projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #805 by resetting selected device on failure
[pulseview.git]
/
pv
/
toolbars
/
mainbar.hpp
diff --git
a/pv/toolbars/mainbar.hpp
b/pv/toolbars/mainbar.hpp
index 64c8a6c7e146aa1cba8564e30d2bf3a9fe0dbc3b..9c4b1cd4b0e4a9f9484d00736109b75a8f8cf8ee 100644
(file)
--- a/
pv/toolbars/mainbar.hpp
+++ b/
pv/toolbars/mainbar.hpp
@@
-38,7
+38,8
@@
#include <pv/widgets/sweeptimingwidget.hpp>
namespace sigrok {
#include <pv/widgets/sweeptimingwidget.hpp>
namespace sigrok {
- class Device;
+class Device;
+class InputFormat;
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Device>)
@@
-68,6
+69,8
@@
public:
void set_capture_state(pv::Session::capture_state state);
void set_capture_state(pv::Session::capture_state state);
+ void reset_device_selector();
+
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
private:
void update_sample_rate_selector();
void update_sample_rate_selector_value();
@@
-97,6
+100,7
@@
private:
QAction *configure_button_action_;
pv::widgets::PopupToolButton channels_button_;
QAction *configure_button_action_;
pv::widgets::PopupToolButton channels_button_;
+ QAction *channels_button_action_;
pv::widgets::SweepTimingWidget sample_count_;
pv::widgets::SweepTimingWidget sample_rate_;
pv::widgets::SweepTimingWidget sample_count_;
pv::widgets::SweepTimingWidget sample_rate_;
@@
-109,6
+113,7
@@
private:
QIcon icon_green_;
QIcon icon_grey_;
QToolButton run_stop_button_;
QIcon icon_green_;
QIcon icon_grey_;
QToolButton run_stop_button_;
+ QAction *run_stop_button_action_;
QToolButton menu_button_;
};
QToolButton menu_button_;
};