From 1d64873130c0d536eb04bfe533ae58fe1caac916 Mon Sep 17 00:00:00 2001 From: vsv Date: Mon, 29 Jun 2015 12:07:44 +0300 Subject: [PATCH] Issue #648: Make shapes presentation clippable --- CMakeCommon/FindSUIT.cmake | 1 + src/ModuleBase/CMakeLists.txt | 1 + src/ModuleBase/ModuleBase_ResultPrs.cpp | 6 +++--- src/ModuleBase/ModuleBase_ResultPrs.h | 6 +++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeCommon/FindSUIT.cmake b/CMakeCommon/FindSUIT.cmake index 30cd6e970..09c97b03e 100644 --- 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 8e0f82a4a..9f0497c54 100644 --- 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 211fdde73..29648d9b2 100644 --- a/src/ModuleBase/ModuleBase_ResultPrs.cpp +++ b/src/ModuleBase/ModuleBase_ResultPrs.cpp @@ -14,11 +14,11 @@ #include #include -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 aShapePtr = ModelAPI_Tools::shape(theResult); std::shared_ptr aWirePtr = diff --git a/src/ModuleBase/ModuleBase_ResultPrs.h b/src/ModuleBase/ModuleBase_ResultPrs.h index 99fa17923..0389241a0 100644 --- a/src/ModuleBase/ModuleBase_ResultPrs.h +++ b/src/ModuleBase/ModuleBase_ResultPrs.h @@ -11,17 +11,17 @@ #include -#include +#include #include -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 -- 2.39.2