Changeset 18

Timestamp:

03/23/09 16:04:37 (16 years ago)

Author:

qweitzel

Message:

change in pixelmap: file now defined via construtor

Files:

• pixelmap/PixelMap.cc (modified) (2 diffs)
• pixelmap/PixelMap.h (modified) (1 diff)
• tools/pixelmap_test/PixelMapTest.cc (modified) (1 diff)
• tools/pixelmap_test/Test_PixelMap.txt (moved) (moved from tools/pixelmap_test/PixelMap.txt )

pixelmap/PixelMap.cc

@@ -6 +6 @@
 #include <cctype>
 
-PixelMap::PixelMap(bool verbose) {
+PixelMap::PixelMap(std::string file, bool verbose) {
 
     pixelmap.clear();
-    ReadPixelMap(pixelmap, verbose);
+    ReadPixelMap(pixelmap, file, verbose);
 
 }
@@ -21 +21 @@
 }
 
-void PixelMap::ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, bool verbose) {
-
-    std::string filename("PixelMap.txt");
-    std::ifstream infile(filename.c_str(), std::fstream::in);
+void PixelMap::ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, std::string file, bool verbose) {
+
+    //std::string filename("PixelMap.txt");
+    std::ifstream infile(file.c_str(), std::fstream::in);
 
     if (verbose) {
-        std::cout<<"Reading mapping file: "<<filename<<std::endl<<std::endl;    
+        std::cout<<"Reading mapping file: "<<file<<std::endl<<std::endl;    
         if (!infile.good()) {
-            std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<filename<<" cannot be found."<<std::endl;
+            std::cerr<<"ERROR in PixelMap::ReadPixelMap: File "<<file<<" cannot be found."<<std::endl;
         }
     }

pixelmap/PixelMap.h

@@ -13 +13 @@
 public:
     
-    PixelMap(bool verbose=false);
+    PixelMap(std::string file, bool verbose=false);
     ~PixelMap();
     
     std::map<std::string, Pixel*> pixelmap;
 
-    void ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, bool verbose=false);
+    void ReadPixelMap(std::map<std::string, Pixel*>& pixelmap, std::string file, bool verbose=false);
     void Print();
 

tools/pixelmap_test/PixelMapTest.cc

@@ -12 +12 @@
     std::cout << std::endl;
 
-    PixelMap* pm = new PixelMap(true);
+    PixelMap* pm = new PixelMap("Test_PixelMap.txt", true);
 
     pm->Print();