Skip to content

Commit

Permalink
Merge 98bae3d into 59bb420
Browse files Browse the repository at this point in the history
  • Loading branch information
@agarny
agarny committed Dec 1, 2018
2 parents 59bb420 + 98bae3d commit 6293279
Show file tree
Hide file tree
Showing 21 changed files with 88 additions and 95 deletions.
2 changes: 1 addition & 1 deletion src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoredata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ BiosignalmlDataStoreData::BiosignalmlDataStoreData(const QString &pFileName,
const QString &pComment,
DataStore::DataStore *pDataStore,
const DataStore::DataStoreVariables &pVariables) :
DataStore::DataStoreData(pFileName, pDataStore, pVariables),
DataStore::DataStoreExportData(pFileName, pDataStore, pVariables),
mName(pName),
mAuthor(pAuthor),
mDescription(pDescription),
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoredata.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace BioSignalMLDataStore {

//==============================================================================

class BiosignalmlDataStoreData : public DataStore::DataStoreData
class BiosignalmlDataStoreData : public DataStore::DataStoreExportData
{
public:
explicit BiosignalmlDataStoreData(const QString &pFileName,
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreexporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace BioSignalMLDataStore {

//==============================================================================

BiosignalmlDataStoreExporterWorker::BiosignalmlDataStoreExporterWorker(DataStore::DataStoreData *pDataStoreData) :
BiosignalmlDataStoreExporterWorker::BiosignalmlDataStoreExporterWorker(DataStore::DataStoreExportData *pDataStoreData) :
DataStore::DataStoreExporterWorker(pDataStoreData)
{
}
Expand Down Expand Up @@ -179,7 +179,7 @@ void BiosignalmlDataStoreExporterWorker::run()

//==============================================================================

DataStore::DataStoreExporterWorker * BiosignalmlDataStoreExporter::workerInstance(DataStore::DataStoreData *pDataStoreData)
DataStore::DataStoreExporterWorker * BiosignalmlDataStoreExporter::workerInstance(DataStore::DataStoreExportData *pDataStoreData)
{
// Return an instance of our worker

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreexporter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class BiosignalmlDataStoreExporterWorker : public DataStore::DataStoreExporterWo
Q_OBJECT

public:
explicit BiosignalmlDataStoreExporterWorker(DataStore::DataStoreData *pDataStoreData);
explicit BiosignalmlDataStoreExporterWorker(DataStore::DataStoreExportData *pDataStoreData);

public slots:
void run() override;
Expand All @@ -52,7 +52,7 @@ class BiosignalmlDataStoreExporter : public DataStore::DataStoreExporter
Q_OBJECT

protected:
DataStore::DataStoreExporterWorker * workerInstance(DataStore::DataStoreData *pDataStoreData) override;
DataStore::DataStoreExporterWorker * workerInstance(DataStore::DataStoreExportData *pDataStoreData) override;
};

//==============================================================================
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreplugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ QString BioSignalMLDataStorePlugin::dataStoreName() const

//==============================================================================

DataStore::DataStoreData * BioSignalMLDataStorePlugin::getData(const QString &pFileName,
DataStore::DataStore *pDataStore,
const QMap<int, QIcon> &pIcons) const
DataStore::DataStoreExportData * BioSignalMLDataStorePlugin::getExportData(const QString &pFileName,
DataStore::DataStore *pDataStore,
const QMap<int, QIcon> &pIcons) const
{
// Ask which data should be exported, as well as some other information

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace CSVDataStore {

//==============================================================================

CsvDataStoreExporterWorker::CsvDataStoreExporterWorker(DataStore::DataStoreData *pDataStoreData) :
CsvDataStoreExporterWorker::CsvDataStoreExporterWorker(DataStore::DataStoreExportData *pDataStoreData) :
DataStore::DataStoreExporterWorker(pDataStoreData)
{
}
Expand Down Expand Up @@ -232,7 +232,7 @@ void CsvDataStoreExporterWorker::run()

//==============================================================================

DataStore::DataStoreExporterWorker * CsvDataStoreExporter::workerInstance(DataStore::DataStoreData *pDataStoreData)
DataStore::DataStoreExporterWorker * CsvDataStoreExporter::workerInstance(DataStore::DataStoreExportData *pDataStoreData)
{
// Return an instance of our worker

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/dataStore/CSVDataStore/src/csvdatastoreexporter.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class CsvDataStoreExporterWorker : public DataStore::DataStoreExporterWorker
Q_OBJECT

public:
explicit CsvDataStoreExporterWorker(DataStore::DataStoreData *pDataStoreData);
explicit CsvDataStoreExporterWorker(DataStore::DataStoreExportData *pDataStoreData);

public slots:
void run() override;
Expand All @@ -52,7 +52,7 @@ class CsvDataStoreExporter : public DataStore::DataStoreExporter
Q_OBJECT

protected:
DataStore::DataStoreExporterWorker * workerInstance(DataStore::DataStoreData *pDataStoreData) override;
DataStore::DataStoreExporterWorker * workerInstance(DataStore::DataStoreExportData *pDataStoreData) override;
};

//==============================================================================
Expand Down
8 changes: 4 additions & 4 deletions src/plugins/dataStore/CSVDataStore/src/csvdatastoreplugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@ QString CSVDataStorePlugin::dataStoreName() const

//==============================================================================

DataStore::DataStoreData * CSVDataStorePlugin::getData(const QString &pFileName,
DataStore::DataStore *pDataStore,
const QMap<int, QIcon> &pIcons) const
DataStore::DataStoreExportData * CSVDataStorePlugin::getExportData(const QString &pFileName,
DataStore::DataStore *pDataStore,
const QMap<int, QIcon> &pIcons) const
{
// Ask which data should be exported

Expand All @@ -88,7 +88,7 @@ DataStore::DataStoreData * CSVDataStorePlugin::getData(const QString &pFileName,
&csvFilter);

if (!fileName.isEmpty())
return new DataStore::DataStoreData(fileName, pDataStore, dataStoreDialog.selectedData());
return new DataStore::DataStoreExportData(fileName, pDataStore, dataStoreDialog.selectedData());
}

return nullptr;
Expand Down
29 changes: 15 additions & 14 deletions src/plugins/datastoreinterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ extern "C" Q_DECL_EXPORT int dataStoreInterfaceVersion()
{
// Version of the data store interface

return 4;
return 5;
}

//==============================================================================
Expand Down Expand Up @@ -345,8 +345,9 @@ double * DataStoreVariable::values(int pRun) const

//==============================================================================

DataStoreData::DataStoreData(const QString &pFileName, DataStore *pDataStore,
const DataStoreVariables &pVariables) :
DataStoreExportData::DataStoreExportData(const QString &pFileName,
DataStore *pDataStore,
const DataStoreVariables &pVariables) :
mFileName(pFileName),
mDataStore(pDataStore),
mVariables(pVariables)
Expand All @@ -355,7 +356,7 @@ DataStoreData::DataStoreData(const QString &pFileName, DataStore *pDataStore,

//==============================================================================

QString DataStoreData::fileName() const
QString DataStoreExportData::fileName() const
{
// Return our file name

Expand All @@ -364,7 +365,7 @@ QString DataStoreData::fileName() const

//==============================================================================

DataStore * DataStoreData::dataStore() const
DataStore * DataStoreExportData::dataStore() const
{
// Return our data store

Expand All @@ -373,7 +374,7 @@ DataStore * DataStoreData::dataStore() const

//==============================================================================

DataStoreVariables DataStoreData::variables() const
DataStoreVariables DataStoreExportData::variables() const
{
// Return our variables

Expand Down Expand Up @@ -534,14 +535,14 @@ void DataStore::addValues(double pVoiValue)

//==============================================================================

DataStoreExporterWorker::DataStoreExporterWorker(DataStoreData *pDataStoreData) :
DataStoreExporterWorker::DataStoreExporterWorker(DataStoreExportData *pDataStoreData) :
mDataStoreData(pDataStoreData)
{
}

//==============================================================================

void DataStoreExporter::exportData(DataStoreData *pDataStoreData)
void DataStoreExporter::exportData(DataStoreExportData *pDataStoreData)
{
// Create and move our worker to a thread
// Note: we cannot use the new connect() syntax with our worker's signals
Expand All @@ -556,14 +557,14 @@ void DataStoreExporter::exportData(DataStoreData *pDataStoreData)
connect(thread, &QThread::started,
worker, &DataStoreExporterWorker::run);

connect(worker, SIGNAL(progress(DataStoreData *, double)),
this, SIGNAL(progress(DataStoreData *, double)));
connect(worker, SIGNAL(progress(DataStoreExportData *, double)),
this, SIGNAL(progress(DataStoreExportData *, double)));

connect(worker, SIGNAL(done(DataStoreData *, const QString &)),
this, SIGNAL(done(DataStoreData *, const QString &)));
connect(worker, SIGNAL(done(DataStoreData *, const QString &)),
connect(worker, SIGNAL(done(DataStoreExportData *, const QString &)),
this, SIGNAL(done(DataStoreExportData *, const QString &)));
connect(worker, SIGNAL(done(DataStoreExportData *, const QString &)),
thread, SLOT(quit()));
connect(worker, SIGNAL(done(DataStoreData *, const QString &)),
connect(worker, SIGNAL(done(DataStoreExportData *, const QString &)),
worker, SLOT(deleteLater()));

connect(thread, &QThread::finished,
Expand Down
23 changes: 12 additions & 11 deletions src/plugins/datastoreinterface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,13 +123,14 @@ class DataStore;

//==============================================================================

class DataStoreData : public QObject
class DataStoreExportData : public QObject
{
Q_OBJECT

public:
explicit DataStoreData(const QString &pFileName, DataStore *pDataStore,
const DataStoreVariables &pVariables);
explicit DataStoreExportData(const QString &pFileName,
DataStore *pDataStore,
const DataStoreVariables &pVariables);

QString fileName() const;
DataStore * dataStore() const;
Expand Down Expand Up @@ -181,14 +182,14 @@ class DataStoreExporterWorker : public QObject
Q_OBJECT

public:
explicit DataStoreExporterWorker(DataStoreData *pDataStoreData);
explicit DataStoreExporterWorker(DataStoreExportData *pDataStoreData);

protected:
DataStoreData *mDataStoreData;
DataStoreExportData *mDataStoreData;

signals:
void progress(DataStoreData *pDataStoreData, double pProgress);
void done(DataStoreData *pDataStoreData, const QString &pErrorMessage);
void progress(DataStoreExportData *pDataStoreData, double pProgress);
void done(DataStoreExportData *pDataStoreData, const QString &pErrorMessage);

public slots:
virtual void run() = 0;
Expand All @@ -201,14 +202,14 @@ class DataStoreExporter : public QObject
Q_OBJECT

public:
void exportData(DataStoreData *pDataStoreData);
void exportData(DataStoreExportData *pDataStoreData);

protected:
virtual DataStoreExporterWorker * workerInstance(DataStoreData *pDataStoreData) = 0;
virtual DataStoreExporterWorker * workerInstance(DataStoreExportData *pDataStoreData) = 0;

signals:
void progress(DataStoreData *pDataStoreData, double pProgress);
void done(DataStoreData *pDataStoreData, const QString &pErrorMessage);
void progress(DataStoreExportData *pDataStoreData, double pProgress);
void done(DataStoreExportData *pDataStoreData, const QString &pErrorMessage);
};

//==============================================================================
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/datastoreinterface.inl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

virtual QString dataStoreName() const PURE;

virtual DataStore::DataStoreData * getData(const QString &pFileName,
DataStore::DataStore *pDataStore,
const QMap<int, QIcon> &pIcons) const PURE;
virtual DataStore::DataStoreExportData * getExportData(const QString &pFileName,
DataStore::DataStore *pDataStore,
const QMap<int, QIcon> &pIcons) const PURE;

virtual DataStore::DataStoreExporter * dataStoreExporterInstance() const PURE;

Expand Down
14 changes: 6 additions & 8 deletions src/plugins/miscellaneous/Core/src/coreplugin.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -554,23 +554,21 @@ void CorePlugin::pluginsInitialized(const Plugins &pLoadedPlugins)
DataStoreInterfaces dataStoreInterfaces = DataStoreInterfaces();

foreach (Plugin *plugin, pLoadedPlugins) {
// Look for a file type

FileTypeInterface *fileTypeInterface = qobject_cast<FileTypeInterface *>(plugin->instance());
SolverInterface *solverInterface = qobject_cast<SolverInterface *>(plugin->instance());
DataStoreInterface *dataStoreInterface = qobject_cast<DataStoreInterface *>(plugin->instance());

// Keep track of file types

if (fileTypeInterface)
fileTypeInterfaces << fileTypeInterface;

// Look for a solver

SolverInterface *solverInterface = qobject_cast<SolverInterface *>(plugin->instance());
// Keep track of solvers

if (solverInterface)
solverInterfaces << solverInterface;

// Look for a data store

DataStoreInterface *dataStoreInterface = qobject_cast<DataStoreInterface *>(plugin->instance());
// Keep track of data stores

if (dataStoreInterface)
dataStoreInterfaces << dataStoreInterface;
Expand Down
3 changes: 1 addition & 2 deletions ...lationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1157,8 +1157,7 @@ void SimulationExperimentViewInformationGraphPanelAndGraphsWidget::populateGraph
connect(parameterAction, &QAction::triggered,
this, &SimulationExperimentViewInformationGraphPanelAndGraphsWidget::updateParameterValue);

// Keep track of the parameter associated with our model parameter
// action
// Keep track of the parameter associated with our parameter action

mParameterActions.insert(parameterAction, parameter);
}
Expand Down
2 changes: 0 additions & 2 deletions ...mulationExperimentView/src/simulationexperimentviewinformationgraphpanelandgraphswidget.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ class SimulationExperimentViewInformationGraphPanelAndGraphsWidget : public QSta

QMap<QString, QString> mRenamedModelListValues;

bool mCanEmitGraphsUpdatedSignal;

void retranslateGraphPanelPropertyEditor(Core::PropertyEditorWidget *pGraphPanelPropertyEditor);

void populateGraphPanelPropertyEditor();
Expand Down
3 changes: 1 addition & 2 deletions ...tion/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -488,8 +488,7 @@ void SimulationExperimentViewInformationParametersWidget::populateContextMenu(Ce
connect(parameterAction, &QAction::triggered,
this, &SimulationExperimentViewInformationParametersWidget::emitGraphRequired);

// Keep track of the parameter associated with our model parameter
// action
// Keep track of the parameter associated with our parameter action

mParameterActions.insert(parameterAction, parameter);
}
Expand Down

0 comments on commit 6293279

Please sign in to comment.