X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetSketchLabel.cpp;h=e87806f74e8e236579e55c4ae75a7aafc7561495;hb=32208dedf0b2b5bd50b5b86c464f37a8e0eb07d0;hp=6f746483e868be959065c53ac8490da51f0374da;hpb=954b7aef79339fdd1e189ad3ed846ec0010af079;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetSketchLabel.cpp b/src/PartSet/PartSet_WidgetSketchLabel.cpp index 6f746483e..e87806f74 100644 --- a/src/PartSet/PartSet_WidgetSketchLabel.cpp +++ b/src/PartSet/PartSet_WidgetSketchLabel.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include #include @@ -51,11 +52,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 +80,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 +101,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 +118,8 @@ PartSet_WidgetSketchLabel::PartSet_WidgetSketchLabel(QWidget* theParent, myViewInverted = new QCheckBox(tr("Reversed"), aViewBox); aViewLayout->addWidget(myViewInverted); - QPushButton* aSetViewBtn = new QPushButton(QIcon(":icons/plane_view.png"), tr("Set plane view"), aViewBox); + 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); @@ -132,7 +154,7 @@ PartSet_WidgetSketchLabel::~PartSet_WidgetSketchLabel() { } -bool PartSet_WidgetSketchLabel::setSelection(QList& theValues, +bool PartSet_WidgetSketchLabel::setSelection(QList& theValues, const bool theToValidate) { // do not use the given selection if the plane of the sketch has been already set. @@ -141,7 +163,7 @@ bool PartSet_WidgetSketchLabel::setSelection(QList& theVal if (plane().get()) return true; - ModuleBase_ViewerPrs aPrs = theValues.first(); + ModuleBase_ViewerPrsPtr aPrs = theValues.first(); bool aDone = setSelectionInternal(theValues, theToValidate); if (aDone) updateByPlaneSelected(aPrs); @@ -157,11 +179,11 @@ QList PartSet_WidgetSketchLabel::getControls() const void PartSet_WidgetSketchLabel::onSelectionChanged() { - QList aSelected = getFilteredSelected(); + QList aSelected = getFilteredSelected(); if (aSelected.empty()) return; - ModuleBase_ViewerPrs aPrs = aSelected.first(); + ModuleBase_ViewerPrsPtr aPrs = aSelected.first(); bool aDone = setSelectionInternal(aSelected, false); if (aDone) { updateByPlaneSelected(aPrs); @@ -187,10 +209,11 @@ void PartSet_WidgetSketchLabel::onShowConstraint(bool theOn) emit showConstraintToggled(aState, theOn); } -void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isFlushesActived, +void PartSet_WidgetSketchLabel::blockAttribute(const AttributePtr& theAttribute, + const bool& theToBlock, bool& isFlushesActived, bool& isAttributeSetInitializedBlocked) { - ModuleBase_WidgetValidated::blockAttribute(theToBlock, isFlushesActived, + ModuleBase_WidgetValidated::blockAttribute(theAttribute, theToBlock, isFlushesActived, isAttributeSetInitializedBlocked); // 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 @@ -208,19 +231,20 @@ void PartSet_WidgetSketchLabel::blockAttribute(const bool& theToBlock, bool& isF } } -bool PartSet_WidgetSketchLabel::setSelectionInternal(const QList& theValues, - const bool theToValidate) +bool PartSet_WidgetSketchLabel::setSelectionInternal( + const QList& theValues, + const bool theToValidate) { bool aDone = false; - ModuleBase_ViewerPrs aValue; if (theValues.empty()) { // In order to make reselection possible, set empty object and shape should be done - setSelectionCustom(ModuleBase_ViewerPrs()); + setSelectionCustom(std::shared_ptr( + new ModuleBase_ViewerPrs(ObjectPtr(), GeomShapePtr(), NULL))); aDone = false; } else { // it removes the processed value from the parameters list - aValue = theValues.first();//.takeFirst(); + ModuleBase_ViewerPrsPtr aValue = theValues.first();//.takeFirst(); if (!theToValidate || isValidInFilters(aValue)) aDone = setSelectionCustom(aValue); } @@ -228,12 +252,12 @@ bool PartSet_WidgetSketchLabel::setSelectionInternal(const QListerasePreviewPlanes(myWorkshop); // 2. if the planes were displayed, change the view projection - const GeomShapePtr& aShape = thePrs.shape(); + const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aGShape; std::shared_ptr aBaseShape; @@ -256,7 +280,8 @@ void PartSet_WidgetSketchLabel::updateByPlaneSelected(const ModuleBase_ViewerPrs } if (aGShape.get() != NULL) { // get plane parameters - std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); + std::shared_ptr aFace(new GeomAPI_Face(aGShape)); + std::shared_ptr aPlane = aFace->getPlane(); std::shared_ptr aDir = aPlane->direction(); gp_XYZ aXYZ = aDir->impl().XYZ(); double aTwist = 0.0; @@ -268,27 +293,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 planes", "rotate_to_plane", "false"); + bool aRotate = Config_PropManager::boolean(SKETCH_TAB_NAME, "rotate_to_plane", "false"); 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); + } + } + } } // 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 @@ -318,14 +355,15 @@ void PartSet_WidgetSketchLabel::enableFocusProcessing() myStackWidget->installEventFilter(this); } -void PartSet_WidgetSketchLabel::storeAttributeValue() +void PartSet_WidgetSketchLabel::storeAttributeValue(const AttributePtr& theAttribute) { - ModuleBase_WidgetValidated::storeAttributeValue(); + ModuleBase_WidgetValidated::storeAttributeValue(theAttribute); } -void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) +void PartSet_WidgetSketchLabel::restoreAttributeValue(const AttributePtr& theAttribute, + const bool theValid) { - ModuleBase_WidgetValidated::restoreAttributeValue(theValid); + ModuleBase_WidgetValidated::restoreAttributeValue(theAttribute, theValid); // it is not necessary to save the previous plane value because the plane is chosen once DataPtr aData = feature()->data(); @@ -338,16 +376,16 @@ void PartSet_WidgetSketchLabel::restoreAttributeValue(const bool theValid) } } -bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrs& thePrs) +bool PartSet_WidgetSketchLabel::setSelectionCustom(const ModuleBase_ViewerPrsPtr& thePrs) { return fillSketchPlaneBySelection(feature(), thePrs); } -bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs) +bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrsPtr& thePrs) { bool aCanFillSketch = true; // avoid any selection on sketch object - ObjectPtr anObject = thePrs.object(); + ObjectPtr anObject = thePrs->object(); ResultPtr aResult = std::dynamic_pointer_cast(anObject); if (aResult.get()) { FeaturePtr aFeature = ModelAPI_Feature::feature(aResult); @@ -357,17 +395,14 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs // check plane or planar face of any non-sketch object if (aCanFillSketch) { std::shared_ptr aGeomFace; - const TopoDS_Shape aShape = thePrs.shape(); - if (aShape.IsNull()) { - if (aResult.get()) { - GeomShapePtr aGeomShape = aResult->shape(); - std::shared_ptr aGeomFace(new GeomAPI_Face(aGeomShape)); - aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar(); - } + + GeomShapePtr aGeomShape = thePrs->shape(); + if ((!aGeomShape.get() || aGeomShape->isNull()) && aResult.get()) { + aGeomShape = aResult->shape(); } - else if (aShape.ShapeType() == TopAbs_FACE) { - std::shared_ptr aGeomFace(new GeomAPI_Face()); - aGeomFace->setImpl(new TopoDS_Shape(aShape)); + + if (aGeomShape.get() && aGeomShape->shapeType() == GeomAPI_Shape::FACE) { + std::shared_ptr aGeomFace(new GeomAPI_Face(aGeomShape)); aCanFillSketch = aGeomFace.get() && aGeomFace->isPlanar(); } else @@ -377,20 +412,20 @@ bool PartSet_WidgetSketchLabel::canFillSketch(const ModuleBase_ViewerPrs& thePrs } bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& theFeature, - const ModuleBase_ViewerPrs& thePrs) + const ModuleBase_ViewerPrsPtr& thePrs) { bool isOwnerSet = false; - const GeomShapePtr& aShape = thePrs.shape(); + const GeomShapePtr& aShape = thePrs->shape(); std::shared_ptr aDir; - if (thePrs.object() && (theFeature != thePrs.object())) { + if (thePrs->object() && (theFeature != thePrs->object())) { DataPtr aData = theFeature->data(); - AttributeSelectionPtr aSelAttr = + AttributeSelectionPtr aSelAttr = std::dynamic_pointer_cast (aData->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())); if (aSelAttr) { - ResultPtr aRes = std::dynamic_pointer_cast(thePrs.object()); + ResultPtr aRes = std::dynamic_pointer_cast(thePrs->object()); if (aRes) { GeomShapePtr aShapePtr(new GeomAPI_Shape()); if (!aShape.get() || aShape->isNull()) { // selection happens in the OCC viewer @@ -408,7 +443,7 @@ bool PartSet_WidgetSketchLabel::fillSketchPlaneBySelection(const FeaturePtr& the } else if (aShape.get() && !aShape->isNull()) { const TopoDS_Shape& aTDShape = aShape->impl(); - aDir = setSketchPlane(aTDShape); + aDir = setSketchPlane(theFeature, aTDShape); isOwnerSet = aDir.get(); } return isOwnerSet; @@ -425,10 +460,20 @@ void PartSet_WidgetSketchLabel::activateCustom() myStackWidget->setCurrentIndex(0); bool aBodyIsVisualized = myPreviewPlanes->hasVisualizedBodies(myWorkshop); + + // Clear previous selection mode It is necessary for correct activation of preview planes + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(myWorkshop); + XGUI_Displayer* aDisp = aWorkshop->displayer(); + aDisp->activateObjects(QIntList(), aDisp->displayedObjects(), false); + if (!aBodyIsVisualized) { // We have to select a plane before any operation myPreviewPlanes->showPreviewPlanes(myWorkshop); + mySizeOfViewWidget->setVisible(true); } + else + mySizeOfViewWidget->setVisible(false); + activateSelection(true); //myLabel->setText(myText); @@ -482,7 +527,8 @@ std::shared_ptr PartSet_WidgetSketchLabel::setSketchPlane(const Fea // get plane parameters - std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aGShape); + std::shared_ptr aFace(new GeomAPI_Face(aGShape)); + std::shared_ptr aPlane = aFace->getPlane(); if (!aPlane.get()) return std::shared_ptr();