X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=67f1bcf7a857a65ddb98e52e1014dca3bf21bc97;hb=f39b615e10f48ab13b8346c1e0b4c64500d44f51;hp=1abaeb6b0377cbfce3498c0f103c8c3a964f06a7;hpb=7d182041b78ddb4375098cff6042edc8817f540c;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 1abaeb6b0..67f1bcf7a 100755
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -42,6 +42,7 @@
 #include <GeomValidators_ZeroOffset.h>
 #include <GeomValidators_BooleanArguments.h>
 #include <GeomValidators_Different.h>
+#include <GeomValidators_PartitionArguments.h>
 
 
 #include <ModelAPI_Object.h>
@@ -51,6 +52,7 @@
 #include <ModelAPI_Session.h>
 #include <GeomValidators_DifferentShapes.h>
 #include <ModelAPI_ResultBody.h>
+#include <ModelAPI_AttributeString.h>
 
 #include <GeomDataAPI_Point2D.h>
 #include <GeomDataAPI_Point.h>
@@ -66,6 +68,7 @@
 #include <XGUI_ObjectsBrowser.h>
 #include <XGUI_SelectionMgr.h>
 #include <XGUI_DataModel.h>
+#include <XGUI_ErrorMgr.h>
 
 #include <SketchPlugin_Feature.h>
 #include <SketchPlugin_Sketch.h>
@@ -120,7 +123,7 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop*
 
 PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
   : ModuleBase_IModule(theWshop),
-  myRestartingMode(RM_None), myVisualLayerId(0)
+  myRestartingMode(RM_None), myVisualLayerId(0), myHasConstraintShown(true)
 {
   new PartSet_IconFactory();
 
@@ -224,6 +227,9 @@ void PartSet_Module::registerValidators()
 
   aFactory->registerValidator("GeomValidators_Different",
                               new GeomValidators_Different);
+
+  aFactory->registerValidator("GeomValidators_PartitionArguments",
+                              new GeomValidators_PartitionArguments);
 }
 
 void PartSet_Module::registerFilters()
@@ -322,6 +328,7 @@ void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
     XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
     aDisplayer->updateViewer();
   }
+  mySketchMgr->onShowConstraintsToggle(myHasConstraintShown);
 }
 
 ModuleBase_Operation* PartSet_Module::currentOperation() const
@@ -412,6 +419,26 @@ void PartSet_Module::updateViewerMenu(const QMap<QString, QAction*>& theStdActio
   myMenuMgr->updateViewerMenu(theStdActions);
 }
 
+QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature)
+{
+  QString anError = ModuleBase_IModule::getFeatureError(theFeature);
+
+  if (anError.isEmpty())
+    anError = sketchMgr()->getFeatureError(theFeature);
+
+  if (anError.isEmpty()) {
+    XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+    XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
+    
+    if (anOpMgr->isValidationLocked()) {
+      ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+                                                             (anOpMgr->currentOperation());
+      if (!aFOperation || theFeature == aFOperation->feature())
+        anError = "Validation is locked by the current operation";
+    }
+  }
+  return anError;
+}
 
 void PartSet_Module::activeSelectionModes(QIntList& theModes)
 {
@@ -433,6 +460,11 @@ void PartSet_Module::closeDocument()
 void PartSet_Module::clearViewer()
 {
   myCustomPrs->clearPrs();
+
+  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+  XGUI_Workshop* aWorkshop = aConnector->workshop();
+  XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+  aDisplayer->deactivateSelectionFilters();
 }
 
 void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation)
@@ -740,6 +772,7 @@ void PartSet_Module::launchOperation(const QString& theCmdId)
 {
   if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
     // Show constraints if a constraint was anOperation
+    myHasConstraintShown = mySketchMgr->isConstraintsShown();
     mySketchMgr->onShowConstraintsToggle(true);
   }
   ModuleBase_IModule::launchOperation(theCmdId);
@@ -777,15 +810,16 @@ void PartSet_Module::onViewTransformed(int theTrsfType)
   // if the operation is panning or rotate or panglobal then do nothing
   if ((theTrsfType == 1) || (theTrsfType == 3) || (theTrsfType == 4))
     return;
-
   ModuleBase_IViewer* aViewer = myWorkshop->viewer();
+  Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
+  if (aContext.IsNull())
+    return;
+
   //Handle(V3d_View) aView = aViewer->activeView();
 
   XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
   XGUI_Workshop* aWorkshop = aConnector->workshop();
   XGUI_Displayer* aDisplayer = aWorkshop->displayer();
-  Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
-
   Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer();
   Handle(V3d_View) aView;
   double aScale = 0;
@@ -977,8 +1011,6 @@ void PartSet_Module::processEvent(const std::shared_ptr<Events_Message>& theMess
       }
     }
 #else
-    // Problem with MPV: At first time on creation it doesn't work because Part feature
-    // creation event will be sent after
     if (aActivePartIndex.isValid())
       aTreeView->setExpanded(aActivePartIndex, false);
     XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel();
@@ -992,8 +1024,14 @@ void PartSet_Module::processEvent(const std::shared_ptr<Events_Message>& theMess
     // Update displayed objects in order to update active color
     XGUI_Displayer* aDisplayer = aWorkshop->displayer();
     QObjectPtrList aObjects = aDisplayer->displayedObjects();
-    foreach(ObjectPtr aObj, aObjects)
-      aDisplayer->redisplay(aObj, false);
+    bool aHidden;
+    foreach(ObjectPtr aObj, aObjects) {
+      //TODO: replace by redisplay event.
+      aHidden = !aObj->data() || !aObj->data()->isValid() || 
+        aObj->isDisabled() || (!aObj->isDisplayed());
+      if (!aHidden)
+        aDisplayer->redisplay(aObj, false);
+    }
     aDisplayer->updateViewer();
   }
 }
@@ -1042,7 +1080,11 @@ void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*)
 {
   // z layer is created for all started operations in order to visualize operation AIS presentation
   // over the object
-  Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer();
+  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+  if (aContext.IsNull())
+    return;
+
+  Handle(V3d_Viewer) aViewer = aContext->CurrentViewer();
   if (myVisualLayerId == 0) {
     if (myVisualLayerId == 0)
       aViewer->AddZLayer(myVisualLayerId);
@@ -1059,4 +1101,17 @@ void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*)
     if (!aFound)
       aViewer->AddZLayer(myVisualLayerId);
   }
+  // if there is an active operation with validated widget,
+  // the filters of this widget should be activated in the created view
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+  if (aOperation) {
+    ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+    ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
+    if (anActiveWidget) {
+      ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+                                                                             (anActiveWidget);
+      if (aWidgetValidated)
+        aWidgetValidated->activateFilters(true);
+    }
+  }
 }