From 671ffb1ac11f0ea00524510af965550c3fbc40ad Mon Sep 17 00:00:00 2001
From: d23004 <kimseijin@diteam.co.kr>
Date: 수, 24 5월 2023 13:41:44 +0900
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
SA_LTT_UI/SA_LTT_UI/SA_LTT_UI.csproj | 110 +++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 79 insertions(+), 31 deletions(-)
diff --git a/SA_LTT_UI/SA_LTT_UI/SA_LTT_UI.csproj b/SA_LTT_UI/SA_LTT_UI/SA_LTT_UI.csproj
index f697a81..dfaf3de 100644
--- a/SA_LTT_UI/SA_LTT_UI/SA_LTT_UI.csproj
+++ b/SA_LTT_UI/SA_LTT_UI/SA_LTT_UI.csproj
@@ -33,6 +33,14 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="DevExpress.BonusSkins.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Data.Desktop.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Data.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Drawing.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Printing.v22.2.Core, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Sparkline.v22.2.Core, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Utils.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+ <Reference Include="DevExpress.XtraEditors.v22.2, Version=22.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="EasyModbus, Version=5.6.0.0, Culture=neutral, PublicKeyToken=null" />
<Reference Include="padDLLBW, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -41,7 +49,11 @@
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
+ <Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Core" />
+ <Reference Include="System.Data.Linq" />
+ <Reference Include="System.Design" />
+ <Reference Include="System.Runtime.Remoting" />
<Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
@@ -53,11 +65,17 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
+ <Reference Include="UIAutomationClient" />
<Reference Include="UIAutomationProvider" />
<Reference Include="WindowsBase" />
<Reference Include="WindowsFormsIntegration" />
</ItemGroup>
<ItemGroup>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DesignTime>True</DesignTime>
+ <DependentUpon>Resources.resx</DependentUpon>
+ </Compile>
<Compile Include="Screen\AnalogBar.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -117,6 +135,15 @@
</Compile>
<Compile Include="Screen\WaferProcessPointView.xaml.cs">
<DependentUpon>WaferProcessPointView.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="UserControls\MappingData.xaml.cs">
+ <DependentUpon>MappingData.xaml</DependentUpon>
+ </Compile>
+ <Compile Include="UserControls\TitleBox.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControls\TitleBox.Designer.cs">
+ <DependentUpon>TitleBox.cs</DependentUpon>
</Compile>
<Compile Include="Viewer\AlarmViewer.cs">
<SubType>Form</SubType>
@@ -252,6 +279,12 @@
<Compile Include="Viewer\PreAlignViwer.Designer.cs">
<DependentUpon>PreAlignViwer.cs</DependentUpon>
</Compile>
+ <Compile Include="Viewer\ProcessRecipeInfoViewer.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="Viewer\ProcessRecipeInfoViewer.Designer.cs">
+ <DependentUpon>ProcessRecipeInfoViewer.cs</DependentUpon>
+ </Compile>
<Compile Include="Viewer\RecipeCreateViewer.cs">
<SubType>Form</SubType>
</Compile>
@@ -288,6 +321,7 @@
<Compile Include="Viewer\WaferInfoViewer.Designer.cs">
<DependentUpon>WaferInfoViewer.cs</DependentUpon>
</Compile>
+ <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Screen\AnalogBar.resx">
<DependentUpon>AnalogBar.cs</DependentUpon>
</EmbeddedResource>
@@ -311,6 +345,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Screen\ScreenSetting.resx">
<DependentUpon>ScreenSetting.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="UserControls\TitleBox.resx">
+ <DependentUpon>TitleBox.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Viewer\AlarmViewer.resx">
<DependentUpon>AlarmViewer.cs</DependentUpon>
@@ -350,14 +387,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
- <LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
+ <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DependentUpon>Resources.resx</DependentUpon>
- <DesignTime>True</DesignTime>
- </Compile>
<EmbeddedResource Include="Screen\ScreenAlarmSetting.resx">
<DependentUpon>ScreenAlarmSetting.cs</DependentUpon>
</EmbeddedResource>
@@ -387,6 +419,9 @@
</EmbeddedResource>
<EmbeddedResource Include="Viewer\PreAlignViwer.resx">
<DependentUpon>PreAlignViwer.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Viewer\ProcessRecipeInfoViewer.resx">
+ <DependentUpon>ProcessRecipeInfoViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Viewer\RecipeCreateViewer.resx">
<DependentUpon>RecipeCreateViewer.cs</DependentUpon>
@@ -451,6 +486,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
+ <Page Include="UserControls\MappingData.xaml">
+ <SubType>Designer</SubType>
+ <Generator>MSBuild:Compile</Generator>
+ </Page>
</ItemGroup>
<ItemGroup>
<None Include="Resources\LoadPort.png" />
@@ -466,32 +505,41 @@
</None>
</ItemGroup>
<ItemGroup>
- <None Include="Resources\Robot_Arm.png">
+ <Content Include="Resources\Chamber_SA.png" />
+ <None Include="Resources\LaserBox.png" />
+ <None Include="Resources\Main_TitleBar.png" />
+ <None Include="Resources\MainBottom_Background.png" />
+ <None Include="Resources\SVG_Icon\RunStop_Icon.svg" />
+ <None Include="Resources\SVG_Icon\AutoRun_Icon.svg" />
+ <None Include="Resources\Shutter_Close.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Complete.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Complete2.png" />
+ <None Include="Resources\Wafer_Legend\Wafer_Legend_Complete3.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Empty.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Empty2.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Exist.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Exist2.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Leaning.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Leaning2.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Overlap.png" />
+ <Content Include="Resources\Wafer_Legend\Wafer_Legend_Overlap2.png" />
+ <None Include="Resources\GroupBox_Header.png" />
+ <Content Include="Resources\Port_image.png" />
+ <Content Include="Resources\Robot_Arm1_SA.png" />
+ <Content Include="Resources\Robot_Arm_Hand_SA.png" />
+ <Content Include="Resources\Robot_Body_SA.png" />
+ <None Include="Resources\SVG_Icon\GroubboxHeader_Background.svg" />
+ <None Include="Resources\SVG_Icon\GroupBox_Background.svg" />
+ <None Include="Resources\SVG_Icon\GroupBox_Header_Icon.svg" />
+ <None Include="Resources\SVG_Icon\Start_Icon.svg" />
+ <None Include="Resources\SVG_Icon\Stop_Icon.svg" />
+ <None Include="Resources\SVG_Icon\Pause_Icon.svg" />
+ <None Include="Resources\SVG_Icon\Maint_Icon.svg" />
+ <None Include="Resources\SVG_Icon\SubGroubboxHeader_Background.svg" />
+ <None Include="Resources\SVG_Icon\SubGroubbox_Background.svg" />
+ <Content Include="Resources\Title_Bar.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Robot_Arm1.png">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Robot_Arm2.png">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Robot_Body.png">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </None>
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Robot_Arm_Hand.png" />
- </ItemGroup>
- <ItemGroup>
- <None Include="Resources\Robot_Arm_Body.png" />
- </ItemGroup>
- <ItemGroup>
+ </Content>
<None Include="Resources\BuzzerOff.png" />
<Content Include="Resources\RecipeImage.PNG">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
--
Gitblit v1.9.3