Merge pull request #530 from ra3xdh/422-netmames-not-moved

Fix selection of wirelabel

CMakeLists.txt

@@ -16,7 +16,7 @@ endif()
 file (STRINGS "${qucs-suite_SOURCE_DIR}/VERSION" QUCS_VERSION)
 message(STATUS "Configuring Qucs: VERSION ${QUCS_VERSION}")
 
-set(GIT unknown)
+set(GIT "")
 if(EXISTS ${CMAKE_SOURCE_DIR}/.git )
   find_package(Git)
   # Get the latest abbreviated commit hash of the working branch

qucs/misc.cpp

@@ -45,7 +45,7 @@ QString misc::getWindowTitle()
     }
 #if defined(GIT)
     QString hash = GIT;
-    if (hash != "unknown") {
+    if (!hash.isEmpty()) {
         title = title + "-" + hash;
     }
 #endif

qucs/schematic_element.cpp

@@ -1549,7 +1549,8 @@ int Schematic::selectElements(int x1, int y1, int x2, int y2, bool append, bool
     for (pw = Wires->first(); pw != nullptr; pw = Wires->next()) {
         if (pw->Label) {
             pl = pw->Label;
-            QRect componentRect(pl->x1, pl->y1, pl->x2 - pl->x1, pl->y2 - pl->y1);
+            pl->getLabelBounding(cx1,cy1,cx2,cy2);
+            QRect componentRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
             if (shouldBeSelected(componentRect, selectionRect, entirely)) {
                 pl->isSelected = true;
                 z++;
@@ -1564,7 +1565,8 @@ int Schematic::selectElements(int x1, int y1, int x2, int y2, bool append, bool
     for (Node *pn = Nodes->first(); pn != nullptr; pn = Nodes->next()) {
         pl = pn->Label;
         if (pl) {
-            QRect componentRect(pl->x1, pl->y1, pl->x2 - pl->x1, pl->y2 - pl->y1);
+            pl->getLabelBounding(cx1,cy1,cx2,cy2);
+            QRect componentRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
             if (shouldBeSelected(componentRect, selectionRect, entirely)) {
                 pl->isSelected = true;
                 z++;