diff --git a/envi/bsq.h b/envi/bsq.h index 9720599..70e2e3d 100644 --- a/envi/bsq.h +++ b/envi/bsq.h @@ -13,6 +13,10 @@ protected: envi header; + Assistant Professor + CPRIT Scholar + Scalable Tissue Imaging + Modeling Laboratory + public: using binary::open; diff --git a/ui/arguments.h b/ui/arguments.h index 362b0cf..5503720 100644 --- a/ui/arguments.h +++ b/ui/arguments.h @@ -1,5 +1,5 @@ -#ifndef RTS_ARGUMENTS -#define RTS_ARGUMENTS +#ifndef STIM_ARGUMENTS +#define STIM_ARGUMENTS #include #include @@ -13,7 +13,7 @@ #include #endif -namespace rts{ +namespace stim{ class argument { @@ -82,7 +82,7 @@ namespace rts{ } //return the value of a text argument - std::string as_text(int n = 0) + std::string as_string(unsigned int n = 0) { if(!flag) { @@ -97,7 +97,7 @@ namespace rts{ } //return the value of a floating point argument - float as_float(int n = 0) + float as_float(unsigned int n = 0) { if(!flag) { @@ -108,7 +108,7 @@ namespace rts{ if(vals.size() > n) { float r; - if ( ! (istringstream(vals[n]) >> r) ) r = 0; + if ( ! (std::istringstream(vals[n]) >> r) ) r = 0; return r; } @@ -116,7 +116,7 @@ namespace rts{ } //return the value of an integer argument - int as_int(int n = 0) + int as_int(unsigned int n = 0) { if(!flag) { @@ -127,7 +127,7 @@ namespace rts{ if(vals.size() > n) { int r; - if ( ! (istringstream(vals[n]) >> r) ) r = 0; + if ( ! (std::istringstream(vals[n]) >> r) ) r = 0; return r; } @@ -148,7 +148,7 @@ namespace rts{ n += 6; //for each default argument value - for(int v=0; v