HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r85:d64b77b3d5df

Some fixes on python plugin interface.

jeandet -

r85:d64b77b3d5df default

parent child

Context file:

r85:d64b77b3d5df

doc/PythonExamples/PythonPlugin.py +32 -6

@@ -1,10 +1,36
1	#!/usr/bin/lppmon -e	1	#!/usr/bin/lppmon -e
2		2
3	class test(PySocExplorerEngine.socexplorerplugin):	3	class test(PySocExplorerEngine.socexplorerplugin):
4	def hello(self):	4	m_Layout = QtGui.QGridLayout()
5	print "hello"	5	m_CenterWidget = QtGui.QWidget()
6	def VID(self):	6	m_hexviewer = PySocExplorer.QHexEdit()
7	return 10	7	m_addressQSPB = PySocExplorer.QHexSpinBox()
8	def PID(self):	8	m_readQPB = QtGui.QPushButton("read")
9	return 100	9	m_writeQPB = QtGui.QPushButton("write")
10		10
		11	def postInstantiationTrigger(self):
		12	print "building GUI"
		13	self.setWidget(self.m_CenterWidget)
		14	self.m_CenterWidget.setLayout(self.m_Layout)
		15	self.m_Layout.addWidget(self.m_addressQSPB,0,0,1,1)
		16	self.m_Layout.addWidget(self.m_readQPB,0,1,1,1)
		17	self.m_Layout.addWidget(self.m_writeQPB,0,2,1,1)
		18	self.m_Layout.addWidget(self.m_hexviewer,1,0,1,-1)
		19	def hello(self):
		20	print "hello"
		21	def VID(self):
		22	return 10
		23	def PID(self):
		24	return 100
		25	def readData(self):
		26	bufferQBA = QtCore.QByteArray()
		27	buffer = self.parentPlugin().Read(self.m_addressQSPB.value,16*1024)
		28	for i in range(0,16*1024):
		29	bufferQBA.append(int(buffer[i]))
		30	bufferQBA.append(int(buffer[i]))
		31	bufferQBA.append(int(buffer[i]))
		32	bufferQBA.append(int(buffer[i]))
		33	self.m_hexviewer.setData(bufferQBA)
		34
		35
		36

src/SocExplorerEngine/plugins/socexplorerplugin.h +2 0

                 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);
+                socexplorerplugin* parentPlugin(){return this->parent;}
+                socexplorerplugin* toPlugin(){return (socexplorerplugin*)this;}
             protected:
                 int BaseAddress;
                 bool Connected;

src/SocExplorerEngine/pythonQtgeneratorCfg.txt 0 -1

                 <load-typesystem name=":/trolltech/generator/typesystem_network.txt" generate="no" />
                 <interface-type name="socexplorerplugin"/>
             </typesystem>

src/common/pythonQtOut/generated_cpp/PySocExplorer/PySocExplorer0.cpp +20 0

@@ -4852,6 +4852,21 void PythonQtWrapper_SocExplorerPlot::mo
4852	( ((PythonQtPublicPromoter_SocExplorerPlot*)theWrappedObject)->promoted_mouseReleaseEvent(arg__1));	4852	( ((PythonQtPublicPromoter_SocExplorerPlot*)theWrappedObject)->promoted_mouseReleaseEvent(arg__1));
4853	}	4853	}
4854		4854
		4855	void PythonQtWrapper_SocExplorerPlot::removeAllGraphs(SocExplorerPlot* theWrappedObject)
		4856	{
		4857	( theWrappedObject->removeAllGraphs());
		4858	}
		4859
		4860	bool PythonQtWrapper_SocExplorerPlot::removeGraph(SocExplorerPlot* theWrappedObject, int graphIndex)
		4861	{
		4862	return ( theWrappedObject->removeGraph(graphIndex));
		4863	}
		4864
		4865	void PythonQtWrapper_SocExplorerPlot::replot(SocExplorerPlot* theWrappedObject)
		4866	{
		4867	( theWrappedObject->replot());
		4868	}
		4869
4855	void PythonQtWrapper_SocExplorerPlot::rescaleAxis(SocExplorerPlot* theWrappedObject)	4870	void PythonQtWrapper_SocExplorerPlot::rescaleAxis(SocExplorerPlot* theWrappedObject)
4856	{	4871	{
4857	( theWrappedObject->rescaleAxis());	4872	( theWrappedObject->rescaleAxis());
@@ -4902,6 +4917,11 void PythonQtWrapper_SocExplorerPlot::se
4902	( theWrappedObject->setTitle(title));	4917	( theWrappedObject->setTitle(title));
4903	}	4918	}
4904		4919
		4920	void PythonQtWrapper_SocExplorerPlot::setXaxisDateTimeFormat(SocExplorerPlot* theWrappedObject, const QString& format)
		4921	{
		4922	( theWrappedObject->setXaxisDateTimeFormat(format));
		4923	}
		4924
4905	void PythonQtWrapper_SocExplorerPlot::setXaxisLabel(SocExplorerPlot* theWrappedObject, QString label)	4925	void PythonQtWrapper_SocExplorerPlot::setXaxisLabel(SocExplorerPlot* theWrappedObject, QString label)
4906	{	4926	{
4907	( theWrappedObject->setXaxisLabel(label));	4927	( theWrappedObject->setXaxisLabel(label));

src/common/pythonQtOut/generated_cpp/PySocExplorer/PySocExplorer0.h +4 0

                void mouseMoveEvent(SocExplorerPlot* theWrappedObject, QMouseEvent*  arg__1);
                void mousePressEvent(SocExplorerPlot* theWrappedObject, QMouseEvent*  arg__1);
                void mouseReleaseEvent(SocExplorerPlot* theWrappedObject, QMouseEvent*  arg__1);
+               void removeAllGraphs(SocExplorerPlot* theWrappedObject);
+               bool  removeGraph(SocExplorerPlot* theWrappedObject, int  graphIndex);
+               void replot(SocExplorerPlot* theWrappedObject);
                void rescaleAxis(SocExplorerPlot* theWrappedObject);
                void setAdaptativeSampling(SocExplorerPlot* theWrappedObject, int  graphIndex, bool  enable);
                void setGraphData(SocExplorerPlot* theWrappedObject, int  graphIndex, QList<QVariant >  x, QList<QVariant >  y);
                void setLegendFont(SocExplorerPlot* theWrappedObject, QFont  font);
                void setLegendSelectedFont(SocExplorerPlot* theWrappedObject, QFont  font);
                void setTitle(SocExplorerPlot* theWrappedObject, QString  title);
+               void setXaxisDateTimeFormat(SocExplorerPlot* theWrappedObject, const QString&  format);
                void setXaxisLabel(SocExplorerPlot* theWrappedObject, QString  label);
                void setXaxisRange(SocExplorerPlot* theWrappedObject, double  lower, double  upper);
                void setYaxisLabel(SocExplorerPlot* theWrappedObject, QString  label);

src/src.pro +10 0

             FORMS += \
                 regsExplorer/regsexplorernew.ui
+            DISTFILES += \
+                ../doc/PythonExamples/LEON3_LOAD.py \
+                ../doc/PythonExamples/PythonPlugin.py \
+                ../doc/PythonExamples/simpledemo1.py \
+                ../doc/PythonExamples/SocExplorerPlot.py \
+                ../doc/PythonExamples/SocExplorerPlot2.py \
+                ../doc/PythonExamples/SocExplorerPlot3.py \
+                ../doc/PythonExamples/tcpterminaldemo.py \
+                ../doc/PythonExamples/tcpterminaldemo2.py

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