projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Device: Fix bug introduced by b48daed which broke analog channels
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index b46da06fdfc28ce55645323750b94e5a95dc7a69..a8f793ac1dc3e8f4b73ee9b9f86ead60c19343c6 100644
(file)
--- a/
pv/dialogs/connect.hpp
+++ b/
pv/dialogs/connect.hpp
@@
-18,8
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#ifndef PULSEVIEW_PV_CONNECT_H
-#define PULSEVIEW_PV_CONNECT_H
+#ifndef PULSEVIEW_PV_CONNECT_H
PP
+#define PULSEVIEW_PV_CONNECT_H
PP
#include <memory>
#include <memory>
@@
-33,12
+33,17
@@
#include <QVBoxLayout>
namespace sigrok {
#include <QVBoxLayout>
namespace sigrok {
- class Driver;
- class HardwareDevice;
+class Driver;
+}
+
+namespace pv {
+namespace devices {
+class HardwareDevice;
+}
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
}
Q_DECLARE_METATYPE(std::shared_ptr<sigrok::Driver>);
-Q_DECLARE_METATYPE(std::shared_ptr<
sigrok
::HardwareDevice>);
+Q_DECLARE_METATYPE(std::shared_ptr<
pv::devices
::HardwareDevice>);
namespace pv {
namespace pv {
@@
-53,14
+58,16
@@
class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- std::shared_ptr<
sigrok
::HardwareDevice> get_selected_device() const;
+ std::shared_ptr<
devices
::HardwareDevice> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
+ void populate_serials(std::shared_ptr<sigrok::Driver> driver);
+
void unset_connection();
void unset_connection();
- void set_serial_connection();
+ void set_serial_connection(
std::shared_ptr<sigrok::Driver> driver
);
private Q_SLOTS:
void device_selected(int index);
private Q_SLOTS:
void device_selected(int index);
@@
-77,7
+84,7
@@
private:
QComboBox drivers_;
QComboBox drivers_;
- Q
LineEdit serial_device
_;
+ Q
ComboBox serial_devices
_;
QPushButton scan_button_;
QListWidget device_list_;
QPushButton scan_button_;
QListWidget device_list_;
@@
-88,4
+95,4
@@
private:
} // namespace dialogs
} // namespace pv
} // namespace dialogs
} // namespace pv
-#endif // PULSEVIEW_PV_CONNECT_H
+#endif // PULSEVIEW_PV_CONNECT_H
PP