diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index cfb118f..440e19f 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -2753,8 +2753,8 @@ void PropertyWidget::initTrackProperty(FormTrackTop *fromTop, int iWidth, QMyTab m_strSlfName = fromTop->m_strSlfName; // - double cmWidth = (double)iWidth/(double)g_dPixelPerCm; - _CreateVariantPropertyItem("通常", "道宽(cm)", cmWidth, QVariant::Double); + //double cmWidth = (double)iWidth/(double)g_dPixelPerCm; + _CreateVariantPropertyItem("通常", "道宽(cm)", fromTop->m_nTrackW, QVariant::Double); _CreateVariantPropertyItem("通常", "道名称", m_strTrackName, QVariant::String); _CreateVariantPropertyItem("通常", "道头字体", fromTop->m_font, QVariant::Font); _CreateVariantPropertyItem("通常", "道头字颜色", fromTop->m_fontColor, QVariant::Color); diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 0d3263d..0e3dae4 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -3890,9 +3890,6 @@ FormLine* FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QStrin // FormLine *curv = new FormLine(this, strSlfName, strWellName, strTrackName, strLineName); curv->m_strUuid = m_strUuid; - //背景设置成透明色 - // curv->setBackground(Qt::transparent); - // curv->setStyleSheet("background: transparent;"); double dHight = 0; dHight = (m_iY2-m_iY1)*100.0/(double)m_iScale * g_dPixelPerCm; @@ -3906,7 +3903,8 @@ FormLine* FormDraw::s_addSantuyibiao(QString strUuid, QString strSlfName, QStrin { dHight = 32767; } - curv->setGeometry(0, 0, g_iOneWidth*4, (int)dHight); + int ntmpw = (g_iOneWidth * 4) * g_dPixelPerCm; + this->setGeometry(0, 0, ntmpw - 2, (int)dHight); curv->show(); //斜井三图一表 diff --git a/logPlus/formwell.cpp b/logPlus/formwell.cpp index e6be30b..196b680 100644 --- a/logPlus/formwell.cpp +++ b/logPlus/formwell.cpp @@ -80,7 +80,7 @@ int FormWell::insertColumn(int nw) auto table = ui->tableWidget; int ncolCount = table->columnCount(); table->insertColumn(ncolCount); - table->setColumnWidth(ncolCount, nw); + table->setColumnWidth(ncolCount, nw * g_dPixelPerCm); table->setHorizontalHeaderItem(ncolCount, new QTableWidgetItem("")); // ncolCount = table->columnCount(); @@ -199,7 +199,7 @@ QVector FormWell::new_track(QStringList listdt, QString strTrackName) // trackTop->setFixedWidth(nW/2); vec << trackTop; trackTop->m_strUuid = m_strUuid; - trackTop->m_nTrackW = nW / static_cast(g_dPixelPerCm); + trackTop->m_nTrackW = nW;// / static_cast(g_dPixelPerCm); ui->tableWidget->setCellWidget(i, columnCount, trackTop); } else if(i==1) @@ -546,9 +546,9 @@ void FormWell::slot_NewTrack_No_Line(QString strUuid, QJsonObject topObj, QJsonO } } -int FormWell::setColWidth(int iCurrentCol, int iWidth) +int FormWell::setColWidth(int iCurrentCol, float fWidth) { - int iNewWidth = iWidth * static_cast(g_dPixelPerCm); + int iNewWidth = static_cast(fWidth * g_dPixelPerCm); //设置列宽 ui->tableWidget->setColumnWidth(iCurrentCol, iNewWidth); @@ -558,7 +558,7 @@ int FormWell::setColWidth(int iCurrentCol, int iWidth) FormTrackTop *formTop = qobject_cast(topWidget);//获得widget if(formTop) { - formTop->m_nTrackW = iWidth; + formTop->m_nTrackW = fWidth; } } auto myWidget = ui->tableWidget->cellWidget(2, iCurrentCol); diff --git a/logPlus/formwell.h b/logPlus/formwell.h index 13bc4e0..d4c738b 100644 --- a/logPlus/formwell.h +++ b/logPlus/formwell.h @@ -76,7 +76,7 @@ public: void setRowHeight(double dHight, QProgressBar *progressBar, int iSplit); //设置道宽 - int setColWidth(int iCurrentCol, int iNewWidth); + int setColWidth(int iCurrentCol, float iNewWidth); void setWellProperty(QVariantList listVal); diff --git a/logPlus/logplus.vcxproj b/logPlus/logplus.vcxproj index 4de351d..22ec5b3 100644 --- a/logPlus/logplus.vcxproj +++ b/logPlus/logplus.vcxproj @@ -11,6 +11,7 @@ + @@ -138,6 +139,7 @@ + diff --git a/logPlus/logplus.vcxproj.filters b/logPlus/logplus.vcxproj.filters index 7457f9b..8822ab4 100644 --- a/logPlus/logplus.vcxproj.filters +++ b/logPlus/logplus.vcxproj.filters @@ -259,6 +259,9 @@ Header Files + + Header Files + @@ -474,6 +477,9 @@ Source Files + + Source Files + diff --git a/logPlus/mainwindow.cpp b/logPlus/mainwindow.cpp index d154432..fa61522 100644 --- a/logPlus/mainwindow.cpp +++ b/logPlus/mainwindow.cpp @@ -144,7 +144,7 @@ void MainWindow::ReadConfig() g_iIndex = iIndex; g_iNum = iNum; - g_iOneWidth = iOneWidth; //道宽 + g_iOneWidth = 4; //道宽 g_iHeadHigh = iHeadHigh; //道头高度 g_iTitleHigh = iTitleHigh; //道对象高度 g_iCurveHigh = iCurveHigh;//曲线高度 diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index fa3dc0c..ef2ff22 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -2123,7 +2123,7 @@ QStringList MainWindowCurve::insertCol(int nW) QString strWellName = ui->tableWidget_2->item(0, column)->text(); //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); sret << strWellName << strSlfName; @@ -2876,6 +2876,7 @@ void MainWindowCurve::s_NewWell(QString strWellName, QString strSlfName) int rowcount = 2; //总行数 int columnCount = ui->tableWidget_2->columnCount();//总列数 + int ntmpw = g_iOneWidth * g_dPixelPerCm; if(columnCount==0) { //增加1列 @@ -2886,7 +2887,7 @@ void MainWindowCurve::s_NewWell(QString strWellName, QString strSlfName) //增加1列(空白) ui->tableWidget_2->setColumnCount(columnCount+1); //设置列宽 - ui->tableWidget_2->setColumnWidth(columnCount, g_iOneWidth); + ui->tableWidget_2->setColumnWidth(columnCount, ntmpw); // columnCount = ui->tableWidget_2->columnCount();//总列数 @@ -2894,7 +2895,7 @@ void MainWindowCurve::s_NewWell(QString strWellName, QString strSlfName) ui->tableWidget_2->setColumnCount(columnCount+1); } //设置列宽 - ui->tableWidget_2->setColumnWidth(columnCount, g_iOneWidth); + ui->tableWidget_2->setColumnWidth(columnCount, ntmpw); //标题 QTableWidgetItem *headerItem = new QTableWidgetItem(""); @@ -3077,13 +3078,13 @@ void MainWindowCurve::s_NewTrack() emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, "", "", ""); //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+g_iOneWidth); + ui->tableWidget_2->setColumnWidth(column, iWidth+g_iOneWidth* g_dPixelPerCm); } void MainWindowCurve::s_NewDepth() { int column = -1; - int nW = 100; + int nW = 3; QString strSlfName = ""; //如果视图为空,则根据左侧选中的井来创建深度道 @@ -3146,7 +3147,7 @@ void MainWindowCurve::s_NewDepth() } //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); QStringList dt; dt << m_strUuid; @@ -3386,7 +3387,7 @@ void MainWindowCurve::s_NewShowDip() void MainWindowCurve::s_pinLvAc() { int column = -1; - int nW = 160; + int nW = 4; if(ui->tableWidget_2->columnCount()==0) { @@ -3422,7 +3423,7 @@ void MainWindowCurve::s_pinLvAc() QString strSlfName = ui->tableWidget_2->item(0, column)->data(Qt::UserRole+1).toString(); //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); QStringList dt; dt << m_strUuid; @@ -3466,9 +3467,9 @@ void MainWindowCurve::s_NewGanZhuangTu() int iWidth = ui->tableWidget_2->columnWidth(column); - int nW = 320; + int nW = 4; //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); //新建道 emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, strSlfName, "杆状图", "ganzhuangtuObject", nW); @@ -3476,7 +3477,7 @@ void MainWindowCurve::s_NewGanZhuangTu() void MainWindowCurve::s_roseAc() { - int nW = 160; + int nW = 4; QStringList sret = this->insertCol(nW); if(sret.length() <= 0) return; @@ -3494,7 +3495,7 @@ void MainWindowCurve::s_roseAc() void MainWindowCurve::s_dcaAc() { - int nW = 180; + int nW = 4; QStringList sret = this->insertCol(nW); if(sret.length() <= 0) return; @@ -3542,9 +3543,9 @@ void MainWindowCurve::s_Jykt() int iWidth = ui->tableWidget_2->columnWidth(column); - int nW = 320; + int nW = 4; //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); //新建道 emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, strSlfName, "井眼垮塌矢量图", "JyktObject", nW); @@ -3593,9 +3594,9 @@ void MainWindowCurve::s_Denv() int iWidth = ui->tableWidget_2->columnWidth(column); - int nW = 320; + int nW = 4; //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); //新建道 emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, strSlfName, "井斜方位图", "DenvObject", nW); @@ -3644,9 +3645,9 @@ void MainWindowCurve::s_DrawImage() int iWidth = ui->tableWidget_2->columnWidth(column); - int nW = 320; + int nW = 4; //设置列宽 - ui->tableWidget_2->setColumnWidth(column, iWidth+nW+8); + ui->tableWidget_2->setColumnWidth(column, iWidth+nW*g_dPixelPerCm+8); //新建道 emit CallManage::getInstance()->sig_NewTrack(m_strUuid, strWellName, strSlfName, "成像", "DrawImageObject", nW); @@ -3750,7 +3751,7 @@ void MainWindowCurve::s_NewTubingstring() //TDT void MainWindowCurve::s_NewTDT() { - int nW = 400; + int nW = 10; QStringList sret = this->insertCol(nW); if(sret.length() <= 0) return; @@ -3769,6 +3770,11 @@ void MainWindowCurve::s_NewTDT() void MainWindowCurve::s_NewTrackChangeWidth(QString strWellName, double nW) { qDebug() << "MainWindowCurve s_NewTrackChangeWidth"; + int ntmpw = nW * g_dPixelPerCm; + if (nW <= 0) + { + ntmpw = g_iOneWidth * g_dPixelPerCm; + } int column = ui->tableWidget_2->columnCount(); for(int i=0; itableWidget_2->columnWidth(i);//设置列宽 - if(nW<=0) - { - ui->tableWidget_2->setColumnWidth(i, iWidth+g_iOneWidth+6); - } - else - { - ui->tableWidget_2->setColumnWidth(i, iWidth+nW+6); - } + ui->tableWidget_2->setColumnWidth(i, iWidth + ntmpw + 6); } } } @@ -4107,8 +4106,8 @@ void MainWindowCurve::s_changeTrackProperty(QVariantList vlist) QString strProperty = vlist.at(4).toString(); if("道宽(cm)" == strProperty) { - int iNewWidth = vlist.at(5).toInt(); - int iWellWidth = widgetWell->setColWidth(iCurrentCol, iNewWidth); + float fNewWidth = vlist.at(5).toFloat(); + int iWellWidth = widgetWell->setColWidth(iCurrentCol, fNewWidth); //调整井宽 ui->tableWidget_2->setColumnWidth(i, iWellWidth); @@ -4488,7 +4487,7 @@ void MainWindowCurve::DisplayTrack_Top(int id, QJsonObject trackTop, QJsonObject if(id==0) { //第一道,默认减掉空井宽g_iOneWidth - s_NewTrackChangeWidth(strWellName, nW * g_dPixelPerCm - g_iOneWidth); + s_NewTrackChangeWidth(strWellName, nW * g_dPixelPerCm - g_iOneWidth * g_dPixelPerCm); } else { @@ -4812,7 +4811,7 @@ void MainWindowCurve::DisplayLine_One(QJsonObject lineObjInfo, QString strTrackN void MainWindowCurve::DisplayType_One(QJsonObject lineObjInfo, QString strTrackName, int nW) { - nW = nW * static_cast(g_dPixelPerCm); + //nW = nW * static_cast(g_dPixelPerCm); QStringList sret = this->insertCol(nW); if(sret.length() <= 0) return; diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index f9408ae..0eda68c 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -215,9 +215,8 @@ void QMyCustomPlot::initGeometry(QString strUuid, int nscale, int nW) dHight = 32767; } - //curv->setMaximumHeight((int)dHight); - //curv->setViewport(QRect(0, 0, g_iOneWidth, (int)dHight));//7500-3184 - this->setGeometry(0, 0, nW-2, (int)dHight);//7500-3184 + int ntmpw = nW * g_dPixelPerCm; + this->setGeometry(0, 0, ntmpw - 2, (int)dHight); } void QMyCustomPlot::changePropertyWaveUpdate() diff --git a/logPlus/qmytablewidget.cpp b/logPlus/qmytablewidget.cpp index 62af8fe..d45f2c1 100644 --- a/logPlus/qmytablewidget.cpp +++ b/logPlus/qmytablewidget.cpp @@ -148,9 +148,9 @@ void QMyTableWidget::mouseReleaseEvent(QMouseEvent *event) QString strSlfName = formTop->m_strSlfName; // int iCurrentCol = currentColumn(); - int iWidth = columnWidth(iCurrentCol); + //int iWidth = columnWidth(iCurrentCol); - PropertyService()->initTrackProperty(formTop, iWidth, this, iCurrentCol); + PropertyService()->initTrackProperty(formTop, formTop->m_nTrackW, this, iCurrentCol); // emit CallManage::getInstance()->sig_Raise(strUuid, strSlfName, strWellName, strTrackName, "", 2, ""); }