added file name sorting code to abrastract analysis

there does seem to be some kind of strange file saving ordering problem
going on... into the 'drawing' --> folder. will look at it and try and
see what its doing wrong

config.refindx

@@ -1,6 +1,7 @@
 <!-- THIS FILE NEEDS TO GO IN THE APPLICATION /data/ folder -->
 
 <config>
+    <mode>drawing</mode>
 	<camera>
 		<id>1</id>
 		<width>640</width>

example/RefractiveIndex.cpp

@@ -27,8 +27,10 @@
 #define ISTATE_TRANSITION   0xCCCC
 #define ISTATE_END          0xDDDD
 
+
 int _state = ISTATE_UNDEF;
 
+int              RefractiveIndex::_mode;
 ofPixels         RefractiveIndex::_pixels;
 ofVideoGrabber   RefractiveIndex::_vidGrabber;
 int              RefractiveIndex::_vid_w, RefractiveIndex::_vid_h, RefractiveIndex::_vid_id;
@@ -50,6 +52,10 @@ void RefractiveIndex::setup()
         XML.loadFile("config.refindx");
     }
     
+    // <mode>
+    string m = XML.getValue("config:mode", "analysing");
+    _mode = (m == "analysing" ? MODE_ANALYSING : (m == "drawing" ? MODE_DRAWING : MODE_ANALYSING));
+        
     // <camera>
     _vid_id = XML.getValue("config:camera:id", CAMERA_ID);
     cout << "_vid_id: " << _vid_id << endl;
@@ -82,8 +88,10 @@ void RefractiveIndex::setup()
     cout << "* cam width = " << _vid_w << endl;
     cout << "* cam height = " << _vid_h << endl;
     
+    if(_mode == MODE_ANALYSING) {
         _vid_stream_open = false;    
         setup_camera();
+    }
     
     cout << "RRRRRREADY!" << endl;        
 
@@ -173,9 +181,13 @@ void RefractiveIndex::state_analysis()
             break;
         case ISTATE_STOP:
             stop_analysis(); // blocking
+            if(_mode == MODE_DRAWING)
+                _state = ISTATE_UNDEF;
+            else
                 _state = ISTATE_TRANSITION;
             break;
         case ISTATE_END:
+            if(_mode == MODE_ANALYSING)
                 stop_camera();
             ::exit(1);
             break;

example/RefractiveIndex.h

@@ -11,6 +11,9 @@
 #include "ofxOpenCv.h"
 #include "ofxXmlSettings.h"
 
+#define MODE_DRAWING        0xEEFF
+#define MODE_ANALYSING      0xFFEE
+
 class RefractiveIndex : public ofBaseApp
 {
 public:
@@ -55,6 +58,8 @@ public:
     // acquisition
     static ofPixels         _pixels;    
     static ofVideoGrabber   _vidGrabber;
+    static int              _mode;
+    
     vector<string>          videoSourceList;    
     static int              _vid_w, _vid_h, _vid_id;
     static bool             _vid_stream_open;

src/AbstractAnalysis.cpp

@@ -3,10 +3,32 @@
 #include "AbstractAnalysis.h"
 #include "RefractiveIndex.h"
 #include "ofxFileHelper.h"
+#include "ofSystemUtils.h"
+
+void AbstractAnalysis::setup(int camWidth, int camHeight) {
+    
+    _cam_w = camWidth; _cam_h = camHeight;
+    
+    if(RefractiveIndex::_mode == MODE_DRAWING) {
+        ofFileDialogResult r = ofSystemLoadDialog("choooose da folda", true);
+        if(!r.bSuccess) {
+            ofSystemAlertDialog("OOOOPS.... ERROR...");
+            return;
+        }
+                
+        _whole_file_path_analysis = r.filePath;
+        _whole_file_path_synthesis = r.filePath + "/darwings";        
+    }
+    
+}
 
 // this is the main threaded loop for a given analysis
 void AbstractAnalysis::do_synthesize() {
     
+    switch(RefractiveIndex::_mode)
+    {
+        case MODE_ANALYSING:
+        {
             for(int i = 0; i < NUM_RUN; i++) {
                 
                 cout << "NUM_RUN: " << i << endl;
@@ -14,10 +36,6 @@ void AbstractAnalysis::do_synthesize() {
                 _saved_filenames_analysis.clear();  
                 _saved_filenames_synthesis.clear(); 
                 
-        if(_state == STATE_STOP) goto exit;
-        _state = STATE_ALLOCATE;
-        allocate();
-        if(_state == STATE_STOP) goto exit;
                 _state = STATE_ACQUIRING;
                 acquire();
                 if(_state == STATE_STOP) goto exit;
@@ -26,13 +44,31 @@ void AbstractAnalysis::do_synthesize() {
                 if(_state == STATE_STOP) goto exit;
                 _state = STATE_DISPLAY_RESULTS;
                 displayresults();
-        _state = STATE_CLEANUP;
                 cleanup();
             }                    
+        }
+            
+        case MODE_DRAWING:
+        {            
+            ofxFileHelper fileHelperDrawing;
+            if(!fileHelperDrawing.doesDirectoryExist(_whole_file_path_synthesis)){
+                fileHelperDrawing.makeDirectory(_whole_file_path_synthesis);
+            }            
+            
+            read_dir_create_list(_whole_file_path_analysis);
+            _state = STATE_SYNTHESISING;
+            synthesise();
+            if(_state == STATE_STOP) goto exit;
+            _state = STATE_DISPLAY_RESULTS;
+            displayresults();
+            cleanup();            
+        }
+    }
     
 exit:    
     cleanup();
     ofNotifyEvent(_synthesize_cb, _name);    
+    
 }
 
 void AbstractAnalysis::create_dir_allocate_images()
@@ -121,6 +157,57 @@ void AbstractAnalysis::create_dir_allocate_images()
 
 }
 
+
+
+
+bool cmp_file(string f0, string f1)
+
+{
+    
+    int v0 = atoi(f0.substr(0, f0.find("_")).c_str());
+    
+    int v1 = atoi(f1.substr(0, f1.find("_")).c_str());    
+    
+    return v0 < v1;
+    
+}
+
+
+
+void AbstractAnalysis::read_dir_create_list(string folder_path)
+
+{
+    
+    File dir(folder_path);
+    
+    
+    
+    if(dir.exists() && dir.isDirectory()) {
+        
+        vector<string> list;
+        
+        dir.list(list);   
+        
+        
+        
+        std::sort(list.begin(), list.end(), cmp_file);
+        
+        
+        
+        for(int i = 0; i < list.size(); i++) {
+            
+            string filepath = folder_path + "/" + list[i]; 
+            
+            _saved_filenames_analysis.push_back(filepath);
+            
+        }                
+        
+    }
+}
+
+
+
+
 void AbstractAnalysis::saveImageAnalysis(string filename)
 {
     
@@ -186,5 +273,6 @@ void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels
     
     _saved_filenames_synthesis.push_back(_whole_file_path_synthesis+"/"+filename);
             
+    
 }
 

src/AbstractAnalysis.h

@@ -13,13 +13,10 @@
 #define ANALYSIS_PATH "analysis/"
 #define SYNTHESIS_PATH "synthesis/"
 
-#define STATE_ALLOCATE          0x0010
-#define STATE_CLEANUP           0x0001
 #define STATE_ACQUIRING         0x1111
 #define STATE_SYNTHESISING      0x2222
 #define STATE_DISPLAY_RESULTS   0x3333
 #define STATE_STOP              0xDEADBEEF
-#define STATE_DEF               0x0000
 
 class AbstractAnalysis {
     
@@ -28,7 +25,7 @@ public:
     virtual ~AbstractAnalysis(){;}
     
     // generic function to set up the camera
-    virtual void setup(int camWidth, int camHeight){_cam_w = camWidth; _cam_h = camHeight;}  
+    virtual void setup(int camWidth, int camHeight);  
 
     // this is the main threaded loop for a given analysis
     void do_synthesize();
@@ -40,6 +37,8 @@ protected:
     
     virtual void create_dir_allocate_images();
     
+    virtual void read_dir_create_list(string folder_path);
+    
     virtual void saveImageAnalysis(string filename);
     virtual void saveImageSynthesis(string filename, ofxCvImage* newPixels, ofImageType newType);
     
@@ -52,15 +51,13 @@ protected:
     // display the results from disk
     virtual void displayresults() = 0;   
     
-    // allocate all images
+    // display the results from disk
-    virtual void allocate() {;}   
-    
-    // deallocate all images
     virtual void cleanup() {;}   
     
         
 public:
     string  _name;       
+    string  _draw_directory;
     
     // event
     ofEvent<string> _synthesize_cb;    

src/CamNoiseAnalysis.cpp

@@ -15,6 +15,8 @@ using Poco::Thread;
 
 void CamNoiseAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_camnoise", NUMBER_RUNS);
     cout << "NUM_RUN CamNoiseAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/ColorMultiAnalysis.cpp

@@ -14,6 +14,8 @@ using Poco::Thread;
 
 void ColorMultiAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_colormulti", NUMBER_RUNS);
     cout << "NUM_RUN ColorMultiAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/ColorSingleAnalysis.cpp

@@ -15,6 +15,8 @@ using Poco::Thread;
 
 void ColorSingleAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_colorsingle", NUMBER_RUNS);
     cout << "NUM_RUN ColorSingleAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/ColorSingleAnalysis.h

@@ -65,5 +65,8 @@ protected:
     //this is the temporary container to allow us to convert and save out greyscale images
     ofxCvColorImage         cvConvertorImage;
     
+    unsigned char * imagePixels;
+    int vectorCount;
+    ofVec2f * vectorField;
 
 };

src/DiffNoiseAnalysis.cpp

@@ -15,6 +15,8 @@ using Poco::Thread;
 
 void DiffNoiseAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_diffnoise", NUMBER_RUNS);
     cout << "NUM_RUN DiffNoiseAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/IResponseAnalysis.cpp

@@ -15,6 +15,8 @@ using Poco::Thread;
 
 void IResponseAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+        
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_iresponse", NUMBER_RUNS);
     cout << "NUM_RUN IResponseAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/RelaxRateAnalysis.cpp

@@ -17,6 +17,8 @@ using Poco::Thread;
 
 void RelaxRateAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_relaxrate", NUMBER_RUNS);
     cout << "NUM_RUN RelaxRateAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/ShadowScapesAnalysis.cpp

@@ -19,6 +19,8 @@ using Poco::Thread;
 
 void ShadowScapesAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_shadowscapes", NUMBER_RUNS);
     cout << "NUM_RUN ShadowScapesAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;
@@ -51,7 +53,6 @@ void ShadowScapesAnalysis::setup(int camWidth, int camHeight)
     _show_image = false;
     _image_shown = false;
     
-    /*
     image1.clear();
     image2.clear();
     image3.clear();  
@@ -98,7 +99,6 @@ void ShadowScapesAnalysis::setup(int camWidth, int camHeight)
     cvGrayDiff2.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
     
     cvConvertorImage.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-     */
     
 }
 
@@ -226,116 +226,24 @@ void ShadowScapesAnalysis::displayresults()
         if(!image3.loadImage(_saved_filenames_synthesis[i])){
             //couldn't load image
             cout << "didn't load image" << endl;
-        } else {
-            _show_image = true;
-            _image_shown = false;
-            
         } 
-/*        
+        
         if(image3.loadImage(_saved_filenames_synthesis[i])){
-            //image3.loadImage(_saved_filenames_synthesis[i]);
+            image3.loadImage(_saved_filenames_synthesis[i]);
             //cout << "_show_image = true;" << endl;
             _show_image = true;
             _image_shown = false;
         }
- */
     }
 
 }
 
-void ShadowScapesAnalysis::allocate()
-{
-    _RUN_DONE = false;
-    
-    image1.clear();
-    image3.clear();  
-    image4.clear();
-    image5.clear();
-    
-    image1.setUseTexture(false);         
-    image3.setUseTexture(false);  
-    image4.setUseTexture(false);
-    image5.setUseTexture(false);
-    
-    image1.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h,  OF_IMAGE_COLOR);
-    image3.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h,  OF_IMAGE_COLOR);  
-    image4.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h,  OF_IMAGE_COLOR);
-    image5.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h,  OF_IMAGE_COLOR);
-    
-    
-    while(!_RUN_DONE && _state != STATE_STOP)
-        Thread::sleep(3);    
-}
-
-void ShadowScapesAnalysis::cleanup()
-{
-    _RUN_DONE = false;
-    
-    image1.clear();
-    image3.clear();  
-    image4.clear();
-    image5.clear();        
-    
-    while(!_RUN_DONE && _state != STATE_STOP)
-        Thread::sleep(3);    
-}
-
-
 
 // the animation draw - and the output draw
 void ShadowScapesAnalysis::draw()
 {
     
     switch (_state) {
-        case STATE_ALLOCATE:
-        {
-            image2.clear();
-            image2.setUseTexture(true);
-            image2.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h,  OF_IMAGE_COLOR);
-            
-            cvColorImage1.clear();
-            cvGrayImage1.clear();
-            cvGrayDiff1.clear();
-            
-            cvColorImage2.clear();
-            cvGrayImage2.clear();
-            cvGrayDiff2.clear();
-            
-            cvConvertorImage.clear();    
-            
-            cvColorImage1.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-            cvGrayImage1.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-            cvGrayDiff1.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-            
-            cvColorImage2.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-            cvGrayImage2.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-            cvGrayDiff2.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);
-            
-            cvConvertorImage.allocate(RefractiveIndex::_vid_w,RefractiveIndex::_vid_h);   
-            
-            _state = STATE_DEF;
-            
-            _RUN_DONE = true;
-            break;
-        }
-        case STATE_CLEANUP:
-        {
-            image2.clear();
-            
-            cvColorImage1.clear();
-            cvGrayImage1.clear();
-            cvGrayDiff1.clear();
-            
-            cvColorImage2.clear();
-            cvGrayImage2.clear();
-            cvGrayDiff2.clear();
-            
-            _state = STATE_DEF;
-            
-            _RUN_DONE = true;
-            break;
-        }
-            
         case STATE_ACQUIRING:
         {
             _line += _step;

src/ShadowScapesAnalysis.h

@@ -26,9 +26,6 @@ public:
     void synthesise();   
     void displayresults();
 
-    void allocate();   
-    void cleanup();    
-
     void draw();
     
     void save_cb(Poco::Timer& timer);

src/ShapeFromShadingAnalysis.cpp

@@ -15,6 +15,8 @@ using Poco::Thread;
 
 void ShapeFromShadingAnalysis::setup(int camWidth, int camHeight)
 {       
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_shapefromshading", NUMBER_RUNS);
     cout << "NUM_RUN ShapeFromShadingAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;

src/StrobeAnalysis.cpp

@@ -15,6 +15,8 @@ using Poco::Thread;
 
 void StrobeAnalysis::setup(int camWidth, int camHeight)
 {
+    AbstractAnalysis::setup(camWidth, camHeight);
+    
     NUM_RUN = RefractiveIndex::XML.getValue("config:analysis_NUM_RUN:NUM_RUN_strobe", NUMBER_RUNS);
     cout << "NUM_RUN StrobeAnalysis " << NUM_RUN << endl;
     //NUM_RUN = 5;