HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r875:0e9a8e47fcce

drop of variable inside an existing graph

trabillard -

r875:0e9a8e47fcce

parent child

Context file:

r875:0e9a8e47fcce

gui/include/DragDropHelper.h +1 0

                 QUrl imageTemporaryUrl(const QImage &image) const;
                 void setHightlightedDragWidget(VisualizationDragWidget *dragWidget);
+                VisualizationDragWidget *getHightlightedDragWidget() const;
             private:
                 class DragDropHelperPrivate;

gui/include/Visualization/VisualizationDragDropContainer.h +2 -1

                 Q_OBJECT
             signals:
-                void dropOccured(int dropIndex, const QMimeData *mimeData);
+                void dropOccuredInContainer(int dropIndex, const QMimeData *mimeData);
+                void dropOccuredOnWidget(VisualizationDragWidget *dragWidget, const QMimeData *mimeData);
             public:
                 using AcceptMimeDataFunction = std::function<bool(const QMimeData *mimeData)>;

gui/include/Visualization/VisualizationZoneWidget.h +1 0

                 void onVariableAboutToBeRemoved(std::shared_ptr<Variable> variable);
                 void dropMimeData(int index, const QMimeData *mimeData);
+                void dropMimeDataOnGraph(VisualizationDragWidget *dragWidget, const QMimeData *mimeData);
             };
             #endif // SCIQLOP_VISUALIZATIONZONEWIDGET_H

gui/src/DragDropHelper.cpp +5 0

                 impl->m_HighlightedDragWidget = dragWidget;
             }
+            VisualizationDragWidget *DragDropHelper::getHightlightedDragWidget() const
+            {
+                return impl->m_HighlightedDragWidget;
+            }
             bool DragDropHelper::checkMimeDataForVisualization(const QMimeData *mimeData,
                                                                VisualizationDragDropContainer *dropContainer)
             {

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

             void VisualizationDragDropContainer::dropEvent(QDropEvent *event)
             {
+                auto &helper = sqpApp->dragDropHelper();
                 if (impl->acceptMimeData(event->mimeData())) {
-                    auto dragWidget = sqpApp->dragDropHelper().getCurrentDragWidget();
+                    auto dragWidget = helper.getCurrentDragWidget();
                     if (impl->hasPlaceHolder()) {
-                        auto &helper = sqpApp->dragDropHelper();
+                        // drop where the placeHolder is located
                         auto droppedIndex = impl->m_Layout->indexOf(&helper.placeHolder());
                         helper.removePlaceHolder();
-                        emit dropOccured(droppedIndex, event->mimeData());
+                        emit dropOccuredInContainer(droppedIndex, event->mimeData());
+                    }
+                    else if (helper.getHightlightedDragWidget()) {
+                        // drop on the highlighted widget
+                        auto canMerge = impl->allowMergeMimeData(event->mimeData());
+                        if (canMerge) {
+                            event->acceptProposedAction();
+                            emit dropOccuredOnWidget(helper.getHightlightedDragWidget(), event->mimeData());
                         }
                         else {
                             qCWarning(LOG_VisualizationDragDropContainer())
-                            << tr("VisualizationDragDropContainer::dropEvent, couldn't drop because the "
+                                << tr("VisualizationDragDropContainer::dropEvent, dropping on a widget, but "
-                                  "placeHolder is not found.");
+                                      "the merge is forbidden.");
-                        // Q_ASSERT(false);
+                            Q_ASSERT(false);
+                        }
                     }
                 }
                 else {

gui/src/Visualization/VisualizationTabWidget.cpp +1 -1

                 ui->dragDropContainer->setAcceptedMimeTypes(
                     {MIME_TYPE_GRAPH, MIME_TYPE_ZONE, MIME_TYPE_VARIABLE_LIST});
-                connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,
+                connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,
                         &VisualizationTabWidget::dropMimeData);
                 ui->dragDropContainer->setAcceptMimeDataFunction([this](auto mimeData) {
                     return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,

gui/src/Visualization/VisualizationZoneWidget.cpp +29 -1

@@ -91,8 +91,11 VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *p
91	return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,	91	return sqpApp->dragDropHelper().checkMimeDataForVisualization(mimeData,
92	ui->dragDropContainer);	92	ui->dragDropContainer);
93	});	93	});
94	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,	94
		95	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredInContainer, this,
95	&VisualizationZoneWidget::dropMimeData);	96	&VisualizationZoneWidget::dropMimeData);
		97	connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccuredOnWidget, this,
		98	&VisualizationZoneWidget::dropMimeDataOnGraph);
96		99
97	// 'Close' options : widget is deleted when closed	100	// 'Close' options : widget is deleted when closed
98	setAttribute(Qt::WA_DeleteOnClose);	101	setAttribute(Qt::WA_DeleteOnClose);
@@ -381,6 +384,31 void VisualizationZoneWidget::dropMimeData(int index, const QMimeData *mimeData)
381	}	384	}
382	}	385	}
383		386
		387	void VisualizationZoneWidget::dropMimeDataOnGraph(VisualizationDragWidget *dragWidget,
		388	const QMimeData *mimeData)
		389	{
		390	auto graphWidget = qobject_cast<VisualizationGraphWidget *>(dragWidget);
		391	if (!graphWidget) {
		392	qCWarning(LOG_VisualizationZoneWidget())
		393	<< tr("VisualizationZoneWidget::dropMimeDataOnGraph, dropping in an unknown widget, "
		394	"drop aborted");
		395	Q_ASSERT(false);
		396	return;
		397	}
		398
		399	if (mimeData->hasFormat(MIME_TYPE_VARIABLE_LIST)) {
		400	auto variables = sqpApp->variableController().variablesForMimeData(
		401	mimeData->data(MIME_TYPE_VARIABLE_LIST));
		402	for (const auto &var : variables) {
		403	graphWidget->addVariable(var, graphWidget->graphRange());
		404	}
		405	}
		406	else {
		407	qCWarning(LOG_VisualizationZoneWidget())
		408	<< tr("VisualizationZoneWidget::dropMimeDataOnGraph, unknown MIME data received.");
		409	}
		410	}
		411
384	void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropGraph(	412	void VisualizationZoneWidget::VisualizationZoneWidgetPrivate::dropGraph(
385	int index, VisualizationZoneWidget *zoneWidget)	413	int index, VisualizationZoneWidget *zoneWidget)
386	{	414	{

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