From 650934f9d4a58a0944390315bf16106fd72de967 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 28 May 2014 11:33:08 +0400 Subject: [PATCH] OCC Bugs are 24965, 24966 --- src/PartSet/PartSet_Module.cpp | 7 +++---- src/PartSet/PartSet_TestOCC.cpp | 6 +++--- src/PartSet/PartSet_TestOCC.h | 8 ++++---- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 7cd146030..374b1d503 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -109,12 +109,11 @@ std::string PartSet_Module::featureFile(const std::string& theFeatureId) */ void PartSet_Module::onFeatureTriggered() { - //PartSet_TestOCC::testSelection_OCC(myWorkshop->viewer()->AISContext(), + //PartSet_TestOCC::local_selection_change_shape(myWorkshop->viewer()->AISContext(), // myWorkshop->viewer()->activeView()); - //PartSet_TestOCC::testErase_OCC(myWorkshop->viewer()->AISContext(), - // myWorkshop->viewer()->activeView()); - + //PartSet_TestOCC::local_selection_erase(myWorkshop->viewer()->AISContext(), + // myWorkshop->viewer()->activeView()); QAction* aCmd = dynamic_cast(sender()); //Do nothing on uncheck if(aCmd->isCheckable() && !aCmd->isChecked()) diff --git a/src/PartSet/PartSet_TestOCC.cpp b/src/PartSet/PartSet_TestOCC.cpp index 846973bca..60798a78b 100644 --- a/src/PartSet/PartSet_TestOCC.cpp +++ b/src/PartSet/PartSet_TestOCC.cpp @@ -43,8 +43,8 @@ void PartSet_TestOCC::testSelection(XGUI_Workshop* theWorkshop) } } -void PartSet_TestOCC::testSelection_OCC(Handle_AIS_InteractiveContext theContext, - Handle_V3d_View theView) +void PartSet_TestOCC::local_selection_change_shape(Handle_AIS_InteractiveContext theContext, + Handle_V3d_View theView) { // 1. Create shape gp_Pnt aPnt1(100, 100, 0); @@ -94,7 +94,7 @@ void PartSet_TestOCC::testSelection_OCC(Handle_AIS_InteractiveContext theContext std::cout << "Error: The point of the first line should not be selected." << std::endl; } -void PartSet_TestOCC::testErase_OCC(Handle_AIS_InteractiveContext theContext, +void PartSet_TestOCC::local_selection_erase(Handle_AIS_InteractiveContext theContext, Handle_V3d_View theView) { // 1. Create shape diff --git a/src/PartSet/PartSet_TestOCC.h b/src/PartSet/PartSet_TestOCC.h index 5de140c30..e4b8dd005 100644 --- a/src/PartSet/PartSet_TestOCC.h +++ b/src/PartSet/PartSet_TestOCC.h @@ -28,15 +28,15 @@ public: /// BUG: The result contains the selection from the first presentation /// \param theContext a viewer interactive context /// \param theContext a view - static void testSelection_OCC(Handle_AIS_InteractiveContext theContext, - Handle_V3d_View theView); + static void local_selection_change_shape(Handle_AIS_InteractiveContext theContext, + Handle_V3d_View theView); /// Creates row OCC presentation, activate in the local context, select it, erase the presentation /// BUG: The selected shape are in the viewer even after erase /// \param theContext a viewer interactive context /// \param theContext a view - static void testErase_OCC(Handle_AIS_InteractiveContext theContext, - Handle_V3d_View theView); + static void local_selection_erase(Handle_AIS_InteractiveContext theContext, + Handle_V3d_View theView); private: -- 2.39.2