1.1 --- a/ViewerManager/Controller/otbImageViewerManagerController.cxx	Fri Jun 26 16:57:23 2009 +0800
     1.2 +++ b/ViewerManager/Controller/otbImageViewerManagerController.cxx	Fri Jun 26 17:06:49 2009 +0800
     1.3 @@ -102,11 +102,11 @@
     1.4  
     1.5  void
     1.6  ImageViewerManagerController
     1.7 -::UpdateModulusChannelOrder(int realChoice, int imChoice, unsigned int selectedItem)
     1.8 +::UpdateAmplitudeChannelOrder(int realChoice, int imChoice, unsigned int selectedItem)
     1.9  {
    1.10    try
    1.11      {
    1.12 -      m_Model->UpdateModulusChannelOrder(realChoice,imChoice, selectedItem);
    1.13 +      m_Model->UpdateAmplitudeChannelOrder(realChoice,imChoice, selectedItem);
    1.14      }
    1.15    catch (itk::ExceptionObject & err)
    1.16      {

     2.1 --- a/ViewerManager/Controller/otbImageViewerManagerController.h	Fri Jun 26 16:57:23 2009 +0800
     2.2 +++ b/ViewerManager/Controller/otbImageViewerManagerController.h	Fri Jun 26 17:06:49 2009 +0800
     2.3 @@ -104,7 +104,7 @@
     2.4    virtual void CloseImage(unsigned int selectedItem);
     2.5    virtual void UpdateRGBChannelOrder(int redChoice , int greenChoice, int BlueChoice, unsigned int selectedItem);
     2.6    virtual void UpdateGrayScaleChannelOrder(int choice, unsigned int selectedItem );
     2.7 -  virtual void UpdateModulusChannelOrder(int realChoice , int imChoice ,unsigned int selectedItem );
     2.8 +  virtual void UpdateAmplitudeChannelOrder(int realChoice , int imChoice ,unsigned int selectedItem );
     2.9    virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice, unsigned int selectedItem);
    2.10    virtual void Link(unsigned int leftChoice, unsigned int rightChoice , OffsetType offset);
    2.11    virtual void UpdateImageViewController(unsigned int selectedItem);

     3.1 --- a/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h	Fri Jun 26 16:57:23 2009 +0800
     3.2 +++ b/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h	Fri Jun 26 17:06:49 2009 +0800
     3.3 @@ -72,7 +72,7 @@
     3.4    virtual void CloseImage(unsigned int selectedItem) = 0;
     3.5    virtual void UpdateRGBChannelOrder(int redChoice , int greenChoice, int BlueChoice, unsigned int selectedItem) = 0;
     3.6    virtual void UpdateGrayScaleChannelOrder(int choice, unsigned int selectedItem) = 0; 
     3.7 -  virtual void UpdateModulusChannelOrder(int realChoice , int imChoice,unsigned int selectedItem) = 0; 
     3.8 +  virtual void UpdateAmplitudeChannelOrder(int realChoice , int imChoice,unsigned int selectedItem) = 0; 
     3.9    virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice, unsigned int selectedItem) = 0; 
    3.10    virtual void Link(unsigned int leftChoice, unsigned int rightChoice , OffsetType offset) = 0;
    3.11    virtual void UpdateImageViewController(unsigned int selectedItem) = 0;

     4.1 --- a/ViewerManager/Model/otbImageViewerManagerModel.cxx	Fri Jun 26 16:57:23 2009 +0800
     4.2 +++ b/ViewerManager/Model/otbImageViewerManagerModel.cxx	Fri Jun 26 17:06:49 2009 +0800
     4.3 @@ -260,14 +260,14 @@
     4.4  
     4.5  void
     4.6  ImageViewerManagerModel
     4.7 -::UpdateModulusChannelOrder(int realChoice , int imChoice, unsigned int selectedItem )
     4.8 +::UpdateAmplitudeChannelOrder(int realChoice , int imChoice, unsigned int selectedItem )
     4.9  {
    4.10 -  ModulusRenderingFunction::PixelRepresentationFunctionType::ChannelListType channels;
    4.11 +  AmplitudeRenderingFunction::PixelRepresentationFunctionType::ChannelListType channels;
    4.12    channels.push_back(realChoice);
    4.13    channels.push_back(imChoice);
    4.14  
    4.15 -   ModulusRenderingFunction::Pointer modulusFunction;
    4.16 -  modulusFunction = ModulusRenderingFunction::New();
    4.17 +   AmplitudeRenderingFunction::Pointer modulusFunction;
    4.18 +  modulusFunction = AmplitudeRenderingFunction::New();
    4.19  
    4.20    modulusFunction->SetChannelList(channels);
    4.21  

     5.1 --- a/ViewerManager/Model/otbImageViewerManagerModel.h	Fri Jun 26 16:57:23 2009 +0800
     5.2 +++ b/ViewerManager/Model/otbImageViewerManagerModel.h	Fri Jun 26 17:06:49 2009 +0800
     5.3 @@ -37,9 +37,6 @@
     5.4  #include "otbChangeScaleActionHandler.h"
     5.5  #include "otbArrowKeyMoveActionHandler.h"
     5.6  
     5.7 -
     5.8 -// #include "otbModulusRenderingFunction.h"
     5.9 -// #include "otbPhaseRenderingFunction.h"
    5.10  #include "otbAmplitudeFunctor.h"
    5.11  #include "otbPhaseFunctor.h"
    5.12  
    5.13 @@ -93,10 +90,7 @@
    5.14    typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType>                          StandardRenderingFunctionType;
    5.15  
    5.16    typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType,
    5.17 -  otb::Function::AmplitudeFunctor<ImageType::PixelType> >                            ModulusRenderingFunction;
    5.18 -//   typedef Function::ModulusRenderingFunction<ImageType::InternalPixelType, RGBPixelType>    ModulusRenderingFunction;
    5.19 -
    5.20 -//   typedef Function::PhaseRenderingFunction<ImageType::InternalPixelType, RGBPixelType>      PhaseRenderingFunction;
    5.21 +  otb::Function::AmplitudeFunctor<ImageType::PixelType> >                             AmplitudeRenderingFunction;
    5.22    typedef Function::StandardRenderingFunction<ImageType::PixelType, RGBPixelType,
    5.23    otb::Function::PhaseFunctor<ImageType::PixelType> >                                 PhaseRenderingFunction;
    5.24  
    5.25 @@ -162,7 +156,7 @@
    5.26    virtual void CloseImage(unsigned int selectedItem);
    5.27    virtual void UpdateRGBChannelOrder(int redChoice , int greenChoice, int BlueChoice, unsigned int selectedItem);
    5.28    virtual void UpdateGrayScaleChannelOrder(int choice, unsigned int selectedItem);
    5.29 -  virtual void UpdateModulusChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
    5.30 +  virtual void UpdateAmplitudeChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
    5.31    virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
    5.32    virtual void Link(unsigned int leftChoice, unsigned int rightChoice, OffsetType offset);
    5.33    virtual void InitializeImageViewController(unsigned int selectedItem);

     6.1 --- a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx	Fri Jun 26 16:57:23 2009 +0800
     6.2 +++ b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx	Fri Jun 26 17:06:49 2009 +0800
     6.3 @@ -830,7 +830,7 @@
     6.4     guiGrayscaleChannelChoice->deactivate();
     6.5     guiRealChannelChoice->deactivate();
     6.6     guiImaginaryChannelChoice->deactivate();
     6.7 -   bModulus->deactivate();
     6.8 +   bAmplitude->deactivate();
     6.9     bPhase->deactivate();
    6.10  
    6.11     guiRedChannelChoice->activate();
    6.12 @@ -878,7 +878,7 @@
    6.13  
    6.14     guiRealChannelChoice->deactivate();
    6.15     guiImaginaryChannelChoice->deactivate();
    6.16 -   bModulus->deactivate();
    6.17 +   bAmplitude->deactivate();
    6.18     bPhase->deactivate();
    6.19     guiRedChannelChoice->deactivate();
    6.20     guiGreenChannelChoice->deactivate();
    6.21 @@ -922,7 +922,7 @@
    6.22     guiBlueChannelChoice->deactivate();
    6.23     guiRealChannelChoice->activate();
    6.24     guiImaginaryChannelChoice->activate();
    6.25 -   bModulus->activate();
    6.26 +   bAmplitude->activate();
    6.27     bPhase->activate();
    6.28  
    6.29  
    6.30 @@ -983,9 +983,9 @@
    6.31       }
    6.32     else if (guiViewerSetupComplexMode->value())
    6.33       {
    6.34 -       if (bModulus->value())
    6.35 +       if (bAmplitude->value())
    6.36  	 {
    6.37 -	   m_ImageViewerManagerController->UpdateModulusChannelOrder(atoi(guiRealChannelChoice->value())-1,
    6.38 +	   m_ImageViewerManagerController->UpdateAmplitudeChannelOrder(atoi(guiRealChannelChoice->value())-1,
    6.39  								    atoi(guiImaginaryChannelChoice->value())-1,
    6.40  								    selectedItem);
    6.41  	 }

     7.1 --- a/ViewerManager/View/otbImageViewerManagerViewGroup.fl	Fri Jun 26 16:57:23 2009 +0800
     7.2 +++ b/ViewerManager/View/otbImageViewerManagerViewGroup.fl	Fri Jun 26 17:06:49 2009 +0800
     7.3 @@ -155,14 +155,14 @@
     7.4          label {Imaginary channel index } open
     7.5          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
     7.6        } {}
     7.7 -      Fl_Round_Button bModulus {
     7.8 -        label Modulus
     7.9 +      Fl_Round_Button bAmplitude {
    7.10 +        label Amplitude
    7.11          callback {bPhase->clear();}
    7.12          tooltip {Toggle modulus mode} xywh {235 50 80 15} down_box ROUND_DOWN_BOX value 1 labelcolor 187 deactivate
    7.13        }
    7.14        Fl_Round_Button bPhase {
    7.15          label Phase
    7.16 -        callback {bModulus->clear();}
    7.17 +        callback {bAmplitude->clear();}
    7.18          tooltip {Toggle phase mode} xywh {325 50 80 15} down_box ROUND_DOWN_BOX labelcolor 187 deactivate
    7.19        }
    7.20      }