#include "PartSet_WidgetSketchLabel.h"
#include "PartSet_Validators.h"
#include "PartSet_Tools.h"
+#include "PartSet_PreviewPlanes.h"
#include "PartSet_WidgetPoint2d.h"
#include "PartSet_WidgetPoint2dDistance.h"
#include "PartSet_WidgetPoint2DFlyout.h"
#include "PartSet_WidgetShapeSelector.h"
#include "PartSet_WidgetMultiSelector.h"
+#include "PartSet_WidgetMultiSelectorComposite.h"
#include "PartSet_WidgetEditor.h"
#include "PartSet_WidgetFileSelector.h"
#include "PartSet_WidgetSketchCreator.h"
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWshop);
XGUI_Workshop* aWorkshop = aConnector->workshop();
- XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
- 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*)));
myHasConstraintShown[PartSet_Tools::Geometrical] = true;
myHasConstraintShown[PartSet_Tools::Dimensional] = true;
+ myHasConstraintShown[PartSet_Tools::Expressions] = false;
Config_PropManager::registerProp("Visualization", "operation_parameter_color",
"Reference shape wireframe color in operation", Config_Prop::Color,
}
}
+void PartSet_Module::storeSelection()
+{
+ sketchMgr()->storeSelection();
+}
+
+void PartSet_Module::restoreSelection()
+{
+ sketchMgr()->restoreSelection();
+}
+
void PartSet_Module::registerValidators()
{
//Registering of validators
aFactory->registerValidator("PartSet_MiddlePointSelection", new PartSet_MiddlePointSelection);
aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr);
- aFactory->registerValidator("PartSet_SketchEntityValidator", new PartSet_SketchEntityValidator);
}
void PartSet_Module::registerFilters()
}
void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation)
+{
+ ModuleBase_IWorkshop* anIWorkshop = workshop();
+ if (!theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
+ anIWorkshop->updateCommandStatus();
+ }
+ else {
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+ (theOperation);
+ if (aFOperation) {
+ XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(anIWorkshop);
+ XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel();
+ ModuleBase_ModelWidget* aFilledWidget = 0;
+ bool aPostonedWidgetActivation = false;
+ FeaturePtr aFeature = aFOperation->feature();
+
+ std::string aGreedAttributeId = ModuleBase_Tools::findGreedAttribute(anIWorkshop, aFeature);
+ // if there is a greed attribute, automatic commit by preselection for this feature is prohibited
+ aWorkshop->setPropertyPanel(aFOperation);
+
+ // filling the operation values by the current selection
+ // if the operation can be committed after the controls filling, the method perform should
+ // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch)
+ bool isOperationCommitted = false;
+ if (!aFOperation->isEditOperation()) {
+ aFilledWidget = aFOperation->activateByPreselection(aGreedAttributeId);
+ if (currentOperation() != aFOperation)
+ isOperationCommitted = true;
+ else {
+ if (aGreedAttributeId.empty()) {
+ // a signal should be emitted before the next widget activation
+ // because, the activation of the next widget will give a focus to the widget. As a result
+ // the value of the widget is initialized. And commit may happens until the value is entered.
+ if (aFilledWidget) {
+ if (mySketchReentrantMgr->canBeCommittedByPreselection())
+ isOperationCommitted = mySketchMgr->operationActivatedByPreselection();
+ // activate the next obligatory widget
+ if (!isOperationCommitted)
+ aPropertyPanel->activateNextWidget(aFilledWidget);
+ }
+ }
+ else { // there is a greed widget
+ const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
+ std::string aFirstAttributeId = aWidgets.front()->attributeID();
+ // activate next widget after greeded if it is the first widget in the panel
+ // else the first panel widget is already activated by operation start
+ if (aFirstAttributeId == aGreedAttributeId)
+ aPostonedWidgetActivation = true;
+ }
+ }
+ } if (!isOperationCommitted) {
+ anIWorkshop->updateCommandStatus();
+ aWorkshop->connectToPropertyPanel(true);
+ operationStartedInternal(aFOperation);
+
+ // the objects of the current operation should be deactivated
+ QObjectPtrList anObjects;
+ anObjects.append(aFeature);
+ std::list<ResultPtr> aResults = aFeature->results();
+ std::list<ResultPtr>::const_iterator aIt;
+ for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
+ anObjects.append(*aIt);
+ }
+ QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end();
+ for (; anIt != aLast; anIt++)
+ aWorkshop->deactivateActiveObject(*anIt, false);
+ if (anObjects.size() > 0) {
+ XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+ aDisplayer->updateViewer();
+ }
+ }
+ if (aPostonedWidgetActivation) {
+ // if the widget is an empty in the chain of activated widgets, the current operation
+ // is restarted. It should be performed after functionality of the operation starting
+ aPropertyPanel->activateNextWidget(aFilledWidget);
+ }
+ }
+ }
+}
+
+void PartSet_Module::operationStartedInternal(ModuleBase_Operation* theOperation)
{
/// Restart sketcher operations automatically
mySketchReentrantMgr->operationStarted(theOperation);
void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation)
{
- bool isModified = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeArguments, false) ||
- myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false);
+ bool isModifiedArgs = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeArguments, false);
+ bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false);
+ bool isModified = isModifiedArgs || isModifiedResults;
if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
mySketchMgr->stopNestedSketch(theOperation);
aLast = myHasConstraintShown.end();
for (; anIt != aLast; anIt++) {
myHasConstraintShown[anIt.key()];
- mySketchMgr->onShowConstraintsToggle(anIt.value(), myHasConstraintShown[anIt.key()]);
+ mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value());
}
}
FeaturePtr aFeature = ModelAPI_Feature::feature(anObject);
FeaturePtr anOpFeature = aFOperation->feature();
- TopoDS_Shape aShape = aSelectedPrs.shape();
+ GeomShapePtr aShape = aSelectedPrs.shape();
// click on the digit of dimension constrain comes here with an empty shape, so we need the check
- if (aFeature == anOpFeature && !aShape.IsNull()) {
- AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aShape,
+ if (aFeature == anOpFeature && aShape.get() && !aShape->isNull()) {
+ const TopoDS_Shape& aTDShape = aShape->impl<TopoDS_Shape>();
+ AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aTDShape,
mySketchMgr->activeSketch());
if (anAttribute.get()) {
QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation();
aFactory.createWidget(aPropertyPanel->contentWidget(), anAttributeId);
theWidgets = aFactory.getModelWidgets();
- aProcessed = true;
+ // it is possible that the point does not present in XML definition,
+ // in this case, we assume that it is not processed by this module
+ // e.g. "Intersection point" feature
+ aProcessed = !theWidgets.isEmpty();
}
}
}
anOpMgr->onKeyReleased(theWnd->viewPort(), theEvent);
}
-void PartSet_Module::onOperationActivatedByPreselection()
-{
- if (!mySketchReentrantMgr->canBeCommittedByPreselection())
- return;
- mySketchMgr->operationActivatedByPreselection();
-}
-
-ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
- Config_WidgetAPI* theWidgetApi, std::string theParentId)
+ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType,
+ QWidget* theParent,
+ Config_WidgetAPI* theWidgetApi)
{
ModuleBase_IWorkshop* aWorkshop = workshop();
XGUI_Workshop* aXUIWorkshop = getWorkshop();
ModuleBase_ModelWidget* aWgt = NULL;
if (theType == "sketch-start-label") {
PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, aWorkshop,
- theWidgetApi, theParentId, mySketchMgr->showConstraintStates());
+ theWidgetApi, myHasConstraintShown);
connect(aLabelWgt, SIGNAL(planeSelected(const std::shared_ptr<GeomAPI_Pln>&)),
mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr<GeomAPI_Pln>&)));
- connect(aLabelWgt, SIGNAL(showConstraintToggled(bool, int)),
- mySketchMgr, SLOT(onShowConstraintsToggle(bool, int)));
+ connect(aLabelWgt, SIGNAL(showConstraintToggled(int, bool)),
+ mySketchMgr, SLOT(onShowConstraintsToggle(int, bool)));
aWgt = aLabelWgt;
} else if (theType == "sketch-2dpoint_selector") {
PartSet_WidgetPoint2D* aPointWgt = new PartSet_WidgetPoint2D(theParent, aWorkshop,
- theWidgetApi, theParentId);
+ theWidgetApi);
aPointWgt->setSketch(mySketchMgr->activeSketch());
connect(aPointWgt, SIGNAL(vertexSelected()), sketchReentranceMgr(), SLOT(onVertexSelected()));
aWgt = aPointWgt;
}else if (theType == "sketch-2dpoint_flyout_selector") {
PartSet_WidgetPoint2DFlyout* aPointWgt = new PartSet_WidgetPoint2DFlyout(theParent, aWorkshop,
- theWidgetApi, theParentId);
+ theWidgetApi);
aPointWgt->setSketch(mySketchMgr->activeSketch());
connect(aPointWgt, SIGNAL(vertexSelected()), sketchReentranceMgr(), SLOT(onVertexSelected()));
aWgt = aPointWgt;
} else if (theType == "point2ddistance") {
PartSet_WidgetPoint2dDistance* aDistanceWgt = new PartSet_WidgetPoint2dDistance(theParent,
- aWorkshop, theWidgetApi, theParentId);
+ aWorkshop, theWidgetApi);
aDistanceWgt->setSketch(mySketchMgr->activeSketch());
aWgt = aDistanceWgt;
} else if (theType == "sketch_shape_selector") {
PartSet_WidgetShapeSelector* aShapeSelectorWgt =
- new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi, theParentId);
+ new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi);
aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch());
aWgt = aShapeSelectorWgt;
} else if (theType == "sketch_multi_selector") {
PartSet_WidgetMultiSelector* aShapeSelectorWgt =
- new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi, theParentId);
+ new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi);
aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch());
aWgt = aShapeSelectorWgt;
- } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
- aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi, theParentId);
+ } else if (theType == "composite_multi_selector") {
+ PartSet_WidgetMultiSelectorComposite* aShapeSelectorWgt =
+ new PartSet_WidgetMultiSelectorComposite(theParent, aWorkshop, theWidgetApi);
+ aWgt = aShapeSelectorWgt;
+ }
+ else if (theType == WDG_DOUBLEVALUE_EDITOR) {
+ aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi);
} else if (theType == "export_file_selector") {
- aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi, theParentId);
+ aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi);
} else if (theType == "sketch_launcher") {
- aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi, theParentId);
+ aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi);
} else if (theType == "module_choice") {
- aWgt = new PartSet_WidgetChoice(theParent, theWidgetApi, theParentId);
- connect(aWgt, SIGNAL(itemSelected(int)), SLOT(onBooleanOperationChange(int)));
+ aWgt = new PartSet_WidgetChoice(theParent, theWidgetApi);
+ connect(aWgt, SIGNAL(itemSelected(ModuleBase_ModelWidget*, int)),
+ this, SLOT(onChoiceChanged(ModuleBase_ModelWidget*, int)));
}
return aWgt;
}
ModuleBase_IModule::onFeatureTriggered();
}
+void PartSet_Module::editFeature(FeaturePtr theFeature)
+{
+ storeConstraintsState(theFeature->getKind());
+ ModuleBase_IModule::editFeature(theFeature);
+}
+
void PartSet_Module::launchOperation(const QString& theCmdId)
+{
+ storeConstraintsState(theCmdId.toStdString());
+ ModuleBase_IModule::launchOperation(theCmdId);
+}
+
+void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind)
{
if (myWorkshop->currentOperation() &&
myWorkshop->currentOperation()->id().toStdString() == SketchPlugin_Sketch::ID()) {
- const QMap<PartSet_Tools::ConstraintVisibleState, bool>& aShownStates = mySketchMgr->showConstraintStates();
- myHasConstraintShown = aShownStates;
+ const QMap<PartSet_Tools::ConstraintVisibleState, bool>& aShownStates =
+ mySketchMgr->showConstraintStates();
+ myHasConstraintShown = aShownStates;
}
- if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
+ if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str())) {
// Show constraints if a constraint was anOperation
- mySketchMgr->onShowConstraintsToggle(true, PartSet_Tools::Geometrical);
- mySketchMgr->onShowConstraintsToggle(true, PartSet_Tools::Dimensional);
+ mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true);
+ mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true);
+ mySketchMgr->updateBySketchParameters(PartSet_Tools::Expressions,
+ myHasConstraintShown[PartSet_Tools::Expressions]);
}
- ModuleBase_IModule::launchOperation(theCmdId);
}
-
void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
{
Handle(AIS_InteractiveObject) anAIS = theAIS->impl<Handle(AIS_InteractiveObject)>();
}
if (aView.IsNull())
return;
- double aLen = aView->Convert(20);
+ double aLen = aView->Convert(SketcherPrs_Tools::getDefaultArrowSize());
double aPrevLen = SketcherPrs_Tools::getArrowSize();
SketcherPrs_Tools::setArrowSize(aLen);
ObjectPtr anObject = aDisplayer->getObject(thePrs);
if (anObject.get()) {
bool isConflicting = myOverconstraintListener->isConflictingObject(anObject);
- // customize sketcy symbol presentation
+ // customize sketch symbol presentation
if (thePrs.get()) {
Handle(AIS_InteractiveObject) anAISIO = thePrs->impl<Handle(AIS_InteractiveObject)>();
if (!anAISIO.IsNull()) {
aCustomized = true;
}
}
+
+ // customize dimentional constrains
+ sketchMgr()->customizePresentation(anObject);
}
return aCustomized;
}
//******************************************************
-void PartSet_Module::onBooleanOperationChange(int theOperation)
+void PartSet_Module::onChoiceChanged(ModuleBase_ModelWidget* theWidget,
+ int theIndex)
{
- ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
- if (!aOperation)
+ PartSet_WidgetChoice* aChoiceWidget = dynamic_cast<PartSet_WidgetChoice*>(theWidget);
+ if (!aChoiceWidget)
return;
- ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
- switch (theOperation) {
- case 0:
- aPanel->setWindowTitle(tr("Cut"));
- break;
- case 1:
- aPanel->setWindowTitle(tr("Fuse"));
- break;
- case 2:
- aPanel->setWindowTitle(tr("Common"));
- break;
+
+ QString aChoiceTitle = aChoiceWidget->getPropertyPanelTitle(theIndex);
+ if (!aChoiceTitle.isEmpty()) {
+ ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+ if (!aOperation)
+ return;
+ ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+ aPanel->setWindowTitle(aChoiceTitle);
}
}
