Skip to content

Commit 1f11193

Browse files
committed
fix again
1 parent fb6a5f6 commit 1f11193

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,17 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
4949
interface_dropdown = new NoWheelCompactComboBox(this);
5050
m_dropdowns->addWidget(interface_dropdown);
5151

52-
m_interface_list.emplace_back(ControllerInterface::SerialPABotBase);
53-
if (PreloadSettings::instance().DEVELOPER_MODE){
54-
m_interface_list.emplace_back(ControllerInterface::SerialPABotBase2);
52+
53+
// Add all the supported interfaces.
54+
{
55+
m_interface_list.emplace_back(ControllerInterface::SerialPABotBase);
56+
if (PreloadSettings::instance().DEVELOPER_MODE){
57+
m_interface_list.emplace_back(ControllerInterface::SerialPABotBase2);
58+
}
59+
m_interface_list.emplace_back(ControllerInterface::TcpSysbotBase);
60+
// m_interface_list.emplace_back(ControllerInterface::UsbSysbotBase);
5561
}
56-
m_interface_list.emplace_back(ControllerInterface::TcpSysbotBase);
57-
// m_interface_list.emplace_back(ControllerInterface::UsbSysbotBase);
62+
5863

5964
for (ControllerInterface item : m_interface_list){
6065
interface_dropdown->addItem(QString::fromStdString(CONTROLLER_INTERFACE_STRINGS.get_string(item)));
@@ -67,7 +72,7 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
6772
current.reset(new SerialPABotBase::SerialPABotBase_Descriptor());
6873
session.set_device(std::move(current));
6974
}
70-
interface_dropdown->setCurrentIndex((int)current->interface_type - 1);
75+
update_interface_dropdown(current->interface_type);
7176
m_selector = current->make_selector_QtWidget(*this);
7277
m_dropdowns->addWidget(m_selector, 1);
7378

@@ -149,10 +154,7 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
149154

150155

151156

152-
153-
void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_type){
154-
// cout << "refresh_selection(): "<< endl;
155-
157+
void ControllerSelectorWidget::update_interface_dropdown(ControllerInterface interface_type){
156158
if (interface_type == ControllerInterface::None){
157159
interface_type = ControllerInterface::SerialPABotBase;
158160
}
@@ -163,6 +165,11 @@ void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_t
163165
}
164166
}
165167

168+
}
169+
void ControllerSelectorWidget::refresh_selection(ControllerInterface interface_type){
170+
// cout << "refresh_selection(): "<< endl;
171+
update_interface_dropdown(interface_type);
172+
166173
delete m_selector;
167174
m_selector = nullptr;
168175

SerialPrograms/Source/Controllers/ControllerSelectorWidget.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List
4040
virtual void options_locked(bool locked) override;
4141

4242
private:
43+
void update_interface_dropdown(ControllerInterface interface_type);
4344
void refresh_selection(ControllerInterface interface_type);
4445
void refresh_controllers(
4546
ControllerType controller_type,

0 commit comments

Comments
 (0)