Merge 057f382 into dded71b

opencor · Sep 22, 2020 · a947f34 · a947f34
2 parents dded71b + 057f382
commit a947f34
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 44 deletions.
diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.cpp
@@ -117,15 +117,13 @@ CellMLZincMappingViewEditingWidget::CellMLZincMappingViewEditingWidget(const QSt
         mSaveMapping = Core::newAction(QIcon(":/oxygen/actions/document-save.png"),
                                        mToolBarWidget);
 
-        mOpenMeshFile = Core::newAction(QIcon(":/oxygen/actions/document-open.png"),
+        mOpenFile = Core::newAction(QIcon(":/oxygen/actions/document-open.png"),
                                         mToolBarWidget);
 
         //TODO trash could be hidden when nothing selected
         mClearNode = Core::newAction(QIcon(":/oxygen/actions/edit-clear.png"),
                                                         mToolBarWidget);
 
-        mOpenMappingFile = Core::newAction(QIcon(":/oxygen/actions/document-import.png"),
-                                           mToolBarWidget);
         mNodeSizeWidget = new QwtWheel(mToolBarWidget);
             mNodeSizeWidget->setBorderWidth(0);
             mNodeSizeWidget->setFixedSize(int(0.07*availableGeometry.width()),
@@ -136,11 +134,10 @@ CellMLZincMappingViewEditingWidget::CellMLZincMappingViewEditingWidget(const QSt
             mNodeSizeWidget->setValue(CellMLZincMappingViewZincWidget::nodeSizeOrigin);
 
         mToolBarWidget->addAction(mSaveMapping);
-        mToolBarWidget->addAction(mOpenMeshFile);
+        mToolBarWidget->addAction(mOpenFile);
         mToolBarWidget->addAction(mClearNode);
 
         mToolBarWidget->addWidget(mNodeSizeWidget);
-        mToolBarWidget->addAction(mOpenMappingFile);
 
     mTopSeparator = Core::newLineWidget(this);
 
@@ -203,10 +200,8 @@ CellMLZincMappingViewEditingWidget::CellMLZincMappingViewEditingWidget(const QSt
 
         connect(mSaveMapping, &QAction::triggered,
                 this, &CellMLZincMappingViewEditingWidget::saveMappingSlot);
-        connect(mOpenMeshFile, &QAction::triggered,
-                this, &CellMLZincMappingViewEditingWidget::openMeshFile);
-        connect(mOpenMappingFile, &QAction::triggered,
-                this, &CellMLZincMappingViewEditingWidget::openMappingFile);
+        connect(mOpenFile, &QAction::triggered,
+                this, &CellMLZincMappingViewEditingWidget::openFile);
 
         //create and add informative labels
 
@@ -240,6 +235,16 @@ CellMLZincMappingViewEditingWidget::CellMLZincMappingViewEditingWidget(const QSt
     // Allow for things to be dropped on us
 
     setAcceptDrops(true);
+
+    QString potentialMappingFile = pFileName;
+    potentialMappingFile.replace(".cellml",".json");
+
+    QFile file;
+    file.setFileName(potentialMappingFile);
+
+    if (file.exists()) {
+        openMapping(potentialMappingFile);
+    }
 }
 
 //==============================================================================
@@ -669,18 +674,20 @@ void CellMLZincMappingViewEditingWidget::saveMappingSlot()
 
 //==============================================================================
 
-void CellMLZincMappingViewEditingWidget::openMappingFile()
+void CellMLZincMappingViewEditingWidget::openFile()
 {
-    openMapping(Core::getOpenFileName("Open mapping file"));
-}
+    QStringList files = Core::getOpenFileNames("Open mesh or mapping file");
 
-//==============================================================================
+    if (files.length() == 1 && files.first().endsWith(".json")) {
+        openMapping(files.first());
+    } else {
+        setMeshFiles(files);
+    }
 
-void CellMLZincMappingViewEditingWidget::openMeshFile()
-{
-    setMeshFiles(Core::getOpenFileNames("Open mesh file"));
 }
 
+//==============================================================================
+
 } // namespace MappingView
 } // namespace OpenCOR
 

diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.h b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingvieweditingwidget.h
@@ -133,8 +133,7 @@ class CellMLZincMappingViewEditingWidget : public Core::Widget
 
     QAction *mClearNode;
     QAction *mSaveMapping;
-    QAction *mOpenMeshFile;
-    QAction *mOpenMappingFile;
+    QAction *mOpenFile;
 
     QFrame *mTopSeparator;
     QFrame *mBottomSeparator;
@@ -175,8 +174,7 @@ private slots:
     void emitHorizontalSplitterMoved();
     void emitVerticalSplitterMoved();
     void saveMappingSlot();
-    void openMeshFile();
-    void openMappingFile();
+    void openFile();
 };
 
 //==============================================================================

diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.cpp
@@ -77,8 +77,6 @@ CellMLZincMappingViewZincWidget::CellMLZincMappingViewZincWidget(QWidget *pParen
 
     setup();
 
-    initAuxFile();
-
     setupRegion();
 
     draw();
@@ -95,7 +93,6 @@ CellMLZincMappingViewZincWidget::~CellMLZincMappingViewZincWidget()
 void CellMLZincMappingViewZincWidget::changeSource(const QStringList &pZincMeshFileNames)
 {
     mZincMeshFileNames = pZincMeshFileNames;
-    initAuxFile();
 
     //TODO the emit launched by reset make opencor crashing
     //reset();
@@ -274,26 +271,6 @@ void CellMLZincMappingViewZincWidget::setupRegion()
 
 //==============================================================================
 
-void CellMLZincMappingViewZincWidget::initAuxFile()
-{
-    // For each exnode file, seek for the exelem
-
-    for (auto file : mZincMeshFileNames) {
-        if (file.endsWith(".exnode")) {
-            QString newFile = file;
-            newFile.remove(".exnode");
-            newFile.append(".exelem");
-            QFileInfo check_file;
-            check_file.setFile(newFile);
-            if (check_file.exists() && !mZincMeshFileNames.contains(newFile)) {
-                mZincMeshFileNames.append(newFile);
-            }
-        }
-    }
-}
-
-//==============================================================================
-
 void CellMLZincMappingViewZincWidget::draw()
 {
 

diff --git a/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.h b/src/plugins/editing/CellMLZincMappingView/src/cellmlzincmappingviewzincwidget.h
@@ -117,7 +117,6 @@ public slots:
     OpenCMISS::Zinc::GraphicsPoints mNodePoints;
     OpenCMISS::Zinc::GraphicsPoints mMappedPoints;
 
-    void initAuxFile();
     void setup();
     void setupRegion();
     void draw();