From: Jon S. B. <jb...@us...> - 2014-02-17 04:59:55
|
Update of /cvsroot/jsbsim/JSBSim/src/input_output In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16505/src/input_output Modified Files: FGXMLElement.cpp Log Message: Added support for turning on/off dispersions through JSBSIM_DISPERSE environment variable Index: FGXMLElement.cpp =================================================================== RCS file: /cvsroot/jsbsim/JSBSim/src/input_output/FGXMLElement.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -r1.45 -r1.46 *** FGXMLElement.cpp 13 Jan 2014 10:46:02 -0000 1.45 --- FGXMLElement.cpp 17 Feb 2014 04:59:52 -0000 1.46 *************** *** 569,573 **** double value=val; double disp=0.0; ! if (e->HasAttribute("dispersion")) { disp = e->GetAttributeValueAsNumber("dispersion"); if (!supplied_units.empty()) disp *= convert[supplied_units][target_units]; --- 569,585 ---- double value=val; double disp=0.0; ! ! bool disperse = false; ! try { ! char* num = getenv("JSBSIM_DISPERSE"); ! if (num) { ! disperse = (atoi(num) == 1); // set dispersions ! } ! } catch (...) { // if error set to false ! disperse = false; ! std::cerr << "Could not process JSBSIM_DISPERSE environment variable: Assumed NO dispersions." << endl; ! } ! ! if (e->HasAttribute("dispersion") && disperse) { disp = e->GetAttributeValueAsNumber("dispersion"); if (!supplied_units.empty()) disp *= convert[supplied_units][target_units]; |