X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=1439438c314fe431a1496e02209fde5369c8fc8a;hb=857b1f72d9703c46c6c8c9bb239821d314344c86;hp=afa03ce055134516a11a457d5440f597601525ee;hpb=9503b9474d57935de95296dfe6587f6422a6d85d;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index afa03ce05..1439438c3 100755
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -49,7 +49,7 @@
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Session.h>
-#include <ModelAPI_ShapeValidator.h>
+#include <GeomValidators_DifferentShapes.h>
 #include <ModelAPI_ResultBody.h>
 
 #include <GeomDataAPI_Point2D.h>
@@ -200,15 +200,12 @@ void PartSet_Module::registerValidators()
   aFactory->registerValidator("PartSet_TangentSelection", new PartSet_TangentSelection);
   aFactory->registerValidator("PartSet_FilletSelection", new PartSet_FilletSelection);
   aFactory->registerValidator("PartSet_AngleSelection", new PartSet_AngleSelection);
-
   aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
-  aFactory->registerValidator("PartSet_DifferentShapes", new ModelAPI_ShapeValidator);
-
   aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr);
 
+  aFactory->registerValidator("GeomValidators_DifferentShapes", new GeomValidators_DifferentShapes);
   aFactory->registerValidator("GeomValidators_ShapeType", new GeomValidators_ShapeType);
   aFactory->registerValidator("GeomValidators_Face", new GeomValidators_Face);
-
   aFactory->registerValidator("GeomValidators_Finite", new GeomValidators_Finite);
 
   aFactory->registerValidator("GeomValidators_ConstructionComposite",
@@ -223,9 +220,6 @@ void PartSet_Module::registerValidators()
   aFactory->registerValidator("PartSet_SketchEntityValidator",
                               new PartSet_SketchEntityValidator);
 
-  aFactory->registerValidator("PartSet_SameTypeAttr",
-                              new PartSet_SameTypeAttrValidator);
-
   aFactory->registerValidator("GeomValidators_Different",
                               new GeomValidators_Different);
 }
@@ -269,8 +263,8 @@ void PartSet_Module::onOperationCommitted(ModuleBase_Operation* theOperation)
                      myRestartingMode == RM_EmptyFeatureUsed)) {
     myLastOperationId = aFOperation->id();
     myLastFeature = myRestartingMode == RM_LastFeatureUsed ? aFOperation->feature() : FeaturePtr();
-    
-    launchOperation(myLastOperationId);
+    if (!sketchMgr()->sketchSolverError())
+      launchOperation(myLastOperationId);
   }
   breakOperationSequence();
 }
@@ -298,12 +292,21 @@ void PartSet_Module::onOperationStarted(ModuleBase_Operation* theOperation)
 
   ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
   if (aFOperation)
-    myCustomPrs->activate(aFOperation->feature());
+    myCustomPrs->activate(aFOperation->feature(), true);
+}
+
+void PartSet_Module::onOperationResumed(ModuleBase_Operation* theOperation)
+{
+  ModuleBase_IModule::onOperationResumed(theOperation);
+
+  ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+  if (aFOperation)
+    myCustomPrs->activate(aFOperation->feature(), true);
 }
 
 void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
 {
-  myCustomPrs->deactivate();
+  bool isModified = myCustomPrs->deactivate(false);
 
   if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
     mySketchMgr->stopSketch(theOperation);
@@ -311,6 +314,12 @@ void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
   else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
     mySketchMgr->stopNestedSketch(theOperation);
   }
+
+  if (isModified) {
+    XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+    XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
+    aDisplayer->updateViewer();
+  }
 }
 
 ModuleBase_Operation* PartSet_Module::currentOperation() const
@@ -523,7 +532,12 @@ void PartSet_Module::onNoMoreWidgets()
     if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
       if (myRestartingMode != RM_Forbided)
         myRestartingMode = RM_LastFeatureUsed;
-      anOperation->commit();
+      XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+      XGUI_Workshop* aWorkshop = aConnector->workshop();
+      XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
+      // do nothing if the feature can not be applyed
+      if (anOpMgr->isApplyEnabled())
+        anOperation->commit();
     }
   }
 }
@@ -738,10 +752,11 @@ void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
 
 void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAIS)
 {
+  // this is obsolete
   // it should be recomputed in order to disappear in the viewer if the corresponded object
   // is erased
-  if (myCustomPrs->isActive())
-    myCustomPrs->customize(theObject);
+  //if (myCustomPrs->isActive())
+  //  myCustomPrs->redisplay(theObject, false);
 }
 
 void PartSet_Module::onViewTransformed(int theTrsfType)
@@ -798,10 +813,13 @@ void PartSet_Module::onViewTransformed(int theTrsfType)
     aDisplayer->updateViewer();
 }
 
-void PartSet_Module::customizeObject(ObjectPtr theObject)
+bool PartSet_Module::customizeObject(ObjectPtr theObject, const bool theUpdateViewer)
 {
+  bool isRedisplayed = false;
   if (myCustomPrs->isActive())
-    myCustomPrs->customize(theObject);
+    isRedisplayed = myCustomPrs->redisplay(theObject, theUpdateViewer);
+
+  return isRedisplayed;
 }
 
 void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser)
@@ -849,6 +867,7 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
   QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();
   int aSelected = aObjects.size();
   SessionPtr aMgr = ModelAPI_Session::get();
+  QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD");
   if (aSelected == 1) {
     bool hasResult = false;
     bool hasFeature = false;
@@ -869,10 +888,10 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
         }
         if (aPart.get()) // this may be null is Part feature is disabled
           aPartDoc = aPart->partDoc();
-        if (aMgr->activeDocument() == aPartDoc)
-          theMenu->addAction(myMenuMgr->action("DEACTIVATE_PART_CMD"));
-        else
-          theMenu->addAction(myMenuMgr->action("ACTIVATE_PART_CMD"));
+          
+        theMenu->addAction(aActivatePartAction);
+        aActivatePartAction->setEnabled((aMgr->activeDocument() != aPartDoc));
+
       } else if (aObject->document() == aMgr->activeDocument()) {
         if (hasParameter || hasFeature)
           theMenu->addAction(myMenuMgr->action("EDIT_CMD"));
@@ -880,9 +899,7 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
 
       ResultBodyPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultBody>(aObject);
       if( aResult.get() )
-      {
         theMenu->addAction(myMenuMgr->action("SELECT_PARENT_CMD"));
-      }
     } else {  // If feature is 0 the it means that selected root object (document)
       if (aMgr->activeDocument() != aMgr->moduleDocument())
         theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD"));
@@ -894,10 +911,10 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
       if (aMgr->activeDocument() != aMgr->moduleDocument())
         theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD"));
   }
-  bool aCanDeactivate = (myWorkshop->currentOperation() == 0);
-  myMenuMgr->action("ACTIVATE_PARTSET_CMD")->setEnabled(aCanDeactivate);
-  myMenuMgr->action("DEACTIVATE_PART_CMD")->setEnabled(aCanDeactivate);
-  myMenuMgr->action("ACTIVATE_PART_CMD")->setEnabled(aCanDeactivate);
+  bool aNotDeactivate = (myWorkshop->currentOperation() == 0);
+  myMenuMgr->action("ACTIVATE_PARTSET_CMD")->setEnabled(aNotDeactivate);
+  if (!aNotDeactivate)
+    aActivatePartAction->setEnabled(false);
 }
 
 void PartSet_Module::processEvent(const std::shared_ptr<Events_Message>& theMessage)