#include <PartSet_Module.h>
#include <PartSet_OperationSketch.h>
-#include <PartSet_OperationCreateFeature.h>
-#include <PartSet_OperationCreateConstraint.h>
#include <PartSet_OperationFeatureCreate.h>
#include <PartSet_OperationFeatureEditMulti.h>
#include <PartSet_OperationFeatureEdit.h>
#include <ModuleBase_WidgetFactory.h>
#include <PartSet_Listener.h>
#include <PartSet_TestOCC.h>
+#include <PartSet_WidgetSketchLabel.h>
+#include <PartSet_Validators.h>
#include <ModuleBase_Operation.h>
#include <ModelAPI_Object.h>
+#include <ModelAPI_Events.h>
+#include <ModelAPI_Validator.h>
#include <ModelAPI_Data.h>
#include <GeomDataAPI_Point2D.h>
#include <XGUI_Workshop.h>
#include <XGUI_OperationMgr.h>
#include <XGUI_SelectionMgr.h>
+#include <XGUI_Selection.h>
#include <XGUI_ViewPort.h>
#include <XGUI_ActionsMgr.h>
#include <XGUI_ViewerProxy.h>
#include <Events_Error.h>
#include <GeomAPI_Shape.h>
-
-#include <AIS_ListOfInteractive.hxx>
-//#include <AIS_DimensionSelectionMode.hxx>
+#include <GeomAPI_AISObject.h>
+#include <AIS_Shape.hxx>
#include <QObject>
#include <QMouseEvent>
#include <QString>
+#include <GeomAlgoAPI_FaceBuilder.h>
+#include <GeomDataAPI_Dir.h>
+
#ifdef _DEBUG
#include <QDebug>
#endif
+
/*!Create and return new instance of XGUI_Module*/
-extern "C" PARTSET_EXPORT XGUI_Module* createModule(XGUI_Workshop* theWshop)
+extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(XGUI_Workshop* theWshop)
{
return new PartSet_Module(theWshop);
}
void PartSet_Module::createFeatures()
{
+ //!! Test registering of validators
+ PluginManagerPtr aMgr = ModelAPI_PluginManager::get();
+ ModelAPI_ValidatorsFactory* aFactory = aMgr->validators();
+ aFactory->registerValidator("PartSet_DistanceValidator", new PartSet_DistanceValidator);
+ aFactory->registerValidator("PartSet_LengthValidator", new PartSet_LengthValidator);
+ aFactory->registerValidator("PartSet_PerpendicularValidator", new PartSet_PerpendicularValidator);
+ aFactory->registerValidator("PartSet_ParallelValidator", new PartSet_ParallelValidator);
+ aFactory->registerValidator("PartSet_RadiusValidator", new PartSet_RadiusValidator);
+
Config_ModuleReader aXMLReader = Config_ModuleReader();
aXMLReader.readAll();
myFeaturesInFiles = aXMLReader.featuresInFiles();
void PartSet_Module::launchOperation(const QString& theCmdId)
{
ModuleBase_Operation* anOperation = createOperation(theCmdId.toStdString());
+ PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
+ if (aPreviewOp) {
+ XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ // Initialise operation with preliminary selection
+ std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
+ std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
+ aPreviewOp->initSelection(aSelected, aHighlighted);
+ }
sendOperation(anOperation);
}
myWorkshop->operationMgr()->currentOperation());
if (aPreviewOp) {
XGUI_PropertyPanel* aPropPanel = myWorkshop->propertyPanel();
- connect(aPreviewOp, SIGNAL(focusActivated(const std::string&)),
- aPropPanel, SLOT(onFocusActivated(const std::string&)));
-
connect(aPropPanel, SIGNAL(storedPoint2D(FeaturePtr, const std::string&)),
this, SLOT(onStorePoint2D(FeaturePtr, const std::string&)), Qt::UniqueConnection);
}
PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(theOperation);
if (aPreviewOp) {
XGUI_PropertyPanel* aPropPanel = myWorkshop->propertyPanel();
- disconnect(aPreviewOp, SIGNAL(focusActivated(const std::string&)),
- aPropPanel, SLOT(onFocusActivated(const std::string&)));
//disconnect(aPropPanel, SIGNAL(storedPoint2D(FeaturePtr, const std::string&)),
// this, SLOT(onStorePoint2D(FeaturePtr, const std::string&)));
}
void PartSet_Module::onContextMenuCommand(const QString& theId, bool isChecked)
{
- QFeatureList aFeatures = myWorkshop->selector()->selectedFeatures();
+ QList<ObjectPtr> aFeatures = myWorkshop->selector()->selection()->selectedObjects();
if (theId == "EDIT_CMD" && (aFeatures.size() > 0)) {
- editFeature(aFeatures.first());
+ FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aFeatures.first());
+ if (aFeature)
+ editFeature(aFeature);
}
}
{
PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(
myWorkshop->operationMgr()->currentOperation());
- if (aPreviewOp)
- {
- XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- std::list<XGUI_ViewerPrs> aSelected = aDisplayer->getSelected();
- std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->getHighlighted();
+ if (aPreviewOp) {
+ XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ // Initialise operation with preliminary selection
+ std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
+ std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
aPreviewOp->mousePressed(theEvent, myWorkshop->viewer()->activeView(), aSelected, aHighlighted);
}
{
PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(
myWorkshop->operationMgr()->currentOperation());
- if (aPreviewOp)
- {
- XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- std::list<XGUI_ViewerPrs> aSelected = aDisplayer->getSelected();
- std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->getHighlighted();
+ if (aPreviewOp) {
+ XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ // Initialise operation with preliminary selection
+ std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
+ std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
aPreviewOp->mouseReleased(theEvent, myWorkshop->viewer()->activeView(), aSelected, aHighlighted);
}
myWorkshop->operationMgr()->currentOperation());
if (aPreviewOp)
{
- XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- std::list<XGUI_ViewerPrs> aSelected = aDisplayer->getSelected();
- std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->getHighlighted();
+ XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ // Initialise operation with preliminary selection
+ std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
+ std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
aPreviewOp->mouseDoubleClick(theEvent, myWorkshop->viewer()->activeView(), aSelected,
aHighlighted);
}
void PartSet_Module::onPlaneSelected(double theX, double theY, double theZ)
{
+ //erasePlanes();
myWorkshop->viewer()->setViewProjection(theX, theY, theZ);
myWorkshop->actionsMgr()->update();
myWorkshop->viewer()->fitAll();
}
-void PartSet_Module::onLaunchOperation(std::string theName, FeaturePtr theFeature)
+void PartSet_Module::onLaunchOperation(std::string theName, ObjectPtr theFeature)
{
+ FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theFeature);
+ if (!aFeature) {
+ qDebug("Warning! Restart operation without feature!");
+ return;
+ }
ModuleBase_Operation* anOperation = createOperation(theName.c_str(),
- theFeature ? theFeature->getKind() : "");
+ theFeature ? aFeature->getKind() : "");
PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
if (aPreviewOp)
{
- XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- // refill the features list with avoiding of the features, obtained only by vertex shape (TODO)
- std::list<XGUI_ViewerPrs> aSelected = aDisplayer->getSelected();
- std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->getHighlighted();
- aPreviewOp->init(theFeature, aSelected, aHighlighted);
+ XGUI_Selection* aSelection = myWorkshop->selector()->selection();
+ // Initialise operation with preliminary selection
+ std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
+ std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
+ aPreviewOp->initFeature(aFeature);
+ aPreviewOp->initSelection(aSelected, aHighlighted);
} else {
- anOperation->setEditingFeature(theFeature);
+ anOperation->setEditingFeature(aFeature);
}
sendOperation(anOperation);
myWorkshop->actionsMgr()->updateCheckState();
aViewer->enableMultiselection(theEnabled);
}
-void PartSet_Module::onStopSelection(const QFeatureList& theFeatures, const bool isStop)
+void PartSet_Module::onStopSelection(const QList<ObjectPtr>& theFeatures, const bool isStop)
{
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
if (!isStop) {
- QFeatureList::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end();
- for (; anIt != aLast; anIt++) {
- activateFeature((*anIt), false);
+ foreach(ObjectPtr aObject, theFeatures) {
+ activateFeature(aObject, false);
}
}
+ //ObjectPtr aResults;
+ //foreach(ObjectPtr aFeature, theFeatures) {
+/* TODO if (aFeature->results().size() > 0) {
+ const std::list<ResultPtr>& aResList = aFeature->results();
+ std::list<ResultPtr>::const_iterator aIt;
+ for (aIt = aResList.cbegin(); aIt != aResList.cend(); ++aIt)
+ aResults.append(*aIt);
+ }
+ }*/
aDisplayer->stopSelection(theFeatures, isStop, false);
XGUI_ViewerProxy* aViewer = myWorkshop->viewer();
aDisplayer->updateViewer();
}
-void PartSet_Module::onSetSelection(const QFeatureList& theFeatures)
+void PartSet_Module::onSetSelection(const QList<ObjectPtr>& theFeatures)
{
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
aDisplayer->setSelected(theFeatures, false);
void PartSet_Module::onFeatureConstructed(FeaturePtr theFeature, int theMode)
{
- bool isDisplay = theMode != PartSet_OperationSketchBase::FM_Hide;
- visualizePreview(theFeature, isDisplay, false);
+// bool isDisplay = theMode != PartSet_OperationSketchBase::FM_Hide;
+// if (isDisplay) {
+ ModuleBase_Operation* aCurOperation = myWorkshop->operationMgr()->currentOperation();
+ PartSet_OperationSketchBase* aPrevOp = dynamic_cast<PartSet_OperationSketchBase*>(aCurOperation);
+ if (aPrevOp) {
+ std::list<FeaturePtr> aList = aPrevOp->subFeatures();
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ std::list<int> aModes = aPrevOp->getSelectionModes(aPrevOp->feature());
+ std::list<FeaturePtr>::iterator aSFIt;
+ for (aSFIt = aList.begin(); aSFIt != aList.end(); ++aSFIt) {
+ std::list<ResultPtr> aResults = (*aSFIt)->results();
+ std::list<ResultPtr>::iterator aIt;
+ for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
+ aDisplayer->activateInLocalContext((*aIt), aModes, false);
+ }
+ }
+ }
+/* FeaturePtr aFeature = aPrevOp->feature();
+ if (aFeature) {
+ std::list<ResultPtr> aResList = aFeature->results();
+ std::list<ResultPtr>::iterator aIt;
+ for (aIt = aResList.begin(); aIt != aResList.end(); ++aIt) {
+ aDisplayer->deactivate((*aIt), false);
+ }
+ }
+ }*/
+ ModelAPI_EventCreator::get()->sendUpdated(theFeature,
+ Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
+// }
+// else
+// ->erase(theFeature->firstResult(), true);
+/* bool isDisplay = theMode != PartSet_OperationSketchBase::FM_Hide;
+ // TODO visualizePreview(theFeature, isDisplay, false);
if (!isDisplay) {
ModuleBase_Operation* aCurOperation = myWorkshop->operationMgr()->currentOperation();
FeaturePtr aSketch;
PartSet_OperationSketchBase* aPrevOp = dynamic_cast<PartSet_OperationSketchBase*>(aCurOperation);
if (aPrevOp) {
- std::map<FeaturePtr, boost::shared_ptr<GeomAPI_Shape> > aList = aPrevOp->subPreview();
+ std::list<FeaturePtr> aList = aPrevOp->subFeatures();
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
std::list<int> aModes = aPrevOp->getSelectionModes(aPrevOp->feature());
- std::map<FeaturePtr, boost::shared_ptr<GeomAPI_Shape> >::const_iterator
- anIt = aList.begin(), aLast = aList.end();
- for (; anIt != aLast; anIt++) {
- FeaturePtr aFeature = (*anIt).first;
- visualizePreview(aFeature, false, false);
- }
- aDisplayer->updateViewer();
+ std::list<FeaturePtr>::const_iterator anIt = aList.begin(),
+ aLast = aList.end();
+ //TODO for (; anIt != aLast; anIt++)
+ // visualizePreview((*anIt), false, false);
+ //aDisplayer->updateViewer();
}
}
if (theMode == PartSet_OperationSketchBase::FM_Activation ||
theMode == PartSet_OperationSketchBase::FM_Deactivation)
- activateFeature(theFeature, true);
+ activateFeature(theFeature, true);*/
}
ModuleBase_Operation* PartSet_Module::createOperation(const std::string& theCmdId,
aSketch = aPrevOp->sketch();
if (PartSet_OperationFeatureCreate::canProcessKind(theCmdId))
anOperation = new PartSet_OperationFeatureCreate(theCmdId.c_str(), this, aSketch);
- else if (PartSet_OperationCreateFeature::canProcessKind(theCmdId))
- anOperation = new PartSet_OperationCreateFeature(theCmdId.c_str(), this, aSketch);
- else if (theCmdId == PartSet_OperationFeatureEditMulti::Type())
+ else if (theCmdId == PartSet_OperationFeatureEditMulti::Type())
anOperation = new PartSet_OperationFeatureEditMulti(theCmdId.c_str(), this, aSketch);
else if (theCmdId == PartSet_OperationFeatureEdit::Type())
anOperation = new PartSet_OperationFeatureEdit(theCmdId.c_str(), this, aSketch);
- else if (PartSet_OperationCreateConstraint::canProcessKind(theCmdId))
- anOperation = new PartSet_OperationCreateConstraint(theCmdId.c_str(), this, aSketch);
}
if (!anOperation) {
if (aPreviewOp) {
connect(aPreviewOp, SIGNAL(featureConstructed(FeaturePtr, int)),
this, SLOT(onFeatureConstructed(FeaturePtr, int)));
- connect(aPreviewOp, SIGNAL(launchOperation(std::string, FeaturePtr)),
- this, SLOT(onLaunchOperation(std::string, FeaturePtr)));
+ connect(aPreviewOp, SIGNAL(launchOperation(std::string, ObjectPtr)),
+ this, SLOT(onLaunchOperation(std::string, ObjectPtr)));
connect(aPreviewOp, SIGNAL(multiSelectionEnabled(bool)),
this, SLOT(onMultiSelectionEnabled(bool)));
- connect(aPreviewOp, SIGNAL(multiSelectionEnabled(bool)),
- this, SLOT(onMultiSelectionEnabled(bool)));
- connect(aPreviewOp, SIGNAL(stopSelection(const QFeatureList&, const bool)),
- this, SLOT(onStopSelection(const QFeatureList&, const bool)));
- connect(aPreviewOp, SIGNAL(setSelection(const QFeatureList&)),
- this, SLOT(onSetSelection(const QFeatureList&)));
+ connect(aPreviewOp, SIGNAL(stopSelection(const QList<ObjectPtr>&, const bool)),
+ this, SLOT(onStopSelection(const QList<ObjectPtr>&, const bool)));
+ connect(aPreviewOp, SIGNAL(setSelection(const QList<ObjectPtr>&)),
+ this, SLOT(onSetSelection(const QList<ObjectPtr>&)));
connect(aPreviewOp, SIGNAL(closeLocalContext()),
this, SLOT(onCloseLocalContext()));
void PartSet_Module::sendOperation(ModuleBase_Operation* theOperation)
{
- //TODO(sbh): Implement static method to extract event id [SEID]
- static Events_ID aModuleEvent = Events_Loop::eventByName("PartSetModuleEvent");
+ static Events_ID aModuleEvent = Events_Loop::eventByName(EVENT_OPERATION_LAUNCHED);
Config_PointerMessage aMessage(aModuleEvent, this);
aMessage.setPointer(theOperation);
Events_Loop::loop()->send(aMessage);
}
-void PartSet_Module::visualizePreview(FeaturePtr theFeature, bool isDisplay,
+
+/*void PartSet_Module::visualizePreview(FeaturePtr theFeature, bool isDisplay,
const bool isUpdateViewer)
{
ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
if (!aPreviewOp)
return;
+ ResultPtr aResult = theFeature->firstResult();
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
if (isDisplay) {
boost::shared_ptr<SketchPlugin_Feature> aSPFeature =
boost::dynamic_pointer_cast<SketchPlugin_Feature>(theFeature);
- if (aSPFeature)
- {
- Handle(AIS_InteractiveObject) anAIS = aSPFeature->getAISShape(aDisplayer->getAISObject(theFeature));
- aDisplayer->redisplay(theFeature, anAIS, false);
+ if (aSPFeature) {
+ PartSet_OperationSketch* aSketchOp = dynamic_cast<PartSet_OperationSketch*>(aPreviewOp);
+ if (aSketchOp && !aSketchOp->hasSketchPlane())
+ showPlanes();
}
}
else
- aDisplayer->erase(theFeature, false);
+ aDisplayer->erase(aResult, false);
if (isUpdateViewer)
aDisplayer->updateViewer();
-}
+}*/
-void PartSet_Module::activateFeature(FeaturePtr theFeature, const bool isUpdateViewer)
+void PartSet_Module::activateFeature(ObjectPtr theFeature, const bool isUpdateViewer)
{
ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
if (aPreviewOp) {
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- aDisplayer->activateInLocalContext(theFeature, aPreviewOp->getSelectionModes(theFeature),
- isUpdateViewer);
+ std::list<int> aModes = aPreviewOp->getSelectionModes(theFeature);
+ aDisplayer->activateInLocalContext(theFeature, aModes, isUpdateViewer);
}
}
if (!aFeature || aFeature->getKind() != theCmdId)
return;
- std::map<FeaturePtr, boost::shared_ptr<GeomAPI_Shape> > aList = aPreviewOp->subPreview();
+ std::list<FeaturePtr> aList = aPreviewOp->subFeatures();
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
std::list<int> aModes = aPreviewOp->getSelectionModes(aPreviewOp->feature());
- std::map<FeaturePtr, boost::shared_ptr<GeomAPI_Shape> >::const_iterator
- anIt = aList.begin(), aLast = aList.end();
+ std::list<FeaturePtr>::const_iterator anIt = aList.begin(),
+ aLast = aList.end();
for (; anIt != aLast; anIt++) {
- FeaturePtr aFeature = (*anIt).first;
boost::shared_ptr<SketchPlugin_Feature> aSPFeature =
- boost::dynamic_pointer_cast<SketchPlugin_Feature>((*anIt).first);
+ boost::dynamic_pointer_cast<SketchPlugin_Feature>(*anIt);
if (!aSPFeature)
continue;
-
- Handle(AIS_InteractiveObject) anAIS = aSPFeature->getAISShape(aDisplayer->getAISObject(aFeature));
- if (!anAIS.IsNull())
- aDisplayer->redisplay(aFeature, anAIS, false);
- aDisplayer->activateInLocalContext(aFeature, aModes, false);
+ //visualizePreview((*anIt), true, false);
+ aDisplayer->activateInLocalContext((*anIt), aModes, false);
}
aDisplayer->updateViewer();
}
return;
// if (theFeature->getKind() == SKETCH_KIND) {
- FeaturePtr aFeature = theFeature;
- if (XGUI_Tools::isModelObject(aFeature)) {
- ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
- aFeature = aObject->featureRef();
- }
-
- if (aFeature) {
- onLaunchOperation(aFeature->getKind(), aFeature);
- updateCurrentPreview(aFeature->getKind());
- }
+ //FeaturePtr aFeature = theFeature;
+ //if (XGUI_Tools::isModelObject(aFeature)) {
+ // ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
+ // aFeature = aObject->featureRef();
+ //}
+
+ //if (aFeature) {
+ onLaunchOperation(theFeature->getKind(), theFeature);
+ updateCurrentPreview(theFeature->getKind());
+ //}
// }
}
PartSet_Tools::setConstraints(aPreviewOp->sketch(), theFeature, theAttribute,
aPoint->x(), aPoint->y());
}
+
+/*bool PartSet_Module::isFeatureEnabled(const QString& theCmdId) const
+{
+ XGUI_OperationMgr* aOpMgr = myWorkshop->operationMgr();
+ XGUI_ActionsMgr* aActMgr = myWorkshop->actionsMgr();
+
+ ModuleBase_Operation* aOperation = aOpMgr->currentOperation();
+ if (!aOperation)
+ return !aActMgr->isNested(theCmdId);
+
+ PartSet_OperationFeatureEdit* aSketchEdtOp = dynamic_cast<PartSet_OperationFeatureEdit*>(aOperation);
+ if (aSketchEdtOp) {
+ QStringList aConstraintList;
+ aConstraintList<<"SketchConstraintDistance"<<"SketchConstraintLength"
+ <<"SketchConstraintRadius"<<"SketchConstraintParallel"<<"SketchConstraintPerpendicular";
+ return aConstraintList.contains(theCmdId);
+ }
+ QStringList aList = aActMgr->nestedCommands(aOperation->id());
+ return aList.contains(theCmdId);
+}*/
+
+QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
+ Config_WidgetAPI* theWidgetApi, QList<ModuleBase_ModelWidget*>& theModelWidgets)
+{
+ if (theType == "sketch-start-label") {
+ PartSet_WidgetSketchLabel* aWgt = new PartSet_WidgetSketchLabel(theParent, theWidgetApi, "");
+ aWgt->setOperationsMgr(myWorkshop->operationMgr());
+ theModelWidgets.append(aWgt);
+ return aWgt->getControl();
+ } else
+ return 0;
+}