Started working on Test Studio...

Machine Studio v3.4.42

5 files changed, 23 insertions, 8 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
index 44b2ed401..6c55f6c5e 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml
@@ -10,11 +10,11 @@
         mc:Ignorable="d"
         Title="Tango" Height="800" Width="1280" Foreground="#494949" BorderThickness="1" BorderBrush="{StaticResource AccentColorBrush}">
 
-    <Grid>
+    <Grid x:Name="main_grid">
         <Grid.Background>
             <ImageBrush ImageSource="/Images/White-Abstract.png" Stretch="Fill"></ImageBrush>
         </Grid.Background>
-        <Viewbox Stretch="Fill">
+        <!--<Viewbox Stretch="None" x:Name="viewbox">-->
             <Grid x:Name="grid" Width="1920" Height="1100">
                 <Grid>
                     <sharedControls:NavigationControl TransitionAlwaysFades="True" TransitionType="Zoom" x:Name="NavigationControl" x:FieldModifier="public">
@@ -30,6 +30,6 @@
                     </Grid>
                 </Grid>
             </Grid>
-        </Viewbox>
+        <!--</Viewbox>-->
     </Grid>
 </mahapps:MetroWindow>
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
index f0f93a867..9989aa091 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs
@@ -31,6 +31,7 @@ namespace Tango.MachineStudio.UI
     {
         public static MainWindow Instance { get; set; }
         private LogManager LogManager = LogManager.Default;
+        private bool _is_testing;
 
         public MainWindow()
         {
@@ -40,6 +41,17 @@ namespace Tango.MachineStudio.UI
             {
                 InitializeComponent();
 
+                _is_testing = TestHelper.IsRunningUnderTestStudio();
+
+                if (!_is_testing)
+                {
+                    Viewbox box = new Viewbox();
+                    box.Stretch = Stretch.Fill;
+                    main_grid.Children.Remove(grid);
+                    box.Child = grid;
+                    main_grid.Children.Add(box);
+                }
+
                 WindowStartupLocation = WindowStartupLocation.Manual;
 
                 var r = SettingsManager.Default.GetOrCreate<MachineStudioSettings>().LastBounds;
@@ -52,7 +64,7 @@ namespace Tango.MachineStudio.UI
                 Instance = this;
                 ThreadsHelper.SetDisptacher(Dispatcher);
 
-                Closing += MainWindow_Closing; 
+                Closing += MainWindow_Closing;
             }
             catch (Exception ex)
             {
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
index 2e1844850..6ffcf96b5 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@ using System.Runtime.InteropServices;
 
 [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)]
 [assembly: AssemblyTitle("Tango - Machine Studio")]
-[assembly: AssemblyVersion("3.4.41.18238")]
+[assembly: AssemblyVersion("3.4.42.18238")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
index 3cab71602..5a646e9c0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Tango.MachineStudio.UI.csproj
@@ -512,7 +512,10 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
-    <PostBuildEvent>$(SolutionDir)Build\Utilities\Debug\linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Machine Studio.lnk"
+    <PostBuildEvent>call "$(DevEnvDir)..\..\vc\vcvarsall.bat" x86
+"$(DevEnvDir)..\..\vc\bin\EditBin.exe" "$(TargetPath)"  /LARGEADDRESSAWARE
+
+$(SolutionDir)Build\Utilities\Debug\linkgen.exe -s "$(TargetPath)" -d "$(SolutionDir)Build\Shortcuts\Machine Studio.lnk"
 
 RD /S /Q "$(TargetDir)cs\"
 RD /S /Q "$(TargetDir)da\"
@@ -576,7 +579,7 @@ copy /Y "$(SolutionDir)Referenced Assemblies\Microsoft.WITDataStore32.dll" "$(Ta
   </Target>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_UseGlobalSettings="False" BuildVersion_DetectChanges="True" BuildVersion_UpdateFileVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_BuildVersioningStyle="None.None.Increment.DeltaBaseYearDayOfYear" BuildVersion_UpdateFileVersion="True" BuildVersion_DetectChanges="True" BuildVersion_UseGlobalSettings="False" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
index 55c4edc91..6d47e8191 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Views/AboutView.xaml
@@ -50,7 +50,7 @@
                             <TextBlock FontWeight="SemiBold">Build Date:</TextBlock>
                             <TextBlock Text="{Binding ApplicationManager.BuildDate,Mode=OneWay}"></TextBlock>
                             <TextBlock FontWeight="SemiBold">Data Source:</TextBlock>
-                            <TextBlock Text="{Binding Settings.DataBaseSource,Mode=OneWay}"></TextBlock>
+                            <TextBlock Text="{Binding Settings.DataSource.Address,Mode=OneWay}"></TextBlock>
                         </controls:TableGrid>
 
                         <DockPanel>