X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=b167f5a47d31f3afc287d0df3afee39e6442c80b;hb=0d9a107853208317a6352bb7f8c77eb54d5efbe1;hp=f0bfdc8a20b8a9985c67359e8620bd66f3ff819d;hpb=82d3fff7d0ed2c089da5aa6b106789be076081f3;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp
index f0bfdc8a2..b167f5a47 100644
--- a/src/PartSet/PartSet_WidgetSketchLabel.cpp
+++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp
@@ -6,6 +6,7 @@
 
 #include "PartSet_WidgetSketchLabel.h"
 #include "PartSet_Tools.h"
+#include "PartSet_Module.h"
 
 #include "SketchPlugin_SketchEntity.h"
 
@@ -26,7 +27,7 @@
 #include <ModelAPI_Tools.h>
 
 #include <GeomAlgoAPI_FaceBuilder.h>
-#include <GeomAlgoAPI_ShapeProps.h>
+#include <GeomAlgoAPI_ShapeTools.h>
 #include <GeomDataAPI_Point.h>
 #include <GeomDataAPI_Dir.h>
 #include <GeomAPI_XYZ.h>
@@ -34,7 +35,6 @@
 #include <SketchPlugin_Sketch.h>
 #include <SketcherPrs_Tools.h>
 
-#include <BRepClass3d_SolidClassifier.hxx>
 #include <Precision.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
@@ -49,6 +49,9 @@
 #include <QApplication>
 #include <QVBoxLayout>
 #include <QCheckBox>
+#include <QGroupBox>
+#include <QPushButton>
+#include <QStackedWidget>
 
 
 PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
@@ -59,28 +62,57 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent,
 : ModuleBase_WidgetValidated(theParent, theWorkshop, theData, theParentId),
   myPreviewDisplayed(false)
 {
-  myText = QString::fromStdString(theData->getProperty("title"));
-  myLabel = new QLabel("", theParent);
-  myLabel->setWordWrap(true);
-  myTooltip = QString::fromStdString(theData->getProperty("tooltip"));
-  myLabel->setToolTip("");
-  myLabel->setIndent(5);
-
   QVBoxLayout* aLayout = new QVBoxLayout(this);
   ModuleBase_Tools::zeroMargins(aLayout);
-  aLayout->addWidget(myLabel);
 
-  myShowConstraints = new QCheckBox(tr("Show constraints"), this);
-  aLayout->addWidget(myShowConstraints);
+  myStackWidget = new QStackedWidget(this);
+  myStackWidget->setContentsMargins(0,0,0,0);
+  aLayout->addWidget(myStackWidget);
+
+  // Define label for plane selection
+  QWidget* aFirstWgt = new QWidget(this);
+
+  QString aText = QString::fromStdString(theData->getProperty("title"));
+  QLabel* aLabel = new QLabel(aText, aFirstWgt);
+  aLabel->setWordWrap(true);
+  QString aTooltip = QString::fromStdString(theData->getProperty("tooltip"));
+  aLabel->setToolTip(aTooltip);
+  aLabel->setIndent(5);
+
+  aLayout = new QVBoxLayout(aFirstWgt);
+  ModuleBase_Tools::zeroMargins(aLayout);
+  aLayout->addWidget(aLabel);
+
+  myStackWidget->addWidget(aFirstWgt);
+
+  // Define widget for sketch manmagement
+  QWidget* aSecondWgt = new QWidget(this);
+  aLayout = new QVBoxLayout(aSecondWgt);
+  ModuleBase_Tools::zeroMargins(aLayout);
+
+  QGroupBox* aViewBox = new QGroupBox(tr("Sketcher plane"), this);
+  QVBoxLayout* aViewLayout = new QVBoxLayout(aViewBox);
+
+  myViewInverted = new QCheckBox(tr("Reversed"), aViewBox);
+  aViewLayout->addWidget(myViewInverted);
+
+  QPushButton* aSetViewBtn = new QPushButton(QIcon(":icons/plane_view.png"), tr("Set plane view"), aViewBox);
+  connect(aSetViewBtn, SIGNAL(clicked(bool)), this, SLOT(onSetPlaneView()));
+  aViewLayout->addWidget(aSetViewBtn);
+
+  aLayout->addWidget(aViewBox);
 
-  setLayout(aLayout);
+  myShowConstraints = new QCheckBox(tr("Show constraints"), this);
   connect(myShowConstraints, SIGNAL(toggled(bool)), this, SIGNAL(showConstraintToggled(bool)));
   myShowConstraints->setChecked(toShowConstraints);
+  aLayout->addWidget(myShowConstraints);
+
+  myStackWidget->addWidget(aSecondWgt);
+  //setLayout(aLayout);
 }
 
 PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel()
 {
-  erasePreviewPlanes();
 }
 
 bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theValues,
@@ -103,7 +135,7 @@ bool PartSet_WidgetSketchLabel::setSelection(QList<ModuleBase_ViewerPrs>& theVal
 QList<QWidget*> PartSet_WidgetSketchLabel::getControls() const
 {
   QList<QWidget*> aResult;
-  aResult << myLabel;
+  aResult << myStackWidget;
   return aResult;
 }
 
@@ -116,8 +148,10 @@ void PartSet_WidgetSketchLabel::onSelectionChanged()
   ModuleBase_ViewerPrs aPrs = aSelected.first();
 
   bool aDone = ModuleBase_WidgetValidated::setSelection(aSelected, false);
-  if (aDone)
+  if (aDone) {
     updateByPlaneSelected(aPrs);
+    updateObject(myFeature);
+  }
 }
 
 void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs& thePrs)
@@ -152,27 +186,27 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs
     std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
     std::shared_ptr<GeomAPI_Dir> aDir = aPlane->direction();
     gp_XYZ aXYZ = aDir->impl<gp_Dir>().XYZ();
-
-    // orienting projection
-    if(aBaseShape.get() != NULL) {
-      std::shared_ptr<GeomAPI_Pnt> aCenterPnt = GeomAlgoAPI_ShapeProps::centreOfMass(aGShape);
-      gp_Pnt aPnt = aCenterPnt->impl<gp_Pnt>();
-      aPnt.Translate(aDir->impl<gp_Dir>().XYZ() * (10 * Precision::Confusion()));
-
-      BRepClass3d_SolidClassifier aClassifier;
-      aClassifier.Load(aBaseShape->impl<TopoDS_Shape>());
-      aClassifier.Perform(aPnt, Precision::Confusion());
-
-      if(aClassifier.State() == TopAbs_IN) {
-        aXYZ.Reverse();
-      }
+    double aTwist = 0.0;
+
+    // orienting projection is not needed: it is done in GeomAlgoAPI_FaceBuilder::plane
+    /*if (aGShape->impl<TopoDS_Shape>().Orientation() == TopAbs_REVERSED) {
+      aXYZ.Reverse();
+    }*/
+
+    // Rotate view if the sketcher plane is selected only from preview planes
+    // Preview planes are created only if there is no any shape
+    bool aRotate = Config_PropManager::boolean("Sketch planes", "rotate_to_plane", "false");
+    if (aRotate) {
+      myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist);
+      PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
+      if (aModule)
+        aModule->onViewTransformed();
     }
-
-    myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z());
   }
   // 3. Clear text in the label
-  myLabel->setText("");
-  myLabel->setToolTip("");
+  myStackWidget->setCurrentIndex(1);
+  //myLabel->setText("");
+  //myLabel->setToolTip("");
   disconnect(workshop()->selector(), SIGNAL(selectionChanged()), 
               this, SLOT(onSelectionChanged()));
   // 4. deactivate face selection filter
@@ -189,7 +223,7 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs
 
   // 6. Update sketcher actions
   XGUI_ActionsMgr* anActMgr = workshop()->actionsMgr();
-  anActMgr->update();
+  myWorkshop->updateCommandStatus();
   myWorkshop->viewer()->update();
 }
 
@@ -197,26 +231,28 @@ std::shared_ptr<GeomAPI_Pln> PartSet_WidgetSketchLabel::plane() const
 {
   CompositeFeaturePtr aSketch = std::dynamic_pointer_cast<ModelAPI_CompositeFeature>(myFeature);
   return PartSet_Tools::sketchPlane(aSketch);
-
 }
 
 bool PartSet_WidgetSketchLabel::focusTo()
 {
-  myLabel->setFocus();
+  myStackWidget->setFocus();
   return true;
 }
 
 void PartSet_WidgetSketchLabel::enableFocusProcessing()
 {
-  myLabel->installEventFilter(this);
+  myStackWidget->installEventFilter(this);
 }
 
 void PartSet_WidgetSketchLabel::storeAttributeValue()
 {
+  ModuleBase_WidgetValidated::storeAttributeValue();
 }
 
 void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid)
 {
+  ModuleBase_WidgetValidated::restoreAttributeValue(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>
@@ -268,10 +304,12 @@ void PartSet_WidgetSketchLabel::activateCustom()
 {
   std::shared_ptr<GeomAPI_Pln> aPlane = plane();
   if (aPlane.get()) {
+    myStackWidget->setCurrentIndex(1);
     activateSelection(true);
     return;
   }
 
+  myStackWidget->setCurrentIndex(0);
   bool aBodyIsVisualized = false;
   XGUI_Displayer* aDisp = workshop()->displayer();
   QObjectPtrList aDisplayed = aDisp->displayedObjects();
@@ -290,17 +328,16 @@ void PartSet_WidgetSketchLabel::activateCustom()
   }
   activateSelection(true);
 
-  myLabel->setText(myText);
-  myLabel->setToolTip(myTooltip);
+  //myLabel->setText(myText);
+  //myLabel->setToolTip(myTooltip);
 
   connect(workshop()->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged()));
   activateFilters(true);
-
-  aDisp->updateViewer();
 }
 
 void PartSet_WidgetSketchLabel::deactivate()
 {
+  ModuleBase_ModelWidget::deactivate();
   erasePreviewPlanes();
   activateSelection(false);
 
@@ -344,7 +381,8 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes()
     // Create Preview
     std::shared_ptr<GeomAPI_Pnt> anOrigin(new GeomAPI_Pnt(0, 0, 0));
     std::shared_ptr<GeomAPI_Dir> aYZDir(new GeomAPI_Dir(1, 0, 0));
-    std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, 1, 0));
+    // -1, not 1 for correct internal sketch coords (issue 898)
+    std::shared_ptr<GeomAPI_Dir> aXZDir(new GeomAPI_Dir(0, -1, 0));
     std::shared_ptr<GeomAPI_Dir> aXYDir(new GeomAPI_Dir(0, 0, 1));
 
     std::vector<int> aYZRGB, aXZRGB, aXYRGB;
@@ -363,9 +401,9 @@ void PartSet_WidgetSketchLabel::showPreviewPlanes()
     myXYPlane = createPreviewPlane(anOrigin, aXYDir, aB);
   }
   XGUI_Displayer* aDisp = workshop()->displayer();
-  aDisp->displayAIS(myYZPlane, false);
-  aDisp->displayAIS(myXZPlane, false);
-  aDisp->displayAIS(myXYPlane, false);
+  aDisp->displayAIS(myYZPlane, true, false);
+  aDisp->displayAIS(myXZPlane, true, false);
+  aDisp->displayAIS(myXYPlane, true, false);
   myPreviewDisplayed = true;
 }
 
@@ -397,6 +435,8 @@ std::shared_ptr<GeomAPI_Dir> PartSet_WidgetSketchLabel::setSketchPlane(const Top
 
   // get plane parameters
   std::shared_ptr<GeomAPI_Pln> aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape);
+  if (!aPlane.get())
+    return std::shared_ptr<GeomAPI_Dir>();
 
   // set plane parameters to feature
   std::shared_ptr<ModelAPI_Data> aData = feature()->data();
@@ -441,3 +481,19 @@ XGUI_Workshop* PartSet_WidgetSketchLabel::workshop() const
   XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
   return aConnector->workshop();
 }
+
+
+void PartSet_WidgetSketchLabel::onSetPlaneView()
+{
+  std::shared_ptr<GeomAPI_Pln> aPlane = plane();
+  if (aPlane.get()) {
+    std::shared_ptr<GeomAPI_Dir> aDirection = aPlane->direction();
+    gp_Dir aDir = aDirection->impl<gp_Dir>();
+    if (myViewInverted->isChecked())
+      aDir.Reverse();
+    myWorkshop->viewer()->setViewProjection(aDir.X(), aDir.Y(), aDir.Z(), 0.);
+    PartSet_Module* aModule = dynamic_cast<PartSet_Module*>(myWorkshop->module());
+    if (aModule)
+      aModule->onViewTransformed();
+  }
+}