# HG changeset patch
# User Alexis Jeandet <alexis.jeandet@member.fsf.org>
# Date 2015-07-27 22:02:24
# Node ID 67168ff4b6e78a9cfcc652938253a073d1a13efc
# Parent  c92c4a05386ad7c8a9e230d2f64ed59bf0048313

SpwPlugin:
        -Fixed bug, when switching from one bridge to an other, the previous gui
        didn't disapear.
        -Some work on stardundee runtime driver loading, added some GUI helpers.

diff --git a/spwplugin/StarDundee/fakestardundeespwusb_lib.cpp b/spwplugin/StarDundee/fakestardundeespwusb_lib.cpp
--- a/spwplugin/StarDundee/fakestardundeespwusb_lib.cpp
+++ b/spwplugin/StarDundee/fakestardundeespwusb_lib.cpp
@@ -88,11 +88,7 @@ int   (*resolved_CFGSpaceWire_GetTickEna
 int   (*resolved_CFGSpaceWire_SetTickEnableStatus)(star_device_handle hDevice, U32 dwTickEnableStatus)=NULL;
 
 
-typedef struct funcToresolve
-{
-    void (** function)();
-    const char* symbolName;
-}funcToresolve;
+
 
 QList<funcToresolve> funcTable=QList<funcToresolve>()
 <<funcToresolve{(void (**)())&resolved_USBSpaceWire_Open,"USBSpaceWire_Open"}
@@ -193,6 +189,22 @@ void FakeStarDundeeSpwUSB_Lib::resolve()
     }
 }
 
+bool FakeStarDundeeSpwUSB_Lib::fullresolved()
+{
+    bool success=true;
+    for(int i=0;i<funcTable.count();i++)
+    {
+        if(*(funcTable[i].function)==NULL)
+            success=false;
+    }
+    return success;
+}
+
+const QList<funcToresolve> &FakeStarDundeeSpwUSB_Lib::status()
+{
+    return funcTable;
+}
+
 
 
 char USBSpaceWire_Open(star_device_handle *phDevice, int nDeviceNum)
diff --git a/spwplugin/StarDundee/fakestardundeespwusb_lib.h b/spwplugin/StarDundee/fakestardundeespwusb_lib.h
--- a/spwplugin/StarDundee/fakestardundeespwusb_lib.h
+++ b/spwplugin/StarDundee/fakestardundeespwusb_lib.h
@@ -359,7 +359,11 @@ void  CFGSpaceWire_RTGetOutputPorts(U32 
 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
@@ -367,6 +371,8 @@ class FakeStarDundeeSpwUSB_Lib
 public:
     FakeStarDundeeSpwUSB_Lib();
     static void resolve();
+    static bool fullresolved();
+    static const QList<funcToresolve>& status();
 };
 
 #endif // FAKESTARDUNDEESPWUSB_LIB_H
diff --git a/spwplugin/StarDundee/fakestardundeespwusbgui.cpp b/spwplugin/StarDundee/fakestardundeespwusbgui.cpp
new file mode 100644
--- /dev/null
+++ b/spwplugin/StarDundee/fakestardundeespwusbgui.cpp
@@ -0,0 +1,57 @@
+#include "fakestardundeespwusbgui.h"
+#include "ui_fakestardundeespwusbgui.h"
+#include "fakestardundeespwusb_lib.h"
+
+FakeStardundeeSpwUsbGui::FakeStardundeeSpwUsbGui(QWidget *parent) :
+    QWidget(parent),
+    ui(new Ui::FakeStardundeeSpwUsbGui)
+{
+    ui->setupUi(this);
+}
+
+FakeStardundeeSpwUsbGui::~FakeStardundeeSpwUsbGui()
+{
+    delete ui;
+}
+
+void FakeStardundeeSpwUsbGui::update()
+{
+    const QList<funcToresolve> stat=FakeStarDundeeSpwUSB_Lib::status();
+    QTableWidgetItem* item;
+    this->ui->symbolsList->clear();
+    this->ui->symbolsList->setHorizontalHeaderLabels(QStringList()<<"Symbol"<<"Status");
+    this->ui->symbolsList->setRowCount(stat.count());
+    for(int i=0;i<stat.count();i++)
+    {
+        item=new QTableWidgetItem(stat[i].symbolName);
+        item->setFlags(item->flags()^Qt::ItemIsEditable);
+        this->ui->symbolsList->setItem(i,0,item);
+        if(*(stat[i].function)==NULL)
+        {
+            item=new QTableWidgetItem("Not found");
+            item->setForeground(Qt::red);
+            item->setFlags(item->flags()^Qt::ItemIsEditable);
+            this->ui->symbolsList->setItem(i,1,item);
+        }
+        else
+        {
+            item=new QTableWidgetItem("Loaded");
+            item->setForeground(Qt::green);
+            item->setFlags(item->flags()^Qt::ItemIsEditable);
+            this->ui->symbolsList->setItem(i,1,item);
+        }
+    }
+    this->ui->symbolsList->resizeColumnsToContents();
+}
+
+void FakeStardundeeSpwUsbGui::changeEvent(QEvent *e)
+{
+    QWidget::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
diff --git a/spwplugin/StarDundee/fakestardundeespwusbgui.h b/spwplugin/StarDundee/fakestardundeespwusbgui.h
new file mode 100644
--- /dev/null
+++ b/spwplugin/StarDundee/fakestardundeespwusbgui.h
@@ -0,0 +1,25 @@
+#ifndef FAKESTARDUNDEESPWUSBGUI_H
+#define FAKESTARDUNDEESPWUSBGUI_H
+
+#include <QWidget>
+
+namespace Ui {
+class FakeStardundeeSpwUsbGui;
+}
+
+class FakeStardundeeSpwUsbGui : public QWidget
+{
+    Q_OBJECT
+
+public:
+    explicit FakeStardundeeSpwUsbGui(QWidget *parent = 0);
+    ~FakeStardundeeSpwUsbGui();
+    void update();
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::FakeStardundeeSpwUsbGui *ui;
+};
+
+#endif // FAKESTARDUNDEESPWUSBGUI_H
diff --git a/spwplugin/StarDundee/fakestardundeespwusbgui.ui b/spwplugin/StarDundee/fakestardundeespwusbgui.ui
new file mode 100644
--- /dev/null
+++ b/spwplugin/StarDundee/fakestardundeespwusbgui.ui
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FakeStardundeeSpwUsbGui</class>
+ <widget class="QWidget" name="FakeStardundeeSpwUsbGui">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>612</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="1">
+    <widget class="QPushButton" name="closeQpb">
+     <property name="text">
+      <string>close</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QTableWidget" name="symbolsList">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="sortingEnabled">
+      <bool>true</bool>
+     </property>
+     <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
+      <bool>true</bool>
+     </attribute>
+     <attribute name="verticalHeaderShowSortIndicator" stdset="0">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>Symbol</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Status</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>closeQpb</sender>
+   <signal>clicked()</signal>
+   <receiver>FakeStardundeeSpwUsbGui</receiver>
+   <slot>close()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>560</x>
+     <y>275</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>305</x>
+     <y>149</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/spwplugin/StarDundee/stardundeeGUI.ui b/spwplugin/StarDundee/stardundeeGUI.ui
--- a/spwplugin/StarDundee/stardundeeGUI.ui
+++ b/spwplugin/StarDundee/stardundeeGUI.ui
@@ -6,22 +6,22 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>397</width>
-    <height>506</height>
+    <width>609</width>
+    <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>
@@ -36,14 +36,14 @@
      </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>
@@ -60,14 +60,14 @@
      </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>
@@ -79,14 +79,14 @@
      </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>
@@ -102,14 +102,14 @@
      </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>
@@ -125,14 +125,14 @@
      </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>
@@ -148,7 +148,7 @@
      </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>
@@ -167,38 +167,38 @@
      </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">
@@ -277,27 +277,61 @@
      </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/>
diff --git a/spwplugin/StarDundee/stardundeegui.cpp b/spwplugin/StarDundee/stardundeegui.cpp
--- a/spwplugin/StarDundee/stardundeegui.cpp
+++ b/spwplugin/StarDundee/stardundeegui.cpp
@@ -23,8 +23,6 @@
 
 #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)
@@ -45,6 +43,11 @@ StarDundeeGUI::StarDundeeGUI(QWidget *pa
     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()
@@ -97,6 +100,12 @@ bool StarDundeeGUI::isBrickSetAsAnInterf
     return ui->setInterfaceModeQrb->isChecked();
 }
 
+void StarDundeeGUI::showDriverStatus()
+{
+    this->driverStatus.update();
+    this->driverStatus.show();
+}
+
 void StarDundeeGUI::setBrickAsAnInterface( bool interfaceMode )
 {
     if (interfaceMode == true)
diff --git a/spwplugin/StarDundee/stardundeegui.h b/spwplugin/StarDundee/stardundeegui.h
--- a/spwplugin/StarDundee/stardundeegui.h
+++ b/spwplugin/StarDundee/stardundeegui.h
@@ -24,6 +24,8 @@
 
 #include <QWidget>
 
+#include "fakestardundeespwusbgui.h"
+
 namespace Ui {
     class StarDundeeUI;
 }
@@ -57,6 +59,7 @@ signals:
     void brickModeChanged(bool);
     void startSendingTimecode(bool);
 public slots:
+    void showDriverStatus();
     void lock(bool lock);
     void updateAvailableBrickCount(int count);
     void selectBrick(int brickIndex);
@@ -85,6 +88,7 @@ private:
     unsigned int nbPacketsReceivedFromSpw;
     unsigned int nbPacketsTransmittedToSpw;
     unsigned int nbCCSDSPacketsTransmittedToSpw;
+    FakeStardundeeSpwUsbGui driverStatus;
 };
 
 #endif // STARDUNDEEGUI_H
diff --git a/spwplugin/spwRessources.qrc b/spwplugin/spwRessources.qrc
--- a/spwplugin/spwRessources.qrc
+++ b/spwplugin/spwRessources.qrc
@@ -1,5 +1,5 @@
 <RCC>
     <qresource prefix="/imgs">
-        <file>StarDundee/stardundee.tif</file>
+        <file alias="stardundee.tif">StarDundee/stardundee.tif</file>
     </qresource>
 </RCC>
diff --git a/spwplugin/spwplugin.cpp b/spwplugin/spwplugin.cpp
--- a/spwplugin/spwplugin.cpp
+++ b/spwplugin/spwplugin.cpp
@@ -80,6 +80,7 @@ void spwplugin::bridgeSelectionChanged(c
         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;
@@ -90,6 +91,7 @@ void spwplugin::bridgeSelectionChanged(c
         if(this->bridge!=NULL)
         {
             this->mainLayout->removeWidget(this->bridge->getGUI());
+            this->bridge->getGUI()->hide();
             this->disconnect(this,SLOT(setConnected(bool)));
             delete this->bridge;
         }
@@ -130,6 +132,7 @@ void spwplugin::bridgeSelectionChanged(c
         if(this->bridge!=NULL)
         {
             this->mainLayout->removeWidget(this->bridge->getGUI());
+            this->bridge->getGUI()->hide();
             this->disconnect(this,SLOT(setConnected(bool)));
             delete this->bridge;
         }
diff --git a/spwplugin/spwplugin.pro b/spwplugin/spwplugin.pro
--- a/spwplugin/spwplugin.pro
+++ b/spwplugin/spwplugin.pro
@@ -12,7 +12,7 @@ QMAKE_CFLAGS +=  -std=c++11
 
 win32:CONFIG += dll
 win32:CONFIG -= static
-VERSION=0.6.0
+VERSION=0.6.1
 TARGET = spwplugin
 DEFINES += PLUGIN=spwplugin
 DEFINES += PLUGINHEADER="\"\\\"spwplugin.h"\\\"\"
@@ -46,7 +46,8 @@ HEADERS += \
     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 += \
@@ -58,12 +59,14 @@ 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