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

1.模板加载时，不使用进度条 2.工具toolbar追加黑白图按钮

Browse Source
This commit is contained in:
jiayulong 2026-05-20 11:04:38 +08:00
parent c38742995e
commit d835af126e
6 changed files with 45 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
logPlus/CallManage.h
View File

@ -201,6 +201,9 @@ signals:
//修改滚动条，针对新建的
void sig_changeScrollBar(QString strUuid);
//修改黑白图
void sig_changeBlack(QString strUuid, bool bBlack);
void sig_changeWellProperty(QString strSlfName, QString strWellName, QVariantList listVal);
//改变道宽

18
logPlus/formdraw.cpp
View File

@ -520,10 +520,10 @@ void FormDraw::DisplayLines(QJsonArray linesArray)
}
}
//进度提示
char s[200];
DepthProgress mDepthProgress;
mDepthProgress.CreatProgress(0, iCount,"加载..");
// //进度提示
// char s[200];
// DepthProgress mDepthProgress;
// mDepthProgress.CreatProgress(0, iCount,"加载..");
for (int id = 0; id < iCount; id++)
{
@ -627,16 +627,16 @@ void FormDraw::DisplayLines(QJsonArray linesArray)
{
DisplayType_One(lineObjInfo);
}
//中间
sprintf(s,"加载中，共计%d条，正在加载第%d条..", iCount, id+1);
mDepthProgress.SetShowName(s);
mDepthProgress.SetDepth(id+1);
// //中间
// sprintf(s,"加载中，共计%d条，正在加载第%d条..", iCount, id+1);
// mDepthProgress.SetShowName(s);
// mDepthProgress.SetDepth(id+1);
}
}
}
}
//
mDepthProgress.DelProgress();
//mDepthProgress.DelProgress();
}
// 岩心分析

20
logPlus/mainwindowcurve.cpp
View File

@ -329,13 +329,14 @@ void MainWindowCurve::initMainToolBar()
QIcon SaveAsSvgIcon(::GetImagePath()+"icon/ExportSVG.png");
QIcon doubleHeadIcon(::GetImagePath()+"icon/oneortwohead.png");
QIcon autorollIcon(::GetImagePath()+"icon/autoroll.png");
QIcon loadIcon(":/image/export.png");
QIcon blackIcon(::GetImagePath()+"icon/image/black.png");
//Main工具栏
m_selectWellAc = new QAction(selectWellIcon, "选择井", this);
m_fixwellsectionHeaderAc = new QAction(fixwellsectionHeaderIcon, "锁头", this);
m_currtempliteAc = new QAction(currtempliteIcon, "加载图文件", this);
m_saveastemplateAc = new QAction(saveastemplateIcon, "另存为图文件", this);
m_blackAc = new QAction(blackIcon, "黑白图", this);
m_doubleHeadAc = new QAction(doubleHeadIcon, "单曲线头", this);
m_executeDepthShiftAc = new QAction(executeDepthShiftIcon, "校深", this);
m_joindepthAc = new QAction(joindepthIcon, "拼接", this);
@ -344,7 +345,6 @@ void MainWindowCurve::initMainToolBar()
m_SaveAsPictureAc = new QAction(SaveAsPictureIcon, "导出长图", this);
m_SaveAsPdfAc = new QAction(SaveAsPdfIcon, "导出PDF", this);
m_SaveAsSvgAc = new QAction(SaveAsSvgIcon, "导出SVG", this);
//m_openAc = new QAction(openFileIcon, "打开", this);
ui->mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); //此种方式为文字显示在图标右侧
@ -354,6 +354,7 @@ void MainWindowCurve::initMainToolBar()
//ui->mainToolBar->addAction(m_currtempliteAc);
ui->mainToolBar->addAction(m_saveastemplateAc); //另存为图文件
ui->mainToolBar->addSeparator();
ui->mainToolBar->addAction(m_blackAc); //黑白图
ui->mainToolBar->addAction(m_doubleHeadAc); //单曲线头
ui->mainToolBar->addAction(m_executeDepthShiftAc); //校深
ui->mainToolBar->addAction(m_joindepthAc); //拼接
@ -363,11 +364,10 @@ void MainWindowCurve::initMainToolBar()
ui->mainToolBar->addAction(m_SaveAsPictureAc); //导出长图
ui->mainToolBar->addAction(m_SaveAsPdfAc); //导出PDF
ui->mainToolBar->addAction(m_SaveAsSvgAc); //导出SVG
// ui->mainToolBar->addAction(m_loadAc);
//ui->mainToolBar->addAction(m_openAc);
// 设置为可选中
m_fixwellsectionHeaderAc->setCheckable(true); //锁头
m_blackAc->setCheckable(true); //黑白图
m_doubleHeadAc->setCheckable(true); //单曲线头
m_executeDepthShiftAc->setCheckable(true); //校深
m_joindepthAc->setCheckable(true); //拼接
@ -378,6 +378,7 @@ void MainWindowCurve::initMainToolBar()
connect(m_currtempliteAc, &QAction::triggered, this, &MainWindowCurve::s_currtemplite);
connect(m_saveastemplateAc, &QAction::triggered, this, &MainWindowCurve::s_Save);
connect(m_blackAc, &QAction::triggered, this, &MainWindowCurve::s_Black);
connect(m_doubleHeadAc, &QAction::triggered, this, &MainWindowCurve::s_DoubleHead);
connect(m_executeDepthShiftAc, &QAction::triggered, this, &MainWindowCurve::s_ExecuteDepthShift);
connect(m_joindepthAc, &QAction::triggered, this, &MainWindowCurve::s_ExecuteMerge);
@ -392,11 +393,6 @@ void MainWindowCurve::initMainToolBar()
connect(CallManage::getInstance(), SIGNAL(sig_SaveAsPdf()), this, SLOT(s_SaveAsPdf()));
connect(CallManage::getInstance(), SIGNAL(sig_SaveAsSvg()), this, SLOT(s_SaveAsSvg()));
// connect(m_grepAc, &QAction::triggered, this, &MainWindow::s_Risize);
// connect(m_compileAc, &QAction::triggered, this, &MainWindow::s_AddOne);
// connect(m_debugAc, &QAction::triggered, this, &MainWindow::s_DrawImg);
// connect(m_loadAc, &QAction::triggered, this, &MainWindow::s_DrawLine);
//connect(m_openAc, &QAction::triggered, this, &MainWindowCurve::s_Open);
}
//初始化工具栏
void MainWindowCurve::initToolBar()
@ -2630,6 +2626,12 @@ void MainWindowCurve::s_Save()
}
}
//黑白图
void MainWindowCurve::s_Black()
{
}
//单曲线头
void MainWindowCurve::s_DoubleHead()
{

4
logPlus/mainwindowcurve.h
View File

@ -192,6 +192,7 @@ public:
QAction* m_fixwellsectionHeaderAc = nullptr; //锁头
QAction* m_currtempliteAc = nullptr; //加载图文件
QAction* m_saveastemplateAc = nullptr; //另存为图文件
QAction* m_blackAc = nullptr; //黑白图
QAction* m_doubleHeadAc = nullptr; //单曲线头
QAction* m_executeDepthShiftAc = nullptr; //校深
QAction* m_joindepthAc = nullptr; //拼接
@ -200,8 +201,6 @@ public:
QAction* m_SaveAsPictureAc = nullptr; //导出长图
QAction* m_SaveAsPdfAc = nullptr; //导出PDF
QAction* m_SaveAsSvgAc = nullptr; //导出SVG
// QAction* m_debugAc = nullptr; //
// QAction* m_loadAc = nullptr; //加载
public slots:
void s_NewWell(QString strWellName, QString strSlfName);//新建井
@ -281,6 +280,7 @@ public slots:
void s_showHeadTable(); //显示/隐藏图头
void s_currtemplite(); //加载图文件
void s_Save(); //保存图文件
void s_Black(); //黑白图
void s_DoubleHead(); //单曲线头
void s_ExecuteDepthShift(); //校深
void s_ExecuteMerge(); //拼接

15
logPlus/qmycustomplot.cpp
View File

@ -251,6 +251,8 @@ QMyCustomPlot::QMyCustomPlot(QWidget *parent, QString strSlfName, QString strWel
connect(CallManage::getInstance(), SIGNAL(sig_changeDenvProperty(QString, QString, QString, QString, QString)), this, SLOT(s_changeDenvProperty(QString, QString, QString, QString, QString)));
//改变多臂井径属性
connect(CallManage::getInstance(), SIGNAL(sig_changeMCalsProperty(QString, QString, QString, QString, QString, QString)), this, SLOT(s_changeMCalsProperty(QString, QString, QString, QString, QString, QString)));
//黑白图
connect(CallManage::getInstance(), SIGNAL(sig_changeBlack(QString, bool)), this, SLOT(s_changeBlack(QString, bool)));
}
void QMyCustomPlot::initGeometry(QString strUuid, int nscale, double fW)
@ -14223,3 +14225,16 @@ void QMyCustomPlot::Draw_MCals(QString strLineName, QString strNewLineName)
drawNrad->DrawNrad(m_strSlfName, m_strLineName);
this->replot();
}
void QMyCustomPlot::s_changeBlack(QString strUuid, bool bBlack)
{
if(m_strUuid==strUuid)
{
}
else
{
return;
}
m_bBlack = bBlack;
}

5
logPlus/qmycustomplot.h
View File

@ -739,6 +739,8 @@ public slots:
//改变多臂井径属性
void s_changeMCalsProperty(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strNewLineName);
//修改黑白图
void s_changeBlack(QString strUuid, bool bBlack);
public:
//蝌蚪图重绘网格线
@ -833,6 +835,9 @@ public:
//多臂井径
void Draw_MCals(QString strLineName, QString strNewLineName);
//黑白图
bool m_bBlack = false;
private:
};