From d530d39d7ed9b05e3e233adc62dceba2fd17e1fe Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Sun, 25 Oct 2020 16:58:42 +0200 Subject: Improved extension methods support on procedures. Drastically reduces procedure designer loading time. DataStore proto support fully working and tested. --- Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs') diff --git a/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs b/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs index ec4cf1057..6661c2017 100644 --- a/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs +++ b/Software/Visual_Studio/Tango.DataStore/DataStoreProtoObject.cs @@ -1,5 +1,6 @@ using Google.Protobuf; using Newtonsoft.Json; +using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.IO; @@ -59,6 +60,11 @@ namespace Tango.DataStore return proto; } + public static DataStoreProtoObject FromJObject(JObject obj) + { + return (obj.ToObject()); + } + public static DataStoreProtoObject FromPMRDataStoreItem(DataStoreItem item) { DataStoreProtoObject proto = new DataStoreProtoObject(); -- cgit v1.3.1