1.1 --- a/ViewerManager/Model/otbImageViewerManagerModel.cxx Fri Jun 26 17:06:49 2009 +0800
1.2 +++ b/ViewerManager/Model/otbImageViewerManagerModel.cxx Fri Jun 26 17:29:07 2009 +0800
1.3 @@ -75,7 +75,7 @@
1.4 visuGenerator->SetImage(reader->GetOutput());
1.5 FltkFilterWatcher qlwatcher(visuGenerator->GetResampler(),0,0,200,20,"Generating QuickLook ...");
1.6 visuGenerator->GenerateLayer();
1.7 - RenderingFunctionType::Pointer rendrerFuntion = visuGenerator->GetRenderingFunction();
1.8 + RenderingFunctionType::Pointer rendrerFunction = visuGenerator->GetRenderingFunction();
1.9
1.10 /** Rendering image*/
1.11 VisuModelPointerType rendering = VisuModelType::New();
1.12 @@ -110,7 +110,7 @@
1.13 currentComponent.pRendering = rendering;
1.14 currentComponent.pVisuView = visuView;
1.15 currentComponent.pWidgetController = controller;
1.16 - currentComponent.pRenderFuntion = rendrerFuntion;
1.17 + currentComponent.pRenderFunction = rendrerFunction;
1.18 currentComponent.pPixelView = pixelView;
1.19 currentComponent.pPixelModel = pixelModel;
1.20 currentComponent.pCurveWidget = curveWidget;
1.21 @@ -120,7 +120,7 @@
1.22 assert(currentComponent.pRendering);
1.23 assert(currentComponent.pVisuView);
1.24 assert(currentComponent.pWidgetController);
1.25 - assert(currentComponent.pRenderFuntion);
1.26 + assert(currentComponent.pRenderFunction);
1.27 assert(currentComponent.pPixelView);
1.28 assert(currentComponent.pPixelModel);
1.29 assert(currentComponent.pCurveWidget);
1.30 @@ -223,7 +223,7 @@
1.31
1.32 //Update the layer
1.33 m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(renderFunction);
1.34 - m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = renderFunction;
1.35 + m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = renderFunction;
1.36 renderFunction->Initialize();//FIXME Initialize() should disappear from the renderingFunction
1.37 m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
1.38
1.39 @@ -248,7 +248,7 @@
1.40
1.41 //Update the layer
1.42 m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(renderFunction);
1.43 - m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = renderFunction;
1.44 + m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = renderFunction;
1.45 renderFunction->Initialize();//FIXME Initialize() should disappear from the renderingFunction
1.46 m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
1.47
1.48 @@ -274,7 +274,7 @@
1.49
1.50 //Update the layer
1.51 m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(modulusFunction);
1.52 - m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = modulusFunction;
1.53 + m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = modulusFunction;
1.54 modulusFunction->Initialize();//FIXME Initialize() should disappear from the renderinFunction
1.55 m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
1.56
1.57 @@ -302,7 +302,7 @@
1.58
1.59 //Update the layer
1.60 m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(phaseFunction);
1.61 - m_ObjectTrackedList.at(selectedItem-1).pRenderFuntion = phaseFunction;
1.62 + m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = phaseFunction;
1.63 phaseFunction->Initialize();//FIXME Initialize() should disappear from the renderinFunction
1.64 m_ObjectTrackedList.at(selectedItem-1).pRendering->Update();
1.65
2.1 --- a/ViewerManager/Model/otbImageViewerManagerModel.h Fri Jun 26 17:06:49 2009 +0800
2.2 +++ b/ViewerManager/Model/otbImageViewerManagerModel.h Fri Jun 26 17:29:07 2009 +0800
2.3 @@ -134,7 +134,7 @@
2.4 VisuModelPointerType pRendering;
2.5 WidgetControllerPointerType pWidgetController;
2.6 VisuViewPointerType pVisuView;
2.7 - RenderingFunctionType::Pointer pRenderFuntion;
2.8 + RenderingFunctionType::Pointer pRenderFunction;
2.9 PixelDescriptionViewType::Pointer pPixelView;
2.10 PixelDescriptionModelPointerType pPixelModel;
2.11 CurvesWidgetType::Pointer pCurveWidget;
3.1 --- a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx Fri Jun 26 17:06:49 2009 +0800
3.2 +++ b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx Fri Jun 26 17:29:07 2009 +0800
3.3 @@ -36,7 +36,7 @@
3.4
3.5 m_VisuView = VisuViewType::New();
3.6 m_PreviewWidget = ImageWidgetType::New();
3.7 - m_pRenderingFuntion = StandardRenderingFunctionType::New();
3.8 + m_pRenderingFunction = StandardRenderingFunctionType::New();
3.9 m_WidgetManagerList = WidgetManagerList::New();
3.10 m_LinkWidgetManagerList = WidgetManagerList::New();
3.11
3.12 @@ -436,7 +436,7 @@
3.13 VisuViewPointerType currentVisuView = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pVisuView;
3.14
3.15 //First get the histogram list
3.16 - RenderingFunctionType::Pointer pRenderingFuntion = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
3.17 + RenderingFunctionType::Pointer pRenderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
3.18
3.19
3.20
3.21 @@ -444,7 +444,7 @@
3.22
3.23 curveWidget->ClearAllCurves();
3.24
3.25 - if (pRenderingFuntion->GetPixelRepresentationSize() >=3)
3.26 + if (pRenderingFunction->GetPixelRepresentationSize() >=3)
3.27 {
3.28 HistogramCurveType::Pointer bhistogram = HistogramCurveType::New();
3.29 bhistogram->SetHistogramColor(m_Blue);
3.30 @@ -453,7 +453,7 @@
3.31 curveWidget->AddCurve(bhistogram);
3.32 }
3.33
3.34 - if (pRenderingFuntion->GetPixelRepresentationSize() >=2)
3.35 + if (pRenderingFunction->GetPixelRepresentationSize() >=2)
3.36 {
3.37 HistogramCurveType::Pointer ghistogram = HistogramCurveType::New();
3.38 ghistogram->SetHistogramColor(m_Green);
3.39 @@ -463,7 +463,7 @@
3.40 }
3.41
3.42 HistogramCurveType::Pointer rhistogram = HistogramCurveType::New();
3.43 - if (pRenderingFuntion->GetPixelRepresentationSize() == 1)
3.44 + if (pRenderingFunction->GetPixelRepresentationSize() == 1)
3.45 {
3.46 rhistogram->SetHistogramColor(m_Grey);
3.47 rhistogram->SetLabelColor(m_Grey);
3.48 @@ -739,9 +739,9 @@
3.49 {
3.50 //FIXME why this is not using the Describe method of the rendering function?
3.51 // oss<<"RGB Composition: ";
3.52 -// oss<<" Band 1: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion->GetRedChannelIndex();
3.53 -// oss<<" Band 2: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion->GetGreenChannelIndex();
3.54 -// oss<<" Band 3: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion->GetBlueChannelIndex()<<std::endl;
3.55 +// oss<<" Band 1: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction->GetRedChannelIndex();
3.56 +// oss<<" Band 2: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction->GetGreenChannelIndex();
3.57 +// oss<<" Band 3: "<<m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction->GetBlueChannelIndex()<<std::endl;
3.58 }
3.59
3.60 guiViewerInformation->insert(oss.str().c_str());
3.61 @@ -837,9 +837,9 @@
3.62 guiGreenChannelChoice->activate();
3.63 guiBlueChannelChoice->activate();
3.64
3.65 - assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion.GetPointer());
3.66 + assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction.GetPointer());
3.67
3.68 - RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
3.69 + RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
3.70
3.71 ChannelListType channels = renderingFunction->GetChannelList();
3.72 unsigned int i=0;
3.73 @@ -886,9 +886,9 @@
3.74
3.75 guiGrayscaleChannelChoice->activate();
3.76
3.77 - assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion.GetPointer());
3.78 + assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction.GetPointer());
3.79
3.80 - RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
3.81 + RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
3.82
3.83 ChannelListType channels = renderingFunction->GetChannelList();
3.84 if (channels.size() < 1)
3.85 @@ -926,8 +926,8 @@
3.86 bPhase->activate();
3.87
3.88
3.89 - assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion.GetPointer());
3.90 - RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFuntion;
3.91 + assert(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction.GetPointer());
3.92 + RenderingFunctionType::Pointer renderingFunction = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pRenderFunction;
3.93
3.94 ChannelListType channels = renderingFunction->GetChannelList();
3.95 unsigned int i=0;
3.96 @@ -1055,7 +1055,7 @@
3.97 VisuViewPointerType currentVisuView = m_ImageViewerManagerModel->GetObjectList().at(m_DiaporamaCurrentIndex).pVisuView;
3.98
3.99 //First get the histogram list
3.100 - RenderingFunctionType::Pointer pRenderingFuntion = m_ImageViewerManagerModel->GetObjectList().at(m_DiaporamaCurrentIndex).pRenderFuntion;
3.101 + RenderingFunctionType::Pointer pRenderingFunction = m_ImageViewerManagerModel->GetObjectList().at(m_DiaporamaCurrentIndex).pRenderFunction;
3.102
3.103 HistogramCurveType::Pointer rhistogram = HistogramCurveType::New();
3.104 HistogramCurveType::Pointer ghistogram = HistogramCurveType::New();
4.1 --- a/ViewerManager/View/otbImageViewerManagerViewGUI.h Fri Jun 26 17:06:49 2009 +0800
4.2 +++ b/ViewerManager/View/otbImageViewerManagerViewGUI.h Fri Jun 26 17:29:07 2009 +0800
4.3 @@ -225,7 +225,7 @@
4.4
4.5
4.6 /** Histogram */
4.7 - StandardRenderingFunctionType::Pointer m_pRenderingFuntion;
4.8 + StandardRenderingFunctionType::Pointer m_pRenderingFunction;
4.9 HistogramCurveType::ColorType m_Red;
4.10 HistogramCurveType::ColorType m_Green;
4.11 HistogramCurveType::ColorType m_Blue;