#include <ModuleBase_FilterMulti.h>
#include <ModuleBase_FilterCustom.h>
#include <ModuleBase_FilterNoConsructionSubShapes.h>
+#include <GeomValidators_Edge.h>
+#include <GeomValidators_EdgeOrVertex.h>
+#include <GeomValidators_Face.h>
+#include <GeomValidators_ConstructionComposite.h>
+
+#include <PartSet_FilterSketchEntity.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Events.h>
#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),
- myRestartingMode(RM_None)
+ myRestartingMode(RM_None), myVisualLayerId(0)
{
//myWorkshop = dynamic_cast<XGUI_Workshop*>(theWshop);
mySketchMgr = new PartSet_SketcherMgr(this);
XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
connect(anOpMgr, SIGNAL(keyEnterReleased()), this, SLOT(onEnterReleased()));
- connect(anOpMgr, SIGNAL(keyDeleteReleased()), this, SLOT(onDeleteObjects()));
connect(anOpMgr, SIGNAL(operationActivatedByPreselection()),
this, SLOT(onOperationActivatedByPreselection()));
aFactory->registerValidator("PartSet_RigidValidator", new PartSet_RigidValidator);
aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
aFactory->registerValidator("PartSet_DifferentShapes", new ModelAPI_ShapeValidator);
- aFactory->registerValidator("PartSet_SketchValidator", new PartSet_SketchValidator);
+
+ aFactory->registerValidator("GeomValidators_Edge", new GeomValidators_Edge);
+ aFactory->registerValidator("GeomValidators_EdgeOrVertex",
+ new GeomValidators_EdgeOrVertex);
+ aFactory->registerValidator("GeomValidators_Face", new GeomValidators_Face);
+
+ aFactory->registerValidator("GeomValidators_ConstructionComposite",
+ new GeomValidators_ConstructionComposite);
+
+ aFactory->registerValidator("PartSet_SketchEntityValidator",
+ new PartSet_SketchEntityValidator);
+
+ aFactory->registerValidator("PartSet_SameTypeAttr",
+ new PartSet_SameTypeAttrValidator);
}
void PartSet_Module::registerFilters()
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters();
- aFactory->registerFilter("EdgeFilter", new ModuleBase_FilterLinearEdge);
- aFactory->registerFilter("FaceFilter", new ModuleBase_FilterFace);
- aFactory->registerFilter("MultiFilter", new ModuleBase_FilterMulti);
- Handle(SelectMgr_Filter) aSelectFilter = new ModuleBase_FilterNoConsructionSubShapes(workshop());
- aFactory->registerFilter("NoConstructionSubShapesFilter",
- new ModuleBase_FilterCustom(aSelectFilter));
+ //aFactory->registerFilter("EdgeFilter", new ModuleBase_FilterLinearEdge);
+ //aFactory->registerFilter("FaceFilter", new ModuleBase_FilterFace);
+ //aFactory->registerFilter("MultiFilter", new ModuleBase_FilterMulti);
+ //Handle(SelectMgr_Filter) aSelectFilter = new ModuleBase_FilterNoConsructionSubShapes(workshop());
+ //aFactory->registerFilter("NoConstructionSubShapesFilter",
+ // new ModuleBase_FilterCustom(aSelectFilter));
+ //Handle(SelectMgr_Filter) aSelectFilter = new PartSet_FilterSketchEntity(workshop());
+ //aFactory->registerFilter("SketchEntityFilter", new ModuleBase_FilterCustom(aSelectFilter));
}
void PartSet_Module::registerProperties()
void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation)
{
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
+ Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer();
+ aViewer->AddZLayer(myVisualLayerId);
mySketchMgr->startSketch(theOperation);
}
else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
{
if (PartSet_SketcherMgr::isSketchOperation(theOperation)) {
mySketchMgr->stopSketch(theOperation);
+ Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer();
+ aViewer->RemoveZLayer(myVisualLayerId);
+ myVisualLayerId = 0;
}
else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) {
mySketchMgr->stopNestedSketch(theOperation);
myWorkshop->viewer()->removeSelectionFilter(myDocumentShapeFilter);
}
+ModuleBase_Operation* PartSet_Module::currentOperation() const
+{
+ XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+ XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
+ return anOpMgr->currentOperation();
+}
+
bool PartSet_Module::canUndo() const
{
bool aCanUndo = false;
XGUI_Workshop* aWorkshop = aConnector->workshop();
QAction* anAction = aWorkshop->contextMenuMgr()->action("DELETE_CMD");
theMenu->addAction(anAction);
- theMenu->addAction(action("DELETE_PARTSET_CMD"));
}
}
- bool isConstruction;
- if (mySketchMgr->canChangeConstruction(isConstruction)) {
- QAction* anAction = action("CONSTRUCTION_CMD");
+ bool isAuxiliary;
+ if (mySketchMgr->canSetAuxiliary(isAuxiliary)) {
+ QAction* anAction = action("AUXILIARY_CMD");
theMenu->addAction(anAction);
- anAction->setChecked(isConstruction);
+ anAction->setChecked(isAuxiliary);
}
}
myRestartingMode = RM_EmptyFeatureUsed;
}
-void PartSet_Module::onDeleteObjects()
-{
- ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
- if (PartSet_SketcherMgr::isSketchOperation(anOperation) ||
- PartSet_SketcherMgr::isNestedSketchOperation(anOperation))
- deleteObjects();
-}
-
void PartSet_Module::onOperationActivatedByPreselection()
{
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
void PartSet_Module::onNoMoreWidgets()
{
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
- if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
- if (anOperation) {
+ if (anOperation) {
+ if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
if (myRestartingMode != RM_Forbided)
myRestartingMode = RM_LastFeatureUsed;
anOperation->commit();
if (aOperation->id().toStdString() == SketchPlugin_Line::ID()) {
/// If last line finished on vertex the lines creation sequence has to be break
ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+ ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget();
const QList<ModuleBase_ModelWidget*>& aWidgets = aPanel->modelWidgets();
- if (aWidgets.last() == aPanel->activeWidget()) {
- myRestartingMode = RM_Forbided;
+ QList<ModuleBase_ModelWidget*>::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end();
+ bool aFoundWidget = false;
+ bool aFoundObligatory = false;
+ for (; anIt != aLast && !aFoundObligatory; anIt++) {
+ if (!aFoundWidget)
+ aFoundWidget = *anIt == anActiveWidget;
+ else
+ aFoundObligatory = (*anIt)->isObligatory();
}
+ if (!aFoundObligatory)
+ myRestartingMode = RM_Forbided;
}
}
-QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
- Config_WidgetAPI* theWidgetApi, std::string theParentId,
- QList<ModuleBase_ModelWidget*>& theModelWidgets)
+ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
+ Config_WidgetAPI* theWidgetApi, std::string theParentId)
{
XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
XGUI_Workshop* aWorkshop = aConnector->workshop();
aConstraintShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch());
aWgt = aConstraintShapeSelectorWgt;
}
- if(aWgt)
- theModelWidgets.append(aWgt);
return aWgt;
}
{
QAction* anAction;
- anAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this);
- addAction("DELETE_PARTSET_CMD", anAction);
-
- anAction = new QAction(tr("Construction"), this);
+ anAction = new QAction(tr("Auxiliary"), this);
anAction->setCheckable(true);
- addAction("CONSTRUCTION_CMD", anAction);
+ addAction("AUXILIARY_CMD", anAction);
}
QAction* PartSet_Module::action(const QString& theId) const
QAction* aAction = static_cast<QAction*>(sender());
QString anId = aAction->data().toString();
- if (anId == "DELETE_PARTSET_CMD") {
- deleteObjects();
- }
- if (anId == "CONSTRUCTION_CMD") {
- mySketchMgr->setConstruction(isChecked);
+ if (anId == "AUXILIARY_CMD") {
+ mySketchMgr->setAuxiliary(isChecked);
}
}
-void PartSet_Module::deleteObjects()
+bool PartSet_Module::deleteObjects()
{
ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
- bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation);
- if (!isSketchOp && !PartSet_SketcherMgr::isNestedSketchOperation(anOperation))
- return;
+ bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation),
+ isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation);
+ if (!isSketchOp && !isNestedOp)
+ return false;
// sketch feature should be skipped, only sub-features can be removed
// when sketch operation is active
// 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 = aConnector->selection();
QObjectPtrList aSelectedObj = aSel->selectedPresentations();
- XGUI_Workshop* aWorkshop = aConnector->workshop();
- XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
- if (!isSketchOp && anOpMgr->canStopOperation()) {
- ModuleBase_Operation* aCurrentOp = anOpMgr->currentOperation();
- if (aCurrentOp) {
- aCurrentOp->abort();
- }
- }
+ // if there are no selected objects in the viewer, that means that the selection in another
+ // place cased this method. It is necessary to return the false value to understande in above
+ // method that delete is not processed
+ if (aSelectedObj.count() == 0)
+ return false;
+
+ // the active nested sketch operation should be aborted unconditionally
+ if (isNestedOp)
+ anOperation->abort();
+
std::set<FeaturePtr> aRefFeatures;
foreach (ObjectPtr aObj, aSelectedObj)
{
}
//}
}
- QString aDescription = tr("Delete");
+
+ QString aDescription = aWorkshop->contextMenuMgr()->action("DELETE_CMD")->text();
/**
// according to #355 feature, it is not necessary to inform about dependencies during
// sketch delete operation
aWorkshop->displayer()->updateViewer();
//myDisplayer->updateViewer();
aMgr->finishOperation();
+
+ return true;
+}
+
+
+void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS)
+{
+ Handle(AIS_InteractiveObject) anAIS = theAIS->impl<Handle(AIS_InteractiveObject)>();
+ if (!anAIS.IsNull()) {
+ Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(anAIS);
+ if (!aDim.IsNull()) {
+ Handle(AIS_InteractiveContext) aCtx = anAIS->GetContext();
+ aCtx->SetZLayer(aDim, myVisualLayerId);
+ }
+ }
}
+
