jiayulong/logplus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jiayulong:e2cf4476e8d267337196f5b9ab2552c065dca45e
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:a68e83e4a1ee1363134dacd6539e34c1906f0d84
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "e2cf4476e8d267337196f5b9ab2552c065dca45e" and "a68e83e4a1ee1363134dacd6539e34c1906f0d84" have entirely different histories.
e2cf4476e8 ... a68e83e4a1

2 changed files with 2 additions and 35 deletions
Show Stats Expand all files Collapse all files

36
logPlus/formdraw.cpp
View File

@ -1246,24 +1246,6 @@ 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;
@ -1290,8 +1272,6 @@ 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++)
{
@ -1321,20 +1301,8 @@ void FormDraw::DrawTabDip(QMyCustomPlot *widget)
pPenTail.setWidth(m_nTailWidth);
// 角度
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;
//flVal = frac.DIPorS;
x = frac.DIPorS;
y = -frac.DEP;
// int LineWidth = m_nRadius;

1
logPlus/formdraw.h
View File

@ -96,7 +96,6 @@ 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;
//