diff --git a/client/ostinato.pro b/client/ostinato.pro index 7a97cba..0005b77 100644 --- a/client/ostinato.pro +++ b/client/ostinato.pro @@ -81,6 +81,7 @@ FORMS += \ preferences.ui \ streamconfigdialog.ui \ streamstatswindow.ui \ + streamswidget.ui \ variablefieldswidget.ui SOURCES += \ diff --git a/client/portswindow.cpp b/client/portswindow.cpp index 849cf0d..b5ca9ea 100644 --- a/client/portswindow.cpp +++ b/client/portswindow.cpp @@ -54,7 +54,8 @@ PortsWindow::PortsWindow(PortGroupList *pgl, QWidget *parent) //plm = new PortGroupList(); plm = pgl; - setupUi(this); + Ui::PortsWindow::setupUi(this); + Ui::StreamsWidget::setupUi(streamsWidget); applyMsg_ = new ApplyMessage(); devicesWidget->setPortGroupList(plm); diff --git a/client/portswindow.h b/client/portswindow.h index 3d20a18..92aa85c 100644 --- a/client/portswindow.h +++ b/client/portswindow.h @@ -23,6 +23,7 @@ along with this program. If not, see #include #include #include "ui_portswindow.h" +#include "ui_streamswidget.h" #include "portgrouplist.h" class ApplyMessage; @@ -34,7 +35,7 @@ namespace OstProto { class SessionContent; } -class PortsWindow : public QWidget, private Ui::PortsWindow +class PortsWindow : public QWidget, private Ui::PortsWindow, private Ui::StreamsWidget { Q_OBJECT diff --git a/client/portswindow.ui b/client/portswindow.ui index 4510502..e0611d0 100644 --- a/client/portswindow.ui +++ b/client/portswindow.ui @@ -213,114 +213,7 @@ - - - - - Start Transmit - - - Start transmit on selected port - - - - - - - :/icons/control_play.png:/icons/control_play.png - - - - - - - Stop Transmit - - - Stop transmit on selected port - - - - - - - :/icons/control_stop.png:/icons/control_stop.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Avg pps - - - true - - - - - - - - - - Avg bps - - - - - - - false - - - - - - - - - - 0 - 1 - - - - Qt::ActionsContextMenu - - - This is the stream list for the selected port - -A stream is a sequence of one or more packets - -Right-click to create a stream - - - QFrame::StyledPanel - - - 1 - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectRows - - + @@ -378,33 +271,6 @@ Right-click to create a stream Disconnect Port Group - - - - :/icons/stream_add.png:/icons/stream_add.png - - - New Stream - - - - - - :/icons/stream_delete.png:/icons/stream_delete.png - - - Delete Stream - - - - - - :/icons/stream_edit.png:/icons/stream_edit.png - - - Edit Stream - - true @@ -413,30 +279,11 @@ Right-click to create a stream Exclusive Port Control (EXPERIMENTAL) - - - Open Streams ... - - - - - Save Streams ... - - Port Configuration ... - - - - :/icons/stream_duplicate.png:/icons/stream_duplicate.png - - - Duplicate Stream - - @@ -450,47 +297,9 @@ Right-click to create a stream QTreeView
xtreeview.h
 - - XTableView - QTableView -
xtableview.h
- - - - radioButton - toggled(bool) - averagePacketsPerSec - setEnabled(bool) - - - 326 - 80 - - - 454 - 79 - - - - - radioButton_2 - toggled(bool) - averageBitsPerSec - setEnabled(bool) - - - 523 - 80 - - - 651 - 88 - - - - + diff --git a/client/streamswidget.ui b/client/streamswidget.ui index 4510502..010325a 100644 --- a/client/streamswidget.ui +++ b/client/streamswidget.ui @@ -1,383 +1,130 @@ - PortsWindow - + StreamsWidget + 0 0 - 663 - 352 + 602 + 364 Form - - - - - Qt::Horizontal - - - false - - - - - 1 - 0 - - - - Qt::ActionsContextMenu - - - QAbstractItemView::SingleSelection - - - - - - 2 - 0 - - - - 2 - - - - - - - <p><b>Welcome to Ostinato!</b></p> -<p>The port list on the left contains all the ports on which you can transmit packets.</p> -<p>Ports belong to a port group. Make sure the Port Group has a <img src=":/icons/bullet_green.png"/> next to it, then double click the port group to show or hide the ports in the port group.</p> -<p>To generate packets, you need to create and configure packet streams. A stream is a sequence of one or more packets.</p> -<p>To create a stream, select the port on which you want to send packets.</p> -<hr/> -<p>Don't see the port that you want (or any ports at all) inside the port group? <a href="https://jump.ostinato.org/noports">Get Help!</a></p> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - + + + + + + + Start Transmit + + + Start transmit on selected port + + + + + + + :/icons/control_play.png:/icons/control_play.png + - - - - - - <p>You have selected a port group in the port list on the left.</p> -<p>You can transmit packets on any of the ports within the port group.</p> -<p>Make sure the port group has a <img src=":/icons/bullet_green.png"/> next to it and then double click the port group to show or hide the ports in the port group.</p> -<p>To generate packets, you need to create and configure packet streams. A stream is a sequence of one or more packets.</p> -<p>To create a stream, select the port on which you want to send packets. </p> -<hr/> -<p>Don't see the port that you want (or any ports at all) inside the port group? <a href="https://jump.ostinato.org/noports">Get Help!</a></p> - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - true - - - true - - - - - - - Qt::Vertical - - - - 20 - 177 - - - - - + + + + + Stop Transmit + + + Stop transmit on selected port + + + + + + + :/icons/control_stop.png:/icons/control_stop.png + - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - QFrame::Panel - - - QFrame::Raised - - - - 3 - - - 3 - - - 3 - - - 3 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Apply Hint - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Apply - - - - - - - - - - 0 - - - - Streams - - - - - - - - Start Transmit - - - Start transmit on selected port - - - - - - - :/icons/control_play.png:/icons/control_play.png - - - - - - - Stop Transmit - - - Stop transmit on selected port - - - - - - - :/icons/control_stop.png:/icons/control_stop.png - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Avg pps - - - true - - - - - - - - - - Avg bps - - - - - - - false - - - - - - - - - - 0 - 1 - - - - Qt::ActionsContextMenu - - - This is the stream list for the selected port + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Avg pps + + + true + + + + + + + + + + Avg bps + + + + + + + false + + + + + + + + + + 0 + 1 + + + + Qt::ActionsContextMenu + + + This is the stream list for the selected port A stream is a sequence of one or more packets Right-click to create a stream - - - QFrame::StyledPanel - - - 1 - - - QAbstractItemView::ExtendedSelection - - - QAbstractItemView::SelectRows - - - - - - - - Devices - - - - - - - - - - - - + + + QFrame::StyledPanel + + + 1 + + + QAbstractItemView::ExtendedSelection + + + QAbstractItemView::SelectRows + - - - - :/icons/portgroup_add.png:/icons/portgroup_add.png - - - New Port Group - - - - - - :/icons/portgroup_delete.png:/icons/portgroup_delete.png - - - Delete Port Group - - - - - - :/icons/portgroup_connect.png:/icons/portgroup_connect.png - - - Connect Port Group - - - - - - :/icons/portgroup_disconnect.png:/icons/portgroup_disconnect.png - - - Disconnect Port Group - - @@ -405,14 +152,6 @@ Right-click to create a stream Edit Stream - - - true - - - Exclusive Port Control (EXPERIMENTAL) - - Open Streams ... @@ -423,11 +162,6 @@ Right-click to create a stream Save Streams ... - - - Port Configuration ... - - @@ -439,17 +173,6 @@ Right-click to create a stream - - DevicesWidget - QWidget -
deviceswidget.h
- 1 - - - XTreeView - QTreeView -
xtreeview.h
- XTableView QTableView