-
Notifications
You must be signed in to change notification settings - Fork 91
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into release-2019.11
- Loading branch information
Showing
2 changed files
with
157 additions
and
157 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,114 +1,114 @@ | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2015- Statoil ASA | ||
| // Copyright (C) 2015- Ceetron Solutions AS | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #include "RiuWellLogTrack.h" | ||
|
|
||
| #include "RimWellLogTrack.h" | ||
|
|
||
| #include "qwt_scale_draw.h" | ||
| #include "qwt_scale_engine.h" | ||
| #include "qwt_scale_widget.h" | ||
|
|
||
| #include <QWheelEvent> | ||
|
|
||
| #define RIU_SCROLLWHEEL_ZOOMFACTOR 1.1 | ||
| #define RIU_SCROLLWHEEL_PANFACTOR 0.1 | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| RiuWellLogTrack::RiuWellLogTrack( RimWellLogTrack* plotTrackDefinition, QWidget* parent /*= nullptr */ ) | ||
| : RiuQwtPlotWidget( plotTrackDefinition, parent ) | ||
| { | ||
| setAxisEnabled( QwtPlot::yLeft, true ); | ||
| setAxisEnabled( QwtPlot::yRight, false ); | ||
| setAxisEnabled( QwtPlot::xTop, true ); | ||
| setAxisEnabled( QwtPlot::xBottom, false ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| RiuWellLogTrack::~RiuWellLogTrack() {} | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| bool RiuWellLogTrack::eventFilter( QObject* watched, QEvent* event ) | ||
| { | ||
| QWheelEvent* wheelEvent = dynamic_cast<QWheelEvent*>( event ); | ||
| if ( wheelEvent && watched == canvas() ) | ||
| { | ||
| RimWellLogTrack* track = dynamic_cast<RimWellLogTrack*>( plotDefinition() ); | ||
| CAF_ASSERT( track ); | ||
|
|
||
| RimWellLogPlot* wellLogPlot = nullptr; | ||
| track->firstAncestorOrThisOfType( wellLogPlot ); | ||
|
|
||
| if ( wellLogPlot ) | ||
| { | ||
| if ( wheelEvent->modifiers() & Qt::ControlModifier ) | ||
| { | ||
| QwtScaleMap scaleMap = canvasMap( QwtPlot::yLeft ); | ||
| double zoomCenter = scaleMap.invTransform( wheelEvent->pos().y() ); | ||
|
|
||
| if ( wheelEvent->delta() > 0 ) | ||
| { | ||
| wellLogPlot->setDepthAxisRangeByFactorAndCenter( RIU_SCROLLWHEEL_ZOOMFACTOR, zoomCenter ); | ||
| } | ||
| else | ||
| { | ||
| wellLogPlot->setDepthAxisRangeByFactorAndCenter( 1.0 / RIU_SCROLLWHEEL_ZOOMFACTOR, zoomCenter ); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| wellLogPlot->setDepthAxisRangeByPanDepth( wheelEvent->delta() < 0 ? RIU_SCROLLWHEEL_PANFACTOR | ||
| : -RIU_SCROLLWHEEL_PANFACTOR ); | ||
| } | ||
|
|
||
| event->accept(); | ||
| return true; | ||
| } | ||
| } | ||
| return RiuQwtPlotWidget::eventFilter( watched, event ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiuWellLogTrack::setAxisEnabled( QwtPlot::Axis axis, bool enabled ) | ||
| { | ||
| if ( enabled ) | ||
| { | ||
| enableAxis( axis, true ); | ||
|
|
||
| // Align the canvas with the actual min and max values of the curves | ||
| axisScaleEngine( axis )->setAttribute( QwtScaleEngine::Floating, true ); | ||
| setAxisScale( axis, 0.0, 100.0 ); | ||
| axisScaleDraw( axis )->setMinimumExtent( axisExtent( axis ) ); | ||
|
|
||
| axisWidget( axis )->setMargin( 0 ); | ||
| setAxisTitleEnabled( axis, true ); | ||
| } | ||
| else | ||
| { | ||
| enableAxis( axis, false ); | ||
| } | ||
| } | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2015- Statoil ASA | ||
| // Copyright (C) 2015- Ceetron Solutions AS | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
|
|
||
| #include "RiuWellLogTrack.h" | ||
|
|
||
| #include "RimWellLogTrack.h" | ||
|
|
||
| #include "qwt_scale_draw.h" | ||
| #include "qwt_scale_engine.h" | ||
| #include "qwt_scale_widget.h" | ||
|
|
||
| #include <QWheelEvent> | ||
|
|
||
| #define RIU_SCROLLWHEEL_ZOOMFACTOR 1.1 | ||
| #define RIU_SCROLLWHEEL_PANFACTOR 0.1 | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| RiuWellLogTrack::RiuWellLogTrack( RimWellLogTrack* plotTrackDefinition, QWidget* parent /*= nullptr */ ) | ||
| : RiuQwtPlotWidget( plotTrackDefinition, parent ) | ||
| { | ||
| setAxisEnabled( QwtPlot::yLeft, true ); | ||
| setAxisEnabled( QwtPlot::yRight, false ); | ||
| setAxisEnabled( QwtPlot::xTop, true ); | ||
| setAxisEnabled( QwtPlot::xBottom, false ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| RiuWellLogTrack::~RiuWellLogTrack() {} | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| bool RiuWellLogTrack::eventFilter( QObject* watched, QEvent* event ) | ||
| { | ||
| QWheelEvent* wheelEvent = dynamic_cast<QWheelEvent*>( event ); | ||
| if ( wheelEvent && watched == canvas() ) | ||
| { | ||
| RimWellLogTrack* track = dynamic_cast<RimWellLogTrack*>( plotDefinition() ); | ||
| CAF_ASSERT( track ); | ||
|
|
||
| RimWellLogPlot* wellLogPlot = nullptr; | ||
| track->firstAncestorOrThisOfType( wellLogPlot ); | ||
|
|
||
| if ( wellLogPlot ) | ||
| { | ||
| if ( wheelEvent->modifiers() & Qt::ControlModifier ) | ||
| { | ||
| QwtScaleMap scaleMap = canvasMap( QwtPlot::yLeft ); | ||
| double zoomCenter = scaleMap.invTransform( wheelEvent->pos().y() ); | ||
|
|
||
| if ( wheelEvent->delta() > 0 ) | ||
| { | ||
| wellLogPlot->setDepthAxisRangeByFactorAndCenter( RIU_SCROLLWHEEL_ZOOMFACTOR, zoomCenter ); | ||
| } | ||
| else | ||
| { | ||
| wellLogPlot->setDepthAxisRangeByFactorAndCenter( 1.0 / RIU_SCROLLWHEEL_ZOOMFACTOR, zoomCenter ); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| wellLogPlot->setDepthAxisRangeByPanDepth( wheelEvent->delta() < 0 ? RIU_SCROLLWHEEL_PANFACTOR | ||
| : -RIU_SCROLLWHEEL_PANFACTOR ); | ||
| } | ||
|
|
||
| event->accept(); | ||
| return true; | ||
| } | ||
| } | ||
| return RiuQwtPlotWidget::eventFilter( watched, event ); | ||
| } | ||
|
|
||
| //-------------------------------------------------------------------------------------------------- | ||
| /// | ||
| //-------------------------------------------------------------------------------------------------- | ||
| void RiuWellLogTrack::setAxisEnabled( QwtPlot::Axis axis, bool enabled ) | ||
| { | ||
| if ( enabled ) | ||
| { | ||
| enableAxis( axis, true ); | ||
|
|
||
| // Align the canvas with the actual min and max values of the curves | ||
| axisScaleEngine( axis )->setAttribute( QwtScaleEngine::Floating, true ); | ||
| setAxisScale( axis, 0.0, 100.0 ); | ||
| axisScaleDraw( axis )->setMinimumExtent( axisExtent( axis ) ); | ||
|
|
||
| axisWidget( axis )->setMargin( 0 ); | ||
| setAxisTitleEnabled( axis, true ); | ||
| } | ||
| else | ||
| { | ||
| enableAxis( axis, false ); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,43 +1,43 @@ | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2015- Statoil ASA | ||
| // Copyright (C) 2015- Ceetron Solutions AS | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| #pragma once | ||
|
|
||
| #include "RiuQwtPlotWidget.h" | ||
|
|
||
| class RimWellLogTrack; | ||
|
|
||
| //================================================================================================== | ||
| // | ||
| // | ||
| // | ||
| //================================================================================================== | ||
| class RiuWellLogTrack : public RiuQwtPlotWidget | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| RiuWellLogTrack( RimWellLogTrack* plotTrackDefinition, QWidget* parent = nullptr ); | ||
| ~RiuWellLogTrack() override; | ||
|
|
||
| protected: | ||
| bool eventFilter( QObject* watched, QEvent* event ) override; | ||
|
|
||
| private: | ||
| void setAxisEnabled( QwtPlot::Axis axis, bool enabled ); | ||
| }; | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| // | ||
| // Copyright (C) 2015- Statoil ASA | ||
| // Copyright (C) 2015- Ceetron Solutions AS | ||
| // | ||
| // ResInsight is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY | ||
| // WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| // FITNESS FOR A PARTICULAR PURPOSE. | ||
| // | ||
| // See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html> | ||
| // for more details. | ||
| // | ||
| ///////////////////////////////////////////////////////////////////////////////// | ||
| #pragma once | ||
|
|
||
| #include "RiuQwtPlotWidget.h" | ||
|
|
||
| class RimWellLogTrack; | ||
|
|
||
| //================================================================================================== | ||
| // | ||
| // | ||
| // | ||
| //================================================================================================== | ||
| class RiuWellLogTrack : public RiuQwtPlotWidget | ||
| { | ||
| Q_OBJECT | ||
|
|
||
| public: | ||
| RiuWellLogTrack( RimWellLogTrack* plotTrackDefinition, QWidget* parent = nullptr ); | ||
| ~RiuWellLogTrack() override; | ||
|
|
||
| protected: | ||
| bool eventFilter( QObject* watched, QEvent* event ) override; | ||
|
|
||
| private: | ||
| void setAxisEnabled( QwtPlot::Axis axis, bool enabled ); | ||
| }; |