From 60fce85863e07388db589bd26da73c3bbc1c7299 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 10:16:25 +0800
Subject: [PATCH] 1.选中连接图中的节点,更新显示属性,为方便快速调试;

---
 SourceCode/Bond/Servo/CPageGraph2.cpp |   73 ++++++++++++++++++++++++++++--------
 1 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 83c2471..f29a3bb 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -54,11 +54,6 @@
 		ASSERT(pPin1->pData);
 		ASSERT(pPin2->pData);
 
-		//int nRet = ((IPin*)pPin1->pData)->checkConnectPin((IPin*)pPin2->pData);
-		//if (nRet >= 0) {
-		//	return true;
-		//}
-
 		return false;
 	};
 	listener.onConnectPin = [](PIN* pPin1, PIN* pPin2) -> bool {
@@ -67,29 +62,18 @@
 		ASSERT(pPin1->pData);
 		ASSERT(pPin2->pData);
 
-		//int nRet = ((IPin*)pPin1->pData)->connectPin((IPin*)pPin2->pData);
-		//if (nRet >= 0) {
-		//	return true;
-		//}
-
 		return false;
 	};
 	listener.onDisconnectPin = [](PIN* pPin) -> bool {
 		ASSERT(pPin);
 		ASSERT(pPin->pData);
 
-		//int nRet = ((IPin*)pPin->pData)->disconnect();
-		//if (nRet >= 0) {
-		//	return true;
-		//}
-
 		return false;
 	};
 	listener.onDeleteEqItem = [&](EQITEM* pItem) -> bool {
 		ASSERT(pItem);
 		ASSERT(pItem->pData);
-		return true;
-		// return _filterManager.unload((CFilter*)pFilter->pData) >= 0;
+		return false;
 	};
 	listener.onEqItemPosChanged = [&](EQITEM* pItem, int x, int y) -> void {
 		ASSERT(pItem);
@@ -100,6 +84,61 @@
 	};
 	listener.onRclickEqItem = [&](EQITEM* pItem) -> bool {
 		ASSERT(pItem);
+
+		CMenu menu, menuCommand;
+		CMenu* pPopupMenu;
+		menu.LoadMenu(IDR_MENU_EQSGRAPH_ITEM);
+		pPopupMenu = menu.GetSubMenu(0);
+
+
+		// 鏄剧ず妯″紡
+		pPopupMenu->EnableMenuItem(ID_EQSGRAPHITEM_SMALL, MF_DISABLED | MF_GRAYED);
+		pPopupMenu->EnableMenuItem(ID_EQSGRAPHITEM_NORMAL, MF_DISABLED | MF_GRAYED);
+		pPopupMenu->EnableMenuItem(ID_EQSGRAPHITEM_LARGE, MF_DISABLED | MF_GRAYED);
+		if (pItem->nShowType == ITEM_SMALL) {
+			pPopupMenu->CheckMenuRadioItem(ID_EQSGRAPHITEM_SMALL, ID_EQSGRAPHITEM_LARGE, ID_EQSGRAPHITEM_SMALL, MF_CHECKED);
+		}
+		else if (pItem->nShowType == ITEM_LARGE) {
+			pPopupMenu->CheckMenuRadioItem(ID_EQSGRAPHITEM_SMALL, ID_EQSGRAPHITEM_LARGE, ID_EQSGRAPHITEM_LARGE, MF_CHECKED);
+		}
+		else {
+			pPopupMenu->CheckMenuRadioItem(ID_EQSGRAPHITEM_SMALL, ID_EQSGRAPHITEM_LARGE, ID_EQSGRAPHITEM_NORMAL, MF_CHECKED);
+		}
+
+
+
+		POINT pt;
+		GetCursorPos(&pt);
+		int nCmd = pPopupMenu->TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_TOPALIGN, pt.x, pt.y, this, NULL);
+		if (nCmd == ID_EQSGRAPHITEM_SMALL) {
+			m_pEqsGraphWnd->SetItemType(pItem, ITEM_SMALL);
+		}
+		else if (nCmd == ID_EQSGRAPHITEM_NORMAL) {
+			m_pEqsGraphWnd->SetItemType(pItem, ITEM_NORMAL);
+		}
+		else if (nCmd == ID_EQSGRAPHITEM_LARGE) {
+			m_pEqsGraphWnd->SetItemType(pItem, ITEM_LARGE);
+		}
+
+
+		// 娴嬭瘯
+		else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
+			SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+			pEquipment->outputGlass(0);
+		}
+		else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
+			SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+			pEquipment->outputGlass(1);
+		}
+
+
+		return true;
+	};
+	listener.onSelectEqItem = [&](EQITEM* pItem) -> bool {
+		ASSERT(pItem);
+		SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+		theApp.m_model.notifyPtr(RX_CODE_SELECT_EQUIPMENT, pEquipment);
+
 		return true;
 	};
 

--
Gitblit v1.9.3