Issue #2552: Intersection edition is impossible

[modules/shaper.git] / src / PartSet / PartSet_CustomPrs.cpp

diff --git a/src/PartSet/PartSet_CustomPrs.cpp b/src/PartSet/PartSet_CustomPrs.cpp
index 604e593c2d711f41d2dadf84d650090edde09517..1780f0d44f6299d88775afb1130ad0c0aea10cf0 100755 (executable)
--- a/src/PartSet/PartSet_CustomPrs.cpp
+++ b/src/PartSet/PartSet_CustomPrs.cpp
@@ -1,8 +1,22 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        PartSet_CustomPrs.cpp
-// Created:     30 Jun 2015
-// Author:      Natalia ERMOLAEVA
+// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or
+// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+//
 
 #include <PartSet_CustomPrs.h>
 #include <PartSet_Module.h>
@@ -96,6 +110,7 @@ bool PartSet_CustomPrs::displayPresentation(
       break;
     case ModuleBase_IModule::CustomizeResults:
       PartSet_OperationPrs::getResultShapes(myFeature, myWorkshop, aFeatureShapes);
+      PartSet_OperationPrs::getPresentationShapes(myFeature, myWorkshop, aFeatureShapes, false);
       break;
     case ModuleBase_IModule::CustomizeHighlightedObjects:
       PartSet_OperationPrs::getHighlightedShapes(myWorkshop, aFeatureShapes);
@@ -103,7 +118,7 @@ bool PartSet_CustomPrs::displayPresentation(
     default:
       return isModified;
   }
-  NCollection_DataMap<TopoDS_Shape, Handle_AIS_InteractiveObject>& aShapeMap =
+  NCollection_DataMap<TopoDS_Shape, Handle(AIS_InteractiveObject)>& aShapeMap =
                                                                  anOperationPrs->shapesMap();
   PartSet_OperationPrs::fillShapeList(aFeatureShapes, myWorkshop, aShapeMap);
 
@@ -149,8 +164,9 @@ bool PartSet_CustomPrs::displayPresentation(
   return isModified;
 }
 
-bool PartSet_CustomPrs::erasePresentation(const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag,
-                                          const bool theUpdateViewer)
+bool PartSet_CustomPrs::erasePresentation(
+                          const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag,
+                          const bool theUpdateViewer)
 {
   bool isErased = false;
   XGUI_Workshop* aWorkshop = workshop();
@@ -159,7 +175,8 @@ bool PartSet_CustomPrs::erasePresentation(const ModuleBase_IModule::ModuleBase_C
   return isErased;
 }
 
-void PartSet_CustomPrs::clearPresentation(const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag)
+void PartSet_CustomPrs::clearPresentation(
+  const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag)
 {
   AISObjectPtr aPresentation = getPresentation(theFlag, false);
   if (aPresentation.get()) {
@@ -182,7 +199,7 @@ AISObjectPtr PartSet_CustomPrs::getPresentation(
   AISObjectPtr anOperationPrs;
   if (myPresentations.contains(theFlag))
     anOperationPrs = myPresentations[theFlag];
-  
+
   if (!anOperationPrs.get() && theToCreate) {
     initPresentation(theFlag);
     anOperationPrs = myPresentations[theFlag];
@@ -201,7 +218,7 @@ bool PartSet_CustomPrs::redisplay(const ObjectPtr& theObject,
   bool aRedisplayed = false;
   if (myIsActive[theFlag])
     aRedisplayed = displayPresentation(theFlag, theUpdateViewer);
-  
+
   return aRedisplayed;
 }
 
@@ -218,7 +235,8 @@ void PartSet_CustomPrs::processEvent(const std::shared_ptr<Events_Message>& theM
     myPresentationIsEmpty = true; /// store state to analize it after display/erase is finished
 }
 
-void PartSet_CustomPrs::initPresentation(const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag)
+void PartSet_CustomPrs::initPresentation(
+  const ModuleBase_IModule::ModuleBase_CustomizeFlag& theFlag)
 {
   AISObjectPtr anOperationPrs = AISObjectPtr(new GeomAPI_AISObject());
   Handle(PartSet_OperationPrs) anAISPrs = new PartSet_OperationPrs(myWorkshop);
@@ -241,16 +259,13 @@ Quantity_Color PartSet_CustomPrs::getShapeColor(
   Quantity_Color aColor;
   switch(theFlag) {
     case ModuleBase_IModule::CustomizeArguments:
-      aColor = ModuleBase_Tools::color("Visualization", "operation_parameter_color",
-                                       OPERATION_PARAMETER_COLOR());
+      aColor = ModuleBase_Tools::color("Visualization", "operation_parameter_color");
     break;
     case ModuleBase_IModule::CustomizeResults:
-      aColor = ModuleBase_Tools::color("Visualization", "operation_result_color",
-                                       OPERATION_RESULT_COLOR());
+      aColor = ModuleBase_Tools::color("Visualization", "operation_result_color");
     break;
     case ModuleBase_IModule::CustomizeHighlightedObjects:
-      aColor = ModuleBase_Tools::color("Visualization", "operation_highlight_color",
-                                       OPERATION_HIGHLIGHT_COLOR());
+      aColor = ModuleBase_Tools::color("Visualization", "operation_highlight_color");
     break;
     default:
     break;