Updates BlueQuartzSoftware#175 Changes to be able to read/write jsons…

… for GPD
tuks188 · May 5, 2018 · f441405 · f441405
1 parent ba606eb
commit f441405
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/Source/SIMPLib/StatsData/PrecipitateStatsData.h b/Source/SIMPLib/StatsData/PrecipitateStatsData.h
@@ -131,6 +131,7 @@ class SIMPLib_EXPORT PrecipitateStatsData : public StatsData
     SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSizeDistribution)
     SIMPL_INSTANCE_PROPERTY(uint32_t, FeatureSize_DistType)
     SIMPL_INSTANCE_PROPERTY(RdfData::Pointer, RadialDistFunction)
+	SIMPL_INSTANCE_PROPERTY(QString, DistributionTypeCombo)
 
     SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, BinNumbers)
 

diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.cpp b/Source/SIMPLib/StatsData/PrimaryStatsData.cpp
@@ -219,6 +219,7 @@ void PrimaryStatsData::writeJson(QJsonObject& json)
     avgSizeDist.insert(m_FeatureSizeDistribution[i]->getName(), m_FeatureSizeDistribution[i]->getValue(0));
   }
   json.insert(SIMPL::StringConstants::Feature_Size_Distribution, avgSizeDist);
+  json.insert(SIMPL::StringConstants::DistributionType, decodeDistributionType(getFeatureSize_DistType()));
 
   // Write the Bin Numbers
   if(nullptr == getBinNumbers().get())
@@ -280,6 +281,9 @@ void PrimaryStatsData::readJson(const QJsonObject& json)
     setPhaseFraction(jsonValue.toDouble(0.0));
   }
   // Read the Feature Diameter Info
+  jsonValue = json[SIMPL::StringConstants::DistributionType];
+  setDistributionTypeCombo(jsonValue.toString());
+
   float fVec3[3] = {0.0f, 0.0f, 0.0f};
   if(ParseFloat3Vec(json, SIMPL::StringConstants::Feature_Diameter_Info, fVec3, 0.0) == -1)
   {

diff --git a/Source/SIMPLib/StatsData/PrimaryStatsData.h b/Source/SIMPLib/StatsData/PrimaryStatsData.h
@@ -128,6 +128,8 @@ class SIMPLib_EXPORT PrimaryStatsData : public StatsData
       */
     SIMPL_INSTANCE_PROPERTY(VectorOfFloatArray, FeatureSizeDistribution)
     SIMPL_INSTANCE_PROPERTY(uint32_t, FeatureSize_DistType)
+	SIMPL_INSTANCE_PROPERTY(QString, DistributionTypeCombo)
+
 
     SIMPL_INSTANCE_PROPERTY(FloatArrayType::Pointer, BinNumbers)
 

diff --git a/Source/SIMPLib/StatsData/StatsData.cpp b/Source/SIMPLib/StatsData/StatsData.cpp
@@ -231,6 +231,9 @@ QString StatsData::decodeDistributionType(int disType)
   case SIMPL::DistributionType::Beta:
     disTypeStr = SIMPL::StringConstants::BetaDistribution;
     break;
+  case SIMPL::DistributionType::Pareto:
+	  disTypeStr = SIMPL::StringConstants::ParetoDistribution;
+	  break;
   case SIMPL::DistributionType::LogNormal:
     disTypeStr = SIMPL::StringConstants::LogNormalDistribution;
     break;
@@ -260,6 +263,11 @@ int StatsData::EncodeDistributionType(QString distTypeName)
   {
     distType = SIMPL::DistributionType::LogNormal;
   }
+  else if(distTypeName == SIMPL::StringConstants::ParetoDistribution)
+  {
+	  distType = SIMPL::DistributionType::Pareto;
+  }
+
   else if(distTypeName == SIMPL::StringConstants::UnknownDistribution)
   {
     distType = SIMPL::DistributionType::UnknownDistributionType;