diff --git a/logPlus/TransparentDraggableResult.cpp b/logPlus/TransparentDraggableResult.cpp index d157b58..aab6b49 100644 --- a/logPlus/TransparentDraggableResult.cpp +++ b/logPlus/TransparentDraggableResult.cpp @@ -167,8 +167,8 @@ void TransparentDraggableResult::setRange(double left_Low, double right_Hight, b { if(left_Low >= right_Hight) return; - double lY1 = m_nShowPos*g_dPixelPerCm+mPlot->yAxis->range().lower;//+10 - double lY2 = m_nShowPos*g_dPixelPerCm+(mPlot->yAxis->range().upper-mPlot->yAxis->range().lower)* (m_nConclusionProportion /100.0f); + double lY1 = m_nShowPos*g_dPixelPerCm+mPlot->yAxis->range().lower-1;//+10 + double lY2 = m_nShowPos*g_dPixelPerCm+(mPlot->yAxis->range().upper-mPlot->yAxis->range().lower)* (m_nConclusionProportion /100.0f)-2; mRect->topLeft->setCoords(left_Low, lY1); mRect->bottomRight->setCoords(right_Hight, mPlot->yAxis->range().upper); diff --git a/logPlus/formdraw.cpp b/logPlus/formdraw.cpp index 8df7b19..dcc7e88 100644 --- a/logPlus/formdraw.cpp +++ b/logPlus/formdraw.cpp @@ -6042,7 +6042,8 @@ void FormDraw::initDepth(QMyCustomPlot *curv) { // x轴隐藏 curv->yAxis->setTicks(true); - curv->yAxis2->setVisible(false); + curv->yAxis->setVisible(true); + curv->yAxis->setBasePen(Qt::NoPen); //curv->yAxis->setTickLabels(true); curv->yAxis->setTickLabelSide(QCPAxis::lsInside); diff --git a/logPlus/mainwindowcurve.cpp b/logPlus/mainwindowcurve.cpp index 9918739..006ad03 100644 --- a/logPlus/mainwindowcurve.cpp +++ b/logPlus/mainwindowcurve.cpp @@ -81,7 +81,6 @@ MainWindowCurve::MainWindowCurve(QWidget *parent) : ui->tableWidget_2->setStyleSheet("QTableView {border: 0px solid black;} QTableView::item {border: 0px solid black;} \ QTableView::item:selected {color:#57595B; background:#E4E4E4;}"); - ui->tableWidget_2->verticalHeader()->hide(); //行 //ui->tableWidget_2->horizontalHeader()->hide();//列 int rowcount = 2; //总行数 diff --git a/logPlus/transparentdraggableimage.cpp b/logPlus/transparentdraggableimage.cpp index 1985c6e..05f7dfa 100644 --- a/logPlus/transparentdraggableimage.cpp +++ b/logPlus/transparentdraggableimage.cpp @@ -180,8 +180,8 @@ void TransparentDraggableImage::setRange(double left_Low, double right_Hight, bo left = (getLeft()/100) * mPlot->yAxis->range().upper; width = (getWidth()/100) * mPlot->yAxis->range().upper; - double lY1 = mPlot->yAxis->range().lower+left; - double lY2 = width+left; + double lY1 = mPlot->yAxis->range().lower+left-1; + double lY2 = width+left-3; mRect->topLeft->setCoords(left_Low, lY1); mRect->bottomRight->setCoords(right_Hight, lY2); @@ -235,8 +235,8 @@ void TransparentDraggableImage::setRange(double left_Low, double right_Hight,dou left = (leftPercentage/100) * mPlot->yAxis->range().upper; width = (widthPercentage/100) * mPlot->yAxis->range().upper; - double lY1 = mPlot->yAxis->range().lower+left; - double lY2 = width+left; + double lY1 = mPlot->yAxis->range().lower+left-1; + double lY2 = width+left-3; mRect->topLeft->setCoords(left_Low, lY1); mRect->bottomRight->setCoords(right_Hight, lY2);