-
Notifications
You must be signed in to change notification settings - Fork 176
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dui3/alpha' into dui3/ci/github-actions-test
- Loading branch information
Showing
46 changed files
with
780 additions
and
937 deletions.
There are no files selected for viewing
51 changes: 51 additions & 0 deletions
51
...Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/ArcGISConnectorModule.cs
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,51 @@ | ||
| using Speckle.Autofac.DependencyInjection; | ||
| using Speckle.Connectors.ArcGIS.Bindings; | ||
| using Speckle.Connectors.ArcGis.Operations.Send; | ||
| using Speckle.Connectors.DUI.Bindings; | ||
| using Speckle.Connectors.ArcGIS.Utils; | ||
| using Speckle.Connectors.ArcGIS.Operations.Receive; | ||
| using Speckle.Connectors.DUI.Models.Card.SendFilter; | ||
| using Speckle.Connectors.DUI.WebView; | ||
| using Speckle.Connectors.Utils.Builders; | ||
| using Speckle.Autofac; | ||
| using Speckle.Connectors.ArcGIS.Filters; | ||
| using Speckle.Connectors.DUI; | ||
| using Speckle.Connectors.DUI.Models; | ||
| using Speckle.Connectors.Utils; | ||
| using Speckle.Core.Models.GraphTraversal; | ||
|
|
||
| // POC: This is a temp reference to root object senders to tweak CI failing after having generic interfaces into common project. | ||
| // This should go whenever it is aligned. | ||
|
|
||
| namespace Speckle.Connectors.ArcGIS.DependencyInjection; | ||
|
|
||
| public class ArcGISConnectorModule : ISpeckleModule | ||
| { | ||
| public void Load(SpeckleContainerBuilder builder) | ||
| { | ||
| builder.AddAutofac(); | ||
| builder.AddConnectorUtils(); | ||
| builder.AddDUI(); | ||
| builder.AddDUIView(); | ||
|
|
||
| builder.AddSingleton<DocumentModelStore, ArcGISDocumentStore>(); | ||
|
|
||
| // Register bindings | ||
| builder.AddSingleton<IBinding, TestBinding>(); | ||
| builder.AddSingleton<IBinding, ConfigBinding>("connectorName", "ArcGIS"); // POC: Easier like this for now, should be cleaned up later | ||
| builder.AddSingleton<IBinding, AccountBinding>(); | ||
| builder.AddSingleton<IBinding, BasicConnectorBinding>(); | ||
| builder.AddSingleton<IBasicConnectorBinding, BasicConnectorBinding>(); | ||
| builder.AddSingleton<IBinding, ArcGISSelectionBinding>(); | ||
| builder.AddSingleton<IBinding, ArcGISSendBinding>(); | ||
| builder.AddSingleton<IBinding, ArcGISReceiveBinding>(); | ||
|
|
||
| builder.AddTransient<ISendFilter, ArcGISSelectionFilter>(); | ||
| builder.AddScoped<IHostObjectBuilder, HostObjectBuilder>(); | ||
| builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); | ||
|
|
||
| // register send operation and dependencies | ||
| builder.AddScoped<SendOperation>(); | ||
| builder.AddScoped<RootObjectBuilder>(); | ||
| } | ||
| } |
121 changes: 0 additions & 121 deletions
121
...X/Connectors/ArcGIS/Speckle.Connectors.ArcGIS3/DependencyInjection/AutofacArcGISModule.cs
This file was deleted.
Oops, something went wrong.
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
67 changes: 67 additions & 0 deletions
67
...rs/Autocad/Speckle.Connectors.AutocadShared/DependencyInjection/AutocadConnectorModule.cs
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,67 @@ | ||
| using Autodesk.AutoCAD.DatabaseServices; | ||
| using Speckle.Autofac; | ||
| using Speckle.Autofac.DependencyInjection; | ||
| using Speckle.Connectors.Autocad.Bindings; | ||
| using Speckle.Connectors.Autocad.Filters; | ||
| using Speckle.Connectors.Autocad.HostApp; | ||
| using Speckle.Connectors.Autocad.Interfaces; | ||
| using Speckle.Connectors.Autocad.Operations.Receive; | ||
| using Speckle.Connectors.Autocad.Operations.Send; | ||
| using Speckle.Connectors.Autocad.Plugin; | ||
| using Speckle.Connectors.DUI; | ||
| using Speckle.Connectors.DUI.Bindings; | ||
| using Speckle.Connectors.DUI.Models; | ||
| using Speckle.Connectors.DUI.Models.Card.SendFilter; | ||
| using Speckle.Connectors.DUI.WebView; | ||
| using Speckle.Connectors.Utils; | ||
| using Speckle.Connectors.Utils.Builders; | ||
| using Speckle.Connectors.Utils.Operations; | ||
| using Speckle.Converters.Autocad; | ||
| using Speckle.Converters.Common; | ||
| using Speckle.Core.Models.GraphTraversal; | ||
|
|
||
| namespace Speckle.Connectors.Autocad.DependencyInjection; | ||
|
|
||
| public class AutocadConnectorModule : ISpeckleModule | ||
| { | ||
| public void Load(SpeckleContainerBuilder builder) | ||
| { | ||
| builder.AddAutofac(); | ||
| builder.AddConnectorUtils(); | ||
| builder.AddDUI(); | ||
| builder.AddDUIView(); | ||
|
|
||
| // Register other connector specific types | ||
| builder.AddSingleton<IAutocadPlugin, AutocadPlugin>(); | ||
| builder.AddTransient<TransactionContext>(); | ||
| builder.AddSingleton(new AutocadDocumentManager()); // TODO: Dependent to TransactionContext, can be moved to AutocadContext | ||
| builder.AddSingleton<DocumentModelStore, AutocadDocumentStore>(); | ||
| builder.AddSingleton<AutocadContext>(); | ||
| builder.AddSingleton<AutocadLayerManager>(); | ||
| builder.AddSingleton<AutocadIdleManager>(); | ||
|
|
||
| // Operations | ||
| builder.AddScoped<SendOperation<(DBObject obj, string applicationId)>>(); | ||
| builder.AddSingleton(DefaultTraversal.CreateTraversalFunc()); | ||
|
|
||
| // Object Builders | ||
| builder.AddScoped<IHostObjectBuilder, HostObjectBuilder>(); | ||
| builder.AddSingleton<IRootObjectBuilder<(DBObject obj, string applicationId)>, RootObjectBuilder>(); | ||
|
|
||
| // Register bindings | ||
|
|
||
| builder.AddSingleton<IBinding, TestBinding>(); | ||
| builder.AddSingleton<IBinding, ConfigBinding>("connectorName", "Autocad"); // POC: Easier like this for now, should be cleaned up later | ||
| builder.AddSingleton<IBinding, AccountBinding>(); | ||
| builder.AddSingleton<IBinding, AutocadBasicConnectorBinding>(); | ||
| builder.AddSingleton<IBasicConnectorBinding, AutocadBasicConnectorBinding>(); | ||
| builder.AddSingleton<IBinding, AutocadSelectionBinding>(); | ||
| builder.AddSingleton<IBinding, AutocadSendBinding>(); | ||
| builder.AddSingleton<IBinding, AutocadReceiveBinding>(); | ||
|
|
||
| builder.AddSingleton<IHostToSpeckleUnitConverter<UnitsValue>, AutocadToSpeckleUnitConverter>(); | ||
|
|
||
| // register send filters | ||
| builder.AddTransient<ISendFilter, AutocadSelectionFilter>(); | ||
| } | ||
| } |
Oops, something went wrong.