#include <ModuleBase_Operation.h>
#include <ModuleBase_Preferences.h>
#include <ModuleBase_ActionInfo.h>
+#include <ModuleBase_IModule.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <QtxPopupMgr.h>
#include <QtxActionMenuMgr.h>
+#include <QtxActionToolMgr.h>
#include <QtxResourceMgr.h>
#include <Config_PropManager.h>
#include <QDockWidget>
#include <QAction>
#include <QTimer>
+#include <QMenu>
extern "C" {
myWorkshop->startApplication();
LightApp_Application* anApp = dynamic_cast<LightApp_Application*>(theApp);
if (anApp)
+ {
connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
+ }
}
//******************************************************
aViewAct->setEnabled(true);
myWorkshop->objectBrowser()->setVisible(true);
aObjDoc->setVisible(true);
+ desktop()->tabifyDockWidget(aObjDoc, myWorkshop->propertyPanel());
}
if (!mySelector) {
mySelector = createSelector(OCCViewManagers.first());
}
}
+ // it should be pefromed after the selector creation in order to have AISContext
+ myWorkshop->activateModule();
//action(myEraseAll)->setEnabled(false);
if (myIsOpened) {
myWorkshop->objectBrowser()->rebuildDataTree();
myWorkshop->updateCommandStatus();
myIsOpened = false;
- QTimer::singleShot(1000, myWorkshop, SLOT(displayAllResults()));
}
else
myWorkshop->updateCommandStatus();
aResMgr->setValue("Study", "store_positions", false);
// Synchronize displayed objects
- if (mySelector && mySelector->viewer()) {
- Handle(AIS_InteractiveContext) aContext = mySelector->viewer()->getAISContext();
+ Handle(AIS_InteractiveContext) aContext;
+ if (mySelector && mySelector->viewer())
+ aContext = mySelector->viewer()->getAISContext();
+
+ if (!aContext.IsNull()) {
XGUI_Displayer* aDisp = myWorkshop->displayer();
QObjectPtrList aObjList = aDisp->displayedObjects();
}
}
if (!aFound) {
- aDisp->erase(aObj, false);
+ aObj->setDisplayed(false);
+ //aDisp->erase(aObj, false);
}
}
+ Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
}
-
+ myProxyViewer->activateViewer(true);
return isDone;
}
//******************************************************
bool NewGeom_Module::deactivateModule(SUIT_Study* theStudy)
{
+ myProxyViewer->activateViewer(false);
setMenuShown(false);
setToolShown(false);
+ myWorkshop->deactivateModule();
+
QObject* aObj = myWorkshop->objectBrowser()->parent();
QDockWidget* aObjDoc = dynamic_cast<QDockWidget*>(aObj);
if (aObjDoc) {
{
if (!mySelector) {
mySelector = createSelector(theMgr);
+ myWorkshop->module()->activateSelectionFilters();
+ myWorkshop->synchronizeViewer();
}
}
if (theMgr->getType() == OCCViewer_Viewer::Type()) {
OCCViewer_Viewer* aViewer = static_cast<OCCViewer_Viewer*>(theMgr->getViewModel());
if (mySelector->viewer() == aViewer) {
- myWorkshop->displayer()->eraseAll(false);
+ XGUI_Displayer* aDisp = myWorkshop->displayer();
+ QObjectPtrList aObjects = aDisp->displayedObjects();
+ foreach(ObjectPtr aObj, aObjects)
+ aObj->setDisplayed(false);
+ Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
myProxyViewer->setSelector(0);
delete mySelector;
mySelector = 0;
+
+ myWorkshop->module()->clearViewer();
}
}
}
LightApp_Preferences* pref = preferences();
if (pref)
pref->retrieve();
+
+ myWorkshop->displayer()->redisplayObjects();
}
//******************************************************
const QIcon& theIcon, const QKeySequence& theKeys,
bool isCheckable)
{
+ static QString aLastTool = "";
+ static int aNb = 0;
+ if (aLastTool.isEmpty())
+ aLastTool = theWBName;
+ else if (theWBName != aLastTool) {
+ aLastTool = theWBName;
+ if (aNb > 20) {
+ desktop()->addToolBarBreak();
+ aNb = 0;
+ }
+ }
+ aNb++;
+
int aMenu = createMenu(theWBName, -1, -1, 50);
- int aTool = createTool(theWBName);
+ int aTool = createTool(theWBName, theWBName);
int aId = myActionsList.size();
myActionsList.append(theId);
return aAction;
}
+bool NewGeom_Module::isFeatureOfNested(const QAction* theAction)
+{
+ return dynamic_cast<const NewGeom_NestedButton*>(theAction);
+}
-QAction* NewGeom_Module::addNestedFeature(const QString& theWBName,
- const ActionInfo& theInfo,
- const QList<QAction*>& theNestedActions)
+QAction* NewGeom_Module::addFeatureOfNested(const QString& theWBName,
+ const ActionInfo& theInfo,
+ const QList<QAction*>& theNestedActions)
{
int aMenu = createMenu(theWBName, -1, -1, 50);
- int aTool = createTool(theWBName);
+ int aTool = createTool(theWBName, theWBName);
int aId = myActionsList.size();
myActionsList.append(theInfo.id);
createMenu(separator(), aMenu, -1, theMenuPosition);
}
+bool NewGeom_Module::addActionInToolbar( QAction* theAction, const QString& theToolBarTitle )
+{
+ if( !theAction )
+ return false;
+
+ SUIT_Desktop* aDesktop = application()->desktop();
+ if( !aDesktop )
+ return false;
+
+ QtxActionToolMgr* aToolMgr = aDesktop->toolMgr();
+ if( !aToolMgr )
+ return false;
+
+ aToolMgr->append( theAction, theToolBarTitle );
+ return true;
+}
+
//******************************************************
QList<QAction*> NewGeom_Module::commandList() const
{
QList<QAction*> aActions;
- for (int i = 0; i < myActionsList.size(); i++)
- aActions.append(action(i));
+ for (int i = 0; i < myActionsList.size(); i++) {
+ QAction* aCmd = action(i);
+ if (aCmd && myActionsList.contains(aCmd->data().toString()))
+ aActions.append(aCmd);
+ }
return aActions;
}
//******************************************************
void NewGeom_Module::contextMenuPopup(const QString& theClient, QMenu* theMenu, QString& theTitle)
{
+ myWorkshop->contextMenuMgr()->updateViewerMenu();
myWorkshop->contextMenuMgr()->addViewerMenu(theMenu);
LightApp_Module::contextMenuPopup(theClient, theMenu, theTitle);
}
}
aProp->setValue(aValue);
+ myWorkshop->displayer()->redisplayObjects();
}
void NewGeom_Module::inspectSalomeModules()
Config_ModuleReader::addDependencyModule(eachModule.toStdString());
}
}
+
+bool NewGeom_Module::abortAllOperations()
+{
+ return workshop()->operationMgr()->abortAllOperations();
+}