Changeset 13

Timestamp:

04/23/08 16:54:32

Author:

robert

Message:

Introduced <title-settings> and <text-settings> tags which allow one to set the defaults used for the result of the presentation

Files:

• trunk/src/ReaderWriterXML.cpp (modified) (3 diffs)
• trunk/src/SlideShowConstructor.cpp (modified) (4 diffs)

trunk/src/ReaderWriterXML.cpp

@@ -1268 +1268 @@
-
-    SlideShowConstructor constructor;
-
+      
-    bool readSlide = false;
-    
@@ -1275 +1275 @@
-    while (cur != NULL) {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        if ((!xmlStrcmp(cur->name, (const xmlChar *)"name")))
-        {
@@ -1293 +1282 @@
-            else constructor.setPresentationName("");
-            xmlFree(key);
+        }
+        else if ((!xmlStrcmp(cur->name, (const xmlChar *)"title-settings")))
+        {
+            bool fontRead = getProperties(cur,constructor.getTitleFontDataDefault());
+            if (fontRead) 
+            {
+                osg::notify(osg::NOTICE)<<"Title font details read"<<std::endl;
+            }
+        }
+        else if ((!xmlStrcmp(cur->name, (const xmlChar *)"text-settings")))
+        {
+            bool fontRead = getProperties(cur,constructor.getTextFontDataDefault());
+            if (fontRead) 
+            {
+                osg::notify(osg::NOTICE)<<"Text font details read"<<std::endl;
+            }
-        }
-        /*else if ((!xmlStrcmp(cur->name, (const xmlChar *)"ratio")))

trunk/src/SlideShowConstructor.cpp

@@ -93 +93 @@
-    _titleFontDataDefault.alignment = osgText::Text::CENTER_BASE_LINE;
-    _titleFontDataDefault.axisAlignment = osgText::Text::XZ_PLANE;
+    _titleFontDataDefault.characterSize = 0.06f;
+    _titleFontDataDefault.maximumWidth = 0.9f;
-
-    _titlePositionDataDefault.position.set(0.5f,0.92f,0.0f);
@@ -102 +104 @@
-    _textFontDataDefault.alignment = osgText::Text::LEFT_BASE_LINE;
-    _textFontDataDefault.axisAlignment = osgText::Text::XZ_PLANE;
+    _textFontDataDefault.characterSize = 0.04f;
+    _textFontDataDefault.maximumWidth = 0.8f;
-
-    _textPositionDataDefault.position.set(0.1f,0.85f,0.0f);
@@ -132 +136 @@
-    _slideOrigin.set(-_slideWidth*0.5f,_slideDistance,-_slideHeight*0.5f);
-
+#if 0
-    _titleFontDataDefault.characterSize = 0.06f;
-    _titleFontDataDefault.maximumWidth = 0.9f;
@@ -137 +142 @@
-    _textFontDataDefault.characterSize = 0.04f;
-    _textFontDataDefault.maximumWidth = 0.8f;
+#endif
-    
-    osg::notify(osg::INFO)<<"_titlePositionDataDefault.position="<<_titlePositionDataDefault.position<<std::endl;