STYLE: rename Modulus to Amplitude

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)
     {

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);

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;

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);
 

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);

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);
 	 }

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
       }
     }