瀏覽代碼

modify VCEControl's pic source to relative path

zhouhr 1 年之前
父節點
當前提交
3b204e2259

+ 1 - 1
Venus/Venus_Themes/UserControls/SERobot1.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="600" d:DesignWidth="165">
     <Grid>
         <StackPanel Orientation="Horizontal" RenderTransformOrigin="0.5,0.5">
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\serobot\SERobot11.png"></Image>
+            <Image Source="pack://application:,,,/Venus_Themes;component/Themes/Images/parts/serobot/SERobot11.png"></Image>
         </StackPanel>
     </Grid>
 </UserControl>

+ 1 - 1
Venus/Venus_Themes/UserControls/SERobot2.xaml

@@ -16,7 +16,7 @@
                     <TranslateTransform/>
                 </TransformGroup>
             </StackPanel.RenderTransform>
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\serobot\SERobot2.png"></Image>
+            <Image Source="pack://application:,,,/Venus_Themes;component/Themes/Images/parts/serobot/SERobot2.png"></Image>
         </StackPanel>
     </Grid>
 </UserControl>

+ 1 - 1
Venus/Venus_Themes/UserControls/SERobot3.xaml

@@ -16,7 +16,7 @@
                     <TranslateTransform/>
                 </TransformGroup>
             </StackPanel.RenderTransform>
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\serobot\SERobot3.png"></Image>
+            <Image Source="pack://application:,,,/Venus_Themes;component/Themes/Images/parts/serobot/SERobot3.png"></Image>
         </StackPanel>
     </Grid>
 </UserControl>

+ 1 - 1
Venus/Venus_Themes/UserControls/SERobot4.xaml

@@ -8,7 +8,7 @@
              d:DesignHeight="200" d:DesignWidth="200">
     <Grid>
         <StackPanel Orientation="Horizontal">
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\serobot\SERobot4.png"></Image>
+            <Image Source="pack://application:,,,/Venus_Themes;component/Themes/Images/parts/serobot/SERobot4.png"></Image>
         </StackPanel>
     </Grid>
 </UserControl>

+ 5 - 5
Venus/Venus_Themes/UserControls/VceControl.xaml

@@ -43,7 +43,7 @@
                     </Style.Triggers>
                     </Style>
                 </Canvas.Style>
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\vce\vcedoor.png"  Height="700" Width="500" Canvas.Left="18" Canvas.Top="20" HorizontalAlignment="Left" VerticalAlignment="Center" >
+            <Image Source="/Venus_Themes;component/Themes/Images/parts/vce/vcedoor.png"  Height="700" Width="500" Canvas.Left="18" Canvas.Top="20" HorizontalAlignment="Left" VerticalAlignment="Center" >
             </Image>
         </Canvas>
         <!--Foup-->
@@ -53,19 +53,19 @@
 
             <Canvas Panel.ZIndex="1" Width="300" Height="500" Opacity=".9">
                 <Viewbox  Width="300" Height="500" Canvas.Left="145" HorizontalAlignment="Left" VerticalAlignment="Center" Opacity="0.7">
-                    <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\vce\Support.png" Height="700" Width="500" HorizontalAlignment="Left" VerticalAlignment="Center">
+                    <Image Source="/Venus_Themes;component/Themes/Images/parts/vce/Support.png" Height="700" Width="500" HorizontalAlignment="Left" VerticalAlignment="Center">
                     </Image>
                 </Viewbox>
             </Canvas>
         </Canvas>
         <Canvas Panel.ZIndex="97">
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\vce\vcebuttom.png" Height="850" Width="600" ></Image>
+            <Image Source="/Venus_Themes;component/Themes/Images/parts/vce/vcebuttom.png" Height="850" Width="600" ></Image>
         </Canvas>
         <Canvas Panel.ZIndex="100">
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\vce\vce1.png" Height="850" Width="600"></Image>
+            <Image Source="/Venus_Themes;component/Themes/Images/parts/vce/vce1.png" Height="850" Width="600"></Image>
         </Canvas>
         <Canvas Panel.ZIndex="-1">
-            <Image Source="F:\Venus\Venus\Venus\Venus_Themes\Themes\Images\parts\vce\vceshell2.png" Height="850" Width="600"></Image>
+            <Image Source="/Venus_Themes;component/Themes/Images/parts/vce/VceShell2.png" Height="850" Width="600"></Image>
         </Canvas>
         <Canvas Panel.ZIndex="99" Height="500" Width="600" Canvas.Top="830" Background="#b1d2f2">
         </Canvas>

+ 30 - 14
Venus/Venus_Themes/UserControls/VceControl.xaml.cs

@@ -17,6 +17,7 @@ using System.Windows.Shapes;
 using Venus_Core;
 using OpenSEMI.Ctrlib.Controls;
 using System.Diagnostics;
+using System.IO;
 
 namespace Venus_Themes.UserControls
 {
@@ -133,8 +134,8 @@ namespace Venus_Themes.UserControls
             {
                 if (Convert.ToInt32(e.NewValue) >= 0 && Convert.ToInt32(e.OldValue) >= 0)
                 {
-                    VceWaferNames[(int)e.NewValue].Source = new BitmapImage(new Uri(@"F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\WaferSelected.png", UriKind.RelativeOrAbsolute));
-                    VceWaferNames[(int)e.OldValue].Source = new BitmapImage(new Uri(@"F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\Wafer.png", UriKind.RelativeOrAbsolute));
+                    VceWaferNames[(int)e.NewValue].Source = new BitmapImage(new Uri(@"pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/WaferSelected.png", UriKind.RelativeOrAbsolute));
+                    VceWaferNames[(int)e.OldValue].Source = new BitmapImage(new Uri(@"pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/Wafer.png", UriKind.RelativeOrAbsolute));
                     DoubleAnimation floatY = new DoubleAnimation(
                     430 - 7 * (25 - (int)e.NewValue),
                     TimeSpan.FromSeconds(3)
@@ -143,7 +144,7 @@ namespace Venus_Themes.UserControls
                 }
                 else if (Convert.ToInt32(e.NewValue) >= 0 && Convert.ToInt32(e.OldValue) < 0)
                 {
-                    VceWaferNames[(int)e.NewValue].Source = new BitmapImage(new Uri(@"F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\WaferSelected.png", UriKind.RelativeOrAbsolute));
+                    VceWaferNames[(int)e.NewValue].Source = new BitmapImage(new Uri(@"pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/WaferSelected.png", UriKind.RelativeOrAbsolute));
                     DoubleAnimation floatY = new DoubleAnimation(
                         430 - 7 * (25 - (int)e.NewValue),
                         TimeSpan.FromSeconds(3)
@@ -152,7 +153,7 @@ namespace Venus_Themes.UserControls
                 }
                 else if (Convert.ToInt32(e.NewValue) < 0 && Convert.ToInt32(e.OldValue) > 0)
                 {
-                    VceWaferNames[(int)e.OldValue].Source = new BitmapImage(new Uri(@"F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\Wafer.png", UriKind.RelativeOrAbsolute));
+                    VceWaferNames[(int)e.OldValue].Source = new BitmapImage(new Uri(@"pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/Wafer.png", UriKind.RelativeOrAbsolute));
                     DoubleAnimation floatY = new DoubleAnimation(
                         430,
                         TimeSpan.FromSeconds(3)
@@ -165,13 +166,14 @@ namespace Venus_Themes.UserControls
         {
             Image VceImage = new Image();
             VceImage.Height = ImageHeight;
-            BitmapImage myBitmapImage = new BitmapImage();
-            myBitmapImage.BeginInit();
-            myBitmapImage.UriSource = new Uri(ImagePath);
-            myBitmapImage.DecodePixelHeight = ImageHeight;
-            myBitmapImage.EndInit();
+
+            //BitmapImage myBitmapImage = new BitmapImage();
+            //myBitmapImage.BeginInit();
+            //myBitmapImage.BaseUri = new Uri(ImagePath);
+            //myBitmapImage.DecodePixelHeight = ImageHeight;
+            //myBitmapImage.EndInit();
             //set image source
-            VceImage.Source = myBitmapImage;
+            VceImage.Source = new BitmapImage(new Uri(ImagePath)); ;
             return VceImage;
         }
         private void DrawFoup()
@@ -201,8 +203,8 @@ namespace Venus_Themes.UserControls
                 Canvas.SetTop(SlotIndex, CanvasTop3);
                 CanvasTop3 = CanvasTop3 + 5;
                 Canvas.SetZIndex(SlotIndex, 98);//显示层级
-                //Fuop
-                string ImagePath1 = "F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\Foup1.png";
+                //Fuop pack://application:,,,/
+                string ImagePath1 = "pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/Foup1.png";
                 Image VceControl = CreateImage(ImagePath1, 49);
                 Canvas canvas1 = new Canvas();
                 CanvasTop1 = CanvasTop1 + 7;
@@ -228,7 +230,7 @@ namespace Venus_Themes.UserControls
                 Canvas.SetTop(border, CanvasTop3);
                 CanvasTop3 = CanvasTop3 + 7.5;
                 //Wafer
-                string ImagePath2 = "F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\Wafer.png";
+                string ImagePath2 = @"pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/Wafer.png";
                 VceWaferNames[item.SlotID] = (CreateImage(ImagePath2, 40));
                 Canvas.SetTop(VceWaferNames[item.SlotID], CanvasTop2);
                 CanvasTop2 = CanvasTop1+5;
@@ -245,7 +247,7 @@ namespace Venus_Themes.UserControls
                 }
             }
             //FoupCover
-            string ImagePath3 = "F:\\Venus\\Venus\\Venus\\Venus_Themes\\Themes\\Images\\parts\\vce\\Foup2.png";
+            string ImagePath3 = @"pack://application:,,,/Venus_Themes;component/Themes/Images/parts/vce/Foup2.png";
             System.Windows.Controls.Image FoupCover = CreateImage(ImagePath3, 49);
             Canvas canvas2 = new Canvas();
             canvas2.Children.Add(FoupCover);
@@ -256,5 +258,19 @@ namespace Venus_Themes.UserControls
             vceFoupAndWafer.Children.Add(canvas2);
 
         }
+
+        private string getimageURI(string directoryPath)
+        {
+            var startupPath = System.Diagnostics.Process.GetCurrentProcess().MainModule.FileName;
+            string dir = System.IO.Path.GetDirectoryName(startupPath);
+            var ret = System.IO.Path.Combine(dir, directoryPath);
+            if (!ret.EndsWith(System.IO.Path.DirectorySeparatorChar.ToString()))
+                ret = ret + System.IO.Path.DirectorySeparatorChar;
+
+            if (!Directory.Exists(ret))
+                Directory.CreateDirectory(ret);
+
+            return ret;
+        }
     }
 }

+ 11 - 10
Venus/Venus_Themes/Venus_Themes.csproj

@@ -510,16 +510,17 @@
     <Content Include="Themes\Images\parts\tmdock.png" />
     <Content Include="Themes\Images\parts\vce\ButtomSupport1.png" />
     <Content Include="Themes\Images\parts\vce\ButtomSupport2.png" />
-    <Content Include="Themes\Images\parts\vce\Foup1.png" />
-    <Content Include="Themes\Images\parts\vce\Foup2.png" />
-    <Content Include="Themes\Images\parts\vce\Support.png" />
-    <Content Include="Themes\Images\parts\vce\vce1.png" />
-    <Content Include="Themes\Images\parts\vce\vce2.png" />
-    <Content Include="Themes\Images\parts\vce\vcebuttom.png" />
-    <Content Include="Themes\Images\parts\vce\vcedoor.png" />
-    <Content Include="Themes\Images\parts\vce\VceShell.png" />
-    <Content Include="Themes\Images\parts\vce\Wafer.png" />
-    <Content Include="Themes\Images\parts\vce\WaferSelected.png" />
+    <Resource Include="Themes\Images\parts\vce\Foup1.png" />
+    <Resource Include="Themes\Images\parts\vce\Foup2.png" />
+    <Resource Include="Themes\Images\parts\vce\Support.png" />
+    <Resource Include="Themes\Images\parts\vce\vce1.png" />
+    <Resource Include="Themes\Images\parts\vce\vce2.png" />
+    <Resource Include="Themes\Images\parts\vce\vcebuttom.png" />
+    <Resource Include="Themes\Images\parts\vce\vcedoor.png" />
+    <Resource Include="Themes\Images\parts\vce\VceShell.png" />
+    <Resource Include="Themes\Images\parts\vce\Wafer.png" />
+    <Resource Include="Themes\Images\parts\vce\WaferSelected.png" />
+    <Resource Include="Themes\Images\parts\vce\VceShell2.png" />
     <Content Include="Themes\Images\parts\vce\外框1.png" />
     <Content Include="Themes\Images\parts\vtmrobot\arm1.png" />
     <Content Include="Themes\Images\parts\vtmrobot\arm2.png" />