Issue #648: Make shapes presentation clippable

diff --git a/CMakeCommon/FindSUIT.cmake b/CMakeCommon/FindSUIT.cmake
index 30cd6e9702f93f59b38867a990c6e6a08eac87f1..09c97b03e76fb07a2f043bbc49485212b7f60372 100644 (file)
--- a/CMakeCommon/FindSUIT.cmake
+++ b/CMakeCommon/FindSUIT.cmake
@@ -20,6 +20,7 @@ ELSE(HAVE_SALOME)
     FIND_LIBRARY(PyInterp PyInterp ${SUIT_LIB_DIR})
     FIND_LIBRARY(qtx qtx ${SUIT_LIB_DIR})
     FIND_LIBRARY(suit suit ${SUIT_LIB_DIR})
+    FIND_LIBRARY(ViewerData ViewerData ${SUIT_LIB_DIR})
 
     IF(WIN32)
         SET(SUIT_INCLUDE ${SUIT_DIR}/include)

diff --git a/src/ModuleBase/CMakeLists.txt b/src/ModuleBase/CMakeLists.txt
index 8e0f82a4a5ea195f88e12e8c2f2e7c5724369e43..9f0497c54f0273ae0cb68f09838dfb6fdce72785 100644 (file)
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@ -105,6 +105,7 @@ SET(PROJECT_LIBRARIES
        ${CAS_SHAPE}
        ${suit}
        ${qtx}
+       ${ViewerData}
 )
 
 SET(PROJECT_AUTOMOC 

diff --git a/src/ModuleBase/ModuleBase_ResultPrs.cpp b/src/ModuleBase/ModuleBase_ResultPrs.cpp
index 211fdde73eaf137bffbf5561039171d38c328670..29648d9b255aa304681681d75efb60a0e1bb93f2 100644 (file)
--- a/src/ModuleBase/ModuleBase_ResultPrs.cpp
+++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp
@@ -14,11 +14,11 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <TopoDS_Builder.hxx>
 
-IMPLEMENT_STANDARD_HANDLE(ModuleBase_ResultPrs, AIS_Shape);
-IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, AIS_Shape);
+IMPLEMENT_STANDARD_HANDLE(ModuleBase_ResultPrs, ViewerData_AISShape);
+IMPLEMENT_STANDARD_RTTIEXT(ModuleBase_ResultPrs, ViewerData_AISShape);
 
 ModuleBase_ResultPrs::ModuleBase_ResultPrs(ResultPtr theResult)
-  : AIS_Shape(TopoDS_Shape()), myResult(theResult), myIsSketchMode(false)
+  : ViewerData_AISShape(TopoDS_Shape()), myResult(theResult), myIsSketchMode(false)
 {
   std::shared_ptr<GeomAPI_Shape> aShapePtr = ModelAPI_Tools::shape(theResult);
   std::shared_ptr<GeomAPI_PlanarEdges> aWirePtr = 

diff --git a/src/ModuleBase/ModuleBase_ResultPrs.h b/src/ModuleBase/ModuleBase_ResultPrs.h
index 99fa1792312bc981ee382306ea0b172836394f4d..0389241a033826f128d5a6dc099c803c5176b2e7 100644 (file)
--- a/src/ModuleBase/ModuleBase_ResultPrs.h
+++ b/src/ModuleBase/ModuleBase_ResultPrs.h
@@ -11,17 +11,17 @@
 
 #include <ModelAPI_Result.h>
 
-#include <AIS_Shape.hxx>
+#include <ViewerData_AISShape.hxx>
 #include <Standard_DefineHandle.hxx>
 
-DEFINE_STANDARD_HANDLE(ModuleBase_ResultPrs, AIS_Shape)
+DEFINE_STANDARD_HANDLE(ModuleBase_ResultPrs, ViewerData_AISShape)
 
 /**
 * \ingroup GUI
 * A redefinition of standard AIS Interactive Object in order to provide specific behaviour 
 * for wire presentations based in a one plane
 */
-class ModuleBase_ResultPrs: public AIS_Shape
+class ModuleBase_ResultPrs: public ViewerData_AISShape
 {
 public:
   /// Constructor