#include <dlfcn.h>
#endif
+
+QString XGUI_Workshop::MOVE_TO_END_COMMAND = QObject::tr("Move to the end");
+
//#define DEBUG_DELETE
XGUI_Workshop::XGUI_Workshop(XGUI_SalomeConnector* theConnector)
myDisplayer = new XGUI_Displayer(this);
mySelector = new XGUI_SelectionMgr(this);
- //connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateModuleCommands()));
+ connect(mySelector, SIGNAL(selectionChanged()), this, SLOT(updateCommandStatus()));
myOperationMgr = new XGUI_OperationMgr(this, 0);
myActionsMgr = new XGUI_ActionsMgr(this);
SLOT(onOperationCommitted(ModuleBase_Operation*)));
connect(myOperationMgr, SIGNAL(operationAborted(ModuleBase_Operation*)),
SLOT(onOperationAborted(ModuleBase_Operation*)));
- //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- // myErrorMgr, SLOT(onValidationStateChanged()));
#ifndef HAVE_SALOME
connect(myMainWindow, SIGNAL(exitKeySequence()), SLOT(onExit()));
+ onTrihedronVisibilityChanged(true);
#endif
connect(this, SIGNAL(errorOccurred(const QString&)), myErrorDlg, SLOT(addError(const QString&)));
onNew();
+ myViewerProxy->connectViewProxy();
+ connect(myViewerProxy, SIGNAL(trihedronVisibilityChanged(bool)),
+ SLOT(onTrihedronVisibilityChanged(bool)));
+
emit applicationStarted();
}
connect(myDisplayer, SIGNAL(beforeObjectErase(ObjectPtr, AISObjectPtr)),
myModule, SLOT(onBeforeObjectErase(ObjectPtr, AISObjectPtr)));
- myActionsMgr->update();
+ updateCommandStatus();
// activate visualized objects in the viewer
XGUI_Displayer* aDisplayer = displayer();
addHistoryMenu(aAction, SIGNAL(updateRedoHistory(const QList<ActionInfo>&)), SLOT(onRedo(int)));
salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
- aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
- QIcon(":pictures/rebuild.png"), QKeySequence(),
- false, "MEN_DESK_EDIT");
- salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
+ //aAction = salomeConnector()->addDesktopCommand("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ // QIcon(":pictures/rebuild.png"), QKeySequence(),
+ // false, "MEN_DESK_EDIT");
+ //salomeConnector()->addActionInToolbar( aAction, aToolBarTitle );
- connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild()));
- salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
+ //connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onRebuild()));
+ //salomeConnector()->addDesktopMenuSeparator("MEN_DESK_EDIT");
aAction = salomeConnector()->addDesktopCommand("SAVEAS_CMD", tr("Export NewGeom..."), tr("Export the current document into a NewGeom file"),
QIcon(), QKeySequence(),
aCommand->connectTo(this, SLOT(onSave()));
//aCommand->disable();
+ aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"),
+ QIcon(":pictures/save.png"), QKeySequence());
+ aCommand->connectTo(this, SLOT(onSaveAs()));
+
QString aUndoId = "UNDO_CMD";
aCommand = aGroup->addFeature(aUndoId, tr("Undo"), tr("Undo last command"),
QIcon(":pictures/undo.png"), QKeySequence::Undo);
SIGNAL(updateRedoHistory(const QList<ActionInfo>&)),
SLOT(onRedo(int)));
- aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
- QIcon(":pictures/rebuild.png"), QKeySequence());
- aCommand->connectTo(this, SLOT(onRebuild()));
+ //aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"),
+ // QIcon(":pictures/rebuild.png"), QKeySequence());
+ //aCommand->connectTo(this, SLOT(onRebuild()));
- aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"),
- QIcon(":pictures/save.png"), QKeySequence());
- aCommand->connectTo(this, SLOT(onSaveAs()));
//aCommand->disable();
aCommand = aGroup->addFeature("OPEN_CMD", tr("Open..."), tr("Open a new document"),
ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
(anOperationMgr->currentOperation());
if (aFOperation) {
- if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
- myOperationMgr->onCommitOperation();
+ //if (errorMgr()->canProcessClick(anAction, aFOperation->feature()))
+ myOperationMgr->onCommitOperation();
}
}
}
-//******************************************************
-/*void XGUI_Workshop::onValidationStateChanged(bool theEnabled)
-{
- XGUI_OperationMgr* anOperationMgr = operationMgr();
- if (anOperationMgr) {
- ModuleBase_OperationFeature* aFOperation = dynamic_cast<ModuleBase_OperationFeature*>
- (anOperationMgr->currentOperation());
- if (aFOperation) {
- QAction* anAction = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Accept);
- myErrorMgr->updateActionState(anAction, aFOperation->feature(), theEnabled);
- }
- }
-}*/
-
-
//******************************************************
void XGUI_Workshop::deactivateActiveObject(const ObjectPtr& theObject, const bool theUpdateViewer)
{
}
updateCommandStatus();
- myModule->onOperationStarted(aFOperation);
+ connectToPropertyPanel(true);
+ myModule->operationStarted(aFOperation);
// the objects of the current operation should be deactivated
QObjectPtrList anObjects;
if (theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel
setPropertyPanel(theOperation);
+ connectToPropertyPanel(true);
}
updateCommandStatus();
- myModule->onOperationResumed(theOperation);
+ myModule->operationResumed(theOperation);
}
hidePropertyPanel();
myPropertyPanel->cleanContent();
- myModule->onOperationStopped(aFOperation);
+ connectToPropertyPanel(false);
+ myModule->operationStopped(aFOperation);
// the deactivated objects of the current operation should be activated back.
// They were deactivated on operation start or an object redisplay
void XGUI_Workshop::onOperationCommitted(ModuleBase_Operation* theOperation)
{
- myModule->onOperationCommitted(theOperation);
+ myModule->operationCommitted(theOperation);
}
void XGUI_Workshop::onOperationAborted(ModuleBase_Operation* theOperation)
{
- myModule->onOperationAborted(theOperation);
+ myModule->operationAborted(theOperation);
}
void XGUI_Workshop::setGrantedFeatures(ModuleBase_Operation* theOperation)
myErrorMgr->setPropertyPanel(myPropertyPanel);
}
+void XGUI_Workshop::connectToPropertyPanel(const bool isToConnect)
+{
+ XGUI_PropertyPanel* aPropertyPanel = propertyPanel();
+ if (aPropertyPanel) {
+ const QList<ModuleBase_ModelWidget*>& aWidgets = aPropertyPanel->modelWidgets();
+ foreach (ModuleBase_ModelWidget* aWidget, aWidgets) {
+ myModule->connectToPropertyPanel(aWidget, isToConnect);
+ if (isToConnect) {
+ connect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ }
+ else {
+ disconnect(aWidget, SIGNAL(valueStateChanged(int)), this, SLOT(onWidgetStateChanged(int)));
+ }
+ }
+ }
+}
+
/*
* Saves document with given name.
*/
}
#endif
+//******************************************************
+void XGUI_Workshop::onTrihedronVisibilityChanged(bool theState)
+{
+ XGUI_Displayer* aDisplayer = displayer();
+ if (aDisplayer)
+ aDisplayer->displayTrihedron(theState);
+}
+
//******************************************************
bool XGUI_Workshop::onSave()
{
{
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
+ std::list<std::string> aUndoList = aMgr->undoList();
if (aMgr->isOperation()) {
/// this is important for nested operations
/// when sketch operation is active, this condition is false and
/// the sketch operation is not aborted
operationMgr()->onAbortOperation();
}
- for (int i = 0; i < theTimes; ++i) {
+ std::list<std::string>::const_iterator aIt = aUndoList.cbegin();
+ for (int i = 0; (i < theTimes) && (aIt != aUndoList.cend()); ++i, ++aIt) {
aMgr->undo();
+ if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND)
+ myObjectBrowser->rebuildDataTree();
}
operationMgr()->updateApplyOfOperations();
objectBrowser()->treeView()->setCurrentIndex(QModelIndex());
SessionPtr aMgr = ModelAPI_Session::get();
+ std::list<std::string> aRedoList = aMgr->redoList();
if (aMgr->isOperation()) {
/// this is important for nested operations
/// when sketch operation is active, this condition is false and
/// the sketch operation is not aborted
operationMgr()->onAbortOperation();
}
- for (int i = 0; i < theTimes; ++i) {
+ std::list<std::string>::const_iterator aIt = aRedoList.cbegin();
+ for (int i = 0; (i < theTimes) && (aIt != aRedoList.cend()); ++i, ++aIt) {
aMgr->redo();
+ if (QString((*aIt).c_str()) == MOVE_TO_END_COMMAND)
+ myObjectBrowser->rebuildDataTree();
}
operationMgr()->updateApplyOfOperations();
updateCommandStatus();
}
//******************************************************
-void XGUI_Workshop::onRebuild()
-{
- SessionPtr aMgr = ModelAPI_Session::get();
- bool aWasOperation = aMgr->isOperation(); // keep this value
- if (!aWasOperation) {
- aMgr->startOperation("Rebuild");
- }
- static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild");
- Events_Loop::loop()->send(std::shared_ptr<Events_Message>(
- new Events_Message(aRebuildEvent, this)));
- if (!aWasOperation) {
- aMgr->finishOperation();
+//void XGUI_Workshop::onRebuild()
+//{
+// SessionPtr aMgr = ModelAPI_Session::get();
+// bool aWasOperation = aMgr->isOperation(); // keep this value
+// if (!aWasOperation) {
+// aMgr->startOperation("Rebuild");
+// }
+// static const Events_ID aRebuildEvent = Events_Loop::loop()->eventByName("Rebuild");
+// Events_Loop::loop()->send(std::shared_ptr<Events_Message>(
+// new Events_Message(aRebuildEvent, this)));
+// if (!aWasOperation) {
+// aMgr->finishOperation();
+// }
+// updateCommandStatus();
+//}
+
+//******************************************************
+void XGUI_Workshop::onWidgetStateChanged(int thePreviousState)
+{
+ ModuleBase_ModelWidget* anActiveWidget = 0;
+ ModuleBase_Operation* anOperation = myOperationMgr->currentOperation();
+ if (anOperation) {
+ ModuleBase_IPropertyPanel* aPanel = anOperation->propertyPanel();
+ if (aPanel)
+ anActiveWidget = aPanel->activeWidget();
}
- updateCommandStatus();
+ if (anActiveWidget)
+ operationMgr()->onValidateOperation();
+
+ myModule->widgetStateChanged(thePreviousState);
}
-//******************************************************
ModuleBase_IModule* XGUI_Workshop::loadModule(const QString& theModule)
{
QString libName = QString::fromStdString(library(theModule.toStdString()));
aCmd->setEnabled(false);
}
}
- myActionsMgr->update();
+ myActionsMgr->updateCommandsStatus();
emit commandStatusUpdated();
}
QAction* aCancelAct = myActionsMgr->operationStateAction(XGUI_ActionsMgr::Abort);
connect(aCancelAct, SIGNAL(triggered()), myOperationMgr, SLOT(onAbortOperation()));
- connect(myPropertyPanel, SIGNAL(noMoreWidgets(const std::string&)),
- myModule, SLOT(onNoMoreWidgets(const std::string&)));
connect(myPropertyPanel, SIGNAL(keyReleased(QKeyEvent*)),
myOperationMgr, SLOT(onKeyReleased(QKeyEvent*)));
- //connect(myOperationMgr, SIGNAL(validationStateChanged(bool)),
- // this, SLOT(onValidationStateChanged(bool)));
+
+ connect(myPropertyPanel, SIGNAL(enterClicked()),
+ myOperationMgr, SLOT(onProcessEnter()));
}
//******************************************************
// in order to operation manager could process key events of the panel.
// otherwise they are ignored. It happens only if the same(activateWindow) is
// not happened by property panel activation(e.g. resume operation of Sketch)
- myPropertyPanel->activateWindow();
- myPropertyPanel->setFocus();
+ ModuleBase_Tools::activateWindow(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()");
+ ModuleBase_Tools::setFocus(myPropertyPanel, "XGUI_Workshop::showPropertyPanel()");
}
//******************************************************
// are processed by this console. For example Undo actions.
// It is possible that this code is to be moved to NewGeom package
QMainWindow* aDesktop = desktop();
- aDesktop->activateWindow();
- aDesktop->setFocus();
+ ModuleBase_Tools::activateWindow(aDesktop, "XGUI_Workshop::hidePropertyPanel()");
+ ModuleBase_Tools::setFocus(aDesktop, "XGUI_Workshop::showPropertyPanel()");
}
//******************************************************
moveObjects();
else if (theId == "COLOR_CMD")
changeColor(aObjects);
- else if (theId == "SHOW_CMD")
+ else if (theId == "SHOW_CMD") {
showObjects(aObjects, true);
+ mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ }
else if (theId == "HIDE_CMD")
showObjects(aObjects, false);
- else if (theId == "SHOW_ONLY_CMD")
+ else if (theId == "SHOW_ONLY_CMD") {
showOnlyObjects(aObjects);
+ mySelector->updateSelectionBy(ModuleBase_ISelection::Browser);
+ }
else if (theId == "SHADING_CMD")
setDisplayMode(aObjects, XGUI_Displayer::Shading);
else if (theId == "WIREFRAME_CMD")
if (!anObjectGroups.contains(aGroupName.c_str()))
continue;
- if (!myModule->canApplyAction(aObj, anActionId))
- continue;
-
FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
if (aFeature) {
/*// TODO: to learn the workshop to delegate the Part object deletion to the PartSet module
