完整提交

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -105,7 +105,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
             }
             else
             {
-                m_pMainCameraBind->m_vecCamera[i].eType = MATERIAL_WAFFLE;
+                m_pMainCameraBind->m_vecCamera[i].eType = MATERIAL_BOND;
                 manager = new CameraImageHandler(num, m_pMainCameraBind->m_vecCamera[i]);
             }
 

View/die-bonder-ui/Src/Res/Translate/SBT_en.ts

@@ -199,62 +199,362 @@
 <context>
     <name>Bond</name>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="117"/>
-        <source>PCB%1</source>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="355"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="448"/>
+        <source>Pcb%1*%2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="177"/>
-        <source>PT矩阵%1</source>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="411"/>
+        <source>PtMat%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="492"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Bond.cpp" line="540"/>
+        <source>Sub%1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BondGraphicsView</name>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="195"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="260"/>
         <source>Hide thumbnails</source>
         <comment>隐藏缩略图</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="195"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="260"/>
         <source>Show thumbnails</source>
         <comment>显示缩略图</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="200"/>
-        <source>Send Location</source>
-        <comment>发送位置</comment>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="282"/>
+        <source>move to current location</source>
+        <comment>移动到该位置</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="213"/>
-        <source>move to current location</source>
-        <comment>移动到该位置</comment>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="311"/>
+        <source>set Top left point</source>
+        <comment>设为左上点</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="232"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="321"/>
+        <source>set bottom right point</source>
+        <comment>设为右下点</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="332"/>
         <source>clear the selected area</source>
         <comment>清除选中区域</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="233"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp" line="333"/>
         <source>set area</source>
         <comment>设置区域</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BondMatrixProgramPage</name>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="435"/>
+        <source>Sub Matrix </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="441"/>
+        <location filename="../../BondMatrixProgramPage.cpp" line="618"/>
+        <source>Row </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="452"/>
+        <location filename="../../BondMatrixProgramPage.cpp" line="629"/>
+        <source>Cow </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="463"/>
+        <location filename="../../BondMatrixProgramPage.cpp" line="640"/>
+        <source>Left Top Pos </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="479"/>
+        <location filename="../../BondMatrixProgramPage.cpp" line="656"/>
+        <source>Right Top Pos </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="495"/>
+        <location filename="../../BondMatrixProgramPage.cpp" line="672"/>
+        <source>Right Buttom pos</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="511"/>
+        <location filename="../../BondMatrixProgramPage.cpp" line="688"/>
+        <source>No Bond Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.cpp" line="611"/>
+        <source>Matrix_</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>BondMatrixProgramPageClass</name>
     <message>
-        <location filename="../../BondMatrixProgramPage.ui" line="16"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="14"/>
         <source>BondMatrixProgramPage</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="72"/>
+        <source>右上角</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="96"/>
+        <source>行数</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="103"/>
+        <source>右下角</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="120"/>
+        <source>不固晶点</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="143"/>
+        <source>左上角</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="153"/>
+        <source>列数</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="160"/>
+        <source>一维矩阵:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="240"/>
+        <source>固晶高度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="257"/>
+        <source>取晶参数：</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="264"/>
+        <source>取晶高度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="274"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="288"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="308"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="346"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="626"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="705"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="745"/>
+        <source>CheckBox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="281"/>
+        <source>取晶模板ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="301"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="558"/>
+        <source>拍照延时</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="315"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="698"/>
+        <source>阻塞检测</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="332"/>
+        <source>固晶点补偿Y</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="339"/>
+        <source>是否中转</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="353"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="565"/>
+        <source>吹气延时</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="360"/>
+        <source>预固晶高度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="370"/>
+        <source>取晶延时</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="377"/>
+        <source>晶粒来源</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="392"/>
+        <source>取晶头取晶</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="397"/>
+        <source>中转台取晶</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="445"/>
+        <source>固晶压力</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="458"/>
+        <source>固晶延时</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="465"/>
+        <source>上视对点模板ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="492"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="725"/>
+        <source>真空延时</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="499"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="691"/>
+        <source>阻塞/漏晶检测延时</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="513"/>
+        <source>中转台取晶模板ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="520"/>
+        <source>固晶点补偿角度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="527"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="715"/>
+        <source>是否寻压</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="534"/>
+        <source>固晶对点模板ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="541"/>
+        <source>取晶吸嘴号</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="551"/>
+        <source>固晶台固晶参数：</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="585"/>
+        <source>固后检测模板ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="602"/>
+        <source>取晶压力</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="619"/>
+        <location filename="../../BondMatrixProgramPage.ui" line="752"/>
+        <source>漏晶检测</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="633"/>
+        <source>固前检测模板ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="640"/>
+        <source>预拾取高度</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="651"/>
+        <source>中转台放晶</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="656"/>
+        <source>固晶台固晶</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="664"/>
+        <source>固晶吸嘴号</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="675"/>
+        <source>华夫盒</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="680"/>
+        <source>晶圆台</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="738"/>
+        <source>固晶点补偿X</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../BondMatrixProgramPage.ui" line="809"/>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ChartsAndCamerasWnd</name>
@@ -1017,55 +1317,6 @@ production</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>ProgrammPage</name>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="405"/>
-        <source>Sub Matrix </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="411"/>
-        <location filename="../../ProgrammPage.cpp" line="588"/>
-        <source>Row </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="422"/>
-        <location filename="../../ProgrammPage.cpp" line="599"/>
-        <source>Cow </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="433"/>
-        <location filename="../../ProgrammPage.cpp" line="610"/>
-        <source>Left Top Pos </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="449"/>
-        <location filename="../../ProgrammPage.cpp" line="626"/>
-        <source>Right Top Pos </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="465"/>
-        <location filename="../../ProgrammPage.cpp" line="642"/>
-        <source>Right Buttom pos</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="481"/>
-        <location filename="../../ProgrammPage.cpp" line="658"/>
-        <source>No Bond Points</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.cpp" line="581"/>
-        <source>Matrix_</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>ProgrammPageClass</name>
     <message>
@@ -1079,250 +1330,12 @@ production</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ProgrammPage.ui" line="51"/>
-        <source>Save</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="116"/>
-        <source>右上角</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="140"/>
-        <source>行数</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="147"/>
-        <source>右下角</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="164"/>
-        <source>不固晶点</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="187"/>
-        <source>左上角</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="197"/>
-        <source>列数</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="204"/>
-        <source>一维矩阵:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="256"/>
-        <source>固晶高度</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="273"/>
-        <source>取晶参数：</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="280"/>
-        <source>取晶高度</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="290"/>
-        <location filename="../../ProgrammPage.ui" line="304"/>
-        <location filename="../../ProgrammPage.ui" line="324"/>
-        <location filename="../../ProgrammPage.ui" line="362"/>
-        <location filename="../../ProgrammPage.ui" line="642"/>
-        <location filename="../../ProgrammPage.ui" line="721"/>
-        <location filename="../../ProgrammPage.ui" line="761"/>
-        <source>CheckBox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="297"/>
-        <source>取晶模板ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="317"/>
-        <location filename="../../ProgrammPage.ui" line="574"/>
-        <source>拍照延时</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="331"/>
-        <location filename="../../ProgrammPage.ui" line="714"/>
-        <source>阻塞检测</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="348"/>
-        <source>固晶点补偿Y</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="355"/>
-        <source>是否中转</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="369"/>
-        <location filename="../../ProgrammPage.ui" line="581"/>
-        <source>吹气延时</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="376"/>
-        <source>预固晶高度</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="386"/>
-        <source>取晶延时</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="393"/>
-        <source>晶粒来源</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="408"/>
-        <source>取晶头取晶</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="413"/>
-        <source>中转台取晶</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="461"/>
-        <source>固晶压力</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="474"/>
-        <source>固晶延时</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="481"/>
-        <source>上视对点模板ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="508"/>
-        <location filename="../../ProgrammPage.ui" line="741"/>
-        <source>真空延时</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="515"/>
-        <location filename="../../ProgrammPage.ui" line="707"/>
-        <source>阻塞/漏晶检测延时</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="529"/>
-        <source>中转台取晶模板ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="536"/>
-        <source>固晶点补偿角度</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="543"/>
-        <location filename="../../ProgrammPage.ui" line="731"/>
-        <source>是否寻压</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="550"/>
-        <source>固晶对点模板ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="557"/>
-        <source>取晶吸嘴号</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="567"/>
-        <source>固晶台固晶参数：</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="601"/>
-        <source>固后检测模板ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="618"/>
-        <source>取晶压力</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="635"/>
-        <location filename="../../ProgrammPage.ui" line="768"/>
-        <source>漏晶检测</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="649"/>
-        <source>固前检测模板ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="656"/>
-        <source>预拾取高度</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="667"/>
-        <source>中转台放晶</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="672"/>
-        <source>固晶台固晶</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="680"/>
-        <source>固晶吸嘴号</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="691"/>
-        <source>华夫盒</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="696"/>
-        <source>晶圆台</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="754"/>
-        <source>固晶点补偿X</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../ProgrammPage.ui" line="782"/>
+        <location filename="../../ProgrammPage.ui" line="34"/>
         <source>晶圆编程</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../ProgrammPage.ui" line="792"/>
+        <location filename="../../ProgrammPage.ui" line="44"/>
         <source>华夫盒编程</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1505,53 +1518,66 @@ production</source>
 <context>
     <name>WaferGraphicsView</name>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="193"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="194"/>
         <source>Hide thumbnails</source>
         <comment>隐藏缩略图</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="193"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="194"/>
         <source>Show thumbnails</source>
         <comment>显示缩略图</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="207"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="208"/>
         <source>move to current location</source>
         <comment>移动到该位置</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="239"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="241"/>
         <source>set Top left point</source>
         <comment>设为左上点</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="250"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="252"/>
         <source>set bottom right point</source>
         <comment>设为右下点</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="262"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="264"/>
         <source>clear the selected area</source>
         <comment>清除选中区域</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="263"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="265"/>
         <source>set area</source>
         <comment>设置区域</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="469"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp" line="471"/>
         <source>DieMatrix%1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Waffle</name>
+    <message>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Waffle.cpp" line="306"/>
+        <source>DieMat%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/Waffle.cpp" line="346"/>
+        <source>PackMat%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>WaffleGraphicsView</name>
     <message>
@@ -1567,37 +1593,31 @@ production</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="176"/>
-        <source>Send Location</source>
-        <comment>发送位置</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="184"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="183"/>
         <source>move to current location</source>
         <comment>移动到该位置</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="215"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="214"/>
         <source>set Top left point</source>
         <comment>设为左上点</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="226"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="228"/>
         <source>set bottom right point</source>
         <comment>设为右下点</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="238"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="243"/>
         <source>clear the selected area</source>
         <comment>清除选中区域</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="239"/>
+        <location filename="../../../CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp" line="244"/>
         <source>set area</source>
         <comment>设置区域</comment>
         <translation type="unfinished"></translation>
@@ -1606,44 +1626,44 @@ production</source>
 <context>
     <name>WaffleProgramPage</name>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="64"/>
-        <location filename="../../WaffleProgramPage.cpp" line="226"/>
+        <location filename="../../WaffleProgramPage.cpp" line="65"/>
+        <location filename="../../WaffleProgramPage.cpp" line="268"/>
         <source>Sub Matrix </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="70"/>
-        <location filename="../../WaffleProgramPage.cpp" line="233"/>
+        <location filename="../../WaffleProgramPage.cpp" line="71"/>
+        <location filename="../../WaffleProgramPage.cpp" line="275"/>
         <source>Row </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="81"/>
-        <location filename="../../WaffleProgramPage.cpp" line="244"/>
+        <location filename="../../WaffleProgramPage.cpp" line="82"/>
+        <location filename="../../WaffleProgramPage.cpp" line="286"/>
         <source>Cow </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="92"/>
-        <location filename="../../WaffleProgramPage.cpp" line="255"/>
+        <location filename="../../WaffleProgramPage.cpp" line="93"/>
+        <location filename="../../WaffleProgramPage.cpp" line="297"/>
         <source>Left Top Pos </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="108"/>
-        <location filename="../../WaffleProgramPage.cpp" line="271"/>
+        <location filename="../../WaffleProgramPage.cpp" line="109"/>
+        <location filename="../../WaffleProgramPage.cpp" line="313"/>
         <source>Right Top Pos </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="124"/>
-        <location filename="../../WaffleProgramPage.cpp" line="287"/>
+        <location filename="../../WaffleProgramPage.cpp" line="125"/>
+        <location filename="../../WaffleProgramPage.cpp" line="329"/>
         <source>Right Buttom pos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../WaffleProgramPage.cpp" line="140"/>
-        <location filename="../../WaffleProgramPage.cpp" line="303"/>
+        <location filename="../../WaffleProgramPage.cpp" line="141"/>
+        <location filename="../../WaffleProgramPage.cpp" line="345"/>
         <source>No Bond Points</source>
         <translation type="unfinished"></translation>
     </message>

View/die-bonder-ui/Src/WaffleProgramPage.cpp

@@ -41,11 +41,11 @@ WaffleProgramPage::WaffleProgramPage(QWidget* parent)
 
 	initPage();
 
-	/*connect(ui.pushButtonSave, &QPushButton::clicked, this, [=]() {
+    connect(ui.pushButtonSave, &QPushButton::clicked, this, [=]() {
         m_pProduct->SetAllWaffleMatrix(m_vecWaffleMatrix);
         m_pProduct->SetAllWaffleDieMatrix(m_vecSubWaffleMatrix);
 
-		});*/
+        });
 
 }