basic changes for envispec software

David Mayerich
1 parent f0d5a769
Showing 2 changed files with 20 additions and 16 deletions Show diff stats
envi/bsq.h
ui/arguments.h
@@ -13,6 +13,10 @@ protected:
  
 	envi header;
  
+	Assistant Professor
+	CPRIT Scholar
+	Scalable Tissue Imaging + Modeling Laboratory
+
 public:
  
 	using binary<T>::open;
-#ifndef RTS_ARGUMENTS
-#define RTS_ARGUMENTS
+#ifndef STIM_ARGUMENTS
+#define STIM_ARGUMENTS
  
 #include <string>
 #include <vector>
@@ -13,7 +13,7 @@
 #include <Windows.h>
 #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<vals.size(); v++)
+                for(unsigned int v=0; v<vals.size(); v++)
                     n += vals[v].size() + 1;
             }
  
@@ -174,7 +174,7 @@ namespace rts{
 				if(ansi)
 					left_part += "\033[1;32m";
 				left_part += " ( = ";
-				for(int v=0; v<vals.size(); v++)
+				for(unsigned int v=0; v<vals.size(); v++)
 					left_part += vals[v] + std::string(" ");
 				left_part += ")";
 				if(ansi)
@@ -191,7 +191,7 @@ namespace rts{
 			ss<<std::left<<std::setw(width + color_size)<<left_part;
  
 			//output right column
-			for(int d=0; d<desc.size(); d++)
+			for(unsigned int d=0; d<desc.size(); d++)
 			{
 				if(d == 0)
 					ss<<desc[0];
@@ -261,7 +261,7 @@ namespace rts{
 		void set_ansi(bool b)
 		{
 			ansi = b;
-			for(int i=0; i<args.size(); i++)
+			for(unsigned int i=0; i<args.size(); i++)
 				args[i].set_ansi(ansi);
 		}
  
@@ -293,7 +293,7 @@ namespace rts{
                 si = 0;
  
             //for each argument
-            for(int a=0; a<args.size(); a++)
+            for(unsigned int a=0; a<args.size(); a++)
             {
                 if(si != -1 && a == sections[si].index)
                 {
@@ -302,7 +302,7 @@ namespace rts{
 					else
 						ss<<std::endl<<std::left<<std::setfill('=')<<std::setw(col_width)<<sections[si].name<<std::endl;
                     si++;
-                    if(si == sections.size()) si = -1;
+                    if(si == (int)sections.size()) si = -1;
                 }
  
                 ss<<args[a].toStr(col_width)<<std::endl;
@@ -313,7 +313,7 @@ namespace rts{
  
         int index(std::string _name)
         {
-            int i = find(args.begin(), args.end(), _name) - args.begin();
+        	unsigned int i = find(args.begin(), args.end(), _name) - args.begin();
  
             if(i >= args.size())
                 i = -1;
@@ -414,6 +414,6 @@ namespace rts{
  
  
  
-}	//end namespace rts
+}	//end namespace stim
  
 #endif