HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r204:418c600ae7b7

Merge branch 'feature/WidgetsNames' into develop

Alexandre Leroux -

r204:418c600ae7b7

parent child

Context file:

r204:418c600ae7b7

Collapse all files

gui/include/Visualization/VisualizationGraphWidget.h +1 -1

                 Q_OBJECT
             public:
-                explicit VisualizationGraphWidget(QWidget *parent = 0);
+                explicit VisualizationGraphWidget(const QString name = {}, QWidget *parent = 0);
                 virtual ~VisualizationGraphWidget();
                 void addVariable(std::shared_ptr<Variable> variable);

gui/include/Visualization/VisualizationTabWidget.h +14 -3

             #include "Visualization/IVisualizationWidget.h"
+            #include <Common/spimpl.h>
             #include <QWidget>
+            class Variable;
             class VisualizationZoneWidget;
             namespace Ui {
                 Q_OBJECT
             public:
-                explicit VisualizationTabWidget(QWidget *parent = 0);
+                explicit VisualizationTabWidget(const QString &name = {}, QWidget *parent = 0);
                 virtual ~VisualizationTabWidget();
                 /// Add a zone widget
                 void addZone(VisualizationZoneWidget *zoneWidget);
-                /// Create a zone using a Variable
+                /**
-                VisualizationZoneWidget *createZone();
+                 * Creates a zone using a variable. The variable will be displayed in a new graph of the new
+                 * zone.
+                 * @param variable the variable for which to create the zone
+                 * @return the pointer to the created zone
+                 */
+                VisualizationZoneWidget *createZone(std::shared_ptr<Variable> variable);
                 /// Remove a zone
                 void removeZone(VisualizationZoneWidget *zone);
             private:
                 Ui::VisualizationTabWidget *ui;
+                class VisualizationTabWidgetPrivate;
+                spimpl::unique_impl_ptr<VisualizationTabWidgetPrivate> impl;
             };
             #endif // SCIQLOP_VISUALIZATIONTABWIDGET_H

gui/include/Visualization/VisualizationZoneWidget.h +10 -5

             #include "Visualization/IVisualizationWidget.h"
-            class VisualizationGraphWidget;
             #include <QWidget>
             namespace Ui {
             class VisualizationZoneWidget;
             } // Ui
+            class Variable;
+            class VisualizationGraphWidget;
             class VisualizationZoneWidget : public QWidget, public IVisualizationWidget {
                 Q_OBJECT
             public:
-                explicit VisualizationZoneWidget(QWidget *parent = 0);
+                explicit VisualizationZoneWidget(const QString &name = {}, QWidget *parent = 0);
                 virtual ~VisualizationZoneWidget();
                 /// Add a graph widget
                 void addGraph(VisualizationGraphWidget *graphWidget);
-                /// Create a graph using a Variable
+                /**
-                VisualizationGraphWidget *createGraph();
+                 * Creates a graph using a variable. The variable will be displayed in the new graph.
+                 * @param variable the variable for which to create the graph
+                 * @return the pointer to the created graph
+                 */
+                VisualizationGraphWidget *createGraph(std::shared_ptr<Variable> variable);
                 /// Remove a graph
                 void removeGraph(VisualizationGraphWidget *graph);

gui/src/Visualization/VisualizationGraphWidget.cpp +11 -2

                 std::unordered_map<std::shared_ptr<Variable>, QCPAbstractPlottable *> m_VariableToPlotMap;
             };
-            VisualizationGraphWidget::VisualizationGraphWidget(QWidget *parent)
+            VisualizationGraphWidget::VisualizationGraphWidget(const QString name, QWidget *parent)
                     : QWidget{parent},
                       ui{new Ui::VisualizationGraphWidget},
                       impl{spimpl::make_unique_impl<VisualizationGraphWidgetPrivate>()}
             {
                 ui->setupUi(this);
+                // qcpplot title
+                ui->widget->plotLayout()->insertRow(0);
+                ui->widget->plotLayout()->addElement(0, 0, new QCPTextElement{ui->widget, name});
                 // Set qcpplot properties :
                 // - Drag (on x-axis) and zoom are enabled
                 // - Mouse wheel on qcpplot is intercepted to determine the zoom orientation
             QString VisualizationGraphWidget::name() const
             {
-                return QStringLiteral("MainView");
+                if (auto title = dynamic_cast<QCPTextElement *>(ui->widget->plotLayout()->elementAt(0))) {
+                    return title->text();
+                }
+                else {
+                    return QString{};
+                }
             }
             void VisualizationGraphWidget::onMouseWheel(QWheelEvent *event) noexcept

gui/src/Visualization/VisualizationTabWidget.cpp +33 -5

@@ -3,9 +3,34
3		3
4	#include "Visualization/VisualizationZoneWidget.h"	4	#include "Visualization/VisualizationZoneWidget.h"
5		5
		6	namespace {
6		7
7	VisualizationTabWidget::VisualizationTabWidget(QWidget *parent)	8	/// Generates a default name for a new zone, according to the number of zones already displayed in
8	: QWidget{parent}, ui{new Ui::VisualizationTabWidget}	9	/// the tab
		10	QString defaultZoneName(const QLayout &layout)
		11	{
		12	auto count = 0;
		13	for (auto i = 0; i < layout.count(); ++i) {
		14	if (dynamic_cast<VisualizationZoneWidget *>(layout.itemAt(i)->widget())) {
		15	count++;
		16	}
		17	}
		18
		19	return QObject::tr("Zone %1").arg(count + 1);
		20	}
		21
		22	} // namespace
		23
		24	struct VisualizationTabWidget::VisualizationTabWidgetPrivate {
		25	explicit VisualizationTabWidgetPrivate(const QString &name) : m_Name{name} {}
		26
		27	QString m_Name;
		28	};
		29
		30	VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *parent)
		31	: QWidget{parent},
		32	ui{new Ui::VisualizationTabWidget},
		33	impl{spimpl::make_unique_impl<VisualizationTabWidgetPrivate>(name)}
9	{	34	{
10	ui->setupUi(this);	35	ui->setupUi(this);
11	}	36	}
@@ -20,11 +45,14 void VisualizationTabWidget::addZone(VisualizationZoneWidget *zoneWidget)
20	this->layout()->addWidget(zoneWidget);	45	this->layout()->addWidget(zoneWidget);
21	}	46	}
22		47
23	VisualizationZoneWidget *VisualizationTabWidget::createZone()	48	VisualizationZoneWidget *VisualizationTabWidget::createZone(std::shared_ptr<Variable> variable)
24	{	49	{
25	auto zoneWidget = new VisualizationZoneWidget{this};	50	auto zoneWidget = new VisualizationZoneWidget{defaultZoneName(*layout()), this};
26	this->addZone(zoneWidget);	51	this->addZone(zoneWidget);
27		52
		53	// Creates a new graph into the zone
		54	zoneWidget->createGraph(variable);
		55
28	return zoneWidget;	56	return zoneWidget;
29	}	57	}
30		58
@@ -45,5 +73,5 void VisualizationTabWidget::close()
45		73
46	QString VisualizationTabWidget::name() const	74	QString VisualizationTabWidget::name() const
47	{	75	{
48	return QStringLiteral("MainView");	76	return impl->m_Name;
49	}	77	}

gui/src/Visualization/VisualizationWidget.cpp +7 -12

                 };
                 auto addTabView = [this, enableMinimumCornerWidgetSize]() {
-                    auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
+                    auto widget = new VisualizationTabWidget{QString{"View %1"}.arg(ui->tabWidget->count() + 1),
-                                                       QString("View %1").arg(ui->tabWidget->count() + 1));
+                                                             ui->tabWidget};
+                    auto index = ui->tabWidget->addTab(widget, widget->name());
                     if (ui->tabWidget->count() > 0) {
                         enableMinimumCornerWidgetSize(false);
                     }
                 connect(addTabViewButton, &QToolButton::clicked, addTabView);
                 connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
+                // Adds default tab
+                addTabView();
             }
             VisualizationWidget::~VisualizationWidget()
             void VisualizationWidget::displayVariable(std::shared_ptr<Variable> variable) noexcept
             {
                 if (auto currentTab = dynamic_cast<VisualizationTabWidget *>(ui->tabWidget->currentWidget())) {
-                    if (auto newZone = currentTab->createZone()) {
+                    if (!currentTab->createZone(variable)) {
-                        if (auto newGraph = newZone->createGraph()) {
-                            newGraph->addVariable(variable);
-                        else {
-                            qCCritical(LOG_VisualizationWidget())
-                                << tr("Can't display the variable : can't create the graph");
-                    else {
                         qCCritical(LOG_VisualizationWidget())
                             << tr("Can't display the variable : can't create a new zone in the current tab");
                     }

gui/src/Visualization/VisualizationZoneWidget.cpp +27 -4

             #include "Visualization/VisualizationGraphWidget.h"
-            VisualizationZoneWidget::VisualizationZoneWidget(QWidget *parent)
+            namespace {
+            /// Generates a default name for a new graph, according to the number of graphs already displayed in
+            /// the zone
+            QString defaultGraphName(const QLayout &layout)
+            {
+                auto count = 0;
+                for (auto i = 0; i < layout.count(); ++i) {
+                    if (dynamic_cast<VisualizationGraphWidget *>(layout.itemAt(i)->widget())) {
+                        count++;
+                    }
+                }
+                return QObject::tr("Graph %1").arg(count + 1);
+            }
+            } // namespace
+            VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *parent)
                     : QWidget{parent}, ui{new Ui::VisualizationZoneWidget}
             {
                 ui->setupUi(this);
+                ui->zoneNameLabel->setText(name);
             }
             VisualizationZoneWidget::~VisualizationZoneWidget()
                 ui->visualizationZoneFrame->layout()->addWidget(graphWidget);
             }
-            VisualizationGraphWidget *VisualizationZoneWidget::createGraph()
+            VisualizationGraphWidget *VisualizationZoneWidget::createGraph(std::shared_ptr<Variable> variable)
             {
-                auto graphWidget = new VisualizationGraphWidget{this};
+                auto graphWidget = new VisualizationGraphWidget{
+                    defaultGraphName(*ui->visualizationZoneFrame->layout()), this};
                 this->addGraph(graphWidget);
+                graphWidget->addVariable(variable);
                 return graphWidget;
             }
             QString VisualizationZoneWidget::name() const
             {
-                return QStringLiteral("MainView");
+                return ui->zoneNameLabel->text();
             }

gui/ui/Visualization/VisualizationWidget.ui +1 -14

                <item>
                 <widget class="QTabWidget" name="tabWidget">
                  <property name="currentIndex">
-                  <number>0</number>
+                  <number>-1</number>
                  </property>
-                 <widget class="VisualizationTabWidget" name="firstView">
-                  <attribute name="title">
-                   <string>View 1</string>
-                  </attribute>
-                 </widget>
                 </widget>
                </item>
               </layout>
              </widget>
-             <customwidgets>
-              <customwidget>
-               <class>VisualizationTabWidget</class>
-               <extends>QWidget</extends>
-               <header location="global">Visualization/VisualizationTabWidget.h</header>
-               <container>1</container>
-              </customwidget>
-             </customwidgets>
              <resources/>
              <connections/>
             </ui>

gui/ui/Visualization/VisualizationZoneWidget.ui +41 -15

@@ -14,23 +14,49
14	<string>Form</string>	14	<string>Form</string>
15	</property>	15	</property>
16	<layout class="QVBoxLayout" name="verticalLayout_2">	16	<layout class="QVBoxLayout" name="verticalLayout_2">
17	<property name="spacing">	17	<item>
18	<number>3</number>	18	<widget class="QWidget" name="infobar" native="true">
19	</property>	19	<property name="sizePolicy">
20	<property name="leftMargin">	20	<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
21	<number>0</number>	21	<horstretch>0</horstretch>
22	</property>	22	<verstretch>0</verstretch>
23	<property name="topMargin">	23	</sizepolicy>
24	<number>0</number>	24	</property>
25	</property>	25	<layout class="QHBoxLayout" name="horizontalLayout">
26	<property name="~~righ~~tMargin">	26	<property name="leftMargin">
27	<number>0</number>	27	<number>0</number>
28	</property>	28	</property>
29	<property name="~~bottom~~Margin">	29	<property name="topMargin">
30	<number>0</number>	30	<number>0</number>
31	</property>	31	</property>
		32	<property name="rightMargin">
		33	<number>0</number>
		34	</property>
		35	<property name="bottomMargin">
		36	<number>0</number>
		37	</property>
		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>
32	<item>	52	<item>
33	<widget class="QFrame" name="visualizationZoneFrame">	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	<property name="frameShape">	60	<property name="frameShape">
35	<enum>QFrame::Box</enum>	61	<enum>QFrame::Box</enum>
36	</property>	62	</property>

gui/vera-exclusions/exclusions.txt +2 0

             # Ignore false positive relative to unnamed namespace
             DataSourceTreeWidgetItem\.cpp:\d+:.*IPSIS_F13.*
+            VisualizationTabWidget\.cpp:\d+:.*IPSIS_F13.*
+            VisualizationZoneWidget\.cpp:\d+:.*IPSIS_F13.*

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages