From cf76c06a856fac00bbf1ef6b4a6ac36f98358b6f Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Fri, 26 Jun 2009 17:29:07 +0800
Subject: [PATCH] BUG: correct typo
---
.../Model/otbImageViewerManagerModel.cxx | 14 ++++-----
.../Model/otbImageViewerManagerModel.h | 2 +-
.../View/otbImageViewerManagerViewGUI.cxx | 30 +++++++++----------
.../View/otbImageViewerManagerViewGUI.h | 2 +-
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/ViewerManager/Model/otbImageViewerManagerModel.cxx b/ViewerManager/Model/otbImageViewerManagerModel.cxx
index 16e43f12a5..148517d0fb 100644
--- a/ViewerManager/Model/otbImageViewerManagerModel.cxx
+++ b/ViewerManager/Model/otbImageViewerManagerModel.cxx
@@ -75,7 +75,7 @@ ImageViewerManagerModel
visuGenerator->SetImage(reader->GetOutput());
FltkFilterWatcher qlwatcher(visuGenerator->GetResampler(),0,0,200,20,"Generating QuickLook ...");
visuGenerator->GenerateLayer();
- RenderingFunctionType::Pointer rendrerFuntion = visuGenerator->GetRenderingFunction();
+ RenderingFunctionType::Pointer rendrerFunction = visuGenerator->GetRenderingFunction();
/** Rendering image*/
VisuModelPointerType rendering = VisuModelType::New();
@@ -110,7 +110,7 @@ ImageViewerManagerModel
currentComponent.pRendering = rendering;
currentComponent.pVisuView = visuView;
currentComponent.pWidgetController = controller;
- currentComponent.pRenderFuntion = rendrerFuntion;
+ currentComponent.pRenderFunction = rendrerFunction;
currentComponent.pPixelView = pixelView;
currentComponent.pPixelModel = pixelModel;
currentComponent.pCurveWidget = curveWidget;
@@ -120,7 +120,7 @@ ImageViewerManagerModel
assert(currentComponent.pRendering);
assert(currentComponent.pVisuView);
assert(currentComponent.pWidgetController);
- assert(currentComponent.pRenderFuntion);
+ assert(currentComponent.pRenderFunction);
assert(currentComponent.pPixelView);
assert(currentComponent.pPixelModel);
assert(currentComponent.pCurveWidget);
@@ -223,7 +223,7 @@ ImageViewerManagerModel
//Update the layer
m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(renderFunction);
- m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = renderFunction;
+ m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = renderFunction;
renderFunction->Initialize();//FIXME Initialize() should disappear from the renderingFunction
m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
@@ -248,7 +248,7 @@ ImageViewerManagerModel
//Update the layer
m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(renderFunction);
- m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = renderFunction;
+ m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = renderFunction;
renderFunction->Initialize();//FIXME Initialize() should disappear from the renderingFunction
m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
@@ -274,7 +274,7 @@ ImageViewerManagerModel
//Update the layer
m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(modulusFunction);
- m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = modulusFunction;
+ m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = modulusFunction;
modulusFunction->Initialize();//FIXME Initialize() should disappear from the renderinFunction
m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
@@ -302,7 +302,7 @@ ImageViewerManagerModel
//Update the layer
m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(phaseFunction);
- m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = phaseFunction;
+ m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = phaseFunction;
phaseFunction->Initialize();//FIXME Initialize() should disappear from the renderinFunction
m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
diff --git a/ViewerManager/Model/otbImageViewerManagerModel.h b/ViewerManager/Model/otbImageViewerManagerModel.h
index 8c85c16617..78da30038c 100644
--- a/ViewerManager/Model/otbImageViewerManagerModel.h
+++ b/ViewerManager/Model/otbImageViewerManagerModel.h
@@ -134,7 +134,7 @@ public:
VisuModelPointerType pRendering;
WidgetControllerPointerType pWidgetController;
VisuViewPointerType pVisuView;
- RenderingFunctionType::Pointer pRenderFuntion;
+ RenderingFunctionType::Pointer pRenderFunction;
PixelDescriptionViewType::Pointer pPixelView;
PixelDescriptionModelPointerType pPixelModel;
CurvesWidgetType::Pointer pCurveWidget;
diff --git a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
index f8246c5c20..53cdc741fc 100644
--- a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
+++ b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
@@ -36,7 +36,7 @@ ImageViewerManagerViewGUI
m_VisuView = VisuViewType::New();
m_PreviewWidget = ImageWidgetType::New();
- m_pRenderingFuntion = StandardRenderingFunctionType::New();
+ m_pRenderingFunction = StandardRenderingFunctionType::New();
m_WidgetManagerList = WidgetManagerList::New();
m_LinkWidgetManagerList = WidgetManagerList::New();
@@ -436,7 +436,7 @@ ImageViewerManagerViewGUI
VisuViewPointerType currentVisuView = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pVisuView;
//First get the histogram list
- RenderingFunctionType::Pointer pRenderingFuntion = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
+ RenderingFunctionType::Pointer pRenderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
@@ -444,7 +444,7 @@ ImageViewerManagerViewGUI
curveWidget->ClearAllCurves();
- if (pRenderingFuntion->GetPixelRepresentationSize() >=3)
+ if (pRenderingFunction->GetPixelRepresentationSize() >=3)
{
HistogramCurveType::Pointer bhistogram = HistogramCurveType::New();
bhistogram->SetHistogramColor(m_Blue);
@@ -453,7 +453,7 @@ ImageViewerManagerViewGUI
curveWidget->AddCurve(bhistogram);
}
- if (pRenderingFuntion->GetPixelRepresentationSize() >=2)
+ if (pRenderingFunction->GetPixelRepresentationSize() >=2)
{
HistogramCurveType::Pointer ghistogram = HistogramCurveType::New();
ghistogram->SetHistogramColor(m_Green);
@@ -463,7 +463,7 @@ ImageViewerManagerViewGUI
}
HistogramCurveType::Pointer rhistogram = HistogramCurveType::New();
- if (pRenderingFuntion->GetPixelRepresentationSize() == 1)
+ if (pRenderingFunction->GetPixelRepresentationSize() == 1)
{
rhistogram->SetHistogramColor(m_Grey);
rhistogram->SetLabelColor(m_Grey);
@@ -739,9 +739,9 @@ ImageViewerManagerViewGUI
{
//FIXME why this is not using the Describe method of the rendering function?
// oss<<"RGB Composition: ";
-// oss<<" Band 1: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion->GetRedChannelIndex();
-// oss<<" Band 2: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion->GetGreenChannelIndex();
-// oss<<" Band 3: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion->GetBlueChannelIndex()<<std::endl;
+// oss<<" Band 1: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction->GetRedChannelIndex();
+// oss<<" Band 2: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction->GetGreenChannelIndex();
+// oss<<" Band 3: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction->GetBlueChannelIndex()<<std::endl;
}
guiViewerInformation->insert(oss.str().c_str());
@@ -837,9 +837,9 @@ ImageViewerManagerViewGUI
guiGreenChannelChoice->activate();
guiBlueChannelChoice->activate();
- assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion.GetPointer());
+ assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction.GetPointer());
- RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
+ RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
ChannelListType channels = renderingFunction->GetChannelList();
unsigned int i=0;
@@ -886,9 +886,9 @@ ImageViewerManagerViewGUI
guiGrayscaleChannelChoice->activate();
- assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion.GetPointer());
+ assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction.GetPointer());
- RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
+ RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
ChannelListType channels = renderingFunction->GetChannelList();
if (channels.size() < 1)
@@ -926,8 +926,8 @@ ImageViewerManagerViewGUI
bPhase->activate();
- assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion.GetPointer());
- RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
+ assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction.GetPointer());
+ RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
ChannelListType channels = renderingFunction->GetChannelList();
unsigned int i=0;
@@ -1055,7 +1055,7 @@ ImageViewerManagerViewGUI
VisuViewPointerType currentVisuView = m_ImageViewerManagerModel->GetObjectList().at(m_DiaporamaCurrentIndex).pVisuView;
//First get the histogram list
- RenderingFunctionType::Pointer pRenderingFuntion = m_ImageViewerManagerModel->GetObjectList().at(m_DiaporamaCurrentIndex).pRenderFuntion;
+ RenderingFunctionType::Pointer pRenderingFunction = m_ImageViewerManagerModel->GetObjectList().at(m_DiaporamaCurrentIndex).pRenderFunction;
HistogramCurveType::Pointer rhistogram = HistogramCurveType::New();
HistogramCurveType::Pointer ghistogram = HistogramCurveType::New();
diff --git a/ViewerManager/View/otbImageViewerManagerViewGUI.h b/ViewerManager/View/otbImageViewerManagerViewGUI.h
index 03bcc5d6f3..d846ef5de8 100644
--- a/ViewerManager/View/otbImageViewerManagerViewGUI.h
+++ b/ViewerManager/View/otbImageViewerManagerViewGUI.h
@@ -225,7 +225,7 @@ private:
/** Histogram */
- StandardRenderingFunctionType::Pointer m_pRenderingFuntion;
+ StandardRenderingFunctionType::Pointer m_pRenderingFunction;
HistogramCurveType::ColorType m_Red;
HistogramCurveType::ColorType m_Green;
HistogramCurveType::ColorType m_Blue;
--
GitLab