DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Nodes - Update NoStringEvaluating

Browse Source 
Data model node - Take pin creation off of the UI thread
This commit is contained in:
Robert 2021-09-26 11:39:40 +02:00
parent c21acf87a7
commit 43b7b8345c
5 changed files with 19 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Artemis.UI/packages.lock.json
View File

@ -389,8 +389,8 @@
}, },
"NoStringEvaluating": { "NoStringEvaluating": {
"type": "Transitive", "type": "Transitive",
"resolved": "2.2.1", "resolved": "2.2.2",
"contentHash": "dYvWeDdSXrfWreWu17XUNCZD1QAbeMuyOLwVxNBBy+mbs1O/QjsYr1uQPCJWqYRF2Rd5nQBLFbFWybz4Ndh68g==", "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.ObjectPool": "5.0.9" "Microsoft.Extensions.ObjectPool": "5.0.9"
} }
@ -1494,7 +1494,7 @@
"JetBrains.Annotations": "2021.1.0", "JetBrains.Annotations": "2021.1.0",
"MaterialDesignThemes": "4.1.0", "MaterialDesignThemes": "4.1.0",
"Ninject": "3.3.4", "Ninject": "3.3.4",
"NoStringEvaluating": "2.2.1", "NoStringEvaluating": "2.2.2",
"SkiaSharp": "2.80.3", "SkiaSharp": "2.80.3",
"Stylet": "1.3.6" "Stylet": "1.3.6"
} }

2
src/Artemis.VisualScripting/Artemis.VisualScripting.csproj
View File

@ -47,7 +47,7 @@
<PackageReference Include="JetBrains.Annotations" Version="2021.1.0" /> <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.1.0" /> <PackageReference Include="MaterialDesignThemes" Version="4.1.0" />
<PackageReference Include="Ninject" Version="3.3.4" /> <PackageReference Include="Ninject" Version="3.3.4" />
<PackageReference Include="NoStringEvaluating" Version="2.2.1" /> <PackageReference Include="NoStringEvaluating" Version="2.2.2" />
<PackageReference Include="SkiaSharp" Version="2.80.3" /> <PackageReference Include="SkiaSharp" Version="2.80.3" />
<PackageReference Include="Stylet" Version="1.3.6" /> <PackageReference Include="Stylet" Version="1.3.6" />
</ItemGroup> </ItemGroup>

4
src/Artemis.VisualScripting/Ninject/NoStringNinjectModule.cs
View File

@ -39,10 +39,6 @@ namespace Artemis.VisualScripting.Ninject
// Evaluator // Evaluator
Bind<INoStringEvaluator>().To<NoStringEvaluator>().InSingletonScope(); Bind<INoStringEvaluator>().To<NoStringEvaluator>().InSingletonScope();
// Options
NoStringEvaluatorOptions opt = new NoStringEvaluatorOptions().SetWordQuotationMark("!");
opt.UpdateConstants();
// If needed // If needed
InjectUserDefinedFunctions(); InjectUserDefinedFunctions();
} }

9
src/Artemis.VisualScripting/Nodes/DataModel/DataModelNode.cs
View File

@ -2,7 +2,6 @@
using Artemis.Core; using Artemis.Core;
using Artemis.Storage.Entities.Profile; using Artemis.Storage.Entities.Profile;
using Artemis.VisualScripting.Nodes.DataModel.CustomViewModels; using Artemis.VisualScripting.Nodes.DataModel.CustomViewModels;
using Stylet;
namespace Artemis.VisualScripting.Nodes.DataModel namespace Artemis.VisualScripting.Nodes.DataModel
{ {
@ -51,8 +50,6 @@ namespace Artemis.VisualScripting.Nodes.DataModel
} }
public void UpdateOutputPin(bool loadConnections) public void UpdateOutputPin(bool loadConnections)
{
Execute.OnUIThread(() =>
{ {
if (Output != null && Output.Type == DataModelPath?.GetPropertyType()) if (Output != null && Output.Type == DataModelPath?.GetPropertyType())
return; return;
@ -69,23 +66,17 @@ namespace Artemis.VisualScripting.Nodes.DataModel
if (loadConnections && Script is NodeScript nodeScript) if (loadConnections && Script is NodeScript nodeScript)
nodeScript.LoadConnections(); nodeScript.LoadConnections();
});
} }
private void DataModelPathOnPathValidated(object sender, EventArgs e) private void DataModelPathOnPathValidated(object sender, EventArgs e)
{ {
UpdateOutputPin(true); UpdateOutputPin(true);
} }
#region IDisposable
/// <inheritdoc /> /// <inheritdoc />
public void Dispose() public void Dispose()
{ {
DataModelPath?.Dispose(); DataModelPath?.Dispose();
} }
#endregion
} }
} }

6
src/Artemis.VisualScripting/packages.lock.json
View File

@ -29,9 +29,9 @@
}, },
"NoStringEvaluating": { "NoStringEvaluating": {
"type": "Direct", "type": "Direct",
"requested": "[2.2.1, )", "requested": "[2.2.2, )",
"resolved": "2.2.1", "resolved": "2.2.2",
"contentHash": "dYvWeDdSXrfWreWu17XUNCZD1QAbeMuyOLwVxNBBy+mbs1O/QjsYr1uQPCJWqYRF2Rd5nQBLFbFWybz4Ndh68g==", "contentHash": "hJHivPDA1Vxn0CCgOtHKZ3fmldxQuz7VL1J4lEaPTXCf+Vwcx1FDf05mGMh6olYMSxoKimGX8YK2sEoqeH3pnA==",
"dependencies": { "dependencies": {
"Microsoft.Extensions.ObjectPool": "5.0.9" "Microsoft.Extensions.ObjectPool": "5.0.9"
} }