GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r850:3715d1ed451c

Move Common MIME types constants in a Definition file in core module.

trabillard -

r850:3715d1ed451c

parent child

Context file:

r850:3715d1ed451c

core/include/Common/MimeTypesDef.h created 644 +18 0

@@ -0,0 +1,18
	1	#ifndef SCIQLOP_MIMETYPESDEF_H
	2	#define SCIQLOP_MIMETYPESDEF_H
	3
	4	#include "CoreGlobal.h"
	5
	6	#include <QString>
	7
	8	// ////////////////// //
	9	// SciQlop Mime Types //
	10	// ////////////////// //
	11
	12	extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_GRAPH;
	13	extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_ZONE;
	14	extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_VARIABLE_LIST;
	15	extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_TIME_RANGE;
	16
	17
	18	#endif // SCIQLOP_MIMETYPESDEF_H

core/src/Common/MimeTypesDef.cpp created 644 +6 0

@@ -0,0 +1,6
	1	#include "Common/MimeTypesDef.h"
	2
	3	const QString MIME_TYPE_GRAPH = QStringLiteral("scqlop/graph");
	4	const QString MIME_TYPE_ZONE = QStringLiteral("scqlop/zone");
	5	const QString MIME_TYPE_VARIABLE_LIST = QStringLiteral("scqlop/var-list");
	6	const QString MIME_TYPE_TIME_RANGE = QStringLiteral("scqlop/time-range");

gui/src/DragDropHelper.cpp 0 -3

             #include <QTimer>
             #include <QVBoxLayout>
-            const QString DragDropHelper::MIME_TYPE_GRAPH = "scqlop/graph";
-            const QString DragDropHelper::MIME_TYPE_ZONE = "scqlop/zone";
             const int SCROLL_SPEED = 5;
             const int SCROLL_ZONE_SIZE = 50;

gui/src/Visualization/VisualizationGraphWidget.cpp +2 -1

             #include "Visualization/VisualizationZoneWidget.h"
             #include "ui_VisualizationGraphWidget.h"
+            #include <Common/MimeTypesDef.h>
             #include <Data/ArrayData.h>
             #include <Data/IDataSeries.h>
             #include <DragDropHelper.h>
             QMimeData *VisualizationGraphWidget::mimeData() const
             {
                 auto mimeData = new QMimeData;
-                mimeData->setData(DragDropHelper::MIME_TYPE_GRAPH, QByteArray());
+                mimeData->setData(MIME_TYPE_GRAPH, QByteArray());
                 return mimeData;
             }

gui/src/Visualization/VisualizationTabWidget.cpp +5 -4

             #include "Variable/VariableController.h"
+            #include "Common/MimeTypesDef.h"
             #include "DragDropHelper.h"
             #include "SqpApplication.h"
             {
                 ui->setupUi(this);
-                ui->dragDropContainer->setAcceptedMimeTypes(
+                ui->dragDropContainer->setAcceptedMimeTypes({MIME_TYPE_GRAPH, MIME_TYPE_ZONE});
-                    {DragDropHelper::MIME_TYPE_GRAPH, DragDropHelper::MIME_TYPE_ZONE});
                 connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,
                         &VisualizationTabWidget::dropMimeData);
                 sqpApp->dragDropHelper().addDragDropScrollArea(ui->scrollArea);
             void VisualizationTabWidget::dropMimeData(int index, const QMimeData *mimeData)
             {
                 auto &helper = sqpApp->dragDropHelper();
-                if (mimeData->hasFormat(DragDropHelper::MIME_TYPE_GRAPH)) {
+                if (mimeData->hasFormat(MIME_TYPE_GRAPH)) {
                     auto graphWidget = static_cast<VisualizationGraphWidget *>(helper.getCurrentDragWidget());
                     auto parentDragDropContainer
                         = qobject_cast<VisualizationDragDropContainer *>(graphWidget->parentWidget());
                         }
                     }
                 }
-                else if (mimeData->hasFormat(DragDropHelper::MIME_TYPE_ZONE)) {
+                else if (mimeData->hasFormat(MIME_TYPE_ZONE)) {
                     // Simple move of the zone, no variable operation associated
                     auto zoneWidget = static_cast<VisualizationZoneWidget *>(helper.getCurrentDragWidget());
                     auto parentDragDropContainer = zoneWidget->parentWidget();

gui/src/Visualization/VisualizationZoneWidget.cpp +4 -3

             #include "Visualization/VisualizationGraphWidget.h"
             #include "ui_VisualizationZoneWidget.h"
+            #include "Common/MimeTypesDef.h"
             #include <Data/SqpRange.h>
             #include <Variable/Variable.h>
             #include <Variable/VariableController.h>
                 ui->zoneNameLabel->setText(name);
-                ui->dragDropContainer->setAcceptedMimeTypes({DragDropHelper::MIME_TYPE_GRAPH});
+                ui->dragDropContainer->setAcceptedMimeTypes({MIME_TYPE_GRAPH});
                 connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this,
                         &VisualizationZoneWidget::dropMimeData);
             QMimeData *VisualizationZoneWidget::mimeData() const
             {
                 auto mimeData = new QMimeData;
-                mimeData->setData(DragDropHelper::MIME_TYPE_ZONE, QByteArray());
+                mimeData->setData(MIME_TYPE_ZONE, QByteArray());
                 return mimeData;
             }
             void VisualizationZoneWidget::dropMimeData(int index, const QMimeData *mimeData)
             {
                 auto &helper = sqpApp->dragDropHelper();
-                if (mimeData->hasFormat(DragDropHelper::MIME_TYPE_GRAPH)) {
+                if (mimeData->hasFormat(MIME_TYPE_GRAPH)) {
                     auto graphWidget = static_cast<VisualizationGraphWidget *>(helper.getCurrentDragWidget());
                     auto parentDragDropContainer
                         = qobject_cast<VisualizationDragDropContainer *>(graphWidget->parentWidget());

General Comments 1

trabillard

|

Auto status change to "Under Review"

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