#include <ModuleBase_Operation.h>
#include <ModuleBase_OperationDescription.h>
#include <PartSet_Listener.h>
+#include <PartSet_TestOCC.h>
#include <ModuleBase_Operation.h>
+#include <ModelAPI_Object.h>
#include <XGUI_MainWindow.h>
#include <XGUI_Displayer.h>
#include <XGUI_ViewPort.h>
#include <XGUI_ActionsMgr.h>
#include <XGUI_ViewerProxy.h>
+#include <XGUI_ContextMenuMgr.h>
+#include <XGUI_PropertyPanel.h>
+#include <XGUI_Tools.h>
#include <Config_PointerMessage.h>
#include <Config_ModuleReader.h>
#include <QDebug>
#endif
-
/*!Create and return new instance of XGUI_Module*/
extern "C" PARTSET_EXPORT XGUI_Module* createModule(XGUI_Workshop* theWshop)
{
XGUI_OperationMgr* anOperationMgr = myWorkshop->operationMgr();
+ connect(anOperationMgr, SIGNAL(operationStarted()),
+ this, SLOT(onOperationStarted()));
+
connect(anOperationMgr, SIGNAL(operationStopped(ModuleBase_Operation*)),
this, SLOT(onOperationStopped(ModuleBase_Operation*)));
+ XGUI_ContextMenuMgr* aContextMenuMgr = myWorkshop->contextMenuMgr();
+ connect(aContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)),
+ this, SLOT(onContextMenuCommand(const QString&, bool)));
+
connect(myWorkshop->viewer(), SIGNAL(mousePress(QMouseEvent*)),
this, SLOT(onMousePressed(QMouseEvent*)));
connect(myWorkshop->viewer(), SIGNAL(mouseRelease(QMouseEvent*)),
myFeaturesInFiles = aXMLReader.featuresInFiles();
}
-void PartSet_Module::featureCreated(XGUI_Command* theFeature)
+void PartSet_Module::featureCreated(QAction* theFeature)
{
- theFeature->connectTo(this, SLOT(onFeatureTriggered()));
+ connect(theFeature, SIGNAL(triggered(bool)), this, SLOT(onFeatureTriggered()));
}
QStringList PartSet_Module::nestedFeatures(QString)
*/
void PartSet_Module::onFeatureTriggered()
{
- XGUI_Command* aCmd = dynamic_cast<XGUI_Command*>(sender());
+ //PartSet_TestOCC::local_selection_change_shape(myWorkshop->viewer()->AISContext(),
+ // myWorkshop->viewer()->activeView());
+
+ //PartSet_TestOCC::local_selection_erase(myWorkshop->viewer()->AISContext(),
+ // myWorkshop->viewer()->activeView());
+ QAction* aCmd = dynamic_cast<QAction*>(sender());
//Do nothing on uncheck
if(aCmd->isCheckable() && !aCmd->isChecked())
return;
- launchOperation(aCmd->id());
+ launchOperation(aCmd->data().toString());
}
void PartSet_Module::launchOperation(const QString& theCmdId)
sendOperation(anOperation);
}
+void PartSet_Module::onOperationStarted()
+{
+ PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(
+ myWorkshop->operationMgr()->currentOperation());
+ if (aPreviewOp) {
+ XGUI_PropertyPanel* aPropPanel = myWorkshop->propertyPanel();
+ connect(aPreviewOp, SIGNAL(focusActivated(const std::string&)),
+ aPropPanel, SLOT(onFocusActivated(const std::string&)));
+ }
+}
+
void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
{
if (!theOperation)
return;
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&)));
+ }
+}
+
+void PartSet_Module::onContextMenuCommand(const QString& theId, bool isChecked)
+{
+ QFeatureList aFeatures = myWorkshop->selector()->selectedFeatures();
+ if (theId == "EDIT_CMD" && (aFeatures.size() > 0)) {
+ editFeature(aFeatures.first());
}
}
myWorkshop->operationMgr()->currentOperation());
if (aPreviewOp)
{
- std::list<XGUI_ViewerPrs> aPresentations = myWorkshop->displayer()->GetViewerPrs();
- aPreviewOp->mousePressed(theEvent, myWorkshop->viewer()->activeView(), aPresentations);
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ std::list<XGUI_ViewerPrs> aSelected = aDisplayer->GetSelected();
+ std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->GetHighlighted();
+
+ aPreviewOp->mousePressed(theEvent, myWorkshop->viewer()->activeView(), aSelected, aHighlighted);
}
}
myWorkshop->operationMgr()->currentOperation());
if (aPreviewOp)
{
- std::list<XGUI_ViewerPrs> aPresentations = myWorkshop->displayer()->GetViewerPrs();
- aPreviewOp->mouseReleased(theEvent, myWorkshop->viewer()->activeView(), aPresentations);
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ std::list<XGUI_ViewerPrs> aSelected = aDisplayer->GetSelected();
+ std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->GetHighlighted();
+
+ aPreviewOp->mouseReleased(theEvent, myWorkshop->viewer()->activeView(), aSelected, aHighlighted);
}
}
void PartSet_Module::onPlaneSelected(double theX, double theY, double theZ)
{
myWorkshop->viewer()->setViewProjection(theX, theY, theZ);
+ myWorkshop->actionsMgr()->update();
- ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
- if (anOperation) {
- PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
- if (aPreviewOp) {
- visualizePreview(aPreviewOp->feature(), false);
- }
- }
+ //PartSet_TestOCC::testSelection(myWorkshop);
+}
- myWorkshop->actionsMgr()->setNestedActionsEnabled(true);
+void PartSet_Module::onFitAllView()
+{
+ myWorkshop->viewer()->fitAll();
}
void PartSet_Module::onLaunchOperation(std::string theName, boost::shared_ptr<ModelAPI_Feature> theFeature)
PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
if (aPreviewOp)
{
- std::list<XGUI_ViewerPrs> aPresentations = myWorkshop->displayer()->GetViewerPrs();
- aPreviewOp->init(theFeature, aPresentations);
+ 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(TopAbs_VERTEX);
+ std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->GetHighlighted(TopAbs_VERTEX);
+ aPreviewOp->init(theFeature, aSelected, aHighlighted);
}
- myWorkshop->actionsMgr()->setActionChecked(anOperation->getDescription()->operationId(), true);
sendOperation(anOperation);
+ myWorkshop->actionsMgr()->updateCheckState();
}
void PartSet_Module::onMultiSelectionEnabled(bool theEnabled)
void PartSet_Module::onStopSelection(const std::list<XGUI_ViewerPrs>& theFeatures, const bool isStop)
{
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
- aDisplayer->StopSelection(theFeatures, isStop, false);
if (!isStop) {
std::list<XGUI_ViewerPrs>::const_iterator anIt = theFeatures.begin(), aLast = theFeatures.end();
boost::shared_ptr<ModelAPI_Feature> aFeature;
activateFeature((*anIt).feature(), false);
}
}
+ aDisplayer->StopSelection(theFeatures, isStop, false);
+
+ XGUI_ViewerProxy* aViewer = myWorkshop->viewer();
+ aViewer->enableSelection(!isStop);
+
+ aDisplayer->UpdateViewer();
+}
+
+void PartSet_Module::onSetSelection(const std::list<XGUI_ViewerPrs>& theFeatures)
+{
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
aDisplayer->SetSelected(theFeatures, false);
aDisplayer->UpdateViewer();
}
+void PartSet_Module::onCloseLocalContext()
+{
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ aDisplayer->CloseLocalContexts();
+}
+
void PartSet_Module::onFeatureConstructed(boost::shared_ptr<ModelAPI_Feature> theFeature,
int theMode)
{
- bool isDisplay = theMode != PartSet_OperationSketchBase::FM_Abort;
+ bool isDisplay = theMode != PartSet_OperationSketchBase::FM_Hide;
visualizePreview(theFeature, isDisplay, false);
+ if (!isDisplay) {
+ ModuleBase_Operation* aCurOperation = myWorkshop->operationMgr()->currentOperation();
+ boost::shared_ptr<ModelAPI_Feature> aSketch;
+ PartSet_OperationSketchBase* aPrevOp = dynamic_cast<PartSet_OperationSketchBase*>(aCurOperation);
+ if (aPrevOp) {
+ std::map<boost::shared_ptr<ModelAPI_Feature>, boost::shared_ptr<GeomAPI_Shape> >
+ aList = aPrevOp->subPreview();
+ XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+ std::list<int> aModes = aPrevOp->getSelectionModes(aPrevOp->feature());
+
+ std::map<boost::shared_ptr<ModelAPI_Feature>, boost::shared_ptr<GeomAPI_Shape> >::const_iterator
+ anIt = aList.begin(), aLast = aList.end();
+ for (; anIt != aLast; anIt++) {
+ boost::shared_ptr<ModelAPI_Feature> aFeature = (*anIt).first;
+ visualizePreview(aFeature, false, false);
+ }
+ aDisplayer->UpdateViewer();
+ }
+ }
if (theMode == PartSet_OperationSketchBase::FM_Activation ||
theMode == PartSet_OperationSketchBase::FM_Deactivation)
else if(theCmdId == PartSet_OperationSketchLine::Type() ||
theCmdId == PartSet_OperationEditLine::Type()) {
ModuleBase_Operation* aCurOperation = myWorkshop->operationMgr()->currentOperation();
- boost::shared_ptr<ModelAPI_Feature> aSketchFeature;
- if (aCurOperation)
- aSketchFeature = aCurOperation->feature();
+ boost::shared_ptr<ModelAPI_Feature> aSketch;
+ PartSet_OperationSketchBase* aPrevOp = dynamic_cast<PartSet_OperationSketchBase*>(aCurOperation);
+ if (aPrevOp)
+ aSketch = aPrevOp->sketch();
if (theCmdId == PartSet_OperationSketchLine::Type())
- anOperation = new PartSet_OperationSketchLine(theCmdId.c_str(), this, aSketchFeature);
+ anOperation = new PartSet_OperationSketchLine(theCmdId.c_str(), this, aSketch);
else
- anOperation = new PartSet_OperationEditLine(theCmdId.c_str(), this, aSketchFeature);
+ anOperation = new PartSet_OperationEditLine(theCmdId.c_str(), this, aSketch);
}
else {
anOperation = new ModuleBase_Operation(theCmdId.c_str(), this);
this, SLOT(onMultiSelectionEnabled(bool)));
connect(aPreviewOp, SIGNAL(stopSelection(const std::list<XGUI_ViewerPrs>&, const bool)),
this, SLOT(onStopSelection(const std::list<XGUI_ViewerPrs>&, const bool)));
+ connect(aPreviewOp, SIGNAL(setSelection(const std::list<XGUI_ViewerPrs>&)),
+ this, SLOT(onSetSelection(const std::list<XGUI_ViewerPrs>&)));
+
+ connect(aPreviewOp, SIGNAL(closeLocalContext()),
+ this, SLOT(onCloseLocalContext()));
PartSet_OperationSketch* aSketchOp = dynamic_cast<PartSet_OperationSketch*>(aPreviewOp);
if (aSketchOp) {
connect(aSketchOp, SIGNAL(planeSelected(double, double, double)),
this, SLOT(onPlaneSelected(double, double, double)));
+ connect(aSketchOp, SIGNAL(fitAllView()),
+ this, SLOT(onFitAllView()));
}
}
aPreview ? aPreview->impl<TopoDS_Shape>() : TopoDS_Shape(), false);
}
else
- aDisplayer->Erase(anOperation->feature(), false);
+ aDisplayer->Erase(theFeature, false);
if (isUpdateViewer)
aDisplayer->UpdateViewer();
return;
std::map<boost::shared_ptr<ModelAPI_Feature>, boost::shared_ptr<GeomAPI_Shape> >
- aList = aPreviewOp->preview();
+ aList = aPreviewOp->subPreview();
XGUI_Displayer* aDisplayer = myWorkshop->displayer();
std::list<int> aModes = aPreviewOp->getSelectionModes(aPreviewOp->feature());
aDisplayer->UpdateViewer();
}
+void PartSet_Module::editFeature(FeaturePtr theFeature)
+{
+ if (!theFeature)
+ return;
+
+ if (theFeature->getKind() == "Sketch") {
+ 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());
+ }
+ }
+}