Compare commits

..

No commits in common. "9595301021e34e24a9c5a62a1fd723e5cb845b2d" and "945436e7d9c49adb2126d1617d1c3abb3caad349" have entirely different histories.

5 changed files with 7 additions and 27 deletions

View File

@ -620,7 +620,7 @@ void PropertyWidget::SlotPropertyChanged( QtProperty *pProperty, const QVariant
if("道名称" == m_propertyData[pProperty]) if("道名称" == m_propertyData[pProperty])
{ {
m_fromTop->setTrackName(variant.toString()); m_fromTop->m_strTrackName = variant.toString();
} }
else if("道头字体" == m_propertyData[pProperty]) 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_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);

View File

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

View File

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

View File

@ -33,12 +33,6 @@ 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;

View File

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