jwetzell/QControlKit
1
0
Fork 0
mirror of https://github.com/jwetzell/QControlKit.git synced 2026-08-16 21:03:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Cue properties clean up

Browse Source
This commit is contained in:
Joel Wetzell
2022-07-23 09:57:47 -05:00
parent 69b8210362
commit 1eb8e0c42b
4 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
QControlKit/QControlKit.csproj
+2 -2
View File
@@ -6,7 +6,7 @@
<Authors>Joel Wetzell</Authors> <Authors>Joel Wetzell</Authors>
<Version>1.0.0-devel</Version> <Version>1.0.0-devel</Version>
<PackOnBuild>true</PackOnBuild> <PackOnBuild>true</PackOnBuild>
<PackageVersion>0.0.24</PackageVersion> <PackageVersion>0.0.29</PackageVersion>
<PackageId>QControlKit</PackageId> <PackageId>QControlKit</PackageId>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>
<Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary> <Summary>Unofficial C# port of Figure53's QLabKit.objc</Summary>
@@ -18,7 +18,7 @@
<PackageReference Include="Serilog" Version="2.10.0" /> <PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Zeroconf" Version="3.5.11" /> <PackageReference Include="Zeroconf" Version="3.5.11" />
<PackageReference Include="SuperSimpleTcp" Version="2.6.0" /> <PackageReference Include="SuperSimpleTcp" Version="2.6.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Constants\" /> <Folder Include="Constants\" />
QControlKit/QCue.cs
-3
View File
@@ -45,8 +45,6 @@ namespace QControlKit
init(); init();
this.workspace = workspace; this.workspace = workspace;
updatePropertiesWithDictionary(dict); updatePropertiesWithDictionary(dict);
workspace.fetchBasicPropertiesForCue(this);
} }
public QCue(JToken dict, QWorkspace workspace, int nestLevel) public QCue(JToken dict, QWorkspace workspace, int nestLevel)
@@ -55,7 +53,6 @@ namespace QControlKit
this.workspace = workspace; this.workspace = workspace;
this.nestLevel = nestLevel + 1; this.nestLevel = nestLevel + 1;
updatePropertiesWithDictionary(dict); updatePropertiesWithDictionary(dict);
workspace.fetchBasicPropertiesForCue(this);
} }
public void init() public void init()
QControlKit/QWorkspace.cs
+1 -6
View File
@@ -319,17 +319,12 @@ namespace QControlKit
{ {
List<string> keys = new List<string> { List<string> keys = new List<string> {
QOSCKey.UID, QOSCKey.UID,
QOSCKey.Number,
QOSCKey.Name,
QOSCKey.ListName,
QOSCKey.Type,
QOSCKey.ColorName,
QOSCKey.Flagged, QOSCKey.Flagged,
QOSCKey.Armed, QOSCKey.Armed,
QOSCKey.IsRunning, QOSCKey.IsRunning,
QOSCKey.IsBroken, QOSCKey.IsBroken,
QOSCKey.IsLoaded,
QOSCKey.Parent, QOSCKey.Parent,
QOSCKey.Notes
}; };
fetchPropertiesForCue(cue, keys.ToArray(), false); fetchPropertiesForCue(cue, keys.ToArray(), false);
QControlKitXamDemo/QControlKitXamDemo/CueListPage.xaml.cs
+1 -1
View File
@@ -53,7 +53,7 @@ namespace QControlKitXamDemo
QCue selectedCue = connectedWorkspace.cueWithID(args.cueID); QCue selectedCue = connectedWorkspace.cueWithID(args.cueID);
if(selectedCue != null) //TODO: I think this being null is the result of a race condition? 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); selectedCueGrid.BindingContext = new QCueViewModel(selectedCue, false);
if (cueGridDict.ContainsKey(args.cueID)) if (cueGridDict.ContainsKey(args.cueID))
{ {