Merge branch 'develop'

paulvollmer · Jul 2, 2012 · 24bf515 · 24bf515
2 parents a760336 + 39431d5
commit 24bf515
Show file tree

Hide file tree

Showing 15 changed files with 72 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -20,14 +20,14 @@ ofxOsc (ofxOscSender, ofxOscReceiver)
 Also you can use the xml to store other variables.  
 
 **Current Version:**  
-0.1.1 (stable and versioned using [semantic versioning](http://semver.org/))   
+0.1.2 (stable and versioned using [semantic versioning](http://semver.org/))   
 
 **Tested Platform:**  
-MacOS 10.6   
+MacOS 10.6+   
 Win ???  
 Linux ???  
 **openFrameworks version:**  
-0.07  
+0071  
 **Dependencies**  
 ofxXmlSettings  
 
@@ -38,6 +38,9 @@ You can find a list of all known bugs at [GitHub](https://github.com/wrongentert
 ## Changelog  
 A detailed changelog, intended for programmers.  
 
+0.1.2  
+added missing #ifndef  
+
 0.1.1  
 added ofxOsc settings  
 

diff --git a/example_addonSettings/src/main.cpp b/example_addonSettings/src/main.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofMain.h"

diff --git a/example_addonSettings/src/testApp.cpp b/example_addonSettings/src/testApp.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "testApp.h"

diff --git a/example_addonSettings/src/testApp.h b/example_addonSettings/src/testApp.h
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofMain.h"

diff --git a/example_customSettings/src/main.cpp b/example_customSettings/src/main.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.06
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofMain.h"

diff --git a/example_customSettings/src/testApp.cpp b/example_customSettings/src/testApp.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.06
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "testApp.h"
@@ -59,6 +59,7 @@ void testApp::setup(){
 		tempVar2 = defXML.getValue("wng:myVar2", 0, 0);
 		tempVar3 = defXML.getValue("wng:myVar3", 0, 0);
 	} else {
+		// if no default parameter exist, let create some.
 		tempVar1 = 100;
 		tempVar2 = 200;
 		tempVar3 = 300;

diff --git a/example_customSettings/src/testApp.h b/example_customSettings/src/testApp.h
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.06
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofMain.h"

diff --git a/example_defaultSettings/src/main.cpp b/example_defaultSettings/src/main.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.06
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofMain.h"

diff --git a/example_defaultSettings/src/testApp.cpp b/example_defaultSettings/src/testApp.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.06
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "testApp.h"

diff --git a/example_defaultSettings/src/testApp.h b/example_defaultSettings/src/testApp.h
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.06
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofMain.h"

diff --git a/install.xml b/install.xml
@@ -1,6 +1,6 @@
 <install>
     <name>ofxXmlDefaultSettings</name>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
     <author>Paul Vollmer</author>
     <url>http://www.wng.cc</url>
 

diff --git a/src/ofxXmlDefaultSettings.cpp b/src/ofxXmlDefaultSettings.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofxXmlDefaultSettings.h"
@@ -203,10 +203,10 @@ void ofxXmlDefaultSettings::setLogToFile(){
 			if(!dir.exists()){
 				dir.create(true);
 			}
-			ofLogToFile(ofFilePath::getCurrentWorkingDirectory()+"/logs"+"/"+tempName, 1);
+			ofLogToFile(ofFilePath::getCurrentWorkingDirectory()+"/logs"+"/"+ofGetTimestampString()+"_"+tempName, 1);
 
 		} else {
-			ofLogToFile(tempPath+"/"+tempName, 1);
+			ofLogToFile(tempPath+"/"+ofGetTimestampString()+"_"+tempName, 1);
 		}
 
 	}

diff --git a/src/ofxXmlDefaultSettings.h b/src/ofxXmlDefaultSettings.h
@@ -25,15 +25,18 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
+#ifndef _OFXXMLDEFAULTSETTINGS
+#define _OFXXMLDEFAULTSETTINGS
+
 #include "ofxXmlSettings.h"
 
 // If "OFXXMLDEFAULTSETTINGS_LOG" is defined, the addon prints out ofLog messages.
@@ -76,3 +79,5 @@ class ofxXmlDefaultSettings : public ofxXmlSettings {
 		void createDefaultXml();
 
 };
+
+#endif
diff --git a/src/ofxXmlOscSettings.cpp b/src/ofxXmlOscSettings.cpp
@@ -25,13 +25,13 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
 #include "ofxXmlOscSettings.h"

diff --git a/src/ofxXmlOscSettings.h b/src/ofxXmlOscSettings.h
@@ -25,15 +25,18 @@
  *  THE SOFTWARE.
  *
  *  
- *  @testet_oF          0.07
- *  @testet_plattform   MacOs 10.6
+ *  @testet_oF          0071
+ *  @testet_plattform   MacOs 10.6+
  *                      ??? Win
  *                      ??? Linux
  *  @dependencies       ofxXmlSettings
- *  @modified           2012.05.17
- *  @version            0.1.1
+ *  @modified           2012.07.02
+ *  @version            0.1.2
  */
 
+#ifndef _OFXXMLOSCSETTINGS
+#define _OFXXMLOSCSETTINGS
+
 #include "ofxXmlSettings.h"
 
 // If "OFXXMLOSCSETTINGS_LOG" is defined, the addon prints out ofLog messages.
@@ -77,3 +80,5 @@ class ofxXmlOscSettings : public ofxXmlSettings {
 
 
 };
+
+#endif