Issue #1393 Angle constraint : incorrect angle displayed. solution: arc's passed...

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

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index c230c979318de5644f33e05ed4312c4f07914848..e257113e774650107e5fafee31f5802c0bec8266 100755 (executable)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -4,6 +4,7 @@
 #include "PartSet_WidgetSketchLabel.h"
 #include "PartSet_Validators.h"
 #include "PartSet_Tools.h"
+#include "PartSet_PreviewPlanes.h"
 #include "PartSet_WidgetPoint2d.h"
 #include "PartSet_WidgetPoint2dDistance.h"
 #include "PartSet_WidgetPoint2DFlyout.h"
@@ -14,6 +15,7 @@
 #include "PartSet_WidgetSketchCreator.h"
 #include "PartSet_SketcherMgr.h"
 #include "PartSet_SketcherReetntrantMgr.h"
+#include "PartSet_ResultSketchPrs.h"
 #include "PartSet_MenuMgr.h"
 #include "PartSet_CustomPrs.h"
 #include "PartSet_IconFactory.h"
@@ -39,6 +41,7 @@
 #include <ModuleBase_OperationFeature.h>
 #include <ModuleBase_WidgetFactory.h>
 #include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_ViewerPrs.h>
 
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Events.h>
@@ -47,6 +50,7 @@
 #include <ModelAPI_Session.h>
 #include <ModelAPI_ResultBody.h>
 #include <ModelAPI_AttributeString.h>
+#include <ModelAPI_AttributeSelectionList.h>
 
 #include <GeomDataAPI_Point2D.h>
 #include <GeomDataAPI_Point.h>
@@ -145,7 +149,7 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
 
   myHasConstraintShown[PartSet_Tools::Geometrical] = true;
   myHasConstraintShown[PartSet_Tools::Dimensional] = true;
-  myHasConstraintShown[PartSet_Tools::Dimensional] = false;
+  myHasConstraintShown[PartSet_Tools::Expressions] = false;
 
   Config_PropManager::registerProp("Visualization", "operation_parameter_color",
                           "Reference shape wireframe color in operation", Config_Prop::Color,
@@ -221,7 +225,6 @@ void PartSet_Module::registerValidators()
   aFactory->registerValidator("PartSet_MiddlePointSelection", new PartSet_MiddlePointSelection);
   aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
   aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr);
-  aFactory->registerValidator("PartSet_SketchEntityValidator", new PartSet_SketchEntityValidator);
 }
 
 void PartSet_Module::registerFilters()
@@ -563,17 +566,18 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation,
   if (mySketchMgr->activeSketch().get() && aFOperation && aPropertyPanel) {
     ModuleBase_ISelection* aSelection = workshop()->selection();
     // click on a point in sketch leads here with the point is highlighted, not yet selected
-    QList<ModuleBase_ViewerPrs> aPreselection = aSelection->getHighlighted();
+    QList<ModuleBase_ViewerPrsPtr> aPreselection = aSelection->getHighlighted();
     if (aPreselection.size() == 1) {
-      ModuleBase_ViewerPrs aSelectedPrs = aPreselection[0];
-      ObjectPtr anObject = aSelectedPrs.object();
+      ModuleBase_ViewerPrsPtr aSelectedPrs = aPreselection[0];
+      ObjectPtr anObject = aSelectedPrs->object();
 
       FeaturePtr aFeature = ModelAPI_Feature::feature(anObject);
       FeaturePtr anOpFeature = aFOperation->feature();
-      TopoDS_Shape aShape = aSelectedPrs.shape();
+      GeomShapePtr aShape = aSelectedPrs->shape();
       // click on the digit of dimension constrain comes here with an empty shape, so we need the check
-      if (aFeature == anOpFeature && !aShape.IsNull()) {
-        AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aShape,
+      if (aFeature == anOpFeature && aShape.get() && !aShape->isNull()) {
+        const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+        AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aTDShape,
                                                                          mySketchMgr->activeSketch());
         if (anAttribute.get()) {
           QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
@@ -609,10 +613,10 @@ void PartSet_Module::onSelectionChanged()
   if (isSketcherOp) {
     // Editing of constraints can be done on selection
     ModuleBase_ISelection* aSelect = myWorkshop->selection();
-    QList<ModuleBase_ViewerPrs> aSelected = aSelect->getSelected();
+    QList<ModuleBase_ViewerPrsPtr> aSelected = aSelect->getSelected();
     if (aSelected.size() == 1) {
-      ModuleBase_ViewerPrs aPrs = aSelected.first();
-      ObjectPtr aObject = aPrs.object();
+      ModuleBase_ViewerPrsPtr aPrs = aSelected.first();
+      ObjectPtr aObject = aPrs->object();
       FeaturePtr aFeature = ModelAPI_Feature::feature(aObject);
       if (aFeature) {
         std::string aId = aFeature->getKind();
@@ -676,7 +680,8 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th
                           new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi);
     aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch());
     aWgt = aShapeSelectorWgt;
-  } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
+  }
+  else if (theType == WDG_DOUBLEVALUE_EDITOR) {
     aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi);
   } else if (theType == "export_file_selector") {
     aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi);
@@ -797,6 +802,11 @@ void PartSet_Module::editFeature(FeaturePtr theFeature)
   ModuleBase_IModule::editFeature(theFeature);
 }
 
+bool PartSet_Module::canCommitOperation() const
+{
+  return true;
+}
+
 void PartSet_Module::launchOperation(const QString& theCmdId)
 {
   storeConstraintsState(theCmdId.toStdString());
@@ -1002,6 +1012,11 @@ void PartSet_Module::onActiveDocPopup(const QPoint& thePnt)
   aMenu.exec(aHeader->mapToGlobal(thePnt));
 }
 
+Handle(AIS_InteractiveObject) PartSet_Module::createPresentation(const ResultPtr& theResult)
+{
+  return mySketchMgr->createPresentation(theResult);
+}
+
 
 ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const
 {
@@ -1025,6 +1040,17 @@ ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const
   return anObject;
 }
 
+bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const
+{
+  bool aCanBeShaged = true;
+
+  Handle(PartSet_ResultSketchPrs) aPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theAIS);
+  if (!aPrs.IsNull()) 
+    aCanBeShaged = false;
+
+  return aCanBeShaged;
+}
+
 void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
 {
   QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();
@@ -1037,9 +1063,9 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
     bool hasResult = false;
     bool hasFeature = false;
     bool hasParameter = false;
-    bool hasSubFeature = false;
-    ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature);
-
+    bool hasCompositeOwner = false;
+    ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
+                                   hasCompositeOwner);
     ObjectPtr aObject = aObjects.first();
     if (aObject) {
       ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);