From 8fc148424accf484b4f331c7d5fb11eb7383cf89 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 24 一月 2026 16:34:29 +0800
Subject: [PATCH] 1.点连接图子项时,如果显示生产面板则不显示属性页;
---
SourceCode/Bond/Servo/EqsGraphWnd.cpp | 9 +--------
SourceCode/Bond/Servo/ServoDlg.cpp | 2 +-
2 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/EqsGraphWnd.cpp b/SourceCode/Bond/Servo/EqsGraphWnd.cpp
index cca80eb..9e68a4c 100644
--- a/SourceCode/Bond/Servo/EqsGraphWnd.cpp
+++ b/SourceCode/Bond/Servo/EqsGraphWnd.cpp
@@ -495,14 +495,7 @@
void CEqsGraphWnd::SetOnListener(EqsGraphListener& listener)
{
- m_listener.onConnectPin = listener.onConnectPin;
- m_listener.onCheckConnectPin = listener.onCheckConnectPin;
- m_listener.onDisconnectPin = listener.onDisconnectPin;
- m_listener.onDeleteEqItem = listener.onDeleteEqItem;
- m_listener.onEqItemPosChanged = listener.onEqItemPosChanged;
- m_listener.onDblckEqItem = listener.onDblckEqItem;
- m_listener.onRclickEqItem = listener.onRclickEqItem;
- m_listener.onSelectEqItem = listener.onSelectEqItem;
+ m_listener = listener;
}
BOOL CEqsGraphWnd::SetCurSel(int nSel)
diff --git a/SourceCode/Bond/Servo/ServoDlg.cpp b/SourceCode/Bond/Servo/ServoDlg.cpp
index b374f84..8bd8ca8 100644
--- a/SourceCode/Bond/Servo/ServoDlg.cpp
+++ b/SourceCode/Bond/Servo/ServoDlg.cpp
@@ -195,7 +195,7 @@
ASSERT(m_pPanelAttributes);
m_pPanelEquipment->loadDataFromEquipment(pEquipment);
m_pPanelAttributes->ShowWindow(SW_HIDE);
- if (!m_pPanelEquipment->IsWindowVisible()) {
+ if (!m_pPanelEquipment->IsWindowVisible() && m_nLeftPanelType == 1) {
m_pPanelEquipment->ShowWindow(SW_SHOW);
Resize();
}
--
Gitblit v1.9.3