t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove label for bus number and instead use tabs. The tabs are now

Browse Source 
numbered by the actual system bus number and not always based on 1 any
longer.
This commit is contained in:
Collin Kidder
2019-04-24 22:10:03 -04:00
parent c12031158e
commit 5f97e968e3
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/connectionwindow.cpp
+5 -3
View File
@@ -277,8 +277,8 @@ void ConnectionWindow::populateBusDetails(int offset)
return; return;
} }
int busBase = CANConManager::getInstance()->getBusBase(conn_p); //int busBase = CANConManager::getInstance()->getBusBase(conn_p);
ui->lblBusNum->setText(QString::number(busBase + offset)); //ui->lblBusNum->setText(QString::number(busBase + offset));
ui->ckListenOnly->setChecked(bus.isListenOnly()); ui->ckListenOnly->setChecked(bus.isListenOnly());
ui->ckEnable->setChecked(bus.isActive()); ui->ckEnable->setChecked(bus.isActive());
@@ -328,7 +328,9 @@ void ConnectionWindow::currentRowChanged(const QModelIndex &current, const QMode
int numB = ui->tabBuses->count(); int numB = ui->tabBuses->count();
for (int i = 0; i < numB; i++) ui->tabBuses->removeTab(0); for (int i = 0; i < numB; i++) ui->tabBuses->removeTab(0);
if (numBuses > 1) for (int i = 0; i < numBuses; i++) ui->tabBuses->addTab(QString::number(i+1)); int busBase = CANConManager::getInstance()->getBusBase(conn_p);
/*if (numBuses > 1)*/ for (int i = 0; i < numBuses; i++) ui->tabBuses->addTab(QString::number(busBase + i));
populateBusDetails(0); populateBusDetails(0);
if (ui->ckEnableConsole->isChecked()) if (ui->ckEnableConsole->isChecked())
ui/connectionwindow.ui
+6 -20
View File
@@ -68,58 +68,44 @@
<item> <item>
<layout class="QFormLayout" name="formLayout_2"> <layout class="QFormLayout" name="formLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>CAN Bus Number:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="lblBusNum">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_10"> <widget class="QLabel" name="label_10">
<property name="text"> <property name="text">
<string>Speed:</string> <string>Speed:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="cbBusSpeed"/> <widget class="QComboBox" name="cbBusSpeed"/>
</item> </item>
<item row="2" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_11"> <widget class="QLabel" name="label_11">
<property name="text"> <property name="text">
<string>Listen Only:</string> <string>Listen Only:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="1" column="1">
<widget class="QCheckBox" name="ckListenOnly"> <widget class="QCheckBox" name="ckListenOnly">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_14"> <widget class="QLabel" name="label_14">
<property name="text"> <property name="text">
<string>Enable Bus:</string> <string>Enable Bus:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="2" column="1">
<widget class="QCheckBox" name="ckEnable"> <widget class="QCheckBox" name="ckEnable">
<property name="text"> <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<widget class="QPushButton" name="btnSaveBus"> <widget class="QPushButton" name="btnSaveBus">
<property name="text"> <property name="text">
<string>Save Bus Settings</string> <string>Save Bus Settings</string>