HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r15:c9290c6ca8bb

Sync

Jeandet Alexis -

r15:c9290c6ca8bb default

parent child

Context file:

r15:c9290c6ca8bb

Collapse all files

ressources/Styles/SocExplorer.css created 644 +12 0

@@ -0,0 +1,12
	1	QGroupBox {
	2	border: 1px solid gray;
	3	border-radius: 9px;
	4	margin-top: 0.5em;
	5	}
	6
	7	QGroupBox::title {
	8	subcontrol-origin: margin;
	9	left: 10px;
	10	padding: 0 3px 0 3px;
	11	}
	12

doc/PythonExamples/LEON3_LOAD.py +2 -2

-            #!/usr/bin/lppmon -e
+            #!/usr/bin/socexplorer -e
             proxy.loadSysDriver("AHBUARTplugin","AHBUART");
             proxy.loadSysDriverToParent("dsu3plugin","AHBUART");
-            proxy.loadSysDriverToParent("APB UART PLUGIN","AHBUART");
+            proxy.loadSysDriverToParent("APB_UART_PLUGIN","AHBUART");
             AHBUART.open("/dev/ttyUSB0",30000000)
             FILE=QtGui.QFileDialog.getOpenFileName()
             if FILE!="":
                dsu3plugin0.openFile(FILE)
                dsu3plugin0.loadFile()
                dsu3plugin0.run()
                print "File loaded and running"

ressources/SocExplorer.qrc +3 0

             <RCC>
                 <qresource prefix="/images">
                     <file alias="logolpp.png">images/logo-lpp.png</file>
                     <file alias="logocnrs.png">images/LOGO CNRS.png</file>
                     <file alias="logoso.png">images/LOGO SO.png</file>
                     <file alias="logolppcutted.png">images/logo-lpp-cutted.png</file>
                     <file alias="trash.svg">images/Gnome-user-trash.svg</file>
                     <file alias="refresh.svg">images/Gnome-view-refresh.svg</file>
                     <file alias="open.svg">images/Gnome-document-open.svg</file>
                     <file alias="add.svg">images/Gnome-list-add.svg</file>
                     <file alias="server.svg">images/Gnome-network-server.svg</file>
                     <file alias="config.svg">images/Gnome-preferences-system.svg</file>
                     <file alias="up.svg">images/Gnome-go-up.svg</file>
                     <file alias="down.svg">images/Gnome-go-down.svg</file>
                 </qresource>
                 <qresource prefix="/about">
                     <file alias="about.html">txt/about.html</file>
                 </qresource>
+                <qresource prefix="/styles">
+                    <file alias="SocExplorer.css">Styles/SocExplorer.css</file>
+                </qresource>
             </RCC>

src/mainwindow.cpp +6 -2

             /*------------------------------------------------------------------------------
             --  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 "mainwindow.h"
             #include <QDockWidget>
             SocExplorerMainWindow::SocExplorerMainWindow(QString ScriptToEval, QWidget *parent)
                 : QMainWindow(parent)
             {
                 QCoreApplication::setApplicationName("SocExplorer");
                 QCoreApplication::setOrganizationName("LPP");
                 QCoreApplication::setOrganizationDomain("lpp.fr");
                 this->makeObjects(ScriptToEval);
                 this->makeLayout();
                 this->makeMenu();
                 this->makeConnections();
                 this->setWindowIcon(QIcon(tr(":/images/logolppcutted.png")));
                 this->setAcceptDrops(true);
                 this->pluginManager->setRootLoadable(true);
                 this->PythonConsoleInst->pyConsoleRunFile(ScriptToEval);
+                QFile file(":/styles/SocExplorer.css");
+                if(file.open(QIODevice::ReadOnly | QIODevice::Text))
+                {
+                    qApp->setStyleSheet(file.readAll());
+                    file.close();
+                }
             }
             void SocExplorerMainWindow::makeObjects(QString ScriptToEval)
             {
                 Q_UNUSED(ScriptToEval)
                 this->p_pluginGUIlist = new QList<QDockWidget*>();
                 pluginsDockContainer = new QMainWindow;
                 pluginsDockContainer->setWindowFlags(Qt::Widget);
                 pluginsDockContainer->setDockNestingEnabled(true);
                 this->mainWidget = new QSplitter(Qt::Vertical);
                 this->appTranslator = new QTranslator;
                 this->Quit = new QAction(tr("&Quit"),this);
                 this->Quit->setShortcut(tr("CTRL+Q"));
                 this->ManagePlugins = new QAction(tr("&Manage Plugins"),this);
                 this->ManagePlugins->setShortcut(tr("CTRL+P"));
                 this->regsManager = new QAction(tr("&Manage registers"),this);
                 this->exploreRegs = new QAction(tr("&Explore registers"),this);
                 this->help = new QAction(tr("&Help"),this);
                 this->help->setShortcut(tr("CTRL+H"));
                 this->about = new QAction(tr("&About"),this);
                 socexplorerproxy::setMainWindow(this);
                 SocExplorerEngine::setMainWindow(this);
                 SocExplorerEngine::xmlModel()->scanXmlFiles();
                 this->regExplorer = new regsExplorer();
                 this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->addPluginInterface(this->regExplorer);
                 this->PythonConsoleInst = new PythonConsole(socexplorerproxy::self());
                 this->PythonConsoleInst->addObject("SocExplorerEngine",SocExplorerEngine::self());
                 this->pluginManager = new dockablePluginManager();
                 this->toolpane = new toolBar;
                 this->p_about = new aboutsocexplorer();
             }
             void SocExplorerMainWindow::makeLayout()
             {
                 this->mainWidget->addWidget(pluginsDockContainer);
                 this->mainWidget->addWidget(this->PythonConsoleInst);
                 this->toolpane->setAllowedAreas(Qt::RightDockWidgetArea|Qt::LeftDockWidgetArea);
                 this->addDockWidget(Qt::LeftDockWidgetArea,this->toolpane);
                 this->toolpane->addTool(this->pluginManager);
                 this->setCentralWidget(this->mainWidget);
             }
             void SocExplorerMainWindow::makeConnections()
             {
                 connect(socexplorerproxy::self(),SIGNAL(clearMenu()),this,SLOT(clearMenu()));
                 connect(this,SIGNAL(translateSig()),socexplorerproxy::self(),SLOT(updateText()));
                 connect(socexplorerproxy::self(),SIGNAL(addPluginGUI(QDockWidget*)),this,SLOT(addPluginInterface(QDockWidget*)));
                 connect(socexplorerproxy::self(),SIGNAL(removePluginGUI(QDockWidget*)),this,SLOT(removePluginInterface(QDockWidget*)));
                 connect(this->ManagePlugins,SIGNAL(triggered()),this,SLOT(launchPluginManager()));
                 connect(this->Quit,SIGNAL(triggered()),qApp,SLOT(quit()));
                 connect(this,SIGNAL(registerObject(QObject*,QString)),this->PythonConsoleInst,SLOT(registerObject(QObject*,QString)));
                 connect(socexplorerproxy::self(),SIGNAL(registerObject(QObject*,QString)),this,SIGNAL(registerObject(QObject*,QString)));
                 connect(this->pluginManager,SIGNAL(geteplugintree()),socexplorerproxy::self(),SLOT(geteplugintree()));
                 connect(socexplorerproxy::self(),SIGNAL(treeChanged(QList<socexplorerplugin*>)),this->pluginManager,SIGNAL(treeChanged(QList<socexplorerplugin*>)));
                 connect(this->pluginManager,SIGNAL(changeSysDriverInstName(QString,QString)),socexplorerproxy::self(),SLOT(changeSysDriverInstName(QString,QString)));
                 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)));
             }
             void SocExplorerMainWindow::launchPluginManager()
             {
                 if(this->pluginManager->isHidden())
                 {
                     this->pluginManager->setHidden(false);
                 }
             }
             void SocExplorerMainWindow::addPluginInterface(QDockWidget *plugin)
             {
                 plugin->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->pluginsDockContainer->addDockWidget(Qt::TopDockWidgetArea,plugin);
                 if(p_pluginGUIlist->count()!=0)
                     this->pluginsDockContainer->tabifyDockWidget(p_pluginGUIlist->last(),plugin);
                 p_pluginGUIlist->append(plugin);
             }
             void SocExplorerMainWindow::removePluginInterface(QDockWidget *plugin)
             {
                 p_pluginGUIlist->removeOne(plugin);
                 this->pluginsDockContainer->removeDockWidget(plugin);
             }
             void SocExplorerMainWindow::clearMenu()
             {
                 this->menuBar()->clear();
                 this->makeMenu();
             }
             void SocExplorerMainWindow::makeMenu()
             {
                 this->FileMenu = menuBar()->addMenu(tr("&File"));
                 this->PluginsMenu = menuBar()->addMenu(tr("&Plugins"));
                 this->ToolsMenu = menuBar()->addMenu(tr("&Tools"));
                 this->ToolsMenu->addAction(this->exploreRegs);
                 this->FileMenu->addAction(this->Quit);
                 socexplorerproxy::self()->makeMenu(this->PluginsMenu);
                 this->PluginsMenu->addAction(this->ManagePlugins);
                 this->helpMenu = menuBar()->addMenu(tr("Help"));
                 this->helpMenu->addAction(this->help);
                 this->helpMenu->addAction(this->about);
             }
             SocExplorerMainWindow::~SocExplorerMainWindow()
             {
-                delete this->p_about;
-                delete this->p_pluginGUIlist;
             }
             void SocExplorerMainWindow::setLangage(QAction *action)
             {
                 QString local = action->data().toString();
                 QString qmPath = QDir(QString("translations")).absolutePath();
                 appTranslator->load(qmPath+"/socexplorer_"+local+".qm");
                 qApp->installTranslator(appTranslator);
                 emit this->translateSig();
             }
             void SocExplorerMainWindow::createLangMenu()
             {
                 this->langMenu = menuBar()->addMenu(tr("&Langue"));
                 this->langActionGrp = new QActionGroup(this);
                 connect(this->langActionGrp,SIGNAL(triggered(QAction*)),this,SLOT(setLangage(QAction*)));
                 QDir* qmDir = new QDir(QString("translations"));
                 QStringList LangFiles = qmDir->entryList(QStringList("socexplorer_*.qm"));
                 for(int i=0;i<LangFiles.size();++i)
                 {
                     QString Local = LangFiles[i];
                     Local.remove(0,Local.indexOf('_')+1);
                     Local.chop(3);
                     QTranslator translator;
                     translator.load(LangFiles[i],qmDir->absolutePath());
                     QString langage = translator.translate("MainWindow","English");
                     QAction *action = new QAction(tr("&%1 %2").arg(i+1).arg(langage),this);
                     action->setCheckable(true);
                     action->setData(Local);
                     langMenu->addAction(action);
                     langActionGrp->addAction(action);
                     if(langage==tr("English"))
                         action->setChecked(true);
                 }
             }
             void SocExplorerMainWindow::updateText()
             {
                 emit this->translateSig();
             }
             void SocExplorerMainWindow::showAboutBox()
             {
                 p_about->show();
             }
             void SocExplorerMainWindow::pluginselected(const QString &instanceName)
             {
                 socexplorerplugin* drv=socexplorerproxy::self()->getSysDriver(instanceName);
                 if(drv)
                     drv->raise();
             }
             void SocExplorerMainWindow::closeEvent(QCloseEvent *event)
             {
                 socexplorerproxy::self()->close();
                 qApp->closeAllWindows();
                 event->accept();
             }

src/src.pro +7 -2

             #-------------------------------------------------
             #
             # Project created by QtCreator 2011-09-19T22:52:10
             #
             #-------------------------------------------------
             SOCEXPLORER_ROOT = $${PWD}/..
             include(../build_cfg/socexplorer.pri)
             TARGET = socexplorer$${DEBUG_EXT}
             TEMPLATE = app
             CONFIG += pythonqt
             QMAKE_LFLAGS_RELEASE += --enable-auto-import -mstackrealign
             QMAKE_LFLAGS_DEBUG += --enable-auto-import -mstackrealign
             include ( common/pythonQtOut/generated_cpp/PySocExplorer/PySocExplorer.pri )
             include ( SocExplorerEngine/plugins/socexplorerplugin.prf )
             INCLUDEPATH+=$${PWD} \
                         $${PWD}/common \
                         $${PWD}/common/qhexedit \
                         $${PWD}/common/QCustomPlot \
                         $${PWD}/common/elf \
                         SocExplorerEngine/engine \
                         SocExplorerEngine/pluginloader \
                         SocExplorerEngine/pluginsInterface \
                         SocExplorerEngine/proxy \
                         SocExplorerEngine/pluginManagerWdgt \
                         SocExplorerEngine/plugins \
                         SocExplorerEngine/RegisterMVS \
                         SocExplorerEngine/XmlEngine \
                         SocExplorerEngine/SOC \
                         SocExplorerEngine/PeripheralWidget/src
             win32:INCLUDEPATH+= \
                         $${PWD}/common/elf/libelfWin32/include \
                         $${PWD}/common/elf/libelfWin32/include/libelf \
             RC_FILE = ../win32cfg/socexplorer.rc
             unix:LIBS+=-L$${SOCEXPLORER_ROOT}/bin/linux -lsocexplorercommon$${DEBUG_EXT} -L$${SOCEXPLORER_ROOT}/bin/linux -lsocexplorerengine$${DEBUG_EXT}
             win32-g++:LIBS += $${SOCEXPLORER_ROOT}/bin/win32/socexplorercommon$${DEBUG_EXT}.dll $${SOCEXPLORER_ROOT}/bin/win32/socexplorerengine$${DEBUG_EXT}.dll
             unix{
                 translation.files = $${SOCEXPLORER_ROOT}/translations/socexplorer_fr.qm \
                                     $${SOCEXPLORER_ROOT}/translations/socexplorer_en.qm
                 translation.path = $${SOCEXPLORER_TRANSLATION_INSTALL_PATH}
                 target.path    = /usr/bin
                 INSTALLS += translation target
             }
             header.path = $$[QT_INSTALL_HEADERS]/SocExplorer/common
             header.files = \
                         socexplorer.h
             INSTALLS += header
             SOURCES += main.cpp\
                     mainwindow.cpp \
                 PyWdgt/pythonconsole.cpp \
                 PyWdgt/pythonqtscriptingconsoledandd.cpp \
                 dockablepluginmanager.cpp \
                 toolbar.cpp \
                 toolbarcontainer.cpp \
                 regsExplorer/regsexplorer.cpp \
                 regsExplorer/regsviewer.cpp \
                 regsExplorer/regsexplorercfg.cpp \
                 aboutsocexplorer.cpp
             #    regWidget/xmltagtextedit.cpp \
             #    regWidget/xmltaglabeledit.cpp \
             #    regWidget/xmlelementslistwidget.cpp \
             #    regWidget/xmlelementslistview.cpp \
             #    regWidget/regpropeditor.cpp \
             #    regWidget/registerwdgt.cpp \
             #    regWidget/registereditor.cpp \
             #    regWidget/registercel.cpp \
             #    regWidget/periphpropeditor.cpp \
             #    regWidget/peripherialregs.cpp \
             #    regWidget/bitfieldpropeditor.cpp \
             #    regWidget/bitfield.cpp
             HEADERS  += mainwindow.h \
                 PyWdgt/pythonconsole.h \
                 PyWdgt/pythonqtscriptingconsoledandd.h \
                 dockablepluginmanager.h \
                 toolbar.h \
                 toolbarcontainer.h \
                 regsExplorer/regsexplorer.h \
                 regsExplorer/regsviewer.h \
                 regsExplorer/regsexplorercfg.h \
                 socexplorer.h \
                 SocExplorerEngine/plugins/socexplorerplugin.h \
                 aboutsocexplorer.h
             #    regWidget/xmltagtextedit.h \
             #    regWidget/xmltaglabeledit.h \
             #    regWidget/xmlelementslistwidget.h \
             #    regWidget/xmlelementslistview.h \
             #    regWidget/regpropeditor.h \
             #    regWidget/registerwdgt.h \
             #    regWidget/registereditor.h \
             #    regWidget/registercel.h \
             #    regWidget/periphpropeditor.h \
             #    regWidget/peripherialregs.h \
             #    regWidget/bitfieldpropeditor.h \
             #    regWidget/bitfield.h
             include ( NicePyConsole/NicePyConsole.pri)
-            win32:RESOURCES = $${SOCEXPLORER_ROOT}/ressources/socexplorer.qrc
+            win32{
-            unix:RESOURCES += $${SOCEXPLORER_ROOT}/ressources/socexplorer.qrc
+                RESOURCES = ../ressources/SocExplorer.qrc
+            }
+            unix{
+                RESOURCES = ../ressources/SocExplorer.qrc
+            }
             TRANSLATIONS = ../translations/socexplorer_fr.ts \
                 ../translations/socexplorer_en.ts

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