From be95eefd69455186a4a70160cb6f60b89c651bfc Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Mon, 4 Mar 2019 10:35:29 +0100 Subject: [PATCH] Repository wide spelling correction overly -> overlay * Impacts CAF and ResInsight --- .../UserInterface/RiuCvfOverlayItemWidget.cpp | 2 +- .../UserInterface/RiuCvfOverlayItemWidget.h | 2 +- ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp | 6 +++--- ApplicationCode/UserInterface/RiuViewer.cpp | 2 +- Fwk/AppFwk/cafViewer/cafViewer.cpp | 10 +++++----- Fwk/AppFwk/cafViewer/cafViewer.h | 4 ++-- .../cafTransparentWBRenderConfiguration.cpp | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp b/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp index dd15d84239..dcfbb4b38e 100644 --- a/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp +++ b/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.cpp @@ -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) diff --git a/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.h b/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.h index ed4f895f35..237b09bcba 100644 --- a/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.h +++ b/ApplicationCode/UserInterface/RiuCvfOverlayItemWidget.h @@ -38,7 +38,7 @@ public: explicit RiuCvfOverlayItemWidget(QWidget* parent = nullptr); ~RiuCvfOverlayItemWidget() override; - void updateFromOverlyItem( cvf::OverlayItem * item); + void updateFromOverlayItem( cvf::OverlayItem * item); // virtual QSize sizeHint() const override; // virtual QSize minimumSizeHint() const override; diff --git a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp index 0f79d8be67..25dc3ce2e8 100644 --- a/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryQwtPlot.cpp @@ -136,10 +136,10 @@ void RiuSummaryQwtPlot::addOrUpdateEnsembleCurveSetLegend(RimEnsembleCurveSet* c if (overlayWidget) { - caf::TitledOverlayFrame* overlyItem = curveSetToShowLegendFor->legendConfig()->titledOverlayFrame(); - overlyItem->setRenderSize(overlyItem->preferredSize()); + caf::TitledOverlayFrame* overlayItem = curveSetToShowLegendFor->legendConfig()->titledOverlayFrame(); + overlayItem->setRenderSize(overlayItem->preferredSize()); - overlayWidget->updateFromOverlyItem(curveSetToShowLegendFor->legendConfig()->titledOverlayFrame()); + overlayWidget->updateFromOverlayItem(curveSetToShowLegendFor->legendConfig()->titledOverlayFrame()); overlayWidget->show(); } diff --git a/ApplicationCode/UserInterface/RiuViewer.cpp b/ApplicationCode/UserInterface/RiuViewer.cpp index e0e5fd7b56..be6e222b60 100644 --- a/ApplicationCode/UserInterface/RiuViewer.cpp +++ b/ApplicationCode/UserInterface/RiuViewer.cpp @@ -100,7 +100,7 @@ RiuViewer::RiuViewer(const QGLFormat& format, QWidget* parent) m_mainRendering->addOverlayItem(m_axisCross.p()); m_showAxisCross = true; - this->enableOverlyPainting(true); + this->enableOverlayPainting(true); this->setReleaseOGLResourcesEachFrame(true); // Info Text diff --git a/Fwk/AppFwk/cafViewer/cafViewer.cpp b/Fwk/AppFwk/cafViewer/cafViewer.cpp index 4a4522470d..431d5f8641 100644 --- a/Fwk/AppFwk/cafViewer/cafViewer.cpp +++ b/Fwk/AppFwk/cafViewer/cafViewer.cpp @@ -572,13 +572,13 @@ void caf::Viewer::paintEvent(QPaintEvent* event) } m_overlayPaintingQImage.fill(Qt::transparent); - QPainter overlyPainter(&m_overlayPaintingQImage); + QPainter overlayPainter(&m_overlayPaintingQImage); // Call virtual method to allow subclasses to paint on the OpenGlCanvas if (m_isOverlayPaintingEnabled) { - this->paintOverlayItems(&overlyPainter); + this->paintOverlayItems(&overlayPainter); } // Draw performance overlay @@ -589,7 +589,7 @@ void caf::Viewer::paintEvent(QPaintEvent* event) hud.addStrings(m_renderingSequence->performanceInfo()); hud.addStrings(*m_mainCamera); 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, @@ -977,7 +977,7 @@ int caf::Viewer::currentFrameIndex() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool caf::Viewer::isOverlyPaintingEnabled() const +bool caf::Viewer::isOverlayPaintingEnabled() const { 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; updateOverlayImagePresence(); diff --git a/Fwk/AppFwk/cafViewer/cafViewer.h b/Fwk/AppFwk/cafViewer/cafViewer.h index 52d1625119..2f8401bf84 100644 --- a/Fwk/AppFwk/cafViewer/cafViewer.h +++ b/Fwk/AppFwk/cafViewer/cafViewer.h @@ -140,8 +140,8 @@ public: // QPainter based drawing on top of the OpenGL graphics - bool isOverlyPaintingEnabled() const; - void enableOverlyPainting(bool val); + bool isOverlayPaintingEnabled() const; + void enableOverlayPainting(bool val); // Performance information for debugging etc. void enablePerfInfoHud(bool enable); diff --git a/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp b/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp index 611fc788be..784c1c5c40 100644 --- a/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp +++ b/Fwk/AppFwk/cafVizExtensions/cafTransparentWBRenderConfiguration.cpp @@ -64,8 +64,8 @@ using namespace cvf; m_renderConf = new caf::TransparentWBRenderConfiguration; m_renderConf->setUpRenderSequence(m_renderingSequence.p()); - // Cerate overly item if needed - cvf::OverlyItem* overlayItem; // = new someTtem + // Cerate overlay item if needed + cvf::OverlayItem* overlayItem; // = new someTtem m_renderConf->overlayRendering()->addOverlayItem(overlayItem); }