diff --git a/logPlus/PropertyWidget.cpp b/logPlus/PropertyWidget.cpp index 7acbe2a..633b84d 100644 --- a/logPlus/PropertyWidget.cpp +++ b/logPlus/PropertyWidget.cpp @@ -611,7 +611,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant if("道名称" == m_propertyData[pProperty]) { - m_fromTop->m_strTrackName = variant.toString(); + m_fromTop->setTrackName(variant.toString()); } else if("道头字体" == m_propertyData[pProperty]) { @@ -2811,8 +2811,8 @@ void PropertyWidget::initTrackProperty(FormTrackTop *fromTop, int iWidth, QMyTab _CreateVariantPropertyItem("通常", "道头字体", fromTop->m_font, QVariant::Font); _CreateVariantPropertyItem("通常", "道头字颜色", fromTop->m_fontColor, QVariant::Color); // -// _CreateVariantPropertyItem("网格", "水平", fromTop->m_nTrackW, QVariant::Bool); -// _CreateVariantPropertyItem("网格", "垂直", fromTop->m_nTrackW, QVariant::Bool); + _CreateVariantPropertyItem("网格", "水平", fromTop->m_nTrackW, QVariant::Bool); + _CreateVariantPropertyItem("网格", "垂直", fromTop->m_nTrackW, QVariant::Bool); // _CreateVariantPropertyItem("网格", "道左刻度", fromTop->m_nTrackW, QVariant::Double); // _CreateVariantPropertyItem("网格", "道右刻度", fromTop->m_nTrackW, QVariant::Double); // _CreateVariantPropertyItem("网格", "同步修改曲线刻度", fromTop->m_nTrackW, QVariant::Double); diff --git a/logPlus/customtabwidget.cpp b/logPlus/customtabwidget.cpp index c19a358..aa11a1e 100644 --- a/logPlus/customtabwidget.cpp +++ b/logPlus/customtabwidget.cpp @@ -44,9 +44,21 @@ CustomTabWidget::~CustomTabWidget() void CustomTabWidget::addTab(QWidget *widget, const QString &strTab) { - int iIndex = m_pTabBar->addTab(strTab); - m_pStackedWidget->addWidget(widget); - widget->setAcceptDrops(true); + int iIndex = -1; + for (int i = 0; i < m_pStackedWidget->count(); i++) + { + if (m_pStackedWidget->widget(i) == widget) + { + iIndex = i; + break; + } + } + if (iIndex < 0) + { + iIndex = m_pTabBar->addTab(strTab); + m_pStackedWidget->addWidget(widget); + widget->setAcceptDrops(true); + } // m_pTabBar->setCurrentIndex(iIndex); } diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index a35e309..2d46aa4 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -2903,6 +2903,8 @@ QMyCustomPlot* FormDraw::addTableLine(QString strUuid, QString strSlfName, QStri } else if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT") { + curv->setRowGridVisible(false); + curv->setColGridVisible(false); //固井结论 if(listOtherProperty.size()>=3) { diff --git a/logPlus/formtracktop.cpp b/logPlus/formtracktop.cpp index 7188e17..9e8b5fd 100644 --- a/logPlus/formtracktop.cpp +++ b/logPlus/formtracktop.cpp @@ -33,6 +33,12 @@ FormTrackTop::~FormTrackTop() delete ui; } +void FormTrackTop::setTrackName(QString strTName) +{ + m_strTrackName = strTName; + update(); +} + // void FormTrackTop::setBorderFlags(BorderFlags flags) // { // m_BorderFlags = flags; diff --git a/logPlus/formtracktop.h b/logPlus/formtracktop.h index 1bfdf8b..927e34b 100644 --- a/logPlus/formtracktop.h +++ b/logPlus/formtracktop.h @@ -23,7 +23,7 @@ class FormTrackTop : public FormBase public: explicit FormTrackTop(QWidget*, QString strSlfName="", QString strWellName="", QString strTrackName="", QString strLineName="", QColor lineColor=QColor(255,0,0)); ~FormTrackTop(); - + void setTrackName(QString strTName); void setTrackTopPropert(QJsonObject topObj); private: Ui::FormTrackTop *ui;