QOL changes to the Comme il Faut WF app, additionally Social Exchange…

… IDs are now being properly produced
GAIPS · Oct 8, 2018 · aa4741d · aa4741d
1 parent 68c0f24
commit aa4741d
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 20 deletions.
diff --git a/Assets/CommeillFaut/CommeillFautAsset.cs b/Assets/CommeillFaut/CommeillFautAsset.cs
@@ -202,12 +202,12 @@ public Guid AddOrUpdateExchange(SocialExchangeDTO dto)
         {
 
             var idx = m_SocialExchanges.FindIndex(x => x.Id == dto.Id);
-            System.Guid actualID = new Guid();
+            System.Guid actualId;
             if (idx < 0)
             {
                 var se = new SocialExchange(dto);
                 m_SocialExchanges.Add(se);
-                actualID = se.Id;
+                actualId = se.Id;
             }
             else
             {
@@ -218,11 +218,11 @@ public Guid AddOrUpdateExchange(SocialExchangeDTO dto)
                 m_SocialExchanges[idx].Name = dto.Name;
                  m_SocialExchanges[idx].Steps = m_SocialExchanges[idx].StringToSteps(dto.Steps);
                  m_SocialExchanges[idx].InfluenceRules = dto.InfluenceRules.Select(x=>new InfluenceRule(x)).ToList();
-                actualID = m_SocialExchanges[idx].Id;
+                actualId = m_SocialExchanges[idx].Id;
 
             }
 
-            return actualID;
+            return actualId;
         }
 
         public void RemoveSocialExchange(Guid id)
@@ -277,6 +277,11 @@ public void SetObjectData(ISerializationData dataHolder, ISerializationContext c
         {
 
             m_SocialExchanges = new List<SocialExchange>(dataHolder.GetValue<SocialExchange[]>("SocialExchanges"));
+
+            foreach (var se in m_SocialExchanges)
+            {
+                se.Id =  Guid.NewGuid();
+            }
         }
 
 

diff --git a/Assets/CommeillFaut/SocialExchange.cs b/Assets/CommeillFaut/SocialExchange.cs
@@ -14,7 +14,7 @@ namespace CommeillFaut
     public class SocialExchange : ICustomSerialization
     {
 
-        public Guid Id { get; private set; }
+        public Guid Id { get; set; }
 
         public string Description { get; set; }
 

diff --git a/AuthoringTools/CommeillFautWF/AddInfluenceRule.Designer.cs b/AuthoringTools/CommeillFautWF/AddInfluenceRule.Designer.cs
diff --git a/AuthoringTools/CommeillFautWF/AddSocialExchange.Designer.cs b/AuthoringTools/CommeillFautWF/AddSocialExchange.Designer.cs
diff --git a/AuthoringTools/CommeillFautWF/AddSocialExchange.cs b/AuthoringTools/CommeillFautWF/AddSocialExchange.cs
@@ -54,7 +54,8 @@ private void buttonAdd_Click(object sender, EventArgs e)
                 dto.Description = textBoxDescription.Text;
                 dto.Steps = stepsTextBox.Text;
                 dto.Target = wfNameTarget.Value;
-                UpdatedGuid = asset.AddOrUpdateExchange(dto);
+                dto.Id = asset.AddOrUpdateExchange(dto);
+                UpdatedGuid = dto.Id;
                 Close();
             }
             catch (Exception ex)

diff --git a/AuthoringTools/CommeillFautWF/InfluenceRuleInspector.Designer.cs b/AuthoringTools/CommeillFautWF/InfluenceRuleInspector.Designer.cs
diff --git a/AuthoringTools/CommeillFautWF/MainForm.cs b/AuthoringTools/CommeillFautWF/MainForm.cs
@@ -85,6 +85,8 @@ private void auxAddOrUpdateItem(SocialExchangeDTO item)
         {
             var diag = new AddSocialExchange(LoadedAsset, item);
             diag.ShowDialog(this);
+
+
             if (diag.UpdatedGuid != Guid.Empty)
             {
               //  _socialExchangeList.DataSource = LoadedAsset.GetAllSocialExchanges().ToList();
@@ -96,6 +98,7 @@ private void auxAddOrUpdateItem(SocialExchangeDTO item)
                 EditorTools.HighlightItemInGrid<SocialExchangeDTO>
                     (gridSocialExchanges, diag.UpdatedGuid);
             }
+            _socialExchangeList.Refresh();
 
             SetModified();
         }
@@ -120,6 +123,8 @@ private void buttonDuplicateSE_Click(object sender, EventArgs e)
                 _socialExchangeList.DataSource = LoadedAsset.GetAllSocialExchanges().ToList();
                 EditorTools.HighlightItemInGrid<SocialExchangeDTO>(gridSocialExchanges, newRuleId);
             }
+
+            SetModified();
         }
 
         private void buttonRemoveSE_Click(object sender, EventArgs e)