diff --git a/src/PyWdgt/pythonconsole.cpp b/src/PyWdgt/pythonconsole.cpp --- a/src/PyWdgt/pythonconsole.cpp +++ b/src/PyWdgt/pythonconsole.cpp @@ -15,7 +15,6 @@ void PythonQt_init_PySocExplorerEngine(P PythonConsole::PythonConsole(socexplorerproxy *proxy, QWidget *parent) : QWidget(parent) { - //PythonQt::init(); PythonQt::init(PythonQt::RedirectStdOut); PythonQt_QtAll::init(); this->proxy = proxy; @@ -25,7 +24,6 @@ PythonConsole::PythonConsole(socexplorer 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))); @@ -45,13 +43,6 @@ void PythonConsole::removeVariable(const 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); @@ -72,13 +63,6 @@ void PythonConsole::removeDriver(const Q this->mainContext->removeVariable(instanceName); } -void PythonConsole::removeBussDriver() -{ - this->bussdriver = 0; - this->mainContext->removeVariable("buss"); - emit this->rootDriverDelete(); -} - void PythonConsole::pyConsoleRunFiles(const QStringList & pathList) { diff --git a/src/PyWdgt/pythonconsole.h b/src/PyWdgt/pythonconsole.h --- a/src/PyWdgt/pythonconsole.h +++ b/src/PyWdgt/pythonconsole.h @@ -49,8 +49,6 @@ public: 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); @@ -63,11 +61,9 @@ protected: private: QHBoxLayout* mainlayout; - socexplorerplugin* bussdriver; PythonQtScriptingConsoleDandD* console; PythonQtObjectPtr* mainContext; socexplorerproxy* proxy; - //LPMONMainWindow* mainwin; }; #endif // PYTHONCONSOLE_H diff --git a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp --- a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp +++ b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp @@ -97,47 +97,3 @@ void pluginmanagerWDGT::setChildLoadable -void pluginmanagerWDGT::addPlugin() -{ -// /!\ TODO update it remove maximum operation from widget -// QString fileName = QFileDialog::getOpenFileName(this,tr("Open Plugin"), QDir::homePath(), tr("Plugin Files Files (*.dll *.so *.so.*)")); -// if(pluginloader::checklibrary(fileName)) -// { -// QFile::copy(fileName,QString(SocExplorerEngine::pluginFolder())+"/"+ fileName.section('/',-1)); -// } -// this->pluginTable->refreshPluginList(); -} - - -void pluginmanagerWDGT::removePlugin() -{ -// for(int i=0;ipluginTable->selectedItems().count();i++) -// { -// QListWidgetItem* item = this->pluginTable->selectedItems().at(i); -// if(item!=NULL) -// { -// QFile::remove(QString(SocExplorerEngine::pluginFolder())+"/"+item->text()); -// } -// } -// this->pluginTable->refreshPluginList(); -} - - - -void pluginmanagerWDGT::loadplugin() -{ -// for(int i=0;ipluginTable->selectedItems().count();i++) -// { -// QListWidgetItem* item = this->pluginTable->selectedItems().at(i); -// if(item!=NULL) -// { -// QString plugin = QString(SocExplorerEngine::pluginFolder())+"/"+item->text(); -// emit this->loadSysDrviver(plugin); -// } -// } -// this->pluginTable->refreshPluginList(); -} - - - - diff --git a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h --- a/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h +++ b/src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h @@ -66,11 +66,7 @@ signals: void pluginselected(const QString& instanceName); public slots: - //void libselected(int row); - void addPlugin(); - void removePlugin(); - void loadplugin(); - //void loadplugin(QListWidgetItem*); + private: diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.cpp b/src/SocExplorerEngine/plugins/socexplorerplugin.cpp --- a/src/SocExplorerEngine/plugins/socexplorerplugin.cpp +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.cpp @@ -262,4 +262,3 @@ bool socexplorerplugin::dumpMemory(unsig return false; } - diff --git a/src/SocExplorerEngine/plugins/socexplorerplugin.h b/src/SocExplorerEngine/plugins/socexplorerplugin.h --- a/src/SocExplorerEngine/plugins/socexplorerplugin.h +++ b/src/SocExplorerEngine/plugins/socexplorerplugin.h @@ -157,10 +157,10 @@ public slots: 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 dataList); socexplorerplugin* parentPlugin(){return this->parent;} diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -40,13 +40,13 @@ QCommandLineOption executeOption = QComm QCommandLineOption debugLevelOption = QCommandLineOption ( QStringList() << "d" << "debug-level", - QCoreApplication::translate("main", "Execute given script