bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- in all Object UI's fixed the Properties section columns resize to content on expansion/collapse of the items

Browse Source
This commit is contained in:
Marius Stanciu
2020-12-09 23:12:49 +02:00
committed by Marius
parent 3389d50e53
commit 1f65c9c05f
6 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appObjects/FlatCAMCNCJob.py
View File

@@ -597,6 +597,8 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
# Include CNC Job Snippets changed
self.ui.snippets_cb.toggled.connect(self.on_update_source_file)
@@ -739,6 +741,10 @@ class CNCJobObject(FlatCAMObj, CNCjob):
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()
def on_properties_expanded(self):
for col in range(self.treeWidget.columnCount()):
self.ui.treeWidget.resizeColumnToContents(col)
def on_add_al_probepoints(self):
# create the solid_geo

7
appObjects/FlatCAMExcellon.py
View File

@@ -178,6 +178,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
self.ui.drill_button.clicked.connect(lambda: self.app.drilling_tool.run(toggle=True))
self.ui.milling_button.clicked.connect(self.on_milling_button_clicked)
@@ -626,10 +628,15 @@ class ExcellonObject(FlatCAMObj, Excellon):
self.ui.treeWidget.clear()
self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.MinimumExpanding)
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()
def on_properties_expanded(self):
for col in range(self.treeWidget.columnCount()):
self.ui.treeWidget.resizeColumnToContents(col)
def on_milling_button_clicked(self):
self.app.milling_tool.run(toggle=True)
self.app.milling_tool.ui.target_radio.set_value('exc')

7
appObjects/FlatCAMGeometry.py
View File

@@ -663,6 +663,8 @@ class GeometryObject(FlatCAMObj, Geometry):
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
# # Buttons Signals
# self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)
@@ -709,11 +711,14 @@ class GeometryObject(FlatCAMObj, Geometry):
self.ui.treeWidget.clear()
self.add_properties_items(obj=self, treeWidget=self.ui.treeWidget)
self.ui.treeWidget.setSizePolicy(QtWidgets.QSizePolicy.Ignored, QtWidgets.QSizePolicy.MinimumExpanding)
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()
def on_properties_expanded(self):
for col in range(self.treeWidget.columnCount()):
self.ui.treeWidget.resizeColumnToContents(col)
def on_milling_button_clicked(self):
self.app.milling_tool.run(toggle=True)
self.app.milling_tool.ui.target_radio.set_value('geo')

6
appObjects/FlatCAMGerber.py
View File

@@ -151,6 +151,8 @@ class GerberObject(FlatCAMObj, Gerber):
# Properties
self.ui.properties_button.toggled.connect(self.on_properties)
self.calculations_finished.connect(self.update_area_chull)
self.ui.treeWidget.itemExpanded.connect(self.on_properties_expanded)
self.ui.treeWidget.itemCollapsed.connect(self.on_properties_expanded)
# Tools
self.ui.iso_button.clicked.connect(lambda: self.app.isolation_tool.run(toggle=True))
@@ -367,6 +369,10 @@ class GerberObject(FlatCAMObj, Gerber):
# make sure that the FCTree widget columns are resized to content
self.ui.treeWidget.resize_sig.emit()
def on_properties_expanded(self):
for col in range(self.treeWidget.columnCount()):
self.ui.treeWidget.resizeColumnToContents(col)
def on_generate_buffer(self):
self.app.inform.emit('[WARNING_NOTCL] %s...' % _("Buffering solid geometry"))

3
appObjects/FlatCAMObj.py
View File

@@ -908,6 +908,9 @@ class FlatCAMObj(QtCore.QObject):
self.treeWidget.addChild(
location, ['%s:' % _('Copper Area'), '%.*f %s' % (self.decimals, copper_area, 'in2')], True)
for col in range(self.treeWidget.columnCount()):
self.ui.treeWidget.resizeColumnToContents(col)
@staticmethod
def poly2rings(poly):
return [poly.exterior] + [interior for interior in poly.interiors]