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

@@ -10,3 +10,7 QGroupBox::title {
10	padding: 0 3px 0 3px;	10	padding: 0 3px 0 3px;
11	}	11	}
12		12
		13	QWidget#CollapsablePeripheralWidget {
		14	border: 1px solid gray;
		15	border-radius: 9px;
		16	}

src/SocExplorerEngine/SocExplorerEngine.pro +13 -2

                             PeripheralWidget/src/peripheralwidget.h \
                             PeripheralWidget/src/registerwidget.h \
                             PeripheralWidget/src/socregsviewer.h \
+                            PeripheralWidget/src/socregsviewernew.h \
                             memtester/memtester.h
                 proxy/socexplorerproxy.h \
                 SOC/socexplorerenumdevice.h \
                 PySocExplorerEngine.h \
-                memtester/memtester.h
+                memtester/memtester.h\
+                PeripheralWidget/src/socregsviewernew.h \
+                PeripheralWidget/src/collapsableperipheralwidget.h
                 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 += \
                 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

                 emit _self->clearMenu();
                 emit _self->treeChanged(QList<socexplorerplugin*>(*drivers));
                 SocExplorerEngine::addSOC(driver);
+                driver->postInstantiationTrigger();
             }
             void socexplorerproxy::loadChildSysDriver(socexplorerplugin *parent, const QString child)

src/regsExplorer/regsexplorer.cpp +8 -7

             {
                 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");
             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;
                         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

             #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);
             private:
                 QTabWidget* mainWidget;
                 regsExplorerCfg* cfg;
-                socRegsViewer* socViewer;
+            //    socRegsViewer* socViewer;
+                SocRegsViewerNew* socViewer;
+                regExplorerReadWriteDelegate delegate;
             };
             #endif // REGSEXPLORER_H

src/src.pro +1 0

	@@ -111,3 +111,4 TRANSLATIONS = ../translations/socexplor
	111			111
	112			112
	113			113
				114

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