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

Compare commits

base: jiayulong:4ac77bf7cafb8125872d8671b88222a7134d48d3
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:2b60ae10fa8a5b2d33aafa1e5704289648f1f2db
Branches Tags
jiayulong:main
jiayulong:master

No commits in common. "4ac77bf7cafb8125872d8671b88222a7134d48d3" and "2b60ae10fa8a5b2d33aafa1e5704289648f1f2db" have entirely different histories.
4ac77bf7ca ... 2b60ae10fa

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

6
logPlus/mainwindowcurve.cpp
View File

@ -54,8 +54,6 @@ extern int g_iDebug;
//SmallPrint
extern int g_iSmallPrint;
int g_iLoadingJson = 0;
MainWindowCurve::MainWindowCurve(QWidget *parent) :
QMainWindow(parent),
ui(new Ui::MainWindowCurve)
@ -4657,12 +4655,8 @@ void MainWindowCurve::Open(QString fileFull)
if (value.isArray()) {
wellsArray = value.toArray();
qDebug() << "wellsArray number:" << QString::number(wellsArray.size());
//是否正在加载json
g_iLoadingJson = 1;
//展示所有井
DisplayWells(wellsArray);
g_iLoadingJson = 0;
}
}
//

10
logPlus/qmycustomplot.cpp
View File

@ -36,7 +36,6 @@ extern double g_dPixelPerCm;//每厘米像素数
extern double g_SDepthFac;
extern double g_EDepthFac;
extern QString g_SelectMFac;
extern int g_iLoadingJson;
QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strType) :
QCustomPlot(parent)
@ -274,11 +273,8 @@ void QMyCustomPlot::initGeometry(QString strUuid, int nscale, double fW)
int ntmpw = fW * g_dPixelPerCm;
this->setGeometry(0, 0, ntmpw - 2, (int)dHight);
if(g_iLoadingJson==0)//针对模板加载，不处理滚动条，避免多次冲突
{
//修改滚动条，针对新建的
emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
}
//修改滚动条，针对新建的
emit CallManage::getInstance()->sig_changeScrollBar(m_strUuid);
}
void QMyCustomPlot::changePropertyWaveUpdate()
@ -12457,7 +12453,7 @@ void QMyCustomPlot::drawDipAngle(double centerX, double centerY, float ifdir[360
for (int i = 0; i < lineNumber; ++i)
{
double currY = startX - i * step;
//核心：每个刻度单独计算长度（和你GDI完全一样，每个长度不同）
// <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 核心：每个刻度单独计算长度（和你GDI完全一样，每个长度不同）
double dynamicLen = 0.1 * ifdir[i] / dirmax + lineHeight;
QCPItemLine *scaleLine = new QCPItemLine(this);