Take advantage of our new 'global' SED-ML and COMBINE file type insta…

…nces (#1371).

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewplugin.cpp

@@ -62,9 +62,7 @@ SimulationExperimentViewPlugin::SimulationExperimentViewPlugin() :
     mSolverInterfaces(SolverInterfaces()),
     mDataStoreInterfaces(DataStoreInterfaces()),
     mCellmlEditingViewPlugins(Plugins()),
-    mCellmlSimulationViewPlugins(Plugins()),
-    mSedmlFileTypeInterface(0),
-    mCombineFileTypeInterface(0)
+    mCellmlSimulationViewPlugins(Plugins())
 {
 }
 
@@ -193,8 +191,7 @@ void SimulationExperimentViewPlugin::finalizePlugin()
 
 void SimulationExperimentViewPlugin::pluginsInitialized(const Plugins &pLoadedPlugins)
 {
-    // Retrieve the different solvers and data stores that are available to us,
-    // as well as the file types supported by the SEDMLSupport plugin
+    // Retrieve the different solvers and data stores that are available to us
 
     foreach (Plugin *plugin, pLoadedPlugins) {
         // Look for a solver
@@ -228,18 +225,6 @@ void SimulationExperimentViewPlugin::pluginsInitialized(const Plugins &pLoadedPl
                     mCellmlSimulationViewPlugins << plugin;
             }
         }
-
-        // Keep track of the file type interfaces for the SEDMLSupport and
-        // COMBINESupport plugins
-
-        FileTypeInterface *fileTypeInterface = qobject_cast<FileTypeInterface *>(plugin->instance());
-
-        if (fileTypeInterface) {
-            if (!plugin->name().compare("SEDMLSupport"))
-                mSedmlFileTypeInterface = fileTypeInterface;
-            else if (!plugin->name().compare("COMBINESupport"))
-                mCombineFileTypeInterface = fileTypeInterface;
-        }
     }
 
     // Create our Simulation Experiment view widget
@@ -248,8 +233,6 @@ void SimulationExperimentViewPlugin::pluginsInitialized(const Plugins &pLoadedPl
                                                      mDataStoreInterfaces,
                                                      mCellmlEditingViewPlugins,
                                                      mCellmlSimulationViewPlugins,
-                                                     mSedmlFileTypeInterface,
-                                                     mCombineFileTypeInterface,
                                                      Core::mainWindow());
 
     mViewWidget->setObjectName("SimulationExperimentViewWidget");

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewplugin.h

@@ -27,7 +27,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "datastoreinterface.h"
 #include "filehandlinginterface.h"
-#include "filetypeinterface.h"
 #include "i18ninterface.h"
 #include "plugininfo.h"
 #include "plugininterface.h"
@@ -80,9 +79,6 @@ class SimulationExperimentViewPlugin : public QObject,
 
     Plugins mCellmlEditingViewPlugins;
     Plugins mCellmlSimulationViewPlugins;
-
-    FileTypeInterface *mSedmlFileTypeInterface;
-    FileTypeInterface *mCombineFileTypeInterface;
 };
 
 //==============================================================================

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp

@@ -24,12 +24,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "cellmlfilemanager.h"
 #include "centralwidget.h"
 #include "combinefilemanager.h"
+#include "combineinterface.h"
 #include "combinesupportplugin.h"
 #include "coreguiutils.h"
 #include "filemanager.h"
 #include "graphpanelswidget.h"
 #include "progressbarwidget.h"
 #include "sedmlfilemanager.h"
+#include "sedmlinterface.h"
 #include "sedmlsupportplugin.h"
 #include "simulationexperimentviewcontentswidget.h"
 #include "simulationexperimentviewinformationgraphswidget.h"
@@ -1734,7 +1736,7 @@ void SimulationExperimentViewSimulationWidget::sedmlExportSedmlFile()
     QString cellmlFileName = remoteFile?fileManagerInstance->url(mFileName):mFileName;
     QString cellmlFileCompleteSuffix = QFileInfo(cellmlFileName).completeSuffix();
     QString sedmlFileName = cellmlFileName;
-    QStringList sedmlFilters = Core::filters(FileTypeInterfaces() << mViewWidget->sedmlFileTypeInterface());
+    QStringList sedmlFilters = Core::filters(FileTypeInterfaces() << SEDMLSupport::fileTypeInterface());
     QString firstSedmlFilter = sedmlFilters.first();
 
     if (!cellmlFileCompleteSuffix.isEmpty()) {
@@ -1788,7 +1790,7 @@ void SimulationExperimentViewSimulationWidget::sedmlExportCombineArchive()
     QString cellmlFileName = remoteFile?fileManagerInstance->url(mFileName):mFileName;
     QString cellmlFileCompleteSuffix = QFileInfo(cellmlFileName).completeSuffix();
     QString combineArchiveName = cellmlFileName;
-    QStringList combineFilters = Core::filters(FileTypeInterfaces() << mViewWidget->combineFileTypeInterface());
+    QStringList combineFilters = Core::filters(FileTypeInterfaces() << COMBINESupport::fileTypeInterface());
     QString firstCombineFilter = combineFilters.first();
 
     if (!cellmlFileCompleteSuffix.isEmpty()) {

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.cpp

@@ -74,17 +74,13 @@ SimulationExperimentViewWidget::SimulationExperimentViewWidget(SimulationExperim
                                                                const DataStoreInterfaces &pDataStoreInterfaces,
                                                                const Plugins &pCellmlEditingViewPlugins,
                                                                const Plugins &pCellmlSimulationViewPlugins,
-                                                               FileTypeInterface *pSedmlFileTypeInterface,
-                                                               FileTypeInterface *pCombineFileTypeInterface,
                                                                QWidget *pParent) :
     ViewWidget(pParent),
     mPlugin(pPlugin),
     mSolverInterfaces(pSolverInterfaces),
     mDataStoreInterfaces(pDataStoreInterfaces),
     mCellmlEditingViewPlugins(pCellmlEditingViewPlugins),
     mCellmlSimulationViewPlugins(pCellmlSimulationViewPlugins),
-    mSedmlFileTypeInterface(pSedmlFileTypeInterface),
-    mCombineFileTypeInterface(pCombineFileTypeInterface),
     mSimulationWidgetSizes(QIntList()),
     mContentsWidgetSizes(QIntList()),
     mCollapsibleWidgetCollapsed(QBoolList()),
@@ -475,24 +471,6 @@ Plugins SimulationExperimentViewWidget::cellmlSimulationViewPlugins() const
 
 //==============================================================================
 
-FileTypeInterface * SimulationExperimentViewWidget::sedmlFileTypeInterface() const
-{
-    // Return our SED-ML file type interface
-
-    return mSedmlFileTypeInterface;
-}
-
-//==============================================================================
-
-FileTypeInterface * SimulationExperimentViewWidget::combineFileTypeInterface() const
-{
-    // Return our COMBINE file type interface
-
-    return mCombineFileTypeInterface;
-}
-
-//==============================================================================
-
 SimulationExperimentViewSimulationWidget * SimulationExperimentViewWidget::simulationWidget(const QString &pFileName) const
 {
     // Return the requested simulation widget

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewwidget.h

@@ -29,7 +29,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "combinearchive.h"
 #include "corecliutils.h"
 #include "datastoreinterface.h"
-#include "filetypeinterface.h"
 #include "sedmlfile.h"
 #include "solverinterface.h"
 #include "viewwidget.h"
@@ -63,8 +62,6 @@ class SimulationExperimentViewWidget : public Core::ViewWidget
                                             const DataStoreInterfaces &pDataStoreInterfaces,
                                             const Plugins &pCellmlEditingViewPlugins,
                                             const Plugins &pCellmlSimulationViewPlugins,
-                                            FileTypeInterface *pSedmlFileTypeInterface,
-                                            FileTypeInterface *pCombineFileTypeInterface,
                                             QWidget *pParent);
 
     virtual void loadSettings(QSettings *pSettings);
@@ -94,9 +91,6 @@ class SimulationExperimentViewWidget : public Core::ViewWidget
     Plugins cellmlEditingViewPlugins() const;
     Plugins cellmlSimulationViewPlugins() const;
 
-    FileTypeInterface * sedmlFileTypeInterface() const;
-    FileTypeInterface * combineFileTypeInterface() const;
-
     SimulationExperimentViewSimulationWidget * simulationWidget(const QString &pFileName) const;
     SimulationExperimentViewSimulation * simulation(const QString &pFileName) const;
     CellMLSupport::CellmlFileRuntime * runtime(const QString &pFileName) const;
@@ -117,9 +111,6 @@ class SimulationExperimentViewWidget : public Core::ViewWidget
     Plugins mCellmlEditingViewPlugins;
     Plugins mCellmlSimulationViewPlugins;
 
-    FileTypeInterface *mSedmlFileTypeInterface;
-    FileTypeInterface *mCombineFileTypeInterface;
-
     QIntList mSimulationWidgetSizes;
     QIntList mContentsWidgetSizes;