Skip to content

Commit 32e5796

Browse files
committed
Redesign the synchronization in ControllerSession. Fix crash in SerialPABotBase_Connection.
1 parent 91efc19 commit 32e5796

File tree

5 files changed

+180
-148
lines changed

5 files changed

+180
-148
lines changed

SerialPrograms/Source/Controllers/ControllerSelectorWidget.cpp

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,8 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
5959
interface_dropdown->setCurrentIndex((int)current->interface_type - 1);
6060
m_selector = current->make_selector_QtWidget(*this);
6161
m_dropdowns->insertWidget(1, m_selector);
62-
// refresh_selection();
6362

6463

65-
#if 0
66-
m_devices_dropdown = new NoWheelComboBox(this);
67-
dropdowns->addWidget(m_devices_dropdown);
68-
refresh_devices();
69-
#endif
70-
7164
m_dropdowns->addSpacing(5);
7265
m_controllers_dropdown = new NoWheelComboBox(this);
7366
m_dropdowns->addWidget(m_controllers_dropdown);
@@ -88,7 +81,6 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
8881
if (m_selector){
8982
m_selector->setEnabled(!options_locked);
9083
}
91-
// m_devices_dropdown->setEnabled(!options_locked);
9284
m_reset_button->setEnabled(!options_locked);
9385

9486
connect(
@@ -108,24 +100,6 @@ ControllerSelectorWidget::ControllerSelectorWidget(QWidget& parent, ControllerSe
108100
refresh_selection(incoming);
109101
}
110102
);
111-
#if 0
112-
connect(
113-
m_devices_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),
114-
this, [this](int index){
115-
index = std::max(index, 0);
116-
index = std::min(index, (int)m_device_list.size() - 1);
117-
const std::shared_ptr<const ControllerDescriptor>& selected = m_device_list[index];
118-
119-
std::shared_ptr<const ControllerDescriptor> current = m_session.descriptor();
120-
if (*current == *selected){
121-
return;
122-
}
123-
124-
m_session.set_device(selected);
125-
refresh_devices();
126-
}
127-
);
128-
#endif
129103
if (PreloadSettings::instance().DEVELOPER_MODE){
130104
connect(
131105
m_controllers_dropdown, static_cast<void(QComboBox::*)(int)>(&QComboBox::activated),

SerialPrograms/Source/Controllers/ControllerSelectorWidget.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ class ControllerSelectorWidget : public QWidget, private ControllerSession::List
5252
QHBoxLayout* m_dropdowns;
5353
QWidget* m_selector = nullptr;
5454
QComboBox* interface_dropdown = nullptr;
55-
// QComboBox* m_devices_dropdown = nullptr;
5655
QComboBox* m_controllers_dropdown = nullptr;
5756
QLabel* m_status_text = nullptr;
5857
QPushButton* m_reset_button = nullptr;

0 commit comments

Comments
 (0)