HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r98:d744963be984

Fixed some cli bugs....

Jeandet Alexis -

r98:d744963be984 default

parent child

Context file:

r98:d744963be984

Collapse all files

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/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/plugins/socexplorerplugin.cpp 0 -1

@@ -262,4 +262,3 bool socexplorerplugin::dumpMemory(unsig
262	return false;	262	return false;
263	}	263	}
264		264
265

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

                 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/main.cpp +12 -3

             QCommandLineOption debugLevelOption = QCommandLineOption (
                         QStringList() << "d" << "debug-level",
-                        QCoreApplication::translate("main", "Execute given script <script>."),
+                        QCoreApplication::translate("main", "Sets debug level to <level>, higher the level is more verbose the application will be."),
-                        QCoreApplication::translate("main", "script"),
+                        QCoreApplication::translate("main", "level"),
                         "1");
             QCommandLineOption noGUIOption = QCommandLineOption (
                         QStringList() << "n" << "no-gui",
-                        QCoreApplication::translate("main", "Starts SocExplorer in batch mode."));
+                        QCoreApplication::translate("main", "Starts SocExplorer in batch mode[not fully implemented yet!]."));
             const char* socexplorerDesc="\
             SocExplorer is an open source generic System On Chip testing software/framework.\
                 parser.addHelpOption();
                 parser.addVersionOption();
                 bool noGUI=false;
+                parser.addPositionalArgument("file", QCoreApplication::translate("main", "The Python file to execute."));
                 parser.addOption(executeOption);
                 parser.addOption(debugLevelOption);
                 parser.addOption(noGUIOption);
                         scriptToEval.clear();
                     }
                 }
+                else
+                {
+                    scriptToEval = parser.positionalArguments().first();
+                    if(!QFile::exists(scriptToEval))
+                    {
+                        scriptToEval.clear();
+                    }
+                }
                 if(parser.isSet(debugLevelOption))
                 {
                     bool success;

unixcfg/socexplorer.desktop +2 -2

             Comment=Software to monitor and explore Soc devices.
-            Exec=socexplorer -e %U
+            Exec=socexplorer %U
             Icon=/usr/share/SocExplorer/icon.png
             Terminal=false
-            Categories=Electronics;Engineering;
+            Categories=Development;Engineering;
             MimeType=text/x-python;

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