aboutsummaryrefslogtreecommitdiffstats
path: root/Software
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2023-03-12 09:57:22 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2023-03-12 09:57:22 +0200
commitbf40501d42c26b3e4357800f57d4c19c09ae3788 (patch)
tree3f415b71c90158bd3e083b4e20c7f8fa5919b0dd /Software
parentdb70a09685898ab09e90106e2a37e818a54037bb (diff)
downloadTango-bf40501d42c26b3e4357800f57d4c19c09ae3788.tar.gz
Tango-bf40501d42c26b3e4357800f57d4c19c09ae3788.zip
VFT dialog Eureka. Added converter.
Diffstat (limited to 'Software')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml2
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/IsEurekaToBooleanConverter.cs32
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml1
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj3
4 files changed, 36 insertions, 2 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml
index b967ddec2..0e72c6aa0 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/Dialogs/VectorFineTuningDialog.xaml
@@ -15,7 +15,7 @@
mc:Ignorable="d"
Background="{StaticResource TangoMidBackgroundBrush}"
d:DesignHeight="1280" d:DesignWidth="800" Width="750" Height="1200"
- d:DataContext="{d:DesignInstance Type=vm:VectorFineTuningDialogVM, IsDesignTimeCreatable=False}" >
+ d:DataContext="{d:DesignInstance Type=vm:VectorFineTuningDialogVM, IsDesignTimeCreatable=False}" touch:TouchPanelEureka.MakeEurekaFullScreen="True">
<UserControl.Resources>
<ResourceDictionary>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/IsEurekaToBooleanConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/IsEurekaToBooleanConverter.cs
new file mode 100644
index 000000000..3596a86be
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/IsEurekaToBooleanConverter.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+using Tango.Core.DI;
+using Tango.PPC.Common.Build;
+
+namespace Tango.PPC.Common.Converters
+{
+ public class IsEurekaToBooleanConverter : IValueConverter
+ {
+ private static BuildType? _buildType = null;
+
+ public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ if (_buildType == null)
+ {
+ _buildType = TangoIOC.Default.GetInstance<IBuildProvider>().BuildType;
+ }
+
+ return _buildType == BuildType.Eureka;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+ {
+ throw new NotImplementedException();
+ }
+ }
+}
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
index 780941f66..6c8afc57a 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml
@@ -71,6 +71,7 @@
<converters:IsToStringEqualToVisibilityConverter x:Key="IsToStringEqualToVisibilityConverter" />
<localConverter:EventTypeDescriptionConverter x:Key="EventTypeDescriptionConverter" />
<localConverter:EventTypeTitleConverter x:Key="EventTypeTitleConverter" />
+ <localConverter:IsEurekaToBooleanConverter x:Key="IsEurekaToBooleanConverter" />
<Style TargetType="FrameworkElement">
<Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
index 3c012fa87..ede8bad33 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj
@@ -160,6 +160,7 @@
<Compile Include="Converters\EventTypeDescriptionConverter.cs" />
<Compile Include="Converters\EventTypeTitleConverter.cs" />
<Compile Include="Converters\HeightToOpacityConverter.cs" />
+ <Compile Include="Converters\IsEurekaToBooleanConverter.cs" />
<Compile Include="DataStore\DefaultDataStoreService.cs" />
<Compile Include="DataStore\IDataStoreService.cs" />
<Compile Include="ExtensionMethods\IListExtensions.cs" />
@@ -592,7 +593,7 @@
</Target>
<ProjectExtensions>
<VisualStudio>
- <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+ <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
</VisualStudio>
</ProjectExtensions>
</Project> \ No newline at end of file