X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_OperationSketch.cpp;h=acd79461dc773c4fb58ba4c62a7b4c97329fe1e3;hb=5bac8bac0b4cd2e4520c0908b2863d747e411fb9;hp=dcce1c5fbe655d4b68068272086aa9accc9176aa;hpb=d7e03da669a038a5a47ce8c8d878d8c81cf3faa5;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_OperationSketch.cpp b/src/PartSet/PartSet_OperationSketch.cpp index dcce1c5fb..acd79461d 100644 --- a/src/PartSet/PartSet_OperationSketch.cpp +++ b/src/PartSet/PartSet_OperationSketch.cpp @@ -4,8 +4,8 @@ #include -#include -#include +#include +#include #include #include @@ -14,13 +14,15 @@ #include #include #include +#include #include #include #include #include -#include +#include +#include #include #include @@ -37,9 +39,8 @@ using namespace std; -PartSet_OperationSketch::PartSet_OperationSketch(const QString& theId, - QObject* theParent) -: PartSet_OperationSketchBase(theId, theParent) +PartSet_OperationSketch::PartSet_OperationSketch(const QString& theId, QObject* theParent) + : PartSet_OperationSketchBase(theId, theParent) { } @@ -47,7 +48,7 @@ PartSet_OperationSketch::~PartSet_OperationSketch() { } -std::list PartSet_OperationSketch::getSelectionModes(FeaturePtr theFeature) const +std::list PartSet_OperationSketch::getSelectionModes(ObjectPtr theFeature) const { std::list aModes; if (!hasSketchPlane()) @@ -58,9 +59,8 @@ std::list PartSet_OperationSketch::getSelectionModes(FeaturePtr theFeature) return aModes; } -void PartSet_OperationSketch::init(FeaturePtr theFeature, - const std::list& /*theSelected*/, - const std::list& /*theHighlighted*/) +/// Initializes the operation with previously created feature. It is used in sequental operations +void PartSet_OperationSketch::initFeature(FeaturePtr theFeature) { if (theFeature) setEditingFeature(theFeature); @@ -72,18 +72,10 @@ FeaturePtr PartSet_OperationSketch::sketch() const } void PartSet_OperationSketch::mousePressed(QMouseEvent* theEvent, Handle_V3d_View theView, - const std::list& theSelected, - const std::list& theHighlighted) + const std::list& theSelected, + const std::list& theHighlighted) { - if (!hasSketchPlane()) { - if (!theHighlighted.empty()) { - XGUI_ViewerPrs aPrs = theHighlighted.front(); - const TopoDS_Shape& aShape = aPrs.shape(); - if (!aShape.IsNull()) - setSketchPlane(aShape); - } - } - else { + if (hasSketchPlane()) { // if shift button is pressed and there are some already selected objects, the operation should // not be started. We just want to combine some selected objects. bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier); @@ -91,67 +83,78 @@ void PartSet_OperationSketch::mousePressed(QMouseEvent* theEvent, Handle_V3d_Vie return; if (theHighlighted.size() == 1) { - FeaturePtr aFeature = theHighlighted.front().feature(); - if (aFeature) - restartOperation(getOperationType(aFeature), aFeature); - } - else + ObjectPtr aFeature = theHighlighted.front().object(); + if (aFeature) { + std::string anOperationType = + (theSelected.size() > 1) ? + PartSet_OperationFeatureEditMulti::Type() : PartSet_OperationFeatureEdit::Type(); + restartOperation(anOperationType, aFeature); + } + } else myFeatures = theHighlighted; + } else { + if (!theHighlighted.empty()) { + ModuleBase_ViewerPrs aPrs = theHighlighted.front(); + const TopoDS_Shape& aShape = aPrs.shape(); + if (!aShape.IsNull()) + setSketchPlane(aShape); + } } } void PartSet_OperationSketch::mouseReleased(QMouseEvent* theEvent, Handle_V3d_View theView, - const std::list& theSelected, - const std::list& theHighlighted) + const std::list& theSelected, + const std::list& theHighlighted) { - if (!hasSketchPlane()) { - } - else { + if (hasSketchPlane()) { + /// TODO: OCC bug: 25034 - the highlighted list should be filled not only for AIS_Shape + /// but for other IO, for example constraint dimensions. + /// It is empty and we have to use the process mouse release to start edition operation + /// for these objects if (theSelected.size() == 1) { - FeaturePtr aFeature = theSelected.front().feature(); - if (aFeature) - restartOperation(getOperationType(aFeature), aFeature); + ObjectPtr aObject = theSelected.front().object(); + if (aObject) { + restartOperation(PartSet_OperationFeatureEdit::Type(), aObject); + } } } } void PartSet_OperationSketch::mouseMoved(QMouseEvent* theEvent, Handle(V3d_View) theView) { - if (!hasSketchPlane() || !(theEvent->buttons() & Qt::LeftButton) || myFeatures.empty()) + if (!hasSketchPlane() || !(theEvent->buttons() & Qt::LeftButton) || myFeatures.empty()) return; if (myFeatures.size() != 1) { FeaturePtr aFeature = PartSet_Tools::nearestFeature(theEvent->pos(), theView, feature(), myFeatures); if (aFeature) - restartOperation(getOperationType(aFeature), aFeature); + restartOperation(PartSet_OperationFeatureEditMulti::Type(), aFeature); } } -std::map > - PartSet_OperationSketch::subPreview() const +std::list PartSet_OperationSketch::subFeatures() const { - std::map > aPreviewMap; - - boost::shared_ptr aFeature; + std::list aFeaList; + FeaturePtr aFeature = feature(); + if (!aFeature) + return aFeaList; - boost::shared_ptr aData = feature()->data(); + boost::shared_ptr aData = aFeature->data(); if (!aData->isValid()) - return aPreviewMap; - boost::shared_ptr aRefList = - boost::dynamic_pointer_cast(aData->attribute(SKETCH_ATTR_FEATURES)); - - std::list aFeatures = aRefList->list(); - std::list::const_iterator anIt = aFeatures.begin(), - aLast = aFeatures.end(); - for (; anIt != aLast; anIt++) { - aFeature = boost::dynamic_pointer_cast(*anIt); - boost::shared_ptr aPreview = aFeature->preview(); - if (aPreview) - aPreviewMap[aFeature] = aPreview; + return std::list(); + boost::shared_ptr aRefList = boost::dynamic_pointer_cast< + ModelAPI_AttributeRefList>(aData->attribute(SketchPlugin_Sketch::FEATURES_ID())); + + std::list aList = aRefList->list(); + std::list::iterator aIt; + for (aIt = aList.begin(); aIt != aList.end(); ++aIt) { + FeaturePtr aFeature = boost::dynamic_pointer_cast(*aIt); + if (aFeature) + aFeaList.push_back(aFeature); } - return aPreviewMap; + return aFeaList; } void PartSet_OperationSketch::stopOperation() @@ -159,6 +162,16 @@ void PartSet_OperationSketch::stopOperation() PartSet_OperationSketchBase::stopOperation(); emit featureConstructed(feature(), FM_Hide); emit closeLocalContext(); + + FeaturePtr aFeature = feature(); + std::list aResults = aFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) { + ModelAPI_EventCreator::get()->sendUpdated( + *aIt, Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)); + } + //ModelAPI_EventCreator::get()->sendUpdated(aFeature, + // Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY)); } bool PartSet_OperationSketch::isNestedOperationsEnabled() const @@ -180,8 +193,8 @@ bool PartSet_OperationSketch::hasSketchPlane() const if (feature()) { boost::shared_ptr aData = feature()->data(); AttributeDoublePtr anAttr; - boost::shared_ptr aNormal = - boost::dynamic_pointer_cast(aData->attribute(SKETCH_ATTR_NORM)); + boost::shared_ptr aNormal = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::NORM_ID())); aHasPlane = aNormal && !(aNormal->x() == 0 && aNormal->y() == 0 && aNormal->z() == 0); } return aHasPlane; @@ -213,21 +226,22 @@ void PartSet_OperationSketch::setSketchPlane(const TopoDS_Shape& theShape) // 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; - boost::shared_ptr aTempDir(isX ? new GeomAPI_Dir(0, 1, 0) : new GeomAPI_Dir(1, 0, 0)); + boost::shared_ptr aTempDir( + isX ? new GeomAPI_Dir(0, 1, 0) : new GeomAPI_Dir(1, 0, 0)); boost::shared_ptr aYDir(new GeomAPI_Dir(aNormDir->cross(aTempDir))); boost::shared_ptr aXDir(new GeomAPI_Dir(aYDir->cross(aNormDir))); - boost::shared_ptr anOrigin = - boost::dynamic_pointer_cast(aData->attribute(SKETCH_ATTR_ORIGIN)); + boost::shared_ptr anOrigin = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::ORIGIN_ID())); anOrigin->setValue(anOrigPnt); - boost::shared_ptr aNormal = - boost::dynamic_pointer_cast(aData->attribute(SKETCH_ATTR_NORM)); + boost::shared_ptr aNormal = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::NORM_ID())); aNormal->setValue(aNormDir); - boost::shared_ptr aDirX = - boost::dynamic_pointer_cast(aData->attribute(SKETCH_ATTR_DIRX)); + boost::shared_ptr aDirX = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::DIRX_ID())); aDirX->setValue(aXDir); - boost::shared_ptr aDirY = - boost::dynamic_pointer_cast(aData->attribute(SKETCH_ATTR_DIRY)); + boost::shared_ptr aDirY = boost::dynamic_pointer_cast( + aData->attribute(SketchPlugin_Sketch::DIRY_ID())); aDirY->setValue(aYDir); boost::shared_ptr aDir = aPlane->direction(); @@ -238,12 +252,10 @@ void PartSet_OperationSketch::setSketchPlane(const TopoDS_Shape& theShape) emit planeSelected(aDir->x(), aDir->y(), aDir->z()); } -std::string PartSet_OperationSketch::getOperationType(FeaturePtr theFeature) -{ - std::string aType = PartSet_OperationEditFeature::Type(); - if (PartSet_Tools::isConstraintFeature(theFeature->getKind())) { - aType = PartSet_OperationEditConstraint::Type(); - } - return aType; +bool PartSet_OperationSketch::isValid(ModuleBase_IOperation* theOperation) const +{ + PartSet_OperationSketchBase* aPreviewOp = dynamic_cast(theOperation); + return aPreviewOp != NULL; } +