From b753a9285ef153e78f2dc7a74f754f00a0a4638b Mon Sep 17 00:00:00 2001
From: jiayulong <jiayulong@hivekion.com>
Date: Mon, 29 Jun 2026 09:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=BB=9A=E8=BD=AE=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=EF=BC=8C=E6=94=AF=E6=8C=81=E8=BF=98=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/mainwindowcurve.cpp | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp
index 47f7daf..5061bbd 100644
--- a/logPlus/mainwindowcurve.cpp
+++ b/logPlus/mainwindowcurve.cpp
@@ -579,11 +579,13 @@ void MainWindowCurve::s_mouseWheel(QWheelEvent *event)
     {
         if (event->delta() > 0) // 鼠标滚轮向上滚动
         {
-            ZoomIn(1.1); // 文本放大
+            s_ZoomIn();
+//            ZoomIn(1.1); // 文本放大
         }
         else
         {
-            ZoomIn(0.9); // 文本缩小
+            s_ZoomOut();
+//            ZoomIn(0.9); // 文本缩小
         }
     }
     else
@@ -4170,9 +4172,9 @@ void MainWindowCurve::s_ZoomIn()
 {
     //宽度放大
     double dCurScale = (double)1.0 / (double)0.9;
-    ZoomIn(dCurScale);//1.1
-    //
     m_dScale = m_dScale/dCurScale;
+    //
+    ZoomIn(dCurScale);//1.1
 }
 
 //缩小
@@ -4180,9 +4182,9 @@ void MainWindowCurve::s_ZoomOut()
 {
     //宽度缩小
     double dCurScale = 0.9;
-    ZoomIn(dCurScale);
-    //
     m_dScale = m_dScale/dCurScale;
+    //
+    ZoomIn(dCurScale);
 }
 
 //还原
@@ -8030,11 +8032,13 @@ void MainWindowCurve::wheelEvent(QWheelEvent *e)
     {
         if (e->delta() > 0) // 鼠标滚轮向上滚动
         {
-            ZoomIn(1.1); // 文本放大
+            s_ZoomIn();
+            //ZoomIn(1.1); // 文本放大
         }
         else
         {
-            ZoomIn(0.9); // 文本缩小
+            s_ZoomOut();
+            //ZoomIn(0.9); // 文本缩小
         }
     }