#include "PartSet_WidgetSketchLabel.h"
#include "PartSet_Validators.h"
#include "PartSet_Tools.h"
-#include "ModuleBase_WidgetValidated.h"
#include "PartSet_WidgetPoint2d.h"
#include "PartSet_WidgetPoint2dDistance.h"
#include "PartSet_WidgetShapeSelector.h"
#include "PartSet_WidgetSketchCreator.h"
#include "PartSet_SketcherMgr.h"
#include "PartSet_MenuMgr.h"
-#include <PartSet_CustomPrs.h>
+#include "PartSet_CustomPrs.h"
+#include "PartSet_IconFactory.h"
#include "PartSet_Filters.h"
#include "PartSet_FilterInfinite.h"
#include <PartSetPlugin_Remove.h>
#include <PartSetPlugin_Part.h>
+#include <PartSetPlugin_Duplicate.h>
#include <ModuleBase_Operation.h>
+#include <ModuleBase_OperationAction.h>
#include <ModuleBase_IViewer.h>
#include <ModuleBase_IViewWindow.h>
#include <ModuleBase_IPropertyPanel.h>
#include <ModuleBase_WidgetEditor.h>
+#include <ModuleBase_WidgetValidated.h>
#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_Tools.h>
-#include <GeomValidators_ShapeType.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_Validator.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Session.h>
-#include <ModelAPI_ShapeValidator.h>
+#include <GeomValidators_DifferentShapes.h>
+#include <ModelAPI_ResultBody.h>
+#include <ModelAPI_AttributeString.h>
#include <GeomDataAPI_Point2D.h>
#include <GeomDataAPI_Point.h>
#include <XGUI_Tools.h>
#include <XGUI_ObjectsBrowser.h>
#include <XGUI_SelectionMgr.h>
+#include <XGUI_DataModel.h>
+#include <XGUI_ErrorMgr.h>
#include <SketchPlugin_Feature.h>
#include <SketchPlugin_Sketch.h>
#include <SketchPlugin_Arc.h>
#include <SketchPlugin_Circle.h>
#include <SketchPlugin_Point.h>
+#include <SketchPlugin_ConstraintAngle.h>
#include <SketchPlugin_ConstraintLength.h>
#include <SketchPlugin_ConstraintDistance.h>
#include <SketchPlugin_ConstraintParallel.h>
#include <QDebug>
#endif
-
-
/*!Create and return new instance of XGUI_Module*/
extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* theWshop)
{
PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
: ModuleBase_IModule(theWshop),
- myRestartingMode(RM_None), myVisualLayerId(0)
+ myRestartingMode(RM_None), myVisualLayerId(0), myHasConstraintShown(true)
{
+ new PartSet_IconFactory();
+
mySketchMgr = new PartSet_SketcherMgr(this);
+#ifdef ModuleDataModel
myDataModel = new PartSet_DocumentDataModel(this);
+#endif
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWshop);
XGUI_Workshop* aWorkshop = aConnector->workshop();
this, SLOT(onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*)));
connect(aViewer, SIGNAL(viewTransformed(int)),
SLOT(onViewTransformed(int)));
+ connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)),
+ SLOT(onViewCreated(ModuleBase_IViewWindow*)));
myMenuMgr = new PartSet_MenuMgr(this);
myCustomPrs = new PartSet_CustomPrs(theWshop);
if (!aFilter.IsNull())
aFilter.Nullify();
}
+ delete myCustomPrs;
}
void PartSet_Module::activateSelectionFilters()
aFactory->registerValidator("PartSet_HVDirSelection", new PartSet_HVDirSelection);
aFactory->registerValidator("PartSet_TangentSelection", new PartSet_TangentSelection);
aFactory->registerValidator("PartSet_FilletSelection", new PartSet_FilletSelection);
-
+ aFactory->registerValidator("PartSet_AngleSelection", new PartSet_AngleSelection);
aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
- aFactory->registerValidator("PartSet_DifferentShapes", new ModelAPI_ShapeValidator);
+ 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("PartSet_SketchEntityValidator",
new PartSet_SketchEntityValidator);
- aFactory->registerValidator("PartSet_SameTypeAttr",
- new PartSet_SameTypeAttrValidator);
+ aFactory->registerValidator("GeomValidators_Different",
+ new GeomValidators_Different);
+
+ aFactory->registerValidator("GeomValidators_PartitionArguments",
+ new GeomValidators_PartitionArguments);
}
void PartSet_Module::registerFilters()
mySketchMgr->commitNestedSketch(theOperation);
}
- if (theOperation->isEditOperation())
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (!aFOperation || aFOperation->isEditOperation())
return;
// the selection is cleared after commit the create operation
// in order to do not use the same selected objects in the restarted operation
aWorkshop->selector()->clearSelection();
/// Restart sketcher operations automatically
- FeaturePtr aFeature = theOperation->feature();
+ FeaturePtr aFeature = aFOperation->feature();
std::shared_ptr<SketchPlugin_Feature> aSPFeature =
std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
if (aSPFeature && (myRestartingMode == RM_LastFeatureUsed ||
myRestartingMode == RM_EmptyFeatureUsed)) {
- myLastOperationId = theOperation->id();
- myLastFeature = myRestartingMode == RM_LastFeatureUsed ? theOperation->feature() : FeaturePtr();
-
- launchOperation(myLastOperationId);
+ myLastOperationId = aFOperation->id();
+ myLastFeature = myRestartingMode == RM_LastFeatureUsed ? aFOperation->feature() : FeaturePtr();
+ if (!sketchMgr()->sketchSolverError())
+ launchOperation(myLastOperationId);
}
breakOperationSequence();
}
void PartSet_Module::onOperationStarted(ModuleBase_Operation* theOperation)
{
- // z layer is created for all started operations in order to visualize operation AIS presentation
- // over the object
- Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer();
- aViewer->AddZLayer(myVisualLayerId);
-
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
mySketchMgr->startSketch(theOperation);
}
mySketchMgr->startNestedSketch(theOperation);
}
- myCustomPrs->activate(theOperation->feature());
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (aFOperation)
+ myCustomPrs->activate(aFOperation->feature(), true);
+}
+
+void PartSet_Module::onOperationResumed(ModuleBase_Operation* theOperation)
+{
+ ModuleBase_IModule::onOperationResumed(theOperation);
+
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (aFOperation)
+ myCustomPrs->activate(aFOperation->feature(), true);
}
void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
{
- // the custom presentation should be deactivated before stop sketch,
- // because it uses the active sketch of the sketch manager without checking if it is not null
- Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer();
- aViewer->RemoveZLayer(myVisualLayerId);
- myVisualLayerId = 0;
- myCustomPrs->deactivate();
+ bool isModified = myCustomPrs->deactivate(false);
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
mySketchMgr->stopSketch(theOperation);
else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
mySketchMgr->stopNestedSketch(theOperation);
}
+
+ if (isModified) {
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+ XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer();
+ aDisplayer->updateViewer();
+ }
+ mySketchMgr->onShowConstraintsToggle(myHasConstraintShown);
}
ModuleBase_Operation* PartSet_Module::currentOperation() const
return aCanRedo;
}
+bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const
+{
+ bool aValid = true;
+ if (theActionId == "DELETE_CMD" || 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())
+ 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
+ return mySketchMgr->canEraseObject(theObject);
+}
+
bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const
{
// the sketch manager put the restriction to the objects display
if (isSketchOp || isNestedOp) {
// in active sketch operation it is possible to activate operation object in selection
// in the edit operation, e.g. points of the line can be moved when the line is edited
- aCanActivate = aCanActivate || anOperation->isEditOperation();
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(anOperation);
+ aCanActivate = aCanActivate || (aFOperation && aFOperation->isEditOperation());
}
return aCanActivate;
}
return myMenuMgr->addViewerMenu(theMenu, theStdActions);
}
+void PartSet_Module::updateViewerMenu(const QMap<QString, QAction*>& theStdActions)
+{
+ myMenuMgr->updateViewerMenu(theStdActions);
+}
+
+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::activeSelectionModes(QIntList& theModes)
{
theModes.clear();
return mySketchMgr->isMouseOverWindow();
}
+void PartSet_Module::closeDocument()
+{
+ clearViewer();
+}
+
+void PartSet_Module::clearViewer()
+{
+ myCustomPrs->clearPrs();
+
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+ XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+ aDisplayer->deactivateSelectionFilters();
+}
+
void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation)
{
- ModuleBase_IPropertyPanel* aPanel = theOperation->propertyPanel();
- if (PartSet_SketcherMgr::isSketchOperation(theOperation) && (theOperation->isEditOperation())) {
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ if (!aFOperation)
+ return;
+
+ ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel();
+ if (PartSet_SketcherMgr::isSketchOperation(aFOperation) && (aFOperation->isEditOperation())) {
// we have to manually activate the sketch label in edit mode
aPanel->activateWidget(aPanel->modelWidgets().first());
return;
}
// Restart last operation type
- if ((theOperation->id() == myLastOperationId) && myLastFeature) {
+ if ((aFOperation->id() == myLastOperationId) && myLastFeature) {
ModuleBase_ModelWidget* aWgt = aPanel->activeWidget();
- if (theOperation->id().toStdString() == SketchPlugin_Line::ID()) {
+ if (aFOperation->id().toStdString() == SketchPlugin_Line::ID()) {
// Initialise new line with first point equal to end of previous
PartSet_WidgetPoint2D* aPnt2dWgt = dynamic_cast<PartSet_WidgetPoint2D*>(aWgt);
if (aPnt2dWgt) {
std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Line::END_ID()));
if (aPoint) {
aPnt2dWgt->setPoint(aPoint->x(), aPoint->y());
- PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), theOperation->feature(),
+ PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), aFOperation->feature(),
aWgt->attributeID(), aPoint->x(), aPoint->y());
aPanel->activateNextWidget(aPnt2dWgt);
}
std::string aId = aFeature->getKind();
if ((aId == SketchPlugin_ConstraintRadius::ID()) ||
(aId == SketchPlugin_ConstraintLength::ID()) ||
- (aId == SketchPlugin_ConstraintDistance::ID())) {
+ (aId == SketchPlugin_ConstraintDistance::ID()) ||
+ (aId == SketchPlugin_ConstraintAngle::ID())) {
editFeature(aFeature);
}
}
if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
if (myRestartingMode != RM_Forbided)
myRestartingMode = RM_LastFeatureUsed;
- anOperation->commit();
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+ XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
+ // do nothing if the feature can not be applyed
+ if (anOpMgr->isApplyEnabled())
+ anOperation->commit();
}
}
}
bool PartSet_Module::deleteObjects()
{
- SessionPtr aMgr = ModelAPI_Session::get();
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+ XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
+
+ //SessionPtr aMgr = ModelAPI_Session::get();
// 1. check whether the delete should be processed in the module
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation),
// 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
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
- XGUI_Workshop* aWorkshop = aConnector->workshop();
ModuleBase_ISelection* aSel = workshop()->selection();
QObjectPtrList aSelectedObj = aSel->selectedPresentations();
// if there are no selected objects in the viewer, that means that the selection in another
if (aSketchObjects.size() == 0)
return true;
- // the active nested sketch operation should be aborted unconditionally
- if (isNestedOp)
- anOperation->abort();
-
// 3. start operation
QString aDescription = aWorkshop->contextMenuMgr()->action("DELETE_CMD")->text();
- aMgr->startOperation(aDescription.toStdString());
+ ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, this);
+
+ // the active nested sketch operation should be aborted unconditionally
+ // the Delete action should be additionally granted for the Sketch operation
+ // in order to do not abort/commit it
+ if (!anOpMgr->canStartOperation(anOpAction->id(), isSketchOp/*granted*/))
+ return true; // the objects are processed but can not be deleted
+
+ anOpMgr->startOperation(anOpAction);
// 4. delete features
// sketch feature should be skipped, only sub-features can be removed
// when sketch operation is active
- std::set<FeaturePtr> anIgnoredFeatures;
- anIgnoredFeatures.insert(mySketchMgr->activeSketch());
- aWorkshop->deleteFeatures(aSketchObjects, anIgnoredFeatures);
-
+ aWorkshop->deleteFeatures(aSketchObjects);
// 5. stop operation
- aWorkshop->displayer()->updateViewer();
- aMgr->finishOperation();
- } else {
+ anOpMgr->commitOperation();
+ }
+ else {
bool isPartRemoved = false;
// Delete part with help of PartSet plugin
// TODO: the deleted objects has to be processed by multiselection
std::dynamic_pointer_cast<ModelAPI_ResultPart>(aPartResult);
DocumentPtr aPartDoc = aPart->partDoc();
if (aPartDoc.get()) {
- aMgr->startOperation(PartSetPlugin_Remove::ID());
+ 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();
- aMgr->finishOperation();
+
+ anOpMgr->commitOperation();
isPartRemoved = true;
}
}
void PartSet_Module::onFeatureTriggered()
{
- SessionPtr aMgr = ModelAPI_Session::get();
- // 1. check whether the delete should be processed in the module
- ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
- bool isNestedOp = PartSet_SketcherMgr::isNestedCreateOperation(anOperation);
- if (isNestedOp) {
- // in case if in the viewer nothing is displayed, the create operation should not be
- // comitted even if all values of the feature are initialized
- if (!mySketchMgr->canDisplayCurrentCreatedFeature()) {
- QAction* aCmd = dynamic_cast<QAction*>(sender());
- //Do nothing on uncheck
- if (aCmd->isCheckable() && !aCmd->isChecked())
- return;
-
- // the action information should be saved before the operation is aborted
- // because this abort leads to update command status, which unchecks this action
- anOperation->abort();
-
- launchOperation(aCmd->data().toString());
+ 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();
+ bool isNestedOp = PartSet_SketcherMgr::isNestedCreateOperation(anOperation);
+ if (isNestedOp) {
+ // in case if in the viewer nothing is displayed, the create operation should not be
+ // comitted even if all values of the feature are initialized
+ if (!mySketchMgr->canDisplayCurrentCreatedFeature()) {
+ // the action information should be saved before the operation is aborted
+ // because this abort leads to update command status, which unchecks this action
+ anOperation->abort();
+ launchOperation(aCmd->data().toString());
+ }
}
}
ModuleBase_IModule::onFeatureTriggered();
}
+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);
+ }
+ ModuleBase_IModule::launchOperation(theCmdId);
+}
+
+
void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
{
Handle(AIS_InteractiveObject) anAIS = theAIS->impl<Handle(AIS_InteractiveObject)>();
}
}
+void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAIS)
+{
+ // this is obsolete
+ // it should be recomputed in order to disappear in the viewer if the corresponded object
+ // is erased
+ //if (myCustomPrs->isActive())
+ // myCustomPrs->redisplay(theObject, false);
+}
+
void PartSet_Module::onViewTransformed(int theTrsfType)
{
// Set length of arrows constant in pixel size
// if the operation is panning or rotate or panglobal then do nothing
if ((theTrsfType == 1) || (theTrsfType == 3) || (theTrsfType == 4))
return;
-
ModuleBase_IViewer* aViewer = myWorkshop->viewer();
+ Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
+ if (aContext.IsNull())
+ return;
+
//Handle(V3d_View) aView = aViewer->activeView();
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
XGUI_Workshop* aWorkshop = aConnector->workshop();
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
- Handle(AIS_InteractiveContext) aContext = aViewer->AISContext();
-
Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer();
Handle(V3d_View) aView;
double aScale = 0;
aDisplayer->updateViewer();
}
-void PartSet_Module::customizeObject(ObjectPtr theObject)
+bool PartSet_Module::customizeObject(ObjectPtr theObject, const bool theUpdateViewer)
{
+ bool isRedisplayed = false;
if (myCustomPrs->isActive())
- myCustomPrs->customize(theObject);
+ isRedisplayed = myCustomPrs->redisplay(theObject, theUpdateViewer);
+
+ return isRedisplayed;
}
void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser)
{
XGUI_ObjectsBrowser* aOB = dynamic_cast<XGUI_ObjectsBrowser*>(theObjectBrowser);
if (aOB) {
- QLineEdit* aLabel = aOB->activeDocLabel();
- QPalette aPalet = aLabel->palette();
- aPalet.setColor(QPalette::Text, QColor(0, 72, 140));
- aLabel->setPalette(aPalet);
+ //QLineEdit* aLabel = aOB->activeDocLabel();
+ //QPalette aPalet = aLabel->palette();
+ //aPalet.setColor(QPalette::Text, QColor(0, 72, 140));
+ //aLabel->setPalette(aPalet);
aOB->treeView()->setExpandsOnDoubleClick(false);
connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)),
SLOT(onTreeViewDoubleClick(const QModelIndex&)));
+#ifdef ModuleDataModel
connect(aOB, SIGNAL(headerMouseDblClicked(const QModelIndex&)),
SLOT(onTreeViewDoubleClick(const QModelIndex&)));
connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)),
myDataModel, SLOT(onMouseDoubleClick(const QModelIndex&)));
+#endif
}
}
QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();
int aSelected = aObjects.size();
SessionPtr aMgr = ModelAPI_Session::get();
+ QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD");
+ QAction* aActivatePartSetAction = myMenuMgr->action("ACTIVATE_PARTSET_CMD");
if (aSelected == 1) {
bool hasResult = false;
bool hasFeature = false;
}
if (aPart.get()) // this may be null is Part feature is disabled
aPartDoc = aPart->partDoc();
- if (aMgr->activeDocument() == aPartDoc)
- theMenu->addAction(myMenuMgr->action("DEACTIVATE_PART_CMD"));
- else
- theMenu->addAction(myMenuMgr->action("ACTIVATE_PART_CMD"));
+
+ theMenu->addAction(aActivatePartAction);
+ aActivatePartAction->setEnabled((aMgr->activeDocument() != aPartDoc));
+
} else if (aObject->document() == aMgr->activeDocument()) {
if (hasParameter || hasFeature)
theMenu->addAction(myMenuMgr->action("EDIT_CMD"));
}
+
+ 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)
- if (aMgr->activeDocument() != aMgr->moduleDocument())
- theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD"));
+ 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
- if (aMgr->activeDocument() != aMgr->moduleDocument())
- theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD"));
+ theMenu->addAction(aActivatePartSetAction);
+ aActivatePartSetAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument()));
+ }
+ bool aNotDeactivate = (myWorkshop->currentOperation() == 0);
+ if (!aNotDeactivate) {
+ aActivatePartAction->setEnabled(false);
+ aActivatePartSetAction->setEnabled(false);
}
- bool aCanDeactivate = (myWorkshop->currentOperation() == 0);
- myMenuMgr->action("ACTIVATE_PARTSET_CMD")->setEnabled(aCanDeactivate);
- myMenuMgr->action("DEACTIVATE_PART_CMD")->setEnabled(aCanDeactivate);
- myMenuMgr->action("ACTIVATE_PART_CMD")->setEnabled(aCanDeactivate);
}
void PartSet_Module::processEvent(const std::shared_ptr<Events_Message>& theMessage)
{
if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) {
// Do not change activation of parts if an operation active
- if (myWorkshop->currentOperation() && myWorkshop->currentOperation()->id().toStdString() != PartSetPlugin_Part::ID())
+ static QStringList aAllowActivationList;
+ if (aAllowActivationList.isEmpty())
+ aAllowActivationList <<
+ QString(PartSetPlugin_Part::ID().c_str()) <<
+ QString(PartSetPlugin_Duplicate::ID().c_str()) <<
+ QString(PartSetPlugin_Remove::ID().c_str());
+ if (myWorkshop->currentOperation() &&
+ (!aAllowActivationList.contains(myWorkshop->currentOperation()->id())))
return;
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
XGUI_Workshop* aWorkshop = aConnector->workshop();
SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aActiveDoc = aMgr->activeDocument();
- DocumentPtr aDoc = aMgr->moduleDocument();
+#ifdef ModuleDataModel
QModelIndex aOldIndex = myDataModel->activePartTree();
+ DocumentPtr aDoc = aMgr->moduleDocument();
if (aActiveDoc == aDoc) {
if (aOldIndex.isValid())
aTreeView->setExpanded(aOldIndex, false);
}
}
}
+#else
+ if (aActivePartIndex.isValid())
+ aTreeView->setExpanded(aActivePartIndex, false);
+ XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel();
+ aActivePartIndex = aDataModel->documentRootIndex(aActiveDoc);
+ if (aActivePartIndex.isValid())
+ aTreeView->setExpanded(aActivePartIndex, true);
+#endif
aLabel->setPalette(aPalet);
aWorkshop->updateCommandStatus();
// Update displayed objects in order to update active color
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
QObjectPtrList aObjects = aDisplayer->displayedObjects();
- foreach(ObjectPtr aObj, aObjects)
- aDisplayer->redisplay(aObj, false);
+ bool aHidden;
+ foreach(ObjectPtr aObj, aObjects) {
+ //TODO: replace by redisplay event.
+ aHidden = !aObj->data() || !aObj->data()->isValid() ||
+ aObj->isDisabled() || (!aObj->isDisplayed());
+ if (!aHidden)
+ aDisplayer->redisplay(aObj, false);
+ }
aDisplayer->updateViewer();
}
}
}
if (theIndex.column() != 0) // Use only first column
return;
+#ifdef ModuleDataModel
ObjectPtr aObj = myDataModel->object(theIndex);
+#else
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myWorkshop);
+ XGUI_Workshop* aWorkshop = aConnector->workshop();
+ XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel();
+ // De not use non editable Indexes
+ if ((aDataModel->flags(theIndex) & Qt::ItemIsSelectable) == 0)
+ return;
+ ObjectPtr aObj = aDataModel->object(theIndex);
+#endif
+
ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
if (!aPart.get()) { // Probably this is Feature
FeaturePtr aPartFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
}
if (aPart.get()) { // if this is a part
if (aPart->partDoc() == aMgr->activeDocument()) {
- aMgr->setActiveDocument(aMgr->moduleDocument());
+ myMenuMgr->activatePartSet();
} else {
aPart->activate();
}
}
}
+
+
+void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*)
+{
+ // z layer is created for all started operations in order to visualize operation AIS presentation
+ // over the object
+ Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+ if (aContext.IsNull())
+ return;
+
+ Handle(V3d_Viewer) aViewer = aContext->CurrentViewer();
+ if (myVisualLayerId == 0) {
+ if (myVisualLayerId == 0)
+ aViewer->AddZLayer(myVisualLayerId);
+ } else {
+ TColStd_SequenceOfInteger aZList;
+ aViewer->GetAllZLayers(aZList);
+ bool aFound = false;
+ for (int i = 1; i <= aZList.Length(); i++) {
+ if (aZList(i) == myVisualLayerId) {
+ aFound = true;
+ break;
+ }
+ }
+ if (!aFound)
+ aViewer->AddZLayer(myVisualLayerId);
+ }
+ // if there is an active operation with validated widget,
+ // the filters of this widget should be activated in the created view
+ ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+ if (aOperation) {
+ ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+ ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
+ if (anActiveWidget) {
+ ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast<ModuleBase_WidgetValidated*>
+ (anActiveWidget);
+ if (aWidgetValidated)
+ aWidgetValidated->activateFilters(true);
+ }
+ }
+}
