projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Minor consistency fixes.
[pulseview.git]
/
pv
/
dialogs
/
connect.hpp
diff --git
a/pv/dialogs/connect.hpp
b/pv/dialogs/connect.hpp
index 0cb50fbff060edd6bcb6c4c5e554a19ca18fb0fd..d9cf0a53cfc689b3142b64ae4d078b2a3b0ed7fc 100644
(file)
--- 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
* 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 <http://www.gnu.org/licenses/>.
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
*/
#ifndef PULSEVIEW_PV_CONNECT_HPP
@@
-23,17
+22,20
@@
#include <memory>
#include <memory>
+#include <QCheckBox>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QHBoxLayout>
#include <QLineEdit>
#include <QComboBox>
#include <QDialog>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QHBoxLayout>
#include <QLineEdit>
-#include <QSpinBox>
#include <QListWidget>
#include <QPushButton>
#include <QListWidget>
#include <QPushButton>
+#include <QSpinBox>
#include <QVBoxLayout>
#include <QVBoxLayout>
+using std::shared_ptr;
+
namespace sigrok {
class Driver;
}
namespace sigrok {
class Driver;
}
@@
-44,8
+46,8
@@
class HardwareDevice;
}
}
}
}
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<sigrok::Driver>);
-Q_DECLARE_METATYPE(s
td::s
hared_ptr<pv::devices::HardwareDevice>);
+Q_DECLARE_METATYPE(shared_ptr<sigrok::Driver>);
+Q_DECLARE_METATYPE(shared_ptr<pv::devices::HardwareDevice>);
namespace pv {
namespace pv {
@@
-60,20
+62,20
@@
class Connect : public QDialog
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
public:
Connect(QWidget *parent, pv::DeviceManager &device_manager);
- s
td::s
hared_ptr<devices::HardwareDevice> get_selected_device() const;
+ shared_ptr<devices::HardwareDevice> get_selected_device() const;
private:
void populate_drivers();
private:
void populate_drivers();
- void populate_serials(s
td::s
hared_ptr<sigrok::Driver> driver);
+ void populate_serials(shared_ptr<sigrok::Driver> driver);
void unset_connection();
void unset_connection();
- void set_serial_connection(std::shared_ptr<sigrok::Driver> driver);
- void set_tcp_connection(std::shared_ptr<sigrok::Driver> driver);
-
private Q_SLOTS:
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();
void scan_pressed();
@@
-89,10
+91,10
@@
private:
QComboBox serial_devices_;
QComboBox serial_devices_;
- QWidget
tcp_endpoint
_;
- Q
HBoxLayout tcp_endpoint_layou
t_;
- Q
LineEdit tcp_hos
t_;
- Q
SpinBox tcp_port
_;
+ QWidget
*tcp_config
_;
+ Q
LineEdit *tcp_hos
t_;
+ Q
SpinBox *tcp_por
t_;
+ Q
CheckBox *tcp_use_vxi
_;
QPushButton scan_button_;
QListWidget device_list_;
QPushButton scan_button_;
QListWidget device_list_;