Auto status change to "Under Review"
@@ -3,19 +3,19 | |||
|
3 | 3 | |
|
4 | 4 | #include "Visualization/IVisualizationWidget.h" |
|
5 | 5 | |
|
6 | class VisualizationGraphWidget; | |
|
7 | ||
|
8 | 6 | #include <QWidget> |
|
9 | 7 | |
|
10 | 8 | namespace Ui { |
|
11 | 9 | class VisualizationZoneWidget; |
|
12 | 10 | } // Ui |
|
13 | 11 | |
|
12 | class VisualizationGraphWidget; | |
|
13 | ||
|
14 | 14 | class VisualizationZoneWidget : public QWidget, public IVisualizationWidget { |
|
15 | 15 | Q_OBJECT |
|
16 | 16 | |
|
17 | 17 | public: |
|
18 | explicit VisualizationZoneWidget(QWidget *parent = 0); | |
|
18 | explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0); | |
|
19 | 19 | virtual ~VisualizationZoneWidget(); |
|
20 | 20 | |
|
21 | 21 | /// Add a graph widget |
@@ -3,10 +3,12 | |||
|
3 | 3 | |
|
4 | 4 | #include "Visualization/VisualizationGraphWidget.h" |
|
5 | 5 | |
|
6 | VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent) | |
|
6 | VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent) | |
|
7 | 7 | : QWidget{parent}, ui{new Ui::VisualizationZoneWidget} |
|
8 | 8 | { |
|
9 | 9 | ui->setupUi(this); |
|
10 | ||
|
11 | ui->zoneNameLabel->setText(name); | |
|
10 | 12 | } |
|
11 | 13 | |
|
12 | 14 | VisualizationZoneWidget::~VisualizationZoneWidget() |
@@ -44,5 +46,5 void VisualizationZoneWidget::close() | |||
|
44 | 46 | |
|
45 | 47 | QString VisualizationZoneWidget::name() const |
|
46 | 48 | { |
|
47 | return QStringLiteral("MainView"); | |
|
49 | return ui->zoneNameLabel->text(); | |
|
48 | 50 | } |
@@ -14,9 +14,15 | |||
|
14 | 14 | <string>Form</string> |
|
15 | 15 | </property> |
|
16 | 16 | <layout class="QVBoxLayout" name="verticalLayout_2"> |
|
17 | <property name="spacing"> | |
|
18 | <number>3</number> | |
|
17 | <item> | |
|
18 | <widget class="QWidget" name="infobar" native="true"> | |
|
19 | <property name="sizePolicy"> | |
|
20 | <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> | |
|
21 | <horstretch>0</horstretch> | |
|
22 | <verstretch>0</verstretch> | |
|
23 | </sizepolicy> | |
|
19 | 24 | </property> |
|
25 | <layout class="QHBoxLayout" name="horizontalLayout"> | |
|
20 | 26 | <property name="leftMargin"> |
|
21 | 27 | <number>0</number> |
|
22 | 28 | </property> |
@@ -30,7 +36,27 | |||
|
30 | 36 | <number>0</number> |
|
31 | 37 | </property> |
|
32 | 38 | <item> |
|
39 | <widget class="QLabel" name="zoneNameLabel"> | |
|
40 | <property name="styleSheet"> | |
|
41 | <string notr="true">color: rgb(127, 127, 127); | |
|
42 | </string> | |
|
43 | </property> | |
|
44 | <property name="text"> | |
|
45 | <string>TextLabel</string> | |
|
46 | </property> | |
|
47 | </widget> | |
|
48 | </item> | |
|
49 | </layout> | |
|
50 | </widget> | |
|
51 | </item> | |
|
52 | <item> | |
|
33 | 53 | <widget class="QFrame" name="visualizationZoneFrame"> |
|
54 | <property name="sizePolicy"> | |
|
55 | <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> | |
|
56 | <horstretch>0</horstretch> | |
|
57 | <verstretch>0</verstretch> | |
|
58 | </sizepolicy> | |
|
59 | </property> | |
|
34 | 60 | <property name="frameShape"> |
|
35 | 61 | <enum>QFrame::Box</enum> |
|
36 | 62 | </property> |
General Comments 4
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * M gui/include/Visualization/VisualizationGraphWidget.h * M gui/src/Visualization/VisualizationGraphWidget.cpp
Status change > Approved
You need to be logged in to leave comments.
Login now