diff --git a/pub/src/coord.cpp b/pub/src/coord.cpp index fad1cf89b3626cf550d01e7250288a320e70c539..2a1dad2f73da362fbe74ebe4e7af49ab186a3c63 100644 --- a/pub/src/coord.cpp +++ b/pub/src/coord.cpp @@ -14,28 +14,6 @@ using namespace std; #include "coord.h" #include "gar.h" -CCoord::CCoord(void) -{ -} - -CCoord::CCoord( const char *nin, const char *uin) -{ - name = string(nin); - unit = string(uin); -} - -CCoord::CCoord( const string *nin, const string *uin) -{ - name = *nin; - unit = *uin; -} - -CCoord::CCoord( const string nin, const string uin) -{ - name = nin; - unit = uin; -} - char CoordDecode( const string& resp, CCoord *rval ) { if (resp[0]=='\0') { @@ -84,17 +62,17 @@ CCoord CCoord::Ask( const string& quest ) return *this; } -string CCoord::str(void) const +string CCoord::str() const { return name + ( unit!="" ? (" (" + unit + ")") : ""); } -string CCoord::ps_str(void) const // just two blanks instead of one +string CCoord::ps_str() const // just two blanks instead of one { return name + ( unit!="" ? (" (" + unit + ")") : ""); } -string CCoord::fstr(void) const +string CCoord::fstr() const { return name + "\t" + unit; } @@ -136,7 +114,7 @@ int CParam::init_from_a01( const string in ) return 0; } -string CParam::str(void) const +string CParam::str() const { return strg(val) + string(" ") + Co.str(); } diff --git a/pub/src/coord.h b/pub/src/coord.h index 74e9551fe0a0684a313634475deefe4fb46bc1a9..b8d1fb70cd6aa305b2882cfdb82c772be8b452d2 100644 --- a/pub/src/coord.h +++ b/pub/src/coord.h @@ -1,15 +1,10 @@ -// This is coord.h -// -// Requires #include <string> "readln.h" "usrinp.h" - class CCoord { -public: + public: string name, unit; - CCoord(void); - CCoord( const char *nin, const char *uin); - CCoord( const string *nin, const string *uin); - CCoord( const string nin, const string uin); + inline CCoord() {}; + inline CCoord( const string _name, const string _unit) : + name(_name), unit(_unit) {}; CCoord Ask( const string& quest, const CCoord& defval ); CCoord Ask( const string& quest ); @@ -26,21 +21,21 @@ public: inline bool operator!= (const CCoord& Co2) const { return !(*this==Co2); }; -private: + private: static const char *helptext; }; inline string strg(const CCoord& C) { return C.str(); }; class CParam { -public: + public: CCoord Co; double val; - inline CParam(void) { }; + inline CParam(void) {}; inline CParam(CCoord Cin, double vin=0) { Co = Cin; val = vin; }; - inline CParam(string nin, string uin="", double vin=0) - { Co = CCoord(nin, uin); val = vin; }; + inline CParam(string _name, string _unit="", double vin=0) + { Co = CCoord(_name, _unit); val = vin; }; string str(void) const; int init_from_a01( const string in );