CellML Annotation view plugin: reworked our approach to the saving/re…

…loading of a file (#1491).

src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewplugin.cpp

@@ -98,8 +98,9 @@ void CellMLAnnotationViewPlugin::fileModified(const QString &pFileName)
 
 void CellMLAnnotationViewPlugin::fileSaved(const QString &pFileName)
 {
-//---ISSUE1491---
-Q_UNUSED(pFileName);
+    // The given file has been saved, so let our view widget know about it
+
+    mViewWidget->fileSaved(pFileName);
 }
 
 //==============================================================================

src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewwidget.cpp

@@ -191,6 +191,19 @@ void CellmlAnnotationViewWidget::filePermissionsChanged(const QString &pFileName
 
 //==============================================================================
 
+void CellmlAnnotationViewWidget::fileSaved(const QString &pFileName)
+{
+    // The given file has been saved, so consider it reloaded, but only if it
+    // has a corresponing widget and that it is invisible
+
+    CellmlAnnotationViewEditingWidget *editingWidget = mEditingWidgets.value(pFileName);
+
+    if (editingWidget && !editingWidget->isVisible())
+        fileReloaded(pFileName);
+}
+
+//==============================================================================
+
 void CellmlAnnotationViewWidget::fileReloaded(const QString &pFileName)
 {
     // The given file has been reloaded, so reload it, should it be managed

src/plugins/editing/CellMLAnnotationView/src/cellmlannotationviewwidget.h

@@ -63,6 +63,7 @@ class CellmlAnnotationViewWidget : public Core::ViewWidget
     void finalize(const QString &pFileName);
 
     void filePermissionsChanged(const QString &pFileName);
+    void fileSaved(const QString &pFileName);
     void fileReloaded(const QString &pFileName);
     void fileRenamed(const QString &pOldFileName, const QString &pNewFileName);