From a54b9204796c4fe72e11120d209a483297fcb0e7 Mon Sep 17 00:00:00 2001
From: Emmanuel Christophe <emmanuel.christophe@orfeo-toolbox.org>
Date: Fri, 26 Jun 2009 17:06:49 +0800
Subject: [PATCH] STYLE: rename Modulus to Amplitude
---
.../Controller/otbImageViewerManagerController.cxx | 4 ++--
.../Controller/otbImageViewerManagerController.h | 2 +-
.../otbImageViewerManagerControllerInterface.h | 2 +-
ViewerManager/Model/otbImageViewerManagerModel.cxx | 8 ++++----
ViewerManager/Model/otbImageViewerManagerModel.h | 10 ++--------
ViewerManager/View/otbImageViewerManagerViewGUI.cxx | 10 +++++-----
ViewerManager/View/otbImageViewerManagerViewGroup.fl | 6 +++---
7 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/ViewerManager/Controller/otbImageViewerManagerController.cxx b/ViewerManager/Controller/otbImageViewerManagerController.cxx
index e5ba92f4b0..69688030eb 100644
--- a/ViewerManager/Controller/otbImageViewerManagerController.cxx
+++ b/ViewerManager/Controller/otbImageViewerManagerController.cxx
@@ -102,11 +102,11 @@ ImageViewerManagerController
void
ImageViewerManagerController
-::UpdateModulusChannelOrder(int realChoice, int imChoice, unsigned int selectedItem)
+::UpdateAmplitudeChannelOrder(int realChoice, int imChoice, unsigned int selectedItem)
{
try
{
- m_Model->UpdateModulusChannelOrder(realChoice,imChoice, selectedItem);
+ m_Model->UpdateAmplitudeChannelOrder(realChoice,imChoice, selectedItem);
}
catch (itk::ExceptionObject & err)
{
diff --git a/ViewerManager/Controller/otbImageViewerManagerController.h b/ViewerManager/Controller/otbImageViewerManagerController.h
index 08b9e21d4d..021beba265 100644
--- a/ViewerManager/Controller/otbImageViewerManagerController.h
+++ b/ViewerManager/Controller/otbImageViewerManagerController.h
@@ -104,7 +104,7 @@ public:
virtual void CloseImage(unsigned int selectedItem);
virtual void UpdateRGBChannelOrder(int redChoice , int greenChoice, int BlueChoice, unsigned int selectedItem);
virtual void UpdateGrayScaleChannelOrder(int choice, unsigned int selectedItem );
- virtual void UpdateModulusChannelOrder(int realChoice , int imChoice ,unsigned int selectedItem );
+ virtual void UpdateAmplitudeChannelOrder(int realChoice , int imChoice ,unsigned int selectedItem );
virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice, unsigned int selectedItem);
virtual void Link(unsigned int leftChoice, unsigned int rightChoice , OffsetType offset);
virtual void UpdateImageViewController(unsigned int selectedItem);
diff --git a/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h b/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h
index 448ac32da6..eb97955041 100644
--- a/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h
+++ b/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h
@@ -72,7 +72,7 @@ public:
virtual void CloseImage(unsigned int selectedItem) = 0;
virtual void UpdateRGBChannelOrder(int redChoice , int greenChoice, int BlueChoice, unsigned int selectedItem) = 0;
virtual void UpdateGrayScaleChannelOrder(int choice, unsigned int selectedItem) = 0;
- virtual void UpdateModulusChannelOrder(int realChoice , int imChoice,unsigned int selectedItem) = 0;
+ virtual void UpdateAmplitudeChannelOrder(int realChoice , int imChoice,unsigned int selectedItem) = 0;
virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice, unsigned int selectedItem) = 0;
virtual void Link(unsigned int leftChoice, unsigned int rightChoice , OffsetType offset) = 0;
virtual void UpdateImageViewController(unsigned int selectedItem) = 0;
diff --git a/ViewerManager/Model/otbImageViewerManagerModel.cxx b/ViewerManager/Model/otbImageViewerManagerModel.cxx
index 49c4fb74cc..16e43f12a5 100644
--- a/ViewerManager/Model/otbImageViewerManagerModel.cxx
+++ b/ViewerManager/Model/otbImageViewerManagerModel.cxx
@@ -260,14 +260,14 @@ ImageViewerManagerModel
void
ImageViewerManagerModel
-::UpdateModulusChannelOrder(int realChoice , int imChoice, unsigned int selectedItem )
+::UpdateAmplitudeChannelOrder(int realChoice , int imChoice, unsigned int selectedItem )
{
- ModulusRenderingFunction::PixelRepresentationFunctionType::ChannelListType channels;
+ AmplitudeRenderingFunction::PixelRepresentationFunctionType::ChannelListType channels;
channels.push_back(realChoice);
channels.push_back(imChoice);
- ModulusRenderingFunction::Pointer modulusFunction;
- modulusFunction = ModulusRenderingFunction::New();
+ AmplitudeRenderingFunction::Pointer modulusFunction;
+ modulusFunction = AmplitudeRenderingFunction::New();
modulusFunction->SetChannelList(channels);
diff --git a/ViewerManager/Model/otbImageViewerManagerModel.h b/ViewerManager/Model/otbImageViewerManagerModel.h
index c8a3212794..8c85c16617 100644
--- a/ViewerManager/Model/otbImageViewerManagerModel.h
+++ b/ViewerManager/Model/otbImageViewerManagerModel.h
@@ -37,9 +37,6 @@ PURPOSE. See the above copyright notices for more information.
#include "otbChangeScaleActionHandler.h"
#include "otbArrowKeyMoveActionHandler.h"
-
-// #include "otbModulusRenderingFunction.h"
-// #include "otbPhaseRenderingFunction.h"
#include "otbAmplitudeFunctor.h"
#include "otbPhaseFunctor.h"
@@ -93,10 +90,7 @@ public:
typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType> StandardRenderingFunctionType;
typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType,
- otb::Function::AmplitudeFunctor<ImageType::PixelType> > ModulusRenderingFunction;
-// typedef Function::ModulusRenderingFunction<ImageType::InternalPixelType, RGBPixelType> ModulusRenderingFunction;
-
-// typedef Function::PhaseRenderingFunction<ImageType::InternalPixelType, RGBPixelType> PhaseRenderingFunction;
+ otb::Function::AmplitudeFunctor<ImageType::PixelType> > AmplitudeRenderingFunction;
typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType,
otb::Function::PhaseFunctor<ImageType::PixelType> > PhaseRenderingFunction;
@@ -162,7 +156,7 @@ public:
virtual void CloseImage(unsigned int selectedItem);
virtual void UpdateRGBChannelOrder(int redChoice , int greenChoice, int BlueChoice, unsigned int selectedItem);
virtual void UpdateGrayScaleChannelOrder(int choice, unsigned int selectedItem);
- virtual void UpdateModulusChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
+ virtual void UpdateAmplitudeChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
virtual void Link(unsigned int leftChoice, unsigned int rightChoice, OffsetType offset);
virtual void InitializeImageViewController(unsigned int selectedItem);
diff --git a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
index 66a5dcd259..f8246c5c20 100644
--- a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
+++ b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
@@ -830,7 +830,7 @@ ImageViewerManagerViewGUI
guiGrayscaleChannelChoice->deactivate();
guiRealChannelChoice->deactivate();
guiImaginaryChannelChoice->deactivate();
- bModulus->deactivate();
+ bAmplitude->deactivate();
bPhase->deactivate();
guiRedChannelChoice->activate();
@@ -878,7 +878,7 @@ ImageViewerManagerViewGUI
guiRealChannelChoice->deactivate();
guiImaginaryChannelChoice->deactivate();
- bModulus->deactivate();
+ bAmplitude->deactivate();
bPhase->deactivate();
guiRedChannelChoice->deactivate();
guiGreenChannelChoice->deactivate();
@@ -922,7 +922,7 @@ ImageViewerManagerViewGUI
guiBlueChannelChoice->deactivate();
guiRealChannelChoice->activate();
guiImaginaryChannelChoice->activate();
- bModulus->activate();
+ bAmplitude->activate();
bPhase->activate();
@@ -983,9 +983,9 @@ ImageViewerManagerViewGUI
}
else if (guiViewerSetupComplexMode->value())
{
- if (bModulus->value())
+ if (bAmplitude->value())
{
- m_ImageViewerManagerController->UpdateModulusChannelOrder(atoi(guiRealChannelChoice->value())-1,
+ m_ImageViewerManagerController->UpdateAmplitudeChannelOrder(atoi(guiRealChannelChoice->value())-1,
atoi(guiImaginaryChannelChoice->value())-1,
selectedItem);
}
diff --git a/ViewerManager/View/otbImageViewerManagerViewGroup.fl b/ViewerManager/View/otbImageViewerManagerViewGroup.fl
index 9c7b52b7ec..75170c9696 100644
--- a/ViewerManager/View/otbImageViewerManagerViewGroup.fl
+++ b/ViewerManager/View/otbImageViewerManagerViewGroup.fl
@@ -155,14 +155,14 @@ class ImageViewerManagerViewGroup {open
label {Imaginary channel index } open
tooltip {Select band for imaginary channel in complex composition} xywh {375 96 57 24} box EMBOSSED_BOX color 7 selection_color 55 labelcolor 187 deactivate
} {}
- Fl_Round_Button bModulus {
- label Modulus
+ Fl_Round_Button bAmplitude {
+ label Amplitude
callback {bPhase->clear();}
tooltip {Toggle modulus mode} xywh {235 50 80 15} down_box ROUND_DOWN_BOX value 1 labelcolor 187 deactivate
}
Fl_Round_Button bPhase {
label Phase
- callback {bModulus->clear();}
+ callback {bAmplitude->clear();}
tooltip {Toggle phase mode} xywh {325 50 80 15} down_box ROUND_DOWN_BOX labelcolor 187 deactivate
}
}
--
GitLab