From 0e4a569e194da6b63006d4cf5b26f04b78210118 Mon Sep 17 00:00:00 2001
From: jiayulong <jiayulong@hivekion.com>
Date: Wed, 26 Nov 2025 11:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=9D=8C=E8=9A=AA=E5=9B=BE?=
 =?UTF-8?q?=E5=9D=90=E6=A0=87=E8=AE=A1=E7=AE=97=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logPlus/formdraw.cpp | 36 ++++++++++++++++++++++++++++++++++--
 logPlus/formdraw.h   |  1 +
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp
index cff5e8d..b97746c 100644
--- a/logPlus/formdraw.cpp
+++ b/logPlus/formdraw.cpp
@@ -1246,6 +1246,24 @@ void FormDraw::initTableLine(QMyCustomPlot *widget, QString strSlfName, QString
     DrawTabDip(widget);
 }
 
+void FormDraw::CalcDipWidth(int nColumn,float *flWidth,float factor,int x1,int x2,float flHoriRatio)
+{
+    float scale ;
+    int k;
+
+    scale = flWidth[0]=1.;
+    for(k=1;k<nColumn;k++)
+    {
+        flWidth[k] = flWidth[k-1] / factor;
+        scale += flWidth[k];
+    }
+    scale = /*100. **/flHoriRatio*(x2 - x1) / scale;
+    for(k=0;k<nColumn;k++)
+    {
+        flWidth[k] = flWidth[k] * scale;
+    }
+}
+
 void FormDraw::DrawTabDip(QMyCustomPlot *widget)
 {
     float sdep,edep,flDepthScale,tempf,flVal;
@@ -1272,6 +1290,8 @@ void FormDraw::DrawTabDip(QMyCustomPlot *widget)
     m_crCircle = QColor(0,0,0);
     m_crTail = QColor(0,0,0);
 
+    CalcDipWidth(9,flWidth, 1.2, 0, g_iOneWidth, 1.);
+
     n = m_FracDefList.count();
     for (i=0; i<nPointNum; i++)
     {
@@ -1301,8 +1321,20 @@ void FormDraw::DrawTabDip(QMyCustomPlot *widget)
             pPenTail.setWidth(m_nTailWidth);
 
             // 角度
-            //flVal = frac.DIPorS;
-            x = frac.DIPorS;
+            flVal = frac.DIPorS;
+            tempf = flVal /10.;
+            tempi = tempf;
+            x = fmod(flVal,(float)(10.));
+            if ( x == 0 )
+            {
+                tempi=0;//tempi --;
+            }
+            tempf = 0.;
+            for (j=0; j<tempi; j++)
+                tempf += flWidth[j];
+            x = tempf+(flVal-tempi*10.)*(flWidth[tempi]/10.);
+
+            //x = frac.DIPorS;
             y = -frac.DEP;
 
 //            int LineWidth = m_nRadius;
diff --git a/logPlus/formdraw.h b/logPlus/formdraw.h
index 92268ab..c96b5ee 100644
--- a/logPlus/formdraw.h
+++ b/logPlus/formdraw.h
@@ -96,6 +96,7 @@ public:
     void ReadFracDef();
     void ReadData(QString strSlfName, QString strLineName);
     void DrawTabDip(QMyCustomPlot *widget);
+    void CalcDipWidth(int nColumn,float *flWidth,float factor,int x1,int x2,float flHoriRatio);
 
     int m_PointNum;
     //