浏览代码

edit the wise installation

gsp 2 年之前
父节点
当前提交
fc4de326b9
共有 2 个文件被更改,包括 13 次插入20 次删除
  1. 7 14
      Bin/x64/OTSOx50_2_7.wse
  2. 6 6
      OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

+ 7 - 14
Bin/x64/OTSOx50_2_7.wse

@@ -3923,43 +3923,43 @@ item: Set Variable
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OTSMeasureApp.exe
   Source=%MAINDIR%\OTSMeasureApp.exe
-  Destination=%GROUP%\OTSMeasureApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSMeasureApp.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OTSSysMgrApp.exe
   Source=%MAINDIR%\OTSSysMgrApp.exe
-  Destination=%GROUP%\OTSSysMgrApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSSysMgrApp.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OTSIncAReportApp.exe
   Source=%MAINDIR%\OTSIncAReportApp.exe
-  Destination=%GROUP%\OTSIncAReportApp.lnk
+  Destination=%CGROUPDIR%\%CGROUP_SAVE%\OTSIncAReportApp.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OTSMeasureApp.exe
   Source=%MAINDIR%\OTSMeasureApp.exe
-  Destination=%DESKTOPDIR%\OTSMeasureApp.lnk
+  Destination=%CDESKTOPDIR%\OTSMeasureApp.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OTSIncAReportApp.exe
   Source=%MAINDIR%\OTSIncAReportApp.exe
-  Destination=%DESKTOPDIR%\OTSIncAReportApp.lnk
+  Destination=%CDESKTOPDIR%\OTSIncAReportApp.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OTSSysMgrApp.exe
   Source=%MAINDIR%\OTSSysMgrApp.exe
-  Destination=%DESKTOPDIR%\OTSSysMgrApp.lnk
+  Destination=%CDESKTOPDIR%\OTSSysMgrApp.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
 item: Create Shortcut
 item: Create Shortcut
   Source=%MAINDIR%\OINA.Extender.WPF.Testharness.exe
   Source=%MAINDIR%\OINA.Extender.WPF.Testharness.exe
-  Destination=%DESKTOPDIR%\OINA.Extender.WPF.Testharness.lnk
+  Destination=%CDESKTOPDIR%\OINA.Extender.WPF.Testharness.lnk
   Working Directory=%MAINDIR%
   Working Directory=%MAINDIR%
   Icon Number=0
   Icon Number=0
 end
 end
@@ -3970,49 +3970,42 @@ item: Add ProgMan Icon
   Icon Name=OINA.Extender.WPF.Testharness
   Icon Name=OINA.Extender.WPF.Testharness
   Command Line=%MAINDIR%\OINA.Extender.WPF.Testharness.exe
   Command Line=%MAINDIR%\OINA.Extender.WPF.Testharness.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: Add ProgMan Icon
 item: Add ProgMan Icon
   Group=%GROUP%
   Group=%GROUP%
   Icon Name=OTSSysMgrApp
   Icon Name=OTSSysMgrApp
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: Add ProgMan Icon
 item: Add ProgMan Icon
   Group=%GROUP%
   Group=%GROUP%
   Icon Name=OTSMeasureApp
   Icon Name=OTSMeasureApp
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: Add ProgMan Icon
 item: Add ProgMan Icon
   Group=%GROUP%
   Group=%GROUP%
   Icon Name=OTSIncAReportApp
   Icon Name=OTSIncAReportApp
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: Add ProgMan Icon
 item: Add ProgMan Icon
   Group=%GROUP%
   Group=%GROUP%
   Icon Name=OTSMeasureApp
   Icon Name=OTSMeasureApp
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Command Line=%MAINDIR%\OTSMeasureApp.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: Add ProgMan Icon
 item: Add ProgMan Icon
   Group=%GROUP%
   Group=%GROUP%
   Icon Name=OTSSysMgrApp
   Icon Name=OTSSysMgrApp
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Command Line=%MAINDIR%\OTSSysMgrApp.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: Add ProgMan Icon
 item: Add ProgMan Icon
   Group=%GROUP%
   Group=%GROUP%
   Icon Name=OTSIncAReportApp
   Icon Name=OTSIncAReportApp
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Command Line=%MAINDIR%\OTSIncAReportApp.exe
   Default Directory=%MAINDIR%
   Default Directory=%MAINDIR%
-  Flags=01000000
 end
 end
 item: End Block
 item: End Block
 end
 end

+ 6 - 6
OTSIncAMeasureApp/3-OTSDisplaySourceGridData/OTSPropertyWindow.cs

@@ -119,7 +119,7 @@ namespace OTSMeasureApp
                     strNewName = strNewName.Trim();
                     strNewName = strNewName.Trim();
                     string oldName = m_measurePara.GetWorkSampleName();
                     string oldName = m_measurePara.GetWorkSampleName();
                     if (!m_measurePara.CheckSampleNameIsValid(strNewName))
                     if (!m_measurePara.CheckSampleNameIsValid(strNewName))
-            {
+                   {
         
         
                         //update source grid,recover to the original value
                         //update source grid,recover to the original value
                         DisplaySampleMeasureInfo(SMInfo);
                         DisplaySampleMeasureInfo(SMInfo);
@@ -150,9 +150,9 @@ namespace OTSMeasureApp
 
 
                     DisplaySampleMeasureInfo(SMInfo);
                     DisplaySampleMeasureInfo(SMInfo);
                     return;
                     return;
-                }
+                    }
                     if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, frmStopModeDialog.TimeMode))    // Prop值变化,修改样品值成功
                     if (!m_measurePara.SetSampleParamVal(OTS_SAMPLE_PROP_GRID_ITEMS.STOP_PARAM_TIME, OTS_ITEM_TYPES.INT, frmStopModeDialog.TimeMode))    // Prop值变化,修改样品值成功
-                {
+                   {
 
 
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
 
 
@@ -191,14 +191,14 @@ namespace OTSMeasureApp
 
 
                 default:
                 default:
                     if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化,修改样品值成功
                     if (!m_measurePara.SetSampleParamVal(SampleId, ValType, ObjVal))    // Prop值变化,修改样品值成功
-            {
+                    {
 
 
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                         m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
 
 
 
 
                         DisplaySampleMeasureInfo(SMInfo);
                         DisplaySampleMeasureInfo(SMInfo);
                         return;
                         return;
-                }
+                    }
                     break;
                     break;
              
              
                 }
                 }
@@ -223,7 +223,7 @@ namespace OTSMeasureApp
                 m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                 m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
                 DisplaySampleMeasureInfo(SMInfo);
                 DisplaySampleMeasureInfo(SMInfo);
                 return;
                 return;
-                    }
+                }
 
 
 
 
             m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);
             m_measurePara.GetWorkSamplePerameter(m_measurePara.GetWorkSample(), ref SMInfo);