0025459: Visualization - AIS_ColoredShape::SetMaterial() should not reset custom...

diff --git a/src/AIS/AIS_ColoredShape.cxx b/src/AIS/AIS_ColoredShape.cxx
index aa50d38bbec227a54ba05ff2b8f349dfadcaebe1..d6ea64117c9a4bdd466b4eedbcff10f446ded674 100644 (file)
--- a/src/AIS/AIS_ColoredShape.cxx
+++ b/src/AIS/AIS_ColoredShape.cxx
@@ -269,6 +269,28 @@ void AIS_ColoredShape::SetTransparency (const Standard_Real theValue)
   }
 }
 
+//=======================================================================
+//function : SetMaterial
+//purpose  :
+//=======================================================================
+
+void AIS_ColoredShape::SetMaterial (const Graphic3d_MaterialAspect& theMaterial)
+{
+  setMaterial (myDrawer, theMaterial, HasColor(), IsTransparent());
+  //myOwnMaterial = theMaterial;
+  hasOwnMaterial = Standard_True;
+  LoadRecomputable (AIS_Shaded);
+  for (DataMapOfShapeColor::Iterator anIter (myShapeColors); anIter.More(); anIter.Next())
+  {
+    const Handle(AIS_ColoredDrawer)& aDrawer = anIter.Value();
+    //if (aDrawer->HasOwnMaterial()) continue;
+    if (aDrawer->HasShadingAspect())
+    {
+      setMaterial (aDrawer, theMaterial, aDrawer->HasOwnColor(), Standard_False); // aDrawer->IsTransparent()
+    }
+  }
+}
+
 //=======================================================================
 //function : Compute
 //purpose  :

diff --git a/src/AIS/AIS_ColoredShape.hxx b/src/AIS/AIS_ColoredShape.hxx
index c7b865fe4d3310f96ecfb4bce931b62bedb70911..c9affe1d1a58f38e201c475c0cc75278a34d2ff4 100644 (file)
--- a/src/AIS/AIS_ColoredShape.hxx
+++ b/src/AIS/AIS_ColoredShape.hxx
@@ -104,6 +104,9 @@ public: //! @name global aspects
   //! Sets transparency value.
   Standard_EXPORT virtual void SetTransparency (const Standard_Real theValue) Standard_OVERRIDE;
 
+  //! Sets the material aspect.
+  Standard_EXPORT virtual void SetMaterial (const Graphic3d_MaterialAspect& theAspect) Standard_OVERRIDE;
+
 protected: //! @name override presentation computation
 
   Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,

diff --git a/src/AIS/AIS_Shape.cdl b/src/AIS/AIS_Shape.cdl
index 7b81d6f1c81357b3634a006052201aec53e01ecf..9138a87506009703a06eb6c3937c465a125c60bd 100644 (file)
--- a/src/AIS/AIS_Shape.cdl
+++ b/src/AIS/AIS_Shape.cdl
@@ -306,6 +306,13 @@ uses
                      theValue  : Real   from Standard)
     is protected;
 
+    setMaterial (me;
+                 theDrawer       : Drawer from AIS;
+                 theMaterial     : MaterialAspect from Graphic3d;
+                 theToKeepColor  : Boolean from Standard;
+                 theToKeepTransp : Boolean from Standard)
+    is protected;
+
 fields
     myshape            : Shape   from TopoDS   is protected;
     myBB               : Box     from Bnd      is protected;

diff --git a/src/AIS/AIS_Shape.cxx b/src/AIS/AIS_Shape.cxx
index f64202d545ac07567f867b8441e4b80ec0a41fc1..34e819793b19009477bb65ed73f6e56780375432 100644 (file)
--- a/src/AIS/AIS_Shape.cxx
+++ b/src/AIS/AIS_Shape.cxx
@@ -710,6 +710,35 @@ void AIS_Shape::UnsetWidth()
   LoadRecomputable (AIS_WireFrame);
 }
 
+//=======================================================================
+//function : setMaterial
+//purpose  :
+//=======================================================================
+
+void AIS_Shape::setMaterial (const Handle(AIS_Drawer)&       theDrawer,
+                             const Graphic3d_MaterialAspect& theMaterial,
+                             const Standard_Boolean          theToKeepColor,
+                             const Standard_Boolean          theToKeepTransp) const
+{
+  const Quantity_Color aColor  = theDrawer->ShadingAspect()->Material     (myCurrentFacingModel).Color();
+  const Standard_Real  aTransp = theDrawer->ShadingAspect()->Transparency (myCurrentFacingModel);
+  if (!theDrawer->HasShadingAspect())
+  {
+    theDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
+    *theDrawer->ShadingAspect()->Aspect() = *theDrawer->Link()->ShadingAspect()->Aspect();
+  }
+  theDrawer->ShadingAspect()->SetMaterial (theMaterial, myCurrentFacingModel);
+
+  if (theToKeepColor)
+  {
+    theDrawer->ShadingAspect()->SetColor (aColor, myCurrentFacingModel);
+  }
+  if (theToKeepTransp)
+  {
+    theDrawer->ShadingAspect()->SetTransparency (aTransp, myCurrentFacingModel);
+  }
+}
+
 //=======================================================================
 //function : SetMaterial
 //purpose  : 
@@ -727,20 +756,9 @@ void AIS_Shape::SetMaterial(const Graphic3d_NameOfMaterial aMat)
 
 void AIS_Shape::SetMaterial (const Graphic3d_MaterialAspect& theMat)
 {
-  if (!myDrawer->HasShadingAspect())
-  {
-    myDrawer->SetShadingAspect (new Prs3d_ShadingAspect());
-    *myDrawer->ShadingAspect()->Aspect() = *myDrawer->Link()->ShadingAspect()->Aspect();
-  }
+  setMaterial (myDrawer, theMat, HasColor(), IsTransparent());
   hasOwnMaterial = Standard_True;
 
-  myDrawer->ShadingAspect()->SetMaterial (theMat, myCurrentFacingModel);
-  if (HasColor())
-  {
-    myDrawer->ShadingAspect()->SetColor (myOwnColor, myCurrentFacingModel);
-  }
-  myDrawer->ShadingAspect()->SetTransparency (myTransparency, myCurrentFacingModel);
-
   // modify shading presentation without re-computation
   const PrsMgr_Presentations&        aPrsList  = Presentations();
   Handle(Graphic3d_AspectFillArea3d) anAreaAsp = myDrawer->ShadingAspect()->Aspect();

diff --git a/src/Prs3d/Prs3d_ShadingAspect.cdl b/src/Prs3d/Prs3d_ShadingAspect.cdl
index da96e4928a0900fa1ed137d6d30a1a3d3573f7d1..cdaa74883405758e8dd3756f181612a8b546184b 100644 (file)
--- a/src/Prs3d/Prs3d_ShadingAspect.cdl
+++ b/src/Prs3d/Prs3d_ShadingAspect.cdl
@@ -74,10 +74,12 @@ is
     Color (me; aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_FRONT_SIDE) 
     returns Color from Quantity is static;
        --- Purpose: Returns the polygons color.
+       ---C++: return const &
 
     Material (me; aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_FRONT_SIDE) 
     returns MaterialAspect from Graphic3d is static;
        --- Purpose: Returns the polygons material aspect.
+       ---C++: return const &
 
     Transparency (me; aModel: TypeOfFacingModel from Aspect = Aspect_TOFM_FRONT_SIDE) 
     returns Real from Standard is static;

diff --git a/src/Prs3d/Prs3d_ShadingAspect.cxx b/src/Prs3d/Prs3d_ShadingAspect.cxx
index 4f7f4800f76cf1a6f1514cb900a7a07865c8a707..dac08d17fdea59127d81566df9e5acd9f2d56cc6 100644 (file)
--- a/src/Prs3d/Prs3d_ShadingAspect.cxx
+++ b/src/Prs3d/Prs3d_ShadingAspect.cxx
@@ -12,15 +12,6 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#define BUC60488       //GG_23/09/99 Updates correctly the Material after
-//                     any change.
-
-#define GER61351               //GG_171199     Enable to set an object RGB color
-//                                               instead a restricted object NameOfColor.
-//                             Enable to change separatly the front and back color.
-
-#define OCC1174 //SAV_080103 Added back face interior color management
-
 #include <Prs3d_ShadingAspect.ixx>
 
 //=======================================================================
@@ -53,7 +44,6 @@ Prs3d_ShadingAspect::Prs3d_ShadingAspect () {
 //purpose  : 
 //=======================================================================
 
-#ifdef GER61351
 void Prs3d_ShadingAspect::SetColor(const Quantity_NameOfColor aColor,
                                             const Aspect_TypeOfFacingModel aModel) {
 
@@ -62,10 +52,6 @@ void Prs3d_ShadingAspect::SetColor(const Quantity_NameOfColor aColor,
 
 void Prs3d_ShadingAspect::SetColor(const Quantity_Color &aColor,
                                             const Aspect_TypeOfFacingModel aModel) {
-#ifndef OCC1174  
-  myAspect->SetInteriorColor(aColor);
-#endif
-
   if( aModel != Aspect_TOFM_BOTH_SIDE ) {
     myAspect->SetDistinguishOn();
   }
@@ -73,77 +59,46 @@ void Prs3d_ShadingAspect::SetColor(const Quantity_Color &aColor,
     Graphic3d_MaterialAspect front = myAspect->FrontMaterial();
     front.SetColor(aColor);
     myAspect->SetFrontMaterial(front);
-#ifdef OCC1174
     myAspect->SetInteriorColor( aColor );
-#endif
   }
 
   if( aModel == Aspect_TOFM_BACK_SIDE || aModel == Aspect_TOFM_BOTH_SIDE ) {
     Graphic3d_MaterialAspect back = myAspect->BackMaterial();
     back.SetColor(aColor);
     myAspect->SetBackMaterial(back);
-#ifdef OCC1174
     myAspect->SetBackInteriorColor( aColor );
-#endif
   }
 }
 
-Quantity_Color Prs3d_ShadingAspect::Color( const Aspect_TypeOfFacingModel aModel ) const {
-  Quantity_Color myReturn ;
-  switch (aModel) {
+const Quantity_Color& Prs3d_ShadingAspect::Color (const Aspect_TypeOfFacingModel theModel) const
+{
+  switch (theModel)
+  {
     default:
     case Aspect_TOFM_BOTH_SIDE:
     case Aspect_TOFM_FRONT_SIDE:
-       myReturn = myAspect->FrontMaterial().Color();
-       break;
+      return myAspect->FrontMaterial().Color();
     case Aspect_TOFM_BACK_SIDE:
-       myReturn = myAspect->BackMaterial().Color();
-       break;
+      return myAspect->BackMaterial().Color();
   }
-  return myReturn ;
 }
-#else
-void Prs3d_ShadingAspect::SetColor(const Quantity_NameOfColor aColor) {
-  myAspect->SetInteriorColor(aColor);
-#ifdef OCC1174
-  myAspect->SetBackInteriorColor( aColor );
-#endif
-  myAspect->FrontMaterial().SetAmbientColor(Quantity_Color(aColor));
-  myAspect->BackMaterial().SetAmbientColor(Quantity_Color(aColor));
-//  myAspect->FrontMaterial().SetColor(Quantity_Color(aColor));
-//  myAspect->BackMaterial().SetColor(Quantity_Color(aColor));
-}
-#endif 
 
 //=======================================================================
 //function : SetMaterial
 //purpose  : 
 //=======================================================================
 
-#ifdef GER61351
 void Prs3d_ShadingAspect::SetMaterial(
                    const Graphic3d_NameOfMaterial aMaterial,
                         const Aspect_TypeOfFacingModel aModel ) {
-
   SetMaterial(Graphic3d_MaterialAspect(aMaterial),aModel);
 }
-#else
-void Prs3d_ShadingAspect::SetMaterial(
-//                 const Graphic3d_NameOfPhysicalMaterial aMaterial) {
-                 const Graphic3d_NameOfMaterial aMaterial) {
-
-  Graphic3d_MaterialAspect TheMaterial(aMaterial);
-  myAspect->SetFrontMaterial (TheMaterial);
-  myAspect->SetBackMaterial (TheMaterial);
-}
-#endif
 
 //=======================================================================
 //function : SetMaterial
 //purpose  : 
 //=======================================================================
 
-#ifdef GER61351
 void Prs3d_ShadingAspect::SetMaterial(
                    const Graphic3d_MaterialAspect& aMaterial,
                         const Aspect_TypeOfFacingModel aModel ) {
@@ -160,36 +115,24 @@ void Prs3d_ShadingAspect::SetMaterial(
   }
 }
 
-Graphic3d_MaterialAspect  Prs3d_ShadingAspect::Material(
-                        const Aspect_TypeOfFacingModel aModel ) const {
-  Graphic3d_MaterialAspect myReturn ;             
-  switch (aModel) {
+const Graphic3d_MaterialAspect& Prs3d_ShadingAspect::Material (const Aspect_TypeOfFacingModel theModel) const
+{
+  switch (theModel)
+  {
     default:
     case Aspect_TOFM_BOTH_SIDE:
     case Aspect_TOFM_FRONT_SIDE:
-       myReturn = myAspect->FrontMaterial();
-       break;
+      return myAspect->FrontMaterial();
     case Aspect_TOFM_BACK_SIDE:
-       myReturn = myAspect->BackMaterial();
-       break;
+      return myAspect->BackMaterial();
   }
- return myReturn ;  
-} 
-#else
-void Prs3d_ShadingAspect::SetMaterial(
-                 const Graphic3d_MaterialAspect&  aMaterial) 
-{
-  myAspect->SetFrontMaterial (aMaterial);
-  myAspect->SetBackMaterial (aMaterial);
 }
-#endif
 
 //=======================================================================
 //function : SetTransparency
 //purpose  : 
 //=======================================================================
 
-#ifdef GER61351
 void Prs3d_ShadingAspect::SetTransparency(const Standard_Real aValue,
                                                      const Aspect_TypeOfFacingModel aModel ) {
 
@@ -222,7 +165,6 @@ Standard_Real aValue(0.);
   }
   return aValue;
 }
-#endif
 
 //=======================================================================
 //function : SetAspect

diff --git a/tests/bugs/vis/bug25459_coloredshape b/tests/bugs/vis/bug25459_coloredshape
new file mode 100644 (file)
index 0000000..e747838
--- /dev/null
+++ b/tests/bugs/vis/bug25459_coloredshape
@@ -0,0 +1,25 @@
+puts "========"
+puts "OCC25459 AIS_ColoredShape::SetMaterial() should not reset custom colors"
+puts "========"
+
+box b 0 0 0 1 2 3
+
+# prepare view
+vinit View1
+vclear
+vglinfo
+vsetdispmode 1
+vaxo
+vdisplay b
+vfit
+
+# customize object
+explode b F
+vaspects b -subshapes b_3 -setcolor RED
+vaspects b -setmaterial PLASTIC
+
+# validate results
+set aFaceColor [vreadpixel 128 256 rgb name]
+if {"$aFaceColor"  != "RED4"} {
+  puts "Error: wrong Face color"
+}