Skip to content
Snippets Groups Projects
Commit af8bd09f authored by lacoche's avatar lacoche
Browse files

try to fix reload graph with sync method

parent b4eb7e01
Branches develop
No related tags found
No related merge requests found
......@@ -305,49 +305,42 @@ namespace ETSI.ARF.WorldStorage.UI
public void PaintWorldStorage()
{
WorldAnchorRequest.GetWorldAnchorsAsync(worldStorageServer, (response) =>
List<WorldAnchor> worldAnchors = WorldAnchorRequest.GetWorldAnchorsSync(worldStorageServer);
foreach (WorldAnchor worldAnchor in worldAnchors)
{
List<WorldAnchor> worldAnchors = response.result;
foreach (WorldAnchor worldAnchor in worldAnchors)
{
var waNode = new ARFNodeWorldAnchor(worldAnchor);
var waNode = new ARFNodeWorldAnchor(worldAnchor);
Rect posTemp = new(26, 93, 160, 77);
SaveInfo.instance.nodePositions.TryGetValue(worldAnchor.UUID.ToString(), out posTemp);
waNode.SetPosition(posTemp);
Rect posTemp = new(26, 93, 160, 77);
SaveInfo.instance.nodePositions.TryGetValue(worldAnchor.UUID.ToString(), out posTemp);
waNode.SetPosition(posTemp);
AddElement(waNode);
}
});
AddElement(waNode);
}
TrackableRequest.GetTrackablesAsync(worldStorageServer, (response) =>
List<Trackable> trackables = TrackableRequest.GetTrackablesSync(worldStorageServer);
foreach (Trackable trackable in trackables)
{
List<Trackable> trackables = response.result;
foreach (Trackable trackable in trackables)
{
var tracknode = new ARFNodeTrackable(trackable);
var tracknode = new ARFNodeTrackable(trackable);
Rect posTemp = new(26, 93, 160, 77);
SaveInfo.instance.nodePositions.TryGetValue(trackable.UUID.ToString(), out posTemp);
tracknode.SetPosition(posTemp);
Rect posTemp = new(26, 93, 160, 77);
SaveInfo.instance.nodePositions.TryGetValue(trackable.UUID.ToString(), out posTemp);
tracknode.SetPosition(posTemp);
AddElement(tracknode);
}
});
WorldLinkRequest.GetWorldLinksAsync(worldStorageServer, (response) =>
AddElement(tracknode);
}
List<WorldLink> worldLinks = WorldLinkRequest.GetWorldLinksSync(worldStorageServer);
foreach (WorldLink worldLink in worldLinks)
{
List<WorldLink> worldLinks = response.result;
foreach (WorldLink worldLink in worldLinks)
{
var portPair = GetPortsFromWorldLink(worldLink);
ARFEdgeLink edge = portPair.Key.ConnectTo<ARFEdgeLink>(portPair.Value);
edge.worldLink = worldLink;
edge.GUID = worldLink.UUID.ToString();
AddElement(edge);
}
});
Debug.Log("ports");
var portPair = GetPortsFromWorldLink(worldLink);
Debug.Log("edge " + (portPair.Key == null)+ " " + (portPair.Value == null));
ARFEdgeLink edge = portPair.Key.ConnectTo<ARFEdgeLink>(portPair.Value);
edge.worldLink = worldLink;
edge.GUID = worldLink.UUID.ToString();
AddElement(edge);
}
}
internal ARFNodeTrackable CreateTrackableNode(Trackable track, float posX, float posY)
......@@ -479,14 +472,14 @@ namespace ETSI.ARF.WorldStorage.UI
}
//
// Rsum:
// Rsum:
// Calculate the rectangle size and position to fit all elements in graph.
//
// Paramtres:
// Paramtres:
// container:
// This should be the view container.
//
// Retourne:
// Retourne:
// The calculated rectangle.
public override Rect CalculateRectToFitAll(VisualElement container)
{
......
......@@ -240,55 +240,49 @@ namespace ETSI.ARF.WorldStorage.Editor.Windows
worldStorageUser = user;
instance.nodePositions = new Dictionary<string, Rect>();
TrackableRequest.GetTrackablesAsync(worldStorageServer, (response) =>
List<Trackable> listT = TrackableRequest.GetTrackablesSync(worldStorageServer);
foreach (Trackable track in listT)
{
List<Trackable> list = response.result;
foreach (Trackable track in list)
if (track.KeyvalueTags.ContainsKey("unityAuthoringPosX") && track.KeyvalueTags.ContainsKey("unityAuthoringPosY"))
{
if (track.KeyvalueTags.ContainsKey("unityAuthoringPosX") && track.KeyvalueTags.ContainsKey("unityAuthoringPosY"))
{
var posX = RoundToNearestHalf(float.Parse(track.KeyvalueTags["unityAuthoringPosX"][0]));
var posY = RoundToNearestHalf(float.Parse(track.KeyvalueTags["unityAuthoringPosY"][0]));
Rect trackPos = new(posX, posY, 135, 77);
instance.nodePositions[track.UUID.ToString()] = trackPos;
}
else
{
Rect trackPos = new(0, 0, 135, 77);
instance.nodePositions[track.UUID.ToString()] = trackPos;
}
var posX = RoundToNearestHalf(float.Parse(track.KeyvalueTags["unityAuthoringPosX"][0]));
var posY = RoundToNearestHalf(float.Parse(track.KeyvalueTags["unityAuthoringPosY"][0]));
Rect trackPos = new(posX, posY, 135, 77);
instance.nodePositions[track.UUID.ToString()] = trackPos;
}
});
else
{
Rect trackPos = new(0, 0, 135, 77);
instance.nodePositions[track.UUID.ToString()] = trackPos;
}
}
WorldAnchorRequest.GetWorldAnchorsAsync(worldStorageServer, (response) =>
List<WorldAnchor> listA = WorldAnchorRequest.GetWorldAnchorsSync(worldStorageServer);
Debug.Log("Anchors " +listA.Count);
foreach (WorldAnchor wa in listA)
{
List<WorldAnchor> list = response.result;
foreach (WorldAnchor wa in list)
if (wa.KeyvalueTags.ContainsKey("unityAuthoringPosX") && wa.KeyvalueTags.ContainsKey("unityAuthoringPosY"))
{
if (wa.KeyvalueTags.ContainsKey("unityAuthoringPosX") && wa.KeyvalueTags.ContainsKey("unityAuthoringPosY"))
{
var posX = RoundToNearestHalf(float.Parse(wa.KeyvalueTags["unityAuthoringPosX"][0]));
var posY = RoundToNearestHalf(float.Parse(wa.KeyvalueTags["unityAuthoringPosY"][0]));
Rect waPos = new(posX, posY, 135, 77);
instance.nodePositions[wa.UUID.ToString()] = waPos;
}
else
{
Rect trackPos = new(0, 0, 135, 77);
instance.nodePositions[wa.UUID.ToString()] = trackPos;
}
var posX = RoundToNearestHalf(float.Parse(wa.KeyvalueTags["unityAuthoringPosX"][0]));
var posY = RoundToNearestHalf(float.Parse(wa.KeyvalueTags["unityAuthoringPosY"][0]));
Rect waPos = new(posX, posY, 135, 77);
instance.nodePositions[wa.UUID.ToString()] = waPos;
}
else
{
Rect trackPos = new(0, 0, 135, 77);
instance.nodePositions[wa.UUID.ToString()] = trackPos;
}
});
}
instance.linkIds = new List<string>();
WorldLinkRequest.GetWorldLinksAsync(worldStorageServer, (response) =>
List<WorldLink> listWL = WorldLinkRequest.GetWorldLinksSync(worldStorageServer);
foreach (WorldLink link in listWL)
{
List<WorldLink> list = response.result;
foreach (WorldLink link in list)
{
instance.linkIds.Add(link.UUID.ToString());
}
});
instance.linkIds.Add(link.UUID.ToString());
}
instance.elemsToRemove = new Dictionary<string, Type>();
instance.elemsToUpdate = new List<string>();
......
Subproject commit cebe3c24911db848f91ced30955be6bca4974a71
Subproject commit 5e91e32387700c0c852878e84c2098af794d2ac7
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment