Commit aba51173 authored by Vladimír Ulman's avatar Vladimír Ulman
Browse files

configFile handling FIX: Slightly better names used for classes etc.

parent 8c27c6ef

src/TriangleMesh.cpp

+6 −6
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ void ActiveMesh::ConstructFF_T(FlowField<float> &FF) 
}





void ActiveMesh::config::getValueOrDefault(const char* key,const std::string& defValue,std::string& var)

void ActiveMesh::configDataSubClass::getValueOrDefault(const char* key,const std::string& defValue,std::string& var)

{

	std::string sKey(key);

	std::map<std::string,std::string>::const_iterator it = keyVal_map.find(sKey);
@@ -2299,7 +2299,7 @@ void ActiveMesh::config::getValueOrDefault(const char* key,const std::string& de 
		var = it->second;

}



void ActiveMesh::config::getValueOrDefault(const char* key,const int defValue,int& var)

void ActiveMesh::configDataSubClass::getValueOrDefault(const char* key,const int defValue,int& var)

{

	std::string sKey(key);

	std::map<std::string,std::string>::const_iterator it = keyVal_map.find(sKey);
@@ -2313,7 +2313,7 @@ void ActiveMesh::config::getValueOrDefault(const char* key,const int defValue,in 
		var = atoi(it->second.c_str());

}



void ActiveMesh::config::getValueOrDefault(const char* key,const float defValue,float& var)

void ActiveMesh::configDataSubClass::getValueOrDefault(const char* key,const float defValue,float& var)

{

	std::string sKey(key);

	std::map<std::string,std::string>::const_iterator it = keyVal_map.find(sKey);
@@ -2327,16 +2327,16 @@ void ActiveMesh::config::getValueOrDefault(const char* key,const float defValue, 
		var = (float)atof(it->second.c_str());

}



int ActiveMesh::config::ParseConfigFile(const char* configFileName)

int ActiveMesh::configDataSubClass::ParseConfigFile(const char* fileName)

{

	//clear before parsing

	keyVal_map.clear();



	//try to open the config file

	std::ifstream configFile(configFileName);

	std::ifstream configFile(fileName);

	if (!configFile.is_open())

	{

		std::cout << "Unable to read the config file: " << configFileName << "\n";

		std::cout << "Unable to read the config file: " << fileName << "\n";

		return(-1);

	}

src/TriangleMesh.h

+2 −2
Original line number Diff line number Diff line
@@ -179,12 +179,12 @@ class ActiveMesh 
	Vector3F meshShift;



	///internal class to store all params that one can read in from a config file

	class config

	class configDataSubClass

	{

	 public:

		///returns non-zero if some problem occured,

		///the default values are listed in this function

		int ParseConfigFile(const char* configFileName);

		int ParseConfigFile(const char* fileName);



		///output image resolution as voxels/um

		Vector3F texture_Resolution;