固井结论默认不显示网格
This commit is contained in:
parent
f4c9bd49f4
commit
f729823ed3
|
|
@ -611,7 +611,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
|
||||||
|
|
||||||
if("道名称" == m_propertyData[pProperty])
|
if("道名称" == m_propertyData[pProperty])
|
||||||
{
|
{
|
||||||
m_fromTop->m_strTrackName = variant.toString();
|
m_fromTop->setTrackName(variant.toString());
|
||||||
}
|
}
|
||||||
else if("道头字体" == m_propertyData[pProperty])
|
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_font, QVariant::Font);
|
||||||
_CreateVariantPropertyItem("通常", "道头字颜色", fromTop->m_fontColor, QVariant::Color);
|
_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);
|
// _CreateVariantPropertyItem("网格", "道右刻度", fromTop->m_nTrackW, QVariant::Double);
|
||||||
// _CreateVariantPropertyItem("网格", "同步修改曲线刻度", fromTop->m_nTrackW, QVariant::Double);
|
// _CreateVariantPropertyItem("网格", "同步修改曲线刻度", fromTop->m_nTrackW, QVariant::Double);
|
||||||
|
|
|
||||||
|
|
@ -44,9 +44,21 @@ CustomTabWidget::~CustomTabWidget()
|
||||||
|
|
||||||
void CustomTabWidget::addTab(QWidget *widget, const QString &strTab)
|
void CustomTabWidget::addTab(QWidget *widget, const QString &strTab)
|
||||||
{
|
{
|
||||||
int iIndex = m_pTabBar->addTab(strTab);
|
int iIndex = -1;
|
||||||
m_pStackedWidget->addWidget(widget);
|
for (int i = 0; i < m_pStackedWidget->count(); i++)
|
||||||
widget->setAcceptDrops(true);
|
{
|
||||||
|
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);
|
m_pTabBar->setCurrentIndex(iIndex);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -2903,6 +2903,8 @@ QMyCustomPlot* FormDraw::addTableLine(QString strUuid, QString strSlfName, QStri
|
||||||
}
|
}
|
||||||
else if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT")
|
else if (strLineName == "GUJING1_RESULT" || strLineName == "GUJING2_RESULT" || strLineName == "GUJING3_RESULT")
|
||||||
{
|
{
|
||||||
|
curv->setRowGridVisible(false);
|
||||||
|
curv->setColGridVisible(false);
|
||||||
//固井结论
|
//固井结论
|
||||||
if(listOtherProperty.size()>=3)
|
if(listOtherProperty.size()>=3)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -33,6 +33,12 @@ FormTrackTop::~FormTrackTop()
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void FormTrackTop::setTrackName(QString strTName)
|
||||||
|
{
|
||||||
|
m_strTrackName = strTName;
|
||||||
|
update();
|
||||||
|
}
|
||||||
|
|
||||||
// void FormTrackTop::setBorderFlags(BorderFlags flags)
|
// void FormTrackTop::setBorderFlags(BorderFlags flags)
|
||||||
// {
|
// {
|
||||||
// m_BorderFlags = flags;
|
// m_BorderFlags = flags;
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ class FormTrackTop : public FormBase
|
||||||
public:
|
public:
|
||||||
explicit FormTrackTop(QWidget*, QString strSlfName="", QString strWellName="", QString strTrackName="", QString strLineName="", QColor lineColor=QColor(255,0,0));
|
explicit FormTrackTop(QWidget*, QString strSlfName="", QString strWellName="", QString strTrackName="", QString strLineName="", QColor lineColor=QColor(255,0,0));
|
||||||
~FormTrackTop();
|
~FormTrackTop();
|
||||||
|
void setTrackName(QString strTName);
|
||||||
void setTrackTopPropert(QJsonObject topObj);
|
void setTrackTopPropert(QJsonObject topObj);
|
||||||
private:
|
private:
|
||||||
Ui::FormTrackTop *ui;
|
Ui::FormTrackTop *ui;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user