#include "PartSet_WidgetSketchLabel.h"
#include "PartSet_Validators.h"
#include "PartSet_Tools.h"
+#include "PartSet_PreviewPlanes.h"
#include "PartSet_WidgetPoint2d.h"
-#include "PartSet_WidgetPoint2dDistance.h"
#include "PartSet_WidgetPoint2DFlyout.h"
#include "PartSet_WidgetShapeSelector.h"
#include "PartSet_WidgetMultiSelector.h"
+#include "PartSet_WidgetSubShapeSelector.h"
+#include "PartSet_WidgetFeaturePointSelector.h"
#include "PartSet_WidgetEditor.h"
#include "PartSet_WidgetFileSelector.h"
#include "PartSet_WidgetSketchCreator.h"
#include "PartSet_SketcherMgr.h"
-#include "PartSet_SketcherReetntrantMgr.h"
+#include "PartSet_SketcherReentrantMgr.h"
+#include "PartSet_ResultSketchPrs.h"
#include "PartSet_MenuMgr.h"
#include "PartSet_CustomPrs.h"
#include "PartSet_IconFactory.h"
#include <ModuleBase_IPropertyPanel.h>
#include <ModuleBase_WidgetEditor.h>
#include <ModuleBase_WidgetValidated.h>
-#include <ModuleBase_FilterFactory.h>
#include <ModuleBase_Tools.h>
#include <ModuleBase_OperationFeature.h>
#include <ModuleBase_WidgetFactory.h>
#include <ModuleBase_OperationDescription.h>
+#include <ModuleBase_ViewerPrs.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_ResultBody.h>
#include <ModelAPI_AttributeString.h>
+#include <ModelAPI_AttributeSelectionList.h>
+#include <ModelAPI_Tools.h>
+#include <ModelAPI_ResultConstruction.h>
#include <GeomDataAPI_Point2D.h>
#include <GeomDataAPI_Point.h>
#include <XGUI_DataModel.h>
#include <XGUI_ErrorMgr.h>
#include <XGUI_CustomPrs.h>
+#include <XGUI_SelectionMgr.h>
+#include <XGUI_ActionsMgr.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 <Config_PropManager.h>
#include <Config_Keywords.h>
+#include <AIS_Dimension.hxx>
+#include <AIS_InteractiveObject.hxx>
#include <StdSelect_TypeOfFace.hxx>
#include <TopoDS_Vertex.hxx>
#include <TopoDS.hxx>
#include <TopoDS_Shape.hxx>
#include <BRep_Tool.hxx>
-#include <AIS_Dimension.hxx>
#include <QObject>
#include <QMouseEvent>
PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
: ModuleBase_IModule(theWshop),
- myVisualLayerId(0)
+ myVisualLayerId(0),
+ myIsOperationIsLaunched(false)
{
new PartSet_IconFactory();
mySketchMgr = new PartSet_SketcherMgr(this);
- mySketchReentrantMgr = new PartSet_SketcherReetntrantMgr(theWshop);
+ mySketchReentrantMgr = new PartSet_SketcherReentrantMgr(theWshop);
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWshop);
XGUI_Workshop* aWorkshop = aConnector->workshop();
mySelectionFilters.Append(new PartSet_GlobalFilter(myWorkshop));
mySelectionFilters.Append(new PartSet_FilterInfinite(myWorkshop));
- myHasConstraintShown[PartSet_Tools::Geometrical] = true;
- myHasConstraintShown[PartSet_Tools::Dimensional] = true;
- myHasConstraintShown[PartSet_Tools::Expressions] = false;
+ setDefaultConstraintShown();
Config_PropManager::registerProp("Visualization", "operation_parameter_color",
"Reference shape wireframe color in operation", Config_Prop::Color,
Config_PropManager::registerProp("Visualization", "operation_highlight_color",
"Multi selector item color in operation", Config_Prop::Color,
PartSet_CustomPrs::OPERATION_HIGHLIGHT_COLOR());
+ Config_PropManager::registerProp("Visualization", "operation_remove_feature_color",
+ "Color of removed feature in operation", Config_Prop::Color,
+ PartSet_CustomPrs::OPERATION_REMOVE_FEATURE_COLOR());
}
PartSet_Module::~PartSet_Module()
aFactory->registerValidator("PartSet_MiddlePointSelection", new PartSet_MiddlePointSelection);
aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr);
- aFactory->registerValidator("PartSet_SketchEntityValidator", new PartSet_SketchEntityValidator);
-}
-
-void PartSet_Module::registerFilters()
-{
- //Registering of selection filters
- XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
- ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters();
+ aFactory->registerValidator("PartSet_MultyTranslationSelection",
+ new PartSet_MultyTranslationSelection);
+ aFactory->registerValidator("PartSet_SplitSelection", new PartSet_SplitSelection);
+ aFactory->registerValidator("PartSet_ProjectionSelection", new PartSet_ProjectionSelection);
}
-void PartSet_Module::registerProperties()
-{
- Config_PropManager::registerProp("Sketch planes", "planes_size", "Size", Config_Prop::Double,
- 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)
+void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget,
+ const bool isToConnect)
{
mySketchMgr->connectToPropertyPanel(theWidget, isToConnect);
}
-void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation)
+void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation)
{
- if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
+ if (sketchMgr()->isNestedSketchOperation(theOperation)) {
mySketchMgr->commitNestedSketch(theOperation);
}
/// Restart sketcher operations automatically
if (!mySketchReentrantMgr->operationCommitted(theOperation)) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ 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
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;
+ ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
+ (theOperation);
+ if (aFOperation) {
+ XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(workshop());
+ XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel();
+
+ ModuleBase_ModelWidget* aFilledWidget = 0;
+ bool aPostonedWidgetActivation = false;
+
+ FeaturePtr aFeature = aFOperation->feature();
+ /// Restart sketcher operations automatically
+ /// it is important to call method of sketch reentrant manager before filling of PP
+ /// because it fills some created feature attributes, these new values should be used
+ /// to fill the property panel
+ mySketchReentrantMgr->operationStarted(theOperation);
+
+ aWorkshop->fillPropertyPanel(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()) {
+ std::string aGreedAttributeId = ModuleBase_Tools::findGreedAttribute(workshop(), aFeature);
+ // if there is a greed attribute, automatic commit by preselection
+ // for this feature is prohibited
+ 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);
}
}
- } if (!isOperationCommitted) {
- anIWorkshop->updateCommandStatus();
- aWorkshop->connectToPropertyPanel(true);
- operationStartedInternal(aFOperation);
-
- // the objects of the current operation should be deactivated
- QObjectPtrList anObjects;
- anObjects.append(aFeature);
- std::list<ResultPtr> aResults = aFeature->results();
- std::list<ResultPtr>::const_iterator aIt;
- for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
- anObjects.append(*aIt);
- }
- QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end();
- for (; anIt != aLast; anIt++)
- aWorkshop->deactivateActiveObject(*anIt, false);
- if (anObjects.size() > 0) {
- XGUI_Displayer* aDisplayer = aWorkshop->displayer();
- aDisplayer->updateViewer();
+ 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 (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);
+ } if (!isOperationCommitted) {
+ aWorkshop->connectToPropertyPanel(true);
+ updateSketcherOnStart(aFOperation);
+ updatePresentationsOnStart(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();
}
+ /// state of command actions should be updated after displayed objects modification because
+ /// deactivation(for example) of objects may influence on selection in the viewer
+ /// State of command actions may depend on selection in the viewer(e.g. Sketch)
+ workshop()->updateCommandStatus();
+ }
+ 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)
+void PartSet_Module::updateSketcherOnStart(ModuleBase_Operation* theOperation)
{
- /// Restart sketcher operations automatically
- mySketchReentrantMgr->operationStarted(theOperation);
-
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
mySketchMgr->startSketch(theOperation);
}
- else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
+ else if (sketchMgr()->isNestedSketchOperation(theOperation)) {
mySketchMgr->startNestedSketch(theOperation);
}
+}
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+void PartSet_Module::updatePresentationsOnStart(ModuleBase_Operation* theOperation)
+{
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (aFOperation) {
myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true);
myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true);
{
ModuleBase_IModule::operationResumed(theOperation);
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (aFOperation) {
myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true);
myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true);
bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false);
bool isModified = isModifiedArgs || isModifiedResults;
- if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
+ if (sketchMgr()->isNestedSketchOperation(theOperation)) {
mySketchMgr->stopNestedSketch(theOperation);
}
+ else if (PartSet_SketcherMgr::isSketchOperation(theOperation))
+ setDefaultConstraintShown();
//VSV: Viewer is updated on feature update and redisplay
if (isModified) {
aDisplayer->updateViewer();
}
- QMap<PartSet_Tools::ConstraintVisibleState, bool>::const_iterator anIt = myHasConstraintShown.begin(),
- aLast = myHasConstraintShown.end();
+ QMap<PartSet_Tools::ConstraintVisibleState, bool>::const_iterator
+ anIt = myHasConstraintShown.begin(), aLast = myHasConstraintShown.end();
for (; anIt != aLast; anIt++) {
- myHasConstraintShown[anIt.key()];
mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value());
}
}
if (theActionId == "MOVE_CMD") {
FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
if (aFeature) {
+ ResultPtr aResult = ModuleBase_Tools::firstResult(aFeature);
// part features can not be moved in the history.
- if (aFeature->getKind() == PartSetPlugin_Part::ID())
+ if (aResult.get() && aResult->groupName() == ModelAPI_ResultPart::group())
aValid = false;
}
}
return mySketchMgr->canDisplayObject(theObject);
}
-void PartSet_Module::processHiddenObject(const std::list<ObjectPtr>& theObjects)
+/*void PartSet_Module::processHiddenObject(const std::list<ObjectPtr>& theObjects)
{
mySketchMgr->processHiddenObject(theObjects);
-}
+}*/
bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const
{
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation),
- isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation);
+ isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation);
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
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(anOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(anOperation);
aCanActivate = aCanActivate || (aFOperation && aFOperation->isEditOperation());
}
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->updateViewerMenu(theStdActions);
}
+bool PartSet_Module::isActionEnableStateFixed(const int theActionId) const
+{
+ bool isEnabledFixed = false;
+ if (theActionId == XGUI_ActionsMgr::AcceptAll &&
+ mySketchReentrantMgr->isInternalEditActive())
+ isEnabledFixed = true;
+ return isEnabledFixed;
+}
+
QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature)
{
QString anError = ModuleBase_IModule::getFeatureError(theFeature);
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();
}
+bool PartSet_Module::isSketchNeutralPointActivated() const
+{
+ bool isNeutralPoint = true;
+ if (sketchReentranceMgr()->isInternalEditActive())
+ isNeutralPoint = false;
+ if (myIsOperationIsLaunched)
+ isNeutralPoint = false;
+
+ return isNeutralPoint;
+}
+
void PartSet_Module::closeDocument()
{
+ myActivePartIndex = QModelIndex();
clearViewer();
}
void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation)
{
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ ModuleBase_OperationFeature* aFOperation =
+ dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
if (!aFOperation)
return;
{
bool aProcessed = false;
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>(theOperation);
+ 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_ViewerPrs> aPreselection = aSelection->getHighlighted();
+ QList<ModuleBase_ViewerPrsPtr> aPreselection = aSelection->getHighlighted();
if (aPreselection.size() == 1) {
- ModuleBase_ViewerPrs aSelectedPrs = aPreselection[0];
- ObjectPtr anObject = aSelectedPrs.object();
+ ModuleBase_ViewerPrsPtr aSelectedPrs = aPreselection[0];
+ ObjectPtr anObject = aSelectedPrs->object();
FeaturePtr aFeature = ModelAPI_Feature::feature(anObject);
FeaturePtr anOpFeature = aFOperation->feature();
- TopoDS_Shape aShape = aSelectedPrs.shape();
- // click on the digit of dimension constrain comes here with an empty shape, so we need the check
- if (aFeature == anOpFeature && !aShape.IsNull()) {
- AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aShape,
- mySketchMgr->activeSketch());
+ 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()) {
+ // if feature has only one result and shape of result is equal to selected shape
+ // this attribute is not processed. It is a case of Sketch Point.
+ if (aFeature->results().size() == 1) {
+ ResultPtr aResult = aFeature->results().front();
+ if (aResult.get() && aResult->shape()->isEqual(aShape))
+ return aProcessed;
+ }
+ 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());
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();
if ((aId == SketchPlugin_ConstraintRadius::ID()) ||
- (aId == SketchPlugin_ConstraintLength::ID()) ||
+ (aId == SketchPlugin_ConstraintLength::ID()) ||
(aId == SketchPlugin_ConstraintDistance::ID()) ||
(aId == SketchPlugin_ConstraintAngle::ID())) {
editFeature(aFeature);
}
}
}
- }
+ }
}
void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent)
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);
- aDistanceWgt->setSketch(mySketchMgr->activeSketch());
- aWgt = aDistanceWgt;
} else if (theType == "sketch_shape_selector") {
PartSet_WidgetShapeSelector* aShapeSelectorWgt =
new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi);
new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi);
aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch());
aWgt = aShapeSelectorWgt;
- } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
+ }
+ else if (theType == "sketch_sub_shape_selector") {
+ PartSet_WidgetSubShapeSelector* aSubShapeSelectorWgt =
+ new PartSet_WidgetSubShapeSelector(theParent, aWorkshop, theWidgetApi);
+ aSubShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch());
+ aWgt = aSubShapeSelectorWgt;
+ }
+ else if (theType == "sketch_feature_point_selector") {
+ PartSet_WidgetFeaturePointSelector* aPointSelectorWgt =
+ new PartSet_WidgetFeaturePointSelector(theParent, aWorkshop, theWidgetApi);
+ aPointSelectorWgt->setSketcher(mySketchMgr->activeSketch());
+ aWgt = aPointSelectorWgt;
+ }
+ 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);
ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
if (aOperation) {
ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
- anActiveWidget = aPanel->activeWidget();
+ anActiveWidget = aPanel ? aPanel->activeWidget() : 0;
}
}
return anActiveWidget;
// 1. check whether the delete should be processed in the module
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation),
- isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation);
+ isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation);
if (isSketchOp || isNestedOp) {
isProcessed = true;
// 2. find selected presentations
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
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();
- bool isNestedOp = PartSet_SketcherMgr::isNestedCreateOperation(anOperation);
+ bool isNestedOp = myModule->sketchMgr()->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
launchOperation(aCmd->data().toString());
}
}
- }
+ }*/
ModuleBase_IModule::onFeatureTriggered();
}
ModuleBase_IModule::editFeature(theFeature);
}
+bool PartSet_Module::canCommitOperation() const
+{
+ return true;
+}
+
void PartSet_Module::launchOperation(const QString& theCmdId)
{
+ myIsOperationIsLaunched = true;
storeConstraintsState(theCmdId.toStdString());
+ updateConstraintsState(theCmdId.toStdString());
+
ModuleBase_IModule::launchOperation(theCmdId);
+
+ myIsOperationIsLaunched = false;
}
void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind)
{
- if (myWorkshop->currentOperation() &&
+ 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(theFeatureKind.c_str())) {
+}
+
+void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind)
+{
+ if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str()) ||
+ PartSet_SketcherMgr::replicationsIdList().contains(theFeatureKind.c_str())) {
// Show constraints if a constraint was anOperation
mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true);
mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true);
}
}
-void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
+void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
{
Handle(AIS_InteractiveObject) anAIS = theAIS->impl<Handle(AIS_InteractiveObject)>();
if (!anAIS.IsNull()) {
Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer();
Handle(V3d_View) aView;
double aScale = 0;
- for (aV3dViewer->InitDefinedViews();
- aV3dViewer->MoreDefinedViews();
+ for (aV3dViewer->InitDefinedViews();
+ aV3dViewer->MoreDefinedViews();
aV3dViewer->NextDefinedViews()) {
Handle(V3d_View) aV = aV3dViewer->DefinedView();
double aS = aV->Scale();
aDisplayer->updateViewer();
}
-void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, const ModuleBase_CustomizeFlag& theFlag,
+bool PartSet_Module::isCustomPrsActivated(const ModuleBase_CustomizeFlag& theFlag) const
+{
+ return myCustomPrs->isActive(theFlag);
+}
+
+void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature,
+ const ModuleBase_CustomizeFlag& theFlag,
const bool theUpdateViewer)
{
myCustomPrs->activate(theFeature, theFlag, theUpdateViewer);
{
bool aCustomized = false;
- if (theResult.get())
+ XGUI_Workshop* aWorkshop = getWorkshop();
+ XGUI_Displayer* aDisplayer = aWorkshop->displayer();
+ ObjectPtr anObject = aDisplayer->getObject(thePrs);
+ if (!anObject)
return aCustomized;
+ if (!theResult.get()) {
+ std::vector<int> aColor;
+ 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::afterCustomisePresentation(std::shared_ptr<ModelAPI_Result> theResult,
+ AISObjectPtr thePrs,
+ GeomCustomPrsPtr theCustomPrs)
+{
+ bool aCustomized = false;
+
XGUI_Workshop* aWorkshop = getWorkshop();
XGUI_Displayer* aDisplayer = aWorkshop->displayer();
ObjectPtr anObject = aDisplayer->getObject(thePrs);
- if (anObject.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;
- }
- }
- }
- }
- // customize sketch dimension constraint presentation
- if (!aCustomized) {
- std::vector<int> aColor;
- if (isConflicting) {
- myOverconstraintListener->getConflictingColor(aColor);
+ if (!anObject)
+ return aCustomized;
+
+ std::vector<int> aColor;
+ bool aUseCustomColor = true;
+ if (aUseCustomColor)
+ myOverconstraintListener->getCustomColor(anObject, aColor);
+ // customize sketch symbol presentation
+ 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()) {
+ aPrs->SetCustomColor(aColor);
+ aCustomized = true;
}
- if (aColor.empty())
- XGUI_CustomPrs::getDefaultColor(anObject, true, aColor);
- if (!aColor.empty()) {
- thePrs->setColor(aColor[0], aColor[1], aColor[2]);
+ } else if (!Handle(SketcherPrs_Coincident)::DownCast(anAISIO).IsNull()) {
+ Handle(SketcherPrs_Coincident) aPrs = Handle(SketcherPrs_Coincident)::DownCast(anAISIO);
+ if (!aPrs.IsNull()) {
+ aPrs->SetCustomColor(aColor);
aCustomized = true;
}
}
-
- // customize dimentional constrains
- sketchMgr()->customizePresentation(anObject);
}
-
+ // customize sketch dimension constraint presentation
+ if (!aCustomized) {
+ if (!aColor.empty()) { // otherwise presentation has the default color
+ aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]);
+ }
+ }
return aCustomized;
}
if (aOB) {
QLabel* aLabel = aOB->activeDocLabel();
aLabel->installEventFilter(myMenuMgr);
- connect(aLabel, SIGNAL(customContextMenuRequested(const QPoint&)),
+ 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);
aOB->treeView()->setExpandsOnDoubleClick(false);
- connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)),
+ connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)),
SLOT(onTreeViewDoubleClick(const QModelIndex&)));
+
+ Events_Loop* aLoop = Events_Loop::loop();
+ aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED));
}
}
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 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)
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();
SessionPtr aMgr = ModelAPI_Session::get();
QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD");
+ bool hasResult = false;
+ bool hasFeature = false;
+ bool hasParameter = false;
+ bool hasCompositeOwner = false;
+ ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter,
+ hasCompositeOwner);
+
ModuleBase_Operation* aCurrentOp = myWorkshop->currentOperation();
if (aSelected == 1) {
- bool hasResult = false;
- bool hasFeature = false;
- bool hasParameter = false;
- bool hasSubFeature = false;
- ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature);
-
ObjectPtr aObject = aObjects.first();
if (aObject) {
ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObject);
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObject);
- bool isPart = aPart.get() ||
+ bool isPart = aPart.get() ||
(aFeature.get() && (aFeature->getKind() == PartSetPlugin_Part::ID()));
if (isPart) {
DocumentPtr aPartDoc;
}
if (aPart.get()) // this may be null is Part feature is disabled
aPartDoc = aPart->partDoc();
-
+
theMenu->addAction(aActivatePartAction);
aActivatePartAction->setEnabled((aMgr->activeDocument() != aPartDoc));
}
}
}
-
- ResultBodyPtr aResult = std::dynamic_pointer_cast<ModelAPI_ResultBody>(aObject);
- if( aResult.get() )
- theMenu->addAction(myMenuMgr->action("SELECT_PARENT_CMD"));
+ }
+ } else {
+ if (hasFeature) {
+ myMenuMgr->action("EDIT_CMD")->setEnabled(aCurrentOp == 0);
+ theMenu->addAction(myMenuMgr->action("EDIT_CMD"));
+ theMenu->addSeparator();
}
}
bool aNotDeactivate = (aCurrentOp == 0);
}
}
+#define EXPAND_PARENT(OBJ) \
+QModelIndex aObjIndex = aDataModel->objectIndex(OBJ); \
+if (aObjIndex.isValid()) { \
+ QModelIndex aParent = aObjIndex.parent(); \
+ int aCount = aDataModel->rowCount(aParent); \
+ if (aCount == 1) \
+ aTreeView->setExpanded(aParent, true); \
+}
+
+
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
static QStringList aAllowActivationList;
if (aAllowActivationList.isEmpty())
- aAllowActivationList <<
- QString(PartSetPlugin_Part::ID().c_str()) <<
+ aAllowActivationList <<
+ QString(PartSetPlugin_Part::ID().c_str()) <<
QString(PartSetPlugin_Duplicate::ID().c_str()) <<
QString(PartSetPlugin_Remove::ID().c_str());
- if (myWorkshop->currentOperation() &&
+ if (myWorkshop->currentOperation() &&
(!aAllowActivationList.contains(myWorkshop->currentOperation()->id())))
return;
XGUI_Workshop* aWorkshop = getWorkshop();
SessionPtr aMgr = ModelAPI_Session::get();
DocumentPtr aActiveDoc = aMgr->activeDocument();
- if (aActivePartIndex.isValid())
- aTreeView->setExpanded(aActivePartIndex, false);
+ if (myActivePartIndex.isValid())
+ aTreeView->setExpanded(myActivePartIndex, false);
XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel();
- aActivePartIndex = aDataModel->documentRootIndex(aActiveDoc);
- if (aActivePartIndex.isValid())
- aTreeView->setExpanded(aActivePartIndex, true);
+ myActivePartIndex = aDataModel->documentRootIndex(aActiveDoc);
+ if (myActivePartIndex.isValid())
+ aTreeView->setExpanded(myActivePartIndex, true);
aLabel->setPalette(aPalet);
aWorkshop->updateCommandStatus();
QObjectPtrList aObjects = aDisplayer->displayedObjects();
bool aHidden;
foreach(ObjectPtr aObj, aObjects) {
- //TODO: replace by redisplay event.
- aHidden = !aObj->data() || !aObj->data()->isValid() ||
+ aHidden = !aObj->data() || !aObj->data()->isValid() ||
aObj->isDisabled() || (!aObj->isDisplayed());
if (!aHidden)
aDisplayer->redisplay(aObj, false);
}
aDisplayer->updateViewer();
+ } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) {
+ std::shared_ptr<ModelAPI_ObjectUpdatedMessage> aUpdMsg =
+ std::dynamic_pointer_cast<ModelAPI_ObjectUpdatedMessage>(theMessage);
+ std::set<ObjectPtr> aObjects = aUpdMsg->objects();
+
+ ObjectPtr aConstrObj;
+ ObjectPtr aResultObj;
+ std::set<ObjectPtr>::const_iterator aIt;
+ DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument();
+ for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) {
+ ObjectPtr aObject = (*aIt);
+ if ((!aResultObj.get()) && (aObject->groupName() == ModelAPI_ResultBody::group())
+ && (aObject->document() != aRootDoc))
+ aResultObj = aObject;
+ if ((!aConstrObj.get()) && (aObject->groupName() == ModelAPI_ResultConstruction::group())
+ && (aObject->document() != aRootDoc))
+ aConstrObj = aObject;
+ if (aResultObj.get() && aConstrObj.get())
+ break;
+ }
+
+ if (aResultObj.get() || aConstrObj.get()) {
+ XGUI_Workshop* aWorkshop = getWorkshop();
+ XGUI_DataTree* aTreeView = aWorkshop->objectBrowser()->treeView();
+ XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel();
+
+ if (aResultObj.get()) {
+ EXPAND_PARENT(aResultObj)
+ }
+ if (aConstrObj.get()) {
+ EXPAND_PARENT(aConstrObj)
+ }
+ }
}
}
return;
SessionPtr aMgr = ModelAPI_Session::get();
if (!theIndex.isValid()) {
- aMgr->setActiveDocument(aMgr->moduleDocument());
+ // It seems that this code is obsolete
+ //aMgr->setActiveDocument(aMgr->moduleDocument());
return;
}
if (theIndex.column() != 0) // Use only first column
if (aPart->partDoc() == aMgr->activeDocument()) {
myMenuMgr->activatePartSet();
} else {
- aPart->activate();
+ myMenuMgr->activatePart(aPart);
}
}
}
if (aOperation) {
ModuleBase_ModelWidget* anActiveWidget = activeWidget();
if (anActiveWidget) {
- ModuleBase_WidgetSelector* aWSelector = dynamic_cast<ModuleBase_WidgetSelector*>(anActiveWidget);
+ ModuleBase_WidgetSelector* aWSelector =
+ dynamic_cast<ModuleBase_WidgetSelector*>(anActiveWidget);
if (aWSelector)
aWSelector->activateSelectionAndFilters(true);
}
return mySketchReentrantMgr->processEnter(thePreviousAttributeID);
}
-//******************************************************
-void PartSet_Module::beforeOperationStarted(ModuleBase_Operation* theOperation)
-{
-}
-
//******************************************************
void PartSet_Module::beforeOperationStopped(ModuleBase_Operation* theOperation)
{
GeomShapePtr aGeomShape;
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
- if (anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
+ if (anOperation && sketchMgr()->isNestedSketchOperation(anOperation)) {
aGeomShape = PartSet_Tools::findShapeBy2DPoint(theAttribute, myWorkshop);
}
return aGeomShape;
if (aGeomShape.get()) {
TopoDS_Shape aTDSShape = aGeomShape->impl<TopoDS_Shape>();
- return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape,
+ return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape,
mySketchMgr->activeSketch());
}
return anAttribute;
if (!aOperation)
return;
ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
- aPanel->setWindowTitle(aChoiceTitle);
+ if (aPanel)
+ aPanel->setWindowTitle(aChoiceTitle);
}
}
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;
+}
