Skip to content
Snippets Groups Projects
Commit cf76c06a authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

BUG: correct typo

parent a54b9204
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ViewerManager/Model/otbImageViewerManagerModel.cxx
+ 7
− 7
View file @ cf76c06a
......@@ -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();
......
ViewerManager/Model/otbImageViewerManagerModel.h
+ 1
− 1
View file @ cf76c06a
......@@ -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;
......
ViewerManager/View/otbImageViewerManagerViewGUI.cxx
+ 15
− 15
View file @ cf76c06a
......@@ -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();
......
ViewerManager/View/otbImageViewerManagerViewGUI.h
+ 1
− 1
View file @ cf76c06a
......@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment