X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=d3908d81e0e350937d88b90f512c7156dd2fe35d;hb=ade68d25465a422af49d71881550bd89a2ecb824;hp=33872cf953c52049b9df41ba9d6b3b71c3aa2346;hpb=d4229cf0e4819ef684866a59e18a82e57f0092b0;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 33872cf95..d3908d81e 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_WidgetSketchLabel.cpp -// Created: 07 July 2014 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Tools.h" @@ -34,6 +48,8 @@ #include #include #include +#include +#include #include #include @@ -44,6 +60,7 @@ #include #include #include +#include #include #include @@ -51,11 +68,17 @@ #include #include #include +#include #include #include #include #include +#include +#include +#ifndef DBL_MAX +#define DBL_MAX 1.7976931348623158e+308 +#endif PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, @@ -73,6 +96,18 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, // Define label for plane selection QWidget* aFirstWgt = new QWidget(this); + // Size of the View control + mySizeOfViewWidget = new QWidget(aFirstWgt); + QHBoxLayout* aSizeLayout = new QHBoxLayout(mySizeOfViewWidget); + aSizeLayout->addWidget(new QLabel("Size of the view", mySizeOfViewWidget)); + mySizeOfView = new QLineEdit(mySizeOfViewWidget); + + QDoubleValidator* aValidator = new QDoubleValidator(0, DBL_MAX, 12, mySizeOfView); + aValidator->setLocale(ModuleBase_Tools::doubleLocale()); + aValidator->setNotation(QDoubleValidator::StandardNotation); + mySizeOfView->setValidator(aValidator); + aSizeLayout->addWidget(mySizeOfView); + QString aText = QString::fromStdString(theData->getProperty("title")); QLabel* aLabel = new QLabel(aText, aFirstWgt); aLabel->setWordWrap(true); @@ -82,7 +117,9 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, aLayout = new QVBoxLayout(aFirstWgt); ModuleBase_Tools::zeroMargins(aLayout); + aLayout->addWidget(mySizeOfViewWidget); aLayout->addWidget(aLabel); + aLayout->addStretch(1); myStackWidget->addWidget(aFirstWgt); @@ -97,7 +134,7 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, myViewInverted = new QCheckBox(tr("Reversed"), aViewBox); aViewLayout->addWidget(myViewInverted); - QPushButton* aSetViewBtn = + 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); @@ -190,10 +227,12 @@ void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn) void PartSet_WidgetSketchLabel::blockAttribute(const AttributePtr& theAttribute, const bool& theToBlock, bool& isFlushesActived, - bool& isAttributeSetInitializedBlocked) + bool& isAttributeSetInitializedBlocked, + bool& isAttributeSendUpdatedBlocked) { ModuleBase_WidgetValidated::blockAttribute(theAttribute, theToBlock, isFlushesActived, - isAttributeSetInitializedBlocked); + isAttributeSetInitializedBlocked, + isAttributeSendUpdatedBlocked); // We do not restore the previous state of isAttributeSetInitializedBlocked for each of // attributes. It it is necessary, these states should be append to the method attributes // or stored in the widget @@ -233,12 +272,17 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal( void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrsPtr& thePrs) { - // 1. hide main planes if they have been displayed + // 1. hide main planes if they have been displayed and display sketch preview plane myPreviewPlanes->erasePreviewPlanes(myWorkshop); + + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) { + CompositeFeaturePtr aSketch = std::dynamic_pointer_cast(myFeature); + aModule->sketchMgr()->previewSketchPlane()->createSketchPlane(aSketch, myWorkshop); + } // 2. if the planes were displayed, change the view projection const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aGShape; - std::shared_ptr aBaseShape; DataPtr aData = feature()->data(); AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast @@ -247,20 +291,34 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs // selection happens in OCC viewer if (aShape.get() && !aShape->isNull()) { aGShape = aShape; - - if (aSelAttr && aSelAttr->context()) { - aBaseShape = aSelAttr->context()->shape(); - } } else { // selection happens in OCC viewer(on body) of in the OB browser if (aSelAttr) { aGShape = aSelAttr->value(); } } + // If the selected object is a sketch then use its plane + std::shared_ptr aPlane; + ObjectPtr aObj = thePrs->object(); + // obsolete as selected sketch is stored in external attribute + /*if (aObj.get()) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); + if (aFeature.get() && (aFeature != feature())) { + if (aFeature->getKind() == SketchPlugin_Sketch::ID()) { + CompositeFeaturePtr aSketch = + std::dynamic_pointer_cast(aFeature); + aPlane = PartSet_Tools::sketchPlane(aSketch); + } + } + }*/ if (aGShape.get() != NULL) { // get plane parameters - std::shared_ptr aFace(new GeomAPI_Face(aGShape)); - std::shared_ptr aPlane = aFace->getPlane(); + if (!aPlane.get()) { + std::shared_ptr aFace(new GeomAPI_Face(aGShape)); + aPlane = aFace->getPlane(); + } + if (!aPlane.get()) + return; std::shared_ptr aDir = aPlane->direction(); gp_XYZ aXYZ = aDir->impl().XYZ(); double aTwist = 0.0; @@ -272,27 +330,39 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs // 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_TAB_NAME, "rotate_to_plane", "false"); + bool aRotate = Config_PropManager::boolean(SKETCH_TAB_NAME, "rotate_to_plane"); if (aRotate) { myWorkshop->viewer()->setViewProjection(aXYZ.X(), aXYZ.Y(), aXYZ.Z(), aTwist); - PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); - if (aModule) - aModule->onViewTransformed(); } + QString aSizeOfViewStr = mySizeOfView->text(); + if (!aSizeOfViewStr.isEmpty()) { + bool isOk; + double aSizeOfView = aSizeOfViewStr.toDouble(&isOk); + if (isOk && aSizeOfView > 0) { + Handle(V3d_View) aView3d = myWorkshop->viewer()->activeView(); + if (!aView3d.IsNull()) { + Bnd_Box aBndBox; + double aHalfSize = aSizeOfView/2.0; + aBndBox.Update(-aHalfSize, -aHalfSize, -aHalfSize, aHalfSize, aHalfSize, aHalfSize); + aView3d->FitAll(aBndBox, 0.01, false); + } + } + } + PartSet_Module* aModule = dynamic_cast(myWorkshop->module()); + if (aModule) + aModule->onViewTransformed(); } // 3. Clear text in the label myStackWidget->setCurrentIndex(1); //myLabel->setText(""); //myLabel->setToolTip(""); XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); - disconnect(aWorkshop->selector(), SIGNAL(selectionChanged()), + disconnect(aWorkshop->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); // 4. deactivate face selection filter activateFilters(false); // 5. Clear selection mode and define sketching mode - //XGUI_Displayer* aDisp = aWorkshop->displayer(); - //aDisp->closeLocalContexts(); emit planeSelected(plane()); // after the plane is selected in the sketch, the sketch selection should be activated // it can not be performed in the sketch label widget because, we don't need to switch off @@ -301,7 +371,9 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs // 6. Update sketcher actions XGUI_ActionsMgr* anActMgr = aWorkshop->actionsMgr(); + myWorkshop->updateCommandStatus(); + aWorkshop->selector()->clearSelection(); myWorkshop->viewer()->update(); } @@ -345,7 +417,7 @@ void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAtt bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { - return fillSketchPlaneBySelection(feature(), thePrs); + return fillSketchPlaneBySelection(thePrs); } bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrsPtr& thePrs) @@ -378,17 +450,17 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrsPtr& the return aCanFillSketch; } -bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& theFeature, - const ModuleBase_ViewerPrsPtr& thePrs) +bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const ModuleBase_ViewerPrsPtr& thePrs) { bool isOwnerSet = false; const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aDir; - if (thePrs->object() && (theFeature != thePrs->object())) { - DataPtr aData = theFeature->data(); - AttributeSelectionPtr aSelAttr = + if (thePrs->object() && (feature() != thePrs->object())) { + FeaturePtr aFeature = ModelAPI_Feature::feature(thePrs->object()); + DataPtr aData = feature()->data(); + AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); if (aSelAttr) { @@ -410,7 +482,7 @@ bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& the } else if (aShape.get() && !aShape->isNull()) { const TopoDS_Shape& aTDShape = aShape->impl(); - aDir = setSketchPlane(theFeature, aTDShape); + aDir = setSketchPlane(aTDShape); isOwnerSet = aDir.get(); } return isOwnerSet; @@ -436,11 +508,12 @@ void PartSet_WidgetSketchLabel::activateCustom() if (!aBodyIsVisualized) { // We have to select a plane before any operation myPreviewPlanes->showPreviewPlanes(myWorkshop); + mySizeOfViewWidget->setVisible(true); } - activateSelection(true); + else + mySizeOfViewWidget->setVisible(false); - //myLabel->setText(myText); - //myLabel->setToolTip(myTooltip); + activateSelection(true); connect(XGUI_Tools::workshop(myWorkshop)->selector(), SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); @@ -477,8 +550,8 @@ void PartSet_WidgetSketchLabel::activateSelection(bool toActivate) } -std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const FeaturePtr& theFeature, - const TopoDS_Shape& theShape) +std::shared_ptr + PartSet_WidgetSketchLabel::setSketchPlane(const TopoDS_Shape& theShape) { if (theShape.IsNull()) return std::shared_ptr(); @@ -487,18 +560,21 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Fea std::shared_ptr aGShape(new GeomAPI_Shape); aGShape->setImpl(new TopoDS_Shape(theShape)); - - // get plane parameters std::shared_ptr aFace(new GeomAPI_Face(aGShape)); std::shared_ptr aPlane = aFace->getPlane(); if (!aPlane.get()) return std::shared_ptr(); + return setSketchPlane(aPlane); +} +std::shared_ptr + PartSet_WidgetSketchLabel::setSketchPlane(std::shared_ptr thePlane) +{ // set plane parameters to feature - std::shared_ptr aData = theFeature->data(); + std::shared_ptr aData = feature()->data(); double anA, aB, aC, aD; - aPlane->coefficients(anA, aB, aC, aD); + thePlane->coefficients(anA, aB, aC, aD); // calculate attributes of the sketch std::shared_ptr aNormDir(new GeomAPI_Dir(anA, aB, aC)); @@ -508,7 +584,7 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Fea std::shared_ptr anOrigPnt(new GeomAPI_Pnt(aCoords)); // X axis is preferable to be dirX on the sketch const double tol = Precision::Confusion(); - bool isX = fabs(anA - 1.0) < tol && fabs(aB) < tol && fabs(aC) < tol; + bool isX = fabs(fabs(anA) - 1.0) < tol && fabs(aB) < tol && fabs(aC) < tol; std::shared_ptr aTempDir( isX ? new GeomAPI_Dir(0, 1, 0) : new GeomAPI_Dir(1, 0, 0)); std::shared_ptr aYDir(new GeomAPI_Dir(aNormDir->cross(aTempDir))); @@ -523,7 +599,7 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Fea std::shared_ptr aDirX = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Sketch::DIRX_ID())); aDirX->setValue(aXDir); - std::shared_ptr aDir = aPlane->direction(); + std::shared_ptr aDir = thePlane->direction(); return aDir; } @@ -541,3 +617,47 @@ void PartSet_WidgetSketchLabel::onSetPlaneView() aModule->onViewTransformed(); } } + + +//****************************************************** +QList> PartSet_WidgetSketchLabel::findCircularEdgesInPlane() +{ + QList> aResult; + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + XGUI_Displayer* aDisplayer = aWorkshop->displayer(); + QObjectPtrList aDispObjects = aDisplayer->displayedObjects(); + + std::shared_ptr aPlane = plane(); + foreach(ObjectPtr aObj, aDispObjects) { + ResultPtr aResObj = std::dynamic_pointer_cast(aObj); + if (aResObj.get()) { + GeomShapePtr aShape = aResObj->shape(); + if (aShape.get()) { + GeomAPI_ShapeExplorer aExplorer(aShape, GeomAPI_Shape::EDGE); + for(; aExplorer.more(); aExplorer.next()) { + GeomShapePtr aEdgeShape = aExplorer.current(); + GeomAPI_Edge anEdge(aEdgeShape); + if ((anEdge.isCircle() || anEdge.isArc() || anEdge.isEllipse()) && + anEdge.isInPlane(aPlane)) { + bool isContains = false; + // Check that edge is not used. + // It is possible that the same edge will be taken from different faces + foreach(std::shared_ptr aPrs, aResult) { + GeomAPI_Edge aUsedEdge(aPrs->shape()); + if (aUsedEdge.isEqual(aEdgeShape)) { + isContains = true; + break; + } + } + if (!isContains) { + std::shared_ptr + aPrs(new ModuleBase_ViewerPrs(aResObj, aEdgeShape)); + aResult.append(aPrs); + } + } + } + } + } + } + return aResult; +}