Skip to content
Snippets Groups Projects

Feature/with submodule

Merged Sylvain Renault requested to merge feature/withSubmodule into main
Files
30
@@ -7,7 +7,7 @@ using UnityEditor;
@@ -7,7 +7,7 @@ using UnityEditor;
using UnityEditor.Experimental.GraphView;
using UnityEditor.Experimental.GraphView;
using UnityEngine.UIElements;
using UnityEngine.UIElements;
using UnityEditor.UIElements;
using UnityEditor.UIElements;
using ETSI.ARF.WorldStorage.RESTful;
using ETSI.ARF.WorldStorage.REST;
#if USING_OPENAPI_GENERATOR
#if USING_OPENAPI_GENERATOR
using Org.OpenAPITools.Api;
using Org.OpenAPITools.Api;
@@ -23,13 +23,14 @@ namespace ETSI.ARF.WorldStorage.UI
@@ -23,13 +23,14 @@ namespace ETSI.ARF.WorldStorage.UI
public class GraphWindow : EditorWindow
public class GraphWindow : EditorWindow
{
{
[HideInInspector] public WorldStorageSettings worldStorageSettings;
[HideInInspector] public WorldStorageServer worldStorageSettings;
[SerializeField] public List<string> trackables = new List<string>();
[SerializeField] public List<string> trackables = new List<string>();
bool groupEnabled;
bool groupEnabled;
string uid = System.Guid.Empty.ToString();
string uid = System.Guid.Empty.ToString();
 
string customName = "NotDefined";
string creatorUid = System.Guid.Empty.ToString();
string creatorUid = System.Guid.Empty.ToString();
string type = "Unknow";
string type = "Unknow";
string unit = "Unknow";
string unit = "Unknow";
@@ -42,8 +43,8 @@ namespace ETSI.ARF.WorldStorage.UI
@@ -42,8 +43,8 @@ namespace ETSI.ARF.WorldStorage.UI
private ARFGraphView myGraph;
private ARFGraphView myGraph;
[MenuItem("[ ISG-ARF ]/Graph Editor")]
[MenuItem("ARFWorldStorage/Graph Editor")]
public static void ShowWindow()//WorldStorageSettings ws)
public static void ShowWindow()//WorldStorageServer ws)
{
{
GraphWindow win = EditorWindow.GetWindow(typeof(GraphWindow), false, WorldStorageWindow.winName) as GraphWindow;
GraphWindow win = EditorWindow.GetWindow(typeof(GraphWindow), false, WorldStorageWindow.winName) as GraphWindow;
//win.worldStorageSettings = ws;
//win.worldStorageSettings = ws;
@@ -117,6 +118,7 @@ namespace ETSI.ARF.WorldStorage.UI
@@ -117,6 +118,7 @@ namespace ETSI.ARF.WorldStorage.UI
//graph.Draw();
//graph.Draw();
}
}
 
/*
void DrawTrackableStuffs()// Trackable trackable)
void DrawTrackableStuffs()// Trackable trackable)
{
{
GUILayout.BeginVertical("AR Trackable", gsTest);
GUILayout.BeginVertical("AR Trackable", gsTest);
@@ -133,9 +135,9 @@ namespace ETSI.ARF.WorldStorage.UI
@@ -133,9 +135,9 @@ namespace ETSI.ARF.WorldStorage.UI
if (GUILayout.Button("Get Parameters"))
if (GUILayout.Button("Get Parameters"))
{
{
Trackable t = RESTfulTrackableRequest.GetTrackable(worldStorageSettings, uid);
Trackable t = RESTfulTrackableRequest.GetTrackable(worldStorageSettings, uid);
creatorUid = t.CreatorUID.ToString();
creatorUid = t.CreatorUUID.ToString();
type = t.GetType().ToString();
type = t.GetType().ToString();
unit = t.UnitSystem.ToString();
unit = t.Unit.ToString();
}
}
GUI.backgroundColor = ori;
GUI.backgroundColor = ori;
@@ -177,18 +179,18 @@ namespace ETSI.ARF.WorldStorage.UI
@@ -177,18 +179,18 @@ namespace ETSI.ARF.WorldStorage.UI
{
{
Debug.Log("PostAddTrackable");
Debug.Log("PostAddTrackable");
if (string.IsNullOrEmpty(uid) || uid == "0") uid = System.Guid.Empty.ToString();
if (string.IsNullOrEmpty(uid) || uid == "0") uid = System.Guid.Empty.ToString();
Trackable t = RESTfulTrackableRequest.TrackableFromStrings(uid, worldStorageSettings.creatorUID);
Trackable t = RESTfulTrackableRequest.TrackableFromStrings(uid, cus, worldStorageSettings.creatorUID);
RESTfulTrackableRequest.PostAddTrackable(worldStorageSettings, t);
RESTfulTrackableRequest.PostAddTrackable(worldStorageSettings, t);
WorldStorageWindow.WorldStorageWindowSingleton.UpdateList();
WorldStorageWindow.WorldStorageWindowSingleton.UpdateList();
WorldStorageWindow.WorldStorageWindowSingleton.Repaint();
WorldStorageWindow.WorldStorageWindowSingleton.Repaint();
uid = t.UID.ToString();
uid = t.UUID.ToString();
type = t.GetType().ToString();
type = t.GetType().ToString();
unit = t.UnitSystem.ToString();
unit = t.Unit.ToString();
}
}
GUI.backgroundColor = ori;
GUI.backgroundColor = ori;
}
}
*/
}
}
}
}
 
\ No newline at end of file
Loading