HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r14:e48ea0bd6fcc

added QProgressBar auto deleter like QMutexLocker.

jeandet -

r14:e48ea0bd6fcc default

parent child

Context file:

r14:e48ea0bd6fcc

Collapse all files

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

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2012, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include "socexplorerengine.h"
             #include <proxy/socexplorerproxy.h>
             SocExplorerEngine* SocExplorerEngine::_self = NULL;
             socExplorerXmlModel* SocExplorerEngine::p_xmlmodel=NULL;
             QMainWindow* SocExplorerEngine::mainWindow=NULL;
             QList<SOCModel*>* SocExplorerEngine::SOCs=NULL;
             int SocExplorerEngine::loglvl=1;
             SocExplorerEngine::SocExplorerEngine(QObject *parent) :
                 QObject(parent)
             {
                 if(SOCs==NULL)
                 {
                     SOCs = new QList<SOCModel*>;
                 }
             }
             void SocExplorerEngine::init()
             {
                 QDir dir;
                 if(!_self)
                 {
                     _self= new SocExplorerEngine;
                 }
                 if(!dir.exists(configFolder()))
                     dir.mkdir(configFolder());
                 p_xmlmodel = new socExplorerXmlModel(_self);
                 p_xmlmodel->updateSOClist();
             }
             QString SocExplorerEngine::configFolder()
             {
                 return QString(SOCEXPLORER_CONFIG_PATH);
             }
             SOCModel *SocExplorerEngine::plugin2Soc(socexplorerplugin *plugin)
             {
                 if(!_self)
                     init();
                 if(plugin)
                 {
                     while (plugin->parent!=NULL) {
                         plugin = plugin->parent;
                     }
                     for(int i=0;i<SOCs->count();i++)
                     {
                         if(SOCs->at(i)->isRootDev(plugin))
                             return SOCs->at(i);
                     }
                     //no soc found so create a new one
                     SOCModel* soc=new SOCModel(plugin);
                     SOCs->append(soc);
                     return soc;
                 }
                 return NULL;
             }
             int SocExplorerEngine::addEnumDevice(socexplorerplugin* rootPlugin,int VID, int PID, qint32 baseAddress, const QString &name)
             {
                 if(!_self)
                     init();
                 SOCModel* soc = plugin2Soc(rootPlugin);
                 if(soc && !soc->enumDeviceExists(baseAddress))
                 {
                     emit _self->enumDeviceAdded(soc->addEnumDevice(VID,PID,baseAddress,name));
                     return 1;
                 }
                 return 0;
             }
             QList<SOCModel *> *SocExplorerEngine::getSOCs()
             {
                 if(!_self)
                     init();
                 return SOCs;
             }
             qint32 SocExplorerEngine::getEnumDeviceBaseAddress(const QString& rootPlugin,int VID, int PID, int count)
             {
                 socexplorerplugin* plugin = socexplorerproxy::findPlugin(rootPlugin);
                 if(plugin==NULL)return -1;
                 SOCModel* soc = plugin2Soc(plugin);
                 if(soc==NULL)
                     return -1;
                 return soc->getEnumDeviceBaseAddress(VID,PID,count);
             }
             qint32 SocExplorerEngine::getEnumDeviceBaseAddress(socexplorerplugin *plugin, int VID, int PID, int count)
             {
                 if(plugin==NULL)return -1;
                 SOCModel* soc = plugin2Soc(plugin);
                 if(soc==NULL)
                     return -1;
                 return soc->getEnumDeviceBaseAddress(VID,PID,count);
             }
             int SocExplorerEngine::addEnumDevice(const QString &rootPlugin, int VID, int PID, qint32 baseAddress, const QString &name)
             {
                 socexplorerplugin* plugin = socexplorerproxy::findPlugin(rootPlugin);
                 if(plugin==NULL)return -1;
                 SOCModel* soc = plugin2Soc(plugin);
                 if(soc==NULL)
                     return -1;
                 soc->addEnumDevice(VID,PID,baseAddress,name);
                 return  1;
             }
             QString SocExplorerEngine::getDevName(int VID, int PID)
             {
                 QList<QDomNodeList> list=p_xmlmodel->getAllNodes("peripheral");
                 for(int i=0;i<list.count();i++)
                 {
                     QDomNodeList nodes=list.at(i);
                     for(int l=0;l<nodes.count();l++)
                     {
                         QDomElement node=nodes.at(l).toElement();
                         int nodeVID=node.attribute("vid","0").toInt();
                         int nodePID=node.attribute("pid","0").toInt();
                         if((nodeVID==VID)&&(nodePID==PID))
                         {
                             return node.attribute("name","Unknow device");
                         }
                     }
                 }
                 return QString("Unknow device");
             }
             QString SocExplorerEngine::SocExplorerVersion(){return QString(SOCEXPLORER_VERSION);}
             QString SocExplorerEngine::SocExplorerChangeset(){return QString(SOCEXPLORER_CHAGESET).split(" ").at(0);}
             QString SocExplorerEngine::SocExplorerBranch(){return QString(SOCEXPLORER_BRANCH);}
             socExplorerXmlModel *SocExplorerEngine::xmlModel()
             {
                 if(!_self)
                     init();
                 return p_xmlmodel;
             }
             void SocExplorerEngine::setMainWindow(QMainWindow *Mainwindow)
             {
                 if(!_self)
                     init();
                 mainWindow=Mainwindow;
             }
             QProgressBar *SocExplorerEngine::getProgressBar(const QString& format, int max)
             {
                 if(!_self)
                     init();
                 QProgressBar* progressBar;
                 if(mainWindow!=NULL)
                 {
                     progressBar = new QProgressBar(mainWindow);
                     mainWindow->statusBar()->addWidget(progressBar);
                 }
                 else
                 {
                     progressBar = new QProgressBar();
                 }
                 progressBar->setMaximum(max);
                 progressBar->setFormat(format);
                 return progressBar;
             }
             void SocExplorerEngine::deleteProgressBar(QProgressBar *progressBar)
             {
                 if(mainWindow!=NULL)
                 {
                     mainWindow->statusBar()->removeWidget(progressBar);
                 }
                 delete progressBar;
             }
             void SocExplorerEngine::addSOC(socexplorerplugin *rootPlugin)
             {
                 plugin2Soc(rootPlugin);
             }
             void SocExplorerEngine::removeSOC(socexplorerplugin *rootPlugin)
             {
                 SOCModel* soc=plugin2Soc(rootPlugin);
                 SOCs->removeAll(soc);
                 delete soc;
             }
             void SocExplorerEngine::message(socexplorerplugin *sender, const QString &message, int debugLevel)
             {
                 // TODO add multi output message manager IE also log in files
                 if(!_self)
                     init();
                 if(loglvl>=debugLevel)
                     qDebug()<< QTime::currentTime().toString()+" " + sender->instanceName()+":"+message;
             }
             void SocExplorerEngine::setLogLevel(int level)
             {
                 if(!_self)
                     init();
+                printf("Set log level to %d\n",level);
                 loglvl = level;
             }

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

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2012, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #ifndef SOCEXPLORERENGINE_H
             #define SOCEXPLORERENGINE_H
             #include <stdint.h>
             #include <QObject>
             #include <QtWidgets>
             #include <QStringList>
             #include <QDomDocument>
             #include <QDomElement>
             #include <QDomNodeList>
             #include <QFile>
             #include <QTextStream>
             #include <QDir>
             #include <QApplication>
             #include <QtCore/qglobal.h>
             #include <QFileDialog>
             #include <socexplorerxmlfile.h>
             #include <socexplorerenumdevice.h>
             #include <XMLmodel.h>
             #include <peripheralwidget.h>
             #include <registerwidget.h>
             #include <socmodel.h>
             #if defined(SOCEXPLORER_SDK_BUILD)
             #  define SOCEXPLORER_SDK_EXPORT Q_DECL_EXPORT
             #else
             #  define SOCEXPLORER_SDK_EXPORT Q_DECL_IMPORT
             #endif
+            class SOCEXPLORER_SDK_EXPORT SocExplorerAutoProgressBar
+            {
+            public:
+                SocExplorerAutoProgressBar(QProgressBar* progressBar=NULL)
+                {
+                    this->p_progressbar=progressBar;
+                }
+                 ~SocExplorerAutoProgressBar()
+                {
+                    if(p_progressbar)
+                    {
+                        delete p_progressbar;
+                    }
+                }
+                void setProgressBar(QProgressBar* progressBar)
+                {
+                    this->p_progressbar=progressBar;
+                }
+                void setValue(int value)
+                {
+                    p_progressbar->setValue(value);
+                }
+            private:
+                QProgressBar* p_progressbar;
+            };
             //! SocExplorerEngine is a pure static class which aims to provide services for both SocExplorer software and plugins.
             class SOCEXPLORER_SDK_EXPORT SocExplorerEngine : public QObject
             {
                 Q_OBJECT
             private:
                 static SocExplorerEngine* _self;
                 SocExplorerEngine(QObject *parent = 0);
                 static void init();
             public:
                 static SocExplorerEngine* self(){ if(!_self){_self= new SocExplorerEngine;}return _self;}
                 //! Return the configuration folder path, OS dependant.
                 SOCEXPLORER_SDK_EXPORT static QString configFolder();
                 //! Return the default plugin folder path, OS dependant.
                  static QString pluginFolder(){return QString(SOCEXPLORER_PLUGINS_INSTALL_PATH);}
                  static int addEnumDevice(socexplorerplugin* rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
                  static QList<SOCModel*>* getSOCs();
                  static QString getDevName(int VID, int PID);
                  static QString SocExplorerVersion();
                  static QString SocExplorerChangeset();
                  static QString SocExplorerBranch();
                  static socExplorerXmlModel* xmlModel();
                  static void setMainWindow(QMainWindow* Mainwindow);
                  static QProgressBar* getProgressBar(const QString &format, int max);
                  static void deleteProgressBar(QProgressBar* progressBar);
                  static void addSOC(socexplorerplugin* rootPlugin);
                  static void removeSOC(socexplorerplugin* rootPlugin);
                  static void message(socexplorerplugin* sender,const QString& message,int debugLevel=0);
                  static void setLogLevel(int level);
             signals:
                  void enumDeviceAdded(socExplorerEnumDevice* device);
             public slots:
                  QString getSocExplorerVersion(){return SocExplorerEngine::SocExplorerVersion();}
                  QString getSocExplorerChangeset(){return SocExplorerEngine::SocExplorerChangeset();}
                  QString getSocExplorerBranch(){return SocExplorerEngine::SocExplorerBranch();}
                  qint32 getEnumDeviceBaseAddress(const QString& rootPlugin,int VID,int PID,int count=0);
                  qint32 getEnumDeviceBaseAddress(socexplorerplugin* plugin,int VID,int PID,int count=0);
                  int addEnumDevice(const QString& rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
             private:
                 static SOCModel* plugin2Soc(socexplorerplugin* plugin);
                 static socExplorerXmlModel* p_xmlmodel;
                 static QMainWindow* mainWindow;
                 static QList<SOCModel*>* SOCs;
                 static int loglvl;
             };
             #endif // SOCEXPLORERENGINE_H

src/main.cpp +2 0

             /*------------------------------------------------------------------------------
             --  This file is a part of the SocExplorer Software
             --  Copyright (C) 2011, Plasma Physics Laboratory - CNRS
             --
             --  This program is free software; you can redistribute it and/or modify
             --  it under the terms of the GNU General Public License as published by
             --  the Free Software Foundation; either version 2 of the License, or
             --  (at your option) any later version.
             --
             --  This program is distributed in the hope that it will be useful,
             --  but WITHOUT ANY WARRANTY; without even the implied warranty of
             --  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             --  GNU General Public License for more details.
             --
             --  You should have received a copy of the GNU General Public License
             --  along with this program; if not, write to the Free Software
             --  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
             -------------------------------------------------------------------------------*/
             /*--                  Author : Alexis Jeandet
             --                     Mail : alexis.jeandet@lpp.polytechnique.fr
             ----------------------------------------------------------------------------*/
             #include <QApplication>
             #include "mainwindow.h"
             #include <PythonQt.h>
             #include <PythonQt_QtAll.h>
             #include <gui/PythonQtScriptingConsole.h>
             #include <socexplorerplugin.h>
             #include <QStyle>
             #include <QStyleFactory>
             #include <QStringList>
             #include <QFile>
             int main(int argc, char *argv[])
             {
                // Q_INIT_RESOURCE(socexplorer);
             #ifdef Q_OS_LINUX
              //   QApplication::setGraphicsSystem("raster");
             #endif
                 QApplication a(argc, argv);
                 QString scriptToEval;
                 QStringList args= a.arguments();
                 for(int i=0;i<args.count()-1;i++)
                 {
                     if((args.at(i).compare("-e")==0) || (args.at(i).compare("--execute")==0))
                     {
                         scriptToEval = args.at(i+1);
                         if(!QFile::exists(scriptToEval))
                         {
                             scriptToEval.clear();
                         }
                         else
                             qDebug() << "Will execute" << scriptToEval;
                         break;
                     }
                     if((args.at(i).compare("-d")==0) || (args.at(i).compare("--debug-level")==0))
                     {
                         bool success;
                         int lvl;
                         lvl = args.at(i+1).toInt(&success,10);
                         if(success)
+                        {
                             SocExplorerEngine::setLogLevel(lvl);
                         }
                     }
+                }
                 SocExplorerMainWindow w(scriptToEval);
                 w.show();
                 return a.exec();
             }

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