- some changes in the ObjectUI and for the Geometry UI

FlatCAMObj.py

@@ -195,10 +195,10 @@ class FlatCAMObj(QtCore.QObject):
             pass
 
         # Creates problems on focusOut
-        # try:
-        #     self.ui.scale_entry.returnPressed.connect(self.on_scale_button_click)
-        # except (TypeError, AttributeError):
-        #     pass
+        try:
+            self.ui.scale_entry.returnPressed.connect(self.on_scale_button_click)
+        except (TypeError, AttributeError):
+            pass
 
         # self.ui.skew_button.clicked.connect(self.on_skew_button_click)
 
@@ -3929,6 +3929,7 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
         self.ui.plot_cb.stateChanged.connect(self.on_plot_cb_click)
         self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)
         self.ui.paint_tool_button.clicked.connect(lambda: self.app.paint_tool.run(toggle=False))
+        self.ui.generate_ncc_button.clicked.connect(lambda: self.app.ncclear_tool.run(toggle=False))
         self.ui.pp_geometry_name_cb.activated.connect(self.on_pp_changed)
         self.ui.addtool_entry.returnPressed.connect(lambda: self.on_tool_add())
 

README.md

@@ -16,6 +16,7 @@ CAD program, and create G-Code for Isolation routing.
 - some small changes in the Scale button handler in FlatCAMObj() class
 - added option to save objects as PDF files in File -> Save menu
 - optimized the FlatCAMGerber.clear_plot_apertures() method
+- some changes in the ObjectUI and for the Geometry UI
 
 11.12.2019
 

flatcamGUI/ObjectUI.py

@@ -128,7 +128,8 @@ class ObjectUI(QtWidgets.QWidget):
             self.offset_vectorlabel = QtWidgets.QLabel('%s:' % _('Vector'))
             self.offset_vectorlabel.setToolTip(
                 _("Amount by which to move the object\n"
-                  "in the x and y axes in (x, y) format.")
+                  "in the x and y axes in (x, y) format.\n"
+                  "Expressions are allowed. E.g: (1/3.2, 0.5*3)")
             )
             self.offsetvector_entry = EvalEntry2()
             self.offsetvector_entry.setText("(0.0, 0.0)")
@@ -1676,13 +1677,22 @@ class GeometryObjectUI(ObjectUI):
                             font-weight: bold;
                         }
                         """)
-        self.geo_param_box.addWidget(self.generate_cnc_button)
+        self.grid3.addWidget(self.generate_cnc_button, 23, 0, 1, 2)
+
+        self.grid3.addWidget(QtWidgets.QLabel(''), 24, 0, 1, 2)
 
         # ##############
         # Paint area ##
         # ##############
-        self.paint_label = QtWidgets.QLabel('<b>%s</b>' % _('Paint Area'))
-        self.paint_label.setToolTip(
+        self.tools_label = QtWidgets.QLabel('<b>%s</b>' % _('TOOLS'))
+        self.tools_label.setToolTip(
+            _("Launch Paint Tool in Tools Tab.")
+        )
+        self.grid3.addWidget(self.tools_label, 25, 0, 1, 2)
+
+        # Paint Button
+        self.paint_tool_button = QtWidgets.QPushButton(_('Paint Tool'))
+        self.paint_tool_button.setToolTip(
             _(
                 "Creates tool paths to cover the\n"
                 "whole area of a polygon (remove\n"
@@ -1690,20 +1700,27 @@ class GeometryObjectUI(ObjectUI):
                 "to click on the desired polygon."
             )
         )
-        self.geo_tools_box.addWidget(self.paint_label)
+        self.paint_tool_button.setStyleSheet("""
+                        QPushButton
+                        {
+                            font-weight: bold;
+                        }
+                        """)
+        self.grid3.addWidget(self.paint_tool_button, 26, 0, 1, 2)
 
-        # GO Button
-        self.paint_tool_button = QtWidgets.QPushButton(_('Paint Tool'))
-        self.paint_tool_button.setToolTip(
-            _("Launch Paint Tool in Tools Tab.")
+        # NCC Tool
+        self.generate_ncc_button = QtWidgets.QPushButton(_('NCC Tool'))
+        self.generate_ncc_button.setToolTip(
+            _("Create the Geometry Object\n"
+              "for non-copper routing.")
         )
-        self.paint_tool_button.setStyleSheet("""
+        self.generate_ncc_button.setStyleSheet("""
                         QPushButton
                         {
                             font-weight: bold;
                         }
                         """)
-        self.geo_tools_box.addWidget(self.paint_tool_button)
+        self.grid3.addWidget(self.generate_ncc_button, 27, 0, 1, 2)
 
 
 class CNCObjectUI(ObjectUI):