Removed code to obtaining the data for diagramexoplanets/remove-diagram

4 files changed, 0 insertions, 119 deletions

diff --git a/plugins/Exoplanets/src/Exoplanet.cpp b/plugins/Exoplanets/src/Exoplanet.cpp
index 4bf99e5403..697e64ec40 100644
--- a/plugins/Exoplanets/src/Exoplanet.cpp
+++ b/plugins/Exoplanets/src/Exoplanet.cpp
@@ -93,24 +93,9 @@ Exoplanet::Exoplanet(const QVariantMap& map)
 	effectiveTemp = map.value("effectiveTemp").toInt();
 	hasHabitableExoplanets = map.value("hasHP", false).toBool();
 
-	eccentricityList.clear();
-	semiAxisList.clear();
-	massList.clear();
-	radiusList.clear();
-	periodList.clear();
-	angleDistanceList.clear();
 	englishNames.clear();
 	translatedNames.clear();
 	exoplanetDesignations.clear();
-	effectiveTempHostStarList.clear();
-	yearDiscoveryList.clear();
-	metallicityHostStarList.clear();
-	vMagHostStarList.clear();
-	raHostStarList.clear();
-	decHostStarList.clear();
-	distanceHostStarList.clear();
-	massHostStarList.clear();
-	radiusHostStarList.clear();
 	if (map.contains("exoplanets"))
 	{
 		for (const auto& expl : map.value("exoplanets").toList())
@@ -148,23 +133,6 @@ Exoplanet::Exoplanet(const QVariantMap& map)
 			p.conservative = exoplanetMap.value("conservative", false).toBool();
 
 			exoplanets.append(p);
-
-			eccentricityList.append(qMax(0., p.eccentricity));
-			semiAxisList.append(qMax(0., p.semiAxis));
-			massList.append(qMax(0., p.mass));
-			radiusList.append(qMax(0., p.radius));
-			angleDistanceList.append(qMax(0., p.angleDistance));
-			periodList.append(qMax(0., p.period));
-			yearDiscoveryList.append(p.discovered);
-			effectiveTempHostStarList.append(effectiveTemp);
-			metallicityHostStarList.append(smetal);
-			if (Vmag<99)
-				vMagHostStarList.append(Vmag);
-			raHostStarList.append(RAdd);
-			decHostStarList.append(DEdd);
-			distanceHostStarList.append(distance);
-			massHostStarList.append(smass);
-			radiusHostStarList.append(sradius);
 		}
 	}
 
diff --git a/plugins/Exoplanets/src/Exoplanet.hpp b/plugins/Exoplanets/src/Exoplanet.hpp
index 4f462fafc7..8af13ca0cc 100644
--- a/plugins/Exoplanets/src/Exoplanet.hpp
+++ b/plugins/Exoplanets/src/Exoplanet.hpp
@@ -130,25 +130,6 @@ public:
 		return PHEPCount;
 	}
 
-	QList<double> getData(int mode)
-	{
-		return QMap<int, QList<double>>{
-			{1, semiAxisList},
-			{2, massList},
-			{3, radiusList},
-			{4, periodList},
-			{5, angleDistanceList},
-			{6, effectiveTempHostStarList},
-			{7, yearDiscoveryList},
-			{8, metallicityHostStarList},
-			{9, vMagHostStarList},
-			{10, raHostStarList},
-			{11, decHostStarList},
-			{12, distanceHostStarList},
-			{13, massHostStarList},
-			{14, radiusHostStarList}}.value(mode,eccentricityList);
-	}
-
 private:
 	QString getPlanetaryClassI18n(QString ptype) const;
 
@@ -193,11 +174,6 @@ private:
 
 	QStringList englishNames, translatedNames, exoplanetDesignations;
 
-	// Lists with various data for fast creating a diagrams of relations
-	QList<double> eccentricityList, semiAxisList, massList, radiusList, periodList, angleDistanceList,
-		      effectiveTempHostStarList, yearDiscoveryList, metallicityHostStarList, vMagHostStarList,
-		      raHostStarList, decHostStarList, distanceHostStarList, massHostStarList, radiusHostStarList;
-
 	LinearFader labelsFader;
 };
 
diff --git a/plugins/Exoplanets/src/Exoplanets.cpp b/plugins/Exoplanets/src/Exoplanets.cpp
index cca97303f7..36897488fd 100644
--- a/plugins/Exoplanets/src/Exoplanets.cpp
+++ b/plugins/Exoplanets/src/Exoplanets.cpp
@@ -541,12 +541,6 @@ void Exoplanets::setEPMap(const QVariantMap& map)
 	StelObjectP star;
 	ep.clear();
 	PSCount = EPCountAll = EPCountPH = 0;
-	EPEccentricityAll.clear();
-	EPSemiAxisAll.clear();
-	EPMassAll.clear();
-	EPRadiusAll.clear();
-	EPPeriodAll.clear();
-	EPAngleDistanceAll.clear();
 	QVariantMap epsMap = map.value("stars").toMap();
 	for (auto &epsKey : epsMap.keys())
 	{
@@ -581,21 +575,6 @@ void Exoplanets::setEPMap(const QVariantMap& map)
 		if (eps->initialized)
 		{
 			ep.append(eps);
-			EPEccentricityAll.append(eps->getData(0));
-			EPSemiAxisAll.append(eps->getData(1));
-			EPMassAll.append(eps->getData(2));
-			EPRadiusAll.append(eps->getData(3));
-			EPPeriodAll.append(eps->getData(4));
-			EPAngleDistanceAll.append(eps->getData(5));
-			EPEffectiveTempHostStarAll.append(eps->getData(6));
-			EPYearDiscoveryAll.append(eps->getData(7));
-			EPMetallicityHostStarAll.append(eps->getData(8));
-			EPVMagHostStarAll.append(eps->getData(9));
-			EPRAHostStarAll.append(eps->getData(10));
-			EPDecHostStarAll.append(eps->getData(11));
-			EPDistanceHostStarAll.append(eps->getData(12));
-			EPMassHostStarAll.append(eps->getData(13));
-			EPRadiusHostStarAll.append(eps->getData(14));
 			EPCountAll += eps->getCountExoplanets();
 			EPCountPH += eps->getCountHabitableExoplanets();
 		}
diff --git a/plugins/Exoplanets/src/Exoplanets.hpp b/plugins/Exoplanets/src/Exoplanets.hpp
index f54daa8e51..a390254e86 100644
--- a/plugins/Exoplanets/src/Exoplanets.hpp
+++ b/plugins/Exoplanets/src/Exoplanets.hpp
@@ -193,43 +193,6 @@ public:
 	//! Get the current updateState
 	UpdateState getUpdateState(void) const {return updateState;}
 
-	QList<double> getExoplanetsData(int mode) const
-	{
-		switch(mode)
-		{
-			case 1:
-				return EPSemiAxisAll;
-			case 2:
-				return EPMassAll;
-			case 3:
-				return EPRadiusAll;
-			case 4:
-				return EPPeriodAll;
-			case 5:
-				return EPAngleDistanceAll;
-			case 6:
-				return EPEffectiveTempHostStarAll;
-			case 7:
-				return EPYearDiscoveryAll;
-			case 8:
-				return EPMetallicityHostStarAll;
-			case 9:
-				return EPVMagHostStarAll;
-			case 10:
-				return EPRAHostStarAll;
-			case 11:
-				return EPDecHostStarAll;
-			case 12:
-				return EPDistanceHostStarAll;
-			case 13:
-				return EPMassHostStarAll;
-			case 14:
-				return EPRadiusHostStarAll;
-			default:
-				return EPEccentricityAll;
-		}
-	}
-
 	//! Get the list of all exoplanetary systems.
 	const QList<ExoplanetP>& getAllExoplanetarySystems() const {return ep;}
 
@@ -406,11 +369,6 @@ private:
 	int EPCountAll;	// Count of exoplents
 	int EPCountPH;	// Count of exoplanets in habitable zone
 
-	// Lists of various data about exoplanets for quick plot of graphs
-	QList<double> EPEccentricityAll, EPSemiAxisAll, EPMassAll, EPRadiusAll, EPPeriodAll, EPAngleDistanceAll,
-		      EPEffectiveTempHostStarAll, EPYearDiscoveryAll, EPMetallicityHostStarAll, EPVMagHostStarAll,
-		      EPRAHostStarAll, EPDecHostStarAll, EPDistanceHostStarAll, EPMassHostStarAll, EPRadiusHostStarAll;
-
 	StelTextureSP texPointer;
 	QList<ExoplanetP> ep;