Data store interface: renamed setLabel() and label() to setName() and…

… name(), respectively.
opencor · Dec 9, 2019 · 37d295c · 37d295c
1 parent 4ea4845
commit 37d295c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreexporter.cpp b/src/plugins/dataStore/BioSignalMLDataStore/src/biosignalmldatastoreexporter.cpp
@@ -97,7 +97,7 @@ void BiosignalmlDataStoreExporterWorker::run()
                                                                 voi->values(i),
                                                                 voi->size(i));
 
-            clock->set_label(voi->label().toStdString());
+            clock->set_label(voi->name().toStdString());
 
             // Determine what should be exported (minus the VOI, which should
             // always be exported in the case of a BioSignalML file)
@@ -127,7 +127,7 @@ void BiosignalmlDataStoreExporterWorker::run()
             bsml::HDF5::SignalArray::size_type n = 0;
 
             for (auto variable : variables) {
-                (*signalArray)[n]->set_label(variable->label().toStdString());
+                (*signalArray)[n]->set_label(variable->name().toStdString());
 
                 ++n;
             }

diff --git a/src/plugins/dataStore/DataStore/src/datastoredialog.cpp b/src/plugins/dataStore/DataStore/src/datastoredialog.cpp
@@ -176,7 +176,7 @@ DataStoreDialog::DataStoreDialog(const QString &pDataStoreName,
                 auto dataItem = new QStandardItem(variableIcon.isNull()?
                                                       ErrorNodeIcon:
                                                       variableIcon,
-                                                  variable->label());
+                                                  variable->name());
 
                 dataItem->setCheckable(true);
                 dataItem->setCheckState(Qt::Checked);

diff --git a/src/plugins/datastoreinterface.cpp b/src/plugins/datastoreinterface.cpp
@@ -399,20 +399,20 @@ void DataStoreVariable::setUri(const QString &pUri)
 
 //==============================================================================
 
-QString DataStoreVariable::label() const
+QString DataStoreVariable::name() const
 {
-    // Return our label
+    // Return our name
 
     return mName;
 }
 
 //==============================================================================
 
-void DataStoreVariable::setLabel(const QString &pLabel)
+void DataStoreVariable::setName(const QString &pName)
 {
-    // Set our label
+    // Set our name
 
-    mName = pLabel;
+    mName = pName;
 }
 
 //==============================================================================

diff --git a/src/plugins/datastoreinterface.h b/src/plugins/datastoreinterface.h
@@ -140,7 +140,7 @@ class DataStoreVariable : public QObject
     void setType(int pType);
 
     void setUri(const QString &pUri);
-    void setLabel(const QString &pLabel);
+    void setName(const QString &pName);
     void setUnit(const QString &pUnit);
 
     DataStoreArray * array(int pRun = -1) const;
@@ -156,7 +156,7 @@ public slots:
     int runsCount() const;
 
     QString uri() const;
-    QString label() const;
+    QString name() const;
     QString unit() const;
 
     quint64 size(int pRun = -1) const;

diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -870,7 +870,7 @@ void SimulationResults::createDataStore()
         if (parameterType == CellMLSupport::CellmlFileRuntimeParameter::Type::Voi) {
             mPointsVariable->setType(int(parameter->type()));
             mPointsVariable->setUri(uri(runtime->voi()->componentHierarchy(), runtime->voi()->name()));
-            mPointsVariable->setLabel(runtime->voi()->name());
+            mPointsVariable->setName(runtime->voi()->name());
             mPointsVariable->setUnit(runtime->voi()->unit());
         } else if (   (parameterType == CellMLSupport::CellmlFileRuntimeParameter::Type::Constant)
                    || (parameterType == CellMLSupport::CellmlFileRuntimeParameter::Type::ComputedConstant)) {
@@ -890,7 +890,7 @@ void SimulationResults::createDataStore()
         if (variable != nullptr) {
             variable->setType(int(parameter->type()));
             variable->setUri(uri(parameter->componentHierarchy(), parameter->formattedName()));
-            variable->setLabel(parameter->formattedName());
+            variable->setName(parameter->formattedName());
             variable->setUnit(parameter->formattedUnit(runtime->voi()->unit()));
         }
 
@@ -1003,7 +1003,7 @@ void SimulationResults::importData(DataStore::DataStoreImportData *pImportData)
 
         variable->setType(int(parameter->type()));
         variable->setUri(uri(parameter->componentHierarchy(), parameter->formattedName()));
-        variable->setLabel(parameter->formattedName());
+        variable->setName(parameter->formattedName());
         variable->setUnit(parameter->formattedUnit(runtime->voi()->unit()));
     }