X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=94c577a55272a5a9b85722926c92af717655dfad;hb=a07cdcdf600fc224bc862686439dfbe01d72524a;hp=4d84d816834264352a3cb0d1f20b934df7133ec6;hpb=813c83e36bc7fcd622419767e6a409ceba98a912;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 4d84d8168..94c577a55 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -35,17 +36,17 @@ #include #include -#include +#include #include -#include -#include -#include +#include +//#include +//#include #include #include #include #include #include -#include +//#include #include @@ -68,23 +69,6 @@ #include #endif - -/// Returns list of unique objects by sum of objects from List1 and List2 -QList getSumList(const QList& theList1, - const QList& theList2) -{ - QList aRes; - foreach (ModuleBase_ViewerPrs aPrs, theList1) { - if (!aRes.contains(aPrs.object())) - aRes.append(aPrs.object()); - } - foreach (ModuleBase_ViewerPrs aPrs, theList2) { - if (!aRes.contains(aPrs.object())) - aRes.append(aPrs.object()); - } - return aRes; -} - /*!Create and return new instance of XGUI_Module*/ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* theWshop) { @@ -93,21 +77,10 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myIsDragging(false), myRestartingMode(RM_None), myDragDone(false) + myRestartingMode(RM_None) { //myWorkshop = dynamic_cast(theWshop); - ModuleBase_IViewer* aViewer = aViewer = theWshop->viewer(); - connect(aViewer, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMousePressed(ModuleBase_IViewWindow*, QMouseEvent*))); - - connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMouseReleased(ModuleBase_IViewWindow*, QMouseEvent*))); - - connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMouseMoved(ModuleBase_IViewWindow*, QMouseEvent*))); - - connect(aViewer, SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*))); + mySketchMgr = new PartSet_SketcherMgr(this); XGUI_ModuleConnector* aConnector = dynamic_cast(theWshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); @@ -117,6 +90,7 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) connect(anOpMgr, SIGNAL(operationActivatedByPreselection()), this, SLOT(onOperationActivatedByPreselection())); + ModuleBase_IViewer* aViewer = theWshop->viewer(); connect(aViewer, SIGNAL(keyRelease(ModuleBase_IViewWindow*, QKeyEvent*)), this, SLOT(onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*))); } @@ -125,8 +99,6 @@ PartSet_Module::~PartSet_Module() { if (!myDocumentShapeFilter.IsNull()) myDocumentShapeFilter.Nullify(); - if (!myPlaneFilter.IsNull()) - myPlaneFilter.Nullify(); } void PartSet_Module::registerValidators() @@ -185,37 +157,7 @@ void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation) void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) { if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) { - // Display all sketcher sub-Objects - myCurrentSketch = std::dynamic_pointer_cast(theOperation->feature()); - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - - for (int i = 0; i < myCurrentSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = myCurrentSketch->subFeature(i); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->display((*aIt), false); - } - aDisplayer->display(aFeature); - } - // Hide sketcher result - std::list aResults = myCurrentSketch->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->erase((*aIt), false); - } - aDisplayer->erase(myCurrentSketch); - - - if (myPlaneFilter.IsNull()) - myPlaneFilter = new ModuleBase_ShapeInPlaneFilter(); - myWorkshop->viewer()->addSelectionFilter(myPlaneFilter); - if (theOperation->isEditOperation()) { - // If it is editing of sketch then it means that plane is already defined - std::shared_ptr aPln = PartSet_Tools::sketchPlane(myCurrentSketch); - myPlaneFilter->setPlane(aPln->impl()); - } + mySketchMgr->startSketch(theOperation); } if (myDocumentShapeFilter.IsNull()) myDocumentShapeFilter = new PartSet_GlobalFilter(myWorkshop); @@ -225,43 +167,11 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) { if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) { - DataPtr aData = myCurrentSketch->data(); - if ((!aData) || (!aData->isValid())) { - // The sketch was aborted - myCurrentSketch = CompositeFeaturePtr(); - return; - } - // Hide all sketcher sub-Objects - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - for (int i = 0; i < myCurrentSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = myCurrentSketch->subFeature(i); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->erase((*aIt), false); - } - aDisplayer->erase(aFeature, false); - } - // Display sketcher result - std::list aResults = myCurrentSketch->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->display((*aIt), false); - } - aDisplayer->display(myCurrentSketch); - - myCurrentSketch = CompositeFeaturePtr(); - myWorkshop->viewer()->removeSelectionFilter(myPlaneFilter); + mySketchMgr->stopSketch(theOperation); } myWorkshop->viewer()->removeSelectionFilter(myDocumentShapeFilter); } -void PartSet_Module::onPlaneSelected(const std::shared_ptr& thePln) -{ - myPlaneFilter->setPlane(thePln->impl()); -} - void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) { @@ -285,7 +195,7 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) std::dynamic_pointer_cast(aData->attribute(SketchPlugin_Line::END_ID())); if (aPoint) { aPnt2dWgt->setPoint(aPoint->x(), aPoint->y()); - PartSet_Tools::setConstraints(myCurrentSketch, theOperation->feature(), + PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), theOperation->feature(), aWgt->attributeID(), aPoint->x(), aPoint->y()); theOperation->propertyPanel()->activateNextWidget(aPnt2dWgt); } @@ -295,7 +205,7 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) // Start editing constraint if (theOperation->isEditOperation()) { std::string aId = theOperation->id().toStdString(); - if (sketchOperationIdList().contains(QString(aId.c_str()))) { + if (PartSet_SketcherMgr::sketchOperationIdList().contains(QString(aId.c_str()))) { if ((aId == SketchPlugin_ConstraintRadius::ID()) || (aId == SketchPlugin_ConstraintLength::ID()) || (aId == SketchPlugin_ConstraintDistance::ID())) { @@ -320,8 +230,8 @@ void PartSet_Module::onSelectionChanged() ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); bool isSketcherOp = false; // An edit operation is enable only if the current opeation is the sketch operation - if (aOperation && myCurrentSketch) { - if (PartSet_Tools::sketchPlane(myCurrentSketch)) + if (aOperation && mySketchMgr->activeSketch()) { + if (PartSet_Tools::sketchPlane(mySketchMgr->activeSketch())) isSketcherOp = (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()); } if (!isSketcherOp) @@ -345,214 +255,7 @@ void PartSet_Module::onSelectionChanged() } } -void PartSet_Module::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - if (!(theEvent->buttons() & Qt::LeftButton)) - return; - - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - // Use only for sketch operations - if (aOperation && myCurrentSketch) { - if (!PartSet_Tools::sketchPlane(myCurrentSketch)) - return; - - bool isSketcher = (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()); - bool isSketchOpe = sketchOperationIdList().contains(aOperation->id()); - - // Avoid non-sketch operations - if ((!isSketchOpe) && (!isSketcher)) - return; - - bool isEditing = aOperation->isEditOperation(); - - // Ignore creation sketch operation - if ((!isSketcher) && (!isEditing)) - return; - - if (theEvent->modifiers()) { - // If user performs multiselection - if (isSketchOpe && (!isSketcher)) - if (!aOperation->commit()) - aOperation->abort(); - return; - } - // Remember highlighted objects for editing - ModuleBase_ISelection* aSelect = myWorkshop->selection(); - QList aHighlighted = aSelect->getHighlighted(); - QList aSelected = aSelect->getSelected(); - myEditingFeatures.clear(); - myEditingAttr.clear(); - if ((aHighlighted.size() == 0) && (aSelected.size() == 0)) { - if (isSketchOpe && (!isSketcher)) - // commit previous operation - if (!aOperation->commit()) - aOperation->abort(); - return; - } - - QObjectPtrList aSelObjects = getSumList(aHighlighted, aSelected); - if ((aHighlighted.size() == 1) && (aSelected.size() == 0)) { - // Move by selected shape (vertex). Can be used only for single selection - foreach(ModuleBase_ViewerPrs aPrs, aHighlighted) { - FeaturePtr aFeature = ModelAPI_Feature::feature(aHighlighted.first().object()); - if (aFeature) { - myEditingFeatures.append(aFeature); - TopoDS_Shape aShape = aPrs.shape(); - if (!aShape.IsNull()) { - if (aShape.ShapeType() == TopAbs_VERTEX) { - AttributePtr aAttr = PartSet_Tools::findAttributeBy2dPoint(myEditingFeatures.first(), - aShape, myCurrentSketch); - if (aAttr) - myEditingAttr.append(aAttr); - } - } - } - } - } else { - // Provide multi-selection. Can be used only for features - foreach (ObjectPtr aObj, aSelObjects) { - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - if (aFeature && (!myEditingFeatures.contains(aFeature))) - myEditingFeatures.append(aFeature); - } - - } - // If nothing highlighted - return - if (myEditingFeatures.size() == 0) - return; - - if (isSketcher) { - myIsDragging = true; - get2dPoint(theWnd, theEvent, myCurX, myCurY); - myDragDone = false; - myWorkshop->viewer()->enableSelection(false); - launchEditing(); - - } else if (isSketchOpe && isEditing) { - // If selected another object - aOperation->abort(); - - myIsDragging = true; - get2dPoint(theWnd, theEvent, myCurX, myCurY); - myDragDone = false; - myWorkshop->viewer()->enableSelection(false); - - // This is necessary in order to finalize previous operation - QApplication::processEvents(); - launchEditing(); - } - } -} - - -void PartSet_Module::get2dPoint(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent, - double& theX, double& theY) -{ - Handle(V3d_View) aView = theWnd->v3dView(); - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView); - PartSet_Tools::convertTo2D(aPoint, myCurrentSketch, aView, theX, theY); -} - - -void PartSet_Module::launchEditing() -{ - if (myEditingFeatures.size() > 0) { - FeaturePtr aFeature = myEditingFeatures.first(); - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aFeature); - if (aSPFeature) { - editFeature(aSPFeature); - } - } -} - -void PartSet_Module::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - myWorkshop->viewer()->enableSelection(true); - if (myIsDragging) { - myIsDragging = false; - if (myDragDone) { - myWorkshop->currentOperation()->commit(); - myEditingFeatures.clear(); - myEditingAttr.clear(); - } - } -} - - -void PartSet_Module::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - if (myIsDragging) { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()) - return; // No edit operation activated - - static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED); - Handle(V3d_View) aView = theWnd->v3dView(); - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView); - double aX, aY; - PartSet_Tools::convertTo2D(aPoint, myCurrentSketch, aView, aX, aY); - double dX = aX - myCurX; - double dY = aY - myCurY; - - if ((aOperation->id().toStdString() == SketchPlugin_Line::ID()) && - (myEditingAttr.size() == 1) && - myEditingAttr.first()) { - // probably we have prehighlighted point - AttributePtr aAttr = myEditingAttr.first(); - std::string aAttrId = aAttr->id(); - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - QList aWidgets = aPanel->modelWidgets(); - // Find corresponded widget to provide dragging - foreach (ModuleBase_ModelWidget* aWgt, aWidgets) { - if (aWgt->attributeID() == aAttrId) { - PartSet_WidgetPoint2D* aWgt2d = dynamic_cast(aWgt); - if (aWgt2d) { - aWgt2d->setPoint(aWgt2d->x() + dX, aWgt2d->y() + dY); - break; - } - } - } - } else { - foreach(FeaturePtr aFeature, myEditingFeatures) { - std::shared_ptr aSketchFeature = - std::dynamic_pointer_cast(aFeature); - if (aSketchFeature) { - aSketchFeature->move(dX, dY); - ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anEvent); - } - } // after movement the solver will call the update event: optimization - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED)); - } - myDragDone = true; - myCurX = aX; - myCurY = aY; - } -} - -void PartSet_Module::onMouseDoubleClick(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation && aOperation->isEditOperation()) { - std::string aId = aOperation->id().toStdString(); - if ((aId == SketchPlugin_ConstraintLength::ID()) || - (aId == SketchPlugin_ConstraintDistance::ID()) || - (aId == SketchPlugin_ConstraintRadius::ID())) - { - // Activate dimension value editing on double click - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - QList aWidgets = aPanel->modelWidgets(); - // Find corresponded widget to activate value editing - foreach (ModuleBase_ModelWidget* aWgt, aWidgets) { - if (aWgt->attributeID() == "ConstraintValue") { - aWgt->focusTo(); - return; - } - } - } - } -} void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent) { @@ -600,22 +303,6 @@ void PartSet_Module::onNoMoreWidgets() } } -QStringList PartSet_Module::sketchOperationIdList() const -{ - QStringList aIds; - aIds << SketchPlugin_Line::ID().c_str(); - aIds << SketchPlugin_Point::ID().c_str(); - aIds << SketchPlugin_Arc::ID().c_str(); - aIds << SketchPlugin_Circle::ID().c_str(); - aIds << SketchPlugin_ConstraintLength::ID().c_str(); - aIds << SketchPlugin_ConstraintDistance::ID().c_str(); - aIds << SketchPlugin_ConstraintRigid::ID().c_str(); - aIds << SketchPlugin_ConstraintRadius::ID().c_str(); - aIds << SketchPlugin_ConstraintPerpendicular::ID().c_str(); - aIds << SketchPlugin_ConstraintParallel::ID().c_str(); - return aIds; -} - void PartSet_Module::onVertexSelected(ObjectPtr theObject, const TopoDS_Shape& theShape) { ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); @@ -639,14 +326,14 @@ QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* PartSet_WidgetSketchLabel* aWgt = new PartSet_WidgetSketchLabel(theParent, theWidgetApi, theParentId); aWgt->setWorkshop(aWorkshop); connect(aWgt, SIGNAL(planeSelected(const std::shared_ptr&)), - this, SLOT(onPlaneSelected(const std::shared_ptr&))); + mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr&))); theModelWidgets.append(aWgt); return aWgt->getControl(); } else if (theType == "sketch-2dpoint_selector") { PartSet_WidgetPoint2D* aWgt = new PartSet_WidgetPoint2D(theParent, theWidgetApi, theParentId); aWgt->setWorkshop(aWorkshop); - aWgt->setSketch(myCurrentSketch); + aWgt->setSketch(mySketchMgr->activeSketch()); connect(aWgt, SIGNAL(vertexSelected(ObjectPtr, const TopoDS_Shape&)), this, SLOT(onVertexSelected(ObjectPtr, const TopoDS_Shape&))); @@ -657,7 +344,7 @@ QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* } if (theType == "point2ddistance") { PartSet_WidgetPoint2dDistance* aWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId); aWgt->setWorkshop(aWorkshop); - aWgt->setSketch(myCurrentSketch); + aWgt->setSketch(mySketchMgr->activeSketch()); theModelWidgets.append(aWgt); return aWgt->getControl(); @@ -665,7 +352,7 @@ QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* } if (theType == "sketch_shape_selector") { PartSet_WidgetShapeSelector* aWgt = new PartSet_WidgetShapeSelector(theParent, workshop(), theWidgetApi, theParentId); - aWgt->setSketcher(myCurrentSketch); + aWgt->setSketcher(mySketchMgr->activeSketch()); theModelWidgets.append(aWgt); return aWgt->getControl(); @@ -673,12 +360,12 @@ QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* } if (theType == "sketch_constraint_shape_selector") { PartSet_WidgetConstraintShapeSelector* aWgt = new PartSet_WidgetConstraintShapeSelector(theParent, workshop(), theWidgetApi, theParentId); - aWgt->setSketcher(myCurrentSketch); + aWgt->setSketcher(mySketchMgr->activeSketch()); theModelWidgets.append(aWgt); return aWgt->getControl(); - }else + } else return 0; }