diff options
| author | Mirta <mirta@twine-s.com> | 2021-04-19 17:59:52 +0300 |
|---|---|---|
| committer | Mirta <mirta@twine-s.com> | 2021-04-19 17:59:52 +0300 |
| commit | 9cb29ab4e21baccfa08781f3755438749e25b4e7 (patch) | |
| tree | 51764bb5805f17542bbc1108e563dc12ab531d9a /Software/Visual_Studio/PPC | |
| parent | b8a51d8cd2e5e57e489922cece83ae2c97ea7881 (diff) | |
| parent | 84407a4a05344d13076f970ff62d6660d7504231 (diff) | |
| download | Tango-9cb29ab4e21baccfa08781f3755438749e25b4e7.tar.gz Tango-9cb29ab4e21baccfa08781f3755438749e25b4e7.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio/PPC')
5 files changed, 22 insertions, 17 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs b/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs index e50e5cb6e..0bf54e07e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.DataSynchronizer.CLI/Program.cs @@ -21,6 +21,16 @@ namespace Tango.PPC.DataSynchronizer.CLI public class DataSynchronizer { + private const String REMOTE_ADDRESS = "twine.database.windows.net"; + private const String REMOTE_CATALOG = "Tango_DEV"; //Tango_TEST + private const String REMOTE_USER_NAME = "Roy"; + private const String REMOTE_PASSWORD = "Aa123456"; + + private const String LOCAL_ADDRESS = "localhost\\SQLPPC"; + private const String LOCAL_CATALOG = "Tango"; //Tango_TEST + + private const String MACHINE_SERIAL_NUMBER = "LENA_TABLET"; //ROY_TEST_MACHINE + private Core.DataSource source; private Core.DataSource target; private String machineGuid; @@ -33,19 +43,19 @@ namespace Tango.PPC.DataSynchronizer.CLI source = new Core.DataSource(); source.IntegratedSecurity = false; - source.Address = "twine.database.windows.net"; - source.Catalog = "Tango_DEV"; - source.UserName = "Roy"; - source.Password = "Aa123456"; + source.Address = REMOTE_ADDRESS; + source.Catalog = REMOTE_CATALOG; + source.UserName = REMOTE_USER_NAME; + source.Password = REMOTE_PASSWORD; using (ObservablesContext db = ObservablesContext.CreateDefault(source)) { - machineGuid = db.Machines.Where(x => x.SerialNumber == "LENA_TABLET").Take(1).Select(x => x.Guid).First(); + machineGuid = db.Machines.Where(x => x.SerialNumber == MACHINE_SERIAL_NUMBER).Take(1).Select(x => x.Guid).First(); } target = new Core.DataSource(); - target.Address = "localhost\\SQLPPC"; - target.Catalog = "Tango"; + target.Address = LOCAL_ADDRESS; + target.Catalog = LOCAL_CATALOG; OverrideData(); UpdateMachine(); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs index 04a82803f..f5b234a45 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs @@ -7,5 +7,5 @@ using System.Windows; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("Tango PPC Application")] -[assembly: AssemblyVersion("1.4.8.0")] +[assembly: AssemblyTitle("Tango PPC Application")] +[assembly: AssemblyVersion("1.4.10.0")] diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs index ae31a64a1..cce7d277b 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineSetupViewVM.cs @@ -238,11 +238,6 @@ namespace Tango.PPC.UI.ViewModels /// <param name="e">The <see cref="EventArgs"/> instance containing the event data.</param> private void ApplicationManager_SetupRequired(object sender, EventArgs e) { - if (!LogManager.Categories.Contains(LogCategory.Debug)) - { - LogManager.Categories.Add(LogCategory.Debug); - } - var logger = new SimpleStringLogger(); logger.Categories.Remove(LogCategory.Debug); LogManager.RegisterLogger(logger); diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index f00d1e198..ff35fb059 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -286,7 +286,7 @@ <TextBlock Margin="0 10 0 0" Text="{Binding MachineProvider.MachineOperator.Status,Converter={StaticResource EnumToDescriptionConverter}}"></TextBlock> </StackPanel> - <Grid IsHitTestVisible="False"> + <Grid IsHitTestVisible="False" HorizontalAlignment="Center"> <Grid.Style> <Style TargetType="Grid"> <Setter Property="Visibility" Value="Hidden"></Setter> @@ -300,7 +300,7 @@ </Style.Triggers> </Style> </Grid.Style> - <touch:TouchIcon Icon="LightningBoltOutline" Foreground="#151515" Width="24" Height="24" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 3 20 0"></touch:TouchIcon> + <touch:TouchIcon Icon="LightningBoltOutline" Foreground="#151515" Width="24" Height="24" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 3 -35 0"></touch:TouchIcon> </Grid> </Grid> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index efc5f8179..d72e75011 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> + <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> </requestedPrivileges> </security> </trustInfo> |