diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 7f571e2..2b4d2ca 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -1320,7 +1320,7 @@ void MainWindowCurve::initToolBar_3() //add QAction to Widget. ui->toolBar_3->addAction(m_StandardAc); ui->toolBar_3->addAction(m_CorrectionAc); - //ui->toolBar_3->addAction(m_ShiftotherAc); + ui->toolBar_3->addAction(m_ShiftotherAc); ui->toolBar_3->addSeparator(); ui->toolBar_3->addAction(m_PreMegAc); ui->toolBar_3->addAction(m_mergeAc); @@ -1330,7 +1330,7 @@ void MainWindowCurve::initToolBar_3() connect(m_StandardAc, &QAction::triggered, this, &MainWindowCurve::s_Standard); connect(m_CorrectionAc, &QAction::triggered, this, &MainWindowCurve::s_Correction); -//// connect(m_ShiftotherAc, &QAction::triggered, this, &MainWindowCurve::s_Shiftother); + connect(m_ShiftotherAc, &QAction::triggered, this, &MainWindowCurve::s_Shiftother); connect(m_PreMegAc, &QAction::triggered, this, &MainWindowCurve::s_PreMegAc); connect(m_mergeAc, &QAction::triggered, this, &MainWindowCurve::s_merge); connect(m_ClearAllSetCurveAc, &QAction::triggered, this, &MainWindowCurve::s_ClearAllSetCurve); @@ -2155,7 +2155,7 @@ void MainWindowCurve::s_Shiftother() //修改当前曲线选择状态 iSelect=3从校曲线 emit CallManage::getInstance()->sig_ChangeLineStatus(m_strUuid, g_pShiftCurves[i].m_strSlfName, g_pShiftCurves[i].m_strWellName, g_pShiftCurves[i].m_strTrackName, g_pShiftCurves[i].m_strLineName, 3, m_bMerge); - //设置从校曲线 + //设置从校(从拼接)曲线 m_ShiftCurves.append(g_pShiftCurves[i]); } } @@ -3898,7 +3898,9 @@ void MainWindowCurve::_slotExport(QPrinter &printer, int IsBmp, QString pngName, m_hvDraw->setChecked(true); //默认选中-竖 if (m_bHVDisplay) { - restoreOriginalCentralWidget(); + //横屏时,切换回竖屏 + s_hvDraw(); + //restoreOriginalCentralWidget(); } //预览