-
#include "NewGeom_Module.h"
#include "NewGeom_DataModel.h"
#include "NewGeom_OCCSelector.h"
#include <XGUI_Workshop.h>
#include <XGUI_PropertyPanel.h>
+#include <XGUI_ContextMenuMgr.h>
+#include <XGUI_Preferences.h>
+#include <XGUI_ObjectsBrowser.h>
+#include <XGUI_OperationMgr.h>
+
+#include <ModuleBase_Operation.h>
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SUIT_Selector.h>
#include <SUIT_Desktop.h>
#include <SUIT_ViewManager.h>
+#include <SUIT_ResourceMgr.h>
+#include <QtxPopupMgr.h>
#include <QtxActionMenuMgr.h>
+#include <QtxResourceMgr.h>
+
+#include <Config_PropManager.h>
#include <QDockWidget>
#include <QAction>
+#include <QTimer>
+
extern "C" {
- NewGeom_EXPORT CAM_Module* createModule() {
- return new NewGeom_Module();
+NewGeom_EXPORT CAM_Module* createModule()
+{
+ return new NewGeom_Module();
+}
+
+NewGeom_EXPORT char* getModuleVersion()
+{
+ return "0.0";
+}
+}
+
+class NewGeom_PrefMgr: public XGUI_IPrefMgr
+{
+public:
+ NewGeom_PrefMgr(LightApp_Preferences* theMgr, const QString& theModName):myMgr(theMgr), myModName(theModName) {}
+
+ virtual int addPreference(const QString& theLbl, int pId,
+ SUIT_PreferenceMgr::PrefItemType theType,
+ const QString& theSection, const QString& theName )
+ {
+ return myMgr->addPreference(myModName, theLbl, pId, theType, theSection, theName);
}
-
- NewGeom_EXPORT char* getModuleVersion() {
- return "0.0";
+
+ virtual void setItemProperty(const QString& thePropName,
+ const QVariant& theValue,
+ const int theId = -1)
+ {
+ myMgr->setItemProperty(thePropName, theValue, theId);
}
-}
+
+
+ virtual SUIT_PreferenceMgr* prefMgr() const { return myMgr; }
+
+private:
+ LightApp_Preferences* myMgr;
+ QString myModName;
+};
+
+
//******************************************************
NewGeom_Module::NewGeom_Module()
-: LightApp_Module( "NewGeom" ), mySelector(0)
+ : LightApp_Module("NewGeom"),
+ mySelector(0), myIsOpened(0), myPopupMgr(0)
{
myWorkshop = new XGUI_Workshop(this);
myProxyViewer = new NewGeom_SalomeViewer(this);
+
+ XGUI_Preferences::setResourceMgr(application()->resourceMgr());
+ XGUI_Preferences::loadCustomProps();
}
//******************************************************
void NewGeom_Module::initialize(CAM_Application* theApp)
{
LightApp_Module::initialize(theApp);
-
+
myWorkshop->startApplication();
+ LightApp_Application* anApp = dynamic_cast<LightApp_Application*>(theApp);
+ if (anApp)
+ connect(anApp, SIGNAL(preferenceResetToDefaults()), this, SLOT(onDefaultPreferences()));
}
//******************************************************
void NewGeom_Module::windows(QMap<int, int>& theWndMap) const
{
- theWndMap.insert( LightApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea );
+ theWndMap.insert(LightApp_Application::WT_PyConsole, Qt::BottomDockWidgetArea);
}
//******************************************************
void NewGeom_Module::viewManagers(QStringList& theList) const
{
- theList.append( OCCViewer_Viewer::Type() );
+ theList.append(OCCViewer_Viewer::Type());
}
//******************************************************
{
bool isDone = LightApp_Module::activateModule(theStudy);
if (isDone) {
- setMenuShown( true );
- setToolShown( true );
- myWorkshop->propertyPanel()->hide();
+ setMenuShown(true);
+ setToolShown(true);
+
+ QObject* aObj = myWorkshop->objectBrowser()->parent();
+ QDockWidget* aObjDoc = dynamic_cast<QDockWidget*>(aObj);
+ if (aObjDoc) {
+ QAction* aViewAct = aObjDoc->toggleViewAction();
+ aViewAct->setEnabled(true);
+ myWorkshop->objectBrowser()->setVisible(true);
+ aObjDoc->setVisible(true);
+ }
if (!mySelector) {
ViewManagerList OCCViewManagers;
mySelector = createSelector(OCCViewManagers.first());
}
}
+ //action(myEraseAll)->setEnabled(false);
+
+ if (myIsOpened) {
+ myWorkshop->objectBrowser()->rebuildDataTree();
+ myWorkshop->updateCommandStatus();
+ myIsOpened = false;
+ QTimer::singleShot(1000, myWorkshop, SLOT(displayAllResults()));
+ }
}
+ SUIT_ResourceMgr* aResMgr = application()->resourceMgr();
+ myIsStorePositions = aResMgr->booleanValue("Study", "store_positions", true);
+
+ // this following row is caused by #187 bug.
+ // SALOME saves the dock widget positions before deactivateModule() and
+ // load it after the module activation. So, if the panel is visible before
+ // deactivate, it becomes visible after activate.
+ // In order to avoid the visible property panel, the widget position save is
+ // switch off in this module
+ aResMgr->setValue("Study", "store_positions", false);
+
return isDone;
}
//******************************************************
-void NewGeom_Module::onViewManagerAdded( SUIT_ViewManager* theMgr )
+bool NewGeom_Module::deactivateModule(SUIT_Study* theStudy)
+{
+ setMenuShown(false);
+ setToolShown(false);
+
+ QObject* aObj = myWorkshop->objectBrowser()->parent();
+ QDockWidget* aObjDoc = dynamic_cast<QDockWidget*>(aObj);
+ if (aObjDoc) {
+ aObjDoc->setVisible(false);
+ myWorkshop->objectBrowser()->setVisible(false);
+ QAction* aViewAct = aObjDoc->toggleViewAction();
+ aViewAct->setEnabled(false);
+ }
+
+ // the active operation should be stopped for the next activation.
+ // There should not be active operation and visualized preview.
+ // Abort operation should be performed before the selection's remove
+ // because the displayed objects should be removed from the viewer, but
+ // the AIS context is obtained from the selector.
+ ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
+ if (anOperation)
+ anOperation->abort();
+
+ // Delete selector because it has to be redefined on next activation
+ if (mySelector) {
+ myProxyViewer->setSelector(0);
+ delete mySelector;
+ mySelector = 0;
+ }
+
+ //myWorkshop->contextMenuMgr()->disconnectViewer();
+
+ SUIT_ResourceMgr* aResMgr = application()->resourceMgr();
+ aResMgr->setValue("Study", "store_positions", myIsStorePositions);
+
+ return LightApp_Module::deactivateModule(theStudy);
+}
+
+//******************************************************
+void NewGeom_Module::onViewManagerAdded(SUIT_ViewManager* theMgr)
{
if ((!mySelector)) {
mySelector = createSelector(theMgr);
}
}
+//******************************************************
+QtxPopupMgr* NewGeom_Module::popupMgr()
+{
+ if (!myPopupMgr)
+ myPopupMgr = new QtxPopupMgr( 0, this );
+ return myPopupMgr;
+}
+
+//******************************************************
+void NewGeom_Module::onDefaultPreferences()
+{
+ XGUI_Preferences::resetConfig();
+ XGUI_Preferences::updateResourcesByConfig();
+
+ LightApp_Preferences* pref = preferences();
+ if (pref)
+ pref->retrieve();
+}
+
//******************************************************
NewGeom_OCCSelector* NewGeom_Module::createSelector(SUIT_ViewManager* theMgr)
{
if (theMgr->getType() == OCCViewer_Viewer::Type()) {
OCCViewer_Viewer* aViewer = static_cast<OCCViewer_Viewer*>(theMgr->getViewModel());
- NewGeom_OCCSelector* aSelector = new NewGeom_OCCSelector(aViewer,
- getApp()->selectionMgr());
+ NewGeom_OCCSelector* aSelector = new NewGeom_OCCSelector(aViewer, getApp()->selectionMgr());
LightApp_SelectionMgr* aMgr = getApp()->selectionMgr();
QList<SUIT_Selector*> aList;
aMgr->selectors(aList);
- foreach(SUIT_Selector* aSel, aList) {
+ foreach(SUIT_Selector* aSel, aList)
+ {
aSel->setEnabled(aSel == aSelector);
}
myProxyViewer->setSelector(aSelector);
return 0;
}
-//******************************************************
-bool NewGeom_Module::deactivateModule(SUIT_Study* theStudy)
-{
- setMenuShown( false );
- setToolShown( false );
- return LightApp_Module::deactivateModule(theStudy);
-}
-
//******************************************************
CAM_DataModel* NewGeom_Module::createDataModel()
{
- return new NewGeom_DataModel( this );
+ return new NewGeom_DataModel(this);
}
//******************************************************
-QAction* NewGeom_Module::addFeature(const QString& theWBName,
- const QString& theId,
- const QString& theTitle,
- const QString& theTip,
- const QIcon& theIcon,
- const QKeySequence& theKeys,
+QAction* NewGeom_Module::addFeature(const QString& theWBName, const QString& theId,
+ const QString& theTitle, const QString& theTip,
+ const QIcon& theIcon, const QKeySequence& theKeys,
bool isCheckable)
{
int aMenu = createMenu(theWBName, -1, -1, 50);
myActionsList.append(theId);
SUIT_Desktop* aDesk = application()->desktop();
int aKeys = 0;
- for (int i = 0; i < theKeys.count(); i++)
+ for (unsigned int i = 0; i < theKeys.count(); i++)
aKeys += theKeys[i];
- QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk,
+ QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk,
isCheckable);
aAction->setData(theId);
- int aItemId = createMenu( aId, aMenu, -1, 10 );
- int aToolId = createTool( aId, aTool );
+ int aItemId = createMenu(aId, aMenu, -1, 10);
+ int aToolId = createTool(aId, aTool);
return aAction;
}
//******************************************************
-QAction* NewGeom_Module::addEditCommand(const QString& theId,
- const QString& theTitle,
- const QString& theTip,
- const QIcon& theIcon,
- const QKeySequence& theKeys,
- bool isCheckable)
+QAction* NewGeom_Module::addDesktopCommand(const QString& theId, const QString& theTitle,
+ const QString& theTip, const QIcon& theIcon,
+ const QKeySequence& theKeys, bool isCheckable,
+ const char* theMenuSourceText, const int theMenuPosition)
{
- int aMenu = createMenu(tr( "MEN_DESK_EDIT" ), -1, -1);
+ int aMenu = createMenu(tr(theMenuSourceText), -1, -1);
int aId = myActionsList.size();
myActionsList.append(theId);
SUIT_Desktop* aDesk = application()->desktop();
int aKeys = 0;
- for (int i = 0; i < theKeys.count(); i++)
+ for (unsigned int i = 0; i < theKeys.count(); i++)
aKeys += theKeys[i];
- QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk,
+ QAction* aAction = createAction(aId, theTip, theIcon, theTitle, theTip, aKeys, aDesk,
isCheckable);
aAction->setData(theId);
- createMenu( aId, aMenu, 10 );
+ createMenu(aId, aMenu, theMenuPosition);
return aAction;
}
//******************************************************
-void NewGeom_Module::addEditMenuSeparator()
+void NewGeom_Module::addDesktopMenuSeparator(const char* theMenuSourceText, const int theMenuPosition)
{
- int aMenu = createMenu(tr( "MEN_DESK_EDIT" ), -1, -1);
- createMenu( separator(), aMenu, -1, 10 );
+ int aMenu = createMenu(tr(theMenuSourceText), -1, -1);
+ createMenu(separator(), aMenu, -1, theMenuPosition);
}
//******************************************************
return QStringList();
}
+//******************************************************
+void NewGeom_Module::setDocumentKind(const QString& theId, const QString& theKind)
+{
+ myDocumentType[theId] = theKind;
+}
+
+//******************************************************
+QString NewGeom_Module::documentKind(const QString& theId) const
+{
+ if (myDocumentType.contains(theId))
+ return myDocumentType[theId];
+ return QString();
+
+}
+
//******************************************************
void NewGeom_Module::selectionChanged()
{
LightApp_Module::selectionChanged();
myWorkshop->salomeViewerSelectionChanged();
}
+
+//******************************************************
+void NewGeom_Module::contextMenuPopup(const QString& theClient, QMenu* theMenu, QString& theTitle)
+{
+ myWorkshop->contextMenuMgr()->addViewerItems(theMenu);
+ LightApp_Module::contextMenuPopup(theClient, theMenu, theTitle);
+}
+
+
+//******************************************************
+void NewGeom_Module::createPreferences()
+{
+ LightApp_Preferences* pref = preferences();
+ if (!pref)
+ return;
+ XGUI_Preferences::updateConfigByResources();
+ QString aModName = moduleName();
+
+ QtxPreferenceItem* item = pref->findItem(aModName, true );
+ if ( item && (!item->isEmpty() )) {
+ item->parentItem()->removeItem(item);
+ delete item;
+ }
+
+ int catId = pref->addPreference(aModName, -1 );
+ if ( catId == -1 )
+ return;
+ NewGeom_PrefMgr aMgr(pref, aModName);
+ XGUI_Preferences::createEditContent(&aMgr, catId);
+ pref->retrieve();
+}
+
+//******************************************************
+void NewGeom_Module::preferencesChanged(const QString& theSection, const QString& theParam)
+{
+ SUIT_ResourceMgr* aResMgr = application()->resourceMgr();
+ QString aVal = aResMgr->stringValue(theSection, theParam);
+ Config_Prop* aProp = Config_PropManager::findProp(theSection.toStdString(), theParam.toStdString());
+ std::string aValue = aVal.toStdString();
+ if (aValue.empty()) {
+ aValue = aProp->defaultValue();
+ aResMgr->setValue(theSection, theParam, QString(aValue.c_str()));
+
+ LightApp_Preferences* pref = preferences();
+ if (pref)
+ pref->retrieve();
+ }
+ aProp->setValue(aValue);
+
+}
