From bd632fbead272ce87963754bf5c8a05645a7f8da Mon Sep 17 00:00:00 2001
From: Florian <Florian@8062f311-0dae-4547-b526-b8ab9ac864a5>
Date: Sun, 19 Sep 2010 19:33:28 +0000
Subject: [PATCH] Added expression for getting text value.

git-svn-id: svn://localhost@247 8062f311-0dae-4547-b526-b8ab9ac864a5
---
 Extensions/TextObject/Extension.cpp        |  8 ++++++--
 Extensions/TextObject/TextExpressions.cpp  |  4 ++++
 Extensions/TextObject/TextExtension.layout | 24 +++++++++++-----------
 Extensions/TextObject/TextObject.h         |  1 +
 Extensions/TextObject/TextObjectEditor.cpp |  2 +-
 5 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/Extensions/TextObject/Extension.cpp b/Extensions/TextObject/Extension.cpp
index 2044207798..593f563c45 100644
--- a/Extensions/TextObject/Extension.cpp
+++ b/Extensions/TextObject/Extension.cpp
@@ -214,14 +214,18 @@ class Extension : public ExtensionBase
 
                 DECLARE_END_OBJECT_CONDITION()
 
-                DECLARE_OBJECT_EXPRESSION("Opacity", _("Opacité"), _("Opacité"), _("Opacité"), "res/actions/opacity.png", &TextObject::GetOpacity)
+                DECLARE_OBJECT_EXPRESSION("Opacity", _("Opacité"), _("Opacité"), _("Opacité"), "res/actions/opacity.png", &TextObject::ExpOpacity)
                     DECLARE_PARAMETER("object", _("Objet"), true, "Text")
                 DECLARE_END_OBJECT_EXPRESSION()
 
-                DECLARE_OBJECT_EXPRESSION("Angle", _("Angle"), _("Angle"), _("Rotation"), "res/actions/rotate.png", &TextObject::GetAngle)
+                DECLARE_OBJECT_EXPRESSION("Angle", _("Angle"), _("Angle"), _("Rotation"), "res/actions/rotate.png", &TextObject::ExpAngle)
                     DECLARE_PARAMETER("object", _("Objet"), true, "Text")
                 DECLARE_END_OBJECT_EXPRESSION()
 
+                DECLARE_OBJECT_STR_EXPRESSION("String", _("Texte"), _("Texte"), _("Texte"), "res/texteicon.png", &TextObject::ExpString)
+                    DECLARE_PARAMETER("object", _("Objet"), true, "Text")
+                DECLARE_END_OBJECT_STR_EXPRESSION()
+
             DECLARE_END_OBJECT()
 
             CompleteCompilationInformation();
diff --git a/Extensions/TextObject/TextExpressions.cpp b/Extensions/TextObject/TextExpressions.cpp
index 1115e21e17..4743f88bd9 100644
--- a/Extensions/TextObject/TextExpressions.cpp
+++ b/Extensions/TextObject/TextExpressions.cpp
@@ -40,3 +40,7 @@ double TextObject::ExpAngle( const RuntimeScene & scene, ObjectsConcerned & obje
     return angle;
 }
 
+std::string TextObject::ExpString( const RuntimeScene & scene, ObjectsConcerned & objectsConcerned, ObjSPtr obj1, ObjSPtr obj2, const StrExpressionInstruction & exprInstruction )
+{
+    return text.GetString();
+}
diff --git a/Extensions/TextObject/TextExtension.layout b/Extensions/TextObject/TextExtension.layout
index b2282fa39e..6d30a616c1 100644
--- a/Extensions/TextObject/TextExtension.layout
+++ b/Extensions/TextObject/TextExtension.layout
@@ -1,26 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Debug - Edittime" />
-	<File name="Extension.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="9089" topLine="174" />
+	<File name="Extension.cpp" open="1" top="1" tabpos="6">
+		<Cursor position="10757" topLine="200" />
 	</File>
 	<File name="TextActions.cpp" open="0" top="0" tabpos="1">
-		<Cursor position="1165" topLine="29" />
+		<Cursor position="5079" topLine="89" />
 	</File>
 	<File name="TextConditions.cpp" open="0" top="0" tabpos="4">
-		<Cursor position="3554" topLine="61" />
+		<Cursor position="6416" topLine="69" />
 	</File>
-	<File name="TextExpressions.cpp" open="0" top="0" tabpos="0">
-		<Cursor position="863" topLine="7" />
+	<File name="TextExpressions.cpp" open="1" top="0" tabpos="5">
+		<Cursor position="1165" topLine="11" />
 	</File>
-	<File name="TextObject.cpp" open="1" top="0" tabpos="2">
-		<Cursor position="7803" topLine="235" />
+	<File name="TextObject.cpp" open="1" top="0" tabpos="1">
+		<Cursor position="4084" topLine="89" />
 	</File>
-	<File name="TextObject.h" open="1" top="1" tabpos="1">
-		<Cursor position="6336" topLine="122" />
+	<File name="TextObject.h" open="1" top="0" tabpos="4">
+		<Cursor position="3507" topLine="81" />
 	</File>
-	<File name="TextObjectEditor.cpp" open="0" top="0" tabpos="3">
-		<Cursor position="7072" topLine="128" />
+	<File name="TextObjectEditor.cpp" open="0" top="0" tabpos="0">
+		<Cursor position="7434" topLine="134" />
 	</File>
 	<File name="TextObjectEditor.h" open="0" top="0" tabpos="1">
 		<Cursor position="2482" topLine="63" />
diff --git a/Extensions/TextObject/TextObject.h b/Extensions/TextObject/TextObject.h
index ef2f139245..b7b2a3c493 100644
--- a/Extensions/TextObject/TextObject.h
+++ b/Extensions/TextObject/TextObject.h
@@ -118,6 +118,7 @@ class TextObject : public Object
         //ACE for string
         bool CondString( RuntimeScene & scene, ObjectsConcerned & objectsConcerned, const Instruction & condition );
         bool ActString( RuntimeScene & scene, ObjectsConcerned & objectsConcerned, const Instruction & action );
+        std::string ExpString( const RuntimeScene & scene, ObjectsConcerned & objectsConcerned, ObjSPtr obj1, ObjSPtr obj2, const StrExpressionInstruction & exprInstruction );
 
         //ACE for font and size
         bool ActFont( RuntimeScene & scene, ObjectsConcerned & objectsConcerned, const Instruction & action );
diff --git a/Extensions/TextObject/TextObjectEditor.cpp b/Extensions/TextObject/TextObjectEditor.cpp
index 03c6471fb6..d76bec5fa3 100644
--- a/Extensions/TextObject/TextObjectEditor.cpp
+++ b/Extensions/TextObject/TextObjectEditor.cpp
@@ -135,7 +135,7 @@ TextObjectEditor::~TextObjectEditor()
 void TextObjectEditor::OnokBtClick(wxCommandEvent& event)
 {
     object.SetString(string(textEdit->GetValue().mb_str()));
-    object.SetFont(fontEdit->GetValue().mb_str());
+    object.SetFont(string(fontEdit->GetValue().mb_str()));
 
     EndModal(1);
 }