26229: Clean up

diff --git a/adm/MODULES b/adm/MODULES
index 566647483f1a4224e0bd936aed96116529deef4f..30b75423b85c5b6612dca9c3ddf8d7ed99d45da6 100644 (file)
--- a/adm/MODULES
+++ b/adm/MODULES
@@ -4,4 +4,4 @@ ModelingAlgorithms TKGeomAlgo TKTopAlgo TKPrim TKBO TKBool TKHLR TKFillet TKOffs
 Visualization TKService TKV3d TKOpenGl TKMeshVS TKVoxel TKIVtk
 ApplicationFramework TKCDF TKLCAF TKCAF TKBinL TKXmlL TKBin TKXml FWOSPlugin TKTObj TKBinTObj TKXmlTObj
 DataExchange TKXSBase TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP TKIGES TKXCAF TKXDEIGES TKXDESTEP TKSTL TKVRML TKXmlXCAF TKBinXCAF
-Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw DRAWEXE
\ No newline at end of file
+Draw TKDraw TKTopTest TKViewerTest TKXSDRAW TKDCAF TKXDEDRAW TKTObjDRAW TKQADraw TKIVtkDraw TKVCAF DRAWEXE
\ No newline at end of file

diff --git a/adm/UDLIST b/adm/UDLIST
index 29d3f31286ba3c06f3eefa286e8e8a5a1c0e6164..2b074c4bcb7de7f4c14ee2a9c694d940c493932e 100644 (file)
--- a/adm/UDLIST
+++ b/adm/UDLIST
@@ -431,3 +431,4 @@ n IVtkTools
 t TKIVtk
 n IVtkDraw
 t TKIVtkDraw
+t TKVCAF

diff --git a/src/TKVCAF/CMakeLists.txt b/src/TKVCAF/CMakeLists.txt
new file mode 100644 (file)
index 0000000..b7d2423
--- /dev/null
+++ b/src/TKVCAF/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(TKVCAF)
+
+set (TOOLKIT_MODULES
+  TPrsStd
+)
+
+include(${OCCT_SOURCE_DIR}/adm/cmake/BuildToolkit.cmake)

diff --git a/src/TPrsStd/TPrsStd_AISPresentation.hxx b/src/TPrsStd/TPrsStd_AISPresentation.hxx
index bf61e8b795f25faf1cccb0fcf15b825631faf296..a112dc3a532172d708ba29c722b8c80f154b6255 100644 (file)
--- a/src/TPrsStd/TPrsStd_AISPresentation.hxx
+++ b/src/TPrsStd/TPrsStd_AISPresentation.hxx
@@ -27,6 +27,7 @@
 #include <Standard_Integer.hxx>
 #include <Standard_Boolean.hxx>
 #include <TDF_Attribute.hxx>
+#include <TDataXtd_Presentation.hxx>
 class AIS_InteractiveObject;
 class Standard_GUID;
 class TDF_Label;
@@ -197,6 +198,10 @@ protected:
 
 private:
 
+
+  Handle(TDataXtd_Presentation) getData() const;
+
+  Handle(AIS_InteractiveContext) getAISContext() const;
   
   //! Updates AIS_InteractiveObject stored in the attribute
   //! and applies the visualization settings
@@ -211,20 +216,11 @@ private:
   Standard_EXPORT void AISErase (const Standard_Boolean remove = Standard_False);
 
   Standard_GUID myDriverGUID;
-  Standard_Real myTransparency;
-  Quantity_NameOfColor myColor;
-  Graphic3d_NameOfMaterial myMaterial;
-  Standard_Real myWidth;
-  Standard_Integer myMode;
-  Standard_Integer mySelectionMode;
+  Handle(AIS_InteractiveObject) myAIS;
   Standard_Boolean isDisplayed;
-  Standard_Boolean hasOwnColor;
-  Standard_Boolean hasOwnMaterial;
-  Standard_Boolean hasOwnTransparency;
-  Standard_Boolean hasOwnWidth;
-  Standard_Boolean hasOwnMode;
+  Standard_Integer mySelectionMode;
   Standard_Boolean hasOwnSelectionMode;
-  Handle(AIS_InteractiveObject) myAIS;
+  
 
 
 };