custom optional class for legacy support.

Author: NickHardeman

addons/ofxSvg/src/ofxSvg.cpp

@@ -1323,7 +1323,8 @@ void ofxSvg::_parsePath( ofXml& tnode, std::shared_ptr<ofxSvgPath> aSvgPath ) {
 
 		bool bRelative = false;
 		std::vector<glm::vec3> npositions= {glm::vec3(0.f, 0.f, 0.f)};
-		std::optional<ofPath::Command::Type> ctype;
+		/// \note: ofxSvgOptional is declared in ofxSvgUtils
+		ofxSvgOptional<ofPath::Command::Type> ctype;
 
 		// check if we are looking for a position
 		if( cchar == 'm' || cchar == 'M' ) {

addons/ofxSvg/src/ofxSvgCss.cpp

@@ -3,7 +3,7 @@
 #include "ofLog.h"
 #include <regex>
 #include <map>
-#include <optional>
+//#include <optional>
 
 
 std::map<std::string, ofColor> sCommonColors = {

addons/ofxSvg/src/ofxSvgCss.h

@@ -3,64 +3,19 @@
 #include "ofColor.h"
 #include "ofLog.h"
 #include "ofXml.h"
+#include "ofxSvgUtils.h"
 
 class ofxSvgCssClass {
 public:
 
-	// adding this Optional class since std::optional is not a part of all std:: distributions at the moment, looking at you gcc < 10 nh
-	template<typename T>
-	class Optional {
-	public:
-		Optional() : hasValue(false) {}  // Default constructor, no value
-		Optional(const T& value) : hasValue(true), data(value) {}  // Construct with a value
-		Optional(T&& value) : hasValue(true), data(std::move(value)) {}  // Move constructor
-		
-		// Copy and move constructors
-		Optional(const Optional& other) = default;
-		Optional(Optional&& other) noexcept = default;
-		
-		// Assignment operators
-		Optional& operator=(const Optional& other) = default;
-		Optional& operator=(Optional&& other) noexcept = default;
-		
-		// Destructor
-		~Optional() = default;
-		
-		// Check if there's a value
-		bool has_value() const { return hasValue; }
-		
-		// Accessors for the value
-		T& value() {
-//			if (!hasValue) throw std::runtime_error("No value present");
-			if (!hasValue) {
-				ofLogError("ofxSvgCssClass") << "No value present";
-			}
-			return data;
-		}
-		
-		const T& value() const {
-//			if (!hasValue) throw std::runtime_error("No value present");
-			if (!hasValue) {
-				ofLogError("ofxSvgCssClass") << "No value present";
-			}
-			return data;
-		}
-		
-		// Reset to an empty state
-		void reset() { hasValue = false; }
-		
-	private:
-		bool hasValue;
-		T data;
-	};
-	
+	/// \note: ofxSvgOptional is declared in ofxSvgUtils
 	class Property {
 	public:
 		std::string srcString;
-		Optional<float> fvalue;
-		Optional<int> ivalue;
-		Optional<std::string> svalue;
-		Optional<ofColor> cvalue;
+		ofxSvgOptional<float> fvalue;
+		ofxSvgOptional<int> ivalue;
+		ofxSvgOptional<std::string> svalue;
+		ofxSvgOptional<ofColor> cvalue;
 	};
 
 	std::unordered_map<std::string, Property> properties;

addons/ofxSvg/src/ofxSvgElements.cpp

@@ -803,27 +803,27 @@ void ofxSvgText::customDraw() {
 //	} restoreTransformGL();
 }
 
-//--------------------------------------------------------------
-void ofxSvgText::draw(const std::string &astring, bool abCentered ) {
-	if( textSpans.size() > 0 ) {
-		transformGL(); {
-			textSpans[0]->draw(astring, abCentered );
-		} restoreTransformGL();
-	} else {
-		ofLogVerbose("ofxSvgText") << __FUNCTION__ << " : no text spans to draw with.";
-	}
-}
-
-//--------------------------------------------------------------
-void ofxSvgText::draw(const std::string& astring, const ofColor& acolor, bool abCentered ) {
-	if( textSpans.size() > 0 ) {
-		transformGL(); {
-			textSpans[0]->draw(astring, acolor, abCentered );
-		} restoreTransformGL();
-	} else {
-		ofLogVerbose("ofxSvgText") << __FUNCTION__ << " : no text spans to draw with.";
-	}
-}
+////--------------------------------------------------------------
+//void ofxSvgText::draw(const std::string &astring, bool abCentered ) {
+//	if( textSpans.size() > 0 ) {
+//		transformGL(); {
+//			textSpans[0]->draw(astring, abCentered );
+//		} restoreTransformGL();
+//	} else {
+//		ofLogVerbose("ofxSvgText") << __FUNCTION__ << " : no text spans to draw with.";
+//	}
+//}
+//
+////--------------------------------------------------------------
+//void ofxSvgText::draw(const std::string& astring, const ofColor& acolor, bool abCentered ) {
+//	if( textSpans.size() > 0 ) {
+//		transformGL(); {
+//			textSpans[0]->draw(astring, acolor, abCentered );
+//		} restoreTransformGL();
+//	} else {
+//		ofLogVerbose("ofxSvgText") << __FUNCTION__ << " : no text spans to draw with.";
+//	}
+//}
 
 //--------------------------------------------------------------
 void ofxSvgText::TextSpan::applyStyle(ofxSvgCssClass& aclass) {

addons/ofxSvg/src/ofxSvgElements.h

@@ -554,8 +554,9 @@ class ofxSvgText : public ofxSvgElement {
 	void setText( const std::string& astring, std::string aFontFamily, int aFontSize, float aMaxWidth );
 	void create();
 	void customDraw() override;
-	void draw(const std::string &astring, bool abCentered );
-	void draw(const std::string &astring, const ofColor& acolor, bool abCentered );
+	// going to override
+//	void draw(const std::string &astring, bool abCentered );
+//	void draw(const std::string &astring, const ofColor& acolor, bool abCentered );
 
 	void setFontDirectory( std::string aPath ) {
 		fdirectory = aPath;

addons/ofxSvg/src/ofxSvgUtils.cpp

@@ -260,3 +260,4 @@ ofPixels ofxSvgUtils::base64_decode(std::string const& encoded_string ) {
 //	ofLogNotice("ofxSvgUtils::base64_decode") << "pixels ok: " << bok << " pixels: " << rpix.getWidth() << " x " << rpix.getHeight();
 	return rpix;
 }
+

addons/ofxSvg/src/ofxSvgUtils.h

@@ -2,6 +2,55 @@
 #include <string>
 #include "ofPixels.h"
 
+// adding this Optional class since std::optional is not a part of all std:: distributions at the moment, looking at you gcc < 10 nh
+// and not included in older versions of OF on Windows.
+template<typename T>
+class ofxSvgOptional {
+public:
+	ofxSvgOptional() : hasValue(false) {}  // Default constructor, no value
+	ofxSvgOptional(const T& value) : hasValue(true), data(value) {}  // Construct with a value
+	ofxSvgOptional(T&& value) : hasValue(true), data(std::move(value)) {}  // Move constructor
+	
+	// Copy and move constructors
+	ofxSvgOptional(const ofxSvgOptional& other) = default;
+	ofxSvgOptional(ofxSvgOptional&& other) noexcept = default;
+	
+	// Assignment operators
+	ofxSvgOptional& operator=(const ofxSvgOptional& other) = default;
+	ofxSvgOptional& operator=(ofxSvgOptional&& other) noexcept = default;
+	
+	// Destructor
+	~ofxSvgOptional() = default;
+	
+	// Check if there's a value
+	bool has_value() const { return hasValue; }
+	
+	// Accessors for the value
+	T& value() {
+		//			if (!hasValue) throw std::runtime_error("No value present");
+		if (!hasValue) {
+			ofLogError("ofxSvgCssClass") << "No value present";
+		}
+		return data;
+	}
+	
+	const T& value() const {
+		//			if (!hasValue) throw std::runtime_error("No value present");
+		if (!hasValue) {
+			ofLogError("ofxSvgCssClass") << "No value present";
+		}
+		return data;
+	}
+	
+	// Reset to an empty state
+	void reset() { hasValue = false; }
+	
+private:
+	bool hasValue;
+	T data;
+};
+
+
 class ofxSvgUtils {
 public:
 
@@ -14,4 +63,7 @@ class ofxSvgUtils {
 
 	static std::string base64_encode( const ofPixels& apixels );
 	static ofPixels base64_decode(std::string const& encoded_string );
+	
+	
+	
 };