Auto status change to "Under Review"
@@ -1,336 +1,353 | |||||
1 | #include "DragDropHelper.h" |
|
1 | #include "DragDropHelper.h" | |
2 | #include "SqpApplication.h" |
|
2 | #include "SqpApplication.h" | |
3 | #include "Visualization/VisualizationDragDropContainer.h" |
|
3 | #include "Visualization/VisualizationDragDropContainer.h" | |
4 | #include "Visualization/VisualizationDragWidget.h" |
|
4 | #include "Visualization/VisualizationDragWidget.h" | |
5 | #include "Visualization/VisualizationWidget.h" |
|
5 | #include "Visualization/VisualizationWidget.h" | |
6 | #include "Visualization/operations/FindVariableOperation.h" |
|
6 | #include "Visualization/operations/FindVariableOperation.h" | |
7 |
|
7 | |||
|
8 | #include "Variable/Variable.h" | |||
8 | #include "Variable/VariableController.h" |
|
9 | #include "Variable/VariableController.h" | |
9 |
|
10 | |||
10 | #include "Common/MimeTypesDef.h" |
|
11 | #include "Common/MimeTypesDef.h" | |
11 | #include "Common/VisualizationDef.h" |
|
12 | #include "Common/VisualizationDef.h" | |
12 |
|
13 | |||
13 | #include <QDir> |
|
14 | #include <QDir> | |
14 | #include <QDragEnterEvent> |
|
15 | #include <QDragEnterEvent> | |
15 | #include <QDragMoveEvent> |
|
16 | #include <QDragMoveEvent> | |
16 | #include <QScrollArea> |
|
17 | #include <QScrollArea> | |
17 | #include <QScrollBar> |
|
18 | #include <QScrollBar> | |
18 | #include <QTimer> |
|
19 | #include <QTimer> | |
19 | #include <QVBoxLayout> |
|
20 | #include <QVBoxLayout> | |
20 |
|
21 | |||
21 | const int SCROLL_SPEED = 5; |
|
22 | const int SCROLL_SPEED = 5; | |
22 | const int SCROLL_ZONE_SIZE = 50; |
|
23 | const int SCROLL_ZONE_SIZE = 50; | |
23 |
|
24 | |||
24 | Q_LOGGING_CATEGORY(LOG_DragDropHelper, "DragDrophelper") |
|
25 | Q_LOGGING_CATEGORY(LOG_DragDropHelper, "DragDrophelper") | |
25 |
|
26 | |||
26 | struct DragDropScroller::DragDropScrollerPrivate { |
|
27 | struct DragDropScroller::DragDropScrollerPrivate { | |
27 |
|
28 | |||
28 | QList<QScrollArea *> m_ScrollAreas; |
|
29 | QList<QScrollArea *> m_ScrollAreas; | |
29 | QScrollArea *m_CurrentScrollArea = nullptr; |
|
30 | QScrollArea *m_CurrentScrollArea = nullptr; | |
30 | std::unique_ptr<QTimer> m_Timer = nullptr; |
|
31 | std::unique_ptr<QTimer> m_Timer = nullptr; | |
31 |
|
32 | |||
32 | enum class ScrollDirection { up, down, unknown }; |
|
33 | enum class ScrollDirection { up, down, unknown }; | |
33 | ScrollDirection m_Direction = ScrollDirection::unknown; |
|
34 | ScrollDirection m_Direction = ScrollDirection::unknown; | |
34 |
|
35 | |||
35 | explicit DragDropScrollerPrivate() : m_Timer{std::make_unique<QTimer>()} |
|
36 | explicit DragDropScrollerPrivate() : m_Timer{std::make_unique<QTimer>()} | |
36 | { |
|
37 | { | |
37 | m_Timer->setInterval(0); |
|
38 | m_Timer->setInterval(0); | |
38 | } |
|
39 | } | |
39 | }; |
|
40 | }; | |
40 |
|
41 | |||
41 | DragDropScroller::DragDropScroller(QObject *parent) |
|
42 | DragDropScroller::DragDropScroller(QObject *parent) | |
42 | : QObject{parent}, impl{spimpl::make_unique_impl<DragDropScrollerPrivate>()} |
|
43 | : QObject{parent}, impl{spimpl::make_unique_impl<DragDropScrollerPrivate>()} | |
43 | { |
|
44 | { | |
44 | connect(impl->m_Timer.get(), &QTimer::timeout, this, &DragDropScroller::onTimer); |
|
45 | connect(impl->m_Timer.get(), &QTimer::timeout, this, &DragDropScroller::onTimer); | |
45 | } |
|
46 | } | |
46 |
|
47 | |||
47 | void DragDropScroller::addScrollArea(QScrollArea *scrollArea) |
|
48 | void DragDropScroller::addScrollArea(QScrollArea *scrollArea) | |
48 | { |
|
49 | { | |
49 | impl->m_ScrollAreas << scrollArea; |
|
50 | impl->m_ScrollAreas << scrollArea; | |
50 | scrollArea->viewport()->setAcceptDrops(true); |
|
51 | scrollArea->viewport()->setAcceptDrops(true); | |
51 | } |
|
52 | } | |
52 |
|
53 | |||
53 | void DragDropScroller::removeScrollArea(QScrollArea *scrollArea) |
|
54 | void DragDropScroller::removeScrollArea(QScrollArea *scrollArea) | |
54 | { |
|
55 | { | |
55 | impl->m_ScrollAreas.removeAll(scrollArea); |
|
56 | impl->m_ScrollAreas.removeAll(scrollArea); | |
56 | scrollArea->viewport()->setAcceptDrops(false); |
|
57 | scrollArea->viewport()->setAcceptDrops(false); | |
57 | } |
|
58 | } | |
58 |
|
59 | |||
59 | bool DragDropScroller::eventFilter(QObject *obj, QEvent *event) |
|
60 | bool DragDropScroller::eventFilter(QObject *obj, QEvent *event) | |
60 | { |
|
61 | { | |
61 | if (event->type() == QEvent::DragMove) { |
|
62 | if (event->type() == QEvent::DragMove) { | |
62 | auto w = static_cast<QWidget *>(obj); |
|
63 | auto w = static_cast<QWidget *>(obj); | |
63 |
|
64 | |||
64 | if (impl->m_CurrentScrollArea && impl->m_CurrentScrollArea->isAncestorOf(w)) { |
|
65 | if (impl->m_CurrentScrollArea && impl->m_CurrentScrollArea->isAncestorOf(w)) { | |
65 | auto moveEvent = static_cast<QDragMoveEvent *>(event); |
|
66 | auto moveEvent = static_cast<QDragMoveEvent *>(event); | |
66 |
|
67 | |||
67 | auto pos = moveEvent->pos(); |
|
68 | auto pos = moveEvent->pos(); | |
68 | if (impl->m_CurrentScrollArea->viewport() != w) { |
|
69 | if (impl->m_CurrentScrollArea->viewport() != w) { | |
69 | auto globalPos = w->mapToGlobal(moveEvent->pos()); |
|
70 | auto globalPos = w->mapToGlobal(moveEvent->pos()); | |
70 | pos = impl->m_CurrentScrollArea->viewport()->mapFromGlobal(globalPos); |
|
71 | pos = impl->m_CurrentScrollArea->viewport()->mapFromGlobal(globalPos); | |
71 | } |
|
72 | } | |
72 |
|
73 | |||
73 | auto isInTopZone = pos.y() > impl->m_CurrentScrollArea->viewport()->size().height() |
|
74 | auto isInTopZone = pos.y() > impl->m_CurrentScrollArea->viewport()->size().height() | |
74 | - SCROLL_ZONE_SIZE; |
|
75 | - SCROLL_ZONE_SIZE; | |
75 | auto isInBottomZone = pos.y() < SCROLL_ZONE_SIZE; |
|
76 | auto isInBottomZone = pos.y() < SCROLL_ZONE_SIZE; | |
76 |
|
77 | |||
77 | if (!isInTopZone && !isInBottomZone) { |
|
78 | if (!isInTopZone && !isInBottomZone) { | |
78 | impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown; |
|
79 | impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown; | |
79 | impl->m_Timer->stop(); |
|
80 | impl->m_Timer->stop(); | |
80 | } |
|
81 | } | |
81 | else if (!impl->m_Timer->isActive()) { |
|
82 | else if (!impl->m_Timer->isActive()) { | |
82 | impl->m_Direction = isInTopZone ? DragDropScrollerPrivate::ScrollDirection::up |
|
83 | impl->m_Direction = isInTopZone ? DragDropScrollerPrivate::ScrollDirection::up | |
83 | : DragDropScrollerPrivate::ScrollDirection::down; |
|
84 | : DragDropScrollerPrivate::ScrollDirection::down; | |
84 | impl->m_Timer->start(); |
|
85 | impl->m_Timer->start(); | |
85 | } |
|
86 | } | |
86 | } |
|
87 | } | |
87 | } |
|
88 | } | |
88 | else if (event->type() == QEvent::DragEnter) { |
|
89 | else if (event->type() == QEvent::DragEnter) { | |
89 | auto w = static_cast<QWidget *>(obj); |
|
90 | auto w = static_cast<QWidget *>(obj); | |
90 |
|
91 | |||
91 | for (auto scrollArea : impl->m_ScrollAreas) { |
|
92 | for (auto scrollArea : impl->m_ScrollAreas) { | |
92 | if (impl->m_CurrentScrollArea != scrollArea && scrollArea->isAncestorOf(w)) { |
|
93 | if (impl->m_CurrentScrollArea != scrollArea && scrollArea->isAncestorOf(w)) { | |
93 | auto enterEvent = static_cast<QDragEnterEvent *>(event); |
|
94 | auto enterEvent = static_cast<QDragEnterEvent *>(event); | |
94 | enterEvent->acceptProposedAction(); |
|
95 | enterEvent->acceptProposedAction(); | |
95 | enterEvent->setDropAction(Qt::IgnoreAction); |
|
96 | enterEvent->setDropAction(Qt::IgnoreAction); | |
96 | impl->m_CurrentScrollArea = scrollArea; |
|
97 | impl->m_CurrentScrollArea = scrollArea; | |
97 | break; |
|
98 | break; | |
98 | } |
|
99 | } | |
99 | } |
|
100 | } | |
100 | } |
|
101 | } | |
101 | else if (event->type() == QEvent::DragLeave) { |
|
102 | else if (event->type() == QEvent::DragLeave) { | |
102 | if (impl->m_CurrentScrollArea) { |
|
103 | if (impl->m_CurrentScrollArea) { | |
103 | if (!QRect(QPoint(), impl->m_CurrentScrollArea->size()) |
|
104 | if (!QRect(QPoint(), impl->m_CurrentScrollArea->size()) | |
104 | .contains(impl->m_CurrentScrollArea->mapFromGlobal(QCursor::pos()))) { |
|
105 | .contains(impl->m_CurrentScrollArea->mapFromGlobal(QCursor::pos()))) { | |
105 | impl->m_CurrentScrollArea = nullptr; |
|
106 | impl->m_CurrentScrollArea = nullptr; | |
106 | impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown; |
|
107 | impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown; | |
107 | impl->m_Timer->stop(); |
|
108 | impl->m_Timer->stop(); | |
108 | } |
|
109 | } | |
109 | } |
|
110 | } | |
110 | } |
|
111 | } | |
111 | else if (event->type() == QEvent::Drop) { |
|
112 | else if (event->type() == QEvent::Drop) { | |
112 | if (impl->m_CurrentScrollArea) { |
|
113 | if (impl->m_CurrentScrollArea) { | |
113 | impl->m_CurrentScrollArea = nullptr; |
|
114 | impl->m_CurrentScrollArea = nullptr; | |
114 | impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown; |
|
115 | impl->m_Direction = DragDropScrollerPrivate::ScrollDirection::unknown; | |
115 | impl->m_Timer->stop(); |
|
116 | impl->m_Timer->stop(); | |
116 | } |
|
117 | } | |
117 | } |
|
118 | } | |
118 |
|
119 | |||
119 | return false; |
|
120 | return false; | |
120 | } |
|
121 | } | |
121 |
|
122 | |||
122 | void DragDropScroller::onTimer() |
|
123 | void DragDropScroller::onTimer() | |
123 | { |
|
124 | { | |
124 | if (impl->m_CurrentScrollArea) { |
|
125 | if (impl->m_CurrentScrollArea) { | |
125 | auto mvt = 0; |
|
126 | auto mvt = 0; | |
126 | switch (impl->m_Direction) { |
|
127 | switch (impl->m_Direction) { | |
127 | case DragDropScrollerPrivate::ScrollDirection::up: |
|
128 | case DragDropScrollerPrivate::ScrollDirection::up: | |
128 | mvt = SCROLL_SPEED; |
|
129 | mvt = SCROLL_SPEED; | |
129 | break; |
|
130 | break; | |
130 | case DragDropScrollerPrivate::ScrollDirection::down: |
|
131 | case DragDropScrollerPrivate::ScrollDirection::down: | |
131 | mvt = -SCROLL_SPEED; |
|
132 | mvt = -SCROLL_SPEED; | |
132 | break; |
|
133 | break; | |
133 | default: |
|
134 | default: | |
134 | break; |
|
135 | break; | |
135 | } |
|
136 | } | |
136 |
|
137 | |||
137 | impl->m_CurrentScrollArea->verticalScrollBar()->setValue( |
|
138 | impl->m_CurrentScrollArea->verticalScrollBar()->setValue( | |
138 | impl->m_CurrentScrollArea->verticalScrollBar()->value() + mvt); |
|
139 | impl->m_CurrentScrollArea->verticalScrollBar()->value() + mvt); | |
139 | } |
|
140 | } | |
140 | } |
|
141 | } | |
141 |
|
142 | |||
142 | struct DragDropHelper::DragDropHelperPrivate { |
|
143 | struct DragDropHelper::DragDropHelperPrivate { | |
143 |
|
144 | |||
144 | VisualizationDragWidget *m_CurrentDragWidget = nullptr; |
|
145 | VisualizationDragWidget *m_CurrentDragWidget = nullptr; | |
145 | std::unique_ptr<QWidget> m_PlaceHolder = nullptr; |
|
146 | std::unique_ptr<QWidget> m_PlaceHolder = nullptr; | |
146 | std::unique_ptr<DragDropScroller> m_DragDropScroller = nullptr; |
|
147 | std::unique_ptr<DragDropScroller> m_DragDropScroller = nullptr; | |
147 | QString m_ImageTempUrl; // Temporary file for image url generated by the drag & drop. Not using |
|
148 | QString m_ImageTempUrl; // Temporary file for image url generated by the drag & drop. Not using | |
148 | // QTemporaryFile to have a name which is not generated. |
|
149 | // QTemporaryFile to have a name which is not generated. | |
149 |
|
150 | |||
150 | VisualizationDragWidget *m_HighlightedDragWidget = nullptr; |
|
151 | VisualizationDragWidget *m_HighlightedDragWidget = nullptr; | |
151 |
|
152 | |||
152 | QMetaObject::Connection m_DragWidgetDestroyedConnection; |
|
153 | QMetaObject::Connection m_DragWidgetDestroyedConnection; | |
153 | QMetaObject::Connection m_HighlightedWidgetDestroyedConnection; |
|
154 | QMetaObject::Connection m_HighlightedWidgetDestroyedConnection; | |
154 |
|
155 | |||
155 | explicit DragDropHelperPrivate() |
|
156 | explicit DragDropHelperPrivate() | |
156 | : m_PlaceHolder{std::make_unique<QWidget>()}, |
|
157 | : m_PlaceHolder{std::make_unique<QWidget>()}, | |
157 | m_DragDropScroller{std::make_unique<DragDropScroller>()} |
|
158 | m_DragDropScroller{std::make_unique<DragDropScroller>()} | |
158 | { |
|
159 | { | |
159 | m_PlaceHolder->setStyleSheet("background-color: #BBD5EE; border:2px solid #2A7FD4"); |
|
160 | m_PlaceHolder->setStyleSheet("background-color: #BBD5EE; border:2px solid #2A7FD4"); | |
160 | sqpApp->installEventFilter(m_DragDropScroller.get()); |
|
161 | sqpApp->installEventFilter(m_DragDropScroller.get()); | |
161 |
|
162 | |||
162 |
|
163 | |||
163 | m_ImageTempUrl = QDir::temp().absoluteFilePath("Scqlop_graph.png"); |
|
164 | m_ImageTempUrl = QDir::temp().absoluteFilePath("Sciqlop_graph.png"); | |
164 | } |
|
165 | } | |
165 |
|
166 | |||
166 | void preparePlaceHolder() const |
|
167 | void preparePlaceHolder() const | |
167 | { |
|
168 | { | |
168 | if (m_CurrentDragWidget) { |
|
169 | if (m_CurrentDragWidget) { | |
169 | m_PlaceHolder->setMinimumSize(m_CurrentDragWidget->size()); |
|
170 | m_PlaceHolder->setMinimumSize(m_CurrentDragWidget->size()); | |
170 | m_PlaceHolder->setSizePolicy(m_CurrentDragWidget->sizePolicy()); |
|
171 | m_PlaceHolder->setSizePolicy(m_CurrentDragWidget->sizePolicy()); | |
171 | } |
|
172 | } | |
172 | else { |
|
173 | else { | |
173 | // Configuration of the placeHolder when there is no dragWidget |
|
174 | // Configuration of the placeHolder when there is no dragWidget | |
174 | // (for instance with a drag from a variable) |
|
175 | // (for instance with a drag from a variable) | |
175 |
|
176 | |||
176 | m_PlaceHolder->setMinimumSize(0, GRAPH_MINIMUM_HEIGHT); |
|
177 | m_PlaceHolder->setMinimumSize(0, GRAPH_MINIMUM_HEIGHT); | |
177 | m_PlaceHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); |
|
178 | m_PlaceHolder->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); | |
178 | } |
|
179 | } | |
179 | } |
|
180 | } | |
180 | }; |
|
181 | }; | |
181 |
|
182 | |||
182 |
|
183 | |||
183 | DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} |
|
184 | DragDropHelper::DragDropHelper() : impl{spimpl::make_unique_impl<DragDropHelperPrivate>()} | |
184 | { |
|
185 | { | |
185 | } |
|
186 | } | |
186 |
|
187 | |||
187 | DragDropHelper::~DragDropHelper() |
|
188 | DragDropHelper::~DragDropHelper() | |
188 | { |
|
189 | { | |
189 | QFile::remove(impl->m_ImageTempUrl); |
|
190 | QFile::remove(impl->m_ImageTempUrl); | |
190 | } |
|
191 | } | |
191 |
|
192 | |||
192 | void DragDropHelper::resetDragAndDrop() |
|
193 | void DragDropHelper::resetDragAndDrop() | |
193 | { |
|
194 | { | |
194 | setCurrentDragWidget(nullptr); |
|
195 | setCurrentDragWidget(nullptr); | |
195 | impl->m_HighlightedDragWidget = nullptr; |
|
196 | impl->m_HighlightedDragWidget = nullptr; | |
196 | } |
|
197 | } | |
197 |
|
198 | |||
198 | void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget) |
|
199 | void DragDropHelper::setCurrentDragWidget(VisualizationDragWidget *dragWidget) | |
199 | { |
|
200 | { | |
200 | if (impl->m_CurrentDragWidget) { |
|
201 | if (impl->m_CurrentDragWidget) { | |
201 |
|
202 | |||
202 | QObject::disconnect(impl->m_DragWidgetDestroyedConnection); |
|
203 | QObject::disconnect(impl->m_DragWidgetDestroyedConnection); | |
203 | } |
|
204 | } | |
204 |
|
205 | |||
205 | if (dragWidget) { |
|
206 | if (dragWidget) { | |
206 | // ensures the impl->m_CurrentDragWidget is reset when the widget is destroyed |
|
207 | // ensures the impl->m_CurrentDragWidget is reset when the widget is destroyed | |
207 | impl->m_DragWidgetDestroyedConnection |
|
208 | impl->m_DragWidgetDestroyedConnection | |
208 | = QObject::connect(dragWidget, &VisualizationDragWidget::destroyed, |
|
209 | = QObject::connect(dragWidget, &VisualizationDragWidget::destroyed, | |
209 | [this]() { impl->m_CurrentDragWidget = nullptr; }); |
|
210 | [this]() { impl->m_CurrentDragWidget = nullptr; }); | |
210 | } |
|
211 | } | |
211 |
|
212 | |||
212 | impl->m_CurrentDragWidget = dragWidget; |
|
213 | impl->m_CurrentDragWidget = dragWidget; | |
213 | } |
|
214 | } | |
214 |
|
215 | |||
215 | VisualizationDragWidget *DragDropHelper::getCurrentDragWidget() const |
|
216 | VisualizationDragWidget *DragDropHelper::getCurrentDragWidget() const | |
216 | { |
|
217 | { | |
217 | return impl->m_CurrentDragWidget; |
|
218 | return impl->m_CurrentDragWidget; | |
218 | } |
|
219 | } | |
219 |
|
220 | |||
220 |
|
221 | |||
221 | QWidget &DragDropHelper::placeHolder() const |
|
222 | QWidget &DragDropHelper::placeHolder() const | |
222 | { |
|
223 | { | |
223 | return *impl->m_PlaceHolder; |
|
224 | return *impl->m_PlaceHolder; | |
224 | } |
|
225 | } | |
225 |
|
226 | |||
226 | void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index) |
|
227 | void DragDropHelper::insertPlaceHolder(QVBoxLayout *layout, int index) | |
227 | { |
|
228 | { | |
228 | removePlaceHolder(); |
|
229 | removePlaceHolder(); | |
229 | impl->preparePlaceHolder(); |
|
230 | impl->preparePlaceHolder(); | |
230 | layout->insertWidget(index, impl->m_PlaceHolder.get()); |
|
231 | layout->insertWidget(index, impl->m_PlaceHolder.get()); | |
231 | impl->m_PlaceHolder->show(); |
|
232 | impl->m_PlaceHolder->show(); | |
232 | } |
|
233 | } | |
233 |
|
234 | |||
234 | void DragDropHelper::removePlaceHolder() |
|
235 | void DragDropHelper::removePlaceHolder() | |
235 | { |
|
236 | { | |
236 | auto parentWidget = impl->m_PlaceHolder->parentWidget(); |
|
237 | auto parentWidget = impl->m_PlaceHolder->parentWidget(); | |
237 | if (parentWidget) { |
|
238 | if (parentWidget) { | |
238 | parentWidget->layout()->removeWidget(impl->m_PlaceHolder.get()); |
|
239 | parentWidget->layout()->removeWidget(impl->m_PlaceHolder.get()); | |
239 | impl->m_PlaceHolder->setParent(nullptr); |
|
240 | impl->m_PlaceHolder->setParent(nullptr); | |
240 | impl->m_PlaceHolder->hide(); |
|
241 | impl->m_PlaceHolder->hide(); | |
241 | } |
|
242 | } | |
242 | } |
|
243 | } | |
243 |
|
244 | |||
244 | bool DragDropHelper::isPlaceHolderSet() const |
|
245 | bool DragDropHelper::isPlaceHolderSet() const | |
245 | { |
|
246 | { | |
246 | return impl->m_PlaceHolder->parentWidget(); |
|
247 | return impl->m_PlaceHolder->parentWidget(); | |
247 | } |
|
248 | } | |
248 |
|
249 | |||
249 | void DragDropHelper::addDragDropScrollArea(QScrollArea *scrollArea) |
|
250 | void DragDropHelper::addDragDropScrollArea(QScrollArea *scrollArea) | |
250 | { |
|
251 | { | |
251 | impl->m_DragDropScroller->addScrollArea(scrollArea); |
|
252 | impl->m_DragDropScroller->addScrollArea(scrollArea); | |
252 | } |
|
253 | } | |
253 |
|
254 | |||
254 | void DragDropHelper::removeDragDropScrollArea(QScrollArea *scrollArea) |
|
255 | void DragDropHelper::removeDragDropScrollArea(QScrollArea *scrollArea) | |
255 | { |
|
256 | { | |
256 | impl->m_DragDropScroller->removeScrollArea(scrollArea); |
|
257 | impl->m_DragDropScroller->removeScrollArea(scrollArea); | |
257 | } |
|
258 | } | |
258 |
|
259 | |||
259 | QUrl DragDropHelper::imageTemporaryUrl(const QImage &image) const |
|
260 | QUrl DragDropHelper::imageTemporaryUrl(const QImage &image) const | |
260 | { |
|
261 | { | |
261 | image.save(impl->m_ImageTempUrl); |
|
262 | image.save(impl->m_ImageTempUrl); | |
262 | return QUrl::fromLocalFile(impl->m_ImageTempUrl); |
|
263 | return QUrl::fromLocalFile(impl->m_ImageTempUrl); | |
263 | } |
|
264 | } | |
264 |
|
265 | |||
265 | void DragDropHelper::setHightlightedDragWidget(VisualizationDragWidget *dragWidget) |
|
266 | void DragDropHelper::setHightlightedDragWidget(VisualizationDragWidget *dragWidget) | |
266 | { |
|
267 | { | |
267 | if (impl->m_HighlightedDragWidget) { |
|
268 | if (impl->m_HighlightedDragWidget) { | |
268 | impl->m_HighlightedDragWidget->highlightForMerge(false); |
|
269 | impl->m_HighlightedDragWidget->highlightForMerge(false); | |
269 | QObject::disconnect(impl->m_HighlightedWidgetDestroyedConnection); |
|
270 | QObject::disconnect(impl->m_HighlightedWidgetDestroyedConnection); | |
270 | } |
|
271 | } | |
271 |
|
272 | |||
272 | if (dragWidget) { |
|
273 | if (dragWidget) { | |
273 | dragWidget->highlightForMerge(true); |
|
274 | dragWidget->highlightForMerge(true); | |
274 |
|
275 | |||
275 | // ensures the impl->m_HighlightedDragWidget is reset when the widget is destroyed |
|
276 | // ensures the impl->m_HighlightedDragWidget is reset when the widget is destroyed | |
276 | impl->m_DragWidgetDestroyedConnection |
|
277 | impl->m_DragWidgetDestroyedConnection | |
277 | = QObject::connect(dragWidget, &VisualizationDragWidget::destroyed, |
|
278 | = QObject::connect(dragWidget, &VisualizationDragWidget::destroyed, | |
278 | [this]() { impl->m_HighlightedDragWidget = nullptr; }); |
|
279 | [this]() { impl->m_HighlightedDragWidget = nullptr; }); | |
279 | } |
|
280 | } | |
280 |
|
281 | |||
281 | impl->m_HighlightedDragWidget = dragWidget; |
|
282 | impl->m_HighlightedDragWidget = dragWidget; | |
282 | } |
|
283 | } | |
283 |
|
284 | |||
284 | VisualizationDragWidget *DragDropHelper::getHightlightedDragWidget() const |
|
285 | VisualizationDragWidget *DragDropHelper::getHightlightedDragWidget() const | |
285 | { |
|
286 | { | |
286 | return impl->m_HighlightedDragWidget; |
|
287 | return impl->m_HighlightedDragWidget; | |
287 | } |
|
288 | } | |
288 |
|
289 | |||
289 | bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData, |
|
290 | bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData, | |
290 | VisualizationDragDropContainer *dropContainer) |
|
291 | VisualizationDragDropContainer *dropContainer) | |
291 | { |
|
292 | { | |
292 | if (!mimeData || !dropContainer) { |
|
293 | if (!mimeData || !dropContainer) { | |
293 | qCWarning(LOG_DragDropHelper()) << QObject::tr( |
|
294 | qCWarning(LOG_DragDropHelper()) << QObject::tr( | |
294 | "DragDropHelper::checkMimeDataForVisualization, invalid input parameters."); |
|
295 | "DragDropHelper::checkMimeDataForVisualization, invalid input parameters."); | |
295 | Q_ASSERT(false); |
|
296 | Q_ASSERT(false); | |
|
297 | return false; | |||
296 | } |
|
298 | } | |
297 |
|
299 | |||
298 |
auto result = |
|
300 | auto result = false; | |
299 |
|
301 | |||
300 | if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) { |
|
302 | if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) { | |
301 | auto variables = sqpApp->variableController().variablesForMimeData( |
|
303 | auto variables = sqpApp->variableController().variablesForMimeData( | |
302 | mimeData->data(MIME_TYPE_VARIABLE_LIST)); |
|
304 | mimeData->data(MIME_TYPE_VARIABLE_LIST)); | |
303 |
|
305 | |||
304 | if (variables.count() == 1) { |
|
306 | if (variables.count() == 1) { | |
305 | // Check that the viariable is not already in a graph |
|
|||
306 |
|
307 | |||
307 | // Search for the top level VisualizationWidget |
|
308 | auto variable = variables.first(); | |
|
309 | if (variable->dataSeries() != nullptr) { | |||
|
310 | ||||
|
311 | // Check that the variable is not already in a graph | |||
|
312 | ||||
308 | auto parent = dropContainer->parentWidget(); |
|
313 | auto parent = dropContainer->parentWidget(); | |
309 | while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) { |
|
314 | while (parent && qobject_cast<VisualizationWidget *>(parent) == nullptr) { | |
310 | parent = parent->parentWidget(); |
|
315 | parent = parent->parentWidget(); // Search for the top level VisualizationWidget | |
311 | } |
|
316 | } | |
312 |
|
317 | |||
313 | if (parent) { |
|
318 | if (parent) { | |
314 | auto visualizationWidget = static_cast<VisualizationWidget *>(parent); |
|
319 | auto visualizationWidget = static_cast<VisualizationWidget *>(parent); | |
315 |
|
320 | |||
316 |
FindVariableOperation findVariableOperation{variable |
|
321 | FindVariableOperation findVariableOperation{variable}; | |
317 | visualizationWidget->accept(&findVariableOperation); |
|
322 | visualizationWidget->accept(&findVariableOperation); | |
318 | auto variableContainers = findVariableOperation.result(); |
|
323 | auto variableContainers = findVariableOperation.result(); | |
319 |
if ( |
|
324 | if (variableContainers.empty()) { | |
320 |
result = |
|
325 | result = true; | |
|
326 | } | |||
|
327 | else { | |||
|
328 | // result = false: the variable already exist in the visualisation | |||
321 | } |
|
329 | } | |
322 | } |
|
330 | } | |
323 | else { |
|
331 | else { | |
324 | qCWarning(LOG_DragDropHelper()) << QObject::tr( |
|
332 | qCWarning(LOG_DragDropHelper()) << QObject::tr( | |
325 | "DragDropHelper::checkMimeDataForVisualization, the parent " |
|
333 | "DragDropHelper::checkMimeDataForVisualization, the parent " | |
326 |
"VisualizationWidget cannot be found." |
|
334 | "VisualizationWidget cannot be found. Cannot check if the variable is " | |
327 | result = false; |
|
335 | "already used or not."); | |
328 | } |
|
336 | } | |
329 | } |
|
337 | } | |
330 | else { |
|
338 | else { | |
331 | result = false; |
|
339 | // result = false: the variable is not fully loaded | |
332 | } |
|
340 | } | |
333 | } |
|
341 | } | |
|
342 | else { | |||
|
343 | // result = false: cannot drop multiple variables in the visualisation | |||
|
344 | } | |||
|
345 | } | |||
|
346 | else { | |||
|
347 | // Other MIME data | |||
|
348 | // no special rules, accepted by default | |||
|
349 | result = true; | |||
|
350 | } | |||
334 |
|
351 | |||
335 | return result; |
|
352 | return result; | |
336 | } |
|
353 | } |
General Comments 3
Pull request updated. Auto status change to "Under Review"
Changed commits: * 1 added * 0 removed Changed files: * A core/tests/meson.build
You need to be logged in to leave comments.
Login now