diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-06-05 09:22:07 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-06-05 09:22:07 +0300 |
| commit | 9252f2bd838398029109afcd2e22e9c784e0800d (patch) | |
| tree | 17db539a99eb81e69bf6fd1f7adcae40412722ce /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI | |
| parent | 49c88c7833ac3b179e8c59af11ffd3275d08bc1e (diff) | |
| parent | ac0a8a7715360263973fda940f9138cf7d5141d7 (diff) | |
| download | Tango-9252f2bd838398029109afcd2e22e9c784e0800d.tar.gz Tango-9252f2bd838398029109afcd2e22e9c784e0800d.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI')
3 files changed, 19 insertions, 7 deletions
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config index d51ecc2bb..004400788 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.config @@ -15,6 +15,15 @@ <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" /> </providers> </entityFramework> + + <system.data> + <DbProviderFactories> + <remove invariant="System.Data.SQLite.EF6" /> + <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" /> + <remove invariant="System.Data.SQLite" /> + <add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /> + </DbProviderFactories> + </system.data> <runtime> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> @@ -72,9 +81,4 @@ </dependentAssembly> </assemblyBinding> </runtime> -<system.data> - <DbProviderFactories> - <remove invariant="System.Data.SQLite.EF6" /> - <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" /> - <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories> - </system.data></configuration>
\ No newline at end of file +</configuration>
\ No newline at end of file diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs index 568529534..2cc23f9e6 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/App.xaml.cs @@ -21,6 +21,7 @@ using Tango.MachineStudio.Common.Notifications; using Tango.MachineStudio.UI.ViewModels; using Tango.MachineStudio.UI.Views; using Tango.MachineStudio.Common; +using Tango.Core; namespace Tango.MachineStudio.UI { @@ -34,6 +35,13 @@ namespace Tango.MachineStudio.UI protected override void OnStartup(StartupEventArgs e) { + +#if DEBUG + CoreSettings.DefaultDataBaseSource = "localhost\\SQLEXPRESS"; +#else + CoreSettings.DefaultDataBaseSource = "twine01\\SQLTWINE"; +#endif + LogManager.RegisterLogger(new VSOutputLogger()); LogManager.RegisterLogger(new FileLogger()); diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs index 4fcebe3dd..3cd3fb5f9 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs @@ -48,7 +48,7 @@ namespace Tango.MachineStudio.UI.ViewModels public MachineConnectionViewVM(ExternalBridgeScanner scanner) { Scanner = scanner; - ConnectCommand = new RelayCommand(Connect,(x) => SelectedMachine != null); + ConnectCommand = new RelayCommand(Connect, (x) => SelectedMachine != null); } /// <summary> |