HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r79:3440ba47d0f1

New register explorer WIP...

jeandet -

r79:3440ba47d0f1 default

parent child

Context file:

r79:3440ba47d0f1

src/regsExplorer/regsexplorernew.ui created 644 +44 0

@@ -0,0 +1,44
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>RegsExplorerNew</class>
	4	<widget class="QDockWidget" name="RegsExplorerNew">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>400</width>
	10	<height>300</height>
	11	</rect>
	12	</property>
	13	<property name="windowTitle">
	14	<string>Regs Explorer</string>
	15	</property>
	16	<widget class="QWidget" name="dockWidgetContents">
	17	<layout class="QGridLayout" name="gridLayout">
	18	<item row="0" column="1">
	19	<widget class="QComboBox" name="comboBox"/>
	20	</item>
	21	<item row="0" column="0">
	22	<widget class="QLabel" name="label">
	23	<property name="text">
	24	<string>Root Plugin</string>
	25	</property>
	26	</widget>
	27	</item>
	28	<item row="1" column="0" colspan="2">
	29	<widget class="SocRegsViewerNew" name="regsViewer" native="true"/>
	30	</item>
	31	</layout>
	32	</widget>
	33	</widget>
	34	<customwidgets>
	35	<customwidget>
	36	<class>SocRegsViewerNew</class>
	37	<extends>QWidget</extends>
	38	<header location="global">socregsviewernew.h</header>
	39	<container>1</container>
	40	</customwidget>
	41	</customwidgets>
	42	<resources/>
	43	<connections/>
	44	</ui>

.hgsubstate +1 -1

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

doc/PythonExamples/PythonPlugin.py +5 -1

             class test(PySocExplorerEngine.socexplorerplugin):
             	def hello(self):
-            		print "hello"
+            	    print "hello"
+            	def VID(self):
+            	    return 10
+            	def PID(self):
+            	    return 100

ressources/Styles/SocExplorer.css +3 -2

             }
             QWidget#CollapsablePeripheralWidget {
-                border: 1px solid gray;
+                border: 2px solid gray;
-                border-radius: 9px;
+                border-radius: 6px;
+                margin-top: 0.5em;
             }

src/PyWdgt/pythonconsole.cpp +2 -1

                 socexplorerplugin* obj= this->proxy->getSysDriver(previnstanceName);
                 if(obj==NULL)obj= this->proxy->getSysDriver(newinstanceName);
                 if(obj==NULL)return;
-                this->mainContext->addObject(newinstanceName,obj->getPyObjectWrapper());
+            //    this->mainContext->addObject(newinstanceName,obj->getPyObjectWrapper());
+                this->mainContext->addObject(newinstanceName,obj);
                 this->mainContext->removeVariable(previnstanceName);
             }

src/SocExplorerEngine/SOC/socexplorerenumdevice.h +3 0

                 QString name(){return *_devName;}
                 bool visible(){return _visible;}
                 void setVisible(bool visible){_visible=visible;}
+                const QString& socName(){return _SOC->name();}
+                bool sameSoc(socExplorerEnumDevice* dev){return sameSoc(_SOC);}
+                bool sameSoc(SOCModel* soc){return soc==_SOC;}
             signals:
             public slots:

src/SocExplorerEngine/SOC/socmodel.h +2 0

                 }
                 bool enumDeviceExists(qint32 baseAddress);
                 socExplorerEnumDevice *getEnumDevice(qint32 baseAddress);
+                const QString& name(){return p_name;}
             public slots:
                 qint32 getEnumDeviceBaseAddress(int VID,int PID,int count=0);
                 qint32 getEnumDeviceCount(int VID,int PID);
                 qint32 readReg(qint32 address);
                 bool isLitleEndian();
             private:
+                QString p_name;
                 socexplorerplugin* p_rootDev;
                 QList<socExplorerEnumDevice*> p_enumeratedDevices;
                 QList<SOCclk*> clktree;

src/SocExplorerEngine/SocExplorerEngine.pro 0 -2

             HEADERS += \
                 pluginloader/pluginscache.h \
                 pluginloader/pluginloader.h \
-                plugins/genericPySysdriver.h \
                 pluginManagerWdgt/plugintree.h \
                 pluginManagerWdgt/pluginmanagerWDGT.h \
                 pluginManagerWdgt/pluginlist.h \
                 PeripheralWidget/src/registerwidget.cpp \
                 PeripheralWidget/src/socregsviewer.cpp \
                 SOC/socclk.cpp \
-                plugins/genericPySysdriver.cpp \
                 engine/socexplorerengine.cpp \
                 engine/socexplorerxmlfile.cpp \
                 proxy/socexplorerproxy.cpp \

src/SocExplorerEngine/plugins/socexplorerplugin.cpp +25 -5

@@ -48,7 +48,7 int socexplorerplugin::registermenu(QMen
48	{	48	{
49	this->childs.at(i)->registermenu(this->ChildsMenu);	49	this->childs.at(i)->registermenu(this->ChildsMenu);
50	}	50	}
51	if(~~this~~->~~pyObject~~!=~~NULL~~)emit this->registerObject((QObject*)this->~~pyObject~~,this->instanceName());	51	emit this->registerObject((QObject*)this,this->instanceName());
52	return 0;	52	return 0;
53	}	53	}
54		54
@@ -75,6 +75,29 unsigned int socexplorerplugin::Read(uns
75	return 0;	75	return 0;
76	}	76	}
77		77
		78	QVariantList socexplorerplugin::Read(unsigned int address,unsigned int count)
		79	{
		80	unsigned int data[count];
		81	QVariantList result;
		82	Read(data,count,address);
		83	for(unsigned int i = 0;i<count;i++)
		84	{
		85	result.append(QVariant((int)data[i]));
		86	}
		87	return result;
		88	}
		89	void socexplorerplugin::Write(unsigned int address,QList<QVariant> dataList)
		90	{
		91	unsigned int data[dataList.count()];
		92	for(int i = 0;i<dataList.count();i++)
		93	{
		94	data[i] = (unsigned int)dataList.at(i).toUInt();
		95	}
		96	Write(data,dataList.count(),address);
		97	}
		98
		99
		100
78	void socexplorerplugin::closeMe(){emit this->closePlugin(this);}	101	void socexplorerplugin::closeMe(){emit this->closePlugin(this);}
79		102
80	void socexplorerplugin::activate(bool flag){this->setEnabled(flag);emit this->activateSig(flag);}	103	void socexplorerplugin::activate(bool flag){this->setEnabled(flag);emit this->activateSig(flag);}
@@ -238,7 +261,4 bool socexplorerplugin::dumpMemory(unsig
238	return false;	261	return false;
239	}	262	}
240		263
241	void socexplorerplugin::makeGenericPyWrapper()	264
242	{
243	this->pyObject = new genericPySysdriver(this);
244	}

src/SocExplorerEngine/plugins/socexplorerplugin.h +3 -8

             #include <QFile>
             #include <stdint.h>
             #include <QTextStream>
-            #include <genericPySysdriver.h>
             #include <abstractbinfile.h>
             #ifndef driver_Name
             #define driver_Name "Plugin"
                     _canBeRoot = driver_can_be_root;
                     _VID = driver_VID;
                     _PID = driver_PID;
-                    if(createPyObject)
-                        this->makeGenericPyWrapper();
                 }
                 //! Tells if the plugin is connected, it is used to enable or disable all childrens interfaces.
                 virtual int isConnected();
                 //! be set by SocExplorer and it can be user accessible if you want.
                 virtual void setBaseAddress(unsigned int baseAddress);
-                genericPySysdriver* getPyObjectWrapper(){return this->pyObject;}
                 QList<socexplorerplugin*> childs;
                 socexplorerplugin* parent;
                 QAction* closeAction;
                 QString  instanceName();
+                QString  instance(){return instanceName();}
                 QMenu* menu;
                 QMenu* ChildsMenu;
                 virtual bool loadbin(unsigned int address,QString file);
                 virtual bool loadfile(abstractBinFile* file);
                 virtual bool dumpMemory(unsigned int address,unsigned int count,QString file,const QString& format);
+                QVariantList Read(unsigned int address, unsigned int count);
+                void Write(unsigned int address, QList<QVariant> dataList);
             protected:
-                void makeGenericPyWrapper();
                 int BaseAddress;
                 bool Connected;
-                genericPySysdriver* pyObject;
                 QString* _Name;
                 QString* _Author;
                 QString* _Version;

src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.cpp +5 -5

               return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_dumpMemory(address, count, file, format));
             }
+            QString  PythonQtWrapper_socexplorerplugin::instance(socexplorerplugin* theWrappedObject)
+            {
+              return ( theWrappedObject->instance());
+            }
             QString  PythonQtWrapper_socexplorerplugin::instanceName(socexplorerplugin* theWrappedObject)
             {
               return ( theWrappedObject->instanceName());
               return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_loadbin(address, file));
             }
-            void PythonQtWrapper_socexplorerplugin::makeGenericPyWrapper(socexplorerplugin* theWrappedObject)
-              ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_makeGenericPyWrapper());
             bool  PythonQtWrapper_socexplorerplugin::memSet(socexplorerplugin* theWrappedObject, unsigned int  address, int  value, unsigned int  count)
             {
               return ( ((PythonQtPublicPromoter_socexplorerplugin*)theWrappedObject)->promoted_memSet(address, value, count));

src/SocExplorerEngine/pythonQtOut/generated_cpp/PySocExplorerEngine/PySocExplorerEngine0.h +1 -2

             inline bool  promoted_dumpMemory(unsigned int  address, unsigned int  count, QString  file, const QString&  format) { return socexplorerplugin::dumpMemory(address, count, file, format); }
             inline int  promoted_isConnected() { return socexplorerplugin::isConnected(); }
             inline bool  promoted_loadbin(unsigned int  address, QString  file) { return socexplorerplugin::loadbin(address, file); }
-            inline void promoted_makeGenericPyWrapper() { socexplorerplugin::makeGenericPyWrapper(); }
             inline bool  promoted_memSet(unsigned int  address, int  value, unsigned int  count) { return socexplorerplugin::memSet(address, value, count); }
             inline void promoted_postInstantiationTrigger() { socexplorerplugin::postInstantiationTrigger(); }
             inline int  promoted_registermenu(QMenu*  menu) { return socexplorerplugin::registermenu(menu); }
                void closeMe(socexplorerplugin* theWrappedObject);
                bool  dumpMemory(socexplorerplugin* theWrappedObject, unsigned int  address, unsigned int  count, QString  file);
                bool  dumpMemory(socexplorerplugin* theWrappedObject, unsigned int  address, unsigned int  count, QString  file, const QString&  format);
+               QString  instance(socexplorerplugin* theWrappedObject);
                QString  instanceName(socexplorerplugin* theWrappedObject);
                int  isConnected(socexplorerplugin* theWrappedObject);
                bool  loadbin(socexplorerplugin* theWrappedObject, unsigned int  address, QString  file);
-               void makeGenericPyWrapper(socexplorerplugin* theWrappedObject);
                bool  memSet(socexplorerplugin* theWrappedObject, unsigned int  address, int  value, unsigned int  count);
                void postInstantiationTrigger(socexplorerplugin* theWrappedObject);
                int  registermenu(socexplorerplugin* theWrappedObject, QMenu*  menu);

src/mainwindow.cpp +1 -3

                 socexplorerproxy::setMainWindow(this);
                 SocExplorerEngine::setMainWindow(this);
                 SocExplorerEngine::xmlModel()->scanXmlFiles();
-                this->regExplorer = new regsExplorer();
+                this->regExplorer = new RegsExplorer();
                 this->regExplorer->setAllowedAreas(Qt::AllDockWidgetAreas);
                 this->addPluginInterface(this->regExplorer);
                 this->PythonConsoleInst = new PythonConsole(socexplorerproxy::self());
                 this->pluginManager = new dockablePluginManager();
                 this->toolpane = new toolBar;
                 this->p_about = new aboutsocexplorer();
             }
             void SocExplorerMainWindow::makeLayout()
                 if(p_pluginGUIlist->count()!=0)
                     this->pluginsDockContainer->tabifyDockWidget(p_pluginGUIlist->last(),plugin);
                 p_pluginGUIlist->append(plugin);
             }
             void SocExplorerMainWindow::removePluginInterface(QDockWidget *plugin)

src/mainwindow.h +1 -1

                 QSplitter* mainWidget;
                 PythonConsole* PythonConsoleInst;
                 dockablePluginManager* pluginManager;
-                regsExplorer* regExplorer;
+                RegsExplorer* regExplorer;
                 aboutsocexplorer* p_about;
                 QList<QDockWidget*>* p_pluginGUIlist;
             };

src/regsExplorer/regsexplorer.cpp +44 -36

@@ -1,50 +1,58
1	#include "regsexplorer.h"	1	#include "regsexplorer.h"
		2	#include "ui_regsexplorernew.h"
2	#include "socmodel.h"	3	#include "socmodel.h"
3		4
4	regsExplorer::regsExplorer(QWidget *parent) :	5	RegsExplorer::RegsExplorer(QWidget *parent) :
5	QDockWidget(parent)	6	QDockWidget(parent),
		7	ui(new Ui::RegsExplorerNew)
6	{	8	{
7	mainWidget = new QTabWidget;	9	ui->setupUi(this);
8	cfg = new regsExplorerCfg;
9	socViewer = new SocRegsViewerNew(tr("No soc Detected"),this);
10	this->setWidget(this->mainWidget);
11	this->mainWidget->addTab(this->cfg,"Config");
12	this->mainWidget->addTab(this->socViewer,"View");
13	this->setWindowTitle(tr("Regs Explorer"));
14	connect(SocExplorerEngine::self(),SIGNAL(enumDeviceAdded(socExplorerEnumDevice)),this,SLOT(addDev(socExplorerEnumDevice)));	10	connect(SocExplorerEngine::self(),SIGNAL(enumDeviceAdded(socExplorerEnumDevice)),this,SLOT(addDev(socExplorerEnumDevice)));
		11	delegate.device=NULL;
		12	}
		13
		14	RegsExplorer::~RegsExplorer()
		15	{
		16	delete ui;
15	}	17	}
16		18
17		19	void RegsExplorer::addDev(socExplorerEnumDevice *device)
18	void regsExplorer::addDev(socExplorerEnumDevice *device)
19	{	20	{
20	delegate.device = device;	21	if((delegate.device->sameSoc(device))\|\|(delegate.device==NULL))
21	peripheralWidget* peripheral=new peripheralWidget(device->name(),device->baseAddress(),&delegate,this);
22	this->socViewer->addPeripheral(peripheral);
23	peripheralModel periphM=SocExplorerEngine::xmlModel()->getPeripheral(device->name());
24	int startIndex,stopIndex;
25	QString desc;
26	QString name;
27	bool rw;
28	for(int i=0;i<periphM.registers.count();i++)
29	{	22	{
30	peripheral->addRegister(periphM.registers.at(i).name,device->baseAddress() + periphM.registers.at(i).offset);	23	delegate.device = device;
31	for(int j=0;j<periphM.registers.at(i).bitfields.count();j++)	24	peripheralWidget* peripheral=new peripheralWidget(device->name(),device->baseAddress(),&delegate,this);
		25	this->ui->regsViewer->addPeripheral(peripheral);
		26	peripheralModel periphM=SocExplorerEngine::xmlModel()->getPeripheral(device->name());
		27	int startIndex,stopIndex;
		28	QString desc;
		29	QString name;
		30	bool rw;
		31	this->ui->regsViewer->setSocName(device->socName());
		32	for(int i=0;i<periphM.registers.count();i++)
32	{	33	{
33	startIndex = periphM.registers.at(i).bitfields.at(j).offset;	34	peripheral->addRegister(periphM.registers.at(i).name,device->baseAddress() + periphM.registers.at(i).offset);
34	stopIndex = periphM.registers.at(i).bitfields.at(j).offset+periphM.registers.at(i).bitfields.at(j).size-1;	35	for(int j=0;j<periphM.registers.at(i).bitfields.count();j++)
35	desc = periphM.registers.at(i).bitfields.at(j).description;	36	{
36	rw = periphM.registers.at(i).bitfields.at(j).rw;	37	startIndex = periphM.registers.at(i).bitfields.at(j).offset;
37	~~name~~ = periphM.registers.at(i).bitfields.at(j).~~name~~;	38	stopIndex = periphM.registers.at(i).bitfields.at(j).offset+periphM.registers.at(i).bitfields.at(j).size-1;
38	peripheral->registerAt(i)->setBitFieldAttribute(startIndex,stopIndex,name,desc,rw);	39	desc = periphM.registers.at(i).bitfields.at(j).description;
		40	rw = periphM.registers.at(i).bitfields.at(j).rw;
		41	name = periphM.registers.at(i).bitfields.at(j).name;
		42	peripheral->registerAt(i)->setBitFieldAttribute(startIndex,stopIndex,name,desc,rw);
		43	}
39	}	44	}
40	}	45	}
41	// connect(peripheral,SIGNAL(readRegSig(qint32)),device,SLOT(readReg(qint32)));
42	// connect(peripheral,SIGNAL(writeRegSig(qint32,qint32)),device,SLOT(writeReg(qint32,qint32)));
43	// QCheckBox* chkbx = this->cfg->addDev(device);
44	// chkbx->setChecked(true);
45	// connect(chkbx,SIGNAL(toggled(bool)),peripheral,SLOT(setVisible(bool)));
46	}	46	}
47		47
48		48	void RegsExplorer::changeEvent(QEvent *e)
49		49	{
50		50	QDockWidget::changeEvent(e);
		51	switch (e->type()) {
		52	case QEvent::LanguageChange:
		53	ui->retranslateUi(this);
		54	break;
		55	default:
		56	break;
		57	}
		58	}

src/regsExplorer/regsexplorer.h +12 -41

@@ -1,41 +1,16
1	/*------------------------------------------------------------------------------	1	#ifndef REGSEXPLORERNEW_H
2	-- This file is a part of the SocExplorer Software	2	#define REGSEXPLORERNEW_H
3	-- Copyright (C) 2011, Plasma Physics Laboratory - CNRS
4	--
5	-- This program is free software; you can redistribute it and/or modify
6	-- it under the terms of the GNU General Public License as published by
7	-- the Free Software Foundation; either version 2 of the License, or
8	-- (at your option) any later version.
9	--
10	-- This program is distributed in the hope that it will be useful,
11	-- but WITHOUT ANY WARRANTY; without even the implied warranty of
12	-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13	-- GNU General Public License for more details.
14	--
15	-- You should have received a copy of the GNU General Public License
16	-- along with this program; if not, write to the Free Software
17	-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18	-------------------------------------------------------------------------------*/
19	/*-- Author : Alexis Jeandet
20	-- Mail : alexis.jeandet@lpp.polytechnique.fr
21	----------------------------------------------------------------------------*/
22	#ifndef REGSEXPLORER_H
23	#define REGSEXPLORER_H
24		3
25	#include <QWidget>
26	#include <QTabWidget>
27	#include <QDockWidget>	4	#include <QDockWidget>
28	#include "regsexplorercfg.h"
29	#include "regsviewer.h"
30	#include <QGridLayout>
31	#include <socexplorerengine.h>	5	#include <socexplorerengine.h>
32	#include <peripheralwidget.h>	6	#include <peripheralwidget.h>
33	#include <socregsviewer.h>
34	#include <socregsviewernew.h>	7	#include <socregsviewernew.h>
35		8
36		9	namespace Ui {
		10	class RegsExplorerNew;
		11	}
37		12
38	class regsExplorer : public QDockWidget	13	class RegsExplorer : public QDockWidget
39	{	14	{
40	Q_OBJECT	15	Q_OBJECT
41	class regExplorerReadWriteDelegate: public peripheralWidget::readWriteProxy	16	class regExplorerReadWriteDelegate: public peripheralWidget::readWriteProxy
@@ -47,20 +22,16 class regsExplorer : public QDockWidget
47	socExplorerEnumDevice* device;	22	socExplorerEnumDevice* device;
48	};	23	};
49	public:	24	public:
50	explicit regsExplorer(QWidget *parent = 0);	25	explicit RegsExplorer(QWidget *parent = 0);
51		26	~RegsExplorer();
52	signals:
53
54	public slots:	27	public slots:
55
56	void addDev(socExplorerEnumDevice* device);	28	void addDev(socExplorerEnumDevice* device);
		29	protected:
		30	void changeEvent(QEvent *e);
57		31
58	private:	32	private:
59	QTabWidget* mainWidget;	33	Ui::RegsExplorerNew *ui;
60	regsExplorerCfg* cfg;
61	// socRegsViewer* socViewer;
62	SocRegsViewerNew* socViewer;
63	regExplorerReadWriteDelegate delegate;	34	regExplorerReadWriteDelegate delegate;
64	};	35	};
65		36
66	#endif // REGSEXPLORER_H	37	#endif // REGSEXPLORERNEW_H

src/src.pro +7 -8

                 dockablepluginmanager.cpp \
                 toolbar.cpp \
                 toolbarcontainer.cpp \
-                regsExplorer/regsexplorer.cpp \
+                aboutsocexplorer.cpp \
-                regsExplorer/regsviewer.cpp \
+                regsExplorer/regsexplorer.cpp
-                regsExplorer/regsexplorercfg.cpp \
-                aboutsocexplorer.cpp
             HEADERS  += mainwindow.h \
                 PyWdgt/pythonconsole.h \
                 dockablepluginmanager.h \
                 toolbar.h \
                 toolbarcontainer.h \
-                regsExplorer/regsexplorer.h \
-                regsExplorer/regsviewer.h \
-                regsExplorer/regsexplorercfg.h \
                 socexplorer.h \
                 SocExplorerEngine/plugins/socexplorerplugin.h \
-                aboutsocexplorer.h
+                aboutsocexplorer.h \
+                regsExplorer/regsexplorer.h
             include ( NicePyConsole/NicePyConsole.pri)
             TRANSLATIONS = ../translations/socexplorer_fr.ts \
                 ../translations/socexplorer_en.ts
+            FORMS += \
+                regsExplorer/regsexplorernew.ui

src/SocExplorerEngine/plugins/genericPySysdriver.cpp removed 0 -75

NO CONTENT: file was removed

src/SocExplorerEngine/plugins/genericPySysdriver.h removed 0 -61

NO CONTENT: file was removed

src/regsExplorer/regsexplorercfg.cpp removed 0 -55

NO CONTENT: file was removed

src/regsExplorer/regsexplorercfg.h removed 0 -28

NO CONTENT: file was removed

src/regsExplorer/regsviewer.cpp removed 0 -6

NO CONTENT: file was removed

src/regsExplorer/regsviewer.h removed 0 -40

NO CONTENT: file was removed

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