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;
     
-    _vid_stream_open = false;    
+    if(_mode == MODE_ANALYSING) {
-    setup_camera();
+        _vid_stream_open = false;    
+        setup_camera();
+    }
     
     cout << "RRRRRREADY!" << endl;        
 
@@ -173,10 +181,14 @@ void RefractiveIndex::state_analysis()
             break;
         case ISTATE_STOP:
             stop_analysis(); // blocking
-            _state = ISTATE_TRANSITION;
+            if(_mode == MODE_DRAWING)
+                _state = ISTATE_UNDEF;
+            else
+                _state = ISTATE_TRANSITION;
             break;
         case ISTATE_END:
-            stop_camera();
+            if(_mode == MODE_ANALYSING)
+                stop_camera();
             ::exit(1);
             break;
         case ISTATE_UNDEF:

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,31 +3,72 @@
 #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() {
     
-    for(int i = 0; i < NUM_RUN; i++) {
+    switch(RefractiveIndex::_mode)
+    {
+        case MODE_ANALYSING:
+        {
+            for(int i = 0; i < NUM_RUN; i++) {
                 
-        cout << "NUM_RUN: " << i << endl;
+                cout << "NUM_RUN: " << i << endl;
                 
-        _saved_filenames_analysis.clear();  
+                _saved_filenames_analysis.clear();  
-        _saved_filenames_synthesis.clear(); 
+                _saved_filenames_synthesis.clear(); 
                 
-        _state = STATE_ACQUIRING;
+                _state = STATE_ACQUIRING;
-        acquire();
+                acquire();
-        if(_state == STATE_STOP) goto exit;
+                if(_state == STATE_STOP) goto exit;
-        _state = STATE_SYNTHESISING;
+                _state = STATE_SYNTHESISING;
-        synthesise();
+                synthesise();
-        if(_state == STATE_STOP) goto exit;
+                if(_state == STATE_STOP) goto exit;
-        _state = STATE_DISPLAY_RESULTS;
+                _state = STATE_DISPLAY_RESULTS;
-        displayresults();
+                displayresults();
-        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:    
+exit:    
     cleanup();
     ofNotifyEvent(_synthesize_cb, _name);    
+    
 }
 
 void AbstractAnalysis::create_dir_allocate_images()
@@ -116,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)
 {
     
@@ -181,5 +273,6 @@ void AbstractAnalysis::saveImageSynthesis(string filename, ofxCvImage* newPixels
     
     _saved_filenames_synthesis.push_back(_whole_file_path_synthesis+"/"+filename);
             
+    
 }
 

src/AbstractAnalysis.h

@@ -25,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();
@@ -37,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);
     
@@ -55,6 +57,7 @@ protected:
         
 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;
@@ -26,7 +28,7 @@ void ColorSingleAnalysis::setup(int camWidth, int camHeight)
     //int acq_run_time = 25;   // 20 seconds of acquiring per run
     
     DELTA_T_SAVE = 1*(10*acq_run_time/2); // for 20 seconds, we want this to be around 200 files
-                                            // or 10 times per second = every 100 ms
+    // or 10 times per second = every 100 ms
     
     _frame_cnt_max = acq_run_time*ofGetFrameRate();  // e.g.: 30 frames per second * 20 seconds = 600 frames
     
@@ -113,14 +115,14 @@ void ColorSingleAnalysis::acquire()
     
     // RUN ROUTINE
     //for(int i = 0; i < NUM_RUN; i++) {
-      //  _run_cnt = i;
+    //  _run_cnt = i;
-        //cout << "RUN NUM = " << i;
+    //cout << "RUN NUM = " << i;
     
     save_timer = new Timer(0, DELTA_T_SAVE); // timing interval for saving files
     save_timer->start(save_callback);
     
-        while(!_RUN_DONE && _state != STATE_STOP)
+    while(!_RUN_DONE && _state != STATE_STOP)
-            Thread::sleep(3);
+        Thread::sleep(3);
     
     save_timer->stop();
     
@@ -151,49 +153,49 @@ void ColorSingleAnalysis::synthesise()
             //cout << "LOADED image1!!!" << endl;
             //if(image5.loadImage(_saved_filenames_analysis[i+1])){
             
-                ///////////////////////// PROCESS THE SAVED CAMERA IMAGES OF SHIT TO THE IMAGES //////////////////////////
+            ///////////////////////// PROCESS THE SAVED CAMERA IMAGES OF SHIT TO THE IMAGES //////////////////////////
             
-                cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height);
+            cvColorImage1.setFromPixels(image1.getPixels(), image1.width, image1.height);
-                //cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height);
+            //cvColorImage2.setFromPixels(image5.getPixels(), image5.width, image5.height);
             
-                cvColorImage1.blur(5);
+            cvColorImage1.blur(5);
-                cvColorImage1.erode();
+            cvColorImage1.erode();
-                cvColorImage1.erode();
+            cvColorImage1.erode();
-                cvColorImage1.dilate();
+            cvColorImage1.dilate();
-                cvColorImage1.blur(5);
+            cvColorImage1.blur(5);
-                cvColorImage1.erode();
+            cvColorImage1.erode();
-                cvColorImage1.erode();
+            cvColorImage1.erode();
-                cvColorImage1.erode();
+            cvColorImage1.erode();
-                cvColorImage1.erode();
+            cvColorImage1.erode();
             
-                /////////////////////////////////// SAVE TO DISK IN THE SYNTHESIS FOLDER ////////////////////////////////
+            /////////////////////////////////// SAVE TO DISK IN THE SYNTHESIS FOLDER ////////////////////////////////
-                string file_name;
+            string file_name;
             
-                file_name = ofToString(_synth_save_cnt, 2)+"_ColorSingleAnalysis_"+ofToString(_run_cnt,2)+".jpg";
+            file_name = ofToString(_synth_save_cnt, 2)+"_ColorSingleAnalysis_"+ofToString(_run_cnt,2)+".jpg";
             
             
-                //<---- THE OLD WAY OF SAVING - works on OSX but generates BLACK FRAMES on WINDOWS ---->
+            //<---- THE OLD WAY OF SAVING - works on OSX but generates BLACK FRAMES on WINDOWS ---->
-                // ofSaveImage(cvGrayImage1.getPixelsRef(),_whole_file_path_synthesis+"/"+file_name, OF_IMAGE_QUALITY_BEST);
+            // ofSaveImage(cvGrayImage1.getPixelsRef(),_whole_file_path_synthesis+"/"+file_name, OF_IMAGE_QUALITY_BEST);
             
             
-                //<---- NEW SAVING - seems to fix WINDOWS saving out BLACK FRAMES PROBLEM ---->
+            //<---- NEW SAVING - seems to fix WINDOWS saving out BLACK FRAMES PROBLEM ---->
-                //ofImage image;
+            //ofImage image;
-                //image.allocate(cvColorImage1.width, cvColorImage1.height, OF_IMAGE_COLOR);
+            //image.allocate(cvColorImage1.width, cvColorImage1.height, OF_IMAGE_COLOR);
             
-                //*** This needs to be here for OSX of we get a BAD ACCESS ERROR. DOES IT BREAK WINDOWS? ***//
+            //*** This needs to be here for OSX of we get a BAD ACCESS ERROR. DOES IT BREAK WINDOWS? ***//
-                //image.setUseTexture(false);  
+            //image.setUseTexture(false);  
             
-                //image.setFromPixels(cvColorImage1.getPixels(), cvColorImage1.width, cvColorImage1.height,OF_IMAGE_COLOR);
+            //image.setFromPixels(cvColorImage1.getPixels(), cvColorImage1.width, cvColorImage1.height,OF_IMAGE_COLOR);
-                //image.saveImage(_whole_file_path_synthesis+"/"+file_name);
+            //image.saveImage(_whole_file_path_synthesis+"/"+file_name);
             
-                //_saved_filenames_synthesis.push_back(_whole_file_path_synthesis+"/"+file_name);
+            //_saved_filenames_synthesis.push_back(_whole_file_path_synthesis+"/"+file_name);
             
-                // <--- REALLY NEW SAVING METHOD --- 26 feb 2012 --- consolidated the save function into Abstract Analysis> ///
+            // <--- REALLY NEW SAVING METHOD --- 26 feb 2012 --- consolidated the save function into Abstract Analysis> ///
             
-                saveImageSynthesis(file_name, &cvColorImage1, OF_IMAGE_COLOR);
+            saveImageSynthesis(file_name, &cvColorImage1, OF_IMAGE_COLOR);
-                _synth_save_cnt++;
+            _synth_save_cnt++;
             
-           // }
+            // }
         }
     }
     
@@ -324,7 +326,7 @@ void ColorSingleAnalysis::draw()
                 //ofRotate(ofMap(_anim_cnt/2.0, 0, _anim_cnt_max, 0, 360));
                 
                 if (_anim_cnt < _fade_in_frames) {
-                   // cout << "ColorSingleAnalysis STATE_SYNTHESIZING = FADING IN ANIMATION...\n";
+                    // cout << "ColorSingleAnalysis STATE_SYNTHESIZING = FADING IN ANIMATION...\n";
                     
                     fade = ofMap(_anim_cnt, 0, _fade_in_frames, 0, 255);
                     

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;

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;