@@ -1,5 +1,5 | |||
|
1 | #ifndef VISUALIZATIONDRAGDROPCONTAINER_H | |
|
2 | #define VISUALIZATIONDRAGDROPCONTAINER_H | |
|
1 | #ifndef SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H | |
|
2 | #define SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H | |
|
3 | 3 | |
|
4 | 4 | #include <Common/spimpl.h> |
|
5 | 5 | #include <QMimeData> |
@@ -39,4 +39,4 private slots: | |||
|
39 | 39 | void startDrag(VisualizationDragWidget *dragWidget, const QPoint &dragPosition); |
|
40 | 40 | }; |
|
41 | 41 | |
|
42 | #endif // VISUALIZATIONDRAGDROPCONTAINER_H | |
|
42 | #endif // SCIQLOP_VISUALIZATIONDRAGDROPCONTAINER_H |
@@ -1,5 +1,5 | |||
|
1 | #ifndef VISUALIZATIONDRAGWIDGET_H | |
|
2 | #define VISUALIZATIONDRAGWIDGET_H | |
|
1 | #ifndef SCIQLOP_VISUALIZATIONDRAGWIDGET_H | |
|
2 | #define SCIQLOP_VISUALIZATIONDRAGWIDGET_H | |
|
3 | 3 | |
|
4 | 4 | #include <Common/spimpl.h> |
|
5 | 5 | #include <QMimeData> |
@@ -26,4 +26,4 signals: | |||
|
26 | 26 | void dragDetected(VisualizationDragWidget *dragWidget, const QPoint &dragPosition); |
|
27 | 27 | }; |
|
28 | 28 | |
|
29 | #endif // VISUALIZATIONDRAGWIDGET_H | |
|
29 | #endif // SCIQLOP_VISUALIZATIONDRAGWIDGET_H |
@@ -71,7 +71,6 struct VisualizationDragDropContainer::VisualizationDragDropContainerPrivate { | |||
|
71 | 71 | auto adustNum = 18; // to be safe, in case of scrollbar on the side |
|
72 | 72 | auto containerRect = QRect(QPoint(), container->contentsRect().size()) |
|
73 | 73 | .adjusted(adustNum, adustNum, -adustNum, -adustNum); |
|
74 | qDebug() << containerRect << container->mapFromGlobal(QCursor::pos()); | |
|
75 | 74 | return containerRect.contains(container->mapFromGlobal(QCursor::pos())); |
|
76 | 75 | } |
|
77 | 76 | }; |
@@ -114,8 +113,7 int VisualizationDragDropContainer::countDragWidget() const | |||
|
114 | 113 | { |
|
115 | 114 | auto nbGraph = 0; |
|
116 | 115 | for (auto child : children()) { |
|
117 |
|
|
|
118 | if (widget) { | |
|
116 | if (qobject_cast<VisualizationDragWidget *>(child)) { | |
|
119 | 117 | nbGraph += 1; |
|
120 | 118 | } |
|
121 | 119 | } |
@@ -129,7 +127,7 void VisualizationDragDropContainer::startDrag(VisualizationDragWidget *dragWidg | |||
|
129 | 127 | auto &helper = sqpApp->dragDropHelper(); |
|
130 | 128 | |
|
131 | 129 | // Note: The management of the drag object is done by Qt |
|
132 |
auto |
|
|
130 | auto drag = new QDrag{dragWidget}; | |
|
133 | 131 | drag->setHotSpot(dragPosition); |
|
134 | 132 | |
|
135 | 133 | auto mimeData = dragWidget->mimeData(); |
@@ -189,8 +187,9 void VisualizationDragDropContainer::dragEnterEvent(QDragEnterEvent *event) | |||
|
189 | 187 | } |
|
190 | 188 | } |
|
191 | 189 | } |
|
192 | else | |
|
190 | else { | |
|
193 | 191 | event->ignore(); |
|
192 | } | |
|
194 | 193 | |
|
195 | 194 | QWidget::dragEnterEvent(event); |
|
196 | 195 | } |
@@ -206,7 +205,7 void VisualizationDragDropContainer::dragLeaveEvent(QDragLeaveEvent *event) | |||
|
206 | 205 | |
|
207 | 206 | bool isInternal = true; |
|
208 | 207 | if (isInternal) { |
|
209 |
// Only if the drag is st |
|
|
208 | // Only if the drag is started from the visualization | |
|
210 | 209 | // Show the drag widget at its original place |
|
211 | 210 | // So the drag widget doesn't stay hidden if the drop occurs outside the visualization |
|
212 | 211 | // drop zone (It is not possible to catch a drop event outside of the application) |
@@ -264,8 +263,9 void VisualizationDragDropContainer::dragMoveEvent(QDragMoveEvent *event) | |||
|
264 | 263 | } |
|
265 | 264 | } |
|
266 | 265 | } |
|
267 | else | |
|
266 | else { | |
|
268 | 267 | event->ignore(); |
|
268 | } | |
|
269 | 269 | |
|
270 | 270 | QWidget::dragMoveEvent(event); |
|
271 | 271 | } |
@@ -286,7 +286,6 void VisualizationDragDropContainer::dropEvent(QDropEvent *event) | |||
|
286 | 286 | } |
|
287 | 287 | |
|
288 | 288 | dragWidget->setVisible(true); |
|
289 | dragWidget->setStyleSheet(""); | |
|
290 | 289 | |
|
291 | 290 | event->acceptProposedAction(); |
|
292 | 291 | |
@@ -295,8 +294,9 void VisualizationDragDropContainer::dropEvent(QDropEvent *event) | |||
|
295 | 294 | emit dropOccured(droppedIndex, event->mimeData()); |
|
296 | 295 | } |
|
297 | 296 | } |
|
298 | else | |
|
297 | else { | |
|
299 | 298 | event->ignore(); |
|
299 | } | |
|
300 | 300 | |
|
301 | 301 | QWidget::dropEvent(event); |
|
302 | 302 | } |
@@ -97,9 +97,9 VisualizationGraphWidget::~VisualizationGraphWidget() | |||
|
97 | 97 | VisualizationZoneWidget *VisualizationGraphWidget::parentZoneWidget() const noexcept |
|
98 | 98 | { |
|
99 | 99 | auto parent = parentWidget(); |
|
100 | do { | |
|
100 | while (parent != nullptr && !qobject_cast<VisualizationZoneWidget *>(parent)) { | |
|
101 | 101 | parent = parent->parentWidget(); |
|
102 | } while (parent != nullptr && !qobject_cast<VisualizationZoneWidget *>(parent)); | |
|
102 | } | |
|
103 | 103 | |
|
104 | 104 | return qobject_cast<VisualizationZoneWidget *>(parent); |
|
105 | 105 | } |
@@ -231,7 +231,7 QString VisualizationGraphWidget::name() const | |||
|
231 | 231 | |
|
232 | 232 | QMimeData *VisualizationGraphWidget::mimeData() const |
|
233 | 233 | { |
|
234 |
auto |
|
|
234 | auto mimeData = new QMimeData; | |
|
235 | 235 | mimeData->setData(DragDropHelper::MIME_TYPE_GRAPH, QByteArray()); |
|
236 | 236 | |
|
237 | 237 | return mimeData; |
@@ -314,7 +314,7 QString VisualizationZoneWidget::name() const | |||
|
314 | 314 | |
|
315 | 315 | QMimeData *VisualizationZoneWidget::mimeData() const |
|
316 | 316 | { |
|
317 |
auto |
|
|
317 | auto mimeData = new QMimeData; | |
|
318 | 318 | mimeData->setData(DragDropHelper::MIME_TYPE_ZONE, QByteArray()); |
|
319 | 319 | |
|
320 | 320 | return mimeData; |
General Comments 0
You need to be logged in to leave comments.
Login now