#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_MenuMgr.h"
#include "PartSet_CustomPrs.h"
#include "PartSet_IconFactory.h"
+#include "PartSet_WidgetChoice.h"
#include "PartSet_Filters.h"
#include "PartSet_FilterInfinite.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 <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>
XGUI_Workshop* aWorkshop = aConnector->workshop();
XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
- connect(anOpMgr, SIGNAL(keyEnterReleased()), this, SLOT(onEnterReleased()));
connect(anOpMgr, SIGNAL(operationActivatedByPreselection()),
this, SLOT(onOperationActivatedByPreselection()));
aFactory->registerValidator("PartSet_EqualSelection", new PartSet_EqualSelection);
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);
+ aFactory->registerValidator("PartSet_SketchEntityValidator", new PartSet_SketchEntityValidator);
}
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::onOperationCommitted(ModuleBase_Operation* theOperation)
+void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect)
+{
+ mySketchMgr->connectToPropertyPanel(theWidget, isToConnect);
+}
+
+void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation)
{
if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
mySketchMgr->commitNestedSketch(theOperation);
/// 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
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+ XGUI_Workshop* aWorkshop = aConnector->workshop();
+ aWorkshop->selector()->clearSelection();
+ }
}
}
-void PartSet_Module::onOperationAborted(ModuleBase_Operation* theOperation)
+void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation)
{
/// Restart sketcher operations automatically
mySketchReentrantMgr->operationAborted(theOperation);
}
-void PartSet_Module::onOperationStarted(ModuleBase_Operation* theOperation)
+void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation)
{
+ /// Restart sketcher operations automatically
+ mySketchReentrantMgr->operationStarted(theOperation);
+
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
mySketchMgr->startSketch(theOperation);
}
myCustomPrs->activate(aFOperation->feature(), true);
}
-void PartSet_Module::onOperationResumed(ModuleBase_Operation* theOperation)
+void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation)
{
- ModuleBase_IModule::onOperationResumed(theOperation);
+ ModuleBase_IModule::operationResumed(theOperation);
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (aFOperation)
myCustomPrs->activate(aFOperation->feature(), true);
}
-void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
+void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation)
{
bool isModified = myCustomPrs->deactivate(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();
- //}
+ if (isModified) {
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+ XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
+ aDisplayer->updateViewer();
+ }
mySketchMgr->onShowConstraintsToggle(myHasConstraintShown);
}
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;
}
return aValid;
}
-bool PartSet_Module::canCommitOperation() const
-{
- return mySketchMgr->canCommitOperation();
-}
-
bool PartSet_Module::canEraseObject(const ObjectPtr& theObject) const
{
// the sketch manager put the restriction to the objects erase
QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature)
{
QString anError = ModuleBase_IModule::getFeatureError(theFeature);
-
if (anError.isEmpty())
anError = sketchMgr()->getFeatureError(theFeature);
- if (anError.isEmpty()) {
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
- XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
-
- if (anOpMgr->isValidationLocked()) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
- (anOpMgr->currentOperation());
- if (!aFOperation || theFeature == aFOperation->feature())
- anError = "Validation is locked by the current operation";
- }
- }
return anError;
}
void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation)
{
- mySketchReentrantMgr->propertyPanelDefined(theOperation);
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (!aFOperation)
+ return;
+
+ ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel();
+ // we have to manually activate the sketch label in edit mode
+ if (PartSet_SketcherMgr::isSketchOperation(aFOperation) && (aFOperation->isEditOperation()))
+ aPanel->activateWidget(aPanel->modelWidgets().first());
}
anOpMgr->onKeyReleased(theEvent);
}
-void PartSet_Module::onEnterReleased()
-{
- mySketchReentrantMgr->enterReleased();
-}
-
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,
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);
aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi, theParentId);
} else if (theType == "sketch_launcher") {
aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi, theParentId);
+ } else if (theType == "module_choice") {
+ aWgt = new PartSet_WidgetChoice(theParent, theWidgetApi, theParentId);
+ connect(aWgt, SIGNAL(itemSelected(int)), SLOT(onBooleanOperationChange(int)));
}
return aWgt;
}
{
ModuleBase_ModelWidget* anActiveWidget = 0;
- anActiveWidget = mySketchReentrantMgr->activeWidget();
+ anActiveWidget = mySketchReentrantMgr->internalActiveWidget();
if (!anActiveWidget) {
ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
if (aOperation) {
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())
+ myHasConstraintShown = mySketchMgr->isConstraintsShown();
if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
// Show constraints if a constraint was anOperation
- myHasConstraintShown = mySketchMgr->isConstraintsShown();
mySketchMgr->onShowConstraintsToggle(true);
}
ModuleBase_IModule::launchOperation(theCmdId);
{
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();
//aPalet.setColor(QPalette::Text, QColor(0, 72, 140));
//aLabel->setPalette(aPalet);
}
}
+void PartSet_Module::onActiveDocPopup(const QPoint& thePnt)
+{
+ 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();
+ QLabel* aHeader = aWorkshop->objectBrowser()->activeDocLabel();
+
+ aActivatePartAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument()));
+
+ QMenu aMenu;
+ aMenu.addAction(aActivatePartAction);
+ aMenu.exec(aHeader->mapToGlobal(thePnt));
+}
+
+
ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const
{
ObjectPtr anObject;
int aSelected = aObjects.size();
SessionPtr aMgr = ModelAPI_Session::get();
QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD");
- QAction* aActivatePartSetAction = myMenuMgr->action("ACTIVATE_PARTSET_CMD");
ModuleBase_Operation* aCurrentOp = myWorkshop->currentOperation();
if (aSelected == 1) {
ResultBodyPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultBody>(aObject);
if( aResult.get() )
theMenu->addAction(myMenuMgr->action("SELECT_PARENT_CMD"));
- } else { // If feature is 0 the it means that selected root object (document)
- theMenu->addAction(aActivatePartSetAction);
- aActivatePartSetAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument()));
}
- } else if (aSelected == 0) {
- // if there is no selection then it means that upper label is selected
- QModelIndexList aIndexes = myWorkshop->selection()->selectedIndexes();
- if (aIndexes.size() == 0) // it means that selection happens in top label outside of tree view
- theMenu->addAction(aActivatePartSetAction);
- aActivatePartSetAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument()));
}
bool aNotDeactivate = (aCurrentOp == 0);
if (!aNotDeactivate) {
aActivatePartAction->setEnabled(false);
- aActivatePartSetAction->setEnabled(false);
}
}
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
XGUI_Workshop* aWorkshop = aConnector->workshop();
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();
}
}
}
+
+//******************************************************
+void PartSet_Module::widgetStateChanged(int thePreviousState)
+{
+ 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);
+ }
+}
+
+//******************************************************
+void PartSet_Module::onBooleanOperationChange(int theOperation)
+{
+ ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+ if (!aOperation)
+ 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;
+ }
+}
