-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// 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<mailto:webmaster.salome@opencascade.com>
+//
#include "PartSet_SketcherReentrantMgr.h"
#include "PartSet_Module.h"
#include "ModelAPI_Session.h"
#include "ModelAPI_AttributeString.h"
#include "ModelAPI_AttributeRefAttr.h"
+#include "ModelAPI_AttributeReference.h"
#include "ModelAPI_EventReentrantMessage.h"
#include "GeomDataAPI_Point2D.h"
#include <SketchPlugin_MacroCircle.h>
#include <SketchPlugin_Point.h>
#include <SketchPlugin_Trim.h>
+#include <SketchPlugin_Split.h>
#include <XGUI_Workshop.h>
#include <XGUI_ModuleConnector.h>
if (!isActiveMgr())
return;
- if (myPreviousFeature.get() && myRestartingMode == RM_LastFeatureUsed) {
- ModuleBase_OperationFeature* aCurrentOperation = dynamic_cast<ModuleBase_OperationFeature*>(
- myWorkshop->currentOperation());
- CompositeFeaturePtr aSketch = module()->sketchMgr()->activeSketch();
- if (myPreviousFeature.get() && myPreviousFeature->data()->isValid()) // it is not removed
- copyReetntrantAttributes(myPreviousFeature, aCurrentOperation->feature(), aSketch);
- }
+ //if (myPreviousFeature.get() && myRestartingMode == RM_LastFeatureUsed) {
+ //ModuleBase_OperationFeature* aCurrentOperation = dynamic_cast<ModuleBase_OperationFeature*>(
+ // myWorkshop->currentOperation());
+ //CompositeFeaturePtr aSketch = module()->sketchMgr()->activeSketch();
+ //if (myPreviousFeature.get() && myPreviousFeature->data()->isValid()) // it is not removed
+ //copyReetntrantAttributes(myPreviousFeature, aCurrentOperation->feature(), aSketch);
+ //}
resetFlags();
}
ModuleBase_IPropertyPanel* aPanel = myWorkshop->currentOperation()->propertyPanel();
FeaturePtr aCurrentFeature = aFOperation->feature();
- bool isLineFeature = false, isArcFeature = false;
+ bool isLineFeature = false, isReentrantArcFeature = false;
std::string anAttributeOnStart;
if (aCurrentFeature->getKind() == SketchPlugin_Line::ID()) {
anAttributeOnStart = SketchPlugin_Line::START_ID();
isLineFeature = anActiveWidget->attributeID() == anAttributeOnStart;
}
else if (isTangentArc(aFOperation, module()->sketchMgr()->activeSketch())) {
- anAttributeOnStart = SketchPlugin_MacroArc::TANGENT_POINT_ID();
- isArcFeature = anActiveWidget->attributeID() == anAttributeOnStart;
+ isReentrantArcFeature = true;
}
- bool aCanBeActivatedByMove = isLineFeature || isArcFeature;
+ bool aCanBeActivatedByMove = isLineFeature || isReentrantArcFeature;
if (aCanBeActivatedByMove) {
/// before restarting of operation we need to clear selection, as it may take part in
/// new feature creation, e.g. tangent arc. But it is not necessary as it was processed
myPreviousFeature = FeaturePtr();
anActiveWidget = module()->activeWidget();
- aCurrentFeature = anActiveWidget->feature();
aProcessed = true;
- if (anActiveWidget->attributeID() == anAttributeOnStart) {
+ if (anActiveWidget && anActiveWidget->attributeID() == anAttributeOnStart) {
// it was not deactivated by preselection processing
aPanel->activateNextWidget(anActiveWidget);
}
myClickedSketchPoint = PartSet_Tools::getPnt2d(theEvent, theWindow,
module()->sketchMgr()->activeSketch());
- if (!aPreSelected.empty())
- module()->getGeomSelection(aPreSelected.first(), mySelectedObject, mySelectedAttribute);
+ if (!aPreSelected.empty()) {
+ ModuleBase_ViewerPrsPtr aValue = aPreSelected.first();
+ module()->getGeomSelection(aValue, mySelectedObject, mySelectedAttribute);
+
+ PartSet_WidgetPoint2D* aPointWidget = dynamic_cast<PartSet_WidgetPoint2D*>(anActiveWidget);
+ if (aPointWidget) {
+ GeomShapePtr aShape;
+ aPointWidget->getGeomSelection_(aValue, mySelectedObject, aShape);
+ }
+ }
restartOperation();
myClickedSketchPoint = std::shared_ptr<GeomAPI_Pnt2d>();
&& !aSelectedPrs->object()->data()->isValid()) {
// the selected object was removed diring restart, e.g. presentable macro feature
// there are created objects to replace the object depending on created feature kind
- aSelectedPrs = generatePreSelection();
+ aSelectedPrs = std::shared_ptr<ModuleBase_ViewerPrs>();
}
aMouseProcessor->setPreSelection(aSelectedPrs, theWindow, theEvent);
//aPoint2DWdg->mouseReleased(theWindow, theEvent);
if (!aReentrantMessage.get())
return;
- aReentrantMessage->setSelectedObject(mySelectedObject);
+ // if feature has already filled the selected object, we should not overwrite it
+ if (!aReentrantMessage->selectedObject().get())
+ aReentrantMessage->setSelectedObject(mySelectedObject);
+
aReentrantMessage->setSelectedAttribute(mySelectedAttribute);
aReentrantMessage->setClickedPoint(myClickedSketchPoint);
}
(myWorkshop->currentOperation());
if (aFOperation && module()->sketchMgr()->isNestedSketchOperation(aFOperation)) {
+ /// improvement to deselect automatically all eventual selected objects, when
+ // returning to the neutral point of the Sketcher or start internal edit
+ workshop()->selector()->clearSelection();
+
aFOperation->setEditOperation(true/*, false*/);
createInternalFeature();
if (aPreviousAttributeWidget) {
if (!aPreviousAttributeWidget->isViewerSelector()) {
aPreviousAttributeWidget->focusTo();
+ aPreviousAttributeWidget->emitFocusInWidget();
aPreviousAttributeWidget->selectContent();
}
else {
QToolButton* anOkBtn =
dynamic_cast<XGUI_PropertyPanel*>(aPanel)->findButton(PROP_PANEL_OK);
if (anOkBtn)
- anOkBtn->setFocus(Qt::TabFocusReason);
+ ModuleBase_Tools::setFocus(anOkBtn, "XGUI_PropertyPanel::activateNextWidget");
}
}
}
QList<ModuleBase_ViewerPrsPtr> aPreSelected =
aSelection->getSelected(ModuleBase_ISelection::AllControls);
-
-
if (myInternalFeature.get())
copyReetntrantAttributes(myInternalFeature, aFOperation->feature(),
- module()->sketchMgr()->activeSketch());
+ module()->sketchMgr()->activeSketch());
myNoMoreWidgetsAttribute = "";
myIsFlagsBlocked = true;
- module()->launchOperation(aFOperation->id());
+ /// launch has 'false' parameter to do not start new operation if the previous operation
+ /// is not committed. It is important for Line Sketch feature as it uses the previous
+ /// created feature parameter(to build coincidence), but by abort the previous is removed
+ module()->launchOperation(aFOperation->id(), true);
myIsFlagsBlocked = false;
resetFlags();
AttributeStringPtr aNewFeatureTypeAttr = theNewFeature->data()->string(aTypeAttributeId);
if (aNewFeatureTypeAttr->value() != aTypeAttributeId) // do nothing if there is no changes
aNewFeatureTypeAttr->setValue(aSourceFeatureTypeAttr->value());
- //ModuleBase_Tools::flushUpdated(theNewFeature);
- aChanged = true;*/
+ //ModuleBase_Tools::flushUpdated(theNewFeature);*/
+ //aChanged = true;
}
else if (aFeatureKind == SketchPlugin_MacroArc::ID()) {
// set arc type
- std::string aTypeAttributeId = SketchPlugin_MacroArc::ARC_TYPE();
+ /*std::string aTypeAttributeId = SketchPlugin_MacroArc::ARC_TYPE();
AttributeStringPtr aSourceFeatureTypeAttr = theSourceFeature->data()->string(aTypeAttributeId);
AttributeStringPtr aNewFeatureTypeAttr = theNewFeature->data()->string(aTypeAttributeId);
if (aNewFeatureTypeAttr->value() != aTypeAttributeId) // do nothing if there is no changes
- aNewFeatureTypeAttr->setValue(aSourceFeatureTypeAttr->value());
+ aNewFeatureTypeAttr->setValue(aSourceFeatureTypeAttr->value());*/
//// if the arc is tangent, set coincidence to end point of the previous arc
//std::string anArcType = aSourceFeatureTypeAttr->value();
//if (anArcType == SketchPlugin_Arc::ARC_TYPE_TANGENT()) {
//}
//ModuleBase_Tools::flushUpdated(theNewFeature);
- aChanged = true;
+ //aChanged = true;
}
- else if (aFeatureKind == SketchPlugin_Trim::ID()) {
- /*std::shared_ptr<ModelAPI_AttributeReference> aRefSelectedAttr =
- std::dynamic_pointer_cast<ModelAPI_AttributeReference>(
- theSourceFeature->data()->attribute(SketchPlugin_Trim::SELECTED_OBJECT()));
- std::shared_ptr<ModelAPI_AttributeReference> aNRefSelectedAttr =
- std::dynamic_pointer_cast<ModelAPI_AttributeReference>(
- theNewFeature->data()->attribute(SketchPlugin_Trim::SELECTED_OBJECT()));
- aNRefSelectedAttr->setValue(aRefSelectedAttr->value());*/
-
+ else if (aFeatureKind == SketchPlugin_Trim::ID() ||
+ aFeatureKind == SketchPlugin_Split::ID()) {
+ std::string aPreviewObjectAttribute = aFeatureKind == SketchPlugin_Trim::ID() ?
+ SketchPlugin_Trim::PREVIEW_OBJECT(): SketchPlugin_Split::PREVIEW_OBJECT();
+ std::string aPreviewPointAttribute = aFeatureKind == SketchPlugin_Trim::ID() ?
+ SketchPlugin_Trim::PREVIEW_POINT(): SketchPlugin_Split::PREVIEW_POINT();
std::shared_ptr<ModelAPI_AttributeReference> aRefPreviewAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeReference>(
- theSourceFeature->data()->attribute(SketchPlugin_Trim::PREVIEW_OBJECT()));
+ theSourceFeature->data()->attribute(aPreviewObjectAttribute));
std::shared_ptr<ModelAPI_AttributeReference> aNRefPreviewAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeReference>(
- theNewFeature->data()->attribute(SketchPlugin_Trim::PREVIEW_OBJECT()));
+ theNewFeature->data()->attribute(aPreviewObjectAttribute));
aNRefPreviewAttr->setValue(aRefPreviewAttr->value());
-
- /*std::shared_ptr<GeomDataAPI_Point2D> aPointSelectedAttr =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- theSourceFeature->data()->attribute(SketchPlugin_Trim::SELECTED_POINT()));
- std::shared_ptr<GeomDataAPI_Point2D> aNPointSelectedAttr =
- std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- theNewFeature->data()->attribute(SketchPlugin_Trim::SELECTED_POINT()));
- aNPointSelectedAttr->setValue(aPointSelectedAttr->x(), aPointSelectedAttr->y());
- */
std::shared_ptr<GeomDataAPI_Point2D> aPointPreviewAttr =
std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- theSourceFeature->data()->attribute(SketchPlugin_Trim::PREVIEW_POINT()));
+ theSourceFeature->data()->attribute(aPreviewPointAttribute));
std::shared_ptr<GeomDataAPI_Point2D> aNPointPreviewAttr =
std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- theNewFeature->data()->attribute(SketchPlugin_Trim::PREVIEW_POINT()));
+ theNewFeature->data()->attribute(aPreviewPointAttribute));
aNPointPreviewAttr->setValue(aPointPreviewAttr->x(), aPointPreviewAttr->y());
-
- aChanged = true;
}
return aChanged;
}
return aTangentArc;
}
-std::shared_ptr<ModuleBase_ViewerPrs> PartSet_SketcherReentrantMgr::generatePreSelection()
-{
- std::shared_ptr<ModuleBase_ViewerPrs> aPrs;
-
- return aPrs;
-}
-
void PartSet_SketcherReentrantMgr::updateAcceptAllAction()
{
CompositeFeaturePtr aSketch = module()->sketchMgr()->activeSketch();
