-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023 CEA, EDF
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
myIsFlagsBlocked(false),
myIsInternalEditOperation(false),
myNoMoreWidgetsAttribute(""),
- myIsAutoConstraints(true)
+ myIsAutoConstraints(true),
+ myLastAutoConstraint(0)
{
}
workshop()->selector()->clearSelection();
myPreviousFeature = aFOperation->feature();
- if (myIsAutoConstraints)
- addConstraints(myPreviousFeature);
restartOperation();
myPreviousFeature = FeaturePtr();
}
} else {
// processing mouse move in active widget of restarted operation
- ModuleBase_ModelWidget* anActiveWidget = module()->activeWidget();
- PartSet_MouseProcessor* aProcessor = dynamic_cast<PartSet_MouseProcessor*>(anActiveWidget);
+ ModuleBase_ModelWidget* anActiveWdg = module()->activeWidget();
+ PartSet_MouseProcessor* aProcessor = dynamic_cast<PartSet_MouseProcessor*>(anActiveWdg);
if (aProcessor)
aProcessor->mouseMoved(theWnd, theEvent);
}
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(myWorkshop->currentOperation());
+ if (module()->sketchMgr()->isDragModeCreation()) {
+ if (aFOperation && myIsAutoConstraints)
+ addConstraints(aFOperation->feature());
+ return;
+ }
if (!myWorkshop->module()->getFeatureError(aFOperation->feature()).isEmpty())
return;
isStarted = startInternalEdit(thePreviousAttributeID);
}
}
- if (!isStarted)
+ if (!isStarted) {
+ if (myIsAutoConstraints)
+ addConstraints(aFOperation->feature());
aFOperation->commit();
+ }
}
}
}
if (!isSketchSolverError) {
myRestartingMode = RM_EmptyFeatureUsed;
- isDone = startInternalEdit(thePreviousAttributeID);
+ // It seems that the call is obsolete for Enter key processing
+ // It prevent finalysing of the current operation by Enter key
+ //isDone = startInternalEdit(thePreviousAttributeID);
}
return isDone;
void PartSet_SketcherReentrantMgr::onAfterValuesChangedInPropertyPanel()
{
-
if (isInternalEditActive()) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
- (myWorkshop->currentOperation());
ModuleBase_ModelWidget* aWidget = (ModuleBase_ModelWidget*)sender();
if (!aWidget->isModifiedInEdit().empty())
restartOperation();
// returning to the neutral point of the Sketcher or start internal edit
workshop()->selector()->clearSelection();
+ if (myIsAutoConstraints)
+ addConstraints(aFOperation->feature());
+
aFOperation->setEditOperation(true/*, false*/);
createInternalFeature();
QList<ModuleBase_ModelWidget*> aWidgets = aPanel->modelWidgets();
for (int i = 0, aNb = aWidgets.size(); i < aNb && !aPreviousAttributeWidget; i++) {
if (aWidgets[i]->attributeID() == thePreviousAttributeID) {
- /// workaround for the same attributes used in different stacked widgets(attribute types)
- if (ModuleBase_ToolBox::isOffToolBoxParent(aWidgets[i]))
- continue;
+ // workaround for the same attributes used in different stacked widgets(attribute types)
+ if (ModuleBase_ToolBox::isOffToolBoxParent(aWidgets[i]))
+ continue;
aPreviousAttributeWidget = aWidgets[i];
}
}
void PartSet_SketcherReentrantMgr::addConstraints(const FeaturePtr& theFeature)
{
+ if (theFeature->getKind() != SketchPlugin_Line::ID())
+ return;
+
static GeomDir2dPtr myHorDir(new GeomAPI_Dir2d(1, 0));
static GeomDir2dPtr myVertDir(new GeomAPI_Dir2d(0, 1));
- if (theFeature->getKind() == SketchPlugin_Line::ID()) {
- std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
- std::shared_ptr<GeomDataAPI_Point2D> aPoint1 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aData->attribute(SketchPlugin_Line::START_ID()));
- std::shared_ptr<GeomDataAPI_Point2D> aPoint2 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
- aData->attribute(SketchPlugin_Line::END_ID()));
- if (aPoint1.get() && aPoint2.get()) {
- GeomLine2dPtr aLine(new GeomAPI_Lin2d(aPoint1->pnt(), aPoint2->pnt()));
- GeomDir2dPtr aDir = aLine->direction();
- double aHorAngle = fabs(myHorDir->angle(aDir));
- double aVertAngle = fabs(myVertDir->angle(aDir));
- if (aHorAngle > M_PI/2.)
- aHorAngle = M_PI - aHorAngle;
- if (aVertAngle > M_PI/2.)
- aVertAngle = M_PI - aVertAngle;
-
- double aTolerance = Config_PropManager::real(SKETCH_TAB_NAME, "angular_tolerance");
- CompositeFeaturePtr aSketch = module()->sketchMgr()->activeSketch();
- FeaturePtr aFeature;
- if (aHorAngle < aTolerance)
- // Add horizontal constraint
- aFeature = aSketch->addFeature(SketchPlugin_ConstraintHorizontal::ID());
- else if (aVertAngle < aTolerance)
- // Add vertical constraint
- aFeature = aSketch->addFeature(SketchPlugin_ConstraintVertical::ID());
-
- if (aFeature.get()) {
- aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())->setObject(
- theFeature->firstResult());
- }
+ std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint1 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aData->attribute(SketchPlugin_Line::START_ID()));
+ std::shared_ptr<GeomDataAPI_Point2D> aPoint2 = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
+ aData->attribute(SketchPlugin_Line::END_ID()));
+ if (aPoint1.get() && aPoint2.get()) {
+ GeomLine2dPtr aLine(new GeomAPI_Lin2d(aPoint1->pnt(), aPoint2->pnt()));
+ GeomDir2dPtr aDir = aLine->direction();
+ double aHorAngle = fabs(myHorDir->angle(aDir));
+ double aVertAngle = fabs(myVertDir->angle(aDir));
+ if (aHorAngle > M_PI/2.)
+ aHorAngle = M_PI - aHorAngle;
+ if (aVertAngle > M_PI/2.)
+ aVertAngle = M_PI - aVertAngle;
+
+ double aTolerance = Config_PropManager::real(SKETCH_TAB_NAME, "angular_tolerance");
+ CompositeFeaturePtr aSketch = module()->sketchMgr()->activeSketch();
+ FeaturePtr aFeature;
+ if (aHorAngle < aTolerance) {
+ // Add horizontal constraint
+ aFeature = aSketch->addFeature(SketchPlugin_ConstraintHorizontal::ID());
+ }
+ else if (aVertAngle < aTolerance) {
+ // Add vertical constraint
+ aFeature = aSketch->addFeature(SketchPlugin_ConstraintVertical::ID());
+ }
+ if (aFeature.get()) {
+ aFeature->refattr(SketchPlugin_Constraint::ENTITY_A())->setObject(
+ theFeature->firstResult());
+ myLastAutoConstraint = aFeature.get();
}
}
}
+
+
+bool PartSet_SketcherReentrantMgr::isLastAutoConstraint(const ObjectPtr& theObj) const
+{
+ return theObj.get() == myLastAutoConstraint;
+}