##// END OF EJS Templates
GIT_REPOSITORIES » LPP » Users » mperrinel » SciQLop-fork
RSS

Fork of HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop

Add button on the SidePane widgets to open left or right inspectors
perrinel -
r101:9678ebc27091
parent child
Show More
Show file before | Show file after | Hide comments
1 NO CONTENT: new file 100755, binary diff hidden
NO CONTENT: new file 100755, binary diff hidden
Show file before | Show file after | Hide comments
@@ -0,0 +1,5
1 <RCC>
2 <qresource prefix="/">
3 <file>icones/openInspector.png</file>
4 </qresource>
5 </RCC>
Show file before | Show file after | Hide comments
@@ -1,60 +1,65
1 /*------------------------------------------------------------------------------
1 /*------------------------------------------------------------------------------
2 -- This file is a part of the SciQLop Software
2 -- This file is a part of the SciQLop Software
3 -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
3 -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
4 --
4 --
5 -- This program is free software; you can redistribute it and/or modify
5 -- This program is free software; you can redistribute it and/or modify
6 -- it under the terms of the GNU General Public License as published by
6 -- it under the terms of the GNU General Public License as published by
7 -- the Free Software Foundation; either version 2 of the License, or
7 -- the Free Software Foundation; either version 2 of the License, or
8 -- (at your option) any later version.
8 -- (at your option) any later version.
9 --
9 --
10 -- This program is distributed in the hope that it will be useful,
10 -- This program is distributed in the hope that it will be useful,
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 -- GNU General Public License for more details.
13 -- GNU General Public License for more details.
14 --
14 --
15 -- You should have received a copy of the GNU General Public License
15 -- You should have received a copy of the GNU General Public License
16 -- along with this program; if not, write to the Free Software
16 -- along with this program; if not, write to the Free Software
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 -------------------------------------------------------------------------------*/
18 -------------------------------------------------------------------------------*/
19 /*-- Author : Alexis Jeandet
19 /*-- Author : Alexis Jeandet
20 -- Mail : alexis.jeandet@member.fsf.org
20 -- Mail : alexis.jeandet@member.fsf.org
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #ifndef SCIQLOP_MAINWINDOW_H
22 #ifndef SCIQLOP_MAINWINDOW_H
23 #define SCIQLOP_MAINWINDOW_H
23 #define SCIQLOP_MAINWINDOW_H
24
24
25 #include <QListWidgetItem>
25 #include <QListWidgetItem>
26 #include <QLoggingCategory>
26 #include <QMainWindow>
27 #include <QMainWindow>
27 #include <QProgressBar>
28 #include <QProgressBar>
28 #include <QProgressDialog>
29 #include <QProgressDialog>
29 #include <QThread>
30 #include <QThread>
30 #include <QVBoxLayout>
31 #include <QVBoxLayout>
31 #include <QWidget>
32 #include <QWidget>
32 //#include "../Core/qlopservice.h"
33
33 //#include "../Core/qlopgui.h"
34 #include <Common/spimpl.h>
34
35
35 #include <memory>
36 #include <memory>
36
37
38 Q_DECLARE_LOGGING_CATEGORY(LOG_MainWindow)
39
37 namespace Ui {
40 namespace Ui {
38 class MainWindow;
41 class MainWindow;
39 } // namespace Ui
42 } // namespace Ui
40
43
41
44
42 class MainWindow : public QMainWindow {
45 class MainWindow : public QMainWindow {
43 Q_OBJECT
46 Q_OBJECT
44
47
45 public:
48 public:
46 explicit MainWindow(QWidget *parent = 0);
49 explicit MainWindow(QWidget *parent = 0);
47 virtual ~MainWindow();
50 virtual ~MainWindow();
48 public slots:
51 public slots:
49
52
50 protected:
53 protected:
51 void changeEvent(QEvent *e);
54 void changeEvent(QEvent *e);
52
55
53 private:
56 private:
54 std::unique_ptr<Ui::MainWindow> m_Ui;
57 std::unique_ptr<Ui::MainWindow> m_Ui;
55 // QWidget *m_progressWidget;
58 // QWidget *m_progressWidget;
56 // QVBoxLayout *m_progressLayout;
59 // QVBoxLayout *m_progressLayout;
57 // QList<QLopService*> m_qlopServices;
60 // QList<QLopService*> m_qlopServices;
61 class MainWindowPrivate;
62 spimpl::unique_impl_ptr<MainWindowPrivate> impl;
58 };
63 };
59
64
60 #endif // SCIQLOP_MAINWINDOW_H
65 #endif // SCIQLOP_MAINWINDOW_H
Show file before | Show file after | Hide comments
@@ -1,128 +1,212
1 /*------------------------------------------------------------------------------
1 /*------------------------------------------------------------------------------
2 -- This file is a part of the SciQLop Software
2 -- This file is a part of the SciQLop Software
3 -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
3 -- Copyright (C) 2017, Plasma Physics Laboratory - CNRS
4 --
4 --
5 -- This program is free software; you can redistribute it and/or modify
5 -- This program is free software; you can redistribute it and/or modify
6 -- it under the terms of the GNU General Public License as published by
6 -- it under the terms of the GNU General Public License as published by
7 -- the Free Software Foundation; either version 2 of the License, or
7 -- the Free Software Foundation; either version 2 of the License, or
8 -- (at your option) any later version.
8 -- (at your option) any later version.
9 --
9 --
10 -- This program is distributed in the hope that it will be useful,
10 -- This program is distributed in the hope that it will be useful,
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
11 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 -- GNU General Public License for more details.
13 -- GNU General Public License for more details.
14 --
14 --
15 -- You should have received a copy of the GNU General Public License
15 -- You should have received a copy of the GNU General Public License
16 -- along with this program; if not, write to the Free Software
16 -- along with this program; if not, write to the Free Software
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17 -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18 -------------------------------------------------------------------------------*/
18 -------------------------------------------------------------------------------*/
19 /*-- Author : Alexis Jeandet
19 /*-- Author : Alexis Jeandet
20 -- Mail : alexis.jeandet@member.fsf.org
20 -- Mail : alexis.jeandet@member.fsf.org
21 ----------------------------------------------------------------------------*/
21 ----------------------------------------------------------------------------*/
22 #include "MainWindow.h"
22 #include "MainWindow.h"
23 #include "ui_MainWindow.h"
23 #include "ui_MainWindow.h"
24
24
25 #include <DataSource/DataSourceController.h>
25 #include <DataSource/DataSourceController.h>
26 #include <DataSource/DataSourceWidget.h>
26 #include <DataSource/DataSourceWidget.h>
27 #include <SidePane/SqpSidePane.h>
27 #include <SqpApplication.h>
28 #include <SqpApplication.h>
28
29
29 #include <QAction>
30 #include <QAction>
30 #include <QDate>
31 #include <QDate>
31 #include <QDateTime>
32 #include <QDateTime>
32 #include <QDir>
33 #include <QDir>
33 #include <QFileDialog>
34 #include <QFileDialog>
35 #include <QToolBar>
36 #include <memory.h>
37
34 //#include <omp.h>
38 //#include <omp.h>
35 //#include <network/filedownloader.h>
39 //#include <network/filedownloader.h>
36 //#include <qlopdatabase.h>
40 //#include <qlopdatabase.h>
37 //#include <qlopsettings.h>
41 //#include <qlopsettings.h>
38 //#include <qlopgui.h>
42 //#include <qlopgui.h>
39 //#include <spacedata.h>
43 //#include <spacedata.h>
40 //#include "qlopcore.h"
44 //#include "qlopcore.h"
41 //#include "qlopcodecmanager.h"
45 //#include "qlopcodecmanager.h"
42 //#include "cdfcodec.h"
46 //#include "cdfcodec.h"
43 //#include "amdatxtcodec.h"
47 //#include "amdatxtcodec.h"
44 //#include <qlopplotmanager.h>
48 //#include <qlopplotmanager.h>
45 #include <QAction>
49
46 #include <QToolBar>
50 #include "iostream"
47 #include <memory.h>
51
48 MainWindow::MainWindow(QWidget *parent) : QMainWindow{parent}, m_Ui{new Ui::MainWindow}
52 Q_LOGGING_CATEGORY(LOG_MainWindow, "MainWindow")
53
54 class MainWindow::MainWindowPrivate {
55 public:
56 QSize m_LastOpenLeftInspectorSize;
57 QSize m_LastOpenRightInspectorSize;
58 };
59
60 MainWindow::MainWindow(QWidget *parent)
61 : QMainWindow{parent},
62 m_Ui{new Ui::MainWindow},
63 impl{spimpl::make_unique_impl<MainWindowPrivate>()}
49 {
64 {
50 m_Ui->setupUi(this);
65 m_Ui->setupUi(this);
51
66
52 auto leftSidePane = m_Ui->leftInspectorSidePane->sidePane();
67
53 leftSidePane->addAction("ACTION L1");
68 m_Ui->splitter->setCollapsible(1, false);
54 leftSidePane->addAction("ACTION L2");
69 m_Ui->splitter->setCollapsible(3, false);
55 leftSidePane->addAction("ACTION L3");
70 // Lambda that defines what's happened when clicking on the leftSidePaneInspector open button
71 auto openLeftInspector = [&](bool checked) {
72
73 // Update of the last opened geometry
74 if (checked) {
75 impl->m_LastOpenLeftInspectorSize = m_Ui->leftMainInspectorWidget->size();
76 }
77
78 auto startSize = impl->m_LastOpenLeftInspectorSize;
79 auto endSize = startSize;
80 endSize.setWidth(0);
81
82 QList<int> currentSizes = m_Ui->splitter->sizes();
83 if (checked) {
84 // adjust sizes individually here, e.g.
85 currentSizes[0] -= impl->m_LastOpenLeftInspectorSize.width();
86 currentSizes[2] += impl->m_LastOpenLeftInspectorSize.width();
87 m_Ui->splitter->setSizes(currentSizes);
88 }
89 else {
90 // adjust sizes individually here, e.g.
91 currentSizes[0] += impl->m_LastOpenLeftInspectorSize.width();
92 currentSizes[2] -= impl->m_LastOpenLeftInspectorSize.width();
93 m_Ui->splitter->setSizes(currentSizes);
94 }
95
96 };
97
98 // Lambda that defines what's happened when clicking on the SidePaneInspector open button
99 auto openRightInspector = [&](bool checked) {
100
101 // Update of the last opened geometry
102 if (checked) {
103 impl->m_LastOpenRightInspectorSize = m_Ui->rightMainInspectorWidget->size();
104 }
105
106 auto startSize = impl->m_LastOpenRightInspectorSize;
107 auto endSize = startSize;
108 endSize.setWidth(0);
109
110 QList<int> currentSizes = m_Ui->splitter->sizes();
111 if (checked) {
112 // adjust sizes individually here, e.g.
113 currentSizes[4] -= impl->m_LastOpenRightInspectorSize.width();
114 currentSizes[2] += impl->m_LastOpenRightInspectorSize.width();
115 m_Ui->splitter->setSizes(currentSizes);
116 }
117 else {
118 // adjust sizes individually here, e.g.
119 currentSizes[4] += impl->m_LastOpenRightInspectorSize.width();
120 currentSizes[2] -= impl->m_LastOpenRightInspectorSize.width();
121 m_Ui->splitter->setSizes(currentSizes);
122 }
123
124 };
125
126
127 QToolBar *leftSidePane = m_Ui->leftInspectorSidePane->sidePane();
128 auto openLeftInspectorAction = leftSidePane->addAction(
129 QIcon{
130 ":/icones/openInspector.png",
131 },
132 "ACTION L1", openLeftInspector);
133
134 openLeftInspectorAction->setCheckable(true);
56
135
57 auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane();
136 auto rightSidePane = m_Ui->rightInspectorSidePane->sidePane();
58 rightSidePane->addAction("ACTION R1");
137 auto openRightInspectorAction = rightSidePane->addAction(
59 rightSidePane->addAction("ACTION R2");
138 QIcon{
60 rightSidePane->addAction("ACTION R3");
139 ":/icones/openInspector.png",
140 },
141 "ACTION L1", openRightInspector);
142
143 openRightInspectorAction->setCheckable(true);
144
61
145
62 this->menuBar()->addAction("File");
146 this->menuBar()->addAction("File");
63 auto mainToolBar = this->addToolBar("MainToolBar");
147 auto mainToolBar = this->addToolBar("MainToolBar");
64 mainToolBar->addAction("A1");
148 mainToolBar->addAction("A1");
65
149
66 // Widgets / controllers connections
150 // Widgets / controllers connections
67 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
151 connect(&sqpApp->dataSourceController(), SIGNAL(dataSourceItemSet(DataSourceItem *)),
68 m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
152 m_Ui->dataSourceWidget, SLOT(addDataSource(DataSourceItem *)));
69
153
70 /* QLopGUI::registerMenuBar(menuBar());
154 /* QLopGUI::registerMenuBar(menuBar());
71 this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
155 this->setWindowIcon(QIcon(":/sciqlopLOGO.svg"));
72 this->m_progressWidget = new QWidget();
156 this->m_progressWidget = new QWidget();
73 this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
157 this->m_progressLayout = new QVBoxLayout(this->m_progressWidget);
74 this->m_progressWidget->setLayout(this->m_progressLayout);
158 this->m_progressWidget->setLayout(this->m_progressLayout);
75 this->m_progressWidget->setWindowModality(Qt::WindowModal);
159 this->m_progressWidget->setWindowModality(Qt::WindowModal);
76 m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
160 m_progressThreadIds = (int*) malloc(OMP_THREADS*sizeof(int));
77 for(int i=0;i<OMP_THREADS;i++)
161 for(int i=0;i<OMP_THREADS;i++)
78 {
162 {
79 this->m_progress.append(new QProgressBar(this->m_progressWidget));
163 this->m_progress.append(new QProgressBar(this->m_progressWidget));
80 this->m_progress.last()->setMinimum(0);
164 this->m_progress.last()->setMinimum(0);
81 this->m_progress.last()->setMaximum(100);
165 this->m_progress.last()->setMaximum(100);
82 this->m_progressLayout->addWidget(this->m_progress.last());
166 this->m_progressLayout->addWidget(this->m_progress.last());
83 this->m_progressWidget->hide();
167 this->m_progressWidget->hide();
84 this->m_progressThreadIds[i] = -1;
168 this->m_progressThreadIds[i] = -1;
85 }
169 }
86 this->m_progressWidget->setWindowTitle("Loading File");
170 this->m_progressWidget->setWindowTitle("Loading File");
87 const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
171 const QList<QLopService*>ServicesToLoad=QList<QLopService*>()
88 << QLopCore::self()
172 << QLopCore::self()
89 << QLopPlotManager::self()
173 << QLopPlotManager::self()
90 << QLopCodecManager::self()
174 << QLopCodecManager::self()
91 << FileDownloader::self()
175 << FileDownloader::self()
92 << QLopDataBase::self()
176 << QLopDataBase::self()
93 << SpaceData::self();
177 << SpaceData::self();
94
178
95 CDFCodec::registerToManager();
179 CDFCodec::registerToManager();
96 AMDATXTCodec::registerToManager();
180 AMDATXTCodec::registerToManager();
97
181
98
182
99 for(int i=0;i<ServicesToLoad.count();i++)
183 for(int i=0;i<ServicesToLoad.count();i++)
100 {
184 {
101 qDebug()<<ServicesToLoad.at(i)->serviceName();
185 qDebug()<<ServicesToLoad.at(i)->serviceName();
102 ServicesToLoad.at(i)->initialize(); //must be called before getGUI
186 ServicesToLoad.at(i)->initialize(); //must be called before getGUI
103 QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
187 QDockWidget* wdgt=ServicesToLoad.at(i)->getGUI();
104 if(wdgt)
188 if(wdgt)
105 {
189 {
106 wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
190 wdgt->setAllowedAreas(Qt::AllDockWidgetAreas);
107 this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
191 this->addDockWidget(Qt::TopDockWidgetArea,wdgt);
108 }
192 }
109 PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
193 PythonQt::self()->getMainModule().addObject(ServicesToLoad.at(i)->serviceName(),(QObject*)ServicesToLoad.at(i));
110 }*/
194 }*/
111 }
195 }
112
196
113 MainWindow::~MainWindow()
197 MainWindow::~MainWindow()
114 {
198 {
115 }
199 }
116
200
117
201
118 void MainWindow::changeEvent(QEvent *e)
202 void MainWindow::changeEvent(QEvent *e)
119 {
203 {
120 QMainWindow::changeEvent(e);
204 QMainWindow::changeEvent(e);
121 switch (e->type()) {
205 switch (e->type()) {
122 case QEvent::LanguageChange:
206 case QEvent::LanguageChange:
123 m_Ui->retranslateUi(this);
207 m_Ui->retranslateUi(this);
124 break;
208 break;
125 default:
209 default:
126 break;
210 break;
127 }
211 }
128 }
212 }
Show file before | Show file after | Hide comments
@@ -1,214 +1,158
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <ui version="4.0">
2 <ui version="4.0">
3 <class>MainWindow</class>
3 <class>MainWindow</class>
4 <widget class="QMainWindow" name="MainWindow">
4 <widget class="QMainWindow" name="MainWindow">
5 <property name="geometry">
5 <property name="geometry">
6 <rect>
6 <rect>
7 <x>0</x>
7 <x>0</x>
8 <y>0</y>
8 <y>0</y>
9 <width>800</width>
9 <width>800</width>
10 <height>600</height>
10 <height>600</height>
11 </rect>
11 </rect>
12 </property>
12 </property>
13 <property name="windowTitle">
13 <property name="windowTitle">
14 <string>QLop</string>
14 <string>QLop</string>
15 </property>
15 </property>
16 <property name="dockNestingEnabled">
16 <property name="dockNestingEnabled">
17 <bool>true</bool>
17 <bool>true</bool>
18 </property>
18 </property>
19 <widget class="QWidget" name="centralWidget">
19 <widget class="QWidget" name="centralWidget">
20 <property name="enabled">
20 <property name="enabled">
21 <bool>true</bool>
21 <bool>true</bool>
22 </property>
22 </property>
23 <property name="sizePolicy">
23 <property name="sizePolicy">
24 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
24 <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
25 <horstretch>0</horstretch>
25 <horstretch>0</horstretch>
26 <verstretch>0</verstretch>
26 <verstretch>0</verstretch>
27 </sizepolicy>
27 </sizepolicy>
28 </property>
28 </property>
29 <property name="maximumSize">
29 <property name="maximumSize">
30 <size>
30 <size>
31 <width>16777215</width>
31 <width>16777215</width>
32 <height>16777215</height>
32 <height>16777215</height>
33 </size>
33 </size>
34 </property>
34 </property>
35 <layout class="QHBoxLayout" name="horizontalLayout">
35 <layout class="QHBoxLayout" name="horizontalLayout">
36 <property name="spacing">
36 <property name="spacing">
37 <number>3</number>
38 </property>
39 <property name="leftMargin">
40 <number>0</number>
41 </property>
42 <property name="topMargin">
43 <number>0</number>
44 </property>
45 <property name="rightMargin">
46 <number>0</number>
37 <number>0</number>
47 </property>
38 </property>
48 <property name="bottomMargin">
49 <number>0</number>
50 </property>
51 <item>
52 <widget class="QWidget" name="leftInspectorWidget" native="true">
53 <layout class="QHBoxLayout" name="horizontalLayout_2">
54 <property name="spacing">
55 <number>3</number>
56 </property>
57 <property name="leftMargin">
39 <property name="leftMargin">
58 <number>0</number>
40 <number>0</number>
59 </property>
41 </property>
60 <property name="topMargin">
42 <property name="topMargin">
61 <number>0</number>
43 <number>0</number>
62 </property>
44 </property>
63 <property name="rightMargin">
45 <property name="rightMargin">
64 <number>0</number>
46 <number>0</number>
65 </property>
47 </property>
66 <property name="bottomMargin">
48 <property name="bottomMargin">
67 <number>0</number>
49 <number>0</number>
68 </property>
50 </property>
69 <item>
51 <item>
70 <widget class="QWidget" name="widget" native="true">
52 <widget class="QSplitter" name="splitter">
53 <property name="orientation">
54 <enum>Qt::Horizontal</enum>
55 </property>
56 <widget class="QWidget" name="leftMainInspectorWidget" native="true">
71 <layout class="QVBoxLayout" name="verticalLayout">
57 <layout class="QVBoxLayout" name="verticalLayout">
72 <property name="spacing">
58 <property name="spacing">
73 <number>3</number>
59 <number>0</number>
74 </property>
60 </property>
75 <property name="leftMargin">
61 <property name="leftMargin">
76 <number>0</number>
62 <number>0</number>
77 </property>
63 </property>
78 <property name="topMargin">
64 <property name="topMargin">
79 <number>0</number>
65 <number>0</number>
80 </property>
66 </property>
81 <property name="rightMargin">
67 <property name="rightMargin">
82 <number>0</number>
68 <number>0</number>
83 </property>
69 </property>
84 <property name="bottomMargin">
70 <property name="bottomMargin">
85 <number>0</number>
71 <number>0</number>
86 </property>
72 </property>
87 <item>
73 <item>
88 <widget class="DataSourceWidget" name="dataSourceWidget" native="true"/>
74 <widget class="DataSourceWidget" name="dataSourceWidget" native="true"/>
89 </item>
75 </item>
90 <item>
76 <item>
91 <widget class="QWidget" name="dateTimeWidget" native="true"/>
77 <widget class="QWidget" name="dateTimeWidget" native="true"/>
92 </item>
78 </item>
93 <item>
79 <item>
94 <widget class="QWidget" name="variableInspectorWidget" native="true"/>
80 <widget class="QWidget" name="variableInspectorWidget" native="true"/>
95 </item>
81 </item>
96 </layout>
82 </layout>
97 </widget>
83 </widget>
98 </item>
84 <widget class="SqpSidePane" name="leftInspectorSidePane" native="true"/>
99 <item>
85 <widget class="VisualizationWidget" name="view" native="true">
100 <widget class="SqpSidePane" name="leftInspectorSidePane" native="true">
86 <property name="sizePolicy">
101 <layout class="QVBoxLayout" name="verticalLayout_2">
87 <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
102 <property name="spacing">
88 <horstretch>0</horstretch>
103 <number>3</number>
89 <verstretch>0</verstretch>
104 </property>
90 </sizepolicy>
105 <property name="leftMargin">
106 <number>0</number>
107 </property>
108 <property name="topMargin">
109 <number>0</number>
110 </property>
111 <property name="rightMargin">
112 <number>0</number>
113 </property>
114 <property name="bottomMargin">
115 <number>0</number>
116 </property>
91 </property>
117 </layout>
118 </widget>
92 </widget>
119 </item>
120 </layout>
121 </widget>
122 </item>
123 <item>
124 <widget class="VisualizationWidget" name="view" native="true"/>
125 </item>
126 <item>
127 <widget class="QWidget" name="rightInspectorWidget" native="true">
128 <layout class="QHBoxLayout" name="horizontalLayout_3">
129 <property name="spacing">
130 <number>3</number>
131 </property>
132 <property name="leftMargin">
133 <number>0</number>
134 </property>
135 <property name="topMargin">
136 <number>0</number>
137 </property>
138 <property name="rightMargin">
139 <number>0</number>
140 </property>
141 <property name="bottomMargin">
142 <number>0</number>
143 </property>
144 <item>
145 <widget class="SqpSidePane" name="rightInspectorSidePane" native="true"/>
93 <widget class="SqpSidePane" name="rightInspectorSidePane" native="true"/>
146 </item>
94 <widget class="QWidget" name="rightMainInspectorWidget" native="true">
147 <item>
148 <widget class="QWidget" name="widget_2" native="true">
149 <layout class="QVBoxLayout" name="verticalLayout_3">
95 <layout class="QVBoxLayout" name="verticalLayout_3">
150 <property name="spacing">
96 <property name="spacing">
151 <number>3</number>
97 <number>0</number>
152 </property>
98 </property>
153 <property name="leftMargin">
99 <property name="leftMargin">
154 <number>0</number>
100 <number>0</number>
155 </property>
101 </property>
156 <property name="topMargin">
102 <property name="topMargin">
157 <number>0</number>
103 <number>0</number>
158 </property>
104 </property>
159 <property name="rightMargin">
105 <property name="rightMargin">
160 <number>0</number>
106 <number>0</number>
161 </property>
107 </property>
162 <property name="bottomMargin">
108 <property name="bottomMargin">
163 <number>0</number>
109 <number>0</number>
164 </property>
110 </property>
165 <item>
111 <item>
166 <widget class="QWidget" name="commonPropertyInspectorWidget" native="true"/>
112 <widget class="QWidget" name="commonPropertyInspectorWidget" native="true"/>
167 </item>
113 </item>
168 <item>
114 <item>
169 <widget class="QWidget" name="catalogWidget" native="true"/>
115 <widget class="DataSourceWidget" name="catalogWidget" native="true"/>
170 </item>
116 </item>
171 </layout>
117 </layout>
172 </widget>
118 </widget>
173 </item>
174 </layout>
175 </widget>
119 </widget>
176 </item>
120 </item>
177 </layout>
121 </layout>
178 </widget>
122 </widget>
179 <widget class="QMenuBar" name="menuBar">
123 <widget class="QMenuBar" name="menuBar">
180 <property name="geometry">
124 <property name="geometry">
181 <rect>
125 <rect>
182 <x>0</x>
126 <x>0</x>
183 <y>0</y>
127 <y>0</y>
184 <width>800</width>
128 <width>800</width>
185 <height>26</height>
129 <height>28</height>
186 </rect>
130 </rect>
187 </property>
131 </property>
188 </widget>
132 </widget>
189 <widget class="QStatusBar" name="statusBar"/>
133 <widget class="QStatusBar" name="statusBar"/>
190 </widget>
134 </widget>
191 <layoutdefault spacing="6" margin="11"/>
135 <layoutdefault spacing="6" margin="11"/>
192 <customwidgets>
136 <customwidgets>
193 <customwidget>
137 <customwidget>
194 <class>VisualizationWidget</class>
138 <class>VisualizationWidget</class>
195 <extends>QWidget</extends>
139 <extends>QWidget</extends>
196 <header location="global">Visualization/VisualizationWidget.h</header>
140 <header location="global">Visualization/VisualizationWidget.h</header>
197 <container>1</container>
141 <container>1</container>
198 </customwidget>
142 </customwidget>
199 <customwidget>
143 <customwidget>
200 <class>SqpSidePane</class>
144 <class>SqpSidePane</class>
201 <extends>QWidget</extends>
145 <extends>QWidget</extends>
202 <header location="global">SidePane/SqpSidePane.h</header>
146 <header location="global">SidePane/SqpSidePane.h</header>
203 <container>1</container>
147 <container>1</container>
204 </customwidget>
148 </customwidget>
205 <customwidget>
149 <customwidget>
206 <class>DataSourceWidget</class>
150 <class>DataSourceWidget</class>
207 <extends>QWidget</extends>
151 <extends>QWidget</extends>
208 <header location="global">DataSource/DataSourceWidget.h</header>
152 <header location="global">DataSource/DataSourceWidget.h</header>
209 <container>1</container>
153 <container>1</container>
210 </customwidget>
154 </customwidget>
211 </customwidgets>
155 </customwidgets>
212 <resources/>
156 <resources/>
213 <connections/>
157 <connections/>
214 </ui>
158 </ui>
Show file before | Show file after | Hide comments
@@ -1,47 +1,54
1 #include "SidePane/SqpSidePane.h"
1 #include "SidePane/SqpSidePane.h"
2 #include "ui_SqpSidePane.h"
2 #include "ui_SqpSidePane.h"
3
3
4 #include <QAction>
4 #include <QAction>
5 #include <QLayout>
5 #include <QLayout>
6 #include <QToolBar>
6 #include <QToolBar>
7
7
8 namespace {
8 namespace {
9 static const QString SQPSIDEPANESTYLESHEET
9 static const QString SQPSIDEPANESTYLESHEET
10 = "QToolBar {"
10 = "QToolBar {"
11 " background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,"
11 " background: qlineargradient(x1: 0, y1: 0, x2: 1, y2: 0,"
12 " stop: 0.0 #5a5a5a,"
12 " stop: 0.0 #5a5a5a,"
13 " stop: 1.0 #414141);"
13 " stop: 1.0 #414141);"
14 " border: none;"
14 " border: none;"
15 " border-left: 1px solid #424242;"
15 " border-left: 1px solid #424242;"
16 "border-right: 1px solid #393939;"
16 "border-right: 1px solid #393939;"
17 " }"
17 " }"
18
18
19 " QToolButton {"
19 " QToolButton {"
20 "background: none;"
20 "background: none;"
21 "border: none;"
21 "border: none;"
22 " }";
22 " }";
23 }
23 }
24
24
25 SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane}
25 SqpSidePane::SqpSidePane(QWidget *parent) : QWidget{parent}, ui{new Ui::SqpSidePane}
26 {
26 {
27 QVBoxLayout *sidePaneLayout = new QVBoxLayout(this);
27 // QVBoxLayout *sidePaneLayout = new QVBoxLayout(this);
28 sidePaneLayout->setContentsMargins(0, 0, 0, 0);
28 // sidePaneLayout->setContentsMargins(0, 0, 0, 0);
29 this->setLayout(sidePaneLayout);
29 // this->setLayout(sidePaneLayout);
30
30
31 ui->setupUi(this);
31 ui->setupUi(this);
32 m_SidePaneToolbar = new QToolBar(this);
32 m_SidePaneToolbar = new QToolBar();
33 m_SidePaneToolbar->setOrientation(Qt::Vertical);
33 m_SidePaneToolbar->setOrientation(Qt::Vertical);
34 sidePaneLayout->addWidget(m_SidePaneToolbar);
34 this->layout()->addWidget(m_SidePaneToolbar);
35
35
36 m_SidePaneToolbar->setStyleSheet(SQPSIDEPANESTYLESHEET);
36 m_SidePaneToolbar->setStyleSheet(SQPSIDEPANESTYLESHEET);
37
38 this->setStyleSheet(
39 " QWidget {"
40 "background: red;"
41
42 "border: 1px;"
43 " }");
37 }
44 }
38
45
39 SqpSidePane::~SqpSidePane()
46 SqpSidePane::~SqpSidePane()
40 {
47 {
41 delete ui;
48 delete ui;
42 }
49 }
43
50
44 QToolBar *SqpSidePane::sidePane()
51 QToolBar *SqpSidePane::sidePane()
45 {
52 {
46 return m_SidePaneToolbar;
53 return m_SidePaneToolbar;
47 }
54 }
Show file before | Show file after | Hide comments
@@ -1,43 +1,43
1 #include "Visualization/VisualizationWidget.h"
1 #include "Visualization/VisualizationWidget.h"
2 #include "Visualization/VisualizationTabWidget.h"
2 #include "Visualization/VisualizationTabWidget.h"
3 #include "ui_VisualizationWidget.h"
3 #include "ui_VisualizationWidget.h"
4
4
5 #include <QDebug>
5 #include <QDebug>
6 #include <QToolButton>
6 #include <QToolButton>
7
7
8 #include "iostream"
8 #include "iostream"
9
9
10 Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
10 Q_LOGGING_CATEGORY(LOG_VisualizationWidget, "VisualizationWidget")
11
11
12 VisualizationWidget::VisualizationWidget(QWidget *parent)
12 VisualizationWidget::VisualizationWidget(QWidget *parent)
13 : QWidget{parent}, ui{new Ui::VisualizationWidget}
13 : QWidget{parent}, ui{new Ui::VisualizationWidget}
14 {
14 {
15 ui->setupUi(this);
15 ui->setupUi(this);
16
16
17 auto addTabViewButton = new QToolButton{ui->tabWidget};
17 auto addTabViewButton = new QToolButton{ui->tabWidget};
18 addTabViewButton->setText(tr("Add View"));
18 addTabViewButton->setText(tr("Add View"));
19 addTabViewButton->setCursor(Qt::ArrowCursor);
19 addTabViewButton->setCursor(Qt::ArrowCursor);
20 addTabViewButton->setAutoRaise(true);
20 addTabViewButton->setAutoRaise(true);
21 ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);
21 ui->tabWidget->setCornerWidget(addTabViewButton, Qt::TopRightCorner);
22
22
23 auto addTabView = [&](bool checked) {
23 auto addTabView = [&]() {
24 auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
24 auto index = ui->tabWidget->addTab(new VisualizationTabWidget(ui->tabWidget),
25 QString("View %1").arg(ui->tabWidget->count() + 1));
25 QString("View %1").arg(ui->tabWidget->count() + 1));
26 qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index);
26 qCInfo(LOG_VisualizationWidget()) << tr("add the tab of index %1").arg(index);
27 };
27 };
28
28
29 auto removeTabView = [&](int index) {
29 auto removeTabView = [&](int index) {
30 ui->tabWidget->removeTab(index);
30 ui->tabWidget->removeTab(index);
31 qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index);
31 qCInfo(LOG_VisualizationWidget()) << tr("remove the tab of index %1").arg(index);
32 };
32 };
33
33
34 ui->tabWidget->setTabsClosable(true);
34 ui->tabWidget->setTabsClosable(true);
35
35
36 connect(addTabViewButton, &QToolButton::clicked, addTabView);
36 connect(addTabViewButton, &QToolButton::clicked, addTabView);
37 connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
37 connect(ui->tabWidget, &QTabWidget::tabCloseRequested, removeTabView);
38 }
38 }
39
39
40 VisualizationWidget::~VisualizationWidget()
40 VisualizationWidget::~VisualizationWidget()
41 {
41 {
42 delete ui;
42 delete ui;
43 }
43 }
Show file before | Show file after | Hide comments
@@ -1,24 +1,42
1 <?xml version="1.0" encoding="UTF-8"?>
1 <?xml version="1.0" encoding="UTF-8"?>
2 <ui version="4.0">
2 <ui version="4.0">
3 <class>DataSourceWidget</class>
3 <class>DataSourceWidget</class>
4 <widget class="QWidget" name="DataSourceWidget">
4 <widget class="QWidget" name="DataSourceWidget">
5 <property name="geometry">
5 <property name="geometry">
6 <rect>
6 <rect>
7 <x>0</x>
7 <x>0</x>
8 <y>0</y>
8 <y>0</y>
9 <width>400</width>
9 <width>400</width>
10 <height>300</height>
10 <height>300</height>
11 </rect>
11 </rect>
12 </property>
12 </property>
13 <property name="windowTitle">
13 <property name="windowTitle">
14 <string>Data sources</string>
14 <string>Data sources</string>
15 </property>
15 </property>
16 <layout class="QGridLayout" name="gridLayout">
16 <layout class="QGridLayout" name="gridLayout">
17 <property name="topMargin">
18 <number>0</number>
19 </property>
20 <property name="rightMargin">
21 <number>0</number>
22 </property>
23 <property name="bottomMargin">
24 <number>0</number>
25 </property>
26 <property name="spacing">
27 <number>0</number>
28 </property>
17 <item row="0" column="0">
29 <item row="0" column="0">
18 <widget class="QTreeWidget" name="treeWidget"/>
30 <widget class="QTreeWidget" name="treeWidget">
31 <column>
32 <property name="text">
33 <string notr="true">1</string>
34 </property>
35 </column>
36 </widget>
19 </item>
37 </item>
20 </layout>
38 </layout>
21 </widget>
39 </widget>
22 <resources/>
40 <resources/>
23 <connections/>
41 <connections/>
24 </ui>
42 </ui>
Show file before | Show file after | Hide comments
@@ -1,21 +1,42
1 <?xml version="1.0" encoding="UTF-8"?>
1 <ui version="4.0">
2 <ui version="4.0">
2 <author/>
3 <comment/>
4 <exportmacro/>
5 <class>SqpSidePane</class>
3 <class>SqpSidePane</class>
6 <widget name="SqpSidePane" class="QWidget">
4 <widget class="QWidget" name="SqpSidePane">
7 <property name="geometry">
5 <property name="geometry">
8 <rect>
6 <rect>
9 <x>0</x>
7 <x>0</x>
10 <y>0</y>
8 <y>0</y>
11 <width>400</width>
9 <width>12</width>
12 <height>300</height>
10 <height>12</height>
13 </rect>
11 </rect>
14 </property>
12 </property>
13 <property name="maximumSize">
14 <size>
15 <width>45</width>
16 <height>16777215</height>
17 </size>
18 </property>
15 <property name="windowTitle">
19 <property name="windowTitle">
16 <string>Form</string>
20 <string>Form</string>
17 </property>
21 </property>
22 <layout class="QVBoxLayout" name="verticalLayout_2">
23 <property name="spacing">
24 <number>0</number>
25 </property>
26 <property name="leftMargin">
27 <number>0</number>
28 </property>
29 <property name="topMargin">
30 <number>0</number>
31 </property>
32 <property name="rightMargin">
33 <number>0</number>
34 </property>
35 <property name="bottomMargin">
36 <number>0</number>
37 </property>
38 </layout>
18 </widget>
39 </widget>
19 <pixmapfunction/>
40 <resources/>
20 <connections/>
41 <connections/>
21 </ui>
42 </ui>
General Comments 0
You need to be logged in to leave comments. Login now