替换料盒类的实际接口

View/die-bonder-ui/CameraMaterialGroupWnd/CameraImage/CameraImageHandler.cpp

@@ -142,6 +142,7 @@ QString CameraImageHandler::CreateMaterialType(MATERIAL_TYPE materialType)
 
                 m_pCViewInterface->GetViewMatrix()->GetMaterialBoxAllPointInfo(veMaterial);
                 m_pMaterialBox->UpdataVal(veMaterial);
+                m_pMaterialBox->setMaterialBoxInfo(m_pCViewInterface);
             }
             else
             {

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/BondGraphicsView.cpp

@@ -106,6 +106,14 @@ BondGraphicsView::BondGraphicsView(QGraphicsScene* scene, QWidget* parent)
     thumbnailLabel->setStyleSheet("background-color: white; border: 1px solid gray;");
     thumbnailLabel->installEventFilter(this);
     thumbnailLabel->hide();
+    // 禁用并隐藏水平滚动条
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setHorizontalScrollBar(nullptr);
+
+    // 禁用并隐藏垂直滚动条
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBar(nullptr);
+    setDragMode(QGraphicsView::NoDrag);
 }
 
 

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/MaterialBox.cpp

@@ -121,7 +121,7 @@ void MaterialBox::initFrom(QWidget *parent)
     m_pScene->addItem(backgroundRect);
     for (int i = 0; i < totalLayers; ++i) 
     {
-        MaterialBoxDie* materialBoxDie = new MaterialBoxDie(i, 0, m_boxes.iStatas[i],rectWeight, rectHeight);
+        MaterialBoxDie* materialBoxDie = new MaterialBoxDie(i+1, m_boxes.iStatas[i],rectWeight, rectHeight);
         materialBoxDie->setPos(innerX,(innerY+ i * (rectHeight + spacing) ));
         m_pScene->addItem(materialBoxDie);
 
@@ -140,6 +140,10 @@ void MaterialBox::UpdataVal(std::vector<ns_module::MATERIAL_BOX_STRUCT>& veMater
     }
 }
 
+void MaterialBox::setMaterialBoxInfo(ns_module::CViewInterface* CViewInterface) {
+    m_pCViewInterface = CViewInterface;
+}
+
 void MaterialBox::UpdataGenerateTestData()
 {
     m_boxes = {

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/MaterialBox.h

@@ -33,7 +33,7 @@ public:
     void UpdataVal(std::vector<ns_module::MATERIAL_BOX_STRUCT>& veMaterial);
 
     void UpdataGenerateTestData();
-
+    void setMaterialBoxInfo(ns_module::CViewInterface* CViewInterface);
 private slots:
     void handleLayerRightClicked(int layer);
 
@@ -45,6 +45,7 @@ private:
     ns_module::MATERIAL_BOX_STRUCT  m_boxes; 
 
     QPixmap                         globalPixmap;
+    ns_module::CViewInterface* m_pCViewInterface;
 
 public:
     MaterialBoxGraphicsView*        m_pView = nullptr;

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/MaterialBoxGraphicsView.cpp

@@ -12,6 +12,7 @@ MaterialBoxGraphicsView::MaterialBoxGraphicsView(QGraphicsScene* scene, QWidget*
     setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     setVerticalScrollBar(nullptr);
     setDragMode(QGraphicsView::NoDrag);
+
 };
 
 
@@ -22,7 +23,7 @@ void MaterialBoxGraphicsView::mousePressEvent(QMouseEvent* event){
             clearSeleted();
             selectedLeftItem = dynamic_cast<MaterialBoxDie*>(item);
             selectedLeftItem->setLeftSelected(true);
-            qDebug() << "current row" << selectedLeftItem->getRow();
+            
         }else{
             clearSeleted();
             return;
@@ -36,8 +37,9 @@ void MaterialBoxGraphicsView::mousePressEvent(QMouseEvent* event){
             clearSeleted();
             selectedRightItem = dynamic_cast<MaterialBoxDie*>(item);
             selectedRightItem->setRightSelected(true);
-            qDebug()<<selectedRightItem->getRow();
-            emit layerRightClicked(selectedRightItem->getRow()+1);
+            qDebug()<<selectedRightItem->getCurrentLayer();
+            m_pCViewInterface->GetViewMatrix()->MoveMaterialBoxToiLayers(selectedRightItem->getCurrentLayer());
+            
 
         }else{
             return;
@@ -45,6 +47,9 @@ void MaterialBoxGraphicsView::mousePressEvent(QMouseEvent* event){
     }
     QGraphicsView::mousePressEvent(event);
 }
+void MaterialBoxGraphicsView::setCViewInterface(ns_module::CViewInterface* CViewInterface) {
+    m_pCViewInterface = CViewInterface;
+}
 void MaterialBoxGraphicsView::mouseReleaseEvent(QMouseEvent* event){
     if (event->button() == Qt::LeftButton) {
         setCursor(Qt::ArrowCursor);  // 松开时恢复为箭头
@@ -76,8 +81,8 @@ void BackgroundRect::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
     painter->drawRect(m_containerWidthdp, m_containerHeightdp, m_containerWidth, m_containerHeight);
 }
 
-MaterialBoxDie::MaterialBoxDie(int row, int col, int status, qreal weight,qreal height, QGraphicsItem* parent)
-    : QGraphicsRectItem(parent), row(row), col(col), status(status){
+MaterialBoxDie::MaterialBoxDie(int currentLayer, int status, qreal weight,qreal height, QGraphicsItem* parent)
+    : QGraphicsRectItem(parent), m_ncurrentLayer(currentLayer), status(status){
     setRect(0, 0, weight, height); // 设置单元格大小
     setBrush(getColorByStatus(status));
 
@@ -111,6 +116,6 @@ QColor MaterialBoxDie::getColorByStatus(int status){
     }
 }
 
-int MaterialBoxDie::getRow(){
-    return row;
+int MaterialBoxDie::getCurrentLayer(){
+    return m_ncurrentLayer;
 }

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/MaterialBoxGraphicsView.h

@@ -11,7 +11,7 @@
 #include <QColor>
 #include <QGraphicsSceneEvent>
 #include <QDebug>
-
+#include <CViewInterface.h>
 
 class BackgroundRect : public QGraphicsItem {
 public:
@@ -43,14 +43,14 @@ private:
 class MaterialBoxDie:public QObject, public QGraphicsRectItem{
     Q_OBJECT
 public:
-    MaterialBoxDie(int row, int col, int status, qreal weight,qreal height, QGraphicsItem* parent = nullptr);
+    MaterialBoxDie(int currentLayer, int status, qreal weight,qreal height, QGraphicsItem* parent = nullptr);
 
     void setLeftSelected(bool selected);
     void setRightSelected(bool selected);
-    int getRow();
+    int getCurrentLayer();
 
 private:
-    int row, col;
+    int m_ncurrentLayer;
     int status;
     bool isSelected = false;
     // 获取单元格状态颜色
@@ -62,6 +62,7 @@ class MaterialBoxGraphicsView : public QGraphicsView {
 
 public:
     MaterialBoxGraphicsView(QGraphicsScene* scene, QWidget* parent = nullptr);
+    void setCViewInterface(ns_module::CViewInterface* CViewInterface);
 signals:
     void layerRightClicked(int layer);
 
@@ -78,6 +79,7 @@ private:
     double scaleFactor; // 当前缩放比例
     QPointer<MaterialBoxDie> selectedLeftItem;
     QPointer<MaterialBoxDie> selectedRightItem;
+    ns_module::CViewInterface* m_pCViewInterface;
 
 
 

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/WaffleGraphicsView.cpp

@@ -19,6 +19,14 @@ WaffleGraphicsView::WaffleGraphicsView(QGraphicsScene* scene, QWidget* parent)
 
     topLeftIndex = qMakePair(-1, -1);
     bottomRightIndex = qMakePair(-1, -1);
+    // 禁用并隐藏水平滚动条
+    setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setHorizontalScrollBar(nullptr);
+
+    // 禁用并隐藏垂直滚动条
+    setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    setVerticalScrollBar(nullptr);
+    setDragMode(QGraphicsView::NoDrag);
 }
 
 // 事件过滤器用于处理缩略图拖动

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_BOX;
                 manager = new CameraImageHandler(num, m_pMainCameraBind->m_vecCamera[i]);
             }