h3n3/jmwright-CQ-Editor
1
0
Fork 0
mirror of https://github.com/jdegenstein/jmwright-CQ-Editor.git synced 2025-12-20 06:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bring up to date with mainline CQ-editor ec81ad9

Browse Source 
partial pull for widgets/viewer.py only
This commit is contained in:
jdegenstein
2022-10-19 13:17:55 -05:00
committed by GitHub
parent 4ee59fdeb1
commit e3340927d4
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cq_editor/widgets/object_tree.py
View File

@@ -9,7 +9,8 @@ from OCP.gp import gp_Dir, gp_Pnt, gp_Ax1
from ..mixins import ComponentMixin from ..mixins import ComponentMixin
from ..icons import icon from ..icons import icon
from ..cq_utils import make_AIS, export, to_occ_color, is_obj_empty, get_occ_color from ..cq_utils import make_AIS, export, to_occ_color, is_obj_empty, get_occ_color, set_color
from .viewer import DEFAULT_FACE_COLOR
from ..utils import splitter, layout, get_save_filename from ..utils import splitter, layout, get_save_filename
class TopTreeItem(QTreeWidgetItem): class TopTreeItem(QTreeWidgetItem):
@@ -49,14 +50,19 @@ class ObjectTreeItem(QTreeWidgetItem):
self.properties['Name'] = name self.properties['Name'] = name
self.properties['Alpha'] = ais.Transparency() self.properties['Alpha'] = ais.Transparency()
self.properties['Color'] = get_occ_color(ais) if ais else color self.properties['Color'] = get_occ_color(ais) if ais and ais.HasColor() else get_occ_color(DEFAULT_FACE_COLOR)
self.properties.sigTreeStateChanged.connect(self.propertiesChanged) self.properties.sigTreeStateChanged.connect(self.propertiesChanged)
def propertiesChanged(self,*args): def propertiesChanged(self, properties, changed):
changed_prop = changed[0][0]
self.setData(0,0,self.properties['Name']) self.setData(0,0,self.properties['Name'])
self.ais.SetTransparency(self.properties['Alpha']) self.ais.SetTransparency(self.properties['Alpha'])
self.ais.SetColor(to_occ_color(self.properties['Color']))
if changed_prop.name() == 'Color':
set_color(self.ais, to_occ_color(self.properties['Color']))
self.ais.Redisplay() self.ais.Redisplay()
if self.properties['Visible']: if self.properties['Visible']: