From cf2ec313e3080fb98d85322d32f4896a600d1924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?=
 <jeanmichael.celerier@gmail.com>
Date: Fri, 4 Sep 2015 17:40:32 +0200
Subject: [PATCH] Condition serialization

---
 .../source/Commands/Event/SetCondition.cpp                | 1 -
 .../source/Document/Event/EventModelSerialization.cpp     | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/base/plugins/iscore-plugin-scenario/source/Commands/Event/SetCondition.cpp b/base/plugins/iscore-plugin-scenario/source/Commands/Event/SetCondition.cpp
index 2251f93908..89c79fd461 100644
--- a/base/plugins/iscore-plugin-scenario/source/Commands/Event/SetCondition.cpp
+++ b/base/plugins/iscore-plugin-scenario/source/Commands/Event/SetCondition.cpp
@@ -5,7 +5,6 @@
 using namespace iscore;
 using namespace Scenario::Command;
 
-// TODO
 SetCondition::SetCondition(
         Path<EventModel>&& eventPath,
         iscore::Condition&& cond) :
diff --git a/base/plugins/iscore-plugin-scenario/source/Document/Event/EventModelSerialization.cpp b/base/plugins/iscore-plugin-scenario/source/Document/Event/EventModelSerialization.cpp
index 347eeca7aa..b776cdd669 100644
--- a/base/plugins/iscore-plugin-scenario/source/Document/Event/EventModelSerialization.cpp
+++ b/base/plugins/iscore-plugin-scenario/source/Document/Event/EventModelSerialization.cpp
@@ -12,7 +12,7 @@ template<> void Visitor<Reader<DataStream>>::readFrom(const EventModel& ev)
 
     m_stream << ev.m_timeNode
              << ev.m_states
-   //          << ev.m_condition
+             << ev.m_condition
    //          << ev.m_trigger
              << ev.m_extent
              << ev.m_date;
@@ -27,7 +27,7 @@ template<> void Visitor<Writer<DataStream>>::writeTo(EventModel& ev)
 
     m_stream >> ev.m_timeNode
              >> ev.m_states
-    //         >> ev.m_condition
+             >> ev.m_condition
     //         >> ev.m_trigger
              >> ev.m_extent
              >> ev.m_date;
@@ -47,7 +47,7 @@ template<> void Visitor<Reader<JSONObject>>::readFrom(const EventModel& ev)
     m_obj["States"] = toJsonArray(ev.m_states);
 
     // TODO
-    //m_obj["Condition"] = ev.m_condition;
+    m_obj["Condition"] = toJsonObject(ev.m_condition);
     //m_obj["Trigger"] = ev.m_trigger;
 
     m_obj["Extent"] = toJsonValue(ev.m_extent);
@@ -64,7 +64,7 @@ template<> void Visitor<Writer<JSONObject>>::writeTo(EventModel& ev)
     fromJsonValueArray(m_obj["States"].toArray(), ev.m_states);
 
     // TODO
-    //ev.m_condition = m_obj["Condition"].toString();
+    fromJsonObject(m_obj["Condition"].toObject(), ev.m_condition);
     //ev.m_trigger = m_obj["Trigger"].toString();
 
     ev.m_extent = fromJsonValue<VerticalExtent>(m_obj["Extent"]);