From 7c3b50dd0a348c68221f3cb99b52686c653787db Mon Sep 17 00:00:00 2001
From: d23004 <kimseijin@diteam.co.kr>
Date: 수, 24 5월 2023 13:34:42 +0900
Subject: [PATCH] Revert "Main gui 개선"
---
SA_LTT_UI/SA_LTT_UI/Screen/AnimationEquipment.xaml | 203 +++++++++++++-------------------------------------
1 files changed, 55 insertions(+), 148 deletions(-)
diff --git a/SA_LTT_UI/SA_LTT_UI/Screen/AnimationEquipment.xaml b/SA_LTT_UI/SA_LTT_UI/Screen/AnimationEquipment.xaml
index 0b7fae9..f8cc404 100644
--- a/SA_LTT_UI/SA_LTT_UI/Screen/AnimationEquipment.xaml
+++ b/SA_LTT_UI/SA_LTT_UI/Screen/AnimationEquipment.xaml
@@ -4,71 +4,27 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:SA_LTT_UI.Screen"
- mc:Ignorable="d" Height="407" Width="726">
-
- <Canvas Name="MainFrame" Background="#E4E4E5">
- <Canvas Height="407" Canvas.Left="200" Width="525" >
- <Image x:Name="Status_PMC_Complete" Source="/Resources/Wafer_Legend/Wafer_Legend_Complete.png" Width="525" Canvas.Left="1" Visibility="Visible"/>
- <Image x:Name="Status_PMC_Empty" Source="/Resources/Wafer_Legend/Wafer_Legend_Empty.png" Width="525" Canvas.Left="1" Visibility="Collapsed"/>
- <Image x:Name="Status_PMC_Exist" Source="/Resources/Wafer_Legend/Wafer_Legend_Exist.png" Width="525" Canvas.Left="1" Visibility="Collapsed"/>
- <Image x:Name="Status_PMC_Leaning" Source="/Resources/Wafer_Legend/Wafer_Legend_Leaning.png" Width="525" Canvas.Left="1" Visibility="Collapsed"/>
- <Image x:Name="Status_PMC_NotInit" Source="/Resources/Wafer_Legend/Wafer_Legend_Overlap.png" Width="525" Canvas.Left="1" Visibility="Collapsed"/>
- </Canvas>
-
- <Grid Background="#E4E4E5" Width="200" Height="67" VerticalAlignment="Top" HorizontalAlignment="Left" >
- <Border BorderBrush="#7998AE" BorderThickness="7" CornerRadius="8" Height="67" VerticalAlignment="Top">
- <Grid>
- <TextBlock Text="Alianer" Foreground="Black" FontWeight="Bold" FontSize="15" Margin="30,3,0,0" FontFamily="Roboto"/>
- <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Width="127" Margin="0,15,0,0">
- <Label Content="1" Height="20" Width="20" FontFamily="Roboto" FontSize="10" FontWeight="Bold" Background="#23395E" Foreground="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"/>
- <Rectangle Fill="White" Height="20" Stroke="#23395E" Width="100" Margin="7,8"/>
- </StackPanel>
- </Grid>
- </Border>
- </Grid>
-
- <Canvas Height="14" Canvas.Left="230" Canvas.Top="197" Width="466" VerticalAlignment="Center">
- <TextBlock Text="X : mm" FontSize="12" Margin="0,20,0,0" FontFamily="Roboto"/>
- <Border Background="Silver" Height="14" Width="466" VerticalAlignment="Center" BorderBrush="Black" BorderThickness="2" CornerRadius="7">
- <StackPanel Orientation="Horizontal" Margin="5,0,0,0">
- <Ellipse Fill="Black" Height="8" Width="8" Margin="35,0,0,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="40,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="40,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="40,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,0" VerticalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="40,0" VerticalAlignment="Center"/>
-
- </StackPanel>
- </Border>
- <Canvas x:Name="Motor_Y" Height="346" Canvas.Left="409" Canvas.Top="-165" Width="14">
- <Canvas>
- <TextBlock Text="Y : mm" Margin="23,0,0,0" FontFamily="Roboto"/>
- <Border Height="345" Width="14" BorderBrush="Black" Background="Silver" BorderThickness="2" CornerRadius="7" Canvas.Top="1">
- <StackPanel Orientation="Vertical" Margin="0,0,0,-2">
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,21,0,0" HorizontalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,40" HorizontalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,0" HorizontalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,40" HorizontalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,0" HorizontalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,40" HorizontalAlignment="Center"/>
- <Ellipse Fill="Black" Height="8" Width="8" Margin="0,0" HorizontalAlignment="Center"/>
- </StackPanel>
- </Border>
- </Canvas>
-
- <Canvas x:Name="Chamber" Height="100" Canvas.Left="-43" Canvas.Bottom="0" Width="100" Canvas.Top="246" RenderTransformOrigin="0.545,0.503" Cursor="Hand">
+ mc:Ignorable="d"
+ d:DesignHeight="700" d:DesignWidth="1000">
+ <Canvas Name="MainFrame" Background="White">
+ <Rectangle Height="546" Stroke="Black" Width="700" Fill="SlateGray" Canvas.Top="154" Canvas.Left="302"/>
+ <Canvas Height="105" Canvas.Left="306" Canvas.Top="353" Width="683">
+ <Rectangle Fill="Silver" Height="105" Stroke="Black" Width="684"/>
+ <Canvas Name="Motor_Y" Height="531" Canvas.Left="540" Canvas.Top="-188" Width="105">
+ <Rectangle Fill="Silver" Height="521" Stroke="Black" Width="105" Canvas.Top="10"/>
+ <Canvas x:Name="Chamber" Height="170" Canvas.Left="-39" Canvas.Bottom="0" Width="180" Canvas.Top="360" RenderTransformOrigin="0.545,0.503" Cursor="Hand">
<Canvas.Background>
- <ImageBrush ImageSource="../Resources/Chamber_SA.png"/>
+ <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Chamber.png"/>
</Canvas.Background>
- <!--door-->
- <Rectangle x:Name="ChamberGate" Fill="Black" Height="72" Width="14" Canvas.Left="-14" Canvas.Top="14" Visibility="Visible"/>
- <Canvas x:Name="ChamberWafer" Height="71" Width="71" Canvas.Top="14" RenderTransformOrigin="0.5,0.5" Canvas.Left="15">
- <Ellipse x:Name="ChamberWaferStatus" Fill="#00D1DF" Height="71" Stroke="Black" Width="71"/>
- <TextBlock x:Name="ChamberWaferSourceName" Canvas.Left="24" TextWrapping="Wrap" Text="A1" Canvas.Top="24" Height="30" TextAlignment="Center" FontSize="20" FontFamily="Roboto" FontWeight="Bold" LineHeight="22" RenderTransformOrigin="-0.714,0.367"/>
+ <Ellipse Fill="#FFF3DCC6" Height="5" Canvas.Left="82" Canvas.Top="56" Width="5"/>
+ <Ellipse Fill="#FFF3DCC6" Height="5" Canvas.Left="82" Canvas.Top="108" Width="5"/>
+ <Ellipse Fill="#FFF3DCC6" Height="5" Canvas.Left="126" Canvas.Top="81" Width="5"/>
+ <Rectangle Name="ChamberGate" Fill="White" Height="135" Width="18" Canvas.Left="5" Canvas.Top="18"/>
+ <Canvas Name="ChamberWafer" Height="77" Width="78" Canvas.Top="47" RenderTransformOrigin="0.5,0.5" Canvas.Left="63">
+ <Ellipse Name="ChamberWaferStatus" Fill="Silver" Height="77" Stroke="Black" Width="78"/>
+ <TextBlock Name="ChamberWaferSourceName" Canvas.Left="23" TextWrapping="Wrap" Text="A1" Canvas.Top="22" Height="30" TextAlignment="Center" FontSize="22" LineHeight="22"/>
</Canvas>
- <Slider x:Name="LiftPin" Canvas.Left="80" Canvas.Top="81" Width="40" RenderTransformOrigin="0.5,0.5" Minimum="0" Maximum="1" IsEnabled="False" SmallChange="1" Visibility="Collapsed">
+ <Slider x:Name="LiftPin" Canvas.Left="120" Canvas.Top="79" Width="56" RenderTransformOrigin="0.5,0.5" Minimum="0" Maximum="1" IsEnabled="False" SmallChange="1">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
@@ -81,103 +37,57 @@
</Canvas>
</Canvas>
</Canvas>
-
- <Canvas Height="239" Width="200" Background="#E4E4E5" Canvas.Top="68">
- <Image x:Name="Status_TMC_Complete" Source="../Resources/Wafer_Legend/Wafer_Legend_Complete2.png" Visibility="Visible" Width="200" Height="239" />
- <Image x:Name="Status_TMC_Empty" Source="../Resources/Wafer_Legend/Wafer_Legend_Empty2.png" Visibility="Collapsed" Width="310" Height="462" />
- <Image x:Name="Status_TMC_Exist" Source="../Resources/Wafer_Legend/Wafer_Legend_Exist2.png" Visibility="Collapsed" Width="310" Height="462"/>
- <Image x:Name="Status_TMC_Leaning" Source="../Resources/Wafer_Legend/Wafer_Legend_Leaning2.png" Visibility="Collapsed" Width="310" Height="462" />
- <Image x:Name="Status_TMC_Overlap" Source="../Resources/Wafer_Legend/Wafer_Legend_Overlap2.png" Visibility="Collapsed" Width="310" Height="462" />
- <!--door-->
- <Rectangle Height="120" Width="14" Fill="Black" Canvas.Left="186" Canvas.Top="76" Visibility="Visible"/>
- </Canvas>
-
-
-
- <Canvas x:Name="PreAlignerBody" Height="124" Canvas.Left="-212" Canvas.Top="188" Width="126" Cursor="Hand">
+ <Rectangle Height="154" Stroke="Black" Width="304" Fill="BurlyWood"/>
+ <Rectangle Height="154" Stroke="Black" Width="697" Fill="BurlyWood" Canvas.Left="303"/>
+ <Rectangle Height="546" Stroke="Black" Width="304" Fill="SlateGray" Canvas.Top="154" Canvas.Left="-1"/>
+ <Canvas Name="PreAlignerBody" Height="124" Canvas.Left="100" Canvas.Top="154" Width="126" Cursor="Hand">
<Rectangle Height="124" Stroke="Black" Width="126" Cursor="Hand">
<Rectangle.Fill>
<ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Aligner.png"/>
</Rectangle.Fill>
</Rectangle>
<Canvas x:Name="PreAlignerWafer" Height="77" Width="78" Canvas.Top="58" RenderTransformOrigin="0.5,0.5" Canvas.Left="24">
- <Ellipse x:Name="PreAlignerWaferStatus" Fill="#00D1DF" Height="77" Stroke="Black" Width="77" Canvas.Top="-1"/>
- <TextBlock x:Name="PreAlignerWaferSourceName" Canvas.Left="23" TextWrapping="Wrap" Text="A1" Height="30" TextAlignment="Center" FontSize="22" LineHeight="22" RenderTransformOrigin="1.748,-1.4" Canvas.Top="21"/>
+ <Ellipse Name="PreAlignerWaferStatus" Fill="Silver" Height="77" Stroke="Black" Width="78"/>
+ <TextBlock x:Name="PreAlignerWaferSourceName" Canvas.Left="23" TextWrapping="Wrap" Text="A1" Canvas.Top="22" Height="30" TextAlignment="Center" FontSize="22" LineHeight="22"/>
</Canvas>
- <Rectangle x:Name="IsAlignRun" Height="16" Canvas.Left="88" Canvas.Top="10" Width="28" Fill="Red"/>
+ <Rectangle x:Name="IsAlignRun" Height="16" Canvas.Left="75" Canvas.Top="15" Width="28" Fill="Red"/>
</Canvas>
-
-
- <Rectangle x:Name="Door1" Height="195" Canvas.Top="357" Width="10" Fill="Red" Canvas.Left="-2" Visibility="Collapsed"/>
- <Rectangle x:Name="Door2" Height="10" Canvas.Top="690" Width="299" Fill="Red" Visibility="Collapsed"/>
- <Rectangle x:Name="Door3" Height="10" Canvas.Left="309" Canvas.Top="690" Width="680" Fill="Red" Visibility="Collapsed"/>
- <Rectangle x:Name="Door4" Height="534" Canvas.Left="989" Canvas.Top="156" Width="12" Fill="Red" Visibility="Collapsed"/>
- <Rectangle x:Name="DoorCP" Height="10" Canvas.Left="305" Width="694" Fill="Red" Visibility="Collapsed"/>
-
-
- <Canvas x:Name="RobotBody" Height="75" Canvas.Top="151" Width="75" Cursor="Hand" Canvas.Left="63">
+ <Rectangle Fill="BurlyWood" Height="170" Canvas.Left="15" Stroke="Black" Canvas.Top="516" Width="276"/>
+ <Rectangle x:Name="Door1" Height="195" Canvas.Top="357" Width="10" Fill="Red" Canvas.Left="-2"/>
+ <Rectangle x:Name="Door2" Height="10" Canvas.Top="690" Width="299" Fill="Red"/>
+ <Rectangle x:Name="Door3" Height="10" Canvas.Left="309" Canvas.Top="690" Width="680" Fill="Red"/>
+ <Rectangle x:Name="Door4" Height="534" Canvas.Left="989" Canvas.Top="156" Width="12" Fill="Red"/>
+ <Rectangle Name="DoorCP" Height="10" Canvas.Left="305" Width="694" Fill="Red"/>
+ <Canvas Name="RobotBody" Height="125" Canvas.Left="99" Canvas.Top="344" Width="126" Cursor="Hand">
<Canvas.Background>
- <ImageBrush ImageSource="../Resources/Robot_Body_SA.png"/>
+ <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Robot_Body.png"/>
</Canvas.Background>
- <Canvas x:Name="Robot" Height="50" Canvas.Left="12" Canvas.Top="12" Width="50" RenderTransformOrigin="0.5,0.5">
- <Canvas x:Name="RobotArm1" Height="24" Width="80" RenderTransformOrigin="0.182,0.485" Canvas.Left="11" Canvas.Top="14">
- <Canvas.RenderTransform>
- <TransformGroup>
- <ScaleTransform/>
- <SkewTransform/>
- <RotateTransform Angle="-25.359"/>
- <TranslateTransform/>
- </TransformGroup>
- </Canvas.RenderTransform>
+ <Canvas Name="Robot" Height="50" Canvas.Left="38" Canvas.Top="38" Width="50" RenderTransformOrigin="0.5,0.5">
+ <Canvas x:Name="RobotArm1" Height="38" Width="114" RenderTransformOrigin="0.182,0.485" Canvas.Left="4" Canvas.Top="6">
<Canvas.Background>
- <ImageBrush ImageSource="../Resources/Robot_Arm1_SA.png"/>
+ <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Robot_Arm1.png"/>
</Canvas.Background>
- <Canvas x:Name="RobotArm2" Height="24" Width="80" RenderTransformOrigin="0.787,0.49" Canvas.Top="-4" Canvas.Left="3">
- <Canvas.RenderTransform>
- <TransformGroup>
- <ScaleTransform/>
- <SkewTransform/>
- <RotateTransform Angle="57.842"/>
- <TranslateTransform/>
- </TransformGroup>
- </Canvas.RenderTransform>
+ <Canvas x:Name="RobotArm2" Height="34" Width="87" RenderTransformOrigin="0.787,0.49" Canvas.Left="28" Canvas.Top="2">
<Canvas.Background>
- <ImageBrush ImageSource="../Resources/Robot_Arm1_SA.png"/>
+ <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Robot_Arm2.png"/>
</Canvas.Background>
</Canvas>
</Canvas>
- <Canvas x:Name="RobotHand" Height="102" Canvas.Top="-40" Width="46" RenderTransformOrigin="0.529,0.872" Canvas.Left="2">
+ <Canvas x:Name="RobotHand" Height="171" Canvas.Top="-9" Width="78" RenderTransformOrigin="0.529,0.872" Canvas.Left="-14">
<Canvas.Background>
- <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Robot_Arm_Hand_SA.png"/>
+ <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Robot_Arm.png"/>
</Canvas.Background>
- <Canvas x:Name="RobotWafer" Height="71" Width="71" Canvas.Top="72" RenderTransformOrigin="0.5,0.5" Canvas.Left="-12">
- <Ellipse x:Name="RobotWaferStatus" Fill="#00D1DF" Height="71" Stroke="Black" Width="71"/>
- <TextBlock x:Name="RobotWaferSourceName" Canvas.Left="24" TextWrapping="Wrap" Text="A1" Canvas.Top="23" Height="30" TextAlignment="Center" FontSize="20" FontWeight="Bold" LineHeight="22" FontFamily="Roboto"/>
+ <Canvas Name="RobotWafer" Height="77" Width="78" Canvas.Top="115" RenderTransformOrigin="0.5,0.5">
+ <Ellipse Name="RobotWaferStatus" Fill="Silver" Height="77" Stroke="Black" Width="78"/>
+ <TextBlock Name="RobotWaferSourceName" Canvas.Left="23" TextWrapping="Wrap" Text="A1" Canvas.Top="22" Height="30" TextAlignment="Center" FontSize="22" LineHeight="22"/>
</Canvas>
</Canvas>
</Canvas>
</Canvas>
-
- <Grid Background="#E4E4E5" Height="100" Width="200" VerticalAlignment="Bottom" Canvas.Top="307">
- <Border BorderBrush="#7998AE" BorderThickness="7" CornerRadius="8" Height="98" VerticalAlignment="Top" Margin="0,2,101,0">
- <Canvas x:Name="Port1" Height="66" Canvas.Left="19" Canvas.Top="324" Width="62" Cursor="Hand" Margin="12,9,11,9">
- <Canvas.Background>
- <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Port_image.png"/>
- </Canvas.Background>
- </Canvas>
- </Border>
- <Border BorderBrush="#7998AE" BorderThickness="7" CornerRadius="8" Height="98" VerticalAlignment="Top" Margin="101,2,0,0">
- <Canvas x:Name="Port2" Height="66" Canvas.Left="120" Canvas.Top="324" Width="62" Cursor="Hand" Margin="12,9,11,9">
- <Canvas.Background>
- <ImageBrush ImageSource="pack://siteoforigin:,,,/Resources/Port_image.png"/>
- </Canvas.Background>
- </Canvas>
-
- </Border>
- </Grid>
-
- <Slider x:Name="RobotZ" Canvas.Left="-36" Canvas.Top="223" Width="121" RenderTransformOrigin="0.5,0.5" Minimum="5" Maximum="244" IsEnabled="False" SmallChange="0.01" Visibility="Collapsed">
+ <Canvas Name="Port1" Background="BurlyWood" Height="156" Canvas.Left="30" Canvas.Top="523" Width="113" Cursor="Hand"/>
+ <Canvas Name="Port2" Background="BurlyWood" Height="156" Canvas.Left="161" Canvas.Top="523" Width="113" Cursor="Hand"/>
+ <Slider Name="RobotZ" Canvas.Left="18" Canvas.Top="398" Width="121" RenderTransformOrigin="0.5,0.5" Minimum="5" Maximum="244" IsEnabled="False" SmallChange="0.01">
<Slider.RenderTransform>
<TransformGroup>
<ScaleTransform/>
@@ -187,20 +97,17 @@
</TransformGroup>
</Slider.RenderTransform>
</Slider>
-
- <Canvas x:Name="UVLaser" Height="70" Canvas.Left="565" Canvas.Top="323" Width="160" Cursor="Hand" Visibility="Collapsed">
- <Rectangle Fill="#FFF4F4F5" Height="70" Stroke="Black" Width="160"/>
- <TextBlock x:Name="textBlock" Canvas.Left="28" TextWrapping="Wrap" Text="UV Laser" Canvas.Top="18" FontSize="25"/>
+ <Canvas Name="UVLaser" Height="99" Canvas.Left="732" Canvas.Top="32" Width="255" Cursor="Hand">
+ <Rectangle Fill="#FFF4F4F5" Height="99" Stroke="Black" Width="255"/>
+ <TextBlock x:Name="textBlock" Canvas.Left="80" TextWrapping="Wrap" Text="UV Laser" Canvas.Top="32" FontSize="25"/>
</Canvas>
- <Canvas x:Name="Scanner" Height="70" Canvas.Left="209" Canvas.Top="323" Width="160" Cursor="Hand" Visibility="Collapsed">
- <Rectangle Fill="#FFF4F4F5" Height="70" Stroke="Black" Width="160" Canvas.Left="-1"/>
- <TextBlock x:Name="textBlock1" Canvas.Left="36" TextWrapping="Wrap" Text="Scanner" Canvas.Top="19" FontSize="25"/>
+ <Canvas Name="Scanner" Height="90" Canvas.Left="337" Canvas.Top="37" Width="197" Cursor="Hand">
+ <Rectangle Fill="#FFF4F4F5" Height="90" Stroke="Black" Width="197"/>
+ <TextBlock x:Name="textBlock1" Canvas.Left="55" TextWrapping="Wrap" Text="Scanner" Canvas.Top="27" FontSize="25"/>
</Canvas>
- <Canvas x:Name="Attenuator" Height="70" Canvas.Left="387" Canvas.Top="323" Width="160" Cursor="Hand" Visibility="Collapsed">
- <Rectangle Fill="#FFF4F4F5" Height="70" Stroke="Black" Width="160" Canvas.Left="1"/>
- <TextBlock x:Name="textBlock2" Canvas.Left="22" TextWrapping="Wrap" Text="Attenuator" Canvas.Top="20" FontSize="25"/>
+ <Canvas x:Name="Attenuator" Height="75" Canvas.Left="556" Canvas.Top="44" Width="164" Cursor="Hand">
+ <Rectangle Fill="#FFF4F4F5" Height="75" Stroke="Black" Width="164"/>
+ <TextBlock x:Name="textBlock2" Canvas.Left="23" TextWrapping="Wrap" Text="Attenuator" Canvas.Top="20" FontSize="25"/>
</Canvas>
-
</Canvas>
-
</UserControl>
\ No newline at end of file
--
Gitblit v1.9.3