implement interfaceDetails label

HubertD · May 17, 2016 · 6ad02a9 · 6ad02a9
1 parent cffbd0c
commit 6ad02a9
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 8 deletions.
diff --git a/src/driver/CanInterface.cpp b/src/driver/CanInterface.cpp
@@ -35,6 +35,11 @@ CanDriver* CanInterface::getDriver() {
     return _driver;
 }
 
+QString CanInterface::getDetailsStr() const
+{
+    return "";
+}
+
 uint32_t CanInterface::getCapabilities()
 {
     return 0;
@@ -80,7 +85,7 @@ QString CanInterface::getStateText()
     }
 }
 
-CanInterfaceId CanInterface::getId()
+CanInterfaceId CanInterface::getId() const
 {
     return _id;
 }

diff --git a/src/driver/CanInterface.h b/src/driver/CanInterface.h
@@ -54,6 +54,7 @@ class CanInterface {
 	virtual ~CanInterface();
     virtual CanDriver *getDriver();
     virtual QString getName() const = 0;
+    virtual QString getDetailsStr() const;
 
     virtual void applyConfig(const MeasurementInterface &mi) = 0;
 
@@ -79,7 +80,7 @@ class CanInterface {
 
     QString getStateText();
 
-    CanInterfaceId getId();
+    CanInterfaceId getId() const;
     void setId(CanInterfaceId id);
 
 private:

diff --git a/src/driver/CandleApiDriver/CandleApiInterface.cpp b/src/driver/CandleApiDriver/CandleApiInterface.cpp
@@ -122,7 +122,12 @@ CandleApiInterface::~CandleApiInterface()
 
 QString CandleApiInterface::getName() const
 {
-    return "candle";
+    return "candle" + QString::number(getId() & 0xFF);
+}
+
+QString CandleApiInterface::getDetailsStr() const
+{
+    return QString::fromStdWString(getPath());
 }
 
 void CandleApiInterface::applyConfig(const MeasurementInterface &mi)
@@ -386,7 +391,7 @@ int CandleApiInterface::getNumTxDropped()
     return 0;
 }
 
-wstring CandleApiInterface::getPath()
+wstring CandleApiInterface::getPath() const
 {
     return wstring(candle_dev_get_path(_handle));
 }

diff --git a/src/driver/CandleApiDriver/CandleApiInterface.h b/src/driver/CandleApiDriver/CandleApiInterface.h
@@ -17,7 +17,10 @@ class CandleApiInterface : public CanInterface
 public:
     CandleApiInterface(CandleApiDriver *driver, candle_handle handle);
     virtual ~CandleApiInterface();
+
     virtual QString getName() const;
+    virtual QString getDetailsStr() const;
+
     virtual void applyConfig(const MeasurementInterface &mi);
 
     virtual int getBitrate();
@@ -40,7 +43,7 @@ class CandleApiInterface : public CanInterface
     virtual int getNumRxOverruns();
     virtual int getNumTxDropped();
 
-    wstring getPath();
+    wstring getPath() const;
 
     void update(candle_handle dev);
 

diff --git a/src/driver/GenericCanSetupPage.cpp b/src/driver/GenericCanSetupPage.cpp
@@ -47,6 +47,7 @@ void GenericCanSetupPage::onShowInterfacePage(SetupDialog &dlg, MeasurementInter
 
     ui->laDriver->setText(intf->getDriver()->getName());
     ui->laInterface->setText(intf->getName());
+    ui->laInterfaceDetails->setText(intf->getDetailsStr());
 
     fillBitratesList(intf, _mi->bitrate());
     fillSamplePointsForBitrate(intf, _mi->bitrate(), _mi->samplePoint());

diff --git a/src/driver/GenericCanSetupPage.ui b/src/driver/GenericCanSetupPage.ui
@@ -31,7 +31,7 @@
     <rect>
      <x>120</x>
      <y>9</y>
-     <width>47</width>
+     <width>490</width>
      <height>16</height>
     </rect>
    </property>
@@ -57,7 +57,7 @@
     <rect>
      <x>120</x>
      <y>28</y>
-     <width>47</width>
+     <width>490</width>
      <height>16</height>
     </rect>
    </property>
@@ -83,7 +83,7 @@
     <rect>
      <x>120</x>
      <y>47</y>
-     <width>47</width>
+     <width>490</width>
      <height>16</height>
     </rect>
    </property>