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

[occt.git] / src / AIS / AIS_Shape.cdl

diff --git a/src/AIS/AIS_Shape.cdl b/src/AIS/AIS_Shape.cdl
old mode 100755 (executable)
new mode 100644 (file)
index 921c48e..9138a87
--- a/src/AIS/AIS_Shape.cdl
+++ b/src/AIS/AIS_Shape.cdl
@@ -1,22 +1,18 @@
 -- Created on: 1996-12-20
 -- Created by: Robert COUBLANC
 -- Copyright (c) 1996-1999 Matra Datavision
--- Copyright (c) 1999-2012 OPEN CASCADE SAS
+-- Copyright (c) 1999-2014 OPEN CASCADE SAS
 --
--- The content of this file is subject to the Open CASCADE Technology Public
--- License Version 6.5 (the "License"). You may not use the content of this file
--- except in compliance with the License. Please obtain a copy of the License
--- at http://www.opencascade.org and read it completely before using this file.
+-- This file is part of Open CASCADE Technology software library.
 --
--- The Initial Developer of the Original Code is Open CASCADE S.A.S., having its
--- main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France.
+-- This library is free software; you can redistribute it and/or modify it under
+-- the terms of the GNU Lesser General Public License version 2.1 as published
+-- by the Free Software Foundation, with special exception defined in the file
+-- OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
+-- distribution for complete text of the license and disclaimer of any warranty.
 --
--- The Original Code and all software distributed under the License is
--- distributed on an "AS IS" basis, without warranty of any kind, and the
--- Initial Developer hereby disclaims all such warranties, including without
--- limitation, any warranties of merchantability, fitness for a particular
--- purpose or non-infringement. Please see the License for the specific terms
--- and conditions governing the rights and limitations under the License.
+-- Alternatively, this file may be used under the terms of Open CASCADE
+-- commercial license or contractual agreement.
 
 --   GG  :  GER61351 17/11/1999 Change SetColor() with a compatible Quantity_Color instead
 --                                    the restricted NameOfColor.
@@ -65,6 +61,7 @@ uses
     Projector             from Prs3d,
     PresentationManager3d from PrsMgr,
     Selection             from SelectMgr,
+    Drawer                from AIS,
     KindOfInteractive     from AIS,
     Transformation        from Geom,
     Drawer                from Prs3d,
@@ -72,7 +69,7 @@ uses
  is
 
     Create(shap: Shape from TopoDS) 
-    returns mutable Shape from AIS;
+    returns Shape from AIS;
        ---Purpose: Initializes construction of the shape shap from wires,
        -- edges and vertices.
         
@@ -175,25 +172,25 @@ uses
 
     Compute(me                   : mutable;
             aPresentationManager : PresentationManager3d from PrsMgr;
-            aPresentation        : mutable Presentation from Prs3d;
+            aPresentation        : Presentation from Prs3d;
            aMode                : Integer from Standard = 0) 
     is redefined virtual protected;
 
     Compute(me                   : mutable;
            aProjector           : Projector from Prs3d;
-            aPresentation        : mutable Presentation from Prs3d)
+            aPresentation        : Presentation from Prs3d)
     is redefined virtual protected;
 
     Compute(me                   : mutable;
            aProjector           : Projector from Prs3d;
            aTrsf                : Transformation from Geom;
-           aPresentation        : mutable Presentation from Prs3d)
+           aPresentation        : Presentation from Prs3d)
     is redefined virtual protected;
     
 
 
     ComputeSelection(me          : mutable;
-                    aSelection  : mutable Selection from SelectMgr;
+                    aSelection  : Selection from SelectMgr;
                     aMode       : Integer from Standard)
     is redefined virtual protected; 
                                
@@ -291,18 +288,31 @@ uses
 
     Compute(me                   : mutable;
            aProjector           : Projector from Prs3d;
-            aPresentation        : mutable Presentation from Prs3d;
+            aPresentation        : Presentation from Prs3d;
            ashape               : Shape from TopoDS) is static private;
 
-    GetDeflection(myclass; aShape  : Shape from TopoDS;
-                          aDrawer : Drawer from Prs3d)
-                          returns Real from Standard;
-               
-    DisplayBox(myclass; aPrs : Presentation from Prs3d;
-                       aBox : Box from Bnd;
-                       aDrawer : Drawer from Prs3d) is protected;
-               
-    
+    setColor (me;
+              theDrawer : Drawer from AIS;
+              theColor  : Color  from Quantity)
+    is protected;
+
+    setWidth (me;
+              theDrawer : Drawer from AIS;
+              theWidth  : Real   from Standard)
+    is protected;
+
+    setTransparency (me;
+                     theDrawer : Drawer from AIS;
+                     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;