diff --git a/core/include/Common/MimeTypesDef.h b/core/include/Common/MimeTypesDef.h new file mode 100644 index 0000000..2212853 --- /dev/null +++ b/core/include/Common/MimeTypesDef.h @@ -0,0 +1,18 @@ +#ifndef SCIQLOP_MIMETYPESDEF_H +#define SCIQLOP_MIMETYPESDEF_H + +#include "CoreGlobal.h" + +#include + +// ////////////////// // +// SciQlop Mime Types // +// ////////////////// // + +extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_GRAPH; +extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_ZONE; +extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_VARIABLE_LIST; +extern SCIQLOP_CORE_EXPORT const QString MIME_TYPE_TIME_RANGE; + + +#endif // SCIQLOP_MIMETYPESDEF_H diff --git a/core/src/Common/MimeTypesDef.cpp b/core/src/Common/MimeTypesDef.cpp new file mode 100644 index 0000000..24ef739 --- /dev/null +++ b/core/src/Common/MimeTypesDef.cpp @@ -0,0 +1,6 @@ +#include "Common/MimeTypesDef.h" + +const QString MIME_TYPE_GRAPH = QStringLiteral("scqlop/graph"); +const QString MIME_TYPE_ZONE = QStringLiteral("scqlop/zone"); +const QString MIME_TYPE_VARIABLE_LIST = QStringLiteral("scqlop/var-list"); +const QString MIME_TYPE_TIME_RANGE = QStringLiteral("scqlop/time-range"); diff --git a/gui/src/DragDropHelper.cpp b/gui/src/DragDropHelper.cpp index 9db14fe..083197e 100644 --- a/gui/src/DragDropHelper.cpp +++ b/gui/src/DragDropHelper.cpp @@ -10,9 +10,6 @@ #include #include -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; diff --git a/gui/src/Visualization/VisualizationGraphWidget.cpp b/gui/src/Visualization/VisualizationGraphWidget.cpp index cc42944..5956f76 100644 --- a/gui/src/Visualization/VisualizationGraphWidget.cpp +++ b/gui/src/Visualization/VisualizationGraphWidget.cpp @@ -6,6 +6,7 @@ #include "Visualization/VisualizationZoneWidget.h" #include "ui_VisualizationGraphWidget.h" +#include #include #include #include @@ -232,7 +233,7 @@ QString VisualizationGraphWidget::name() const QMimeData *VisualizationGraphWidget::mimeData() const { auto mimeData = new QMimeData; - mimeData->setData(DragDropHelper::MIME_TYPE_GRAPH, QByteArray()); + mimeData->setData(MIME_TYPE_GRAPH, QByteArray()); return mimeData; } diff --git a/gui/src/Visualization/VisualizationTabWidget.cpp b/gui/src/Visualization/VisualizationTabWidget.cpp index 15f61b2..e74aabd 100644 --- a/gui/src/Visualization/VisualizationTabWidget.cpp +++ b/gui/src/Visualization/VisualizationTabWidget.cpp @@ -7,6 +7,8 @@ #include "Variable/VariableController.h" +#include "Common/MimeTypesDef.h" + #include "DragDropHelper.h" #include "SqpApplication.h" @@ -61,8 +63,7 @@ VisualizationTabWidget::VisualizationTabWidget(const QString &name, QWidget *par { ui->setupUi(this); - ui->dragDropContainer->setAcceptedMimeTypes( - {DragDropHelper::MIME_TYPE_GRAPH, DragDropHelper::MIME_TYPE_ZONE}); + ui->dragDropContainer->setAcceptedMimeTypes({MIME_TYPE_GRAPH, MIME_TYPE_ZONE}); connect(ui->dragDropContainer, &VisualizationDragDropContainer::dropOccured, this, &VisualizationTabWidget::dropMimeData); sqpApp->dragDropHelper().addDragDropScrollArea(ui->scrollArea); @@ -163,7 +164,7 @@ QLayout &VisualizationTabWidget::tabLayout() const noexcept 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(helper.getCurrentDragWidget()); auto parentDragDropContainer = qobject_cast(graphWidget->parentWidget()); @@ -208,7 +209,7 @@ void VisualizationTabWidget::dropMimeData(int index, const QMimeData *mimeData) } } } - 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(helper.getCurrentDragWidget()); auto parentDragDropContainer = zoneWidget->parentWidget(); diff --git a/gui/src/Visualization/VisualizationZoneWidget.cpp b/gui/src/Visualization/VisualizationZoneWidget.cpp index 45355c5..8b2b2eb 100644 --- a/gui/src/Visualization/VisualizationZoneWidget.cpp +++ b/gui/src/Visualization/VisualizationZoneWidget.cpp @@ -5,6 +5,7 @@ #include "Visualization/VisualizationGraphWidget.h" #include "ui_VisualizationZoneWidget.h" +#include "Common/MimeTypesDef.h" #include #include #include @@ -77,7 +78,7 @@ VisualizationZoneWidget::VisualizationZoneWidget(const QString &name, QWidget *p 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); @@ -315,7 +316,7 @@ QString VisualizationZoneWidget::name() const QMimeData *VisualizationZoneWidget::mimeData() const { auto mimeData = new QMimeData; - mimeData->setData(DragDropHelper::MIME_TYPE_ZONE, QByteArray()); + mimeData->setData(MIME_TYPE_ZONE, QByteArray()); return mimeData; } @@ -355,7 +356,7 @@ void VisualizationZoneWidget::onVariableAboutToBeRemoved(std::shared_ptrdragDropHelper(); - if (mimeData->hasFormat(DragDropHelper::MIME_TYPE_GRAPH)) { + if (mimeData->hasFormat(MIME_TYPE_GRAPH)) { auto graphWidget = static_cast(helper.getCurrentDragWidget()); auto parentDragDropContainer = qobject_cast(graphWidget->parentWidget());