#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"
PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
: ModuleBase_IModule(theWshop),
- myVisualLayerId(0), myHasConstraintShown(true)
+ myVisualLayerId(0)
{
new PartSet_IconFactory();
SLOT(onViewTransformed(int)));
connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
SLOT(onViewCreated(ModuleBase_IViewWindow*)));
-
myMenuMgr = new PartSet_MenuMgr(this);
myCustomPrs = new PartSet_CustomPrs(theWshop);
mySelectionFilters.Append(new PartSet_GlobalFilter(myWorkshop));
mySelectionFilters.Append(new PartSet_FilterInfinite(myWorkshop));
+
+ myHasConstraintShown[PartSet_Tools::Geometrical] = true;
+ myHasConstraintShown[PartSet_Tools::Dimensional] = true;
+
+ 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()
}
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 isModified = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeArguments, false) ||
+ myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false);
- if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
- mySketchMgr->stopSketch(theOperation);
- }
- else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
+ if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
mySketchMgr->stopNestedSketch(theOperation);
}
//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++) {
+ myHasConstraintShown[anIt.key()];
+ mySketchMgr->onShowConstraintsToggle(anIt.value(), myHasConstraintShown[anIt.key()]);
+ }
}
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.
+ // part features can not be moved in the history.
if (aFeature->getKind() == PartSetPlugin_Part::ID())
aValid = false;
}
{
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();
- }
+ mySketchMgr->operationActivatedByPreselection();
}
ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
ModuleBase_ModelWidget* aWgt = NULL;
if (theType == "sketch-start-label") {
PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, aWorkshop,
- theWidgetApi, theParentId, mySketchMgr->isConstraintsShown());
+ theWidgetApi, theParentId, mySketchMgr->showConstraintStates());
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(bool, int)),
+ mySketchMgr, SLOT(onShowConstraintsToggle(bool, int)));
aWgt = aLabelWgt;
} else if (theType == "sketch-2dpoint_selector") {
PartSet_WidgetPoint2D* aPointWgt = new PartSet_WidgetPoint2D(theParent, aWorkshop,
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);
aPointWgt->setSketch(mySketchMgr->activeSketch());
aWorkshop, theWidgetApi, theParentId);
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);
bool PartSet_Module::deleteObjects()
{
+ bool isProcessed = false;
+
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
XGUI_Workshop* aWorkshop = aConnector->workshop();
XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
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
// 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()
void PartSet_Module::launchOperation(const QString& theCmdId)
{
+ if (myWorkshop->currentOperation() &&
+ myWorkshop->currentOperation()->id().toStdString() == SketchPlugin_Sketch::ID()) {
+ const QMap<PartSet_Tools::ConstraintVisibleState, bool>& aShownStates = mySketchMgr->showConstraintStates();
+ myHasConstraintShown = aShownStates;
+ }
if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
// Show constraints if a constraint was anOperation
- myHasConstraintShown = mySketchMgr->isConstraintsShown();
- mySketchMgr->onShowConstraintsToggle(true);
+ mySketchMgr->onShowConstraintsToggle(true, PartSet_Tools::Geometrical);
+ mySketchMgr->onShowConstraintsToggle(true, PartSet_Tools::Dimensional);
}
ModuleBase_IModule::launchOperation(theCmdId);
}
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::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;
}
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);
+ }
+}
//******************************************************
void PartSet_Module::onBooleanOperationChange(int theOperation)
