From 1eb8e0c42be985c250e3ce3b4f6b47e37bfe2bca Mon Sep 17 00:00:00 2001 From: Joel Wetzell Date: Sat, 23 Jul 2022 09:57:47 -0500 Subject: [PATCH] Cue properties clean up --- QControlKit/QControlKit.csproj | 4 ++-- QControlKit/QCue.cs | 3 --- QControlKit/QWorkspace.cs | 7 +------ QControlKitXamDemo/QControlKitXamDemo/CueListPage.xaml.cs | 2 +- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/QControlKit/QControlKit.csproj b/QControlKit/QControlKit.csproj index 7b7e97b..ac0919c 100644 --- a/QControlKit/QControlKit.csproj +++ b/QControlKit/QControlKit.csproj @@ -6,7 +6,7 @@ Joel Wetzell 1.0.0-devel true - 0.0.24 + 0.0.29 QControlKit MIT Unofficial C# port of Figure53's QLabKit.objc @@ -18,7 +18,7 @@ - + diff --git a/QControlKit/QCue.cs b/QControlKit/QCue.cs index c8ece0d..6fe560d 100644 --- a/QControlKit/QCue.cs +++ b/QControlKit/QCue.cs @@ -45,8 +45,6 @@ namespace QControlKit init(); this.workspace = workspace; updatePropertiesWithDictionary(dict); - workspace.fetchBasicPropertiesForCue(this); - } public QCue(JToken dict, QWorkspace workspace, int nestLevel) @@ -55,7 +53,6 @@ namespace QControlKit this.workspace = workspace; this.nestLevel = nestLevel + 1; updatePropertiesWithDictionary(dict); - workspace.fetchBasicPropertiesForCue(this); } public void init() diff --git a/QControlKit/QWorkspace.cs b/QControlKit/QWorkspace.cs index ca969ef..e5754aa 100644 --- a/QControlKit/QWorkspace.cs +++ b/QControlKit/QWorkspace.cs @@ -319,17 +319,12 @@ namespace QControlKit { List keys = new List { QOSCKey.UID, - QOSCKey.Number, - QOSCKey.Name, - QOSCKey.ListName, - QOSCKey.Type, - QOSCKey.ColorName, QOSCKey.Flagged, QOSCKey.Armed, QOSCKey.IsRunning, QOSCKey.IsBroken, + QOSCKey.IsLoaded, QOSCKey.Parent, - QOSCKey.Notes }; fetchPropertiesForCue(cue, keys.ToArray(), false); diff --git a/QControlKitXamDemo/QControlKitXamDemo/CueListPage.xaml.cs b/QControlKitXamDemo/QControlKitXamDemo/CueListPage.xaml.cs index 89fc60f..482e43f 100644 --- a/QControlKitXamDemo/QControlKitXamDemo/CueListPage.xaml.cs +++ b/QControlKitXamDemo/QControlKitXamDemo/CueListPage.xaml.cs @@ -53,7 +53,7 @@ namespace QControlKitXamDemo QCue selectedCue = connectedWorkspace.cueWithID(args.cueID); if(selectedCue != null) //TODO: I think this being null is the result of a race condition? { - connectedWorkspace.fetchDefaultPropertiesForCue(selectedCue); + connectedWorkspace.fetchBasicPropertiesForCue(selectedCue); selectedCueGrid.BindingContext = new QCueViewModel(selectedCue, false); if (cueGridDict.ContainsKey(args.cueID)) {