Marius Stanciu 5 лет назад
Родитель
Сommit
4a82224883
3 измененных файлов с 17 добавлено и 17 удалено
  1. 2 2
      flatcamEditors/FlatCAMExcEditor.py
  2. 2 2
      flatcamEditors/FlatCAMGeoEditor.py
  3. 13 13
      flatcamTools/ToolDistance.py

+ 2 - 2
flatcamEditors/FlatCAMExcEditor.py

@@ -3438,8 +3438,8 @@ class FlatCAMExcEditor(QtCore.QObject):
             self.pos = (self.pos[0], self.pos[1])
             self.pos = (self.pos[0], self.pos[1])
 
 
         if event.button == 1:
         if event.button == 1:
-            self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp;  <b>Dy</b>: "
-                                                   "%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (0, 0))
+            # self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp;  <b>Dy</b>: "
+            #                                        "%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (0, 0))
 
 
             # Selection with left mouse button
             # Selection with left mouse button
             if self.active_tool is not None and event.button == 1:
             if self.active_tool is not None and event.button == 1:

+ 2 - 2
flatcamEditors/FlatCAMGeoEditor.py

@@ -4161,8 +4161,8 @@ class FlatCAMGeoEditor(QtCore.QObject):
             self.pos = (self.pos[0], self.pos[1])
             self.pos = (self.pos[0], self.pos[1])
 
 
         if event.button == 1:
         if event.button == 1:
-            self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp;  <b>Dy</b>: "
-                                                   "%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (0, 0))
+            # self.app.ui.rel_position_label.setText("<b>Dx</b>: %.4f&nbsp;&nbsp;  <b>Dy</b>: "
+            #                                        "%.4f&nbsp;&nbsp;&nbsp;&nbsp;" % (0, 0))
 
 
             modifiers = QtWidgets.QApplication.keyboardModifiers()
             modifiers = QtWidgets.QApplication.keyboardModifiers()
             # If the SHIFT key is pressed when LMB is clicked then the coordinates are copied to clipboard
             # If the SHIFT key is pressed when LMB is clicked then the coordinates are copied to clipboard

+ 13 - 13
flatcamTools/ToolDistance.py

@@ -469,9 +469,9 @@ class Distance(FlatCAMTool):
 
 
             # Reset here the relative coordinates so there is a new reference on the click position
             # Reset here the relative coordinates so there is a new reference on the click position
             if self.rel_point1 is None:
             if self.rel_point1 is None:
-                self.app.ui.rel_position_label.setText("<b>Dx</b>: %.*f&nbsp;&nbsp;  <b>Dy</b>: "
-                                                       "%.*f&nbsp;&nbsp;&nbsp;&nbsp;" %
-                                                       (self.decimals, 0.0, self.decimals, 0.0))
+                # self.app.ui.rel_position_label.setText("<b>Dx</b>: %.*f&nbsp;&nbsp;  <b>Dy</b>: "
+                #                                        "%.*f&nbsp;&nbsp;&nbsp;&nbsp;" %
+                #                                        (self.decimals, 0.0, self.decimals, 0.0))
                 self.rel_point1 = pos
                 self.rel_point1 = pos
             else:
             else:
                 self.rel_point2 = copy(self.rel_point1)
                 self.rel_point2 = copy(self.rel_point1)
@@ -510,11 +510,11 @@ class Distance(FlatCAMTool):
                     pass
                     pass
 
 
             self.total_distance_entry.set_value('%.*f' % (self.decimals, abs(d)))
             self.total_distance_entry.set_value('%.*f' % (self.decimals, abs(d)))
-            self.app.ui.rel_position_label.setText(
-                "<b>Dx</b>: {}&nbsp;&nbsp;  <b>Dy</b>: {}&nbsp;&nbsp;&nbsp;&nbsp;".format(
-                    '%.*f' % (self.decimals, pos[0]), '%.*f' % (self.decimals, pos[1])
-                )
-            )
+            # self.app.ui.rel_position_label.setText(
+            #     "<b>Dx</b>: {}&nbsp;&nbsp;  <b>Dy</b>: {}&nbsp;&nbsp;&nbsp;&nbsp;".format(
+            #         '%.*f' % (self.decimals, pos[0]), '%.*f' % (self.decimals, pos[1])
+            #     )
+            # )
             self.tool_done = True
             self.tool_done = True
             self.deactivate_measure_tool()
             self.deactivate_measure_tool()
 
 
@@ -562,11 +562,11 @@ class Distance(FlatCAMTool):
                 dx = pos[0]
                 dx = pos[0]
                 dy = pos[1]
                 dy = pos[1]
 
 
-            self.app.ui.rel_position_label.setText(
-                "<b>Dx</b>: {}&nbsp;&nbsp;  <b>Dy</b>: {}&nbsp;&nbsp;&nbsp;&nbsp;".format(
-                    '%.*f' % (self.decimals, dx), '%.*f' % (self.decimals, dy)
-                )
-            )
+            # self.app.ui.rel_position_label.setText(
+            #     "<b>Dx</b>: {}&nbsp;&nbsp;  <b>Dy</b>: {}&nbsp;&nbsp;&nbsp;&nbsp;".format(
+            #         '%.*f' % (self.decimals, dx), '%.*f' % (self.decimals, dy)
+            #     )
+            # )
 
 
             # update utility geometry
             # update utility geometry
             if len(self.points) == 1:
             if len(self.points) == 1: