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

Compare commits

base: jiayulong:945436e7d9c49adb2126d1617d1c3abb3caad349
Branches Tags
jiayulong:main
jiayulong:master
..
compare: jiayulong:9595301021e34e24a9c5a62a1fd723e5cb845b2d
Branches Tags
jiayulong:main
jiayulong:master

2 Commits
945436e7d9 ... 9595301021

Author SHA1 Message Date
DESKTOP-450PEFP\mainc
9595301021 Merge branch 'main' of http://git.hivekion.com:3000/jiayulong/logplus 2026-04-22 17:28:39 +08:00
DESKTOP-450PEFP\mainc
f729823ed3 固井结论默认不显示网格 2026-04-22 17:28:35 +08:00
5 changed files with 27 additions and 7 deletions
Show Stats Expand all files Collapse all files

6
logPlus/PropertyWidget.cpp
View File

@ -620,7 +620,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])
{
@ -2826,8 +2826,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);

14
logPlus/customtabwidget.cpp
View File

@ -44,9 +44,21 @@ CustomTabWidget::~CustomTabWidget()
void CustomTabWidget::addTab(QWidget *widget, const QString &strTab)
{
int iIndex = m_pTabBar->addTab(strTab);
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);
}

2
logPlus/formdraw.cpp
View File

@ -2973,6 +2973,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)
{

6
logPlus/formtracktop.cpp
View File

@ -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;

2
logPlus/formtracktop.h
View File

@ -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;