HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorer Commit - r34:a265fede2b19

Added qint32 SocExplorerEngine::getEnumDeviceCount(socexplorerplugin *plugin, int VID, int PID)...

jeandet -

r34:a265fede2b19 default

parent child

Context file:

r34:a265fede2b19

src/SocExplorerEngine/SOC/socmodel.cpp +13 0

@@ -45,6 +45,19 qint32 SOCModel::getEnumDeviceBaseAddres
45	return -1;	45	return -1;
46	}	46	}
47		47
		48	qint32 SOCModel::getEnumDeviceCount(int VID, int PID)
		49	{
		50	qint32 count =0;
		51	for(int i=0;i<p_enumeratedDevices.count();i++)
		52	{
		53	if((p_enumeratedDevices.at(i)->VID()==VID) && (p_enumeratedDevices.at(i)->PID()==PID))
		54	{
		55	count++;
		56	}
		57	}
		58	return count;
		59	}
		60
48	socExplorerEnumDevice *SOCModel::addEnumDevice( int VID, int PID, qint32 baseAddress, const QString &name)	61	socExplorerEnumDevice *SOCModel::addEnumDevice( int VID, int PID, qint32 baseAddress, const QString &name)
49	{	62	{
50	if(enumDeviceExists(baseAddress))	63	if(enumDeviceExists(baseAddress))

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

             public slots:
                 //void setRegValue(qint32 baseAddress,qint32 value);
                 qint32 getEnumDeviceBaseAddress(int VID,int PID,int count=0);
+                qint32 getEnumDeviceCount(int VID,int PID);
                 socExplorerEnumDevice* addEnumDevice(int VID, int PID, qint32 baseAddress, const QString& name);
                 int addEnumDevice(socExplorerEnumDevice* device);
                 void writeReg(qint32 address,qint32 value);

src/SocExplorerEngine/engine/socexplorerengine.cpp +19 0

@@ -119,6 +119,25 qint32 SocExplorerEngine::getEnumDeviceB
119	return soc->getEnumDeviceBaseAddress(VID,PID,count);	119	return soc->getEnumDeviceBaseAddress(VID,PID,count);
120	}	120	}
121		121
		122	qint32 SocExplorerEngine::getEnumDeviceCount(socexplorerplugin *plugin, int VID, int PID)
		123	{
		124	if(plugin==NULL)return 0;
		125	SOCModel* soc = plugin2Soc(plugin);
		126	if(soc==NULL)
		127	return 0;
		128	return soc->getEnumDeviceCount(VID,PID);
		129	}
		130
		131	qint32 SocExplorerEngine::getEnumDeviceCount(const QString &rootPlugin, int VID, int PID)
		132	{
		133	socexplorerplugin* plugin = socexplorerproxy::findPlugin(rootPlugin);
		134	if(plugin==NULL)return 0;
		135	SOCModel* soc = plugin2Soc(plugin);
		136	if(soc==NULL)
		137	return 0;
		138	return soc->getEnumDeviceCount(VID,PID);
		139	}
		140
122	int SocExplorerEngine::addEnumDevice(const QString &rootPlugin, int VID, int PID, qint32 baseAddress, const QString &name)	141	int SocExplorerEngine::addEnumDevice(const QString &rootPlugin, int VID, int PID, qint32 baseAddress, const QString &name)
123	{	142	{
124	socexplorerplugin* plugin = socexplorerproxy::findPlugin(rootPlugin);	143	socexplorerplugin* plugin = socexplorerproxy::findPlugin(rootPlugin);

src/SocExplorerEngine/engine/socexplorerengine.h +2 0

                  QString getSocExplorerBranch(){return SocExplorerEngine::SocExplorerBranch();}
                  qint32 getEnumDeviceBaseAddress(const QString& rootPlugin,int VID,int PID,int count=0);
                  qint32 getEnumDeviceBaseAddress(socexplorerplugin* plugin,int VID,int PID,int count=0);
+                 qint32 getEnumDeviceCount(socexplorerplugin* plugin,int VID,int PID);
+                 qint32 getEnumDeviceCount(const QString& rootPlugin,int VID,int PID);
                  int addEnumDevice(const QString& rootPlugin,int VID,int PID,qint32 baseAddress,const QString& name);
             private:

src/SocExplorerEngine/plugins/socexplorerplugin.prf +1 -1

                 SOCEXPLORER_PLUGINS_INSTALL_PATH = $${SOCEXPLORER_ROOT_PLUGINS_INSTALL_PATH}"/.SocExplorer/plugins"
             }
-            isEmpty(SOCEXPLORER_SDK_BUILD){
+            isEmpty( SOCEXPLORER_SDK_BUILD ){
                 message( "building a plugin" )
                 QT += core gui xml
                 contains(QT_MAJOR_VERSION, 5) {

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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