urldecoding etc

2 files changed, 40 insertions, 66 deletions

diff --git a/bin/data/settings.xml b/bin/data/settings.xml
index d5554e5..f411e8d 100755
--- a/bin/data/settings.xml
+++ b/bin/data/settings.xml
@@ -1,68 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<figgis volume="0.282353" threshold="42" invert="0" flip="0" method="5"/>
+<figgis volume="0.282353" threshold="42" invert="0" flip="0" method="5" />
 <boundaries>
-    <boundary filename="hook.wav">
-        <point x="556.000000" y="28.000000"></point>
-        <point x="414.000000" y="53.000000"></point>
-        <point x="374.000000" y="150.000000"></point>
-        <point x="475.000000" y="247.000000"></point>
-        <point x="642.000000" y="233.000000"></point>
-        <point x="676.000000" y="157.000000"></point>
-        <point x="633.000000" y="60.000000"></point>
-    </boundary>
-    <boundary filename="pus.wav">
-        <point x="651.000000" y="343.000000"></point>
-        <point x="447.000000" y="361.000000"></point>
-        <point x="318.000000" y="536.000000"></point>
-        <point x="681.000000" y="536.000000"></point>
-        <point x="678.000000" y="401.000000"></point>
-    </boundary>
-    <boundary filename="bigs.wav">
-        <point x="47.000000" y="38.000000"></point>
-        <point x="91.000000" y="38.000000"></point>
-        <point x="97.000000" y="95.000000"></point>
-        <point x="47.000000" y="97.000000"></point>
-        <point x="42.000000" y="55.000000"></point>
-    </boundary>
-    <boundary filename="cloaks.wav">
-        <point x="95.000000" y="122.000000"></point>
-        <point x="42.000000" y="125.000000"></point>
-        <point x="39.000000" y="239.000000"></point>
-        <point x="115.000000" y="239.000000"></point>
-        <point x="111.000000" y="153.000000"></point>
-    </boundary>
-    <boundary filename="pins.wav">
-        <point x="153.000000" y="266.000000"></point>
-        <point x="41.000000" y="264.000000"></point>
-        <point x="35.000000" y="537.000000"></point>
-        <point x="273.000000" y="546.000000"></point>
-        <point x="259.000000" y="391.000000"></point>
-    </boundary>
-    <boundary filename="bosie.wav">
-        <point x="171.000000" y="33.000000"></point>
-        <point x="134.000000" y="33.000000"></point>
-        <point x="136.000000" y="81.000000"></point>
-        <point x="175.000000" y="81.000000"></point>
-        <point x="178.000000" y="62.000000"></point>
-    </boundary>
-    <boundary filename="loop.wav">
-        <point x="182.000000" y="110.000000"></point>
-        <point x="153.000000" y="111.000000"></point>
-        <point x="151.000000" y="132.000000"></point>
-        <point x="180.000000" y="139.000000"></point>
-    </boundary>
-    <boundary filename="six.wav">
-        <point x="190.000000" y="164.000000"></point>
-        <point x="136.000000" y="152.000000"></point>
-        <point x="136.000000" y="206.000000"></point>
-        <point x="193.000000" y="233.000000"></point>
-        <point x="209.000000" y="202.000000"></point>
-    </boundary>
-    <boundary filename="friends.wav">
-        <point x="189.000000" y="260.000000"></point>
-        <point x="285.000000" y="365.000000"></point>
-        <point x="284.000000" y="317.000000"></point>
-        <point x="227.000000" y="212.000000"></point>
-        <point x="212.000000" y="246.000000"></point>
+    <boundary filename="Fog Strings.wav">
+        <point x="670.000000" y="35.000000"></point>
+        <point x="463.000000" y="29.000000"></point>
+        <point x="405.000000" y="190.000000"></point>
+        <point x="581.000000" y="265.000000"></point>
+        <point x="682.000000" y="104.000000"></point>
+        <point x="689.000000" y="59.000000"></point>
+    </boundary>
+    <boundary filename="Cello.wav">
+        <point x="645.000000" y="398.000000"></point>
+        <point x="413.000000" y="389.000000"></point>
+        <point x="403.000000" y="555.000000"></point>
+        <point x="623.000000" y="541.000000"></point>
+        <point x="672.000000" y="470.000000"></point>
+    </boundary>
+    <boundary filename="Bicycle.wav">
+        <point x="218.000000" y="421.000000"></point>
+        <point x="48.000000" y="401.000000"></point>
+        <point x="23.000000" y="556.000000"></point>
+        <point x="208.000000" y="548.000000"></point>
+        <point x="250.000000" y="482.000000"></point>
     </boundary>
 </boundaries>
diff --git a/src/testApp.cpp b/src/testApp.cpp
index 312aa57..e443c1e 100755
--- a/src/testApp.cpp
+++ b/src/testApp.cpp
@@ -1,4 +1,20 @@
 #include "testApp.h"
+string urlDecode(string &SRC) {
+    string ret;
+    char ch;
+    int i, ii;
+    for (i=0; i<SRC.length(); i++) {
+        if (int(SRC[i])==37) {
+            sscanf(SRC.substr(i+1,2).c_str(), "%x", &ii);
+            ch=static_cast<char>(ii);
+            ret+=ch;
+            i=i+2;
+        } else {
+            ret+=SRC[i];
+        }
+    }
+    return (ret);
+}
 //--------------------------------------------------------------
 guiWindow::~guiWindow(){
 	cout << "gui window destroyed" << endl;
@@ -245,7 +261,6 @@ void testApp::mousePressed(int x, int y, int button){
         case 0:
             selectedPoint=boundaries[selectedBoundary].findPoint(p);
             if (selectedPoint<0) {
-                selectedPoint=boundaries[selectedBoundary].points.size();
                 boundaries[selectedBoundary].add(p);
             }
             else boundaries[selectedBoundary].points[selectedPoint]=p;
@@ -286,7 +301,8 @@ void testApp::dragEvent(ofDragInfo dragInfo) {
     printf("got draginfo: %f,%f,%f\n",dragInfo.position.x,dragInfo.position.y,dragInfo.position.z);
     int sta=dragInfo.files[0].find_last_of("\\/")+1;
     int len=(dragInfo.files[0].find_last_of(".")+4)-sta;
-	string filename=dragInfo.files[0].substr(sta,len);
+	string f=dragInfo.files[0].substr(sta,len);
+	string filename=urlDecode(f);
 	for (int i=0;i<boundaries.size();i++) {
 		if (boundaries[i].checkFile(dragInfo.position,filename)) printf("loaded %s into shape %i\n",filename.c_str(),i);
 	}