#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_WidgetPoint2dAngle.h"
#include "PartSet_WidgetMultiSelector.h"
#include "PartSet_WidgetEditor.h"
#include "PartSet_WidgetFileSelector.h"
#include "PartSet_WidgetSketchCreator.h"
#include "PartSet_SketcherMgr.h"
#include "PartSet_SketcherReetntrantMgr.h"
+#include "PartSet_ResultSketchPrs.h"
#include "PartSet_MenuMgr.h"
#include "PartSet_CustomPrs.h"
#include "PartSet_IconFactory.h"
+#include "PartSet_WidgetChoice.h"
+#include "PartSet_OverconstraintListener.h"
#include "PartSet_Filters.h"
#include "PartSet_FilterInfinite.h"
#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_OperationFeature.h>
-
-#include <GeomValidators_ShapeType.h>
-#include <GeomValidators_Finite.h>
-#include <GeomValidators_Face.h>
-#include <GeomValidators_ConstructionComposite.h>
-#include <GeomValidators_ZeroOffset.h>
-#include <GeomValidators_BooleanArguments.h>
-#include <GeomValidators_Different.h>
-#include <GeomValidators_PartitionArguments.h>
-
+#include <ModuleBase_WidgetFactory.h>
+#include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_ViewerPrs.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Validator.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Session.h>
-#include <GeomValidators_DifferentShapes.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_AttributeString.h>
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Tools.h>
#include <GeomDataAPI_Point2D.h>
#include <GeomDataAPI_Point.h>
#include <XGUI_SelectionMgr.h>
#include <XGUI_DataModel.h>
#include <XGUI_ErrorMgr.h>
+#include <XGUI_CustomPrs.h>
+#include <XGUI_SelectionMgr.h>
#include <SketchPlugin_Feature.h>
#include <SketchPlugin_Sketch.h>
#include <SketchPlugin_ConstraintRadius.h>
#include <SketcherPrs_SymbolPrs.h>
+#include <SketcherPrs_Coincident.h>
#include <SketcherPrs_Tools.h>
#include <Events_Loop.h>
#include <QMessageBox>
#include <QMainWindow>
#include <QLineEdit>
+#include <QString>
#include <GeomAlgoAPI_FaceBuilder.h>
#include <GeomDataAPI_Dir.h>
PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
: ModuleBase_IModule(theWshop),
- myVisualLayerId(0), myHasConstraintShown(true)
+ myVisualLayerId(0)
{
new PartSet_IconFactory();
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*)));
SLOT(onViewTransformed(int)));
connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
SLOT(onViewCreated(ModuleBase_IViewWindow*)));
-
myMenuMgr = new PartSet_MenuMgr(this);
myCustomPrs = new PartSet_CustomPrs(theWshop);
+ myOverconstraintListener = new PartSet_OverconstraintListener(theWshop);
+
Events_Loop* aLoop = Events_Loop::loop();
aLoop->registerListener(this, Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED));
mySelectionFilters.Append(new PartSet_GlobalFilter(myWorkshop));
mySelectionFilters.Append(new PartSet_FilterInfinite(myWorkshop));
+
+ setDefaultConstraintShown();
+
+ Config_PropManager::registerProp("Visualization", "operation_parameter_color",
+ "Reference shape wireframe color in operation", Config_Prop::Color,
+ PartSet_CustomPrs::OPERATION_PARAMETER_COLOR());
+ Config_PropManager::registerProp("Visualization", "operation_result_color",
+ "Result shape wireframe color in operation", Config_Prop::Color,
+ PartSet_CustomPrs::OPERATION_RESULT_COLOR());
+ Config_PropManager::registerProp("Visualization", "operation_highlight_color",
+ "Multi selector item color in operation", Config_Prop::Color,
+ PartSet_CustomPrs::OPERATION_HIGHLIGHT_COLOR());
}
PartSet_Module::~PartSet_Module()
aFilter.Nullify();
}
delete myCustomPrs;
+ delete myOverconstraintListener;
}
void PartSet_Module::activateSelectionFilters()
}
}
+void PartSet_Module::storeSelection()
+{
+ sketchMgr()->storeSelection();
+}
+
+void PartSet_Module::restoreSelection()
+{
+ sketchMgr()->restoreSelection();
+}
+
void PartSet_Module::registerValidators()
{
//Registering of validators
aFactory->registerValidator("PartSet_FilletSelection", new PartSet_FilletSelection);
aFactory->registerValidator("PartSet_AngleSelection", new PartSet_AngleSelection);
aFactory->registerValidator("PartSet_EqualSelection", new PartSet_EqualSelection);
+ aFactory->registerValidator("PartSet_CollinearSelection", new PartSet_CollinearSelection);
+ aFactory->registerValidator("PartSet_MiddlePointSelection", new PartSet_MiddlePointSelection);
aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr);
-
- aFactory->registerValidator("GeomValidators_DifferentShapes", new GeomValidators_DifferentShapes);
- aFactory->registerValidator("GeomValidators_ShapeType", new GeomValidators_ShapeType);
- aFactory->registerValidator("GeomValidators_Face", new GeomValidators_Face);
- aFactory->registerValidator("GeomValidators_Finite", new GeomValidators_Finite);
-
- aFactory->registerValidator("GeomValidators_ConstructionComposite",
- new GeomValidators_ConstructionComposite);
-
- aFactory->registerValidator("GeomValidators_ZeroOffset",
- new GeomValidators_ZeroOffset);
-
- aFactory->registerValidator("GeomValidators_BooleanArguments",
- new GeomValidators_BooleanArguments);
-
- aFactory->registerValidator("PartSet_SketchEntityValidator",
- new PartSet_SketchEntityValidator);
-
- aFactory->registerValidator("GeomValidators_Different",
- new GeomValidators_Different);
-
- aFactory->registerValidator("GeomValidators_PartitionArguments",
- new GeomValidators_PartitionArguments);
}
void PartSet_Module::registerFilters()
PLANE_SIZE);
Config_PropManager::registerProp("Sketch planes", "planes_thickness", "Thickness",
Config_Prop::Integer, SKETCH_WIDTH);
+ Config_PropManager::registerProp("Sketch planes", "rotate_to_plane", "Rotate to plane when selected",
+ Config_Prop::Boolean, "false");
}
void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect)
/// Restart sketcher operations automatically
if (!mySketchReentrantMgr->operationCommitted(theOperation)) {
- // the selection is cleared after commit the create operation
- // in order to do not use the same selected objects in the restarted operation
- // for common behaviour, the selection is cleared even if the operation is not restarted
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
- XGUI_Workshop* aWorkshop = aConnector->workshop();
- aWorkshop->selector()->clearSelection();
+
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (aFOperation && !aFOperation->isEditOperation()) {
+ // the selection is cleared after commit the create operation
+ // in order to do not use the same selected objects in the restarted operation
+ // for common behaviour, the selection is cleared even if the operation is not restarted
+ getWorkshop()->selector()->clearSelection();
+ }
}
}
}
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;
+ ModelAPI_Tools::allResults(aFeature, aResults);
+ 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);
}
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
- if (aFOperation)
- myCustomPrs->activate(aFOperation->feature(), true);
+ if (aFOperation) {
+ myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true);
+ myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true);
+ }
}
void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation)
ModuleBase_IModule::operationResumed(theOperation);
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
- if (aFOperation)
- myCustomPrs->activate(aFOperation->feature(), true);
+ if (aFOperation) {
+ myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true);
+ myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true);
+ }
}
void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation)
{
- bool isModified = myCustomPrs->deactivate(false);
+ bool isModifiedArgs = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeArguments, false);
+ bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false);
+ bool isModified = isModifiedArgs || isModifiedResults;
- if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
- mySketchMgr->stopSketch(theOperation);
- }
- else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
+ if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
mySketchMgr->stopNestedSketch(theOperation);
}
+ else if (PartSet_SketcherMgr::isSketchOperation(theOperation))
+ setDefaultConstraintShown();
//VSV: Viewer is updated on feature update and redisplay
- //if (isModified) {
- // XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- // XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
- // aDisplayer->updateViewer();
- //}
- mySketchMgr->onShowConstraintsToggle(myHasConstraintShown);
+ if (isModified) {
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+ XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
+ aDisplayer->updateViewer();
+ }
+
+ QMap<PartSet_Tools::ConstraintVisibleState, bool>::const_iterator anIt = myHasConstraintShown.begin(),
+ aLast = myHasConstraintShown.end();
+ for (; anIt != aLast; anIt++) {
+ mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value());
+ }
}
ModuleBase_Operation* PartSet_Module::currentOperation() const
bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const
{
bool aValid = true;
- if (theActionId == "DELETE_CMD" || theActionId == "MOVE_CMD") {
+ if (theActionId == "MOVE_CMD") {
FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
if (aFeature) {
- // part features are removed in the PartSet module only.
- if (aFeature->getKind() == PartSetPlugin_Part::ID())
+ ResultPtr aResult = ModuleBase_Tools::firstResult(aFeature);
+ // part features can not be moved in the history.
+ if (aResult.get() && aResult->groupName() == ModelAPI_ResultPart::group())
aValid = false;
}
}
return mySketchMgr->canDisplayObject(theObject);
}
+/*void PartSet_Module::processHiddenObject(const std::list<ObjectPtr>& theObjects)
+{
+ mySketchMgr->processHiddenObject(theObjects);
+}*/
+
bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const
{
bool aCanActivate = ModuleBase_IModule::canActivateSelection(theObject);
return aCanActivate;
}
-bool PartSet_Module::addViewerMenu(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const
+bool PartSet_Module::addViewerMenu(const QMap<QString, QAction*>& theStdActions,
+ QWidget* theParent,
+ QMap<int, QAction*>& theMenuActions) const
{
- return myMenuMgr->addViewerMenu(theMenu, theStdActions);
+ return myMenuMgr->addViewerMenu(theStdActions, theParent, theMenuActions);
}
void PartSet_Module::updateViewerMenu(const QMap<QString, QAction*>& theStdActions)
myMenuMgr->grantedOperationIds(theOperation, theIds);
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
- XGUI_Workshop* aWorkshop = aConnector->workshop();
-
+ XGUI_Workshop* aWorkshop = getWorkshop();
theIds.append(aWorkshop->contextMenuMgr()->action("DELETE_CMD")->text());
}
}
PartSet_SketcherMgr::sketchSelectionModes(theModes);
}
+void PartSet_Module::customSubShapesSelectionModes(QIntList& theTypes)
+{
+ if (theTypes.contains(TopAbs_FACE))
+ theTypes.append(SketcherPrs_Tools::Sel_Sketch_Face);
+ if (theTypes.contains(TopAbs_WIRE))
+ theTypes.append(SketcherPrs_Tools::Sel_Sketch_Wire);
+}
+
bool PartSet_Module::isMouseOverWindow()
{
return mySketchMgr->isMouseOverWindow();
{
myCustomPrs->clearPrs();
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_Workshop* aWorkshop = getWorkshop();
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
aDisplayer->deactivateSelectionFilters();
}
aPanel->activateWidget(aPanel->modelWidgets().first());
}
+bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation,
+ QList<ModuleBase_ModelWidget*>& theWidgets) const
+{
+ bool aProcessed = false;
+
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ XGUI_Workshop* aWorkshop = getWorkshop();
+ XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel();
+ if (mySketchMgr->activeSketch().get() && aFOperation && aPropertyPanel) {
+ ModuleBase_ISelection* aSelection = workshop()->selection();
+ // click on a point in sketch leads here with the point is highlighted, not yet selected
+ QList<ModuleBase_ViewerPrsPtr> aPreselection = aSelection->getHighlighted();
+ if (aPreselection.size() == 1) {
+ ModuleBase_ViewerPrsPtr aSelectedPrs = aPreselection[0];
+ ObjectPtr anObject = aSelectedPrs->object();
+
+ FeaturePtr aFeature = ModelAPI_Feature::feature(anObject);
+ FeaturePtr anOpFeature = aFOperation->feature();
+ 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.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();
+ ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), workshop());
+
+ const std::string anAttributeId = anAttribute->id();
+ aFactory.createWidget(aPropertyPanel->contentWidget(), anAttributeId);
+
+ theWidgets = aFactory.getModelWidgets();
+ // 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();
+ }
+ }
+ }
+ }
+ return aProcessed;
+}
void PartSet_Module::onSelectionChanged()
{
if (isSketcherOp) {
// Editing of constraints can be done on selection
ModuleBase_ISelection* aSelect = myWorkshop->selection();
- QList<ModuleBase_ViewerPrs> aSelected = aSelect->getSelected();
+ QList<ModuleBase_ViewerPrsPtr> aSelected = aSelect->getSelected();
if (aSelected.size() == 1) {
- ModuleBase_ViewerPrs aPrs = aSelected.first();
- ObjectPtr aObject = aPrs.object();
+ ModuleBase_ViewerPrsPtr aPrs = aSelected.first();
+ ObjectPtr aObject = aPrs->object();
FeaturePtr aFeature = ModelAPI_Feature::feature(aObject);
if (aFeature) {
std::string aId = aFeature->getKind();
{
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
- anOpMgr->onKeyReleased(theEvent);
+ anOpMgr->onKeyReleased(theWnd->viewPort(), theEvent);
}
-void PartSet_Module::onOperationActivatedByPreselection()
-{
- if (!mySketchReentrantMgr->canBeCommittedByPreselection())
- return;
-
- ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
- if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
- // Set final definitions if they are necessary
- //propertyPanelDefined(aOperation);
-
- /// Commit sketcher operations automatically
- anOperation->commit();
- }
-}
-
-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_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(aWorkshop);
- XGUI_Workshop* aXUIWorkshop = aConnector->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->isConstraintsShown());
+ 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)),
- mySketchMgr, SLOT(onShowConstraintsToggle(bool)));
+ 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") {
+ }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 == "point2dangle") {
- PartSet_WidgetPoint2dAngle* anAngleWgt = new PartSet_WidgetPoint2dAngle(theParent,
- aWorkshop, theWidgetApi, theParentId);
- anAngleWgt->setSketch(mySketchMgr->activeSketch());
- aWgt = anAngleWgt;
} 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 == 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);
+ connect(aWgt, SIGNAL(itemSelected(ModuleBase_ModelWidget*, int)),
+ this, SLOT(onChoiceChanged(ModuleBase_ModelWidget*, int)));
}
return aWgt;
}
bool PartSet_Module::deleteObjects()
{
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
- XGUI_Workshop* aWorkshop = aConnector->workshop();
+ bool isProcessed = false;
+
+ XGUI_Workshop* aWorkshop = getWorkshop();
XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
//SessionPtr aMgr = ModelAPI_Session::get();
bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation),
isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation);
if (isSketchOp || isNestedOp) {
+ isProcessed = true;
// 2. find selected presentations
// selected objects should be collected before the current operation abort because
// the abort leads to selection lost on constraint objects. It can be corrected after #386 issue
anOpMgr->startOperation(anOpAction);
+ // WORKAROUND, should be done to avoid viewer highlight update after deletetion of objects
+ // the problem is in AIS Dimensions recompute if a line and the dim are removed, line is the first
+ // it causes the AIS recompute, where the base line is null, the result is empty AIS in the viewer
+ XGUI_Tools::workshop(myWorkshop)->selector()->clearSelection();
+
// 4. delete features
// sketch feature should be skipped, only sub-features can be removed
// when sketch operation is active
// 5. stop operation
anOpMgr->commitOperation();
}
- else {
- bool isPartRemoved = false;
- // Delete part with help of PartSet plugin
- // TODO: the deleted objects has to be processed by multiselection
- QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();
- if (aObjects.size() == 1) {
- ObjectPtr aObj = aObjects.first();
- FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
- if (aFeature.get() && (aFeature->getKind() == PartSetPlugin_Part::ID())) {
- // Remove feature should be created in the document of the part results
- ResultPtr aPartResult = aFeature->firstResult();
- if (aPartResult.get()) {
- std::shared_ptr<ModelAPI_ResultPart> aPart =
- std::dynamic_pointer_cast<ModelAPI_ResultPart>(aPartResult);
- DocumentPtr aPartDoc = aPart->partDoc();
- if (aPartDoc.get()) {
- ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction
- (PartSetPlugin_Remove::ID().c_str(), this);
- if (!anOpMgr->canStartOperation(anOpAction->id()))
- return true; // the objects are processed but can not be deleted
-
- anOpMgr->startOperation(anOpAction);
-
- FeaturePtr aFeature = aPartDoc->addFeature(PartSetPlugin_Remove::ID());
- aFeature->execute();
-
- anOpMgr->commitOperation();
- isPartRemoved = true;
- }
- }
- }
- }
- return isPartRemoved;
- }
- return true;
+ return isProcessed;
}
void PartSet_Module::onFeatureTriggered()
{
- QAction* aCmd = dynamic_cast<QAction*>(sender());
+ // is commented for imp: Unpressing the button of the current action must behave like
+ // a validation if the entity can be created (instead of Cancel, as currently)
+ /*QAction* aCmd = dynamic_cast<QAction*>(sender());
if (aCmd->isCheckable() && aCmd->isChecked()) {
// 1. check whether the delete should be processed in the module
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
launchOperation(aCmd->data().toString());
}
}
- }
+ }*/
ModuleBase_IModule::onFeatureTriggered();
}
+void PartSet_Module::editFeature(FeaturePtr theFeature)
+{
+ storeConstraintsState(theFeature->getKind());
+ ModuleBase_IModule::editFeature(theFeature);
+}
+
+bool PartSet_Module::canCommitOperation() const
+{
+ return true;
+}
+
void PartSet_Module::launchOperation(const QString& theCmdId)
{
- if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
- // Show constraints if a constraint was anOperation
- myHasConstraintShown = mySketchMgr->isConstraintsShown();
- mySketchMgr->onShowConstraintsToggle(true);
- }
+ storeConstraintsState(theCmdId.toStdString());
+ updateConstraintsState(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;
+ }
+}
+
+void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind)
+{
+ if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str())) {
+ // Show constraints if a constraint was anOperation
+ mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true);
+ mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true);
+ mySketchMgr->updateBySketchParameters(PartSet_Tools::Expressions,
+ myHasConstraintShown[PartSet_Tools::Expressions]);
+ }
+}
void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
{
//Handle(V3d_View) aView = aViewer->activeView();
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_Workshop* aWorkshop = getWorkshop();
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer();
Handle(V3d_View) aView;
}
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);
aDisplayer->updateViewer();
}
-bool PartSet_Module::customizeObject(ObjectPtr theObject, const bool theUpdateViewer)
+void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, const ModuleBase_CustomizeFlag& theFlag,
+ const bool theUpdateViewer)
+{
+ myCustomPrs->activate(theFeature, theFlag, theUpdateViewer);
+}
+
+void PartSet_Module::deactivateCustomPrs(const ModuleBase_CustomizeFlag& theFlag,
+ const bool theUpdateViewer)
+{
+ myCustomPrs->deactivate(theFlag, theUpdateViewer);
+}
+
+bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr thePrs,
+ std::shared_ptr<GeomAPI_ICustomPrs> theCustomPrs)
+{
+ bool aCustomized = false;
+
+ XGUI_Workshop* aWorkshop = getWorkshop();
+ XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+ ObjectPtr anObject = aDisplayer->getObject(thePrs);
+ if (!anObject)
+ return aCustomized;
+
+ if (!theResult.get()) {
+ bool isConflicting = myOverconstraintListener->isConflictingObject(anObject);
+ // customize sketch symbol presentation
+ if (thePrs.get()) {
+ Handle(AIS_InteractiveObject) anAISIO = thePrs->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAISIO.IsNull()) {
+ if (!Handle(SketcherPrs_SymbolPrs)::DownCast(anAISIO).IsNull()) {
+ Handle(SketcherPrs_SymbolPrs) aPrs = Handle(SketcherPrs_SymbolPrs)::DownCast(anAISIO);
+ if (!aPrs.IsNull()) {
+ std::vector<int> aColor;
+ myOverconstraintListener->getConflictingColor(aColor);
+ aPrs->SetConflictingConstraint(isConflicting, aColor);
+ aCustomized = true;
+ }
+ } else if (!Handle(SketcherPrs_Coincident)::DownCast(anAISIO).IsNull()) {
+ Handle(SketcherPrs_Coincident) aPrs = Handle(SketcherPrs_Coincident)::DownCast(anAISIO);
+ if (!aPrs.IsNull()) {
+ std::vector<int> aColor;
+ myOverconstraintListener->getConflictingColor(aColor);
+ aPrs->SetConflictingConstraint(isConflicting, aColor);
+ aCustomized = true;
+ }
+ }
+ }
+ }
+ // customize sketch dimension constraint presentation
+ if (!aCustomized) {
+ std::vector<int> aColor;
+ if (isConflicting) {
+ myOverconstraintListener->getConflictingColor(aColor);
+ }
+ if (aColor.empty())
+ XGUI_CustomPrs::getDefaultColor(anObject, true, aColor);
+ if (!aColor.empty()) {
+ aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]);
+ }
+ }
+ }
+ // customize dimentional constrains
+ sketchMgr()->customizePresentation(anObject);
+
+ return aCustomized;
+}
+
+bool PartSet_Module::customizeObject(ObjectPtr theObject, const ModuleBase_CustomizeFlag& theFlag,
+ const bool theUpdateViewer)
{
bool isRedisplayed = false;
- if (myCustomPrs->isActive())
- isRedisplayed = myCustomPrs->redisplay(theObject, theUpdateViewer);
+ if (myCustomPrs->isActive(theFlag))
+ isRedisplayed = myCustomPrs->redisplay(theObject, theFlag, theUpdateViewer);
return isRedisplayed;
}
{
XGUI_ObjectsBrowser* aOB = dynamic_cast<XGUI_ObjectsBrowser*>(theObjectBrowser);
if (aOB) {
- QLineEdit* aLabel = aOB->activeDocLabel();
+ QLabel* aLabel = aOB->activeDocLabel();
+ aLabel->installEventFilter(myMenuMgr);
connect(aLabel, SIGNAL(customContextMenuRequested(const QPoint&)),
SLOT(onActiveDocPopup(const QPoint&)));
//QPalette aPalet = aLabel->palette();
SessionPtr aMgr = ModelAPI_Session::get();
QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PARTSET_CMD");
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
- QLineEdit* aHeader = aWorkshop->objectBrowser()->activeDocLabel();
+ XGUI_Workshop* aWorkshop = getWorkshop();
+ QLabel* aHeader = aWorkshop->objectBrowser()->activeDocLabel();
aActivatePartAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument()));
aMenu.exec(aHeader->mapToGlobal(thePnt));
}
+Handle(AIS_InteractiveObject) PartSet_Module::createPresentation(const ResultPtr& theResult)
+{
+ return mySketchMgr->createPresentation(theResult);
+}
+
ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const
{
if (aOperation) {
/// If last line finished on vertex the lines creation sequence has to be break
ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
- ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
- // if there is an active widget, find the presented object in it
- if (!anActiveWidget)
- anActiveWidget = aPanel->preselectionWidget();
+ if (aPanel) {
+ ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
+ // if there is an active widget, find the presented object in it
+ if (!anActiveWidget)
+ anActiveWidget = aPanel->preselectionWidget();
- ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
- (anActiveWidget);
- if (aWidgetValidated)
- anObject = aWidgetValidated->findPresentedObject(theAIS);
+ ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+ (anActiveWidget);
+ if (aWidgetValidated)
+ anObject = aWidgetValidated->findPresentedObject(theAIS);
+ }
}
return anObject;
}
+bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const
+{
+ bool aCanBeShaged = true;
+
+ Handle(PartSet_ResultSketchPrs) aPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theAIS);
+ if (!aPrs.IsNull())
+ aCanBeShaged = false;
+
+ return aCanBeShaged;
+}
+
void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const
{
QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();
bool hasResult = false;
bool hasFeature = false;
bool hasParameter = false;
- bool hasSubFeature = false;
- ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature);
-
+ bool hasCompositeOwner = false;
+ ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
+ hasCompositeOwner);
ObjectPtr aObject = aObjects.first();
if (aObject) {
ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
if (myWorkshop->currentOperation() &&
(!aAllowActivationList.contains(myWorkshop->currentOperation()->id())))
return;
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_Workshop* aWorkshop = getWorkshop();
XGUI_DataTree* aTreeView = aWorkshop->objectBrowser()->treeView();
- QLineEdit* aLabel = aWorkshop->objectBrowser()->activeDocLabel();
+ QLabel* aLabel = aWorkshop->objectBrowser()->activeDocLabel();
QPalette aPalet = aLabel->palette();
SessionPtr aMgr = ModelAPI_Session::get();
if (theIndex.column() != 0) // Use only first column
return;
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
- XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_Workshop* aWorkshop = getWorkshop();
XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel();
// De not use non editable Indexes
if ((aDataModel->flags(theIndex) & Qt::ItemIsSelectable) == 0)
{
mySketchMgr->widgetStateChanged(thePreviousState);
}
+
+bool PartSet_Module::processEnter(const std::string& thePreviousAttributeID)
+{
+ return mySketchReentrantMgr->processEnter(thePreviousAttributeID);
+}
+
+//******************************************************
+void PartSet_Module::beforeOperationStarted(ModuleBase_Operation* theOperation)
+{
+}
+
+//******************************************************
+void PartSet_Module::beforeOperationStopped(ModuleBase_Operation* theOperation)
+{
+ if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
+ mySketchMgr->stopSketch(theOperation);
+ }
+}
+
+//******************************************************
+GeomShapePtr PartSet_Module::findShape(const AttributePtr& theAttribute)
+{
+ GeomShapePtr aGeomShape;
+
+ ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
+ if (anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
+ aGeomShape = PartSet_Tools::findShapeBy2DPoint(theAttribute, myWorkshop);
+ }
+ return aGeomShape;
+}
+
+//******************************************************
+AttributePtr PartSet_Module::findAttribute(const ObjectPtr& theObject,
+ const GeomShapePtr& theGeomShape)
+{
+ AttributePtr anAttribute;
+ GeomShapePtr aGeomShape = theGeomShape;
+ if (!aGeomShape.get()) {
+ // processing shape of result, e.g. sketch circle center is selected, this is a result
+ // the geom shape is empty, the shape of result should be used
+ ResultPtr aResult = std::dynamic_pointer_cast<ModelAPI_Result>(theObject);
+ if (aResult.get()) {
+ aGeomShape = aResult->shape();
+ }
+ }
+
+ if (aGeomShape.get()) {
+ TopoDS_Shape aTDSShape = aGeomShape->impl<TopoDS_Shape>();
+ return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape,
+ mySketchMgr->activeSketch());
+ }
+ return anAttribute;
+}
+
+//******************************************************
+void PartSet_Module::onChoiceChanged(ModuleBase_ModelWidget* theWidget,
+ int theIndex)
+{
+ PartSet_WidgetChoice* aChoiceWidget = dynamic_cast<PartSet_WidgetChoice*>(theWidget);
+ if (!aChoiceWidget)
+ return;
+
+ QString aChoiceTitle = aChoiceWidget->getPropertyPanelTitle(theIndex);
+ if (!aChoiceTitle.isEmpty()) {
+ ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+ if (!aOperation)
+ return;
+ ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+ if (aPanel)
+ aPanel->setWindowTitle(aChoiceTitle);
+ }
+}
+
+//******************************************************
+XGUI_Workshop* PartSet_Module::getWorkshop() const
+{
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+ return aConnector->workshop();
+}
+
+//******************************************************
+void PartSet_Module::setDefaultConstraintShown()
+{
+ myHasConstraintShown[PartSet_Tools::Geometrical] = true;
+ myHasConstraintShown[PartSet_Tools::Dimensional] = true;
+ myHasConstraintShown[PartSet_Tools::Expressions] = false;
+}