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

1. 左侧工具栏按钮功能优化，在选中道后，新的曲线、波列、固井等添加到道里 2.固井结论道(table类型曲线)追加右键菜单

Browse Source
This commit is contained in:
jiayulong 2026-02-11 16:11:45 +08:00
parent bf06d27cae
commit a9f67d5549
13 changed files with 298 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CallManage/CallManage.h
View File

@ -52,7 +52,7 @@ signals:
void sig_NewTrack_No_Line(QString strUuid, QJsonObject topObj, QJsonObject infoObj);//新建空白道，没有曲线
void sig_AddLine(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName);//新建曲线
void sig_AddLine_Property(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName,
double newLeftScale, double newRightScale, QString strScaleType, QColor lineColor, double width, Qt::PenStyle lineStyle);//新建曲线，带属性
double newLeftScale, double newRightScale, QString strScaleType, QColor lineColor, double width, Qt::PenStyle lineStyle, QStringList listOtherProperty);//新建曲线，带属性
void sig_delLine(QString strUuid, QString strWellName, QString strTrackName, QString strLineName);//删除曲线
void sig_AddDepth(QString strUuid, QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, int nW = 0);//深度

16
logPlus/formdraw.cpp
View File

@ -55,15 +55,17 @@ FormDraw::FormDraw(QWidget *parent, QString strWellName, QString strTrackName) :
m_strTrackName = strTrackName;
m_nSltk=15.0;//杆状图长度
//曲线
connect(CallManage::getInstance(), SIGNAL(sig_AddLine(QString, QString, QString, QString, QString)), this, SLOT(s_addLine(QString, QString, QString, QString, QString)));
connect(CallManage::getInstance(), SIGNAL(sig_AddLine_Property(QString, QString, QString, QString, QString, double, double, QString, QColor, double, Qt::PenStyle, QStringList)),
this, SLOT(s_AddLine_Property(QString, QString, QString, QString, QString, double, double, QString, QColor, double, Qt::PenStyle, QStringList)));
connect(CallManage::getInstance(), SIGNAL(sig_delLine(QString, QString, QString, QString)), this, SLOT(s_delLine(QString, QString, QString, QString)));
connect(CallManage::getInstance(), SIGNAL(sig_MouseMove(QString, QString, QString, float)), this, SLOT(s_MouseMove(QString, QString, QString, float)));
//波列
connect(CallManage::getInstance(), SIGNAL(sig_AddWave(QString, QString, QString, QString, QString)), this, SLOT(s_addWave(QString, QString, QString, QString, QString)));
connect(CallManage::getInstance(), SIGNAL(sig_delWave(QString, QString, QString, QString)), this, SLOT(s_delWave(QString, QString, QString, QString)));
//表格曲线
//表格
connect(CallManage::getInstance(), SIGNAL(sig_AddTableLine(QString, QString, QString, QString, QString)), this, SLOT(s_addTableLine(QString, QString, QString, QString, QString)));
connect(CallManage::getInstance(), SIGNAL(sig_delTableLine(QString, QString, QString, QString)), this, SLOT(s_delTableLine(QString, QString, QString, QString)));
@ -3180,7 +3182,7 @@ void FormDraw::initIMAGE_DATA(QMyCustomPlot *widget, QString strSlfName, QString
double width=2;
QString strScaleType = "";
//道-对象
m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, m_RightVal, m_LeftVal, strScaleType, "yanxinImageObject");
m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, m_RightVal, m_LeftVal, strScaleType, "tableObject");//yanxinImageObject
}
bool FormDraw::LoadFromSLF(QMyCustomPlot *widget, QString strSlfName, QString strLineName)
@ -6238,8 +6240,14 @@ void FormDraw::addRandomGraph(QMyCustomPlot *widget, QVector<double> x, QVector<
widget->addRandomGraph(x, y, strSlfName, strLineName, strAliasName, strUnit,
newLeftScale, newRightScale, strScaleType, newlineColor, width, lineStyle);
//道-对象
m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, m_vmax, m_vmin, strScaleType, "curveObject");
if(widget->m_bDrawCore_PHYSICS)
{
//岩心分析特殊处理
m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, m_vmax, m_vmin, strScaleType, "tableObject");
}
else {
m_formTrack->Add(strSlfName, m_strWellName, m_strTrackName, strLineName, strAliasName, strUnit, newlineColor, width, m_vmax, m_vmin, strScaleType, "curveObject");
}
//AppendConsole(PAI_INFO, "FormDraw addRandomGraph");
// widget->addGraph();
// if(strLineName=="")

28
logPlus/formhead.cpp
View File

@ -32,6 +32,9 @@ FormHead::FormHead(QWidget *parent, QString indexID) :
{
ui->setupUi(this);
//加载样式
loadStyle(":/qrc/qss/flatgray.css");
m_indexID =indexID;
m_parent = (FormMultiHeads *)parent;
@ -82,6 +85,31 @@ FormHead::~FormHead()
delete ui;
}
void FormHead::loadStyle(const QString &qssFile)
{
//加载样式表
QString qss;
QFile file(qssFile);
if (file.open(QFile::ReadOnly)) {
//用QTextStream读取样式文件不用区分文件编码 带bom也行
QStringList list;
QTextStream in(&file);
//in.setCodec("utf-8");
while (!in.atEnd()) {
QString line;
in >> line;
list << line;
}
file.close();
qss = list.join("\n");
QString paletteColor = qss.mid(20, 7);
this->setPalette(QPalette(paletteColor));
//用时主要在下面这句
this->setStyleSheet(qss);
}
}
void FormHead::resizeWindow(bool bDelete)
{
QRect rect = this->rect();

1
logPlus/formhead.h
View File

@ -40,6 +40,7 @@ public:
FormMultiHeads *m_parent;
public:
void loadStyle(const QString &qssFile);
void Init(int iRows, int iCols);
//更新
void updateJsonInfo(QJsonObject headObjInfo);

27
logPlus/forminfo.cpp
View File

@ -848,19 +848,38 @@ void FormInfo::contextMenuEvent(QContextMenuEvent *event)
{
QMenu menu(this);
menu.addAction(QIcon(::GetImagePath() + "icon/Sheet.png"), "数据对象查看", this, &FormInfo::onShowCurve);
menu.addAction(QIcon(::GetImagePath() + "icon/Delete.png"), "删除当前对象", this, &FormInfo::onDeleteObject);
menu.addAction(QIcon(::GetImagePath() + "icon/Delete.png"), "删除当前对象", this, &FormInfo::onDeleteCurv);
menu.exec(event->globalPos());
}
else if(m_strType=="tableObject")
{
QMenu menu(this);
menu.addAction(QIcon(::GetImagePath() + "icon/Sheet.png"), "数据对象查看", this, &FormInfo::onShowTable);
menu.addAction(QIcon(::GetImagePath() + "icon/Delete.png"), "删除当前对象", this, &FormInfo::onDeleteTable);
menu.exec(event->globalPos());
}
}
//数据查看
//曲线数据查看
void FormInfo::onShowCurve()
{
emit CallManage::getInstance()->sig_ShowCurve(m_strSlfName, m_strLineName);
}
void FormInfo::onDeleteObject()
//删除曲线
void FormInfo::onDeleteCurv()
{
//删除曲线
emit CallManage::getInstance()->sig_delLine(m_strUuid, m_strWellName, m_strTrackName, m_strLineName);
}
//表格查看
void FormInfo::onShowTable()
{
emit CallManage::getInstance()->sig_ShowTable(m_strSlfName, m_strLineName);
}
//删除表格
void FormInfo::onDeleteTable()
{
//删除表格
emit CallManage::getInstance()->sig_delTableLine(m_strUuid, m_strWellName, m_strTrackName, m_strLineName);
}

11
logPlus/forminfo.h
View File

@ -149,10 +149,15 @@ private:
QPoint startPosition;
public slots:
//数据查看
//曲线数据查看
void onShowCurve();
//删除当前对象
void onDeleteObject();
//删除曲线
void onDeleteCurv();
//表格查看
void onShowTable();
//删除表格
void onDeleteTable();
};

29
logPlus/formmultiheads.cpp
View File

@ -3,6 +3,7 @@
#include <QDebug>
#include <QMenu>
#include <QFile>
#include "newheaddialog.h"
#include "formhead.h"
#include "qtcommonclass.h"
@ -21,6 +22,9 @@ FormMultiHeads::FormMultiHeads(QWidget *parent) :
{
ui->setupUi(this);
//加载样式
loadStyle(":/qrc/qss/flatgray.css");
//-------------------------------------
// 强制使用Qt渲染引擎
//QApplication::setAttribute(Qt::AA_UseStyleSheetPropagationInWidgetStyles, true);
@ -61,6 +65,31 @@ FormMultiHeads::~FormMultiHeads()
delete ui;
}
void FormMultiHeads::loadStyle(const QString &qssFile)
{
//加载样式表
QString qss;
QFile file(qssFile);
if (file.open(QFile::ReadOnly)) {
//用QTextStream读取样式文件不用区分文件编码 带bom也行
QStringList list;
QTextStream in(&file);
//in.setCodec("utf-8");
while (!in.atEnd()) {
QString line;
in >> line;
list << line;
}
file.close();
qss = list.join("\n");
QString paletteColor = qss.mid(20, 7);
this->setPalette(QPalette(paletteColor));
//用时主要在下面这句
this->setStyleSheet(qss);
}
}
void FormMultiHeads::slotContextMenu(QPoint pos)
{
//

1
logPlus/formmultiheads.h
View File

@ -30,6 +30,7 @@ public slots:
public:
void loadStyle(const QString &qssFile);
void AddHead();
void resizeItem(QString indexID, double tempWidth, double tempHight, bool bDelete=false);
QJsonArray makeJsonArray();

52
logPlus/formtrack.cpp
View File

@ -21,7 +21,7 @@ FormTrack::FormTrack(QWidget *parent, QString strWellName, QString strTrackName)
ui->tableWidget->setShowGrid(false);
//设置样式表，竖直边框宽度为0，隐藏
ui->tableWidget->setStyleSheet( "QTableView::item {border-left: 0px solid black;} \
QTableView::item:selected {border-left: 0px solid black;}\
QTableView::item:selected {border-left: 0px solid black; color:#57595B; background:#E4E4E4;}\
QTableView::item {border-right: 0px solid black;} \
QTableView::item:selected {border-right: 0px solid black;}");
@ -48,10 +48,14 @@ FormTrack::FormTrack(QWidget *parent, QString strWellName, QString strTrackName)
connect(this, SIGNAL(sig_AddLine(QString, QString, QString, QString, QString, QString, QColor, double, float, float, QString)),
this, SLOT(s_addLine(QString, QString, QString, QString, QString, QString, QColor, double, float, float, QString)));
//删除曲线
connect(CallManage::getInstance(), SIGNAL(sig_delLine(QString, QString, QString, QString)), this, SLOT(s_delLine(QString, QString, QString, QString)));
//波列
connect(CallManage::getInstance(), SIGNAL(sig_delLine(QString, QString, QString, QString)),
this, SLOT(s_delLine(QString, QString, QString, QString)));
//表格
connect(this, SIGNAL(sig_AddWave(QString, QString, QString, QString, QString, QString, QColor, double, float, float, QString)),
this, SLOT(s_addWave(QString, QString, QString, QString, QString, QString, QColor, double, float, float, QString)));
connect(CallManage::getInstance(), SIGNAL(sig_delTableLine(QString, QString, QString, QString)),
this, SLOT(s_delTableLine(QString, QString, QString, QString)));
//波列
connect(this, SIGNAL(sig_AddTableLine(QString, QString, QString, QString, QString, QString, QColor, double, float, float, QString)),
@ -198,10 +202,10 @@ void FormTrack::Add(QString strSlfName, QString strWellName, QString strTrackNam
{
emit sig_AddDenv(strSlfName, strWellName, m_strTrackName, strLineName, strAliasName, strUnit, lineColor, dWidth, vmax, vmin, strScaleType);
}
else if(strType=="yanxinImageObject")
{
emit sig_AddYanXinImage(strSlfName, strWellName, m_strTrackName, strLineName, strAliasName, strUnit, lineColor, dWidth, vmax, vmin, strScaleType);
}
// else if(strType=="yanxinImageObject")
// {
// emit sig_AddYanXinImage(strSlfName, strWellName, m_strTrackName, strLineName, strAliasName, strUnit, lineColor, dWidth, vmax, vmin, strScaleType);
// }
else if(strType=="DrawImageObject")
{
emit sig_AddDrawImage(strSlfName, strWellName, m_strTrackName, strLineName, strAliasName, strUnit, lineColor, dWidth, vmax, vmin, strScaleType);
@ -376,6 +380,38 @@ void FormTrack::s_delLine(QString strUuid, QString strWellName, QString strTrack
}
}
void FormTrack::s_delTableLine(QString strUuid, QString strWellName, QString strTrackName, QString strLineName)
{
//井名&道名不一致
if(strUuid == m_strUuid && m_strWellName == strWellName && m_strTrackName == strTrackName)
{
}
else
{
return;
}
//
int rowCount = ui->tableWidget->rowCount();
for(int i=0; i<rowCount; i++)
{
if( ui->tableWidget->cellWidget(i, 0) != nullptr )
{
auto myWidget = ui->tableWidget->cellWidget(i, 0);
FormInfo *formInfo = qobject_cast<FormInfo*>(myWidget);//获得widget
if(formInfo)
{
if(strUuid == formInfo->m_strUuid
&& formInfo->m_strWellName == strWellName
&& formInfo->m_strTrackName == strTrackName
&& formInfo->m_strLineName == strLineName)
{
ui->tableWidget->removeRow(i);
}
}
}
}
}
void FormTrack::s_addWave(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strAliasName, QString strUnit, QColor lineColor, double dWidth, float vmax, float vmin, QString strScaleType)
{
qDebug() << "FormTrack s_addWave";
@ -420,7 +456,7 @@ void FormTrack::s_AddTableLine(QString strSlfName, QString strWellName, QString
if(strLineName == "FRAC_HOLE.TABLE" || strLineName == "WORDS_RELUST" || strLineName == "RESULT"
|| strLineName == "GEO_LITH" || strLineName == "SWALL_CORE"
|| strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT"
|| strLineName == "CORE_PHYSICS")
|| strLineName == "CORE_PHYSICS" || strLineName == "IMAGE_DATA")
{
}

3
logPlus/formtrack.h
View File

@ -89,8 +89,11 @@ signals:
public slots:
void s_addLine(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strAliasName, QString strUnit, QColor lineColor, double dWidth, float vmax, float vmin, QString strScaleType);
void s_delLine(QString strUuid, QString strWellName, QString strTrackName, QString strLineName);
void s_addWave(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strAliasName, QString strUnit, QColor lineColor, double dWidth, float vmax, float vmin, QString strScaleType);
void s_AddTableLine(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strAliasName, QString strUnit, QColor lineColor, double dWidth, float vmax, float vmin, QString strScaleType);
void s_delTableLine(QString strUuid, QString strWellName, QString strTrackName, QString strLineName);
void s_addDepth(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strAliasName, QString strUnit, QColor lineColor, double dWidth, float vmax, float vmin, QString strScaleType);
void s_addGanZhuangTu(QString strSlfName, QString strWellName, QString strTrackName, QString strLineName, QString strAliasName, QString strUnit, QColor lineColor, double dWidth, float vmax, float vmin, QString strScaleType);

2
logPlus/formwell.cpp
View File

@ -28,6 +28,8 @@ FormWell::FormWell(QWidget *parent, QString strWellName) :
//ui->tableWidget->verticalHeader()->setFixedWidth(3);//标题栏宽度
ui->tableWidget->horizontalHeader()->setFixedHeight(3);
ui->tableWidget->setStyleSheet( "QTableView::item:selected {color:#57595B; background:#E4E4E4;}");
// 设置右键菜单策略
ui->tableWidget->setContextMenuPolicy(Qt::CustomContextMenu);
// 连接信号和槽

156
logPlus/mainwindowcurve.cpp
View File

@ -61,7 +61,7 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) :
ui->tableWidget_2->setShowGrid(false);
//设置样式表，只显示竖直边框
ui->tableWidget_2->setStyleSheet( "QTableView::item {border-left: 1px solid black;} \
QTableView::item:selected {border-left: 1px solid black;}\
QTableView::item:selected {border-left: 1px solid black; color:#57595B; background:#E4E4E4;}\
QTableView::item {border-right: 1px solid black;} \
QTableView::item:selected {border-right: 1px solid black;}");
@ -2091,6 +2091,66 @@ QStringList MainWindowCurve::insertCol(int nW)
return sret;
}
QStringList MainWindowCurve::getSelectWell_New()
{
QStringList sret;
//没有选中要添加的道
if(m_SelectTableItem.m_iTableType==0)
{
if(ui->tableWidget_2->columnCount()==0)
{
//0井，空白视图
QString strLeft = m_leftWidgets->getLeftTreeString();
if(strLeft.length() > 0)
{
QStringList list = strLeft.split("#@@#");//QString字符串分割函数
if (list.size() > 3)
{
QString strSlfName = list[0];
QString strWellName = list[1];
sret << strWellName << strSlfName;
return sret;
}
}
else {
QMessageBox::warning(this, "提示", "请先选中待处理井次!");
return sret;
}
}
else if(ui->tableWidget_2->columnCount()==1)
{
//单井
QString strWellName = ui->tableWidget_2->item(0, 0)->text();
//直接从单井获取，data记录slf路径
QString strSlfName = ui->tableWidget_2->item(0, 0)->data(Qt::UserRole+1).toString();
sret << strWellName << strSlfName;
return sret;
}
else
{
//多井
QMessageBox::warning(this, "提示", "请在可视解释视图，选择添加的井或道!");
return sret;
}
}
else if(m_SelectTableItem.m_iTableType==2)
{
//选中道
//不在此处处理
}
else
{
//选中井次或曲线
QString strSlfName = m_SelectTableItem.m_strSlfName;
QString strWellName = m_SelectTableItem.m_strWellName;
sret << strWellName << strSlfName;
return sret;
}
}
QStringList MainWindowCurve::getSelectWell()
{
QStringList sret;
@ -2490,7 +2550,7 @@ void MainWindowCurve::onItemClicked(QTableWidgetItem* item)
PropertyService()->initWellProperty(m_strUuid, strSlfName, strWellName, m_iY1, m_iY2);
//取消所有选中单元格
emit CallManage::getInstance()->sig_Raise(m_strUuid, "", "", "", "", 1, "");
emit CallManage::getInstance()->sig_Raise(m_strUuid, strSlfName, strWellName, "", "", 1, "");
}
@ -2640,7 +2700,14 @@ void MainWindowCurve::s_NewDepth()
//曲线
void MainWindowCurve::s_NewLogs()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建曲线
emit CallManage::getInstance()->sig_AddLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "AC");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2651,7 +2718,14 @@ void MainWindowCurve::s_NewLogs()
//波列
void MainWindowCurve::s_NewWave()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建波列
emit CallManage::getInstance()->sig_AddWave(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "STAIMAGE");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2662,7 +2736,14 @@ void MainWindowCurve::s_NewWave()
//解释结论
void MainWindowCurve::s_NewOGResult()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "RESULT");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2673,7 +2754,14 @@ void MainWindowCurve::s_NewOGResult()
//固井结论道
void MainWindowCurve::s_NewGujing()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "GUJING1_RESULT");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2684,7 +2772,14 @@ void MainWindowCurve::s_NewGujing()
//井壁取心
void MainWindowCurve::s_NewSideCore()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "SWALL_CORE");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2695,7 +2790,14 @@ void MainWindowCurve::s_NewSideCore()
//岩心分析
void MainWindowCurve::s_NewCore()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "CORE_PHYSICS");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2706,7 +2808,14 @@ void MainWindowCurve::s_NewCore()
//录井剖面
void MainWindowCurve::s_NewMudlogging()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "GEO_LITH");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2717,7 +2826,14 @@ void MainWindowCurve::s_NewMudlogging()
//岩性描述
void MainWindowCurve::s_NewTxt()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "WORDS_RELUST");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2728,7 +2844,14 @@ void MainWindowCurve::s_NewTxt()
//岩心照片
void MainWindowCurve::s_NewCoreImage()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "IMAGE_DATA");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -2761,7 +2884,14 @@ void MainWindowCurve::s_NewCrack()
//蝌蚪图
void MainWindowCurve::s_NewShowDip()
{
QStringList sret = this->getSelectWell();
//选中道
if(m_SelectTableItem.m_iTableType==2) {
//新建表格曲线
emit CallManage::getInstance()->sig_AddTableLine(m_strUuid, m_SelectTableItem.m_strSlfName, m_SelectTableItem.m_strWellName, m_SelectTableItem.m_strTrackName, "FRAC_HOLE.TABLE");
return;
}
QStringList sret = this->getSelectWell_New();
if(sret.length() <= 0)
return;
@ -3160,7 +3290,7 @@ void MainWindowCurve::s_AddLine_Property(QString strSlfName, QString strWellName
double newLeftScale, double newRightScale, QString strScaleType, QColor lineColor, double width, Qt::PenStyle lineStyle, QStringList listOtherProperty)
{
emit CallManage::getInstance()->sig_AddLine_Property(m_strUuid, strSlfName, strWellName, strTrackName, strLineName,
newLeftScale, newRightScale, strScaleType, lineColor, width, lineStyle);
newLeftScale, newRightScale, strScaleType, lineColor, width, lineStyle, listOtherProperty);
}
//新建井+道+曲线(首条)

4
logPlus/mainwindowcurve.h
View File

@ -118,7 +118,9 @@ public:
QStringList insertCol(int nW);
// 返回 strWellName << strSlfName
QStringList getSelectWell();
QStringList getSelectWell();
// 返回 strWellName << strSlfName
QStringList getSelectWell_New();
//停靠
void dockLayout();