##// END OF EJS Templates
HG_REPOSITORIES » LPP » SciQLOP_Repos » SciQLop
RSS
Edition of events from the inspector
trabillard -
r1148:ac6f44836b9a
parent child
Show More
Side by Side Unified
Context file:
r1148:ac6f44836b9a Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,38 +1,40
1 1 #ifndef SCIQLOP_CATALOGUEEVENTSTABLEMODEL_H
2 2 #define SCIQLOP_CATALOGUEEVENTSTABLEMODEL_H
3 3
4 4 #include <Common/spimpl.h>
5 5 #include <QAbstractTableModel>
6 6
7 7 class DBEvent;
8 8
9 9 class CatalogueEventsTableModel : public QAbstractTableModel {
10 10 public:
11 11 CatalogueEventsTableModel(QObject *parent = nullptr);
12 12
13 13 void setEvents(const QVector<std::shared_ptr<DBEvent> > &events);
14 14 std::shared_ptr<DBEvent> getEvent(int row) const;
15 15
16 void addEvent(const std::shared_ptr<DBEvent> &events);
17 void removeEvent(const std::shared_ptr<DBEvent> &events);
16 void addEvent(const std::shared_ptr<DBEvent> &event);
17 void removeEvent(const std::shared_ptr<DBEvent> &event);
18
19 void refreshEvent(const std::shared_ptr<DBEvent> &event);
18 20
19 21 // Model
20 22 int rowCount(const QModelIndex &parent = QModelIndex()) const override;
21 23 int columnCount(const QModelIndex &parent = QModelIndex()) const override;
22 24 Qt::ItemFlags flags(const QModelIndex &index) const override;
23 25 QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
24 26 QVariant headerData(int section, Qt::Orientation orientation,
25 27 int role = Qt::DisplayRole) const override;
26 28 void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
27 29
28 30 Qt::DropActions supportedDragActions() const override;
29 31 QStringList mimeTypes() const override;
30 32 QMimeData *mimeData(const QModelIndexList &indexes) const override;
31 33
32 34
33 35 private:
34 36 class CatalogueEventsTableModelPrivate;
35 37 spimpl::unique_impl_ptr<CatalogueEventsTableModelPrivate> impl;
36 38 };
37 39
38 40 #endif // SCIQLOP_CATALOGUEEVENTSTABLEMODEL_H
Show file before | Show file after | Hide comments
@@ -1,40 +1,42
1 1 #ifndef SCIQLOP_CATALOGUEEVENTSWIDGET_H
2 2 #define SCIQLOP_CATALOGUEEVENTSWIDGET_H
3 3
4 4 #include <Common/spimpl.h>
5 5 #include <QLoggingCategory>
6 6 #include <QWidget>
7 7
8 8 class DBCatalogue;
9 9 class DBEvent;
10 10 class VisualizationWidget;
11 11
12 12 namespace Ui {
13 13 class CatalogueEventsWidget;
14 14 }
15 15
16 16 Q_DECLARE_LOGGING_CATEGORY(LOG_CatalogueEventsWidget)
17 17
18 18 class CatalogueEventsWidget : public QWidget {
19 19 Q_OBJECT
20 20
21 21 signals:
22 22 void eventsSelected(const QVector<std::shared_ptr<DBEvent> > &event);
23 23
24 24 public:
25 25 explicit CatalogueEventsWidget(QWidget *parent = 0);
26 26 virtual ~CatalogueEventsWidget();
27 27
28 28 void setVisualizationWidget(VisualizationWidget *visualization);
29 29
30 void setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges);
31
30 32 public slots:
31 33 void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
32 34
33 35 private:
34 36 Ui::CatalogueEventsWidget *ui;
35 37
36 38 class CatalogueEventsWidgetPrivate;
37 39 spimpl::unique_impl_ptr<CatalogueEventsWidgetPrivate> impl;
38 40 };
39 41
40 42 #endif // SCIQLOP_CATALOGUEEVENTSWIDGET_H
Show file before | Show file after | Hide comments
@@ -1,185 +1,191
1 1 #include "Catalogue/CatalogueEventsTableModel.h"
2 2
3 3 #include <Common/DateUtils.h>
4 4 #include <Common/MimeTypesDef.h>
5 5 #include <DBEvent.h>
6 6 #include <DBTag.h>
7 7 #include <Data/SqpRange.h>
8 8 #include <QMimeData>
9 9 #include <SqpApplication.h>
10 10 #include <Time/TimeController.h>
11 11
12 12 struct CatalogueEventsTableModel::CatalogueEventsTableModelPrivate {
13 13 QVector<std::shared_ptr<DBEvent> > m_Events;
14 14
15 15 enum class Column { Event, TStart, TEnd, Tags, Product, NbColumn };
16 16 QStringList columnNames()
17 17 {
18 18 return QStringList{tr("Event"), tr("TStart"), tr("TEnd"), tr("Tags"), tr("Product")};
19 19 }
20 20
21 21 QVariant eventData(int col, const std::shared_ptr<DBEvent> &event) const
22 22 {
23 23 switch (static_cast<Column>(col)) {
24 24 case Column::Event:
25 25 return event->getName();
26 26 case Column::TStart:
27 27 return DateUtils::dateTime(event->getTStart());
28 28 case Column::TEnd:
29 29 return DateUtils::dateTime(event->getTEnd());
30 30 case Column::Product:
31 31 return event->getProduct();
32 32 case Column::Tags: {
33 33 QString tagList;
34 34 auto tags = event->getTags();
35 35 for (auto tag : tags) {
36 36 tagList += tag.getName();
37 37 tagList += ' ';
38 38 }
39 39
40 40 return tagList;
41 41 }
42 42 default:
43 43 break;
44 44 }
45 45
46 46 Q_ASSERT(false);
47 47 return QStringLiteral("Unknown Data");
48 48 }
49 49 };
50 50
51 51 CatalogueEventsTableModel::CatalogueEventsTableModel(QObject *parent)
52 52 : QAbstractTableModel(parent),
53 53 impl{spimpl::make_unique_impl<CatalogueEventsTableModelPrivate>()}
54 54 {
55 55 }
56 56
57 57 void CatalogueEventsTableModel::setEvents(const QVector<std::shared_ptr<DBEvent> > &events)
58 58 {
59 59 beginResetModel();
60 60 impl->m_Events = events;
61 61 endResetModel();
62 62 }
63 63
64 64 std::shared_ptr<DBEvent> CatalogueEventsTableModel::getEvent(int row) const
65 65 {
66 66 return impl->m_Events.value(row);
67 67 }
68 68
69 void CatalogueEventsTableModel::addEvent(const std::shared_ptr<DBEvent> &events)
69 void CatalogueEventsTableModel::addEvent(const std::shared_ptr<DBEvent> &event)
70 70 {
71 71 beginInsertRows(QModelIndex(), impl->m_Events.count() - 1, impl->m_Events.count() - 1);
72 // impl->m_Events.append(event); TODO
72 impl->m_Events.append(event);
73 73 endInsertRows();
74 74 }
75 75
76 void CatalogueEventsTableModel::removeEvent(const std::shared_ptr<DBEvent> &events)
76 void CatalogueEventsTableModel::removeEvent(const std::shared_ptr<DBEvent> &event)
77 77 {
78 // TODO
79 auto index = -1; // impl->m_Events.indexOf(event);
78 auto index = impl->m_Events.indexOf(event);
80 79 if (index >= 0) {
81 80 beginRemoveRows(QModelIndex(), index, index);
82 81 impl->m_Events.removeAt(index);
83 82 endRemoveRows();
84 83 }
85 84 }
86 85
86 void CatalogueEventsTableModel::refreshEvent(const std::shared_ptr<DBEvent> &event)
87 {
88 auto eventIndex = impl->m_Events.indexOf(event);
89 if (eventIndex >= 0) {
90 emit dataChanged(index(eventIndex, 0), index(eventIndex, columnCount()));
91 }
92 }
93
87 94 int CatalogueEventsTableModel::rowCount(const QModelIndex &parent) const
88 95 {
89 96 int r = impl->m_Events.count();
90 97 return r;
91 98 }
92 99
93 100 int CatalogueEventsTableModel::columnCount(const QModelIndex &parent) const
94 101 {
95 int c = static_cast<int>(CatalogueEventsTableModelPrivate::Column::NbColumn);
96 return c;
102 return static_cast<int>(CatalogueEventsTableModelPrivate::Column::NbColumn);
97 103 }
98 104
99 105 Qt::ItemFlags CatalogueEventsTableModel::flags(const QModelIndex &index) const
100 106 {
101 107 return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled;
102 108 }
103 109
104 110 QVariant CatalogueEventsTableModel::data(const QModelIndex &index, int role) const
105 111 {
106 112 if (index.isValid()) {
107 113 auto event = getEvent(index.row());
108 114
109 115 switch (role) {
110 116 case Qt::DisplayRole:
111 117 return impl->eventData(index.column(), event);
112 118 break;
113 119 }
114 120 }
115 121
116 122 return QVariant{};
117 123 }
118 124
119 125 QVariant CatalogueEventsTableModel::headerData(int section, Qt::Orientation orientation,
120 126 int role) const
121 127 {
122 128 if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
123 129 return impl->columnNames().value(section);
124 130 }
125 131
126 132 return QVariant();
127 133 }
128 134
129 135 void CatalogueEventsTableModel::sort(int column, Qt::SortOrder order)
130 136 {
131 137 std::sort(impl->m_Events.begin(), impl->m_Events.end(),
132 138 [this, column, order](auto e1, auto e2) {
133 139 auto data1 = impl->eventData(column, e1);
134 140 auto data2 = impl->eventData(column, e2);
135 141
136 142 auto result = data1.toString() < data2.toString();
137 143
138 144 return order == Qt::AscendingOrder ? result : !result;
139 145 });
140 146
141 147 emit dataChanged(QModelIndex(), QModelIndex());
142 148 }
143 149
144 150 Qt::DropActions CatalogueEventsTableModel::supportedDragActions() const
145 151 {
146 152 return Qt::CopyAction | Qt::MoveAction;
147 153 }
148 154
149 155 QStringList CatalogueEventsTableModel::mimeTypes() const
150 156 {
151 157 return {MIME_TYPE_EVENT_LIST, MIME_TYPE_TIME_RANGE};
152 158 }
153 159
154 160 QMimeData *CatalogueEventsTableModel::mimeData(const QModelIndexList &indexes) const
155 161 {
156 162 auto mimeData = new QMimeData;
157 163
158 164 QVector<std::shared_ptr<DBEvent> > eventList;
159 165
160 166 SqpRange firstTimeRange;
161 167 for (const auto &index : indexes) {
162 168 if (index.column() == 0) { // only the first column
163 169 auto event = getEvent(index.row());
164 170 if (eventList.isEmpty()) {
165 171 // Gets the range of the first variable
166 172 firstTimeRange.m_TStart = event->getTStart();
167 173 firstTimeRange.m_TEnd = event->getTEnd();
168 174 }
169 175
170 176 eventList << event;
171 177 }
172 178 }
173 179
174 180 auto eventsEncodedData
175 181 = QByteArray{}; // sqpApp->catalogueController().->mimeDataForEvents(eventList); //TODO
176 182 mimeData->setData(MIME_TYPE_EVENT_LIST, eventsEncodedData);
177 183
178 184 if (eventList.count() == 1) {
179 185 // No time range MIME data if multiple events are dragged
180 186 auto timeEncodedData = TimeController::mimeDataForTimeRange(firstTimeRange);
181 187 mimeData->setData(MIME_TYPE_TIME_RANGE, timeEncodedData);
182 188 }
183 189
184 190 return mimeData;
185 191 }
Show file before | Show file after | Hide comments
@@ -1,291 +1,296
1 1 #include "Catalogue/CatalogueEventsWidget.h"
2 2 #include "ui_CatalogueEventsWidget.h"
3 3
4 4 #include <Catalogue/CatalogueController.h>
5 5 #include <Catalogue/CatalogueEventsTableModel.h>
6 6 #include <CatalogueDao.h>
7 7 #include <DBCatalogue.h>
8 8 #include <SqpApplication.h>
9 9 #include <Visualization/VisualizationTabWidget.h>
10 10 #include <Visualization/VisualizationWidget.h>
11 11 #include <Visualization/VisualizationZoneWidget.h>
12 12
13 13 #include <QDialog>
14 14 #include <QDialogButtonBox>
15 15 #include <QListWidget>
16 16
17 17 Q_LOGGING_CATEGORY(LOG_CatalogueEventsWidget, "CatalogueEventsWidget")
18 18
19 19 /// Format of the dates appearing in the label of a cursor
20 20 const auto DATETIME_FORMAT = QStringLiteral("yyyy/MM/dd hh:mm:ss");
21 21
22 22 struct CatalogueEventsWidget::CatalogueEventsWidgetPrivate {
23 23
24 24 CatalogueEventsTableModel *m_Model = nullptr;
25 25 QStringList m_ZonesForTimeMode;
26 26 QString m_ZoneForGraphMode;
27 27
28 28 VisualizationWidget *m_VisualizationWidget = nullptr;
29 29
30 30 void setEvents(const QVector<std::shared_ptr<DBEvent> > &events, QTableView *tableView)
31 31 {
32 32 tableView->setSortingEnabled(false);
33 33 m_Model->setEvents(events);
34 34 tableView->setSortingEnabled(true);
35 35 }
36 36
37 37 void addEvent(const std::shared_ptr<DBEvent> &event, QTableView *tableView)
38 38 {
39 39 tableView->setSortingEnabled(false);
40 40 m_Model->addEvent(event);
41 41 tableView->setSortingEnabled(true);
42 42 }
43 43
44 44 void removeEvent(const std::shared_ptr<DBEvent> &event, QTableView *tableView)
45 45 {
46 46 tableView->setSortingEnabled(false);
47 47 m_Model->removeEvent(event);
48 48 tableView->setSortingEnabled(true);
49 49 }
50 50
51 51 QStringList getAvailableVisualizationZoneList() const
52 52 {
53 53 if (m_VisualizationWidget) {
54 54 if (auto tab = m_VisualizationWidget->currentTabWidget()) {
55 55 return tab->availableZoneWidgets();
56 56 }
57 57 }
58 58
59 59 return QStringList{};
60 60 }
61 61
62 62 QStringList selectZone(QWidget *parent, const QStringList &selectedZones,
63 63 bool allowMultiSelection, const QPoint &location)
64 64 {
65 65 auto availableZones = getAvailableVisualizationZoneList();
66 66 if (availableZones.isEmpty()) {
67 67 return QStringList{};
68 68 }
69 69
70 70 QDialog d(parent, Qt::Tool);
71 71 d.setWindowTitle("Choose a zone");
72 72 auto layout = new QVBoxLayout{&d};
73 73 layout->setContentsMargins(0, 0, 0, 0);
74 74 auto listWidget = new QListWidget{&d};
75 75 layout->addWidget(listWidget);
76 76
77 77 QSet<QListWidgetItem *> checkedItems;
78 78 for (auto zone : availableZones) {
79 79 auto item = new QListWidgetItem{zone};
80 80 item->setFlags(Qt::ItemIsEnabled | Qt::ItemIsUserCheckable);
81 81 if (selectedZones.contains(zone)) {
82 82 item->setCheckState(Qt::Checked);
83 83 checkedItems << item;
84 84 }
85 85 else {
86 86 item->setCheckState(Qt::Unchecked);
87 87 }
88 88
89 89 listWidget->addItem(item);
90 90 }
91 91
92 92 auto buttonBox = new QDialogButtonBox{QDialogButtonBox::Ok, &d};
93 93 layout->addWidget(buttonBox);
94 94
95 95 QObject::connect(buttonBox, &QDialogButtonBox::accepted, &d, &QDialog::accept);
96 96 QObject::connect(buttonBox, &QDialogButtonBox::rejected, &d, &QDialog::reject);
97 97
98 98 QObject::connect(listWidget, &QListWidget::itemChanged,
99 99 [&checkedItems, allowMultiSelection, listWidget](auto item) {
100 100 if (item->checkState() == Qt::Checked) {
101 101 if (!allowMultiSelection) {
102 102 for (auto checkedItem : checkedItems) {
103 103 listWidget->blockSignals(true);
104 104 checkedItem->setCheckState(Qt::Unchecked);
105 105 listWidget->blockSignals(false);
106 106 }
107 107
108 108 checkedItems.clear();
109 109 }
110 110 checkedItems << item;
111 111 }
112 112 else {
113 113 checkedItems.remove(item);
114 114 }
115 115 });
116 116
117 117 QStringList result;
118 118
119 119 d.setMinimumWidth(120);
120 120 d.resize(d.minimumSizeHint());
121 121 d.move(location);
122 122 if (d.exec() == QDialog::Accepted) {
123 123 for (auto item : checkedItems) {
124 124 result += item->text();
125 125 }
126 126 }
127 127 else {
128 128 result = selectedZones;
129 129 }
130 130
131 131 return result;
132 132 }
133 133
134 134 void updateForTimeMode(QTableView *tableView)
135 135 {
136 136 auto selectedRows = tableView->selectionModel()->selectedRows();
137 137
138 138 if (selectedRows.count() == 1) {
139 139 auto event = m_Model->getEvent(selectedRows.first().row());
140 140 if (m_VisualizationWidget) {
141 141 if (auto tab = m_VisualizationWidget->currentTabWidget()) {
142 142
143 143 for (auto zoneName : m_ZonesForTimeMode) {
144 144 if (auto zone = tab->getZoneWithName(zoneName)) {
145 145 SqpRange eventRange;
146 146 eventRange.m_TStart = event->getTStart();
147 147 eventRange.m_TEnd = event->getTEnd();
148 148 zone->setZoneRange(eventRange);
149 149 }
150 150 }
151 151 }
152 152 else {
153 153 qCWarning(LOG_CatalogueEventsWidget())
154 154 << "updateTimeZone: no tab found in the visualization";
155 155 }
156 156 }
157 157 else {
158 158 qCWarning(LOG_CatalogueEventsWidget())
159 159 << "updateTimeZone: visualization widget not found";
160 160 }
161 161 }
162 162 else {
163 163 qCWarning(LOG_CatalogueEventsWidget())
164 164 << "updateTimeZone: not compatible with multiple events selected";
165 165 }
166 166 }
167 167
168 168 void updateForGraphMode(QTableView *tableView)
169 169 {
170 170 auto selectedRows = tableView->selectionModel()->selectedRows();
171 171
172 172 if (selectedRows.count() == 1) {
173 173 auto event = m_Model->getEvent(selectedRows.first().row());
174 174 if (m_VisualizationWidget) {
175 175 if (auto tab = m_VisualizationWidget->currentTabWidget()) {
176 176 if (auto zone = tab->getZoneWithName(m_ZoneForGraphMode)) {
177 177 // TODO
178 178 }
179 179 }
180 180 else {
181 181 qCWarning(LOG_CatalogueEventsWidget())
182 182 << "updateGraphMode: no tab found in the visualization";
183 183 }
184 184 }
185 185 else {
186 186 qCWarning(LOG_CatalogueEventsWidget())
187 187 << "updateGraphMode: visualization widget not found";
188 188 }
189 189 }
190 190 else {
191 191 qCWarning(LOG_CatalogueEventsWidget())
192 192 << "updateGraphMode: not compatible with multiple events selected";
193 193 }
194 194 }
195 195 };
196 196
197 197 CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
198 198 : QWidget(parent),
199 199 ui(new Ui::CatalogueEventsWidget),
200 200 impl{spimpl::make_unique_impl<CatalogueEventsWidgetPrivate>()}
201 201 {
202 202 ui->setupUi(this);
203 203
204 204 impl->m_Model = new CatalogueEventsTableModel{this};
205 205 ui->tableView->setModel(impl->m_Model);
206 206
207 207 ui->tableView->setSortingEnabled(true);
208 208 ui->tableView->setDragDropMode(QAbstractItemView::DragDrop);
209 209 ui->tableView->setDragEnabled(true);
210 210
211 211 connect(ui->btnTime, &QToolButton::clicked, [this](auto checked) {
212 212 if (checked) {
213 213 ui->btnChart->setChecked(false);
214 214 impl->m_ZonesForTimeMode
215 215 = impl->selectZone(this, impl->m_ZonesForTimeMode, true,
216 216 this->mapToGlobal(ui->btnTime->frameGeometry().center()));
217 217
218 218 impl->updateForTimeMode(ui->tableView);
219 219 }
220 220 });
221 221
222 222 connect(ui->btnChart, &QToolButton::clicked, [this](auto checked) {
223 223 if (checked) {
224 224 ui->btnTime->setChecked(false);
225 225 impl->m_ZoneForGraphMode
226 226 = impl->selectZone(this, {impl->m_ZoneForGraphMode}, false,
227 227 this->mapToGlobal(ui->btnChart->frameGeometry().center()))
228 228 .value(0);
229 229
230 230 impl->updateForGraphMode(ui->tableView);
231 231 }
232 232 });
233 233
234 234 auto emitSelection = [this]() {
235 235 QVector<std::shared_ptr<DBEvent> > events;
236 236 for (auto rowIndex : ui->tableView->selectionModel()->selectedRows()) {
237 237 events << impl->m_Model->getEvent(rowIndex.row());
238 238 }
239 239
240 240 emit this->eventsSelected(events);
241 241 };
242 242
243 243 connect(ui->tableView, &QTableView::clicked, emitSelection);
244 244 connect(ui->tableView->selectionModel(), &QItemSelectionModel::selectionChanged, emitSelection);
245 245
246 246 connect(ui->tableView->selectionModel(), &QItemSelectionModel::selectionChanged, [this]() {
247 247 auto isNotMultiSelection = ui->tableView->selectionModel()->selectedRows().count() <= 1;
248 248 ui->btnChart->setEnabled(isNotMultiSelection);
249 249 ui->btnTime->setEnabled(isNotMultiSelection);
250 250
251 251 if (isNotMultiSelection && ui->btnTime->isChecked()) {
252 252 impl->updateForTimeMode(ui->tableView);
253 253 }
254 254 else if (isNotMultiSelection && ui->btnChart->isChecked()) {
255 255 impl->updateForGraphMode(ui->tableView);
256 256 }
257 257 });
258 258
259 259 ui->tableView->horizontalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
260 260 ui->tableView->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Stretch);
261 261 ui->tableView->horizontalHeader()->setSortIndicatorShown(true);
262 262 }
263 263
264 264 CatalogueEventsWidget::~CatalogueEventsWidget()
265 265 {
266 266 delete ui;
267 267 }
268 268
269 269 void CatalogueEventsWidget::setVisualizationWidget(VisualizationWidget *visualization)
270 270 {
271 271 impl->m_VisualizationWidget = visualization;
272 272 }
273 273
274 void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &event, bool hasChanges)
275 {
276 impl->m_Model->refreshEvent(event);
277 }
278
274 279 void CatalogueEventsWidget::populateWithCatalogues(
275 280 const QVector<std::shared_ptr<DBCatalogue> > &catalogues)
276 281 {
277 282 QSet<QUuid> eventIds;
278 283 QVector<std::shared_ptr<DBEvent> > events;
279 284
280 285 for (auto catalogue : catalogues) {
281 286 auto catalogueEvents = sqpApp->catalogueController().retrieveEventsFromCatalogue(catalogue);
282 287 for (auto event : catalogueEvents) {
283 288 if (!eventIds.contains(event->getUniqId())) {
284 289 events << event;
285 290 eventIds.insert(event->getUniqId());
286 291 }
287 292 }
288 293 }
289 294
290 295 impl->setEvents(events, ui->tableView);
291 296 }
Show file before | Show file after | Hide comments
@@ -1,64 +1,67
1 1 #include "Catalogue/CatalogueExplorer.h"
2 2 #include "ui_CatalogueExplorer.h"
3 3
4 4 #include <Visualization/VisualizationWidget.h>
5 5
6 6 #include <DBCatalogue.h>
7 7 #include <DBEvent.h>
8 8
9 9 struct CatalogueExplorer::CatalogueExplorerPrivate {
10 10 };
11 11
12 12 CatalogueExplorer::CatalogueExplorer(QWidget *parent)
13 13 : QDialog(parent, Qt::Dialog | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint),
14 14 ui(new Ui::CatalogueExplorer),
15 15 impl{spimpl::make_unique_impl<CatalogueExplorerPrivate>()}
16 16 {
17 17 ui->setupUi(this);
18 18
19 19 connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSelected, [this](auto catalogues) {
20 20 if (catalogues.count() == 1) {
21 21 ui->inspector->setCatalogue(catalogues.first());
22 22 }
23 23 else {
24 24 ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
25 25 }
26 26
27 27 ui->events->populateWithCatalogues(catalogues);
28 28 });
29 29
30 30 connect(ui->catalogues, &CatalogueSideBarWidget::databaseSelected, [this](auto databases) {
31 31 ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
32 32 });
33 33
34 34 connect(ui->catalogues, &CatalogueSideBarWidget::trashSelected,
35 35 [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
36 36
37 37 connect(ui->catalogues, &CatalogueSideBarWidget::allEventsSelected,
38 38 [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
39 39
40 40 connect(ui->catalogues, &CatalogueSideBarWidget::selectionCleared,
41 41 [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
42 42
43 43 connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
44 44 if (events.count() == 1) {
45 45 ui->inspector->setEvent(events.first());
46 46 }
47 47 else {
48 48 ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
49 49 }
50 50 });
51 51
52 52 connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated,
53 53 [this](auto catalogue) { ui->catalogues->setCatalogueChanges(catalogue, true); });
54
55 connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated,
56 [this](auto event) { ui->events->setEventChanges(event, true); });
54 57 }
55 58
56 59 CatalogueExplorer::~CatalogueExplorer()
57 60 {
58 61 delete ui;
59 62 }
60 63
61 64 void CatalogueExplorer::setVisualizationWidget(VisualizationWidget *visualization)
62 65 {
63 66 ui->events->setVisualizationWidget(visualization);
64 67 }
Show file before | Show file after | Hide comments
@@ -1,89 +1,146
1 1 #include "Catalogue/CatalogueInspectorWidget.h"
2 2 #include "ui_CatalogueInspectorWidget.h"
3 3
4 4 #include <Common/DateUtils.h>
5 5 #include <DBCatalogue.h>
6 6 #include <DBEvent.h>
7 7 #include <DBTag.h>
8 8
9 9 struct CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate {
10 10 std::shared_ptr<DBCatalogue> m_DisplayedCatalogue = nullptr;
11 11 std::shared_ptr<DBEvent> m_DisplayedEvent = nullptr;
12
13 void connectCatalogueUpdateSignals(CatalogueInspectorWidget *inspector,
14 Ui::CatalogueInspectorWidget *ui);
15 void connectEventUpdateSignals(CatalogueInspectorWidget *inspector,
16 Ui::CatalogueInspectorWidget *ui);
12 17 };
13 18
14 19 CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)
15 20 : QWidget(parent),
16 21 ui(new Ui::CatalogueInspectorWidget),
17 22 impl{spimpl::make_unique_impl<CatalogueInspectorWidgetPrivate>()}
18 23 {
19 24 ui->setupUi(this);
20 25 showPage(Page::Empty);
21 26
22 connect(ui->leCatalogueName, &QLineEdit::editingFinished, [this]() {
23 if (ui->leCatalogueName->text() != impl->m_DisplayedCatalogue->getName()) {
24 impl->m_DisplayedCatalogue->setName(ui->leCatalogueName->text());
25 emit this->catalogueUpdated(impl->m_DisplayedCatalogue);
27 impl->connectCatalogueUpdateSignals(this, ui);
28 impl->connectEventUpdateSignals(this, ui);
29 }
30
31 CatalogueInspectorWidget::~CatalogueInspectorWidget()
32 {
33 delete ui;
34 }
35
36 void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectCatalogueUpdateSignals(
37 CatalogueInspectorWidget *inspector, Ui::CatalogueInspectorWidget *ui)
38 {
39 connect(ui->leCatalogueName, &QLineEdit::editingFinished, [ui, inspector, this]() {
40 if (ui->leCatalogueName->text() != m_DisplayedCatalogue->getName()) {
41 m_DisplayedCatalogue->setName(ui->leCatalogueName->text());
42 emit inspector->catalogueUpdated(m_DisplayedCatalogue);
26 43 }
27 44 });
28 45
29 connect(ui->leCatalogueAuthor, &QLineEdit::editingFinished, [this]() {
30 if (ui->leCatalogueAuthor->text() != impl->m_DisplayedCatalogue->getAuthor()) {
31 impl->m_DisplayedCatalogue->setAuthor(ui->leCatalogueAuthor->text());
32 emit this->catalogueUpdated(impl->m_DisplayedCatalogue);
46 connect(ui->leCatalogueAuthor, &QLineEdit::editingFinished, [ui, inspector, this]() {
47 if (ui->leCatalogueAuthor->text() != m_DisplayedCatalogue->getAuthor()) {
48 m_DisplayedCatalogue->setAuthor(ui->leCatalogueAuthor->text());
49 emit inspector->catalogueUpdated(m_DisplayedCatalogue);
33 50 }
34 51 });
35 52 }
36 53
37 CatalogueInspectorWidget::~CatalogueInspectorWidget()
54 void CatalogueInspectorWidget::CatalogueInspectorWidgetPrivate::connectEventUpdateSignals(
55 CatalogueInspectorWidget *inspector, Ui::CatalogueInspectorWidget *ui)
38 56 {
39 delete ui;
57 connect(ui->leEventName, &QLineEdit::editingFinished, [ui, inspector, this]() {
58 if (ui->leEventName->text() != m_DisplayedEvent->getName()) {
59 m_DisplayedEvent->setName(ui->leEventName->text());
60 emit inspector->eventUpdated(m_DisplayedEvent);
61 }
62 });
63
64 connect(ui->leEventMission, &QLineEdit::editingFinished, [ui, inspector, this]() {
65 if (ui->leEventMission->text() != m_DisplayedEvent->getMission()) {
66 m_DisplayedEvent->setMission(ui->leEventMission->text());
67 emit inspector->eventUpdated(m_DisplayedEvent);
68 }
69 });
70
71 connect(ui->leEventProduct, &QLineEdit::editingFinished, [ui, inspector, this]() {
72 if (ui->leEventProduct->text() != m_DisplayedEvent->getProduct()) {
73 m_DisplayedEvent->setProduct(ui->leEventProduct->text());
74 emit inspector->eventUpdated(m_DisplayedEvent);
75 }
76 });
77
78 connect(ui->leEventTags, &QLineEdit::editingFinished, [ui, inspector, this]() {
79 // TODO
80 });
81
82 connect(ui->dateTimeEventTStart, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
83 auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTStart->dateTime());
84 if (time != m_DisplayedEvent->getTStart()) {
85 m_DisplayedEvent->setTStart(time);
86 emit inspector->eventUpdated(m_DisplayedEvent);
87 }
88 });
89
90 connect(ui->dateTimeEventTEnd, &QDateTimeEdit::editingFinished, [ui, inspector, this]() {
91 auto time = DateUtils::secondsSinceEpoch(ui->dateTimeEventTEnd->dateTime());
92 if (time != m_DisplayedEvent->getTEnd()) {
93 m_DisplayedEvent->setTEnd(time);
94 emit inspector->eventUpdated(m_DisplayedEvent);
95 }
96 });
40 97 }
41 98
42 99 void CatalogueInspectorWidget::showPage(CatalogueInspectorWidget::Page page)
43 100 {
44 101 ui->stackedWidget->setCurrentIndex(static_cast<int>(page));
45 102 }
46 103
47 104 CatalogueInspectorWidget::Page CatalogueInspectorWidget::currentPage() const
48 105 {
49 106 return static_cast<Page>(ui->stackedWidget->currentIndex());
50 107 }
51 108
52 109 void CatalogueInspectorWidget::setEvent(const std::shared_ptr<DBEvent> &event)
53 110 {
54 111 impl->m_DisplayedEvent = event;
55 112
56 113 blockSignals(true);
57 114
58 115 showPage(Page::EventProperties);
59 116 ui->leEventName->setText(event->getName());
60 117 ui->leEventMission->setText(event->getMission());
61 118 ui->leEventProduct->setText(event->getProduct());
62 119
63 120 QString tagList;
64 121 auto tags = event->getTags();
65 122 for (auto tag : tags) {
66 123 tagList += tag.getName();
67 124 tagList += ' ';
68 125 }
69 126
70 127 ui->leEventTags->setText(tagList);
71 128
72 129 ui->dateTimeEventTStart->setDateTime(DateUtils::dateTime(event->getTStart()));
73 130 ui->dateTimeEventTEnd->setDateTime(DateUtils::dateTime(event->getTEnd()));
74 131
75 132 blockSignals(false);
76 133 }
77 134
78 135 void CatalogueInspectorWidget::setCatalogue(const std::shared_ptr<DBCatalogue> &catalogue)
79 136 {
80 137 impl->m_DisplayedCatalogue = catalogue;
81 138
82 139 blockSignals(true);
83 140
84 141 showPage(Page::CatalogueProperties);
85 142 ui->leCatalogueName->setText(catalogue->getName());
86 143 ui->leCatalogueAuthor->setText(catalogue->getAuthor());
87 144
88 145 blockSignals(false);
89 146 }
Show file before | Show file after | Hide comments
@@ -1,214 +1,222
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <ui version="4.0">
3 3 <class>CatalogueInspectorWidget</class>
4 4 <widget class="QWidget" name="CatalogueInspectorWidget">
5 5 <property name="geometry">
6 6 <rect>
7 7 <x>0</x>
8 8 <y>0</y>
9 9 <width>400</width>
10 10 <height>300</height>
11 11 </rect>
12 12 </property>
13 13 <property name="windowTitle">
14 14 <string>Form</string>
15 15 </property>
16 16 <layout class="QVBoxLayout" name="verticalLayout_2">
17 17 <property name="leftMargin">
18 18 <number>0</number>
19 19 </property>
20 20 <property name="topMargin">
21 21 <number>0</number>
22 22 </property>
23 23 <property name="rightMargin">
24 24 <number>0</number>
25 25 </property>
26 26 <property name="bottomMargin">
27 27 <number>0</number>
28 28 </property>
29 29 <item>
30 30 <widget class="QFrame" name="frame">
31 31 <property name="frameShape">
32 32 <enum>QFrame::Box</enum>
33 33 </property>
34 34 <property name="frameShadow">
35 35 <enum>QFrame::Sunken</enum>
36 36 </property>
37 37 <property name="lineWidth">
38 38 <number>1</number>
39 39 </property>
40 40 <layout class="QVBoxLayout" name="verticalLayout">
41 41 <property name="leftMargin">
42 42 <number>0</number>
43 43 </property>
44 44 <property name="topMargin">
45 45 <number>0</number>
46 46 </property>
47 47 <property name="rightMargin">
48 48 <number>0</number>
49 49 </property>
50 50 <property name="bottomMargin">
51 51 <number>0</number>
52 52 </property>
53 53 <item>
54 54 <widget class="QStackedWidget" name="stackedWidget">
55 55 <property name="currentIndex">
56 56 <number>1</number>
57 57 </property>
58 58 <widget class="QWidget" name="emptyPage"/>
59 59 <widget class="QWidget" name="catalogueInspectorPage">
60 60 <layout class="QGridLayout" name="gridLayout_2">
61 61 <item row="1" column="0">
62 62 <widget class="QLabel" name="label_7">
63 63 <property name="text">
64 64 <string>Name</string>
65 65 </property>
66 66 </widget>
67 67 </item>
68 68 <item row="1" column="1">
69 69 <widget class="QLineEdit" name="leCatalogueName"/>
70 70 </item>
71 71 <item row="2" column="0">
72 72 <widget class="QLabel" name="label_8">
73 73 <property name="text">
74 74 <string>Author</string>
75 75 </property>
76 76 </widget>
77 77 </item>
78 78 <item row="2" column="1">
79 79 <widget class="QLineEdit" name="leCatalogueAuthor">
80 80 <property name="text">
81 81 <string/>
82 82 </property>
83 83 </widget>
84 84 </item>
85 85 <item row="3" column="1">
86 86 <spacer name="verticalSpacer_2">
87 87 <property name="orientation">
88 88 <enum>Qt::Vertical</enum>
89 89 </property>
90 90 <property name="sizeHint" stdset="0">
91 91 <size>
92 92 <width>20</width>
93 93 <height>40</height>
94 94 </size>
95 95 </property>
96 96 </spacer>
97 97 </item>
98 98 <item row="0" column="0" colspan="2">
99 99 <widget class="QLabel" name="label_9">
100 100 <property name="font">
101 101 <font>
102 102 <pointsize>10</pointsize>
103 103 <weight>75</weight>
104 104 <bold>true</bold>
105 105 </font>
106 106 </property>
107 107 <property name="text">
108 108 <string>Catalogue Properties</string>
109 109 </property>
110 110 </widget>
111 111 </item>
112 112 </layout>
113 113 </widget>
114 114 <widget class="QWidget" name="eventInspectorPage">
115 115 <layout class="QGridLayout" name="gridLayout">
116 116 <item row="5" column="1">
117 <widget class="QDateTimeEdit" name="dateTimeEventTEnd"/>
117 <widget class="QDateTimeEdit" name="dateTimeEventTEnd">
118 <property name="timeSpec">
119 <enum>Qt::UTC</enum>
120 </property>
121 </widget>
118 122 </item>
119 123 <item row="4" column="0">
120 124 <widget class="QLabel" name="label_4">
121 125 <property name="text">
122 126 <string>TStart</string>
123 127 </property>
124 128 </widget>
125 129 </item>
126 130 <item row="6" column="0">
127 131 <widget class="QLabel" name="label_6">
128 132 <property name="text">
129 133 <string>Tags</string>
130 134 </property>
131 135 </widget>
132 136 </item>
133 137 <item row="3" column="0">
134 138 <widget class="QLabel" name="label_3">
135 139 <property name="text">
136 140 <string>Product</string>
137 141 </property>
138 142 </widget>
139 143 </item>
140 144 <item row="3" column="1">
141 145 <widget class="QLineEdit" name="leEventProduct"/>
142 146 </item>
143 147 <item row="5" column="0">
144 148 <widget class="QLabel" name="label_5">
145 149 <property name="text">
146 150 <string>Tend</string>
147 151 </property>
148 152 </widget>
149 153 </item>
150 154 <item row="4" column="1">
151 <widget class="QDateTimeEdit" name="dateTimeEventTStart"/>
155 <widget class="QDateTimeEdit" name="dateTimeEventTStart">
156 <property name="timeSpec">
157 <enum>Qt::UTC</enum>
158 </property>
159 </widget>
152 160 </item>
153 161 <item row="2" column="0">
154 162 <widget class="QLabel" name="label_2">
155 163 <property name="text">
156 164 <string>Mission</string>
157 165 </property>
158 166 </widget>
159 167 </item>
160 168 <item row="1" column="1">
161 169 <widget class="QLineEdit" name="leEventName"/>
162 170 </item>
163 171 <item row="1" column="0">
164 172 <widget class="QLabel" name="label">
165 173 <property name="text">
166 174 <string>Name</string>
167 175 </property>
168 176 </widget>
169 177 </item>
170 178 <item row="2" column="1">
171 179 <widget class="QLineEdit" name="leEventMission"/>
172 180 </item>
173 181 <item row="6" column="1">
174 182 <widget class="QLineEdit" name="leEventTags"/>
175 183 </item>
176 184 <item row="7" column="1">
177 185 <spacer name="verticalSpacer">
178 186 <property name="orientation">
179 187 <enum>Qt::Vertical</enum>
180 188 </property>
181 189 <property name="sizeHint" stdset="0">
182 190 <size>
183 191 <width>20</width>
184 192 <height>40</height>
185 193 </size>
186 194 </property>
187 195 </spacer>
188 196 </item>
189 197 <item row="0" column="0" colspan="2">
190 198 <widget class="QLabel" name="label_10">
191 199 <property name="font">
192 200 <font>
193 201 <pointsize>10</pointsize>
194 202 <weight>75</weight>
195 203 <bold>true</bold>
196 204 </font>
197 205 </property>
198 206 <property name="text">
199 207 <string>Event Properties</string>
200 208 </property>
201 209 </widget>
202 210 </item>
203 211 </layout>
204 212 </widget>
205 213 </widget>
206 214 </item>
207 215 </layout>
208 216 </widget>
209 217 </item>
210 218 </layout>
211 219 </widget>
212 220 <resources/>
213 221 <connections/>
214 222 </ui>
General Comments 0
You need to be logged in to leave comments. Login now