From 7e422dca80d89f32c890079e9d70a2e192714b32 Mon Sep 17 00:00:00 2001
From: Jamie Allen <jamie@heavyside.net>
Date: Sun, 27 May 2012 22:42:20 +0200
Subject: [PATCH] removed the ofxArcBall.h and related calls as it was
 producing runtime locking errors

---
 config.refindx                   | 173 ++++++++++++-------------------
 example/RefractiveIndex.cpp      |   2 +-
 src/CamNoiseAnalysis.cpp         |   4 +-
 src/ColorMultiAnalysis.cpp       |   4 +-
 src/ColorSingleAnalysis.cpp      |   4 +-
 src/DiffNoiseAnalysis.cpp        |   4 +-
 src/IResponseAnalysis.cpp        |   4 +-
 src/RelaxRateAnalysis.cpp        |   4 +-
 src/ShadowScapesAnalysis.cpp     |   4 +-
 src/ShapeFromShadingAnalysis.cpp |   4 +-
 src/StrobeAnalysis.cpp           |   4 +-
 11 files changed, 86 insertions(+), 125 deletions(-)

diff --git a/config.refindx b/config.refindx
index fb9bfd5..80d0d01 100644
--- a/config.refindx
+++ b/config.refindx
@@ -1,115 +1,76 @@
 <!-- THIS FILE NEEDS TO GO IN THE APPLICATION /data/ folder -->
 
 <config>
-    <mode>analysing</mode>
-	<camera>
-		<id>1</id>
-		<width>640</width>
-		<height>480</height>
-	</camera>
-	<display>
-		<fps>30</fps>
-    </display>
-	<locale>
-		<name>FUTURE</name>
-	</locale>
+    <mode>analysis</mode>
 
-    <analysis_NUM_RUN>
-        <NUM_RUN_shadowscapes>          1      </NUM_RUN_shadowscapes>
-        <NUM_RUN_relaxrate>             1      </NUM_RUN_relaxrate>
-        <NUM_RUN_iresponse>             1      </NUM_RUN_iresponse>
-        <NUM_RUN_shapefromshading>      1      </NUM_RUN_shapefromshading>
-        <NUM_RUN_strobe>                1      </NUM_RUN_strobe>
-        <NUM_RUN_camnoise>              1      </NUM_RUN_camnoise>
-        <NUM_RUN_colorsingle>           1      </NUM_RUN_colorsingle>
-        <NUM_RUN_colormulti>            1      </NUM_RUN_colormulti>
-        <NUM_RUN_diffnoise>             1      </NUM_RUN_diffnoise>
-    </analysis_NUM_RUN>
+<camera>
+    <id>1</id>
+    <width>640</width>
+    <height>480</height>
+</camera>
 
-    <analysis_time>
-        <acquiretime_shadowscapes>      5      </acquiretime_shadowscapes>
-        <acquiretime_relaxrate>         5      </acquiretime_relaxrate>
-        <acquiretime_iresponse>         5      </acquiretime_iresponse>
-        <acquiretime_shapefromshading>  5      </acquiretime_shapefromshading>
-        <acquiretime_strobe>            5      </acquiretime_strobe>
-        <acquiretime_camnoise>          5      </acquiretime_camnoise>
-        <acquiretime_colorsingle>       5      </acquiretime_colorsingle>
-        <acquiretime_colormulti>        5      </acquiretime_colormulti>
-        <acquiretime_diffnoise>         5      </acquiretime_diffnoise>
-    </analysis_time>
+<display>
+    <fps>30</fps>
+</display>
+
+<locale>
+    <name>FUTURE</name>
+</locale>
+
+<analysis_NUM_RUN>
+    <NUM_RUN_shadowscapes>          1      </NUM_RUN_shadowscapes>
+    <NUM_RUN_relaxrate>             1     </NUM_RUN_relaxrate>
+    <NUM_RUN_iresponse>             1      </NUM_RUN_iresponse>
+    <NUM_RUN_shapefromshading>      1      </NUM_RUN_shapefromshading>
+    <NUM_RUN_strobe>                1      </NUM_RUN_strobe>
+    <NUM_RUN_camnoise>              1      </NUM_RUN_camnoise>
+    <NUM_RUN_colorsingle>           1      </NUM_RUN_colorsingle>
+    <NUM_RUN_colormulti>            1      </NUM_RUN_colormulti>
+    <NUM_RUN_diffnoise>             1      </NUM_RUN_diffnoise>
+</analysis_NUM_RUN>
+
+<analysis_time>
+    <acquiretime_shadowscapes>      7     </acquiretime_shadowscapes>
+    <acquiretime_relaxrate>         10      </acquiretime_relaxrate>
+    <acquiretime_iresponse>         30      </acquiretime_iresponse>
+    <acquiretime_shapefromshading>  30      </acquiretime_shapefromshading>
+    <acquiretime_strobe>            30      </acquiretime_strobe>
+    <acquiretime_camnoise>          30      </acquiretime_camnoise>
+    <acquiretime_colorsingle>       40      </acquiretime_colorsingle>
+    <acquiretime_colormulti>        15      </acquiretime_colormulti>
+    <acquiretime_diffnoise>         30      </acquiretime_diffnoise>
+</analysis_time>
+
+<algorithms>
+    <vertices_per_frame>1000</vertices_per_frame>
+    <pixel_per_vertex>4</pixel_per_vertex>
     
-    <viewport>
-        <tx>0</tx>
-        <ty>-20</ty>
-        <tz>-400</tz>
-        <rx>-10</rx>
-        <ry>0</ry>
-        <rz>0</rz>        
-    </viewport>
+    <colormulti>
+        <algo>2</algo>
+        <scale>2</scale>
+        <draw_style>3</draw_style>
+        <line_width>2</line_width>
+    </colormulti>
     
-    <algorithms>
-        <vertices_per_frame>1000</vertices_per_frame>
-        <pixel_per_vertex>4</pixel_per_vertex>
-        <colormulti>
-            <algo>2</algo>
-            <scale>1</scale>
-            <draw_style>2</draw_style>
-            <line_width>0.5</line_width>
-        </colormulti>
-        <colorsingle>
-            <algo>2</algo>
-            <scale>1</scale>
-            <draw_style>2</draw_style>
-            <line_width>0.5</line_width>
-        </colorsingle>        
-        <relaxrate>
-            <algo>1</algo>
-            <scale>500</scale>
-            <draw_style>1</draw_style>
-            <line_width>2</line_width>
-            <point_size>2</point_size>            
-        </relaxrate>
-        <diffnoise>
-            <algo>1</algo>
-            <scale>500</scale>
-            <draw_style>1</draw_style>
-            <line_width>2</line_width>
-            <point_size>2</point_size>            
-        </diffnoise>        
-        <shapeshade>
-            <algo>1</algo>
-            <scale>500</scale>
-            <draw_style>1</draw_style>
-            <line_width>2</line_width>
-            <point_size>2</point_size>            
-        </shapeshade>        
-        <strobe>
-            <algo>1</algo>
-            <scale>500</scale>
-            <draw_style>1</draw_style>
-            <line_width>2</line_width>
-            <point_size>2</point_size>            
-        </strobe>                
-        <camnoise>
-            <algo>1</algo>
-            <scale>500</scale>
-            <draw_style>1</draw_style>
-            <line_width>2</line_width>
-            <point_size>2</point_size>            
-        </camnoise>                        
-        <shadowscapes>
-            <algo>4</algo>
-            <scale>500</scale>        
-            <draw_style>2</draw_style>
-            <line_width>2</line_width>
-        </shadowscapes>   
-        <iresponse>
-            <algo>1</algo>
-            <scale>500</scale>
-            <draw_style>1</draw_style>
-            <line_width>2</line_width>
-            <point_size>2</point_size>            
-        </iresponse>             
-    </algorithms>
+    <relaxrate>
+        <algo>4</algo>
+        <scale>600</scale>        
+        <draw_style>2</draw_style>
+        <line_width>4</line_width>
+    </relaxrate>
     
+    <shadowscapes>
+        <algo>1</algo>
+        <scale>650</scale>
+        <draw_style>1</draw_style>
+        <line_width>1</line_width>
+    </shadowscapes>        
+
+</algorithms>
+
+<relaxrate>
+<treshold>51</treshold>
+<maxblobs>25</maxblobs>
+</relaxrate>
+
 </config>
\ No newline at end of file
diff --git a/example/RefractiveIndex.cpp b/example/RefractiveIndex.cpp
index df50b53..2e5be31 100644
--- a/example/RefractiveIndex.cpp
+++ b/example/RefractiveIndex.cpp
@@ -64,7 +64,7 @@ ofxXmlSettings   RefractiveIndex::XML;
 ofShader        RefractiveIndex::_shader;
 ofVboMesh       RefractiveIndex::_mesh_vbo;
 
-ofxArcBall      RefractiveIndex::cam;
+//ofxArcBall      RefractiveIndex::cam;
 
 string          msg;
 
diff --git a/src/CamNoiseAnalysis.cpp b/src/CamNoiseAnalysis.cpp
index 691b626..247a3f9 100755
--- a/src/CamNoiseAnalysis.cpp
+++ b/src/CamNoiseAnalysis.cpp
@@ -322,7 +322,7 @@ void CamNoiseAnalysis::draw()
             glPointSize(point_size);
             glEnable(GL_POINT_SMOOTH);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -355,7 +355,7 @@ void CamNoiseAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             break;
 
diff --git a/src/ColorMultiAnalysis.cpp b/src/ColorMultiAnalysis.cpp
index abe98d1..ac42949 100755
--- a/src/ColorMultiAnalysis.cpp
+++ b/src/ColorMultiAnalysis.cpp
@@ -309,7 +309,7 @@ void ColorMultiAnalysis::draw()
             glShadeModel(GL_SMOOTH);
             glLineWidth(line_width);              
                 
-                RefractiveIndex::cam.begin();
+                //RefractiveIndex::cam.begin();
                 
                 ofTranslate(tx, ty, tz);
                 ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -342,7 +342,7 @@ void ColorMultiAnalysis::draw()
                 
                 image2.unbind();
                 
-                RefractiveIndex::cam.end();    
+                //RefractiveIndex::cam.end();    
                 
                 _RUN_DONE = true;
                 break;
diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp
index bfaf4a3..dff4585 100755
--- a/src/ColorSingleAnalysis.cpp
+++ b/src/ColorSingleAnalysis.cpp
@@ -325,7 +325,7 @@ void ColorSingleAnalysis::draw()
             glShadeModel(GL_SMOOTH);
             glLineWidth(line_width);              
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -358,7 +358,7 @@ void ColorSingleAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             _RUN_DONE = true;
             break;
diff --git a/src/DiffNoiseAnalysis.cpp b/src/DiffNoiseAnalysis.cpp
index c52ce7f..3701d31 100755
--- a/src/DiffNoiseAnalysis.cpp
+++ b/src/DiffNoiseAnalysis.cpp
@@ -333,7 +333,7 @@ void DiffNoiseAnalysis::draw()
             glPointSize(point_size);
             glEnable(GL_POINT_SMOOTH);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -366,7 +366,7 @@ void DiffNoiseAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             break;
             
diff --git a/src/IResponseAnalysis.cpp b/src/IResponseAnalysis.cpp
index 6be0889..feec733 100755
--- a/src/IResponseAnalysis.cpp
+++ b/src/IResponseAnalysis.cpp
@@ -298,7 +298,7 @@ void IResponseAnalysis::draw()
             glPointSize(point_size);
             glEnable(GL_POINT_SMOOTH);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -331,7 +331,7 @@ void IResponseAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             break;
             
diff --git a/src/RelaxRateAnalysis.cpp b/src/RelaxRateAnalysis.cpp
index 3b4cf94..574b764 100755
--- a/src/RelaxRateAnalysis.cpp
+++ b/src/RelaxRateAnalysis.cpp
@@ -295,7 +295,7 @@ void RelaxRateAnalysis::draw()
             glPointSize(point_size);
             glEnable(GL_POINT_SMOOTH);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -328,7 +328,7 @@ void RelaxRateAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             break;
         
diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp
index 784fc47..eaa69c2 100755
--- a/src/ShadowScapesAnalysis.cpp
+++ b/src/ShadowScapesAnalysis.cpp
@@ -338,7 +338,7 @@ void ShadowScapesAnalysis::draw()
             glShadeModel(GL_SMOOTH);
             glLineWidth(line_width);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -371,7 +371,7 @@ void ShadowScapesAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             _RUN_DONE = true;
             break;
diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp
index 171d8f2..fd35532 100755
--- a/src/ShapeFromShadingAnalysis.cpp
+++ b/src/ShapeFromShadingAnalysis.cpp
@@ -491,7 +491,7 @@ void ShapeFromShadingAnalysis::draw()
             glPointSize(point_size);
             glEnable(GL_POINT_SMOOTH);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -524,7 +524,7 @@ void ShapeFromShadingAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             break;
 
diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp
index 4e8da06..a1322b6 100755
--- a/src/StrobeAnalysis.cpp
+++ b/src/StrobeAnalysis.cpp
@@ -320,7 +320,7 @@ void StrobeAnalysis::draw()
             glPointSize(point_size);
             glEnable(GL_POINT_SMOOTH);
             
-            RefractiveIndex::cam.begin();
+            //RefractiveIndex::cam.begin();
             
             ofTranslate(tx, ty, tz);
             ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@@ -353,7 +353,7 @@ void StrobeAnalysis::draw()
             
             image2.unbind();
             
-            RefractiveIndex::cam.end();    
+            //RefractiveIndex::cam.end();    
             
             break;