X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;ds=sidebyside;f=pv%2Fdialogs%2Fconnect.hpp;h=f34268ddb6fde5a383cd56e42dd165da04b497e7;hb=97378470ded88af84edaa0f1063d10d834475665;hp=a8f793ac1dc3e8f4b73ee9b9f86ead60c19343c6;hpb=da30ecb7e72bd2547e524258efa5ec642988b70b;p=pulseview.git
diff --git a/pv/dialogs/connect.hpp b/pv/dialogs/connect.hpp
index a8f793a..f34268d 100644
--- a/pv/dialogs/connect.hpp
+++ b/pv/dialogs/connect.hpp
@@ -14,8 +14,7 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
@@ -23,15 +22,20 @@
#include
+#include
#include
#include
#include
#include
+#include
#include
#include
#include
+#include
#include
+using std::shared_ptr;
+
namespace sigrok {
class Driver;
}
@@ -42,8 +46,8 @@ class HardwareDevice;
}
}
-Q_DECLARE_METATYPE(std::shared_ptr);
-Q_DECLARE_METATYPE(std::shared_ptr);
+Q_DECLARE_METATYPE(shared_ptr);
+Q_DECLARE_METATYPE(shared_ptr);
namespace pv {
@@ -58,19 +62,20 @@ class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- std::shared_ptr get_selected_device() const;
+ shared_ptr get_selected_device() const;
private:
void populate_drivers();
- void populate_serials(std::shared_ptr driver);
+ void populate_serials(shared_ptr driver);
void unset_connection();
- void set_serial_connection(std::shared_ptr driver);
-
private Q_SLOTS:
- void device_selected(int index);
+ void driver_selected(int index);
+
+ void serial_toggled(bool checked);
+ void tcp_toggled(bool checked);
void scan_pressed();
@@ -84,7 +89,13 @@ private:
QComboBox drivers_;
- QComboBox serial_devices_;
+ QWidget *serial_config_;
+ QComboBox serial_devices_, serial_baudrate_;
+
+ QWidget *tcp_config_;
+ QLineEdit *tcp_host_;
+ QSpinBox *tcp_port_;
+ QComboBox *tcp_protocol_;
QPushButton scan_button_;
QListWidget device_list_;