-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #34 from arup-group/dev
Refreshed the UI to be more responsive for the user (and easier to maintain and extend in the future for the developer) including better display of current state and progress Fixed some bugs related to units other than metres Revamped the application's internal data cache to make receiving from streams faster, particularly for models with tens of thousands of elements Included calls to enable some telemetry Improved logging of data to the technical log for future problem diagnosis and solving The command line interface (headless) version of this app is affected by the UI change; it has been partly tested but might still need further work in order to replace the previous version The progress bar currently doesn't work perfectly when sending/receiving in continuous mode
- Loading branch information
Showing
126 changed files
with
7,120 additions
and
3,898 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| using SpeckleGSAInterfaces; | ||
| using System.Collections.Generic; | ||
|
|
||
| namespace SpeckleGSA | ||
| { | ||
| public class GsaResultParams : IGSAResultParams | ||
| { | ||
| public int ResHeader { get; set; } | ||
| public int Flags { get; set; } | ||
| public List<string> Keys { get; set; } //Field/column headers | ||
| public string Keyword { get; set; } //TODO: is this still necessary? | ||
|
|
||
| public GsaResultParams(int resHeader, int flags, List<string> keys) | ||
| { | ||
| this.ResHeader = resHeader; | ||
| this.Flags = flags; | ||
| this.Keys = keys; | ||
| } | ||
|
|
||
| public GsaResultParams(string keyword, int resHeader, int flags, List<string> keys) | ||
| { | ||
| this.ResHeader = resHeader; | ||
| this.Flags = flags; | ||
| this.Keys = keys; | ||
| if (!string.IsNullOrEmpty(keyword)) | ||
| { | ||
| this.Keyword = keyword; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| using SpeckleGSAInterfaces; | ||
| using SpeckleGSAProxy; | ||
| using SpeckleUtil; | ||
|
|
||
| namespace SpeckleGSA | ||
| { | ||
| public interface IGSALocalAppResources : IGSAAppResources | ||
| { | ||
| IGSACache LocalCache { get; set; } | ||
| IGSALocalSettings LocalSettings { get; set; } | ||
| IGSALocalProxy LocalProxy { get; } | ||
| IGSALocalMessenger LocalMessenger { get; set; } | ||
|
|
||
| ISpeckleObjectMerger Merger { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| using SpeckleGSAInterfaces; | ||
| using System; | ||
| using System.Collections.Generic; | ||
|
|
||
| namespace SpeckleGSA | ||
| { | ||
| public interface IGSALocalMessenger : IGSAMessenger | ||
| { | ||
| bool Append(IEnumerable<string> messagePortionsToMatch, IEnumerable<string> additional); | ||
| void Trigger(); | ||
| event EventHandler<MessageEventArgs> MessageAdded; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| using SpeckleGSAInterfaces; | ||
|
|
||
| namespace SpeckleGSA | ||
| { | ||
| public interface IGSALocalSettings : IGSASettings | ||
| { | ||
| int LoggingMinimumLevel { get; set; } | ||
| bool SendOnlyResults { get; set; } | ||
| bool SendOnlyMeaningfulNodes { get; set; } | ||
| bool SeparateStreams { get; set; } | ||
| string ServerAddress { get; set; } | ||
| bool VerboseErrors { get; set; } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| namespace SpeckleGSA | ||
| { | ||
| //Used for estimation of work for progress bar | ||
| internal class ProcessingPhase | ||
| { | ||
| public WorkPhase Phase { get; set; } | ||
| public double Weighting { get; set; } | ||
| public double Total { get; set; } | ||
| public double Current { get; set; } | ||
|
|
||
| public void Clear() | ||
| { | ||
| this.Total = 0; | ||
| this.Current = 0; | ||
| } | ||
|
|
||
| public ProcessingPhase(WorkPhase phase, double weighting) | ||
| { | ||
| this.Phase = phase; | ||
| this.Weighting = weighting; | ||
| } | ||
| } | ||
|
|
||
| internal enum WorkPhase | ||
| { | ||
| CacheRead, | ||
| CacheUpdate, | ||
| Conversion, | ||
| ApiCalls | ||
| } | ||
| } |
Oops, something went wrong.