X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=03b29dd75a50a4cc255b261bb270f8bd7b171b29;hb=013eda84dcea4a427d406c5c75ba7870f4124b7f;hp=8bde3e6f8179e8e5a423b3e936447283f4a7990f;hpb=ec7c4f6ca5f54babcdb171e1df2b1cfe06d4e6fe;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
old mode 100644
new mode 100755
index 8bde3e6f8..03b29dd75
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -4,7 +4,6 @@
 #include "PartSet_WidgetSketchLabel.h"
 #include "PartSet_Validators.h"
 #include "PartSet_Tools.h"
-#include "ModuleBase_WidgetValidated.h"
 #include "PartSet_WidgetPoint2d.h"
 #include "PartSet_WidgetPoint2dDistance.h"
 #include "PartSet_WidgetShapeSelector.h"
@@ -15,7 +14,8 @@
 #include "PartSet_WidgetSketchCreator.h"
 #include "PartSet_SketcherMgr.h"
 #include "PartSet_MenuMgr.h"
-#include <PartSet_CustomPrs.h>
+#include "PartSet_CustomPrs.h"
+#include "PartSet_IconFactory.h"
 
 #include "PartSet_Filters.h"
 #include "PartSet_FilterInfinite.h"
@@ -29,6 +29,7 @@
 #include <ModuleBase_IViewWindow.h>
 #include <ModuleBase_IPropertyPanel.h>
 #include <ModuleBase_WidgetEditor.h>
+#include <ModuleBase_WidgetValidated.h>
 #include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_Tools.h>
 #include <GeomValidators_ShapeType.h>
@@ -46,6 +47,7 @@
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_ShapeValidator.h>
+#include <ModelAPI_ResultBody.h>
 
 #include <GeomDataAPI_Point2D.h>
 #include <GeomDataAPI_Point.h>
@@ -60,6 +62,7 @@
 #include <XGUI_Tools.h>
 #include <XGUI_ObjectsBrowser.h>
 #include <XGUI_SelectionMgr.h>
+#include <XGUI_DataModel.h>
 
 #include <SketchPlugin_Feature.h>
 #include <SketchPlugin_Sketch.h>
@@ -67,6 +70,7 @@
 #include <SketchPlugin_Arc.h>
 #include <SketchPlugin_Circle.h>
 #include <SketchPlugin_Point.h>
+#include <SketchPlugin_ConstraintAngle.h>
 #include <SketchPlugin_ConstraintLength.h>
 #include <SketchPlugin_ConstraintDistance.h>
 #include <SketchPlugin_ConstraintParallel.h>
@@ -105,8 +109,6 @@
 #include <QDebug>
 #endif
 
-
-
 /*!Create and return new instance of XGUI_Module*/
 extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* theWshop)
 {
@@ -117,6 +119,8 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
   : ModuleBase_IModule(theWshop),
   myRestartingMode(RM_None), myVisualLayerId(0)
 {
+  new PartSet_IconFactory();
+
   mySketchMgr = new PartSet_SketcherMgr(this);
   myDataModel = new PartSet_DocumentDataModel(this);
 
@@ -192,6 +196,7 @@ void PartSet_Module::registerValidators()
   aFactory->registerValidator("PartSet_HVDirSelection", new PartSet_HVDirSelection);
   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);
@@ -331,6 +336,20 @@ bool PartSet_Module::canRedo() const
   return aCanRedo;
 }
 
+bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const
+{
+  bool aValid = true;
+  if (theActionId == "DELETE_CMD" || theActionId == "MOVE_CMD") {
+    FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
+    if (aFeature) {
+      // part features are removed in the PartSet module only.
+      if (aFeature->getKind() == PartSetPlugin_Part::ID())
+        aValid = false;
+    }
+  }
+  return aValid;
+}
+
 bool PartSet_Module::canCommitOperation() const
 {
   return mySketchMgr->canCommitOperation();
@@ -435,7 +454,8 @@ void PartSet_Module::onSelectionChanged()
         std::string aId = aFeature->getKind();
         if ((aId == SketchPlugin_ConstraintRadius::ID()) ||
             (aId == SketchPlugin_ConstraintLength::ID()) || 
-            (aId == SketchPlugin_ConstraintDistance::ID())) {
+            (aId == SketchPlugin_ConstraintDistance::ID()) ||
+            (aId == SketchPlugin_ConstraintAngle::ID())) {
           editFeature(aFeature);
         }
       }
@@ -678,6 +698,14 @@ void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
   }
 }
 
+void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAIS)
+{
+  // it should be recomputed in order to disappear in the viewer if the corresponded object
+  // is erased
+  if (myCustomPrs->isActive())
+    myCustomPrs->customize(theObject);
+}
+
 void PartSet_Module::onViewTransformed(int theTrsfType)
 {
   // Set length of arrows constant in pixel size
@@ -747,12 +775,14 @@ void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser)
     aPalet.setColor(QPalette::Text, QColor(0, 72, 140));
     aLabel->setPalette(aPalet);
     aOB->treeView()->setExpandsOnDoubleClick(false);
+#ifdef ModuleDataModel
     connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), 
       SLOT(onTreeViewDoubleClick(const QModelIndex&)));
     connect(aOB, SIGNAL(headerMouseDblClicked(const QModelIndex&)), 
       SLOT(onTreeViewDoubleClick(const QModelIndex&)));
     connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), 
       myDataModel, SLOT(onMouseDoubleClick(const QModelIndex&)));
+#endif
   }
 }
 
@@ -809,6 +839,12 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
         if (hasParameter || hasFeature)
           theMenu->addAction(myMenuMgr->action("EDIT_CMD"));
       }
+
+      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"));
@@ -847,8 +883,9 @@ void PartSet_Module::processEvent(const std::shared_ptr<Events_Message>& theMess
 
     SessionPtr aMgr = ModelAPI_Session::get();
     DocumentPtr aActiveDoc = aMgr->activeDocument();
-    DocumentPtr aDoc = aMgr->moduleDocument();
+#ifdef ModuleDataModel
     QModelIndex aOldIndex = myDataModel->activePartTree();
+    DocumentPtr aDoc = aMgr->moduleDocument();
     if (aActiveDoc == aDoc) {
       if (aOldIndex.isValid())
         aTreeView->setExpanded(aOldIndex, false);
@@ -870,6 +907,16 @@ 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();
+    aActivePartIndex = aDataModel->documentRootIndex(aActiveDoc);
+    if (aActivePartIndex.isValid())
+      aTreeView->setExpanded(aActivePartIndex, true);
+#endif
     aLabel->setPalette(aPalet);
     aWorkshop->updateCommandStatus();