Renamed MappingView in CellMLZincMappingView

opencor · Aug 10, 2020 · 9ae8364 · 9ae8364
1 parent 8f5193b
commit 9ae8364
Show file tree

Hide file tree

Showing 16 changed files with 112 additions and 255 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -916,7 +916,7 @@ if(USE_PREBUILT_QTWEBKIT_PACKAGE)
             editing/RawSEDMLView
             editing/RawTextView
             editing/SEDMLEditingView
-            editing/MappingView
+            editing/CellMLZincMappingView
 
             miscellaneous/Compiler
             miscellaneous/Core

diff --git a/...lugins/editing/MappingView/CMakeLists.txt → ...ting/CellMLZincMappingView/CMakeLists.txt b/...lugins/editing/MappingView/CMakeLists.txt → ...ting/CellMLZincMappingView/CMakeLists.txt
@@ -1,20 +1,19 @@
-project(MappingViewPlugin)
+project(CellMLZincMappingViewPlugin)
 
 # Add the plugin
 
-add_plugin(MappingView
+add_plugin(CellMLZincMappingView
     SOURCES
         ../../filehandlinginterface.cpp
         ../../i18ninterface.cpp
         ../../plugininfo.cpp
         ../../plugininterface.cpp
         ../../viewinterface.cpp
 
-        src/mappingvieweditingwidget.cpp
-        src/mappingviewmeshreader.cpp
-        src/mappingviewplugin.cpp
-        src/mappingviewwidget.cpp
-        src/mappingviewzincwidget.cpp
+        src/cellmlzincmappingvieweditingwidget.cpp
+        src/cellmlzincmappingviewplugin.cpp
+        src/cellmlzincmappingviewwidget.cpp
+        src/cellmlzincmappingviewzincwidget.cpp
     PLUGINS
         Core
         CellMLSupport

diff --git a/...diting/MappingView/i18n/MappingView_fr.ts → ...pingView/i18n/CellMLZincMappingView_fr.ts b/...diting/MappingView/i18n/MappingView_fr.ts → ...pingView/i18n/CellMLZincMappingView_fr.ts
@@ -2,10 +2,10 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="fr_FR" sourcelanguage="en_GB">
 <context>
-    <name>OpenCOR::MappingView::MappingViewPlugin</name>
+    <name>OpenCOR::CellMLZincMappingView::CellMLZincMappingViewPlugin</name>
     <message>
         <source>Mapping</source>
-        <translation>Mappeur</translation>
+        <translation type="unfinished">Mappeur</translation>
     </message>
 </context>
 </TS>
diff --git a/...g/MappingView/res/MappingView_i18n.qrc.in → ...iew/res/CellMLZincMappingView_i18n.qrc.in b/...g/MappingView/res/MappingView_i18n.qrc.in → ...iew/res/CellMLZincMappingView_i18n.qrc.in
diff --git a/...pingView/src/mappingvieweditingwidget.cpp → ...rc/cellmlzincmappingvieweditingwidget.cpp b/...pingView/src/mappingvieweditingwidget.cpp → ...rc/cellmlzincmappingvieweditingwidget.cpp
@@ -24,8 +24,7 @@ along with this program. If not, see <https://gnu.org/licenses>.
 #include "cellmlfilemanager.h"
 #include "corecliutils.h"
 #include "filemanager.h"
-#include "mappingvieweditingwidget.h"
-#include "mappingviewmeshreader.h"
+#include "cellmlzincmappingvieweditingwidget.h"
 #include "toolbarwidget.h"
 #include "zincwidget.h"
 
@@ -48,29 +47,29 @@ along with this program. If not, see <https://gnu.org/licenses>.
 //==============================================================================
 
 namespace OpenCOR {
-namespace MappingView {
+namespace CellMLZincMappingView {
 
 //==============================================================================
 
-MappingViewEditingModel::MappingViewEditingModel(QObject *pParent) :
+CellMLZincMappingViewEditingModel::CellMLZincMappingViewEditingModel(QObject *pParent) :
     QStandardItemModel(pParent)
 {
 }
 
 //==============================================================================
 
-const char *MappingViewEditingModel::MappingViewEdittingMimeType = "opencor/mapping-view-editting";
+const char *CellMLZincMappingViewEditingModel::MappingViewEdittingMimeType = "opencor/mapping-view-editting";
 
 //==============================================================================
 
-QStringList MappingViewEditingModel::mimeTypes() const
+QStringList CellMLZincMappingViewEditingModel::mimeTypes() const
 {
     return {MappingViewEdittingMimeType};
 }
 
 //==============================================================================
 
-QMimeData * MappingViewEditingModel::mimeData(const QModelIndexList &pIndexes) const
+QMimeData * CellMLZincMappingViewEditingModel::mimeData(const QModelIndexList &pIndexes) const
 {
     auto res = new QMimeData();
     QString names;
@@ -114,7 +113,7 @@ MappingViewEditingWidget::MappingViewEditingWidget(const QString &pFileName,
             mDelayWidget->setRange(0.0, 100.0);
             mDelayWidget->setWheelBorderWidth(0);
 
-            mDelayWidget->setValue(MappingViewZincWidget::nodeSizeOrigin);
+            mDelayWidget->setValue(CellMLZincMappingViewZincWidget::nodeSizeOrigin);
 
         mToolBarWidget->addWidget(mDelayWidget);
 
@@ -139,7 +138,7 @@ MappingViewEditingWidget::MappingViewEditingWidget(const QString &pFileName,
         mVariableTree = new QTreeView(this);
         mVariableTree->setDragEnabled(true);
 
-        mVariableTreeModel = new MappingViewEditingModel();
+        mVariableTreeModel = new CellMLZincMappingViewEditingModel();
         mVariableTree->setModel(mVariableTreeModel);
 
         mHorizontalSplitterWidget->addWidget(mVariableTree);
@@ -154,10 +153,10 @@ MappingViewEditingWidget::MappingViewEditingWidget(const QString &pFileName,
 
         // add a Zinc widget
 
-        mZincWidget = new MappingViewZincWidget(this, mMeshFileName, this);
+        mZincWidget = new CellMLZincMappingViewZincWidget(this, mMeshFileName, this);
 
         connect(mDelayWidget, &QwtWheel::valueChanged,
-                mZincWidget, &MappingViewZincWidget::setNodeSizes );
+                mZincWidget, &CellMLZincMappingViewZincWidget::setNodeSizes );
 
         mHorizontalSplitterWidget->addWidget(mZincWidget);
 

diff --git a/...appingView/src/mappingvieweditingwidget.h → .../src/cellmlzincmappingvieweditingwidget.h b/...appingView/src/mappingvieweditingwidget.h → .../src/cellmlzincmappingvieweditingwidget.h
@@ -27,7 +27,7 @@ along with this program. If not, see <https://gnu.org/licenses>.
 
 #include "cellmlfile.h"
 #include "corecliutils.h"
-#include "mappingviewzincwidget.h"
+#include "cellmlzincmappingviewzincwidget.h"
 #include "splitterwidget.h"
 #include "viewwidget.h"
 
@@ -61,19 +61,19 @@ namespace Core {
 
 //==============================================================================
 
-namespace MappingView {
+namespace CellMLZincMappingView {
 
 //==============================================================================
 
 
-class MappingViewEditingModel : public QStandardItemModel
+class CellMLZincMappingViewEditingModel : public QStandardItemModel
 {
     Q_OBJECT
 
 public:
     static const char *MappingViewEdittingMimeType;
 
-    explicit MappingViewEditingModel(QObject *pParent = nullptr);
+    explicit CellMLZincMappingViewEditingModel(QObject *pParent = nullptr);
 
     QStringList mimeTypes() const override;
     QMimeData * mimeData(const QModelIndexList &pIndexes) const override;
@@ -106,13 +106,13 @@ class MappingViewEditingWidget : public Core::Widget
 
     Core::SplitterWidget *mVerticalSplitterWidget;
     Core::SplitterWidget *mHorizontalSplitterWidget;
-    MappingViewZincWidget *mZincWidget;
+    CellMLZincMappingViewZincWidget *mZincWidget;
 
     QLabel *mNodeValue;
     QLabel *mVariableValue;
     QTreeView *mVariableTree;
 
-    MappingViewEditingModel *mVariableTreeModel;
+    CellMLZincMappingViewEditingModel *mVariableTreeModel;
 
     QString mMeshFileName;