Output/inc/Module/CProduct.h

@@ -323,9 +323,15 @@ namespace ns_db
 		LONG SaveWaffleMatrix();
 	public:
 		std::vector<PROGRAM_WAFFLE_MATRIX_STRUCT> GetWaffleMatrix() { return m_VecWaffleMatrix; };
+<<<<<<< Updated upstream
 		LONG SetWaffleMatrix(int id, PROGRAM_WAFFLE_MATRIX_STRUCT matrix);
 		LONG AddWaffleMatrix(PROGRAM_WAFFLE_MATRIX_STRUCT newMatrix, int& newId);
 		LONG DeleteWaffleMatrix(int matrixID);
+=======
+		/*void SetWaffleMatrix(int matrixID, PROGRAM_WAFFLE_MATRIX_STRUCT matrix);
+		LONG AddBondMatrix(PROGRAM_WAFFLE_MATRIX_STRUCT matrix, int& newId);
+		void DeleteWaffleMatrix(int matrixID);*/
+>>>>>>> Stashed changes
 
 #pragma endregion
 

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

@@ -9,6 +9,7 @@
 #include "CViewInterface.h"
 #include "Login.h"
 #include "TreeViewManager/JIoMapPage.h"
+#include <View/die-bonder-ui/OriginalWnd/TreeViewManager/MatrixDiePage.h>
 
 // 构造函数
 DbTreeViewManager::DbTreeViewManager(QWidget* pOriginalWndMenuPage, QWidget* parent)
@@ -3275,6 +3276,10 @@ void DbTreeViewManager::displayThirdLevelFields(const QList<ST_TABLE_CONTROL_DAT
                 {
                     rightLayout->addWidget(JIoMapPage::CreateAxisTestPage(control));
                 }
+                else if (fieldType == "Table")
+                {
+                    rightLayout->addWidget(MatrixDiePage::CreateMatrixDiePage(control));
+                }
                 else
                 {
                     qWarning() << "未知字段类型：" << fieldType;

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj

@@ -238,7 +238,11 @@
     <ClCompile Include="OriginalWnd\chartline.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="OriginalWnd\TreeViewManager\JIoMapPage.cpp" />
+<<<<<<< Updated upstream
     <ClCompile Include="Src\BondMatrixProgramPage.cpp" />
+=======
+    <ClCompile Include="OriginalWnd\TreeViewManager\MatrixDiePage.cpp" />
+>>>>>>> Stashed changes
     <ClCompile Include="Src\CameraBind.cpp" />
     <ClCompile Include="Src\common\GlobalUse\JMouseMonitorThread.cpp" />
     <ClCompile Include="Src\common\JLogAllOutput.cpp" />
@@ -285,6 +289,7 @@
     <ClInclude Include="JUserAccountsData.h" />
     <QtMoc Include="Src\common\GlobalUse\JMouseMonitorThread.h" />
     <QtMoc Include="OriginalWnd\TreeViewManager\JIoMapPage.h" />
+    <QtMoc Include="OriginalWnd\TreeViewManager\MatrixDiePage.h" />
     <ClInclude Include="OriginalWnd\TreeViewManager\TreeViewManagerHead.h" />
     <QtMoc Include="Src\BondMatrixProgramPage.h" />
     <ClInclude Include="Src\common\JLogAllOutput.h" />

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj.filters

@@ -307,6 +307,11 @@
       <Filter>Source Files\Src</Filter>
     </ClCompile>
   </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="OriginalWnd\TreeViewManager\MatrixDiePage.cpp">
+      <Filter>Header Files\OriginalWnd\TreeViewManager</Filter>
+    </ClCompile>
+  </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
       <Filter>Header Files</Filter>
@@ -416,6 +421,7 @@
     <QtMoc Include="OriginalWnd\TreeViewManager\JIoMapPage.h">
       <Filter>Header Files\OriginalWnd\TreeViewManager</Filter>
     </QtMoc>
+<<<<<<< Updated upstream
     <QtMoc Include="Src\RewriteControl\Controls\DoubleSpinBox.h">
       <Filter>Source Files\Src\RewriteControl\Controls</Filter>
     </QtMoc>
@@ -430,6 +436,10 @@
     </QtMoc>
     <QtMoc Include="Src\WaffleProgramPage.h">
       <Filter>Source Files\Src</Filter>
+=======
+    <QtMoc Include="OriginalWnd\TreeViewManager\MatrixDiePage.h">
+      <Filter>Header Files\OriginalWnd\TreeViewManager</Filter>
+>>>>>>> Stashed changes
     </QtMoc>
   </ItemGroup>
   <ItemGroup>