OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-10 23:46:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Repository wide spelling correction overly -> overlay

Browse Source 
* Impacts CAF and ResInsight
This commit is contained in:
Gaute Lindkvist 2019-03-04 10:35:29 +01:00
parent 89a68d099a
commit be95eefd69
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp
View File

@ -64,7 +64,7 @@ RiuCvfOverlayItemWidget::~RiuCvfOverlayItemWidget()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiuCvfOverlayItemWidget::updateFromOverlyItem( cvf::OverlayItem * item) void RiuCvfOverlayItemWidget::updateFromOverlayItem( cvf::OverlayItem * item)
{ {
// Use the render size of the overlayItem (sizeHint should be renamed) // Use the render size of the overlayItem (sizeHint should be renamed)

2
ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.h
View File

@ -38,7 +38,7 @@ public:
explicit RiuCvfOverlayItemWidget(QWidget* parent = nullptr); explicit RiuCvfOverlayItemWidget(QWidget* parent = nullptr);
~RiuCvfOverlayItemWidget() override; ~RiuCvfOverlayItemWidget() override;
void updateFromOverlyItem( cvf::OverlayItem * item); void updateFromOverlayItem( cvf::OverlayItem * item);
// virtual QSize sizeHint() const override; // virtual QSize sizeHint() const override;
// virtual QSize minimumSizeHint() const override; // virtual QSize minimumSizeHint() const override;

6
ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp
View File

@ -136,10 +136,10 @@ void RiuSummaryQwtPlot::addOrUpdateEnsembleCurveSetLegend(RimEnsembleCurveSet* c
if (overlayWidget) if (overlayWidget)
{ {
caf::TitledOverlayFrame* overlyItem = curveSetToShowLegendFor->legendConfig()->titledOverlayFrame(); caf::TitledOverlayFrame* overlayItem = curveSetToShowLegendFor->legendConfig()->titledOverlayFrame();
overlyItem->setRenderSize(overlyItem->preferredSize()); overlayItem->setRenderSize(overlayItem->preferredSize());
overlayWidget->updateFromOverlyItem(curveSetToShowLegendFor->legendConfig()->titledOverlayFrame()); overlayWidget->updateFromOverlayItem(curveSetToShowLegendFor->legendConfig()->titledOverlayFrame());
overlayWidget->show(); overlayWidget->show();
} }

2
ApplicationCode/UserInterface/RiuViewer.cpp
View File

@ -100,7 +100,7 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent)
m_mainRendering->addOverlayItem(m_axisCross.p()); m_mainRendering->addOverlayItem(m_axisCross.p());
m_showAxisCross = true; m_showAxisCross = true;
this->enableOverlyPainting(true); this->enableOverlayPainting(true);
this->setReleaseOGLResourcesEachFrame(true); this->setReleaseOGLResourcesEachFrame(true);
// Info Text // Info Text

10
Fwk/AppFwk/cafViewer/cafViewer.cpp
View File

@ -572,13 +572,13 @@ void caf::Viewer::paintEvent(QPaintEvent* event)
} }
m_overlayPaintingQImage.fill(Qt::transparent); m_overlayPaintingQImage.fill(Qt::transparent);
QPainter overlyPainter(&m_overlayPaintingQImage); QPainter overlayPainter(&m_overlayPaintingQImage);
// Call virtual method to allow subclasses to paint on the OpenGlCanvas // Call virtual method to allow subclasses to paint on the OpenGlCanvas
if (m_isOverlayPaintingEnabled) if (m_isOverlayPaintingEnabled)
{ {
this->paintOverlayItems(&overlyPainter); this->paintOverlayItems(&overlayPainter);
} }
// Draw performance overlay // Draw performance overlay
@ -589,7 +589,7 @@ void caf::Viewer::paintEvent(QPaintEvent* event)
hud.addStrings(m_renderingSequence->performanceInfo()); hud.addStrings(m_renderingSequence->performanceInfo());
hud.addStrings(*m_mainCamera); hud.addStrings(*m_mainCamera);
hud.addString(QString("PaintCount: %1").arg(m_paintCounter++)); hud.addString(QString("PaintCount: %1").arg(m_paintCounter++));
hud.draw(&overlyPainter, width(), height()); hud.draw(&overlayPainter, width(), height());
} }
// Convert the QImage into the cvf::TextureImage, // Convert the QImage into the cvf::TextureImage,
@ -977,7 +977,7 @@ int caf::Viewer::currentFrameIndex() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool caf::Viewer::isOverlyPaintingEnabled() const bool caf::Viewer::isOverlayPaintingEnabled() const
{ {
return m_isOverlayPaintingEnabled; return m_isOverlayPaintingEnabled;
} }
@ -985,7 +985,7 @@ bool caf::Viewer::isOverlyPaintingEnabled() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void caf::Viewer::enableOverlyPainting(bool val) void caf::Viewer::enableOverlayPainting(bool val)
{ {
m_isOverlayPaintingEnabled = val; m_isOverlayPaintingEnabled = val;
updateOverlayImagePresence(); updateOverlayImagePresence();

4
Fwk/AppFwk/cafViewer/cafViewer.h
View File

@ -140,8 +140,8 @@ public:
// QPainter based drawing on top of the OpenGL graphics // QPainter based drawing on top of the OpenGL graphics
bool isOverlyPaintingEnabled() const; bool isOverlayPaintingEnabled() const;
void enableOverlyPainting(bool val); void enableOverlayPainting(bool val);
// Performance information for debugging etc. // Performance information for debugging etc.
void enablePerfInfoHud(bool enable); void enablePerfInfoHud(bool enable);

4
Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp
View File

@ -64,8 +64,8 @@ using namespace cvf;
m_renderConf = new caf::TransparentWBRenderConfiguration; m_renderConf = new caf::TransparentWBRenderConfiguration;
m_renderConf->setUpRenderSequence(m_renderingSequence.p()); m_renderConf->setUpRenderSequence(m_renderingSequence.p());
// Cerate overly item if needed // Cerate overlay item if needed
cvf::OverlyItem* overlayItem; // = new someTtem cvf::OverlayItem* overlayItem; // = new someTtem
m_renderConf->overlayRendering()->addOverlayItem(overlayItem); m_renderConf->overlayRendering()->addOverlayItem(overlayItem);
} }