GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1064:1b1ede101ec5

Handle the previous prohibition for drag and drop

Alexandre Leroux -

r1064:1b1ede101ec5

parent child

Context file:

r1064:1b1ede101ec5

Collapse all files

gui/include/Visualization/VisualizationDragDropContainer.h +4 0

             public:
                 enum class DropBehavior { Inserted, Merged, InsertedAndMerged, Forbidden };
                 using AcceptMimeDataFunction = std::function<bool(const QMimeData *mimeData)>;
+                using AcceptDragWidgetFunction
+                    = std::function<bool(const VisualizationDragWidget *dragWidget, const QMimeData *mimeData)>;
                 VisualizationDragDropContainer(QWidget *parent = nullptr);
                 void setAcceptMimeDataFunction(AcceptMimeDataFunction fun);
+                void setAcceptDragWidgetFunction(AcceptDragWidgetFunction fun);
                 void setPlaceHolderType(DragDropHelper::PlaceHolderType type,
                                         const QString &placeHolderText = QString());

gui/src/Visualization/VisualizationDragDropContainer.cpp +25 -6

                 VisualizationDragDropContainer::AcceptMimeDataFunction m_AcceptMimeDataFun
                     = [](auto mimeData) { return true; };
+                VisualizationDragDropContainer::AcceptDragWidgetFunction m_AcceptDragWidgetFun
+                    = [](auto dragWidget, auto mimeData) { return true; };
                 int m_MinContainerHeight = 0;
                     return nbGraph;
                 }
-                void findPlaceHolderPosition(const QPoint &pos, bool canInsert, bool canMerge,
+                bool findPlaceHolderPosition(const QPoint &pos, const QMimeData *mimeData, bool canInsert,
-                                             const VisualizationDragDropContainer *container);
+                                             bool canMerge, const VisualizationDragDropContainer *container);
             };
             VisualizationDragDropContainer::VisualizationDragDropContainer(QWidget *parent)
                 impl->m_AcceptMimeDataFun = fun;
             }
+            void VisualizationDragDropContainer::setAcceptDragWidgetFunction(
+                VisualizationDragDropContainer::AcceptDragWidgetFunction fun)
+            {
+                impl->m_AcceptDragWidgetFun = fun;
+            }
             void VisualizationDragDropContainer::setPlaceHolderType(DragDropHelper::PlaceHolderType type,
                                                                     const QString &placeHolderText)
             {
                         auto canMerge = impl->allowMergeForMimeData(event->mimeData());
                         auto canInsert = impl->allowInsertForMimeData(event->mimeData());
-                        impl->findPlaceHolderPosition(event->pos(), canInsert, canMerge, this);
+                        if (!impl->findPlaceHolderPosition(event->pos(), event->mimeData(), canInsert, canMerge,
+                                                           this)) {
+                            event->ignore();
+                        }
                     }
                     else {
                         // do nothing
                 if (impl->acceptMimeData(event->mimeData())) {
                     auto canMerge = impl->allowMergeForMimeData(event->mimeData());
                     auto canInsert = impl->allowInsertForMimeData(event->mimeData());
-                    impl->findPlaceHolderPosition(event->pos(), canInsert, canMerge, this);
+                    impl->findPlaceHolderPosition(event->pos(), event->mimeData(), canInsert, canMerge, this);
                 }
                 else {
                     event->ignore();
             }
-            void VisualizationDragDropContainer::VisualizationDragDropContainerPrivate::findPlaceHolderPosition(
+            bool VisualizationDragDropContainer::VisualizationDragDropContainerPrivate::findPlaceHolderPosition(
-                const QPoint &pos, bool canInsert, bool canMerge,
+                const QPoint &pos, const QMimeData *mimeData, bool canInsert, bool canMerge,
                 const VisualizationDragDropContainer *container)
             {
                 auto &helper = sqpApp->dragDropHelper();
                                 helper.removePlaceHolder();
                             }
+                            if (m_AcceptDragWidgetFun(dragWidgetHovered, mimeData)) {
                                 helper.setHightlightedDragWidget(dragWidgetHovered);
+                                return true;
+                            }
+                            else {
+                                return false;
+                            }
                         }
                         else {
                             qCWarning(LOG_VisualizationDragDropContainer())
                     // the mouse is hover the placeHolder
                     // Do nothing
                 }
+                return true;
             }

gui/src/Visualization/VisualizationZoneWidget.cpp +23 0

@@ -115,6 +115,29 VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *p
115	ui->dragDropContainer);	115	ui->dragDropContainer);
116	});	116	});
117		117
		118	auto acceptDragWidgetFun = [](auto dragWidget, auto mimeData) {
		119	if (!mimeData) {
		120	return false;
		121	}
		122
		123	if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) {
		124	auto variables = sqpApp->variableController().variablesForMimeData(
		125	mimeData->data(MIME_TYPE_VARIABLE_LIST));
		126
		127	if (variables.count() != 1) {
		128	return false;
		129	}
		130	auto variable = variables.first();
		131
		132	if (auto graphWidget = dynamic_cast<const VisualizationGraphWidget *>(dragWidget)) {
		133	return graphWidget->canDrop(*variable);
		134	}
		135	}
		136
		137	return true;
		138	};
		139	ui->dragDropContainer->setAcceptDragWidgetFunction(acceptDragWidgetFun);
		140
118	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,	141	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,
119	&VisualizationZoneWidget::dropMimeData);	142	&VisualizationZoneWidget::dropMimeData);
120	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredOnWidget, this,	143	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredOnWidget, this,

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

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

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