فهرست منبع

- Excellon UI: fixed a small issue with toggling all rows in Tools Table not toggling off and also the milling section in Utilities was not updated

Marius Stanciu 5 سال پیش
والد
کامیت
5a929a4c60
3فایلهای تغییر یافته به همراه11 افزوده شده و 4 حذف شده
  1. 1 0
      CHANGELOG.md
  2. 9 3
      appObjects/FlatCAMExcellon.py
  3. 1 1
      appTools/ToolMilling.py

+ 1 - 0
CHANGELOG.md

@@ -18,6 +18,7 @@ CHANGELOG for FlatCAM beta
 - removed Hungarian language since it's looking like is no longer being translated
 - added a default properties tab which will hold a set of information's about the application
 - minor changes in the Properties Tool
+- Excellon UI: fixed a small issue with toggling all rows in Tools Table not toggling off and also the milling section in Utilities was not updated
 
 22.10.2020
 

+ 9 - 3
appObjects/FlatCAMExcellon.py

@@ -172,6 +172,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
         self.ui.plot_cb.stateChanged.connect(self.on_plot_cb_click)
         self.ui.solid_cb.stateChanged.connect(self.on_solid_cb_click)
         self.ui.multicolored_cb.stateChanged.connect(self.on_multicolored_cb_click)
+        self.multicolored_build_sig.connect(self.on_multicolored_build)
+
         self.ui.autoload_db_cb.stateChanged.connect(self.on_autoload_db_toggled)
 
         # Editor
@@ -182,6 +184,7 @@ class ExcellonObject(FlatCAMObj, Excellon):
         self.calculations_finished.connect(self.update_area_chull)
 
         self.ui.drill_button.clicked.connect(lambda: self.app.drilling_tool.run(toggle=True))
+        # FIXME will uncomment when Milling Tool is ready
         # self.ui.milling_button.clicked.connect(lambda: self.app.milling_tool.run(toggle=True))
 
         # UTILITIES
@@ -189,10 +192,10 @@ class ExcellonObject(FlatCAMObj, Excellon):
         self.ui.generate_milling_button.clicked.connect(self.on_generate_milling_button_click)
         self.ui.generate_milling_slots_button.clicked.connect(self.on_generate_milling_slots_button_click)
 
+        # Toggle all Table rows
         self.ui.tools_table.horizontalHeader().sectionClicked.connect(self.on_toggle_rows)
-        self.ui.table_visibility_cb.stateChanged.connect(self.on_table_visibility_toggle)
 
-        self.multicolored_build_sig.connect(self.on_multicolored_build)
+        self.ui.table_visibility_cb.stateChanged.connect(self.on_table_visibility_toggle)
 
         self.units_found = self.app.defaults['units']
 
@@ -560,11 +563,14 @@ class ExcellonObject(FlatCAMObj, Excellon):
         for idx in sel_indexes:
             sel_rows.add(idx.row())
 
-        if len(sel_rows) == self.ui.tools_table.rowCount():
+        # subtract the last 2 rows that show the total and are always displayed but not selected
+        if len(sel_rows) == self.ui.tools_table.rowCount() - 2:
             self.ui.tools_table.clearSelection()
         else:
             self.ui.tools_table.selectAll()
 
+        self.on_row_selection_change()
+
     def get_selected_tools_list(self):
         """
         Returns the keys to the self.tools dictionary corresponding

+ 1 - 1
appTools/ToolMilling.py

@@ -52,7 +52,7 @@ class ToolMilling(AppTool, Excellon):
         # #############################################################################
         # ######################### Tool GUI ##########################################
         # #############################################################################
-        self.ui = DrillingUI(layout=self.layout, app=self.app)
+        self.ui = MillingUI(layout=self.layout, app=self.app)
         self.toolName = self.ui.toolName
 
         # #############################################################################