From 342d9456728b02e5fada8b57cf5182af8a1f1fab Mon Sep 17 00:00:00 2001 From: jiayulong Date: Tue, 19 May 2026 11:56:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD=E5=8D=81?= =?UTF-8?q?=E5=AD=97=E9=BC=A0=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- logPlus/TransparentDraggableGeoLith.cpp | 18 ++-- logPlus/TransparentDraggableGujing.cpp | 18 ++-- logPlus/TransparentDraggableLayer.cpp | 18 ++-- logPlus/TransparentDraggableRect.cpp | 18 ++-- logPlus/qmycustomplot.cpp | 108 ++++++++++++------------ 5 files changed, 88 insertions(+), 92 deletions(-) diff --git a/logPlus/TransparentDraggableGeoLith.cpp b/logPlus/TransparentDraggableGeoLith.cpp index e270a86..edc0c80 100644 --- a/logPlus/TransparentDraggableGeoLith.cpp +++ b/logPlus/TransparentDraggableGeoLith.cpp @@ -851,15 +851,15 @@ void TransparentDraggableGeoLith::onMouseMove(QMouseEvent *event) } else { - double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 - QCPRange currentRange = getRange(); - if(y >= currentRange.lower && y <= currentRange.upper) { - m_bNormal = true; - } - else - { - m_bNormal = false; - } +// double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 +// QCPRange currentRange = getRange(); +// if(y >= currentRange.lower && y <= currentRange.upper) { +// m_bNormal = true; +// } +// else +// { +// m_bNormal = false; +// } // m_bArrow = false; m_bMoveRect = false; diff --git a/logPlus/TransparentDraggableGujing.cpp b/logPlus/TransparentDraggableGujing.cpp index d636c8e..7b93ab2 100644 --- a/logPlus/TransparentDraggableGujing.cpp +++ b/logPlus/TransparentDraggableGujing.cpp @@ -534,15 +534,15 @@ void TransparentDraggableGujing::onMouseMove(QMouseEvent *event) } else { - double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 - QCPRange currentRange = getRange(); - if(y >= currentRange.lower && y <= currentRange.upper) { - m_bNormal = true; - } - else - { - m_bNormal = false; - } +// double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 +// QCPRange currentRange = getRange(); +// if(y >= currentRange.lower && y <= currentRange.upper) { +// m_bNormal = true; +// } +// else +// { +// m_bNormal = false; +// } // m_bArrow = false; m_bMoveRect = false; diff --git a/logPlus/TransparentDraggableLayer.cpp b/logPlus/TransparentDraggableLayer.cpp index a85252e..2090e83 100644 --- a/logPlus/TransparentDraggableLayer.cpp +++ b/logPlus/TransparentDraggableLayer.cpp @@ -466,15 +466,15 @@ void TransparentDraggableLayer::onMouseMove(QMouseEvent *event) } else { - double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 - QCPRange currentRange = getRange(); - if(y >= currentRange.lower && y <= currentRange.upper) { - m_bNormal = true; - } - else - { - m_bNormal = false; - } +// double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 +// QCPRange currentRange = getRange(); +// if(y >= currentRange.lower && y <= currentRange.upper) { +// m_bNormal = true; +// } +// else +// { +// m_bNormal = false; +// } // m_bArrow = false; m_bMoveRect = false; diff --git a/logPlus/TransparentDraggableRect.cpp b/logPlus/TransparentDraggableRect.cpp index e3a4353..4c936d5 100644 --- a/logPlus/TransparentDraggableRect.cpp +++ b/logPlus/TransparentDraggableRect.cpp @@ -354,15 +354,15 @@ void TransparentDraggableRect::onMouseMove(QMouseEvent *event) } else { - double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 - QCPRange currentRange = getRange(); - if(y >= currentRange.lower && y <= currentRange.upper) { - m_bNormal = true; - } - else - { - m_bNormal = false; - } +// double y = mPlot->xAxis->pixelToCoord(event->pos().y());//x轴展示深度 +// QCPRange currentRange = getRange(); +// if(y >= currentRange.lower && y <= currentRange.upper) { +// m_bNormal = true; +// } +// else +// { +// m_bNormal = false; +// } // m_bArrow = false; m_bMoveRect = false; diff --git a/logPlus/qmycustomplot.cpp b/logPlus/qmycustomplot.cpp index 6a214f9..53b296b 100644 --- a/logPlus/qmycustomplot.cpp +++ b/logPlus/qmycustomplot.cpp @@ -1617,7 +1617,7 @@ void QMyCustomPlot::mouseMoveEvent(QMouseEvent *event) { this->setCursor(Qt::SizeVerCursor); } - else if (nmaxCursor == 3) + else /*if (nmaxCursor == 3)*/ { QCursor currentCursor = this->cursor(); if(currentCursor == Qt::CrossCursor) @@ -1628,63 +1628,59 @@ void QMyCustomPlot::mouseMoveEvent(QMouseEvent *event) this->setCursor(Qt::ArrowCursor); } } - else - { - bool bCheck = false; - //曲线 - /*if(m_addRandomGraph && m_strLineName != "CORE_PHYSICS") - { - bCheck = true; - } - else */if (m_strLineName == "GEO_LITH") - { - //录井剖面 - bCheck = true; - } - else if (m_strLineName == "WORDS_RELUST") - { - //岩性描述，文字结论 - bCheck = true; - } - else if (m_strLineName == "LAYER_DATA") - { - //地质分层 - bCheck = true; - } +// else +// { +// bool bCheck = false; +// if (m_strLineName == "GEO_LITH") +// { +// //录井剖面 +// bCheck = true; +// } +// else if (m_strLineName == "WORDS_RELUST") +// { +// //岩性描述，文字结论 +// bCheck = true; +// } +// else if (m_strLineName == "LAYER_DATA") +// { +// //地质分层 +// bCheck = true; +// } - // - if(m_strType == "") - { - FormInfo* pInfo = m_formTrack->getFormInfoByParameters(m_strUuid, m_strWellName, m_strTrackName, m_strLineName); - if (pInfo == NULL) - { - return; - } - m_strType = pInfo->m_strType; - } +// // +// if(m_strType == "") +// { +// FormInfo* pInfo = m_formTrack->getFormInfoByParameters(m_strUuid, m_strWellName, m_strTrackName, m_strLineName); +// if (pInfo == NULL) +// { +// return; +// } +// m_strType = pInfo->m_strType; +// } + +// // +// if (m_strType == "gujingObject") +// { +// bCheck = true; +// } +// if(bCheck) +// { +// //十字标，编辑 +// if(m_bEditRect) +// { +// this->setCursor(Qt::CrossCursor); +// } +// else +// { +// this->setCursor(Qt::ArrowCursor); +// } +// } +// else +// { +// this->setCursor(Qt::ArrowCursor); +// } +// } - // - if (m_strType == "gujingObject") - { - bCheck = true; - } - if(bCheck) - { - //十字标，编辑 - if(m_bEditRect) - { - this->setCursor(Qt::CrossCursor); - } - else - { - this->setCursor(Qt::ArrowCursor); - } - } - else - { - this->setCursor(Qt::ArrowCursor); - } - } // if (mMousePress) { // auto items = selectedItems();