- fixed an module import issue in NCC Tool

- minor change (optimization) of the CNCJob UI
- work in progress in German translation ~20%

README.md

@@ -15,6 +15,9 @@ CAD program, and create G-Code for Isolation routing.
 - added all the TCL keywords in the completer keyword list
 - work in progress in German translation ~7%
 - after any autocomplete in TCL completer, a space is added
+- fixed an module import issue in NCC Tool
+- minor change (optimization) of the CNCJob UI
+- work in progress in German translation ~20%
 
 22.03.2019
 

flatcamGUI/ObjectUI.py

@@ -1601,13 +1601,6 @@ class CNCObjectUI(ObjectUI):
                 "a Custom Toolchange GCode (macro)."
             )
         )
-        cnclay.addWidget(self.toolchange_cb)
-
-        self.toolch_ois = OptionalInputSection(self.toolchange_cb, [self.toolchangelabel, self.toolchange_text])
-        cnclay.addStretch()
-
-        cnclay1 = QtWidgets.QHBoxLayout()
-        self.cnc_box.addLayout(cnclay1)
 
         # Variable list
         self.tc_variable_combo = FCComboBox()
@@ -1618,7 +1611,6 @@ class CNCObjectUI(ObjectUI):
                 "They have to be surrounded by the '%' symbol"
             )
         )
-        cnclay1.addWidget(self.tc_variable_combo)
 
         # Populate the Combo Box
         variables = [_('Parameters'), 'tool', 'tooldia', 't_drills', 'x_toolchange', 'y_toolchange', 'z_toolchange',
@@ -1638,15 +1630,12 @@ class CNCObjectUI(ObjectUI):
         self.tc_variable_combo.setItemData(11, _("dwelltime = time to dwell to allow the spindle to reach it's set RPM"),
                                            Qt.ToolTipRole)
 
-        cnclay1.addStretch()
+        cnclay.addWidget(self.toolchange_cb)
+        cnclay.addStretch()
+        cnclay.addWidget(self.tc_variable_combo)
 
-        # Insert Variable into the Toolchange G-Code Text Box
-        # self.tc_insert_buton = FCButton("Insert")
-        # self.tc_insert_buton.setToolTip(
-        #     "Insert the variable in the GCode Box\n"
-        #     "surrounded by the '%' symbol."
-        # )
-        # cnclay1.addWidget(self.tc_insert_buton)
+        self.toolch_ois = OptionalInputSection(self.toolchange_cb,
+                                               [self.toolchangelabel, self.toolchange_text, self.tc_variable_combo])
 
         h_lay = QtWidgets.QHBoxLayout()
         h_lay.setAlignment(QtCore.Qt.AlignVCenter)

flatcamTools/ToolNonCopperClear.py

@@ -13,6 +13,7 @@ import time
 
 import gettext
 import FlatCAMTranslation as fcTranslate
+from shapely.geometry import base
 
 fcTranslate.apply_language('strings')
 import builtins
@@ -661,7 +662,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
 
         # Prepare non-copper polygons
         try:
-            bounding_box = self.ncc_obj.solid_geometry.envelope.buffer(distance=margin, join_style=JOIN_STYLE.mitre)
+            bounding_box = self.ncc_obj.solid_geometry.envelope.buffer(distance=margin, join_style=base.JOIN_STYLE.mitre)
         except AttributeError:
             self.app.inform.emit(_("[ERROR_NOTCL]No Gerber file available."))
             return