Sfoglia il codice sorgente

- fix in Tool Subtract where there was a typo

Marius Stanciu 5 anni fa
parent
commit
d1368425f1
3 ha cambiato i file con 4 aggiunte e 3 eliminazioni
  1. 1 0
      CHANGELOG.md
  2. 2 2
      appGUI/GUIElements.py
  3. 1 1
      appTools/ToolSub.py

+ 1 - 0
CHANGELOG.md

@@ -26,6 +26,7 @@ CHANGELOG for FlatCAM beta
 - fixed Tcl command Copper Clear (NCC)
 - fixed Tcl command Copper Clear (NCC)
 - fixed Tcl command Paint
 - fixed Tcl command Paint
 - temporary fix for comboboxes not finding the the value in the items when setting themselves with a value by defaulting to the first item in the list
 - temporary fix for comboboxes not finding the the value in the items when setting themselves with a value by defaulting to the first item in the list
+- fix in Tool Subtract where there was a typo
 
 
 27.10.2020
 27.10.2020
 
 

+ 2 - 2
appGUI/GUIElements.py

@@ -2133,8 +2133,8 @@ class FCComboBox(QtWidgets.QComboBox):
         idx = self.findText(str(val))
         idx = self.findText(str(val))
         if idx == -1:
         if idx == -1:
             self.setCurrentIndex(0)
             self.setCurrentIndex(0)
-        else:
-            self.setCurrentIndex(idx)
+            return
+        self.setCurrentIndex(idx)
 
 
     @property
     @property
     def is_last(self):
     def is_last(self):

+ 1 - 1
appTools/ToolSub.py

@@ -205,7 +205,7 @@ class ToolSub(AppTool):
 
 
             app_obj.inform.emit("%s" % _("Subtraction aperture processing finished."))
             app_obj.inform.emit("%s" % _("Subtraction aperture processing finished."))
 
 
-            outname = self.target_gerber_combo.currentText() + '_sub'
+            outname = self.ui.target_gerber_combo.currentText() + '_sub'
             self.aperture_processing_finished.emit(outname, output)
             self.aperture_processing_finished.emit(outname, output)
 
 
         self.app.worker_task.emit({'fcn': worker_job, 'params': [self.app]})
         self.app.worker_task.emit({'fcn': worker_job, 'params': [self.app]})