X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e70a8a0975dedcdab221a48d4d8c8ad9fae1e85f;hb=a731f82dccbfdb67cbf8e8d617222a4d3e32018a;hp=afe12cd2d39ce60e64dc1994fcb02387218cf796;hpb=a2686c838648dcf05659df3c31d9b90aca42b792;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index afe12cd2d..e70a8a097 100644
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -7,6 +7,8 @@
 #include "PartSet_WidgetSketchLabel.h"
 #include "PartSet_Tools.h"
 
+#include "SketchPlugin_SketchEntity.h"
+
 #include <XGUI_Workshop.h>
 #include <XGUI_Displayer.h>
 #include <XGUI_SelectionMgr.h>
@@ -16,6 +18,8 @@
 
 #include <ModuleBase_Operation.h>
 #include <ModuleBase_ViewerPrs.h>
+#include <ModuleBase_Tools.h>
+#include <ModuleBase_IModule.h>
 
 #include <GeomAlgoAPI_FaceBuilder.h>
 #include <GeomDataAPI_Point.h>
@@ -37,15 +41,15 @@
 #include <QLabel>
 #include <QTimer>
 #include <QApplication>
-
-#define PLANE_SIZE          "200"     
-#define SKETCH_WIDTH        "4"
+#include <QVBoxLayout>
 
 
 PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
                                                      const Config_WidgetAPI* theData,
                                                      const std::string& theParentId)
-    : ModuleBase_ModelWidget(theParent, theData, theParentId), myPreviewDisplayed(false)
+    : ModuleBase_WidgetValidated(theParent, theData, theParentId),
+      myPreviewDisplayed(false),
+      myWorkshop(NULL)
 {
   myText = QString::fromStdString(theData->getProperty("title"));
   myLabel = new QLabel("", theParent);
@@ -57,6 +61,11 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
   mySelectionTimer = new QTimer(this);
   connect(mySelectionTimer, SIGNAL(timeout()), SLOT(setSketchingMode()));
   mySelectionTimer->setSingleShot(true);
+
+  QVBoxLayout* aLayout = new QVBoxLayout(this);
+  ModuleBase_Tools::zeroMargins(aLayout);
+  aLayout->addWidget(myLabel);
+  setLayout(aLayout);
 }
 
 PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
@@ -66,51 +75,50 @@ PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
 
 QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 {
-  return QList<QWidget*>();
-}
-
-QWidget* PartSet_WidgetSketchLabel::getControl() const
-{
-  return myLabel;
+  QList<QWidget*> aResult;
+  aResult << myLabel;
+  return aResult;
 }
 
 void PartSet_WidgetSketchLabel::onPlaneSelected()
 {
+
   XGUI_Selection* aSelection = myWorkshop->selector()->selection();
   QList<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
   if (!aSelected.empty()) {
     ModuleBase_ViewerPrs aPrs = aSelected.first();
-    TopoDS_Shape aShape = aPrs.shape();
-    if (!aShape.IsNull()) {
-      std::shared_ptr<GeomAPI_Dir> aDir = setSketchPlane(aShape);
-      if (aDir) {
-        erasePreviewPlanes();
+    Handle(SelectMgr_EntityOwner) anOwner = aSelected.first().owner();
+    if (isValid(anOwner)) {
+      setSelection(anOwner);
 
-        if (aPrs.object() && (feature() != aPrs.object())) {
-          DataPtr aData = feature()->data();
-          AttributeSelectionPtr aSelAttr = 
-            std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
-            (aData->attribute(SketchPlugin_Feature::EXTERNAL_ID()));
-          if (aSelAttr) {
-            ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs.object());
-            if (aRes) {
-              GeomShapePtr aShapePtr(new GeomAPI_Shape());
-              aShapePtr->setImpl(new TopoDS_Shape(aShape));
-              aSelAttr->setValue(aRes, aShapePtr);
-            }
+      TopoDS_Shape aShape = aPrs.shape();
+      if (!aShape.IsNull()) {
+        erasePreviewPlanes();
+        DataPtr aData = feature()->data();
+        AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+                                  (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+        if (aSelAttr) {
+          GeomShapePtr aShapePtr = aSelAttr->value();
+          if (aShapePtr.get() == NULL || aShapePtr->isNull()) {
+            std::shared_ptr<GeomAPI_Shape> aGShape(new GeomAPI_Shape);
+            aGShape->setImpl(new TopoDS_Shape(aShape));
+            // get plane parameters
+            std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
+            std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
+
+            myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
           }
-        } else
-          myWorkshop->viewer()->setViewProjection(aDir->x(), aDir->y(), aDir->z());
+        }
 
         // Clear text in the label
         myLabel->setText("");
         myLabel->setToolTip("");
         disconnect(myWorkshop->selector(), SIGNAL(selectionChanged()), 
                    this, SLOT(onPlaneSelected()));
+        activateFilters(myWorkshop->module()->workshop(), false);
 
         // Clear selection mode and define sketching mode
-        XGUI_Displayer* aDisp = myWorkshop->displayer();
-        aDisp->removeSelectionFilter(myFaceFilter);
+        //XGUI_Displayer* aDisp = myWorkshop->displayer();
         //aDisp->closeLocalContexts();
         emit planeSelected(plane());
         setSketchingMode();
@@ -131,12 +139,74 @@ std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
 
 }
 
+bool PartSet_WidgetSketchLabel::focusTo()
+{
+  myLabel->setFocus();
+  return true;
+}
+
+void PartSet_WidgetSketchLabel::enableFocusProcessing()
+{
+  myLabel->installEventFilter(this);
+}
+
+void PartSet_WidgetSketchLabel::storeAttributeValue()
+{
+}
+
+void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid)
+{
+  // it is not necessary to save the previous plane value because the plane is chosen once
+  DataPtr aData = feature()->data();
+  AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+    (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+  if (aSelAttr) {
+    ResultPtr anEmptyResult;
+    GeomShapePtr anEmptyShape;
+    aSelAttr->setValue(anEmptyResult, anEmptyShape);
+  }
+}
+
+bool PartSet_WidgetSketchLabel::setSelection(const Handle_SelectMgr_EntityOwner& theOwner)
+{
+  bool isOwnerSet = false;
+
+  ModuleBase_ViewerPrs aPrs;
+  myWorkshop->selector()->selection()->fillPresentation(aPrs, theOwner);
+
+  const TopoDS_Shape& aShape = aPrs.shape();
+  std::shared_ptr<GeomAPI_Dir> aDir;
+
+  if (aPrs.object() && (feature() != aPrs.object())) {
+    DataPtr aData = feature()->data();
+    AttributeSelectionPtr aSelAttr = 
+      std::dynamic_pointer_cast<ModelAPI_AttributeSelection>
+      (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID()));
+    if (aSelAttr) {
+      ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs.object());
+      if (aRes) {
+        GeomShapePtr aShapePtr(new GeomAPI_Shape());
+        aShapePtr->setImpl(new TopoDS_Shape(aShape));
+        aSelAttr->setValue(aRes, aShapePtr);
+        isOwnerSet = true;
+      }
+    }
+  }
+  else if (!aShape.IsNull()) {
+    aDir = setSketchPlane(aShape);
+    isOwnerSet = aDir;
+  }
+  return isOwnerSet;
+}
+
 void PartSet_WidgetSketchLabel::activateCustom()
 {
   std::shared_ptr<GeomAPI_Pln> aPlane = plane();
   if (aPlane) {
     //setSketchingMode();
     // In order to avoid Opening/Closing of context too often
+    // it can be useful for a delay on the property panel filling
+    // it is possible that it is not necessary anymore, but it requires a check
     mySelectionTimer->start(20);
   } else {
     // We have to select a plane before any operation
@@ -145,9 +215,6 @@ void PartSet_WidgetSketchLabel::activateCustom()
     XGUI_Displayer* aDisp = myWorkshop->displayer();
     //aDisp->openLocalContext();
     //aDisp->activateObjects(QIntList());
-    if (myFaceFilter.IsNull())
-      myFaceFilter = new StdSelect_FaceFilter(StdSelect_Plane);
-    aDisp->addSelectionFilter(myFaceFilter);
     QIntList aModes;
     aModes << TopAbs_FACE;
     aDisp->activateObjects(aModes);
@@ -156,6 +223,8 @@ void PartSet_WidgetSketchLabel::activateCustom()
     myLabel->setToolTip(myTooltip);
 
     connect(myWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onPlaneSelected()));
+    activateFilters(myWorkshop->module()->workshop(), true);
+
     aDisp->updateViewer();
   }
 }
@@ -164,9 +233,7 @@ void PartSet_WidgetSketchLabel::deactivate()
 {
   // Do not set selection mode if the widget was activated for a small moment 
   mySelectionTimer->stop();
-  XGUI_Displayer* aDisp = myWorkshop->displayer();
-  aDisp->removeSelectionFilter(myFaceFilter);
-  //aDisp->removeSelectionFilter(mySketchFilter);
+  //XGUI_Displayer* aDisp = myWorkshop->displayer();
   //aDisp->closeLocalContexts();
   erasePreviewPlanes();
 }
@@ -194,9 +261,16 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes()
     std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, 1, 0));
     std::shared_ptr<GeomAPI_Dir> aXYDir(new GeomAPI_Dir(0, 0, 1));
 
-    int aR[] = {255, 0, 0};
-    int aG[] = {0, 255, 0};
-    int aB[] = {0, 0, 255};
+    std::vector<int> aYZRGB, aXZRGB, aXYRGB;
+    aYZRGB = Config_PropManager::color("Visualization", "yz_plane_color",
+                                                        YZ_PLANE_COLOR);
+    aXZRGB = Config_PropManager::color("Visualization", "xz_plane_color",
+                                                        XZ_PLANE_COLOR);
+    aXYRGB = Config_PropManager::color("Visualization", "xy_plane_color",
+                                                        XY_PLANE_COLOR);
+    int aR[] = {aYZRGB[0], aYZRGB[1], aYZRGB[2]};
+    int aG[] = {aXZRGB[0], aXZRGB[1], aXZRGB[2]};
+    int aB[] = {aXYRGB[0], aXYRGB[1], aXYRGB[2]};
 
     myYZPlane = createPreviewPlane(anOrigin, aYZDir, aR);
     myXZPlane = createPreviewPlane(anOrigin, aXZDir, aG);
@@ -214,7 +288,7 @@ AISObjectPtr PartSet_WidgetSketchLabel::createPreviewPlane(std::shared_ptr<GeomA
                                                            std::shared_ptr<GeomAPI_Dir> theNorm, 
                                                            const int theRGB[3])
 {
-  double aSize = Config_PropManager::integer("Sketch planes", "Size of planes", PLANE_SIZE);
+  double aSize = Config_PropManager::integer("Sketch planes", "planes_size", PLANE_SIZE);
   std::shared_ptr<GeomAPI_Shape> aFace = GeomAlgoAPI_FaceBuilder::square(theOrigin, theNorm, aSize);
   AISObjectPtr aAIS = AISObjectPtr(new GeomAPI_AISObject());
   aAIS->createShape(aFace);
@@ -264,9 +338,6 @@ std::shared_ptr<GeomAPI_Dir> PartSet_WidgetSketchLabel::setSketchPlane(const Top
   std::shared_ptr<GeomDataAPI_Dir> aDirX = std::dynamic_pointer_cast<GeomDataAPI_Dir>(
       aData->attribute(SketchPlugin_Sketch::DIRX_ID()));
   aDirX->setValue(aXDir);
-  std::shared_ptr<GeomDataAPI_Dir> aDirY = std::dynamic_pointer_cast<GeomDataAPI_Dir>(
-      aData->attribute(SketchPlugin_Sketch::DIRY_ID()));
-  aDirY->setValue(aYDir);
   std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
   return aDir;
 }