Better default material and color handling (#371)

* Better default material and color handling

* Trying to fix the tests

NB: default color changed

* Another test fix

Author: adam-urbanczyk

cq_editor/cq_utils.py

@@ -7,7 +7,7 @@
 
 from OCP.XCAFPrs import XCAFPrs_AISObject
 from OCP.TopoDS import TopoDS_Shape
-from OCP.AIS import AIS_InteractiveObject, AIS_Shape, AIS_ColoredShape
+from OCP.AIS import AIS_InteractiveObject, AIS_Shape
 from OCP.Quantity import \
     Quantity_TOC_RGB as TOC_RGB, Quantity_Color
 
@@ -62,7 +62,7 @@ def make_AIS(obj : Union[cq.Workplane, List[cq.Workplane], cq.Shape, List[cq.Sha
         ais = obj
     else:
         shape = to_compound(obj)
-        ais = AIS_ColoredShape(shape.wrapped)
+        ais = AIS_Shape(shape.wrapped)
 
     if 'alpha' in options:
         ais.SetTransparency(options['alpha'])
@@ -105,13 +105,23 @@ def to_occ_color(color) -> Quantity_Color:
                           color.blueF(),
                           TOC_RGB)
 
-def get_occ_color(ais : AIS_ColoredShape) -> QColor:
-    
-    color = Quantity_Color()
-    ais.Color(color)
-    
+def get_occ_color(obj : Union[AIS_InteractiveObject, Quantity_Color]) -> QColor:
+
+    if isinstance(obj, AIS_InteractiveObject):
+        color = Quantity_Color()
+        obj.Color(color)
+    else:
+        color = obj
+
     return QColor.fromRgbF(color.Red(), color.Green(), color.Blue())
 
+def set_color(ais : AIS_Shape, color : Quantity_Color) -> AIS_Shape:
+
+    drawer = ais.Attributes()
+    drawer.ShadingAspect().SetColor(color)
+
+    return ais
+
 def reload_cq():
 
     # NB: order of reloads is important

cq_editor/widgets/object_tree.py

@@ -9,7 +9,8 @@
 
 from ..mixins import ComponentMixin
 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
 
 class TopTreeItem(QTreeWidgetItem):
@@ -49,14 +50,19 @@ def __init__(self,
 
         self.properties['Name'] = name
         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)
 
-    def propertiesChanged(self,*args):
+    def propertiesChanged(self, properties, changed):
+
+        changed_prop = changed[0][0]
 
         self.setData(0,0,self.properties['Name'])
         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()
 
         if self.properties['Visible']:

cq_editor/widgets/viewer.py

@@ -1,22 +1,16 @@
-# -*- coding: utf-8 -*-
+from PyQt5.QtWidgets import QWidget, QDialog, QTreeWidgetItem, QApplication, QAction
 
-from OCP.Graphic3d import Graphic3d_Camera, Graphic3d_StereoMode
-from PyQt5.QtWidgets import (QWidget, QPushButton, QDialog, QTreeWidget,
-                             QTreeWidgetItem, QVBoxLayout, QFileDialog,
-                             QHBoxLayout, QFrame, QLabel, QApplication,
-                             QToolBar, QAction)
-
-from PyQt5.QtCore import QSize, pyqtSlot, pyqtSignal, QMetaObject, Qt
+from PyQt5.QtCore import pyqtSlot, pyqtSignal
 from PyQt5.QtGui import QIcon
 
-from OCP.AIS import AIS_Shaded,AIS_WireFrame, AIS_ColoredShape, \
-    AIS_Axis, AIS_Line
-from OCP.Aspect import Aspect_GDM_Lines, Aspect_GT_Rectangular, Aspect_GFM_VER
-from OCP.Quantity import Quantity_NOC_BLACK as BLACK, \
+from OCP.Graphic3d import Graphic3d_Camera, Graphic3d_StereoMode, Graphic3d_NOM_JADE,\
+    Graphic3d_MaterialAspect
+from OCP.AIS import AIS_Shaded,AIS_WireFrame, AIS_ColoredShape, AIS_Axis
+from OCP.Aspect import Aspect_GDM_Lines, Aspect_GT_Rectangular
+from OCP.Quantity import Quantity_NOC_BLACK as BLACK, Quantity_NOC_GOLD as GOLD,\
     Quantity_TOC_RGB as TOC_RGB, Quantity_Color
-from OCP.Geom import Geom_CylindricalSurface, Geom_Plane, Geom_Circle,\
-     Geom_TrimmedCurve, Geom_Axis1Placement, Geom_Axis2Placement, Geom_Line
-from OCP.gp import gp_Trsf, gp_Vec, gp_Ax3, gp_Dir, gp_Pnt, gp_Ax1
+from OCP.Geom import Geom_Axis1Placement
+from OCP.gp import gp_Ax3, gp_Dir, gp_Pnt, gp_Ax1
 
 from ..utils import layout, get_save_filename
 from ..mixins import ComponentMixin
@@ -29,6 +23,10 @@
 import qtawesome as qta
 
 
+DEFAULT_FACE_COLOR = Quantity_Color(GOLD)
+DEFAULT_EDGE_COLOR = Quantity_Color(BLACK)
+DEFUALT_EDGE_WIDTH = 2
+
 class OCCViewer(QWidget,ComponentMixin):
 
     name = '3D Viewer'
@@ -65,8 +63,23 @@ def __init__(self,parent=None):
                              top_widget=self,
                              margin=0)
 
+        self.setup_defualt_drawer()
         self.updatePreferences()
 
+    def setup_defualt_drawer(self):
+
+        # set the default color and material
+        material = Graphic3d_MaterialAspect(Graphic3d_NOM_JADE)
+
+        shading_aspect = self.canvas.context.DefaultDrawer().ShadingAspect()
+        shading_aspect.SetMaterial(material)
+        shading_aspect.SetColor(DEFAULT_FACE_COLOR)
+
+        # face edge lw
+        line_aspect = self.canvas.context.DefaultDrawer().FaceBoundaryAspect()
+        line_aspect.SetWidth(DEFUALT_EDGE_WIDTH)
+        line_aspect.SetColor(DEFAULT_EDGE_COLOR)
+
     def updatePreferences(self,*args):
 
         color1 = to_occ_color(self.preferences['Background color'])

tests/test_app.py

@@ -114,7 +114,7 @@ def get_rgba(ais):
     alpha = ais.Transparency()
     color = get_occ_color(ais)
 
-    return color.redF(),color.redF(),color.redF(),alpha
+    return color.redF(), color.greenF(), color.blueF(), alpha
 
 @pytest.fixture
 def main(qtbot,mocker):
@@ -1017,14 +1017,13 @@ def test_render_colors(main_clean):
     CQ = obj_tree.CQ
 
     # object 1 (defualt color)
-    r,g,b,a = get_rgba(CQ.child(0).ais)
-    assert( a == 0 )
-    assert( r != 1.0 )
-    
+    assert not CQ.child(0).ais.HasColor()
+
     # object 2
     r,g,b,a = get_rgba(CQ.child(1).ais)
     assert( a == 0.5 )
     assert( r == 1.0 )
+    assert( g == 0.0 )
 
     # object 3
     r,g,b,a = get_rgba(CQ.child(2).ais)
@@ -1059,20 +1058,11 @@ def test_render_colors_console(main_clean):
     console = win.components['console']
 
     console.execute_command(code_color)
-
-    def get_rgba(ais):
-        
-        alpha = ais.Transparency()
-        color = get_occ_color(ais)
-        
-        return color.redF(),color.redF(),color.redF(),alpha
 
     CQ = obj_tree.CQ
 
     # object 1 (defualt color)
-    r,g,b,a = get_rgba(CQ.child(0).ais)
-    assert( a == 0 )
-    assert( r != 1.0 )
+    assert not CQ.child(0).ais.HasColor()
 
     # object 2
     r,g,b,a = get_rgba(CQ.child(1).ais)