jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-09-01 04:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to using valuesForKeys to update cue

Browse Source
This commit is contained in:
jwetzell
2019-04-08 09:19:07 -05:00
parent 4cb4ae6e26
commit c156a3b926
4 changed files with 2270 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Resources/Resource.designer.cs
Generated
+2241 -194
View File
File diff suppressed because it is too large Load Diff
qController.Standard/Classes/Communication/QParser.cs
+14 -10
View File
@@ -48,7 +48,7 @@ namespace qController
public void ParseMessage(OscMessage msg){ public void ParseMessage(OscMessage msg){
if (!msg.Address.Contains("null")) if (!msg.Address.Contains("null"))
{ {
if (msg.Address.Contains("selectedCues")) if (msg.Address.Contains("valuesForKeys"))
ParseSelectedCueInfo(msg); ParseSelectedCueInfo(msg);
else if (msg.Address.Contains("notes")) else if (msg.Address.Contains("notes"))
ParseNoteInfo(msg); ParseNoteInfo(msg);
@@ -57,21 +57,25 @@ namespace qController
else if (msg.Address.Contains("cueLists")) else if (msg.Address.Contains("cueLists"))
ParseWorkspaceInfo(msg); ParseWorkspaceInfo(msg);
else else
{
Console.WriteLine("Unknown message type");
Console.WriteLine(msg.Address); Console.WriteLine(msg.Address);
foreach (var item in msg.Arguments)
{
Console.WriteLine(item);
}
}
} }
} }
public void ParseSelectedCueInfo(OscMessage msg){ public void ParseSelectedCueInfo(OscMessage msg){
JArray selectedCues = (JArray)OSC2JSON(msg); JToken selectedCue = OSC2JSON(msg);
if (selectedCues.Count > 0){ Console.WriteLine("Selected Cue Updated");
foreach(JObject item in selectedCues){ QCue cue = JsonConvert.DeserializeObject<QCue>(selectedCue.ToString());
QCue parsedCue = JsonConvert.DeserializeObject<QCue>(item.ToString());
OnSelectedCueUpdated(parsedCue);
}
}else{ Console.WriteLine(cue.uniqueID);
Console.WriteLine("No Cues Selected"); OnSelectedCueUpdated(cue);
}
} }
public void ParseNoteInfo(OscMessage msg){ public void ParseNoteInfo(OscMessage msg){
qController.Standard/Classes/Communication/QUpdater.cs
+2 -1
View File
@@ -25,7 +25,8 @@ namespace qController
public void UpdateSelected() public void UpdateSelected()
{ {
qController.qClient.sendAndReceiveString("/selectedCues"); string valuesForKeys = "[\"displayName\",\"number\",\"type\",\"isBroken\",\"isLoaded\",\"isPaused\",\"isRunning\",\"preWait\",\"duration\",\"postWait\",\"translationX\",\"translationY\",\"opacity\",\"scaleX\",\"scaleY\",\"uniqueID\",\"flagged\",\"listName\",\"colorName\",\"name\",\"armed\"]";
qController.qClient.sendAndReceiveStringArgs("/cue/selected/valuesForKeys", valuesForKeys);
} }
public void UpdateLevels() public void UpdateLevels()
{ {
qController.Standard/Classes/Cues/QCue.cs
+13
View File
@@ -12,5 +12,18 @@ namespace qController
public string colorName { get; set; } public string colorName { get; set; }
public string name { get; set; } public string name { get; set; }
public bool armed { get; set; } public bool armed { get; set; }
public int translationX { get; set; }
public bool isRunning { get; set; }
public int scaleX { get; set; }
public bool isPaused { get; set; }
public int translationY { get; set; }
public int preWait { get; set; }
public int opacity { get; set; }
public int scaleY { get; set; }
public int duration { get; set; }
public int postWait { get; set; }
public bool isBroken { get; set; }
public string displayName { get; set; }
public bool isLoaded { get; set; }
} }
} }