General Housekeeping

qController.Standard/Classes/Cues/QCue.cs

@@ -5,6 +5,7 @@ namespace qController
 {
     public class QCue
     {
+        //info loaded from "/cueLists"
         public string number { get; set; }
         public string uniqueID { get; set; }
         public bool flagged { get; set; }
@@ -13,6 +14,8 @@ namespace qController
         public string colorName { get; set; }
         public string name { get; set; }
         public bool armed { get; set; }
+
+        //info loaded from "/valuesForKeys
         public decimal translationX { get; set; }
         public bool isRunning { get; set; }
         public decimal scaleX { get; set; }
@@ -27,65 +30,13 @@ namespace qController
         public string displayName { get; set; }
         public bool isLoaded { get; set; }
         public string notes { get; set; }
-        public List<double> levels { get; set; }
+        public List<List<double>> levels { get; set; }
+
+        //info loaded from /children
         public List<QCue> cues { get; set; }
         public string getIconString()
         {
-            switch (type)
-            {
-                case "Group":
-                    return "\uF248";
-                case "Audio":
-                    return "\uE807";
-                case "Mic":
-                    return "\uF130";
-                case "Video":
-                    return "\uE805";
-                case "Camera":
-                    return "\uE806";
-                case "Text":
-                    return "T";
-                case "Light":
-                    return "\uF0EB";
-                case "Fade":
-                    return "\uF1DE";
-                case "Network":
-                    return "\uF192";
-                case "MIDI":
-                    return "";
-                case "MIDI File":
-                    return "\uE804";
-                case "Timecode":
-                    return "\uE808";
-                case "Start":
-                    return "\uE809";
-                case "Stop":
-                    return "\uE80A";
-                case "Pause":
-                    return "\uE80B";
-                case "Load":
-                    return "\uE80E";
-                case "Reset":
-                    return "\uE80F";
-                case "Devamp":
-                    return "\uE80C";
-                case "GoTo":
-                    return "\uF178";
-                case "Target":
-                    return "\uE80D";
-                case "Arm":
-                    return "\uE810";
-                case "Disarm":
-                    return "";
-                case "Wait":
-                    return "\uF250";
-                case "Memo":
-                    return "\uF27B";
-                case "Script":
-                    return "\uE811";
-                default:
-                    return "";
-            }
+            return QIcon.GetIconFromType(type);
         }
     }
 }

qController.Standard/Classes/Cues/QWorkSpace.cs

@@ -9,20 +9,20 @@ namespace qController
         public List<QCueList> data { get; set; }
         public string workspace_id { get; set; }
         public string address { get; set; }
+        public bool IsPopulated { get; set; }
         public QCue GetCue(string cue_id)
         {
-            QCue returnCue = null;
             foreach (var cueList in data)
             {
                 foreach (var cue in cueList.cues)
                 {
                     if(cue.uniqueID == cue_id)
                     {
-                        returnCue = cue;
+                        return cue;
                     }
                 }
             }
-            return returnCue;
+            return null;
         }
 
         public void UpdateCue(QCue cue)
@@ -34,6 +34,7 @@ namespace qController
                     if(data[i].cues[j].uniqueID == cue.uniqueID)
                     {
                         data[i].cues[j] = cue;
+                        return;
                     }
                 }
             }
@@ -50,25 +51,28 @@ namespace qController
                         if(data[i].cues[j].type == "Group")
                         {
                             data[i].cues[j].cues = children;
+                            return;
                         }
                     }
                 }
             }
         }
 
-        public void UpdateLevels(string cue_id, List<double> levels)
+        public QCue GetEmptyGroup()
         {
-            for (int i = 0; i < data.Count; i++)
+            foreach (var cueList in data)
             {
-                for (int j = 0; j < data[i].cues.Count; j++)
+                foreach (var cue in cueList.cues)
                 {
-                    if (data[i].cues[j].uniqueID == cue_id)
+                    if (cue.type == "Group" && cue.cues == null)
                     {
-                        Console.WriteLine("Cue found and levels updated");
-                        data[i].cues[j].levels = levels;
+                        Console.WriteLine("Next Group Cue Found");
+                        return cue;
                     }
                 }
             }
+            IsPopulated = true;
+            return null;
         }
 
         public bool ChildrenPopulated()
@@ -79,10 +83,12 @@ namespace qController
                 {
                     if (data[i].cues[j].type == "Group" && data[i].cues[j].cues == null)
                     {
+                        IsPopulated = false;
                         return false;
                     }
                 }
             }
+            IsPopulated = true;
             return true;
         }
 
@@ -91,7 +97,6 @@ namespace qController
             foreach (var cueList in data)
             {
                 Console.WriteLine(cueList.listName + "("+ cueList.cues.Count + " cues)");
-
             }
         }
     }