HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r78:9b311fda2412

New register explorer WIP.

jeandet -

r78:9b311fda2412 default

parent child

Context file:

r78:9b311fda2412

.hgsubstate +1 -1

-c82d72694590cbc2aebb946667f11f60ea89afe src/SocExplorerEngine/PeripheralWidget
+            9790824220ca06014e65a5c13aa4ed37f89d7593 src/SocExplorerEngine/PeripheralWidget
             cc958c79ba0939809a70e63b8bac798930160243 src/common/genericBinaryFiles
 dce25b198558be573f56c1cf337aa95ddd666d6 src/common/lppserial
 afde9cc96bb419cf898560d080ec96991aeca src/common/qhexedit

ressources/Styles/SocExplorer.css +4 0

             QGroupBox {
                 border: 1px solid gray;
                 border-radius: 9px;
                 margin-top: 0.5em;
             }
             QGroupBox::title {
                 subcontrol-origin: margin;
                 left: 10px;
                 padding: 0 3px 0 3px;
             }
+            QWidget#CollapsablePeripheralWidget {
+                border: 1px solid gray;
+                border-radius: 9px;
+            }

src/SocExplorerEngine/SocExplorerEngine.pro +13 -2

             SOCEXPLORER_ROOT = \"$${PWD}/../..\"
             include($${PWD}/../../build_cfg/socexplorer.pri)
             TARGET = socexplorerengine$${DEBUG_EXT}
             TEMPLATE = lib
             #more verbose plugin loader to debug plugin loading issues such as dependencies issues
             SOCEXPLORER_PLUGIN_LOADER="custom"
             SOCEXPLORER_CHAGESETNUM=$$system(hg id)
             isEmpty(SOCEXPLORER_CHAGESETNUM){
                 SOCEXPLORER_CHAGESETNUM=2c7201cecc87+
             }
             SOCEXPLORER_CHAGESETNUMSTR = '\\"$${SOCEXPLORER_CHAGESETNUM}\\"'
             SOCEXPLORER_BRANCH=$$system(hg branch)
             isEmpty(SOCEXPLORER_BRANCH){
                 SOCEXPLORER_BRANCH=default
             }
             SOCEXPLORER_BRANCHSTR = '\\"$${SOCEXPLORER_BRANCH}\\"'
             DEFINES += SOCEXPLORER_VERSION="\"\\\"0.5.0"\\\"\"
             DEFINES += SOCEXPLORER_CHAGESET=\"$${SOCEXPLORER_CHAGESETNUMSTR}\"
             DEFINES += SOCEXPLORER_BRANCH=\"$${SOCEXPLORER_BRANCHSTR}\"
             message("Building SOCEXPLORER changeset $${SOCEXPLORER_CHAGESETNUM}")
             DEFINES += SOCEXPLORER_EXPORTS
             include ( plugins/socexplorerplugin.prf )
             include ( PeripheralWidget/PeripheralWidget.pri)
             win32:CONFIG += dll
             win32:CONFIG -= static
             win32:LIBS+=-L$${SOCEXPLORER_ROOT}/bin/win32 -lsocexplorercommon$${DEBUG_EXT}
             contains(SOCEXPLORER_PLUGIN_LOADER,"custom")
             {
                 unix:LIBS+= -ldl
                 unix:DEFINES += SOCEXPLORER_CUSTOM_PLUGIN_LOADER
                 unix:HEADERS += \
                 pluginloader/unix/unixpluginloader.h
                 unix:SOURCES += \
                 pluginloader/unix/unixpluginloader.cpp
             }
             target.path = $$[QT_INSTALL_LIBS]
             isEmpty(target.path) {
                     error(can\'t get QT_INSTALL_LIBS)
             }
             header.path = $$[QT_INSTALL_HEADERS]/SocExplorer
             header.files = engine/socexplorerengine.h \
                             pluginloader/pluginscache.h \
                             plugins/socexplorerplugin.h \
                             proxy/socexplorerproxy.h \
                             engine/socexplorerxmlfile.h \
                             SOC/socexplorerenumdevice.h \
                             plugins/genericPySysdriver.h \
                             XmlEngine/XMLmodel.h \
                             XmlEngine/XMLdata.h \
                             XmlEngine/xmldriver.h \
                             SOC/socmodel.h \
                             SOC/registerdata.h \
                             SOC/socclk.h \
                             PeripheralWidget/src/peripheralwidget.h \
                             PeripheralWidget/src/registerwidget.h \
                             PeripheralWidget/src/socregsviewer.h \
+                            PeripheralWidget/src/socregsviewernew.h \
                             memtester/memtester.h
             isEmpty(header.path) {
                     error(can\'t get QT_INSTALL_HEADERS)
             }
             pluginif.files = pluginsInterface/*.h \
                             pluginsInterface/*.cpp
             pluginif.path = $$[QT_INSTALL_HEADERS]/SocExplorer/pluginsInterface
             INSTALLS += target header pluginif
             INCLUDEPATH += engine \
                 pluginloader \
                 pluginsInterface \
                 proxy \
                 plugins \
                 pluginManagerWdgt \
                 ../common \
                 ../common/genericBinaryFiles \
                 ../ \
                 RegisterMVS \
                 XmlEngine \
                 SOC \
                 PeripheralWidget/src \
                 memtester
             HEADERS += \
                 pluginloader/pluginscache.h \
                 pluginloader/pluginloader.h \
                 plugins/genericPySysdriver.h \
                 pluginManagerWdgt/plugintree.h \
                 pluginManagerWdgt/pluginmanagerWDGT.h \
                 pluginManagerWdgt/pluginlist.h \
                 pluginManagerWdgt/plugininfoswdgt.h \
                 XmlEngine/XMLmodel.h \
                 XmlEngine/XMLdata.h \
                 SOC/socmodel.h  \
                 SOC/registerdata.h \
                 XmlEngine/xmldriver.h \
                 PeripheralWidget/src/peripheralwidget.h \
                 PeripheralWidget/src/registerwidget.h \
                 PeripheralWidget/src/socregsviewer.h \
                 SOC/socclk.h \
                 engine/socexplorerengine.h \
                 engine/socexplorerxmlfile.h \
                 plugins/socexplorerplugin.h \
                 pluginsInterface/socexplorerplugininterface.h \
                 pluginsInterface/socexplorerplugininterface_global.h \
                 proxy/socexplorerproxy.h \
                 SOC/socexplorerenumdevice.h \
                 PySocExplorerEngine.h \
-                memtester/memtester.h
+                memtester/memtester.h\
+                PeripheralWidget/src/socregsviewernew.h \
+                PeripheralWidget/src/collapsableperipheralwidget.h
             SOURCES += \
                 pluginloader/pluginscache.cpp \
                 pluginloader/pluginloader.cpp \
                 pluginManagerWdgt/plugintree.cpp \
                 pluginManagerWdgt/pluginmanagerWDGT.cpp \
                 pluginManagerWdgt/pluginlist.cpp \
                 pluginManagerWdgt/plugininfoswdgt.cpp \
                 XmlEngine/XMLmodel.cpp \
                 XmlEngine/XMLdata.cpp \
                 SOC/socmodel.cpp \
                 SOC/registerdata.cpp \
                 XmlEngine/xmldriver.cpp \
                 PeripheralWidget/src/peripheralwidget.cpp \
                 PeripheralWidget/src/registerwidget.cpp \
                 PeripheralWidget/src/socregsviewer.cpp \
                 SOC/socclk.cpp \
                 plugins/genericPySysdriver.cpp \
                 engine/socexplorerengine.cpp \
                 engine/socexplorerxmlfile.cpp \
                 proxy/socexplorerproxy.cpp \
                 SOC/socexplorerenumdevice.cpp \
                 plugins/socexplorerplugin.cpp \
-                memtester/memtester.cpp
+                memtester/memtester.cpp \
+                PeripheralWidget/src/socregsviewernew.cpp \
+                PeripheralWidget/src/collapsableperipheralwidget.cpp
             OTHER_FILES += \
                 plugins/socexplorerplugin.cpp \
                 pluginsInterface/socexplorerplugininterface.cpp \
                 plugins/socexplorerplugin.prf \
                 pythongenerator.sh \
                 pythonQtgeneratorCfg.txt
+            FORMS += \
+                PeripheralWidget/src/socregsviewernew.ui \
+                PeripheralWidget/src/collapsableperipheralwidget.ui
+            RESOURCES += \
+                PeripheralWidget/ressources/peripheralwidget.qrc

src/SocExplorerEngine/proxy/socexplorerproxy.cpp +1 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 "socexplorerproxy.h"
             #include <pluginmanagerWDGT.h>
             #include <socexplorerengine.h>
             #include <pluginloader.h>
             #include <socexplorerplugin.h>
             socexplorerproxy* socexplorerproxy::_self=NULL;
             QMainWindow* socexplorerproxy::mainWindow=NULL;
             QList<socexplorerplugin*>* socexplorerproxy::drivers=NULL;
             QList<socexplorerplugin*>* socexplorerproxy::linearDriverList=NULL;
             socexplorerplugin* socexplorerproxy::root=NULL;
             socexplorerplugin* socexplorerproxy::parent=NULL;
             PluginsCache* socexplorerproxy::cache=NULL;
             socexplorerproxy::socexplorerproxy(QObject *parent) :
                 QObject(parent)
             {
                 cache = new PluginsCache;
                 drivers = new QList<socexplorerplugin*>;
                 linearDriverList=new QList<socexplorerplugin*>;
                 root = NULL;
             }
             socexplorerproxy::socexplorerproxy(QMainWindow *Mainwindow, QObject *parent):
                 QObject(parent)
             {
                 mainWindow = Mainwindow;
                 cache = new PluginsCache;
                 drivers = new QList<socexplorerplugin*>;
                 linearDriverList=new QList<socexplorerplugin*>;
                 root = NULL;
             }
             void socexplorerproxy::init()
             {
                 if(!_self)
                 {
                     _self = new socexplorerproxy();
                     mainWindow = NULL;
                 }
             }
             void socexplorerproxy::setMainWindow(QMainWindow *Mainwindow)
             {
                 if(!_self)init();
                 mainWindow=Mainwindow;
             }
             void socexplorerproxy::loadSysDriver(const QString name)
             {
                 if(!_self)init();
                 if(pluginloader::libcanberoot(name))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     QString driverName = _self->getinstanceName(driver->baseName());
                     loadSysDriver(driver,driverName);
                 }
             }
             void socexplorerproxy::loadSysDriver(const QString name, const QString instanceName)
             {
                 if(!_self)init();
                 if(pluginloader::libcanberoot(name) && !_self->instanceExists(instanceName))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     loadSysDriver(driver,instanceName);
                 }
             }
             void socexplorerproxy::loadSysDriver(socexplorerplugin *driver, const QString instanceName)
             {
                 if(!_self)init();
                 driver->setInstanceName(instanceName);
                 driver->parent = NULL;
                 drivers->append(driver);
                 linearDriverList->append(driver);
                 connectChildToProxy(driver);
                 emit _self->addPluginGUI(driver);
                 emit _self->clearMenu();
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                 SocExplorerEngine::addSOC(driver);
+                driver->postInstantiationTrigger();
             }
             void socexplorerproxy::loadChildSysDriver(socexplorerplugin *parent, const QString child)
             {
                 if(!_self)init();
                 if(pluginloader::libcanbechild(child))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(child);
                     QString driverName = _self->getinstanceName(driver->baseName());
                     bool ok=true;
                     if(ok)
                     {
                         if(parent!=NULL)_self->loadSysDriverToParent(driver,parent,driverName);
                     }
                 }
             }
             void socexplorerproxy::loadSysDriverToParent(const QString name,const QString ParentInst)
             {
                 if(!_self)init();
                 if(pluginloader::libcanbechild(name))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     QString driverName = _self->getinstanceName(driver->baseName());
                     bool ok=true;
                     if(ok)
                     {
                         socexplorerplugin* parent=_self->getSysDriver(ParentInst);
                         if(parent!=NULL)loadSysDriverToParent(driver,parent,driverName);
                     }
                 }
             }
             void socexplorerproxy::loadSysDriverToParent(const QString name,const QString instanceName,const QString ParentInst)
             {
                 if(!_self)init();
                 if(pluginloader::libcanbechild(name) && !_self->instanceExists(instanceName))
                 {
                     socexplorerplugin* driver = pluginloader::newsocexplorerplugin(name);
                     bool ok=true;
                     if(ok)
                     {
                         socexplorerplugin* parent=_self->getSysDriver(ParentInst);
                         if(parent!=NULL)loadSysDriverToParent(driver,parent,instanceName);
                     }
                 }
             }
             void socexplorerproxy::loadSysDriverToParent(socexplorerplugin *driver,socexplorerplugin *parent, const QString instanceName)
             {
                 if(!_self)init();
                 linearDriverList->append(driver);
                 driver->parent = parent;
                 driver->setInstanceName(instanceName);
                 parent->childs.append(driver);
                 connectChildToProxy(driver);
                 connectChildToParent(parent,driver);
                 emit _self->clearMenu();
                 emit _self->addPluginGUI(driver);
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                 driver->postInstantiationTrigger();
             }
             void socexplorerproxy::changeSysDriverInstName(const QString instanceName)
             {
                 Q_UNUSED(instanceName)
             }
             void socexplorerproxy::changeSysDriverInstName(const QString newinstanceName, const QString previnstanceName)
             {
                 if(!_self)init();
                 socexplorerplugin*temp=_self->getSysDriver(previnstanceName);
                 if(temp!=NULL)
                 {
                     if(NULL!=_self->getSysDriver(newinstanceName))
                     {
                         emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                         return;
                     }
                     temp->setInstanceName(newinstanceName);
                 }
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
             }
             void socexplorerproxy::connectChildToParent(socexplorerplugin *parent, socexplorerplugin *child)
             {
                 if(!_self)init();
                 connect(parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));
                 child->activate(parent->isConnected());
             }
             void socexplorerproxy::disconnectChildToParent(socexplorerplugin *child)
             {
                 if(!_self)init();
                 disconnect(child->parent,SIGNAL(activateSig(bool)),child,SLOT(activate(bool)));
             }
             void socexplorerproxy::connectChildToProxy(socexplorerplugin *child)
             {
                 if(!_self)init();
                 connect(child,SIGNAL(registerObject(QObject*,QString)),_self,SIGNAL(registerObject(QObject*,QString)));
                 connect(child,SIGNAL(closePlugin(socexplorerplugin*)),_self,SLOT(closeSysDriver(socexplorerplugin*)));
             }
             void socexplorerproxy::disconnectChildToProxy(socexplorerplugin *child)
             {
                 if(!_self)init();
                 disconnect(child,SIGNAL(registerObject(QObject*,QString)),_self,SIGNAL(registerObject(QObject*,QString)));
                 disconnect(child,SIGNAL(closePlugin(socexplorerplugin*)),_self,SLOT(closeSysDriverFromDriver(socexplorerplugin*)));
             }
             QString socexplorerproxy::getinstanceName(const QString& baseName)
             {
                 if(!_self)init();
                 int i=0;
                 QString name;
                 bool validName = false;
                 while(!validName)
                 {
                     name.clear();
                     name.append(baseName+QString::number(i));
                     validName = instanceNameIsValid(name);
                     i++;
                 }
                 return name;
             }
             void socexplorerproxy::changeSysDriverInstName(socexplorerplugin* driver)
             {
                 if(!_self)init();
                 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))
                         return false;
                 }
                 return true;
             }
             socexplorerplugin *socexplorerproxy::findPlugin(const QString &instanceName)
             {
                 if(!_self)init();
                 for(int k=0;k<linearDriverList->count();k++)
                 {
                     if(!linearDriverList->at(k)->instanceName().compare(instanceName))
                         return linearDriverList->at(k);
                 }
                 return NULL;
             }
             bool socexplorerproxy::instanceExists(const QString &instanceName)
             {
                 return !socexplorerproxy::instanceNameIsValid(instanceName);
             }
             void socexplorerproxy::close()
             {
                 if(!_self)init();
                 socexplorerplugin* tmpPtr;
                 while(drivers->count()>0)
                 {
                     tmpPtr = drivers->last();
                     drivers->removeLast();
                     _self->closeSysDriver(tmpPtr);
                 }
                 if(root!=NULL)
                 {
                     _self->closeSysDriver(root);
                 }
             }
             socexplorerplugin* socexplorerproxy::getSysDriver(const QString instanceName)
             {
                 if(!_self)init();
                 for(int i=0;i<linearDriverList->count();i++)
                 {
                     if(!linearDriverList->at(i)->instanceName().compare(instanceName))
                         return linearDriverList->at(i);
                 }
                 return NULL;
             }
             void socexplorerproxy::closeSysDriver(const QString instanceName)
             {
                 if(!_self)init();
                 closeSysDriver(getSysDriver(instanceName),false);
             }
             void socexplorerproxy::closeSysDriver(socexplorerplugin *driver, bool recursive)
             {
                 if(!_self)init();
                 if(driver!=NULL)
                 {
                     emit _self->removePluginGUI(driver);
                     if(driver->parent==NULL)SocExplorerEngine::removeSOC(driver);
                     while(driver->childs.count()!=0)closeSysDriver(driver->childs.first());
                     linearDriverList->removeOne(driver);
                     if(driver->parent!= NULL)
                     {
                         driver->parent->childs.removeOne(driver);     //Have parent so it's a child
                         disconnectChildToParent(driver);
                         disconnectChildToProxy(driver);
                         delete driver;
                     }
                     else
                     {
                         drivers->removeOne(driver);
                         disconnectChildToProxy(driver);
                         delete driver;
                     }
                     if(!recursive)
                     {
                         emit _self->clearMenu();
                         emit _self->registermenu(mainWindow);
                         emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                     }
                 }
             }
             void socexplorerproxy::geteplugintree()
             {
                 if(!_self)init();
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
             }
             void socexplorerproxy::closeSysDriverFromDriver(socexplorerplugin *driver)
             {
                 if(!_self)init();
                 emit _self->closeSysDriverSig(driver);
             }
             void socexplorerproxy::updateText()
             {
                 if(!_self)init();
                 emit _self->clearMenu();
                 emit _self->registermenu(mainWindow);
             }
             void socexplorerproxy::makeMenu(QMenu* menu)
             {
                 if(!_self)init();
                 for(int i=0;i<drivers->count();i++)
                 {
                     drivers->at(i)->registermenu(menu);
                 }
             }

src/regsExplorer/regsexplorer.cpp +8 -7

             #include "regsexplorer.h"
             #include "socmodel.h"
             regsExplorer::regsExplorer(QWidget *parent) :
                 QDockWidget(parent)
             {
                 mainWidget = new QTabWidget;
                 cfg = new regsExplorerCfg;
-                socViewer = new socRegsViewer(tr("No soc Detected"),this);
+                socViewer = new SocRegsViewerNew(tr("No soc Detected"),this);
                 this->setWidget(this->mainWidget);
                 this->mainWidget->addTab(this->cfg,"Config");
                 this->mainWidget->addTab(this->socViewer,"View");
                 this->setWindowTitle(tr("Regs Explorer"));
                 connect(SocExplorerEngine::self(),SIGNAL(enumDeviceAdded(socExplorerEnumDevice*)),this,SLOT(addDev(socExplorerEnumDevice*)));
             }
             void regsExplorer::addDev(socExplorerEnumDevice *device)
             {
-                peripheralWidget* peripheral=new peripheralWidget(device->name(),device->baseAddress(),this);
+                delegate.device = device;
+                peripheralWidget* peripheral=new peripheralWidget(device->name(),device->baseAddress(),&delegate,this);
                 this->socViewer->addPeripheral(peripheral);
                 peripheralModel periphM=SocExplorerEngine::xmlModel()->getPeripheral(device->name());
                 int startIndex,stopIndex;
                 QString desc;
                 QString name;
                 bool rw;
                 for(int i=0;i<periphM.registers.count();i++)
                 {
                     peripheral->addRegister(periphM.registers.at(i).name,device->baseAddress() + periphM.registers.at(i).offset);
                     for(int j=0;j<periphM.registers.at(i).bitfields.count();j++)
                     {
                         startIndex = periphM.registers.at(i).bitfields.at(j).offset;
                         stopIndex = periphM.registers.at(i).bitfields.at(j).offset+periphM.registers.at(i).bitfields.at(j).size-1;
                         desc = periphM.registers.at(i).bitfields.at(j).description;
                         rw = periphM.registers.at(i).bitfields.at(j).rw;
                         name = periphM.registers.at(i).bitfields.at(j).name;
                         peripheral->registerAt(i)->setBitFieldAttribute(startIndex,stopIndex,name,desc,rw);
                     }
                 }
-                connect(peripheral,SIGNAL(readRegSig(qint32)),device,SLOT(readReg(qint32)));
+            //    connect(peripheral,SIGNAL(readRegSig(qint32)),device,SLOT(readReg(qint32)));
-                connect(peripheral,SIGNAL(writeRegSig(qint32,qint32)),device,SLOT(writeReg(qint32,qint32)));
+            //    connect(peripheral,SIGNAL(writeRegSig(qint32,qint32)),device,SLOT(writeReg(qint32,qint32)));
-                QCheckBox* chkbx = this->cfg->addDev(device);
+            //    QCheckBox* chkbx = this->cfg->addDev(device);
-                chkbx->setChecked(true);
+            //    chkbx->setChecked(true);
-                connect(chkbx,SIGNAL(toggled(bool)),peripheral,SLOT(setVisible(bool)));
+            //    connect(chkbx,SIGNAL(toggled(bool)),peripheral,SLOT(setVisible(bool)));
             }

src/regsExplorer/regsexplorer.h +14 -3

             /*------------------------------------------------------------------------------
             --  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
             ----------------------------------------------------------------------------*/
             #ifndef REGSEXPLORER_H
             #define REGSEXPLORER_H
             #include <QWidget>
             #include <QTabWidget>
             #include <QDockWidget>
             #include "regsexplorercfg.h"
             #include "regsviewer.h"
             #include <QGridLayout>
             #include <socexplorerengine.h>
             #include <peripheralwidget.h>
             #include <socregsviewer.h>
+            #include <socregsviewernew.h>
             class regsExplorer : public QDockWidget
             {
                 Q_OBJECT
+                class regExplorerReadWriteDelegate: public peripheralWidget::readWriteProxy
+                {
+                public:
+                    regExplorerReadWriteDelegate() {}
+                    void writeReg(qint32 address,qint32 value){if(device)device->writeReg(address,value);}
+                    qint32 readReg(qint32 address){if(device)return device->readReg(address);}
+                    socExplorerEnumDevice* device;
+                };
             public:
                 explicit regsExplorer(QWidget *parent = 0);
             signals:
             public slots:
                 void addDev(socExplorerEnumDevice* device);
             private:
                 QTabWidget* mainWidget;
                 regsExplorerCfg* cfg;
-                socRegsViewer* socViewer;
+            //    socRegsViewer* socViewer;
+                SocRegsViewerNew* socViewer;
+                regExplorerReadWriteDelegate delegate;
             };
             #endif // REGSEXPLORER_H

src/src.pro +1 0

             #-------------------------------------------------
             #
             # 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/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine.pri )
             include ( SocExplorerEngine/plugins/socexplorerplugin.prf )
             INCLUDEPATH+=$${PWD} \
                         $${PWD}/common \
                         $${PWD}/common/qhexedit \
                         $${PWD}/common/QCustomPlot \
                         $${PWD}/common/genericBinaryFiles \
                         $${PWD}/common/genericBinaryFiles/elf \
                         $${PWD}/common/genericBinaryFiles/srec \
                         $${PWD}/common/genericBinaryFiles/BinFile \
                         SocExplorerEngine/engine \
                         SocExplorerEngine/pluginloader \
                         SocExplorerEngine/pluginsInterface \
                         SocExplorerEngine/proxy \
                         SocExplorerEngine/pluginManagerWdgt \
                         SocExplorerEngine/plugins \
                         SocExplorerEngine/RegisterMVS \
                         SocExplorerEngine/XmlEngine \
                         SocExplorerEngine/SOC \
                         SocExplorerEngine/PeripheralWidget/src \
                         SocExplorerEngine/memtester
             win32:INCLUDEPATH+= \
                         $${PWD}/common/genericBinaryFiles/elf/libelfWin32/include \
                         $${PWD}/common/genericBinaryFiles/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
             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
             include ( NicePyConsole/NicePyConsole.pri)
             win32{
                 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