HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r106:7598f3bdb8ba

Pre-0.7 partially back-ported.

Alexis Jeandet -

r106:7598f3bdb8ba 0.6

parent child

Context file:

r106:7598f3bdb8ba

Expand all files

.hgsubstate +1 -1

 cb664ab4bb3c531d706b1948a378ed9810c0dda src/SocExplorerEngine/PeripheralWidget
 f143e4ae72a0bb4832b546eb76eb50e94049b80 src/common/genericBinaryFiles
-dce25b198558be573f56c1cf337aa95ddd666d6 src/common/lppserial
+b353bf8243cbfb3db44e196f33bd164c11c9949 src/common/lppserial
 afde9cc96bb419cf898560d080ec96991aeca src/common/qhexedit

ressources/Grlib.xml +17 0

@@ -430,6 +430,23 generic is set to 2. Reset value: ‘0’."/>
430	<bitField name="DATA" size="32" mode="1" desc=""/>	430	<bitField name="DATA" size="32" mode="1" desc=""/>
431	</register>	431	</register>
432	</peripheral>	432	</peripheral>
		433	<peripheral vid="1" name="SDCTRL" pid="9">
		434	<register name="configuration" addOffset="0">
		435	<bitField size="1" name="Refresh" offset="31" mode="3" desc="SDRAM refresh. If set, the SDRAM refresh will be enabled."/>
		436	<bitField size="1" name="tRP" offset="30" mode="3" desc="SDRAM tRP timing. tRP will be equal to 2 or 3 system clocks (0/1). When mobile SDRAM support is enabled, this bit also represent the MSB in the tRFC timing."/>
		437	<bitField name="tRFC" size="3" offset="27" mode="3" desc="SDRAM tRFC timing. tRFC will be equal to 3 + field-value system clocks. When mobile SDRAM support is enabled, this field is extended with the bit 30."/>
		438	<bitField name="tCD" size="1" offset="26" mode="3" desc="SDRAM CAS delay. Selects 2 or 3 cycle CAS delay (0/1). When changed, a LOAD-COMMAND-REGISTER command must be issued at the same time. Also sets RAS/CAS delay (tRCD)."/>
		439	<bitField name="SDRAM bank size" offset="23" size="3" mode="3" desc="SDRAM banks size. Defines the decoded memory size for each SDRAM chip select: “000”= 4 Mbyte, “001”= 8 Mbyte, “010”= 16 Mbyte .... “111”= 512 Mbyte."/>
		440	<bitField name="SDRAM col. size" offset="21" size="2" mode="3" desc="SDRAM column size. “00”=256, “01”=512, “10”=1024, “11”=2048 except when bit[25:23]= ̆111 ̆then ̆11 ̆=4096"/>
		441	<bitField name="SDRAM command" offset="18" size="3" mode="3" desc="SDRAM command. Writing a non-zero value will generate an SDRAM command: “010”=PRE-CHARGE, “100”=AUTO-REFRESH, “110”=LOAD-COMMAND-REGISTER, “111”=LOAD-EXTENDED-COMMAND-REGISTER. The field is reset after command has been executed."/>
		442	<bitField name="Page-Burst" offset="17" size="1" mode="3" desc="1 = pageburst is used for read operations, 0 = line burst of length 8 is used for read operations. (Only available when VHDL generic pageburst i set to 2)"/>
		443	<bitField name="MS" offset="16" size="1" mode="3" desc="Mobile SDR support enabled. ‘1’ = Enabled, ‘0’ = Disabled (read-only)"/>
		444	<bitField name="D64" offset="15" size="1" mode="3" desc="64-bit data bus (D64) - Reads ‘1’ if memory controller is configured for 64-bit data bus, otherwise‘0’. Read-only."/>
		445	<bitField name="SDRAM refresh load value" offset="0" size="15" mode="3" desc="The period between each AUTO-REFRESH command - Calculated as follows: tREFRESH = ((reload value) + 1) / SYSCLK"/>
		446	</register>
		447	<register name="Power-Saving configuration" addOffset="4">
		448	</register>
		449	</peripheral>
433	</soc>	450	</soc>
434		451
435		452

src/PyWdgt/pythonconsole.cpp 0 -16

             PythonConsole::PythonConsole(socexplorerproxy *proxy, QWidget *parent) :
                 QWidget(parent)
             {
-                //PythonQt::init();
                 PythonQt::init(PythonQt::RedirectStdOut);
                 PythonQt_QtAll::init();
                 this->proxy = proxy;
                 this->console = new PythonQtScriptingConsoleDandD(NULL, PythonQt::self()->getMainModule());
                 this->mainlayout->addWidget(this->console);
                 this->setWindowTitle(tr("Python Scripting Console"));
-                this->bussdriver = 0;
                 this->setAcceptDrops(true);
                 this->setLayout(this->mainlayout);
                 connect(this->console,SIGNAL(pyConsoleRunFiles(QStringList)),this,SLOT(pyConsoleRunFiles(QStringList)));
               this->mainContext->removeVariable(name);
             }
-            void PythonConsole::setBussDriver(socexplorerplugin *driver)
-                this->bussdriver = driver;
-                this->mainContext->addObject("buss", this->bussdriver);
             void PythonConsole::registerObject(QObject* object,const QString& instanceName)
             {
                 this->mainContext->addObject(instanceName,object);
                 this->mainContext->removeVariable(instanceName);
             }
-            void PythonConsole::removeBussDriver()
-                this->bussdriver = 0;
-                this->mainContext->removeVariable("buss");
-                emit this->rootDriverDelete();
             void PythonConsole::pyConsoleRunFiles(const QStringList & pathList)
             {

src/PyWdgt/pythonconsole.h 0 -4

             signals:
                 void rootDriverDelete();
             public slots:
-                void setBussDriver(socexplorerplugin* driver);
-                void removeBussDriver();
                 void removeDriver(const QString& instanceName);
                 void pyConsoleRunFiles(const QStringList&);
                 void pyConsoleRunFile(const QString& fileName);
             private:
                 QHBoxLayout* mainlayout;
-                socexplorerplugin* bussdriver;
                 PythonQtScriptingConsoleDandD* console;
                 PythonQtObjectPtr*  mainContext;
                 socexplorerproxy* proxy;
-                //LPMONMainWindow* mainwin;
             };
             #endif // PYTHONCONSOLE_H

src/SocExplorerEngine/SocExplorerEngine.pro +16 -4

                             PeripheralWidget/src/registerwidget.h \
                             PeripheralWidget/src/socregsviewer.h \
                             PeripheralWidget/src/socregsviewernew.h \
-                            memtester/memtester.h
+                            memtester/memtester.h \
+                            engine/socexplorersettings.h \
+                            engine/socexplorersettingsdialog.h \
+                            engine/socexplorergui.h\
+                            engine/socexplorerconfigkeys.h
                 PySocExplorerEngine.h \
                 memtester/memtester.h\
                 PeripheralWidget/src/socregsviewernew.h \
-                PeripheralWidget/src/collapsableperipheralwidget.h
+                PeripheralWidget/src/collapsableperipheralwidget.h \
+                engine/socexplorersettings.h \
+                engine/socexplorersettingsdialog.h \
+                engine/socexplorergui.h \
+                engine/socexplorerconfigkeys.h
                 plugins/socexplorerplugin.cpp \
                 memtester/memtester.cpp \
                 PeripheralWidget/src/socregsviewernew.cpp \
-                PeripheralWidget/src/collapsableperipheralwidget.cpp
+                PeripheralWidget/src/collapsableperipheralwidget.cpp \
+                engine/socexplorersettings.cpp \
+                engine/socexplorersettingsdialog.cpp \
+                engine/socexplorergui.cpp
             OTHER_FILES += \
             FORMS += \
                 PeripheralWidget/src/socregsviewernew.ui \
-                PeripheralWidget/src/collapsableperipheralwidget.ui
+                PeripheralWidget/src/collapsableperipheralwidget.ui \
+                engine/socexplorersettingsdialog.ui
             RESOURCES += \

src/SocExplorerEngine/engine/socexplorerengine.cpp +33 -2

             ----------------------------------------------------------------------------*/
             #include "socexplorerengine.h"
             #include <proxy/socexplorerproxy.h>
+            #include <socexplorersettings.h>
+            #include <socexplorercoresettingsgui.h>
+            #include <socexplorerconfigkeys.h>
             SocExplorerEngine* SocExplorerEngine::_self = NULL;
             socExplorerXmlModel* SocExplorerEngine::p_xmlmodel=NULL;
             QMainWindow* SocExplorerEngine::mainWindow=NULL;
             QList<SOCModel*>* SocExplorerEngine::SOCs=NULL;
+            QSettings* SocExplorerEngine::m_settings=NULL;
             int SocExplorerEngine::loglvl=1;
             SocExplorerEngine::SocExplorerEngine(QObject *parent) :
                 QObject(parent)
             {
                 {
                     SOCs = new QList<SOCModel*>;
                 }
+                m_settings = new QSettings();
+                SocExplorerCoreSettingsGUI* cfggui=new SocExplorerCoreSettingsGUI();
+                SocExplorerSettings::registerConfigEntry(cfggui,QIcon(":/images/config.svg"),"SocExplorer Core");
             }
                         }
                     }
                 }
+                QStringList localCfg = SocExplorerSettings::value(SOCEXPLORERENGINE_SETTINGS_SCOPE,SOCEXPLORERENGINE_SETTINGS_PLUGINS_LOOKUP_PATH).toString().split(";");
+                QString dir;
+                foreach (dir, localCfg)
+                {
+                    QDir plugDir(dir);
+                    if(plugDir.exists())
+                        folders.append(dir);
+                }
                 return folders;
             }
                 delete soc;
             }
             void SocExplorerEngine::message(socexplorerplugin *sender, const QString &message, int debugLevel)
             {
+                if(!_self)
+                    init();
+                 SocExplorerEngine::message(sender->instanceName(),message,debugLevel);
+            }
+            void SocExplorerEngine::message(QObject *sender, const QString &message, int debugLevel)
+            {
+                if(!_self)
+                    init();
+                 SocExplorerEngine::message(sender->objectName(),message,debugLevel);
+            }
+            void SocExplorerEngine::message(const QString &sender, const QString &message, int debugLevel)
+            {
                 // TODO add multi output message manager IE also log in files
+                static QTextStream SocExplorerEngineStdout(stdout);
                 if(!_self)
                     init();
                 if(loglvl>=debugLevel)
-                    qDebug()<< QTime::currentTime().toString()+" " + sender->instanceName()+":"+message;
+                    SocExplorerEngineStdout << QTime::currentTime().toString()+" " + sender+":"+message << endl;
             }
             void SocExplorerEngine::setLogLevel(int level)

src/SocExplorerEngine/engine/socexplorerengine.h +4 0

             #include <registerwidget.h>
             #include <socmodel.h>
             #include <memtester.h>
+            #include <QSettings>
             #if defined(SOCEXPLORER_SDK_BUILD)
             #  define SOCEXPLORER_SDK_EXPORT Q_DECL_EXPORT
                 Q_OBJECT
             private:
                 static SocExplorerEngine* _self;
+                static QSettings* m_settings;
                 SocExplorerEngine(QObject *parent = 0);
                 static void init();
                  static void addSOC(socexplorerplugin* rootPlugin);
                  static void removeSOC(socexplorerplugin* rootPlugin);
                  static void message(socexplorerplugin* sender,const QString& message,int debugLevel=0);
+                 static void message(QObject* sender,const QString& message,int debugLevel=0);
+                 static void message(const QString& sender,const QString& message,int debugLevel=0);
                  static void setLogLevel(int level);
                  static bool isSocLitleEndian(socexplorerplugin* plugin);
             signals:

src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp 0 -44

@@ -97,47 +97,3 void pluginmanagerWDGT::setChildLoadable
97		97
98		98
99		99
100	void pluginmanagerWDGT::addPlugin()
101	{
102	// /!\ TODO update it remove maximum operation from widget
103	// QString fileName = QFileDialog::getOpenFileName(this,tr("Open Plugin"), QDir::homePath(), tr("Plugin Files Files (.dll .so .so.)"));
104	// if(pluginloader::checklibrary(fileName))
105	// {
106	// QFile::copy(fileName,QString(SocExplorerEngine::pluginFolder())+"/"+ fileName.section('/',-1));
107	// }
108	// this->pluginTable->refreshPluginList();
109	}
110
111
112	void pluginmanagerWDGT::removePlugin()
113	{
114	// for(int i=0;i<this->pluginTable->selectedItems().count();i++)
115	// {
116	// QListWidgetItem* item = this->pluginTable->selectedItems().at(i);
117	// if(item!=NULL)
118	// {
119	// QFile::remove(QString(SocExplorerEngine::pluginFolder())+"/"+item->text());
120	// }
121	// }
122	// this->pluginTable->refreshPluginList();
123	}
124
125
126
127	void pluginmanagerWDGT::loadplugin()
128	{
129	// for(int i=0;i<this->pluginTable->selectedItems().count();i++)
130	// {
131	// QListWidgetItem* item = this->pluginTable->selectedItems().at(i);
132	// if(item!=NULL)
133	// {
134	// QString plugin = QString(SocExplorerEngine::pluginFolder())+"/"+item->text();
135	// emit this->loadSysDrviver(plugin);
136	// }
137	// }
138	// this->pluginTable->refreshPluginList();
139	}
140
141
142
143

src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h +1 -5

                 void pluginselected(const QString& instanceName);
             public slots:
-                //void libselected(int row);
-                void addPlugin();
-                void removePlugin();
-                void loadplugin();
-                //void loadplugin(QListWidgetItem*);
             private:

src/SocExplorerEngine/pluginloader/pluginloader.cpp +4 -33

@@ -13,6 +13,8
13	#ifdef SOCEXPLORER_CUSTOM_PLUGIN_LOADER	13	#ifdef SOCEXPLORER_CUSTOM_PLUGIN_LOADER
14	#include "unix/unixpluginloader.h"	14	#include "unix/unixpluginloader.h"
15	#endif	15	#endif
		16	#include <socexplorerengine.h>
		17	#include <socexplorersettings.h>
16		18
17	pluginloader* pluginloader::_self = NULL;	19	pluginloader* pluginloader::_self = NULL;
18	PluginsCache* pluginloader::_cache = NULL;	20	PluginsCache* pluginloader::_cache = NULL;
@@ -27,38 +29,6 pluginloader::pluginloader()
27	scanFolders();	29	scanFolders();
28	}	30	}
29		31
30
31	QStringList pluginloader::readFoldersList(const QStringList confFiles)
32	{
33	QDir testDir;
34	QStringList folders;
35	QFile confFile;
36	for(int i=0;i<confFiles.count();i++)
37	{
38	confFile.setFileName(confFiles.at(i));
39	if(confFile.exists())
40	{
41	if (confFile.open(QIODevice::ReadOnly \| QIODevice::Text))
42	{
43	QTextStream in(&confFile);
44	QString line = in.readLine();
45	while (!line.isNull())
46	{
47	testDir.setPath(line);
48	if(testDir.exists())
49	{
50	if(!folders.contains(line))
51	folders << line;
52	}
53	line = in.readLine();
54	}
55	}
56	}
57	}
58	return folders;
59	}
60
61
62	void pluginloader::scanFolders()	32	void pluginloader::scanFolders()
63	{	33	{
64	QDir dir;	34	QDir dir;
@@ -74,6 +44,7 void pluginloader::scanFolders()
74	for (int i = 0; i < list.size(); ++i)	44	for (int i = 0; i < list.size(); ++i)
75	{	45	{
76	QFileInfo fileInfo = list.at(i);	46	QFileInfo fileInfo = list.at(i);
		47	SocExplorerEngine::message("pluginloader::scanFolders","Checking "+ fileInfo.filePath(),3);
77	if(checklibrary(fileInfo.filePath())!=0)	48	if(checklibrary(fileInfo.filePath())!=0)
78	{	49	{
79	_cache->append(fileInfo.fileName(),fileInfo.path(),_getlibName(fileInfo.filePath()),_getlibPID(fileInfo.filePath()),_getlibPID(fileInfo.filePath()));	50	_cache->append(fileInfo.fileName(),fileInfo.path(),_getlibName(fileInfo.filePath()),_getlibPID(fileInfo.filePath()),_getlibPID(fileInfo.filePath()));
@@ -90,7 +61,7 int pluginloader::p_checklibraryQlib(con
90	lib->load();	61	lib->load();
91	if(!lib->isLoaded())	62	if(!lib->isLoaded())
92	{	63	{
93	qDebug()<<lib->errorString();	64	SocExplorerEngine::message("pluginloader::p_checklibraryQlib",lib->errorString(),3);
94	lib->~QLibrary();	65	lib->~QLibrary();
95	lib = new QLibrary(fileName);	66	lib = new QLibrary(fileName);
96	lib->load();	67	lib->load();

src/SocExplorerEngine/pluginloader/pluginloader.h 0 -1

                 int p_checklibraryCustom(const QString fileName);
                 socexplorerplugin* p_newsocexplorerpluginQlib(const QString Name);
                 socexplorerplugin* p_newsocexplorerpluginCustom(const QString Name);
-                static QStringList readFoldersList(const QStringList confFiles);
                 static QString* _cacheLookup(const QString Name);
                 static QString _getlibName(const QString fileName);
                 static int _getlibPID(const QString fileName);

src/SocExplorerEngine/pluginloader/pluginscache.cpp +3 -2

             #include "pluginscache.h"
             #include <QDebug>
+            #include <socexplorerengine.h>
             PluginsCacheItem::PluginsCacheItem(const QString &fileName, const QString &path, const QString &pluginName, int VID, int PID)
             {
                 {
                     if(this->items->at(i)->compare(item))
                     {
-                        qDebug()<< fileName << "already in the cache";
+                        SocExplorerEngine::message("PluginsCache",fileName + " already in the cache",3);
                         delete item;
                         return;
                     }
                 }
-                qDebug()<< fileName << "added to cache";
+                SocExplorerEngine::message("PluginsCache",fileName + " added to cache",3);
                 this->items->append(item);
             }

src/SocExplorerEngine/pluginloader/unix/unixpluginloader.cpp +8 -7

             #include "unixpluginloader.h"
             #include <stdio.h>
             #include <QDebug>
+            #include <socexplorerengine.h>
             unixPluginLoader::unixPluginLoader(const QString &libPath)
             {
-                qDebug()<<"try to open "+libPath;
+                SocExplorerEngine::message("unixPluginLoader::unixPluginLoader","try to open "+libPath,3);
                 dlHandle = dlopen(libPath.toStdString().c_str(),RTLD_LAZY|RTLD_GLOBAL);
                 if(dlHandle==NULL)
-                    qDebug() << "Failed"<< dlerror();
+                    SocExplorerEngine::message("unixPluginLoader::unixPluginLoader",QString("Failed ") + dlerror(),3);
                 else
-                    qDebug() << "Success";
+                    SocExplorerEngine::message("unixPluginLoader::unixPluginLoader","Success " ,3);
                 this->libPath = libPath;
             }
             {
                 if(dlHandle!=NULL)
                 {
-                    qDebug()<<"try to resolve "+symbol+" in "+libPath;
+                    SocExplorerEngine::message("unixPluginLoader::resolve","try to resolve "+symbol+" in "+libPath ,3);
                     void* sym =  dlsym (dlHandle, symbol.toStdString().c_str());
                     if(sym==NULL)
-                        qDebug() << "Failed"<< dlerror();
+                        SocExplorerEngine::message("unixPluginLoader::resolve",QString("Failed")+ dlerror() ,3);
                     else
-                        qDebug() << "Success";
+                        SocExplorerEngine::message("unixPluginLoader::resolve","Success",3);
                     return sym;
                 }
                 return NULL;
                 if(dlHandle!=NULL)
                 {
                     dlclose(dlHandle);
-                    qDebug() << dlerror();
+                    SocExplorerEngine::message("unixPluginLoader::close",dlerror(),3);
                 }
             }

src/SocExplorerEngine/plugins/socexplorerplugin.cpp +1 -1

               if(this->menu)
                 this->menu->setTitle(this->_instanceName);
               this->setWindowTitle(newName);
+              this->setObjectName(newName);
             }
             bool socexplorerplugin::dumpMemory(unsigned int address, unsigned int count, QString file)
               return false;
             }

src/SocExplorerEngine/plugins/socexplorerplugin.h +2 -1

                 //! Default plugin constructor, any plugin should call this constructor.
                 socexplorerplugin(QWidget *parent = 0,bool createPyObject=true):QDockWidget(parent)
                 {
+                    Q_UNUSED(createPyObject)
                     closeAction=NULL;
                     menu=NULL;
                     ChildsMenu=NULL;
                 virtual void setInstanceName(const QString& newName);
                 virtual bool dumpMemory(unsigned int address,unsigned int count,QString file);
+                virtual bool dumpMemory(unsigned int address,unsigned int count,QString file,const QString& format);
                 virtual bool memSet(unsigned int address,int value, unsigned int count);
                 virtual bool loadbin(unsigned int address,QString file);
                 virtual bool loadfile(abstractBinFile* file);
-                virtual bool dumpMemory(unsigned int address,unsigned int count,QString file,const QString& format);
                 QVariantList Read(unsigned int address, unsigned int count);
                 void Write(unsigned int address, QList<QVariant> dataList);
                 socexplorerplugin* parentPlugin(){return this->parent;}

src/SocExplorerEngine/proxy/socexplorerproxy.cpp +70 -7

             socexplorerplugin* socexplorerproxy::root=NULL;
             socexplorerplugin* socexplorerproxy::parent=NULL;
             PluginsCache* socexplorerproxy::cache=NULL;
+            QStringList* socexplorerproxy::linearDriverPathList=NULL;
             socexplorerproxy::socexplorerproxy(QObject *parent) :
                 QObject(parent)
                 cache = new PluginsCache;
                 drivers = new QList<socexplorerplugin*>;
                 linearDriverList=new QList<socexplorerplugin*>;
+                linearDriverPathList=new QStringList;
                 root = NULL;
             }
                 cache = new PluginsCache;
                 drivers = new QList<socexplorerplugin*>;
                 linearDriverList=new QList<socexplorerplugin*>;
+                linearDriverPathList=new QStringList;
                 root = NULL;
             }
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     QString driverName = _self->getinstanceName(driver->baseName());
-                    loadSysDriver(driver,driverName);
+                    loadSysDriver(driver,driverName,name);
                 }
             }
                 if(pluginloader::libcanberoot(name) && !_self->instanceExists(instanceName))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
-                    loadSysDriver(driver,instanceName);
+                    loadSysDriver(driver,instanceName,name);
                 }
             }
-            void socexplorerproxy::loadSysDriver(socexplorerplugin *driver, const QString instanceName)
+            void socexplorerproxy::loadSysDriver(socexplorerplugin *driver, const QString instanceName, const QString path)
             {
                 if(!_self)init();
                 driver->setInstanceName(instanceName);
                 driver->parent = NULL;
                 drivers->append(driver);
                 linearDriverList->append(driver);
+                if(path.isEmpty())
+                    linearDriverPathList->append(driver->baseName());
+                else
+                    linearDriverPathList->append(path);
                 connectChildToProxy(driver);
                 emit _self->addPluginGUI(driver);
                 emit _self->clearMenu();
                     bool ok=true;
                     if(ok)
                     {
-                        if(parent!=NULL)_self->loadSysDriverToParent(driver,parent,driverName);
+                        if(parent!=NULL)_self->loadSysDriverToParent(driver,parent,driverName,child);
                     }
                 }
             }
                     if(ok)
                     {
                         socexplorerplugin* parent=_self->getSysDriver(ParentInst);
-                        if(parent!=NULL)loadSysDriverToParent(driver,parent,driverName);
+                        if(parent!=NULL)loadSysDriverToParent(driver,parent,driverName,name);
                     }
                 }
             }
                     if(ok)
                     {
                         socexplorerplugin* parent=_self->getSysDriver(ParentInst);
-                        if(parent!=NULL)loadSysDriverToParent(driver,parent,instanceName);
+                        if(parent!=NULL)loadSysDriverToParent(driver,parent,instanceName,name);
                     }
                 }
             }
-            void socexplorerproxy::loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName)
+            void socexplorerproxy::loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName,const QString path)
             {
                 if(!_self)init();
                 linearDriverList->append(driver);
+                if(path.isEmpty())
+                    linearDriverPathList->append(driver->baseName());
+                else
+                    linearDriverPathList->append(path);
                 driver->parent = parent;
                 driver->setInstanceName(instanceName);
                 parent->childs.append(driver);
                 return NULL;
             }
+            QStringList socexplorerproxy::getPluginsList()
+            {
+                if(!_self)init();
+                QStringList result;
+                socexplorerplugin* plugin;
+                for(int i=0; i<linearDriverList->count();i++)
+                {
+                    QString parent="";
+                    plugin=linearDriverList->at(i);
+                    if(plugin->parent)parent=plugin->parent->instanceName();
+                    result.append(linearDriverList->at(i)->instanceName()+":"+parent+":"+linearDriverPathList->at(i));
+                }
+                return result;
+            }
+            bool socexplorerproxy::loadPluginsList(QStringList plugins)
+            {
+                if(!_self)init();
+                QString plugin;
+                int lastLoadedPlugins=-1;
+                QStringList loadedPlugins;
+                while(plugins.count() && lastLoadedPlugins!=loadedPlugins.count())
+                {
+                    lastLoadedPlugins=loadedPlugins.count();
+                    for (int i = 0; i < plugins.count(); i++)
+                    {
+                        plugin=plugins[i];
+                        QStringList args=plugin.split(':',QString::KeepEmptyParts);
+                        if(args.count()==3)
+                        {
+                            if(args[1].isEmpty())
+                            {
+                                _self->loadSysDriver(args[2],args[0]);
+                                loadedPlugins.append(args[0]);
+                                plugins.removeAt(i);
+                            }
+                            else if(loadedPlugins.contains(args[1]))
+                            {
+                                _self->loadSysDriverToParent(args[2],args[0],args[1]);
+                                loadedPlugins.append(args[0]);
+                                plugins.removeAt(i);
+                            }
+                        }
+                        else
+                        {
+                            plugins.removeAt(i);
+                        }
+                    }
+                }
+            }
             bool socexplorerproxy::instanceExists(const QString &instanceName)
             {
                 return !socexplorerproxy::instanceNameIsValid(instanceName);
                     emit _self->removePluginGUI(driver);
                     if(driver->parent==NULL)SocExplorerEngine::removeSOC(driver);
                     while(driver->childs.count()!=0)closeSysDriver(driver->childs.first());
+                    linearDriverPathList->removeAt(linearDriverList->indexOf(driver));
                     linearDriverList->removeOne(driver);
                     if(driver->parent!= NULL)
                     {

src/SocExplorerEngine/proxy/socexplorerproxy.h +5 -2

                 static void disconnectChildToProxy(socexplorerplugin* child);
                 static bool instanceNameIsValid(const QString& instanceName);
                 static socexplorerplugin* findPlugin(const QString &instanceName);
+                static QStringList getPluginsList();
+                static bool loadPluginsList( QStringList plugins);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE static void loadChildSysDriver(socexplorerplugin* parent,const QString child);
             public slots:
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(const QString name);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(const QString name,const QString instanceName);
-                QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(socexplorerplugin* driver,const QString instanceName);
+                QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriver(socexplorerplugin* driver,const QString instanceName,const QString path="");
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(const QString name,const QString ParentInst);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(const QString name,const QString instanceName,const QString ParentInst);
-                QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName);
+                QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName,const QString path="");
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void changeSysDriverInstName(const QString instanceName);
                 QT_ENSURE_STACK_ALIGNED_FOR_SSE void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName);
              //   QT_ENSURE_STACK_ALIGNED_FOR_SSE void loadChild(socexplorerplugin* parent);
                 static QMainWindow* mainWindow;
                 static QList<socexplorerplugin*>* drivers;
                 static QList<socexplorerplugin*>* linearDriverList;
+                static QStringList* linearDriverPathList;
                 static socexplorerplugin* root;
                 static socexplorerplugin* parent;
                 static PluginsCache* cache;

src/common/pythonQtOut/generated_cpp/PySocExplorer/PySocExplorer0.cpp +5 0

               return ( theWrappedObject->getSymbolCount());
             }
+            int  PythonQtWrapper_ElfFile::getSymbolIndex(ElfFile* theWrappedObject, const QString&  name)
+            {
+              return ( theWrappedObject->getSymbolIndex(name));
+            }
             QString  PythonQtWrapper_ElfFile::getSymbolLinkType(ElfFile* theWrappedObject, int  index)
             {
               return ( theWrappedObject->getSymbolLinkType(index));

src/common/pythonQtOut/generated_cpp/PySocExplorer/PySocExplorer0.h +1 0

                qint64  getSegmentVaddr(ElfFile* theWrappedObject, int  index);
                quint64  getSymbolAddress(ElfFile* theWrappedObject, int  index);
                int  getSymbolCount(ElfFile* theWrappedObject);
+               int  getSymbolIndex(ElfFile* theWrappedObject, const QString&  name);
                QString  getSymbolLinkType(ElfFile* theWrappedObject, int  index);
                QString  getSymbolName(ElfFile* theWrappedObject, int  index);
                int  getSymbolSectionIndex(ElfFile* theWrappedObject, int  index);

src/main.cpp +58 -21

@@ -29,49 +29,93
29	#include <QStyleFactory>	29	#include <QStyleFactory>
30	#include <QStringList>	30	#include <QStringList>
31	#include <QFile>	31	#include <QFile>
		32	#include <QCommandLineOption>
		33	#include <QCommandLineParser>
32		34
33	void usage();	35
		36	QCommandLineOption executeOption = QCommandLineOption (
		37	QStringList() << "e" << "execute",
		38	QCoreApplication::translate("main", "Execute given script <script>."),
		39	QCoreApplication::translate("main", "script"));
		40
		41	QCommandLineOption debugLevelOption = QCommandLineOption (
		42	QStringList() << "d" << "debug-level",
		43	QCoreApplication::translate("main", "Sets debug level to <level>, higher the level is more verbose the application will be."),
		44	QCoreApplication::translate("main", "level"),
		45	"1");
		46
		47	QCommandLineOption noGUIOption = QCommandLineOption (
		48	QStringList() << "n" << "no-gui",
		49	QCoreApplication::translate("main", "Starts SocExplorer in batch mode[not fully implemented yet!]."));
		50
		51	const char* socexplorerDesc="\
		52	SocExplorer is an open source generic System On Chip testing software/framework.\
		53	We write this software for the development and the validation of our instrument,\
		54	the Low Frequency Receiver(LFR) for the Solar Orbiter mission. This instrument is\
		55	based on an actel FPGA hosting a LEON3FT processor and some peripherals. To make\
		56	it more collaborative, we use a plugin based system, the main executable is SocExplorer\
		57	then all the functionality are provided by plugins. Like this everybody can provide\
		58	his set of plugins to handle a new SOC or just a new peripheral. SocExplorer uses\
		59	PythonQt to allow user to automate some tasks such as loading some plugins, configuring\
		60	them and talking with his device. SocExplorer is provided under the terms of the GNU\
		61	General Public License as published by the Free Software Foundation; either version 2\
		62	of the License, or (at your option) any later version.";
34		63
35	int main(int argc, char *argv[])	64	int main(int argc, char *argv[])
36	{	65	{
37	QApplication a(argc, argv);	66	QApplication a(argc, argv);
38	QString scriptToEval;	67	QString scriptToEval;
39	QStringList args= a.arguments();	68	QApplication::setOrganizationName("LPP");
		69	QApplication::setOrganizationDomain("lpp.fr");
		70	QApplication::setApplicationName("SocExplorer");
		71	QCommandLineParser parser;
		72	parser.setApplicationDescription(socexplorerDesc);
		73	parser.addHelpOption();
		74	parser.addVersionOption();
40	bool noGUI=false;	75	bool noGUI=false;
41	for(int i=0;i<=args.count()-1;i++)	76	parser.addPositionalArgument("file", QCoreApplication::translate("main", "The Python file to execute."));
		77	parser.addOption(executeOption);
		78	parser.addOption(debugLevelOption);
		79	parser.addOption(noGUIOption);
		80	parser.process(a);
		81	if(parser.isSet(executeOption))
42	{	82	{
43	if(((args.at(i).compare("-e")==0) \|\| (args.at(i).compare("--execute")==0)) && (i<(args.count()-1)))	83	scriptToEval = parser.value(executeOption);
44	{
45	scriptToEval = args.at(i+1);
46	if(!QFile::exists(scriptToEval))	84	if(!QFile::exists(scriptToEval))
47	{	85	{
48	scriptToEval.clear();	86	scriptToEval.clear();
49	}	87	}
		88	}
50	else	89	else
51	qDebug() << "Will execute" << scriptToEval;	90	{
52	break;	91	QStringList posArgs = parser.positionalArguments();
		92	if(posArgs.count())
		93	{
		94	scriptToEval = posArgs.first();
		95	if(!QFile::exists(scriptToEval))
		96	{
		97	scriptToEval.clear();
53	}	98	}
54	if(((args.at(i).compare("-d")==0) \|\| (args.at(i).compare("--debug-level")==0)) && (i<(args.count()-1)))	99	}
		100	}
		101	if(parser.isSet(debugLevelOption))
55	{	102	{
56	bool success;	103	bool success;
57	int lvl;	104	int lvl;
58	lvl = args.at(i+1).toInt(&success,10);	105	lvl = parser.value(debugLevelOption).toInt(&success,10);
59	if(success)	106	if(success)
60	{	107	{
61	SocExplorerEngine::setLogLevel(lvl);	108	SocExplorerEngine::setLogLevel(lvl);
62	}	109	}
63	}	110	}
64	if((args.at(i).compare("--no-gui")==0))	111	if(parser.isSet(noGUIOption))
65	{	112	{
66	noGUI = true;	113	noGUI = true;
67	qDebug() << "CLI mode";	114	qDebug() << "CLI mode";
68	}	115	}
69	}
70
71	SocExplorerMainWindow w(scriptToEval);	116	SocExplorerMainWindow w(scriptToEval);
72	if(!noGUI)	117	if(!noGUI)
73	{	118	{
74
75	w.show();	119	w.show();
76	}	120	}
77	else	121	else
@@ -80,10 +124,3 int main(int argc, char *argv[])
80	}	124	}
81	return a.exec();	125	return a.exec();
82	}	126	}
83
84
85	void usage()
86	{
87	// TODO respect usual Linux Cli interface, socexplore [OPTION]...FILES...
88	// TODO write an usage helper.
89	}

src/mainwindow.cpp +130 -3

@@ -1,6 +1,6
1	/*------------------------------------------------------------------------------	1	/*------------------------------------------------------------------------------
2	-- This file is a part of the SocExplorer Software	2	-- This file is a part of the SocExplorer Software
3	-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS	3	-- Copyright (C) 2011-2015, Plasma Physics Laboratory - CNRS
4	--	4	--
5	-- This program is free software; you can redistribute it and/or modify	5	-- This program is free software; you can redistribute it and/or modify
6	-- it under the terms of the GNU General Public License as published by	6	-- it under the terms of the GNU General Public License as published by
@@ -21,6 +21,8
21	----------------------------------------------------------------------------*/	21	----------------------------------------------------------------------------*/
22	#include "mainwindow.h"	22	#include "mainwindow.h"
23	#include <QDockWidget>	23	#include <QDockWidget>
		24	#include <socexplorersettings.h>
		25	#include <socexplorerconfigkeys.h>
24		26
25	SocExplorerMainWindow::SocExplorerMainWindow(QString ScriptToEval, QWidget *parent)	27	SocExplorerMainWindow::SocExplorerMainWindow(QString ScriptToEval, QWidget *parent)
26	: QMainWindow(parent)	28	: QMainWindow(parent)
@@ -31,6 +33,7 SocExplorerMainWindow::SocExplorerMainWi
31	this->makeObjects(ScriptToEval);	33	this->makeObjects(ScriptToEval);
32	this->makeLayout();	34	this->makeLayout();
33	this->makeMenu();	35	this->makeMenu();
		36	SocExplorerSettings::init();
34	this->makeConnections();	37	this->makeConnections();
35	this->setWindowIcon(QIcon(":/images/icon.png"));	38	this->setWindowIcon(QIcon(":/images/icon.png"));
36	this->setAcceptDrops(true);	39	this->setAcceptDrops(true);
@@ -50,8 +53,11 void SocExplorerMainWindow::makeObjects(
50	Q_UNUSED(ScriptToEval)	53	Q_UNUSED(ScriptToEval)
51	this->p_pluginGUIlist = new QList<QDockWidget*>();	54	this->p_pluginGUIlist = new QList<QDockWidget*>();
52	pluginsDockContainer = new QMainWindow;	55	pluginsDockContainer = new QMainWindow;
		56	pluginsDockContainer->setObjectName("pluginsDockContainer");
53	pluginsDockContainer->setWindowFlags(Qt::Widget);	57	pluginsDockContainer->setWindowFlags(Qt::Widget);
54	pluginsDockContainer->setDockNestingEnabled(true);	58	pluginsDockContainer->setDockNestingEnabled(true);
		59	this->sessionsActions = new QActionGroup(this);
		60	this->sessionManagerAction =new QAction(tr("&Session manager"),this);
55	this->mainWidget = new QSplitter(Qt::Vertical);	61	this->mainWidget = new QSplitter(Qt::Vertical);
56	this->appTranslator = new QTranslator;	62	this->appTranslator = new QTranslator;
57	this->Quit = new QAction(tr("&Quit"),this);	63	this->Quit = new QAction(tr("&Quit"),this);
@@ -63,16 +69,19 void SocExplorerMainWindow::makeObjects(
63	this->help = new QAction(tr("&Help"),this);	69	this->help = new QAction(tr("&Help"),this);
64	this->help->setShortcut(tr("CTRL+H"));	70	this->help->setShortcut(tr("CTRL+H"));
65	this->about = new QAction(tr("&About"),this);	71	this->about = new QAction(tr("&About"),this);
		72	this->p_SessionManagerDialog = new SessionManagerDialog();
66	socexplorerproxy::setMainWindow(this);	73	socexplorerproxy::setMainWindow(this);
67	SocExplorerEngine::setMainWindow(this);	74	SocExplorerEngine::setMainWindow(this);
68	SocExplorerEngine::xmlModel()->scanXmlFiles();	75	SocExplorerEngine::xmlModel()->scanXmlFiles();
69	this->regExplorer = new RegsExplorer();	76	this->regExplorer = new RegsExplorer();
70	this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);	77	this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);
		78	this->regExplorer->setObjectName("regExplorer");
71	this->addPluginInterface(this->regExplorer);	79	this->addPluginInterface(this->regExplorer);
72	this->PythonConsoleInst = new PythonConsole(socexplorerproxy::self());	80	this->PythonConsoleInst = new PythonConsole(socexplorerproxy::self());
73	this->PythonConsoleInst->addObject("SocExplorerEngine",SocExplorerEngine::self());	81	this->PythonConsoleInst->addObject("SocExplorerEngine",SocExplorerEngine::self());
74	this->pluginManager = new dockablePluginManager();	82	this->pluginManager = new dockablePluginManager();
75	this->toolpane = new toolBar;	83	this->toolpane = new toolBar;
		84	this->toolpane->setObjectName("toolpane");
76	this->p_about = new aboutsocexplorer();	85	this->p_about = new aboutsocexplorer();
77	}	86	}
78		87
@@ -107,6 +116,13 void SocExplorerMainWindow::makeConnecti
107	connect(this->about,SIGNAL(triggered()),this,SLOT(showAboutBox()));	116	connect(this->about,SIGNAL(triggered()),this,SLOT(showAboutBox()));
108	connect(this->exploreRegs,SIGNAL(triggered()),this->regExplorer,SLOT(show()));	117	connect(this->exploreRegs,SIGNAL(triggered()),this->regExplorer,SLOT(show()));
109		118
		119	connect(this->sessionManagerAction, SIGNAL(triggered(bool)),this,SLOT(showSessionManager(bool)));
		120	connect(this->p_SessionManagerDialog, SIGNAL(switchSession(QString)),this,SLOT(setActiveSession(QString)));
		121	connect(this->p_SessionManagerDialog, SIGNAL(sessionRenamed(QString,QString)),this,SLOT(renameSession(QString,QString)));
		122	connect(this->p_SessionManagerDialog, SIGNAL(sessionAdded(QString)),this,SLOT(addSession(QString)));
		123	connect(this->p_SessionManagerDialog, SIGNAL(sessionRemoved(QString)),this,SLOT(removeSession(QString)));
		124	connect(this->sessionsActions,SIGNAL(triggered(QAction)),this,SLOT(setActiveSession(QAction)));
		125
110	this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDrviver(QString)),socexplorerproxy::self(),SLOT(loadSysDriver(QString)));	126	this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDrviver(QString)),socexplorerproxy::self(),SLOT(loadSysDriver(QString)));
111	this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDriverToParent(QString,QString)),socexplorerproxy::self(),SLOT(loadSysDriverToParent(QString,QString)));	127	this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDriverToParent(QString,QString)),socexplorerproxy::self(),SLOT(loadSysDriverToParent(QString,QString)));
112		128
@@ -115,12 +131,10 void SocExplorerMainWindow::makeConnecti
115		131
116	void SocExplorerMainWindow::launchPluginManager()	132	void SocExplorerMainWindow::launchPluginManager()
117	{	133	{
118
119	if(this->pluginManager->isHidden())	134	if(this->pluginManager->isHidden())
120	{	135	{
121	this->pluginManager->setHidden(false);	136	this->pluginManager->setHidden(false);
122	}	137	}
123
124	}	138	}
125		139
126		140
@@ -150,6 +164,11 void SocExplorerMainWindow::clearMenu()
150	void SocExplorerMainWindow::makeMenu()	164	void SocExplorerMainWindow::makeMenu()
151	{	165	{
152	this->FileMenu = menuBar()->addMenu(tr("&File"));	166	this->FileMenu = menuBar()->addMenu(tr("&File"));
		167	this->SessionsMenu = this->FileMenu->addMenu(tr("&Sessions"));
		168	this->loadSessions();
		169	this->FileMenu->addAction(this->sessionManagerAction);
		170	this->SettingsMenu = menuBar()->addMenu(tr("&Settings"));
		171	SocExplorerGUI::registerMenuBar(menuBar(),this->FileMenu,this->SettingsMenu);
153	this->PluginsMenu = menuBar()->addMenu(tr("&Plugins"));	172	this->PluginsMenu = menuBar()->addMenu(tr("&Plugins"));
154	this->ToolsMenu = menuBar()->addMenu(tr("&Tools"));	173	this->ToolsMenu = menuBar()->addMenu(tr("&Tools"));
155	this->ToolsMenu->addAction(this->exploreRegs);	174	this->ToolsMenu->addAction(this->exploreRegs);
@@ -163,9 +182,58 void SocExplorerMainWindow::makeMenu()
163		182
164	}	183	}
165		184
		185	void SocExplorerMainWindow::loadSessions()
		186	{
		187	p_Sessions=this->p_SessionManagerDialog->getSessionsList();
		188	QAction* sact;
		189	QString stext;
		190	QList<QAction*> sessions=sessionsActions->actions();
		191	foreach (sact, sessions)
		192	{
		193	sessionsActions->removeAction(sact);
		194	SessionsMenu->removeAction(sact);
		195	delete sact;
		196	}
		197	foreach (stext, p_Sessions)
		198	{
		199	addSession(stext);
		200	}
		201	}
		202
		203	void SocExplorerMainWindow::savePlugins()
		204	{
		205
		206	}
		207
		208	void SocExplorerMainWindow::saveCurrentSession()
		209	{
		210	if(p_currentSession.isEmpty())
		211	{
		212	SocExplorerSettings::loadSession("default");
		213	}
		214	SocExplorerSettings::setValue("GLOBAL","LastModified",QDate::currentDate().toString(),SocExplorerSettings::Session);
		215	SocExplorerSettings::setValue(this,"DOCK_LOCATIONS",this->saveState(0),SocExplorerSettings::Session);
		216	SocExplorerSettings::setValue(this,"PLUGINS_DOCK_LOCATIONS",this->pluginsDockContainer->saveState(0),SocExplorerSettings::Session);
		217	SocExplorerSettings::setValue(this,"MAIN_WINDOW_GEOMETRY",this->saveGeometry(),SocExplorerSettings::Session);
		218	QStringList plugins = socexplorerproxy::getPluginsList();
		219	SocExplorerSettings::setValue(this,"LOADED_PLUGINS",QVariant(plugins),SocExplorerSettings::Session);
		220	SocExplorerSettings::sync();
		221	}
		222
		223	void SocExplorerMainWindow::loadCurrentSession()
		224	{
		225
		226	QStringList plugins = SocExplorerSettings::value(this,"LOADED_PLUGINS",QVariant(),SocExplorerSettings::Session).toStringList();
		227	socexplorerproxy::loadPluginsList(plugins);
		228	this->restoreGeometry(SocExplorerSettings::value(this,"MAIN_WINDOW_GEOMETRY",QVariant(),SocExplorerSettings::Session).toByteArray());
		229	this->restoreState(SocExplorerSettings::value(this,"DOCK_LOCATIONS",QVariant(),SocExplorerSettings::Session).toByteArray());
		230	this->pluginsDockContainer->restoreState(SocExplorerSettings::value(this,"PLUGINS_DOCK_LOCATIONS",QVariant(),SocExplorerSettings::Session).toByteArray());
		231	}
		232
166		233
167	SocExplorerMainWindow::~SocExplorerMainWindow()	234	SocExplorerMainWindow::~SocExplorerMainWindow()
168	{	235	{
		236
169	}	237	}
170		238
171		239
@@ -224,10 +292,69 void SocExplorerMainWindow::pluginselect
224	drv->raise();	292	drv->raise();
225	}	293	}
226		294
		295	void SocExplorerMainWindow::setActiveSession(const QString &session)
		296	{
		297	if(!(p_currentSession.isNull() && session=="default"))
		298	saveCurrentSession();
		299	socexplorerproxy::self()->close();
		300	this->p_currentSession = session;
		301	SocExplorerSettings::loadSession(session);
		302	loadCurrentSession();
		303
		304	}
		305
		306	void SocExplorerMainWindow::setActiveSession(QAction *session)
		307	{
		308	this->setActiveSession(session->text());
		309	}
		310
		311	void SocExplorerMainWindow::showSessionManager(bool)
		312	{
		313	this->p_SessionManagerDialog->show();
		314	}
		315
		316	void SocExplorerMainWindow::renameSession(const QString &oldName, const QString &newName)
		317	{
		318	for(int i=0;i<sessionsActions->actions().count();i++)
		319	{
		320	if(Q_UNLIKELY(sessionsActions->actions().at(i)->text()==oldName))
		321	{
		322	sessionsActions->actions().at(i)->setText(newName);
		323	}
		324	}
		325	}
		326
		327	void SocExplorerMainWindow::addSession(const QString &newSession)
		328	{
		329	QAction* sact = new QAction(newSession,this);
		330	sact->setCheckable(true);
		331	sact->setData(newSession);
		332	if(Q_UNLIKELY(p_currentSession==newSession))
		333	sact->setChecked(true);
		334	sessionsActions->addAction(sact);
		335	SessionsMenu->addAction(sact);
		336	}
		337
		338	void SocExplorerMainWindow::removeSession(const QString &session)
		339	{
		340	QAction* sact;
		341	foreach (sact, sessionsActions->actions())
		342	{
		343	if(Q_UNLIKELY(sact->text()==session))
		344	{
		345	sessionsActions->removeAction(sact);
		346	SessionsMenu->removeAction(sact);
		347	delete sact;
		348	}
		349	}
		350	}
		351
		352
227		353
228		354
229	void SocExplorerMainWindow::closeEvent(QCloseEvent *event)	355	void SocExplorerMainWindow::closeEvent(QCloseEvent *event)
230	{	356	{
		357	saveCurrentSession();
231	socexplorerproxy::self()->close();	358	socexplorerproxy::self()->close();
232	qApp->closeAllWindows();	359	qApp->closeAllWindows();
233	event->accept();	360	event->accept();

src/mainwindow.h +19 -3

             #include "aboutsocexplorer.h"
             #include "toolbar.h"
             #include "regsExplorer/regsexplorer.h"
+            #include "socexplorergui.h"
+            #include "sessionmanagerdialog.h"
             class SocExplorerMainWindow : public QMainWindow
             {
                 Q_OBJECT
             public:
                 SocExplorerMainWindow(QString ScriptToEval,QWidget *parent = 0);
                 ~SocExplorerMainWindow();
-                QAction* Quit,*LoadPlugin,*ManagePlugins,*help,*regsManager,*exploreRegs,*about,*translateAction;
+                QAction* Quit,*LoadPlugin,*ManagePlugins,*help,*regsManager,*exploreRegs,*about,*translateAction,*sessionManagerAction;
+                QActionGroup*sessionsActions;
                 QActionGroup*langActionGrp;
-                QMenu* FileMenu,*PluginsMenu,*ToolsMenu,*langMenu,*helpMenu;
+                QMenu* FileMenu,*SettingsMenu,*PluginsMenu,*ToolsMenu,*langMenu,*helpMenu,*SessionsMenu;
                 QTranslator* appTranslator;
                 void createLangMenu();
                 void closeEvent(QCloseEvent *event);
                 void setLangage(QAction* action);
                 void showAboutBox();
                 void pluginselected(const QString& instanceName);
+                void setActiveSession(const QString & session);
+                void setActiveSession(QAction* session);
+                void showSessionManager(bool);
+                void renameSession(const QString& oldName,const QString& newName);
+                void addSession(const QString& newSession);
+                void removeSession(const QString& session);
             signals:
                 void translateSig();
                 void registerObject(QObject* object,const QString& instanceName);
                 void makeLayout();
                 void makeConnections();
                 void makeMenu();
+                void loadSessions();
+                void savePlugins();
+                void saveCurrentSession();
+                void loadCurrentSession();
                 QMainWindow* pluginsDockContainer;
                 QSplitter* mainWidget;
                 PythonConsole* PythonConsoleInst;
                 RegsExplorer* regExplorer;
                 aboutsocexplorer* p_about;
                 QList<QDockWidget*>* p_pluginGUIlist;
+                QStringList p_Sessions;
+                QString p_currentSession;
+                SessionManagerDialog* p_SessionManagerDialog;
             };
             #endif // MAINWINDOW_H

src/src.pro +9 -3

                 toolbar.cpp \
                 toolbarcontainer.cpp \
                 aboutsocexplorer.cpp \
-                regsExplorer/regsexplorer.cpp
+                regsExplorer/regsexplorer.cpp \
+                socexplorercoresettingsgui.cpp \
+                sessionmanagerdialog.cpp
             HEADERS  += mainwindow.h \
                 PyWdgt/pythonconsole.h \
                 socexplorer.h \
                 SocExplorerEngine/plugins/socexplorerplugin.h \
                 aboutsocexplorer.h \
-                regsExplorer/regsexplorer.h
+                regsExplorer/regsexplorer.h \
+                socexplorercoresettingsgui.h \
+                sessionmanagerdialog.h
             include ( NicePyConsole/NicePyConsole.pri)
                 ../translations/socexplorer_en.ts
             FORMS += \
-                regsExplorer/regsexplorernew.ui
+                regsExplorer/regsexplorernew.ui \
+                socexplorercoresettingsgui.ui \
+                sessionmanagerdialog.ui
             DISTFILES += \
                 ../doc/PythonExamples/LEON3_LOAD.py \

unixcfg/socexplorer.desktop +1 -1

             Comment=Software to monitor and explore Soc devices.
-            Exec=socexplorer -e %U
+            Exec=socexplorer %U
             Icon=/usr/share/SocExplorer/icon.png
             Terminal=false

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages