HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r65:67168ff4b6e7

SpwPlugin:...

jeandet -

r65:67168ff4b6e7 default

parent child

Context file:

r65:67168ff4b6e7

spwplugin/StarDundee/fakestardundeespwusbgui.cpp created 644 +57 0

@@ -0,0 +1,57
	1	#include "fakestardundeespwusbgui.h"
	2	#include "ui_fakestardundeespwusbgui.h"
	3	#include "fakestardundeespwusb_lib.h"
	4
	5	FakeStardundeeSpwUsbGui::FakeStardundeeSpwUsbGui(QWidget *parent) :
	6	QWidget(parent),
	7	ui(new Ui::FakeStardundeeSpwUsbGui)
	8	{
	9	ui->setupUi(this);
	10	}
	11
	12	FakeStardundeeSpwUsbGui::~FakeStardundeeSpwUsbGui()
	13	{
	14	delete ui;
	15	}
	16
	17	void FakeStardundeeSpwUsbGui::update()
	18	{
	19	const QList<funcToresolve> stat=FakeStarDundeeSpwUSB_Lib::status();
	20	QTableWidgetItem* item;
	21	this->ui->symbolsList->clear();
	22	this->ui->symbolsList->setHorizontalHeaderLabels(QStringList()<<"Symbol"<<"Status");
	23	this->ui->symbolsList->setRowCount(stat.count());
	24	for(int i=0;i<stat.count();i++)
	25	{
	26	item=new QTableWidgetItem(stat[i].symbolName);
	27	item->setFlags(item->flags()^Qt::ItemIsEditable);
	28	this->ui->symbolsList->setItem(i,0,item);
	29	if(*(stat[i].function)==NULL)
	30	{
	31	item=new QTableWidgetItem("Not found");
	32	item->setForeground(Qt::red);
	33	item->setFlags(item->flags()^Qt::ItemIsEditable);
	34	this->ui->symbolsList->setItem(i,1,item);
	35	}
	36	else
	37	{
	38	item=new QTableWidgetItem("Loaded");
	39	item->setForeground(Qt::green);
	40	item->setFlags(item->flags()^Qt::ItemIsEditable);
	41	this->ui->symbolsList->setItem(i,1,item);
	42	}
	43	}
	44	this->ui->symbolsList->resizeColumnsToContents();
	45	}
	46
	47	void FakeStardundeeSpwUsbGui::changeEvent(QEvent *e)
	48	{
	49	QWidget::changeEvent(e);
	50	switch (e->type()) {
	51	case QEvent::LanguageChange:
	52	ui->retranslateUi(this);
	53	break;
	54	default:
	55	break;
	56	}
	57	}

spwplugin/StarDundee/fakestardundeespwusbgui.h created 644 +25 0

@@ -0,0 +1,25
	1	#ifndef FAKESTARDUNDEESPWUSBGUI_H
	2	#define FAKESTARDUNDEESPWUSBGUI_H
	3
	4	#include <QWidget>
	5
	6	namespace Ui {
	7	class FakeStardundeeSpwUsbGui;
	8	}
	9
	10	class FakeStardundeeSpwUsbGui : public QWidget
	11	{
	12	Q_OBJECT
	13
	14	public:
	15	explicit FakeStardundeeSpwUsbGui(QWidget *parent = 0);
	16	~FakeStardundeeSpwUsbGui();
	17	void update();
	18	protected:
	19	void changeEvent(QEvent *e);
	20
	21	private:
	22	Ui::FakeStardundeeSpwUsbGui *ui;
	23	};
	24
	25	#endif // FAKESTARDUNDEESPWUSBGUI_H

spwplugin/StarDundee/fakestardundeespwusbgui.ui created 644 +84 0

@@ -0,0 +1,84
	1	<?xml version="1.0" encoding="UTF-8"?>
	2	<ui version="4.0">
	3	<class>FakeStardundeeSpwUsbGui</class>
	4	<widget class="QWidget" name="FakeStardundeeSpwUsbGui">
	5	<property name="geometry">
	6	<rect>
	7	<x>0</x>
	8	<y>0</y>
	9	<width>612</width>
	10	<height>300</height>
	11	</rect>
	12	</property>
	13	<property name="windowTitle">
	14	<string>Form</string>
	15	</property>
	16	<layout class="QGridLayout" name="gridLayout">
	17	<item row="1" column="1">
	18	<widget class="QPushButton" name="closeQpb">
	19	<property name="text">
	20	<string>close</string>
	21	</property>
	22	</widget>
	23	</item>
	24	<item row="1" column="0">
	25	<spacer name="horizontalSpacer">
	26	<property name="orientation">
	27	<enum>Qt::Horizontal</enum>
	28	</property>
	29	<property name="sizeHint" stdset="0">
	30	<size>
	31	<width>40</width>
	32	<height>20</height>
	33	</size>
	34	</property>
	35	</spacer>
	36	</item>
	37	<item row="0" column="0" colspan="2">
	38	<widget class="QTableWidget" name="symbolsList">
	39	<property name="alternatingRowColors">
	40	<bool>true</bool>
	41	</property>
	42	<property name="sortingEnabled">
	43	<bool>true</bool>
	44	</property>
	45	<attribute name="horizontalHeaderShowSortIndicator" stdset="0">
	46	<bool>true</bool>
	47	</attribute>
	48	<attribute name="verticalHeaderShowSortIndicator" stdset="0">
	49	<bool>false</bool>
	50	</attribute>
	51	<column>
	52	<property name="text">
	53	<string>Symbol</string>
	54	</property>
	55	</column>
	56	<column>
	57	<property name="text">
	58	<string>Status</string>
	59	</property>
	60	</column>
	61	</widget>
	62	</item>
	63	</layout>
	64	</widget>
	65	<resources/>
	66	<connections>
	67	<connection>
	68	<sender>closeQpb</sender>
	69	<signal>clicked()</signal>
	70	<receiver>FakeStardundeeSpwUsbGui</receiver>
	71	<slot>close()</slot>
	72	<hints>
	73	<hint type="sourcelabel">
	74	<x>560</x>
	75	<y>275</y>
	76	</hint>
	77	<hint type="destinationlabel">
	78	<x>305</x>
	79	<y>149</y>
	80	</hint>
	81	</hints>
	82	</connection>
	83	</connections>
	84	</ui>

spwplugin/StarDundee/fakestardundeespwusb_lib.cpp +17 -5

@@ -88,11 +88,7 int (*resolved_CFGSpaceWire_GetTickEna
88	int (*resolved_CFGSpaceWire_SetTickEnableStatus)(star_device_handle hDevice, U32 dwTickEnableStatus)=NULL;	88	int (*resolved_CFGSpaceWire_SetTickEnableStatus)(star_device_handle hDevice, U32 dwTickEnableStatus)=NULL;
89		89
90		90
91	typedef struct funcToresolve	91
92	{
93	void (** function)();
94	const char* symbolName;
95	}funcToresolve;
96		92
97	QList<funcToresolve> funcTable=QList<funcToresolve>()	93	QList<funcToresolve> funcTable=QList<funcToresolve>()
98	<<funcToresolve{(void (**)())&resolved_USBSpaceWire_Open,"USBSpaceWire_Open"}	94	<<funcToresolve{(void (**)())&resolved_USBSpaceWire_Open,"USBSpaceWire_Open"}
@@ -193,6 +189,22 void FakeStarDundeeSpwUSB_Lib::resolve()
193	}	189	}
194	}	190	}
195		191
		192	bool FakeStarDundeeSpwUSB_Lib::fullresolved()
		193	{
		194	bool success=true;
		195	for(int i=0;i<funcTable.count();i++)
		196	{
		197	if(*(funcTable[i].function)==NULL)
		198	success=false;
		199	}
		200	return success;
		201	}
		202
		203	const QList<funcToresolve> &FakeStarDundeeSpwUSB_Lib::status()
		204	{
		205	return funcTable;
		206	}
		207
196		208
197		209
198	char USBSpaceWire_Open(star_device_handle *phDevice, int nDeviceNum)	210	char USBSpaceWire_Open(star_device_handle *phDevice, int nDeviceNum)

spwplugin/StarDundee/fakestardundeespwusb_lib.h +7 -1

             int   CFGSpaceWire_GetTickEnableStatus(star_device_handle hDevice, U32 *dwTickEnableStatus);
             int   CFGSpaceWire_SetTickEnableStatus(star_device_handle hDevice, U32 dwTickEnableStatus);
+            typedef struct funcToresolve
+            {
+                void (** function)();
+                const char* symbolName;
+            }funcToresolve;
             class FakeStarDundeeSpwUSB_Lib
             public:
                 FakeStarDundeeSpwUSB_Lib();
                 static void resolve();
+                static bool fullresolved();
+                static const QList<funcToresolve>& status();
             };
             #endif // FAKESTARDUNDEESPWUSB_LIB_H

spwplugin/StarDundee/stardundeeGUI.ui +59 -25

                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>397</width>
+                <width>609</width>
-                <height>506</height>
+                <height>581</height>
                </rect>
               </property>
               <property name="windowTitle">
                <string>Form</string>
               </property>
               <layout class="QFormLayout" name="formLayout">
-               <item row="0" column="0">
+               <item row="7" column="0">
                 <widget class="QLabel" name="selectBrickLbl">
                  <property name="text">
                   <string>Select Brick</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
+               <item row="7" column="1">
                 <widget class="QComboBox" name="selectBrickCmbx">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the brick you want to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </item>
                 </widget>
                </item>
-               <item row="1" column="0">
+               <item row="8" column="0">
                 <widget class="QLabel" name="selectLinkLbl">
                  <property name="text">
                   <string>Select link number</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1">
+               <item row="8" column="1">
                 <widget class="QComboBox" name="selectLinkCmbx">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the link number you want to use.&lt;/p&gt;&lt;p&gt;The link number correspond to the numbers on the brick:&lt;/p&gt;&lt;p&gt;&lt;img src=&quot;:/imgs/stardundee.tif&quot;/&gt;&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </item>
                 </widget>
                </item>
-               <item row="2" column="0">
+               <item row="9" column="0">
                 <widget class="QLabel" name="selectLinkSpeedLbl">
                  <property name="text">
                   <string>Link Speed</string>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="1">
+               <item row="9" column="1">
                 <widget class="QComboBox" name="setLinkSpeedCmbx">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Select the Space Wire link speed you want to use.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </item>
                 </widget>
                </item>
-               <item row="3" column="0">
+               <item row="10" column="0">
                 <widget class="QLabel" name="setDestKeyLbl">
                  <property name="text">
                   <string>Source address</string>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="1">
+               <item row="10" column="1">
                 <widget class="QLineEdit" name="sourceAddressLineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the Space Wire Brick destination Key, the default value is 32 (0x20).&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="0">
+               <item row="11" column="0">
                 <widget class="QLabel" name="RMAPaddressLbl">
                  <property name="text">
                   <string>Destination address</string>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="1">
+               <item row="11" column="1">
                 <widget class="QLineEdit" name="destinationAddressLineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the RMAP target address, this address will be used as destination address for all the RMAP transfers.&lt;/p&gt;&lt;p&gt;This is you SOC spw address.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="0">
+               <item row="12" column="0">
                 <widget class="QLabel" name="RMAPKeyLbl">
                  <property name="text">
                   <string>Destination key</string>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="1">
+               <item row="12" column="1">
                 <widget class="QLineEdit" name="destinationKeyLineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the RMAP target key, this key will be used for all the RMAP transfers.&lt;/p&gt;&lt;p&gt;This is you SOC spw key.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="1">
+               <item row="13" column="1">
                 <widget class="QLineEdit" name="RMAPTimeoutLineEdit">
                  <property name="toolTip">
                   <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Set the RMAP timeout, when waiting for a RMAP answer the driver will give up after this time if it doesn't get any answer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="0">
+               <item row="13" column="0">
                 <widget class="QLabel" name="RMAPTimeoutLbl">
                  <property name="text">
                   <string>RMAP timeout(ms)</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="1">
+               <item row="17" column="1">
                 <widget class="QPushButton" name="connectQpb">
                  <property name="text">
                   <string>Connect</string>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="1">
+               <item row="15" column="1">
                 <widget class="QRadioButton" name="setInterfaceModeQrb">
                  <property name="text">
-                  <string>interface mode</string>
+                  <string>i&amp;nterface mode</string>
                  </property>
                  <property name="checked">
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="1">
+               <item row="16" column="1">
                 <widget class="QRadioButton" name="setRouterModeQrb">
                  <property name="text">
-                  <string>router mode</string>
+                  <string>router &amp;mode</string>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="0" colspan="2">
+               <item row="18" column="0" colspan="2">
                 <layout class="QGridLayout" name="gridLayout">
                  <item row="1" column="0">
                   <widget class="QLabel" name="label_4">
                  </item>
                 </layout>
                </item>
-               <item row="8" column="0">
+               <item row="15" column="0">
                 <widget class="QCheckBox" name="spwTimecodes">
                  <property name="text">
                   <string>timecode</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="0">
+               <item row="14" column="0">
                 <widget class="QLabel" name="label">
                  <property name="text">
                   <string>Timecode f (Hz)</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="1">
+               <item row="14" column="1">
                 <widget class="QLineEdit" name="timecodeFrequencyLineEdit">
                  <property name="text">
                   <string>1</string>
                  </property>
                 </widget>
                </item>
+               <item row="5" column="0">
+                <widget class="QLabel" name="label_2">
+                 <property name="text">
+                  <string>Driver Status</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="5" column="1">
+                <layout class="QHBoxLayout" name="horizontalLayout">
+                 <property name="leftMargin">
+                  <number>0</number>
+                 </property>
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
+                 <item>
+                  <widget class="QLabel" name="driverstatuslbl">
+                   <property name="text">
+                    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; color:#ff0000;&quot;&gt;NotLoaded&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignCenter</set>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QPushButton" name="driverStatusQpb">
+                   <property name="text">
+                    <string>Details</string>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
               </layout>
              </widget>
              <resources/>

spwplugin/StarDundee/stardundeegui.cpp +11 -2

             #include "ui_stardundeeGUI.h"
             #include "fakestardundeespwusb_lib.h"
-            //#include <spw_usb_api.h>
-            //#include <spw_config_library.h>
             StarDundeeGUI::StarDundeeGUI(QWidget *parent) :
                 QWidget(parent),ui(new Ui::StarDundeeUI)
                 connect(this->ui->setInterfaceModeQrb, SIGNAL(toggled(bool)), this, SIGNAL(brickModeChanged(bool)));
                 connect(this->ui->resetStatsQpb, SIGNAL(clicked()), this, SLOT(resetStatistics()));
                 connect(this->ui->spwTimecodes, SIGNAL(toggled(bool)), this, SIGNAL(startSendingTimecode(bool)));
+                connect(this->ui->driverStatusQpb,SIGNAL(clicked(bool)),this,SLOT(showDriverStatus()));
+                if(FakeStarDundeeSpwUSB_Lib::fullresolved())
+                    this->ui->driverstatuslbl->setText("<html><head/><body><p><span style=\" color:#00ff00;\">Driver loaded</span></p></body></html>");
+                else
+                    this->ui->driverstatuslbl->setText("<html><head/><body><p><span style=\" color:#ff0000;\">Driver not loaded(error!)</span></p></body></html>");
             }
             int StarDundeeGUI::getBrickSelection()
                 return ui->setInterfaceModeQrb->isChecked();
             }
+            void StarDundeeGUI::showDriverStatus()
+            {
+                this->driverStatus.update();
+                this->driverStatus.show();
+            }
             void StarDundeeGUI::setBrickAsAnInterface( bool interfaceMode )
             {
                 if (interfaceMode == true)

spwplugin/StarDundee/stardundeegui.h +4 0

             #include <QWidget>
+            #include "fakestardundeespwusbgui.h"
             namespace Ui {
                 class StarDundeeUI;
             }
                 void brickModeChanged(bool);
                 void startSendingTimecode(bool);
             public slots:
+                void showDriverStatus();
                 void lock(bool lock);
                 void updateAvailableBrickCount(int count);
                 void selectBrick(int brickIndex);
                 unsigned int nbPacketsReceivedFromSpw;
                 unsigned int nbPacketsTransmittedToSpw;
                 unsigned int nbCCSDSPacketsTransmittedToSpw;
+                FakeStardundeeSpwUsbGui driverStatus;
             };
             #endif // STARDUNDEEGUI_H

spwplugin/spwRessources.qrc +1 -1

             <RCC>
                 <qresource prefix="/imgs">
-                    <file>StarDundee/stardundee.tif</file>
+                    <file alias="stardundee.tif">StarDundee/stardundee.tif</file>
                 </qresource>
             </RCC>

spwplugin/spwplugin.cpp +3 0

                     if(this->bridge!=NULL)
                     {
                         this->mainLayout->removeWidget(this->bridge->getGUI());
+                        this->bridge->getGUI()->hide();
                         this->disconnect(this,SLOT(setConnected(bool)));
                         delete this->bridge;
                         this->bridge= NULL;
                     if(this->bridge!=NULL)
                     {
                         this->mainLayout->removeWidget(this->bridge->getGUI());
+                        this->bridge->getGUI()->hide();
                         this->disconnect(this,SLOT(setConnected(bool)));
                         delete this->bridge;
                     }
                     if(this->bridge!=NULL)
                     {
                         this->mainLayout->removeWidget(this->bridge->getGUI());
+                        this->bridge->getGUI()->hide();
                         this->disconnect(this,SLOT(setConnected(bool)));
                         delete this->bridge;
                     }

spwplugin/spwplugin.pro +7 -4

             win32:CONFIG += dll
             win32:CONFIG -= static
-            VERSION=0.6.0
+            VERSION=0.6.1
             TARGET = spwplugin
             DEFINES += PLUGIN=spwplugin
             DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
                 GR-ESB/gr_esb_bridge.h \
                 GR-ESB/gr_esb_ui.h \
                 SpwTcpPacketServer/incomingpacketparser.h \
-                StarDundee/fakestardundeespwusb_lib.h
+                StarDundee/fakestardundeespwusb_lib.h \
+                StarDundee/fakestardundeespwusbgui.h
             SOURCES += \
                 GR-ESB/gr_esb_bridge.cpp \
                 GR-ESB/gr_esb_ui.cpp \
                 SpwTcpPacketServer/incomingpacketparser.cpp \
-                StarDundee/fakestardundeespwusb_lib.cpp
+                StarDundee/fakestardundeespwusb_lib.cpp \
+                StarDundee/fakestardundeespwusbgui.cpp
             FORMS += \
                 StarDundee/stardundeeGUI.ui \
                 SpwTcpPacketServer/spwtcppacketserver.ui \
-                GR-ESB/gr_esb_ui.ui
+                GR-ESB/gr_esb_ui.ui \
+                StarDundee/fakestardundeespwusbgui.ui
             RESOURCES += \
                 spwRessources.qrc

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