Compare commits

..

No commits in common. "5f4ec06978dff859af2780be3bf4a5b4b52646e0" and "526f0eeb95a4d07f27271a6c1310b16a4ff963bd" have entirely different histories.

2 changed files with 6 additions and 6 deletions

View File

@ -2151,7 +2151,7 @@ void MainWindowCurve::s_ClearSetCurve()
} }
} }
QStringList MainWindowCurve::insertCol(double dW) QStringList MainWindowCurve::insertCol(int nW)
{ {
QStringList sret; QStringList sret;
int column = -1; int column = -1;
@ -2213,7 +2213,7 @@ QStringList MainWindowCurve::insertCol(double dW)
} }
//设置列宽 //设置列宽
ui->tableWidget_2->setColumnWidth(column, iWidth+dW*g_dPixelPerCm); ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm);
return sret; return sret;
} }
@ -3457,8 +3457,8 @@ void MainWindowCurve::s_NewTrack()
void MainWindowCurve::s_NewDepth() void MainWindowCurve::s_NewDepth()
{ {
int column = -1; int column = -1;
double dW = 1.2; int nW = 2;
QStringList sret = this->insertCol(dW); QStringList sret = this->insertCol(nW);
if (sret.length() <= 0) if (sret.length() <= 0)
return; return;
@ -3468,7 +3468,7 @@ void MainWindowCurve::s_NewDepth()
dt << sret.at(1); dt << sret.at(1);
dt << "深度"; dt << "深度";
dt << "depthObject"; dt << "depthObject";
dt << QString::number(dW); dt << QString::number(nW);
//新建道 //新建道
emit CallManage::getInstance()->sig_NewCol(dt); emit CallManage::getInstance()->sig_NewCol(dt);
} }

View File

@ -118,7 +118,7 @@ public:
QJsonArray m_tailsArray; QJsonArray m_tailsArray;
// 返回 strWellName << strSlfName // 返回 strWellName << strSlfName
QStringList insertCol(double dW); QStringList insertCol(int nW);
// 返回 strWellName << strSlfName // 返回 strWellName << strSlfName
QStringList getSelectWell(); QStringList getSelectWell();