X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_OperationSketch.cpp;h=e5290aa77eb9bc3cbd86ec285cb4b6afdf623019;hb=1d7a043abfadf964bf38802e8adb5a4773fec900;hp=6c274b66ef432c3cfcb74e28b4a63f452656b821;hpb=8de33e2487eed6e3aded5c2b086bd2d8b6e36f55;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_OperationSketch.cpp b/src/PartSet/PartSet_OperationSketch.cpp index 6c274b66e..e5290aa77 100644 --- a/src/PartSet/PartSet_OperationSketch.cpp +++ b/src/PartSet/PartSet_OperationSketch.cpp @@ -4,25 +4,34 @@ #include +#include +#include + #include + #include #include #include #include #include +#include + #include #include +#include #ifdef _DEBUG #include #endif +#include + using namespace std; PartSet_OperationSketch::PartSet_OperationSketch(const QString& theId, QObject* theParent) -: PartSet_OperationSketchBase(theId, theParent) +: PartSet_OperationSketchBase(theId, theParent), myIsEditMode(false) { } @@ -33,24 +42,48 @@ PartSet_OperationSketch::~PartSet_OperationSketch() std::list PartSet_OperationSketch::getSelectionModes(boost::shared_ptr theFeature) const { std::list aModes; - if (!isEditMode()) + if (!myIsEditMode) aModes.push_back(TopAbs_FACE); + else { + aModes.push_back(TopAbs_VERTEX); + aModes.push_back(TopAbs_EDGE); + } return aModes; } -void PartSet_OperationSketch::setSelected(boost::shared_ptr theFeature, - const TopoDS_Shape& theShape) +void PartSet_OperationSketch::mouseReleased(QMouseEvent* theEvent, Handle_V3d_View theView, + const std::list& theSelected) { - if (!isEditMode()) { - setSketchPlane(theShape); - setEditMode(true); + if (theSelected.empty()) + return; + + if (!myIsEditMode) { + XGUI_ViewerPrs aPrs = theSelected.front(); + const TopoDS_Shape& aShape = aPrs.shape(); + if (!aShape.IsNull()) { + setSketchPlane(aShape); + myIsEditMode = true; + } } - else if (theFeature) - emit launchOperation("EditLine", theFeature); +} + +void PartSet_OperationSketch::mouseMoved(QMouseEvent* theEvent, Handle(V3d_View) theView, + const std::list& theSelected) +{ + if (!myIsEditMode || !(theEvent->buttons() & Qt::LeftButton) || theSelected.empty()) + return; + + boost::shared_ptr aFeature = PartSet_Tools::NearestFeature(theEvent->pos(), + theView, feature(), theSelected); + if (aFeature) + emit launchOperation(PartSet_OperationEditLine::Type(), aFeature); } void PartSet_OperationSketch::setSketchPlane(const TopoDS_Shape& theShape) { + if (theShape.IsNull()) + return; + // get selected shape boost::shared_ptr aGShape(new GeomAPI_Shape); aGShape->setImpl(new TopoDS_Shape(theShape)); @@ -86,4 +119,3 @@ void PartSet_OperationSketch::setSketchPlane(const TopoDS_Shape& theShape) boost::shared_ptr aDir = aPlane->direction(); emit planeSelected(aDir->x(), aDir->y(), aDir->z()); } -