diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-04-27 18:23:54 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2023-04-27 18:23:54 +0300 |
| commit | 19c3ce7f77cd4a78c5438db2d4385e5daaad4624 (patch) | |
| tree | ddbef98d8f9b54a90c6d2dad7bc69af1d3f5d24f /Software/Visual_Studio/PPC | |
| parent | 17ab19a3bf8d06b210bc6dc8d3af735a15b26df7 (diff) | |
| download | Tango-19c3ce7f77cd4a78c5438db2d4385e5daaad4624.tar.gz Tango-19c3ce7f77cd4a78c5438db2d4385e5daaad4624.zip | |
PPC. Added icons to Overview.
Diffstat (limited to 'Software/Visual_Studio/PPC')
13 files changed, 141 insertions, 65 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Error.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Error.png Binary files differnew file mode 100644 index 000000000..b9138f444 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Error.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder1.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder1.png Binary files differnew file mode 100644 index 000000000..bc33bb720 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder1.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder2.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder2.png Binary files differnew file mode 100644 index 000000000..aba3e3084 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder2.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder3.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder3.png Binary files differnew file mode 100644 index 000000000..1cd0e8026 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder3.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder4.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder4.png Binary files differnew file mode 100644 index 000000000..d3072f9ad --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Feeder4.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Inks.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Inks.png Binary files differnew file mode 100644 index 000000000..4e3bce00d --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Inks.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Normal.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Normal.png Binary files differnew file mode 100644 index 000000000..a562e9228 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Normal.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Sensors.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Sensors.png Binary files differnew file mode 100644 index 000000000..a47662545 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Sensors.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/UpdateInk.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/UpdateInk.png Binary files differnew file mode 100644 index 000000000..742121560 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/UpdateInk.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Warning.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Warning.png Binary files differnew file mode 100644 index 000000000..25f0d8de5 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Warning.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Waste.png b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Waste.png Binary files differnew file mode 100644 index 000000000..f12bfd7d4 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Images/Overview Icons/Waste.png diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj index ea6532b3d..d22ac9e74 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Tango.PPC.UI.csproj @@ -492,6 +492,7 @@ <DesignTimeSharedInput>True</DesignTimeSharedInput> </Compile> <Resource Include="Images\GlobalStatus\ready-to-dye.png" /> + <Resource Include="Images\Overview Icons\Sensors.png" /> <Resource Include="Images\user-profile.png" /> <Resource Include="Images\warning-test.png" /> <EmbeddedResource Include="Properties\Resources.resx"> @@ -585,6 +586,16 @@ <Resource Include="Images\Menu\Power_image.png" /> <Resource Include="Manifests\eureka.xml" /> <Resource Include="Icon.ico" /> + <Resource Include="Images\Overview Icons\Error.png" /> + <Resource Include="Images\Overview Icons\Feeder2.png" /> + <Resource Include="Images\Overview Icons\Feeder3.png" /> + <Resource Include="Images\Overview Icons\Inks.png" /> + <Resource Include="Images\Overview Icons\Feeder1.png" /> + <Resource Include="Images\Overview Icons\Normal.png" /> + <Resource Include="Images\Overview Icons\UpdateInk.png" /> + <Resource Include="Images\Overview Icons\Warning.png" /> + <Resource Include="Images\Overview Icons\Waste.png" /> + <Resource Include="Images\Overview Icons\Feeder4.png" /> <Content Include="Manifests\release.xml" /> <Content Include="Manifests\debug.xml" /> <None Include="firmware_package.tfp"> @@ -915,7 +926,7 @@ if $(ConfigurationName) == Debug "rc.exe" "$(TargetPath)" --set-version-string " </PropertyGroup> <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 diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml index f667593a7..433e08571 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/MachineStatusView.xaml @@ -152,14 +152,56 @@ </Path.Data> </Path> <Path Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/> - </Grid> - <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center"> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - </UniformGrid> - </Grid> + </Grid> + <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center"> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + </UniformGrid> + </Grid> + </DockPanel> + </DataTemplate> + + <DataTemplate x:Key="WasteBox"> + <DockPanel> + <TextBlock DockPanel.Dock="Bottom" Text="Waste" HorizontalAlignment="Center" Margin="0 8 0 0"></TextBlock> + <Grid> + <Grid ClipToBounds="True" HorizontalAlignment="Center"> + <Path Fill="#CCCCCC"> + <Path.Resources> + <sys:Double x:Key="RectWidth">30</sys:Double> + <sys:Double x:Key="RectHeight">88</sys:Double> + </Path.Resources> + <Path.Data> + <CombinedGeometry GeometryCombineMode="Intersect"> + <CombinedGeometry.Geometry1> + <StaticResource ResourceKey="InkContainerPath"/> + </CombinedGeometry.Geometry1> + <CombinedGeometry.Geometry2> + + <RectangleGeometry Rect="1,30 30,88"> + <!--<RectangleGeometry.Rect> + <MultiBinding Converter="{StaticResource MidTankLevelToElementRectConverter}"> + <Binding Source="{StaticResource RectHeight}"/> + <Binding Source="{StaticResource RectWidth}"/> + <Binding Path="Level" /> + </MultiBinding> + </RectangleGeometry.Rect>--> + </RectangleGeometry> + </CombinedGeometry.Geometry2> + </CombinedGeometry> + </Path.Data> + </Path> + <Path Stroke="Black" Fill="Transparent" StrokeThickness="1" Data="{StaticResource InkContainerPath}"/> + </Grid> + <UniformGrid Rows="4" Columns="1" Margin="0 15 0 15" HorizontalAlignment="Center"> + <Rectangle Stroke="Black" Width="10" Height="2" ></Rectangle> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + <Rectangle Width="10" Height="2" Stroke="Black"></Rectangle> + </UniformGrid> + </Grid> </DockPanel> </DataTemplate> @@ -774,7 +816,7 @@ <Grid Grid.Row="1" Margin="0 25 0 0"> <StackPanel Orientation="Vertical"> <StackPanel Orientation="Horizontal" > - <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> + <Image Source="../Images/Overview Icons/Sensors.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Sensors</TextBlock> </StackPanel> <UniformGrid Columns="5" Rows="1" Height="120" Margin="20 22 20 0"> @@ -829,46 +871,78 @@ <StackPanel Orientation="Horizontal" HorizontalAlignment="Center"> <StackPanel Orientation="Vertical"> <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}"> - <UniformGrid Columns="1" Rows="4" Margin="10"> - <touch:TouchRadioButton HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> + <UniformGrid Columns="1" Rows="4" Margin="24"> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" > + <!--<Image.Style> + <Style> + <Style.Triggers> + <DataTrigger Binding="{Binding Job.BTSR}}" Value="True"> + <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style>--> + </Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0">Winder</TextBlock> </StackPanel> <StackPanel Orientation="Vertical"> <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}"> - <UniformGrid Columns="1" Rows="4" Margin="0 16 0 0" VerticalAlignment="Center"> - <touch:TouchRadioButton HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> + <UniformGrid Columns="1" Rows="4" Margin="0 21 0 9" VerticalAlignment="Stretch"> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" > + <!--<Image.Style> + <Style> + <Style.Triggers> + <DataTrigger Binding="{Binding Job.BTSR}}" Value="True"> + <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style>--> + </Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> - <TextBlock HorizontalAlignment="Center" Margin="0 16 0 0">Dancer</TextBlock> + <TextBlock HorizontalAlignment="Center" Margin="14">Dancer</TextBlock> </StackPanel> <StackPanel Orientation="Vertical" Margin="274 0 0 0"> <Border Height="171" Width="95" VerticalAlignment="Center" CornerRadius="0" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}"> - <UniformGrid Columns="1" Rows="4" Margin="0 16 0 0" VerticalAlignment="Center"> - <touch:TouchRadioButton HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> + <UniformGrid Columns="1" Rows="4" Margin="0 21 0 9" VerticalAlignment="Stretch"> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" > + <!--<Image.Style> + <Style> + <Style.Triggers> + <DataTrigger Binding="{Binding Job.BTSR}}" Value="True"> + <Setter Property="Image.Source" Value="../Images/Overview Icons/Error.png"/> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style>--> + </Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="24" Height="24" Source="../Images/Overview Icons/Normal.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> <TextBlock HorizontalAlignment="Center" Margin="0 16 0 0">BTSR</TextBlock> </StackPanel> <StackPanel Orientation="Vertical"> <Border Height="184" Width="83" VerticalAlignment="Center" CornerRadius="2 0 0 2" BorderThickness="0" BorderBrush="{StaticResource TangoBlackInkBrush}"> - <UniformGrid Columns="1" Rows="4" Margin="10"> - <touch:TouchRadioButton HorizontalAlignment="Center" IsChecked="True"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> - <touch:TouchRadioButton HorizontalAlignment="Center"></touch:TouchRadioButton> + <UniformGrid Columns="1" Rows="4" Margin="24"> + <Image Stretch="Fill" Width="20" Height="24" Source="../Images/Overview Icons/Feeder1.png" HorizontalAlignment="Center" > + + </Image> + <Image Stretch="Fill" Width="20" Height="24" Source="../Images/Overview Icons/Feeder2.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="20" Height="24" Source="../Images/Overview Icons/Feeder3.png" HorizontalAlignment="Center" ></Image> + <Image Stretch="Fill" Width="20" Height="24" Source="../Images/Overview Icons/Feeder4.png" HorizontalAlignment="Center" ></Image> </UniformGrid> </Border> <TextBlock HorizontalAlignment="Center" Margin="0 4 0 0">Feeder</TextBlock> @@ -880,45 +954,36 @@ <Grid Grid.Row="2" x:Name="IncLevels" Margin="0 20 0 0"> <StackPanel Orientation="Vertical"> <DockPanel> - <StackPanel Orientation="Horizontal" DockPanel.Dock="Right" > - <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> + <StackPanel Orientation="Vertical" DockPanel.Dock="Right" Margin="0 0 30 0" > + <StackPanel Orientation="Horizontal" > + <Image Source="../Images/Overview Icons/Waste.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Waste</TextBlock> </StackPanel> + <StackPanel Orientation="Horizontal" Margin="-25 24 0 0"> + <Border Height="88" Width="2" CornerRadius="16" BorderThickness="2" BorderBrush="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="-20 0 0 0"/> + <ContentControl Margin="20 0 0 0" ContentTemplate="{StaticResource WasteBox}" Content="{Binding}" IsTabStop="False"/> + </StackPanel> + + </StackPanel> + <StackPanel Orientation="Vertical"> <StackPanel Orientation="Horizontal" > - <Image Source="../Images/Job Issues/job_length.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> + <Image Source="../Images/Overview Icons/Inks.png" Stretch="UniformToFill" VerticalAlignment="Top" HorizontalAlignment="Left" Width="32" Height="32"/> <TextBlock Margin="12 0 0 0 " VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="{StaticResource TangoComboBoxItemFontSize}">Ink Levels</TextBlock> </StackPanel> - </DockPanel> - <StackPanel Orientation="Horizontal" Margin="0 24 0 0"> - <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}"> - <ItemsControl.ItemsPanel> - <ItemsPanelTemplate> - <UniformGrid Rows="1" IsItemsHost="True" Width="580"></UniformGrid> - </ItemsPanelTemplate> - </ItemsControl.ItemsPanel> - </ItemsControl> - <!--<Border Height="88" Width="32" CornerRadius="16" BorderThickness="2" BorderBrush="RosyBrown"> - <Grid> - <Canvas Width="30" > - <Rectangle Canvas.Top="30" Fill="Cyan" Height="88" Width="32" > - <Rectangle.Clip> - <RectangleGeometry RadiusX="1" RadiusY="15" > - <RectangleGeometry.Rect> - <Rect Width="30" Height="20"></Rect> - </RectangleGeometry.Rect> - </RectangleGeometry> - </Rectangle.Clip> - </Rectangle> - </Canvas> - <UniformGrid Rows="4" Columns="1" Margin="1 15 1 15"> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - <Rectangle Width="10" Height="2" Fill="Black"></Rectangle> - </UniformGrid> - </Grid> - </Border>--> - </StackPanel> + <StackPanel Orientation="Horizontal" Margin="0 24 0 0"> + <ItemsControl ItemsSource="{Binding MidTankLevels}" ItemTemplate="{StaticResource LiquidBox}"> + <ItemsControl.ItemsPanel> + <ItemsPanelTemplate> + <UniformGrid Rows="1" IsItemsHost="True" Width="800"></UniformGrid> + </ItemsPanelTemplate> + </ItemsControl.ItemsPanel> + </ItemsControl> + + <Border Height="88" Width="2" CornerRadius="16" BorderThickness="2" BorderBrush="{StaticResource TangoColumnDividerBrush}" VerticalAlignment="Top" Margin="20 0 0 0"/> + </StackPanel> + </StackPanel> + </DockPanel> + </StackPanel> </Grid> </Grid> |
