HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r10:536aeec6c7cb

Some cleaning.

jeandet -

r10:536aeec6c7cb default

parent child

Context file:

r10:536aeec6c7cb

Collapse all files

.hgsubstate +1 -1

	@@ -1,1 +1,1
	1	~~b05d3dada0406dd7c1700d5d53719a901d214281~~ src/SocExplorerEngine/PeripheralWidget		1	e3a98a04d9ec8685bf222f8d687a614a71927549 src/SocExplorerEngine/PeripheralWidget

src/SocExplorerEngine/engine/socexplorerengine.cpp +1 -1

                 if(!_self)
                     init();
                 if(loglvl>=debugLevel)
-                    qDebug()<< QTime::currentTime().toString()+" " + sender->instanceName+":"+message;
+                    qDebug()<< QTime::currentTime().toString()+" " + sender->instanceName()+":"+message;
             }

src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.cpp +1 0

                 connect(this->treeview,SIGNAL(loadSysDriverToParent(QString,QString)),this,SIGNAL(loadSysDriverToParent(QString,QString)));
                 connect(this->treeview,SIGNAL(changeSysDriverInstName(QString,QString)),this,SIGNAL(changeSysDriverInstName(QString,QString)));
                 connect(this->treeview,SIGNAL(closeSysDriver(QString)),this,SIGNAL(closeSysDriver(QString)));
+                connect(this->treeview,SIGNAL(pluginselected(QString)),this,SIGNAL(pluginselected(QString)));
                 this->rootLoadable = false;
                 this->childLoadable = false;
                 this->pluginTable->refreshPluginList();

src/SocExplorerEngine/pluginManagerWdgt/pluginmanagerWDGT.h +2 0

                 void treeChanged(const QList<socexplorerplugin*>& drivers);
                 void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName);
                 void closeSysDriver(const QString instanceName);
+                void pluginselected(const QString& instanceName);
             public slots:
                 //void libselected(int row);
                 void addPlugin();

src/SocExplorerEngine/pluginManagerWdgt/plugintree.cpp +11 -2

                 this->setAcceptDrops(true);
                 this->setDragDropMode(QAbstractItemView::DropOnly);
                 connect(this,SIGNAL(itemChanged(QTreeWidgetItem*,int)),this,SLOT(pluginselectedslt(QTreeWidgetItem*,int)));
+                connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChangedslt()));
                 this->setHeaderLabels(QStringList()<<"Loaded plugins");
                 emit this->geteplugintree();
             }
                 emit this->pluginselected(item->text(0));
             }
+            void plugintree::itemSelectionChangedslt()
+            {
+                if(this->selectedItems().count()==1)
+                {
+                    emit this->pluginselected(this->selectedItems().first()->text(0));
+                }
+            }
             void plugintree::treeChanged(const QList<socexplorerplugin*>& drivers)
             {
                 this->clear();
                 {
                     QTreeWidgetItem* currentItem=new QTreeWidgetItem;
                     currentItem->setIcon(0,QSvgIcon(":/images/server.svg"));
-                    currentItem->setText(0,drivers.at(i)->instanceName);
+                    currentItem->setText(0,drivers.at(i)->instanceName());
                     this->addTopLevelItem(currentItem);
                     if(drivers.at(i)->childs.count()!=0)
                     {
                 {
                     QTreeWidgetItem* currentItem=new QTreeWidgetItem;
                     currentItem->setIcon(0,QSvgIcon(":/images/server.svg"));
-                    currentItem->setText(0,driver->childs.at(i)->instanceName);
+                    currentItem->setText(0,driver->childs.at(i)->instanceName());
                     item->addChild(currentItem);
                     if(driver->childs.at(i)->childs.count()!=0)
                     {

src/SocExplorerEngine/pluginManagerWdgt/plugintree.h +1 -1

             public slots:
                     void treeChanged(const QList<socexplorerplugin*>& drivers);
                     void pluginselectedslt( QTreeWidgetItem * item, int column);
+                    void itemSelectionChangedslt();
             private:
                     void addplugin(socexplorerplugin* driver,QTreeWidgetItem* item);

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

             QString genericPySysdriver::instance()
             {
-                return plugin->instanceName;
+                return plugin->instanceName();
             }

src/SocExplorerEngine/plugins/socexplorerplugin.cpp +11 -4

             void socexplorerplugin::setBaseAddress(unsigned int baseAddress){this->BaseAddress = baseAddress;}
+            QString socexplorerplugin::instanceName()
+            {
+                return this->_instanceName;
+            }
             int socexplorerplugin::registermenu(QMenu *menu)
             {
-                this->menu = menu->addMenu(this->instanceName);
+                this->menu = menu->addMenu(this->_instanceName);
                 this->closeAction = this->menu->addAction(tr("Close plugin"));
                 QObject::connect(this->closeAction,SIGNAL(triggered()),this,SLOT(closeMe()));
                 this->ChildsMenu = this->menu->addMenu(QString("Childs"));
                 {
                     this->childs.at(i)->registermenu(this->ChildsMenu);
                 }
-                if(this->pyObject!=NULL)emit this->registerObject((QObject*)this->pyObject,this->instanceName);
+                if(this->pyObject!=NULL)emit this->registerObject((QObject*)this->pyObject,this->instanceName());
                 return 0;
             }
             void socexplorerplugin::setInstanceName(const QString &newName)
             {
-                this->instanceName = newName;
+                this->_instanceName = newName;
-                this->menu->setTitle(this->instanceName);
+                if(this->menu)
+                    this->menu->setTitle(this->_instanceName);
+                this->setWindowTitle(newName);
             }
             void socexplorerplugin::makeGenericPyWrapper()

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

                 //! Default plugin constructor, any plugin should call this constructor. This constructor creates a
                 //! default python wrapper instance. If you want to connect your own python wrapper, you have to clear
                 //! createPyObject option and instanciate your own genericPySysdriver derivated object.
-                socexplorerplugin(QWidget *parent = 0,bool createPyObject=true)
+                socexplorerplugin(QWidget *parent = 0,bool createPyObject=true):QDockWidget(parent)
                 {
+                    closeAction=NULL;
+                    menu=NULL;
+                    ChildsMenu=NULL;
                     this->Connected = false;
                     this->setFeatures(QDockWidget::DockWidgetMovable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetVerticalTitleBar);
                     _Name = new QString(driver_Name);
                 QList<socexplorerplugin*> childs;
                 socexplorerplugin* parent;
                 QAction* closeAction;
-                QString  instanceName;
+                QString  instanceName();
                 QMenu* menu;
                 QMenu* ChildsMenu;
                 QString* _Author;
                 QString* _Version;
                 QString* _Description;
+                QString  _instanceName;
                 int _canBeChild;
                 int _canBeRoot;
                 int _VID;

src/SocExplorerEngine/proxy/socexplorerproxy.cpp +8 -12

             void socexplorerproxy::loadSysDriver(socexplorerplugin *driver, const QString instanceName)
             {
                 if(!_self)init();
-                driver->instanceName.append(instanceName);
+                driver->setInstanceName(instanceName);
                 driver->parent = NULL;
                 drivers->append(driver);
                 linearDriverList->append(driver);
                 if(!_self)init();
                 linearDriverList->append(driver);
                 driver->parent = parent;
-                driver->instanceName.append(instanceName);
+                driver->setInstanceName(instanceName);
                 parent->childs.append(driver);
                 connectChildToProxy(driver);
                 connectChildToParent(parent,driver);
             void socexplorerproxy::connectChildToParent(socexplorerplugin *parent, socexplorerplugin *child)
             {
                 if(!_self)init();
-                //connect(child,SIGNAL(WriteSig(uint*,uint,uint)),parent,SLOT(Write(uint*,uint,uint)));
+                connect(parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));
-                //connect(child,SIGNAL(ReadSig(uint*,uint,uint)),parent,SLOT(Read(uint*,uint,uint)));
-                connect(parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));//,Qt::DirectConnection);
                 child->activate(parent->isConnected());
             }
             void socexplorerproxy::disconnectChildToParent(socexplorerplugin *child)
             {
                 if(!_self)init();
-                //disconnect(child,SIGNAL(WriteSig(uint*,uint,uint)),child->parent,SLOT(Write(uint*,uint,uint)));
+                disconnect(child->parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));
-               // disconnect(child,SIGNAL(ReadSig(uint*,uint,uint)),child->parent,SLOT(Read(uint*,uint,uint)));
-                disconnect(child->parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));//,Qt::DirectConnection);
             }
             void socexplorerproxy::changeSysDriverInstName(socexplorerplugin* driver)
             {
                 if(!_self)init();
-                QString prevName(driver->instanceName);
+                QString prevName(driver->instanceName());
             }
             bool socexplorerproxy::instanceNameIsValid(const QString& instanceName)
                 if(!_self)init();
                 for(int k=0;k<linearDriverList->count();k++)
                 {
-                    if(!linearDriverList->at(k)->instanceName.compare(instanceName))
+                    if(!linearDriverList->at(k)->instanceName().compare(instanceName))
                         return false;
                 }
                 return true;
                 if(!_self)init();
                 for(int k=0;k<linearDriverList->count();k++)
                 {
-                    if(linearDriverList->at(k)->instanceName.compare(instanceName))
+                    if(linearDriverList->at(k)->instanceName().compare(instanceName))
                         return linearDriverList->at(k);
                 }
                 return NULL;
                 if(!_self)init();
                 for(int i=0;i<linearDriverList->count();i++)
                 {
-                    if(!linearDriverList->at(i)->instanceName.compare(instanceName))
+                    if(!linearDriverList->at(i)->instanceName().compare(instanceName))
                         return linearDriverList->at(i);
                 }
                 return NULL;

src/dockablepluginmanager.cpp +1 0

                 connect(this,SIGNAL(treeChanged(QList<socexplorerplugin*>)),this->managerGui,SIGNAL(treeChanged(QList<socexplorerplugin*>)));
                 connect(this->managerGui,SIGNAL(changeSysDriverInstName(QString,QString)),this,SIGNAL(changeSysDriverInstName(QString,QString)));
                 connect(this->managerGui,SIGNAL(closeSysDriver(QString)),this,SIGNAL(closeSysDriver(QString)));
+                connect(this->managerGui,SIGNAL(pluginselected(QString)),this,SIGNAL(pluginselected(QString)));
                 this->setWidget(this->managerGui);
                 this->setWindowTitle(this->managerGui->windowTitle());
             }

src/dockablepluginmanager.h +1 0

                 void treeChanged(const QList<socexplorerplugin*>& drivers);
                 void changeSysDriverInstName(const QString newinstanceName,const QString previnstanceName);
                 void closeSysDriver(const QString instanceName);
+                void pluginselected(const QString& instanceName);
             public slots:
             private:

src/mainwindow.cpp +15 -4

                 this->setAcceptDrops(true);
                 this->pluginManager->setRootLoadable(true);
                 this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval);
-                QProgressBar* test = SocExplorerEngine::getProgressBar("test",10);
+            //    QProgressBar* test = SocExplorerEngine::getProgressBar("test",10);
-                statusBar()->setFixedHeight(statusBar()->height());
+            //    statusBar()->setFixedHeight(statusBar()->height());
-                SocExplorerEngine::deleteProgressBar(test);
+            //    SocExplorerEngine::deleteProgressBar(test);
             }
                 SocExplorerEngine::xmlModel()->scanXmlFiles();
                 this->regExplorer = new regsExplorer();
                 this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);
-                this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,this->regExplorer);
+            //    this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,this->regExplorer);
+                this->addPluginInterface(this->regExplorer);
                 this->PythonConsoleInst = new PythonConsole(socexplorerproxy::self());
                 this->PythonConsoleInst->addObject("SocExplorerEngine",SocExplorerEngine::self());
                 this->pluginManager = new dockablePluginManager();
                 connect(this->pluginManager,SIGNAL(changeSysDriverInstName(QString,QString)),this->PythonConsoleInst,SLOT(changeSysDriverInstName(QString,QString)));
                 connect(this->pluginManager,SIGNAL(closeSysDriver(QString)),socexplorerproxy::self(),SLOT(closeSysDriver(QString)));
                 connect(this->pluginManager,SIGNAL(closeSysDriver(QString)),this->PythonConsoleInst,SLOT(removeDriver(QString)));
+                connect(this->pluginManager,SIGNAL(pluginselected(QString)),this,SLOT(pluginselected(QString)));
                 connect(this->about,SIGNAL(triggered()),this,SLOT(showAboutBox()));
                 connect(this->exploreRegs,SIGNAL(triggered()),this->regExplorer,SLOT(show()));
                 this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDrviver(QString)),socexplorerproxy::self(),SLOT(loadSysDriver(QString)));
                 this->pluginManager->connect(this->pluginManager,SIGNAL(loadSysDriverToParent(QString,QString)),socexplorerproxy::self(),SLOT(loadSysDriverToParent(QString,QString)));
                 p_about->show();
             }
+            void LPMONMainWindow::pluginselected(const QString &instanceName)
+            {
+                socexplorerplugin* drv=socexplorerproxy::self()->getSysDriver(instanceName);
+            //    if(drv)
+            //        drv->activate(true);
+            // TODO add plugin widget auto focus
+            }
             void LPMONMainWindow::closeEvent(QCloseEvent *event)

src/mainwindow.h +1 -1

                 void updateText();
                 void setLangage(QAction* action);
                 void showAboutBox();
+                void pluginselected(const QString& instanceName);
             signals:
                 void translateSig();

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