Bug 2502: Synchronized field and column names.

copasi · Sep 29, 2017 · 03c2b2e · 03c2b2e
1 parent 13bec22
commit 03c2b2e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/copasi/UI/CQReactionDM.cpp b/copasi/UI/CQReactionDM.cpp
@@ -181,7 +181,7 @@ QVariant CQReactionDM::headerData(int section, Qt::Orientation orientation,
             if (FrequencyUnits != "none")
               FrequencyUnits = "\n(" + FrequencyUnits + ")";
 
-            return QVariant("Flux" + FrequencyUnits);
+            return QVariant("Number Flux" + FrequencyUnits);
           }
 
           default:

diff --git a/copasi/UI/CQSpeciesDetail.cpp b/copasi/UI/CQSpeciesDetail.cpp
@@ -222,7 +222,7 @@ void CQSpeciesDetail::setFramework(int framework)
         break;
 
       case 1:
-        mpLblInitialValue->setText("Initial Particle Number");
+        mpLblInitialValue->setText("Initial Number");
 
         ValueUnits.replace(0, 1, '\n'); // Line break instead of space
         mpLblInitialExpression->setText("Initial Expression" + ValueUnits);
@@ -233,8 +233,8 @@ void CQSpeciesDetail::setFramework(int framework)
         else
           mpLblExpression->setText("Expression" + RateUnits);
 
-        mpLblValue->setText("Particle Number");
-        mpLblRate->setText("Rate" + FrequencyUnits);
+        mpLblValue->setText("Number");
+        mpLblRate->setText("Number Rate" + FrequencyUnits);
 
         mpEditInitialValue->setText(QString::number(mInitialNumber, 'g', 10));
         mpEditInitialValue->setReadOnly(false);

diff --git a/copasi/UI/ReactionsWidget1.cpp b/copasi/UI/ReactionsWidget1.cpp
@@ -814,7 +814,7 @@ void ReactionsWidget1::setFramework(int framework)
         if (Units != "none")
           Units = " (" + Units + ")";
 
-        mpLblFlux->setText("Particle Flux" + Units);
+        mpLblFlux->setText("Number Flux" + Units);
 
         if (pReaction != NULL)
           mpEditFlux->setText(QString::number(pReaction->getParticleFlux(), 'g', 10));

diff --git a/copasi/UI/StateSubwidget.cpp b/copasi/UI/StateSubwidget.cpp
@@ -1,3 +1,8 @@
+// Copyright (C) 2017 by Pedro Mendes, Virginia Tech Intellectual
+// Properties, Inc., University of Heidelberg, and University of
+// of Connecticut School of Medicine.
+// All rights reserved.
+
 // Copyright (C) 2010 - 2016 by Pedro Mendes, Virginia Tech Intellectual
 // Properties, Inc., University of Heidelberg, and The University
 // of Manchester.
@@ -342,13 +347,13 @@ void StateSubwidget::showUnits()
   mpTblCompartments->horizontalHeaderItem(3)->setText("Rate" + VolumeRateUnits);
 
   mpTblMetabolites->horizontalHeaderItem(2)->setText("Concentration" + ConcentrationUnits);
-  mpTblMetabolites->horizontalHeaderItem(3)->setText("Particle Numbers");
+  mpTblMetabolites->horizontalHeaderItem(3)->setText("Number");
   mpTblMetabolites->horizontalHeaderItem(4)->setText("Rate" + ConcentrationRateUnits);
-  mpTblMetabolites->horizontalHeaderItem(5)->setText("Rate" + FrequencyUnits);
+  mpTblMetabolites->horizontalHeaderItem(5)->setText("Number Rate" + FrequencyUnits);
   mpTblMetabolites->horizontalHeaderItem(6)->setText("Transition Time" + TimeUnits);
 
   mpTblReactions->horizontalHeaderItem(1)->setText("Flux" + QuantityRateUnits);
-  mpTblReactions->horizontalHeaderItem(2)->setText("Particle Flux" + FrequencyUnits);
+  mpTblReactions->horizontalHeaderItem(2)->setText("Number Flux" + FrequencyUnits);
 }
 
 bool StateSubwidget::loadAll(const CSteadyStateTask * pTask)