From e2af9cb4d93ab2325ddd8799ecd74c8fb3207ea0 Mon Sep 17 00:00:00 2001
From: OTB Bot <otbbot@orfeo-toolbox.org>
Date: Sun, 1 May 2011 08:30:28 +0200
Subject: [PATCH] STYLE
---
.../otbImageViewerManagerController.cxx | 9 +-
.../otbImageViewerManagerController.h | 11 +-
...otbImageViewerManagerControllerInterface.h | 9 +-
.../Model/otbImageViewerManagerModel.cxx | 18 +-
.../Model/otbImageViewerManagerModel.h | 25 +-
.../View/otbAutoScaleActionHandler.h | 26 +-
.../View/otbImageViewerManagerViewGUI.cxx | 288 +++++++++---------
.../View/otbImageViewerManagerViewGUI.h | 12 +-
.../ViewerManager/otbImageViewerManager.cxx | 14 +-
9 files changed, 201 insertions(+), 211 deletions(-)
diff --git a/Legacy/ViewerManager/Controller/otbImageViewerManagerController.cxx b/Legacy/ViewerManager/Controller/otbImageViewerManagerController.cxx
index b4e58e52b4..5cfe06f2e5 100644
--- a/Legacy/ViewerManager/Controller/otbImageViewerManagerController.cxx
+++ b/Legacy/ViewerManager/Controller/otbImageViewerManagerController.cxx
@@ -39,7 +39,6 @@ ImageViewerManagerController
}
-
unsigned int
ImageViewerManagerController
::OpenInputImage(const char * filename)
@@ -90,7 +89,7 @@ ImageViewerManagerController
try
{
- m_Model->UpdateRGBChannelOrder(redChoice,greenChoice,BlueChoice, selectedItem);
+ m_Model->UpdateRGBChannelOrder(redChoice, greenChoice, BlueChoice, selectedItem);
}
catch (itk::ExceptionObject & err)
{
@@ -119,7 +118,7 @@ ImageViewerManagerController
{
try
{
- m_Model->UpdateAmplitudeChannelOrder(realChoice,imChoice, selectedItem);
+ m_Model->UpdateAmplitudeChannelOrder(realChoice, imChoice, selectedItem);
}
catch (itk::ExceptionObject & err)
{
@@ -133,7 +132,7 @@ ImageViewerManagerController
{
try
{
- m_Model->UpdatePhaseChannelOrder(realChoice,imChoice, selectedItem);
+ m_Model->UpdatePhaseChannelOrder(realChoice, imChoice, selectedItem);
}
catch (itk::ExceptionObject & err)
{
@@ -147,7 +146,7 @@ ImageViewerManagerController
{
try
{
- m_Model->Link(leftChoice,rightChoice,offset);
+ m_Model->Link(leftChoice, rightChoice, offset);
}
catch (itk::ExceptionObject & err)
{
diff --git a/Legacy/ViewerManager/Controller/otbImageViewerManagerController.h b/Legacy/ViewerManager/Controller/otbImageViewerManagerController.h
index bfed5c6071..3566fadd7a 100644
--- a/Legacy/ViewerManager/Controller/otbImageViewerManagerController.h
+++ b/Legacy/ViewerManager/Controller/otbImageViewerManagerController.h
@@ -28,7 +28,6 @@ See OTBCopyright.txt for details.
#include "otbAutoScaleActionHandler.h"
-
#include "otbObjectList.h"
namespace otb
@@ -58,17 +57,17 @@ public:
typedef ObjectList<VisuControllerType> VisuControllerListType;
- typedef WidgetResizingActionHandler<VisuModelType,VisuViewType> ResizingHandlerType;
+ typedef WidgetResizingActionHandler<VisuModelType, VisuViewType> ResizingHandlerType;
typedef ResizingHandlerType::Pointer ResizingHandlerPointerType;
- typedef ChangeExtractRegionActionHandler<VisuModelType,VisuViewType> ChangeExtractRegionHandlerType;
+ typedef ChangeExtractRegionActionHandler<VisuModelType, VisuViewType> ChangeExtractRegionHandlerType;
typedef ChangeExtractRegionHandlerType::Pointer ChangeExtractRegionHandlerPointerType;
typedef AutoScaleActionHandler<ViewType::ImageWidgetType> AutoScaleHandlerType;
typedef AutoScaleHandlerType::Pointer AutoScaleHandlerPointerType;
/** Standard type macros */
- itkTypeMacro(ImageViewerManagerController,Superclass);
+ itkTypeMacro(ImageViewerManagerController, Superclass);
itkNewMacro(Self);
/** NewVisu */
@@ -98,13 +97,13 @@ public:
/* } */
- //virtual void AddController(VisuModelPointerType modelRenderingLayer ,VisuViewPointerType visuView);
+ //virtual void AddController(VisuModelPointerType modelRenderingLayer , VisuViewPointerType visuView);
virtual unsigned int OpenInputImage(const char * filename);
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 UpdateAmplitudeChannelOrder(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/Legacy/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h b/Legacy/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h
index a34a25af4b..b7383b0495 100644
--- a/Legacy/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h
+++ b/Legacy/ViewerManager/Controller/otbImageViewerManagerControllerInterface.h
@@ -23,7 +23,6 @@ See OTBCopyright.txt for details.
#include "otbImageViewerManagerModel.h"
-
/** NewVisu */
#include "otbImageWidgetController.h"
#include "otbImageWidget.h"
@@ -65,15 +64,15 @@ public:
typedef WidgetType::Pointer VisuWidgetPointerType;
/** Standard type macros */
- itkTypeMacro(ImageViewerManagerControllerInterface,Superclass);
+ itkTypeMacro(ImageViewerManagerControllerInterface, Superclass);
/** Users actions */
virtual unsigned int OpenInputImage(const char * filename) =0;
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 UpdateAmplitudeChannelOrder(int realChoice , int imChoice,unsigned int selectedItem) = 0;
- virtual void UpdatePhaseChannelOrder(int realChoice , int imChoice, unsigned int selectedItem) = 0;
+ virtual void UpdateGrayScaleChannelOrder(int choice, 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;
/** NewVisu */
diff --git a/Legacy/ViewerManager/Model/otbImageViewerManagerModel.cxx b/Legacy/ViewerManager/Model/otbImageViewerManagerModel.cxx
index e7eb093aff..588aa499dc 100644
--- a/Legacy/ViewerManager/Model/otbImageViewerManagerModel.cxx
+++ b/Legacy/ViewerManager/Model/otbImageViewerManagerModel.cxx
@@ -43,7 +43,6 @@ ImageViewerManagerModel
::~ImageViewerManagerModel(){}
-
/** Manage the singleton */
ImageViewerManagerModel::Pointer
ImageViewerManagerModel::GetInstance()
@@ -74,7 +73,7 @@ ImageViewerManagerModel
/** Generate the layer*/
LayerGeneratorPointerType visuGenerator = LayerGeneratorType::New();
visuGenerator->SetImage(reader->GetOutput());
- FltkFilterWatcher qlwatcher(visuGenerator->GetProgressSource(),0,0,200,20,"Generating QuickLook ...");
+ FltkFilterWatcher qlwatcher(visuGenerator->GetProgressSource(), 0, 0, 200, 20,"Generating QuickLook ...");
visuGenerator->GenerateLayer();
RenderingFunctionType::Pointer rendrerFunction = visuGenerator->GetRenderingFunction();
@@ -94,7 +93,7 @@ ImageViewerManagerModel
pixelView->SetModel(pixelModel);
/** Controller*/
- WidgetControllerPointerType controller = this->BuiltController(rendering, visuView ,pixelModel );
+ WidgetControllerPointerType controller = this->BuiltController(rendering, visuView , pixelModel );
/** Finish Builting the visu*/
visuView->SetController(controller);
@@ -138,7 +137,7 @@ ImageViewerManagerModel
/**
* Read a series of images, including cropping facilities throught
- * the ImageSeriesFileReader
+ * the ImageSeriesFileReader
*/
unsigned int
ImageViewerManagerModel
@@ -155,7 +154,7 @@ ImageViewerManagerModel
/** Generate the layer*/
LayerGeneratorPointerType visuGenerator = LayerGeneratorType::New();
visuGenerator->SetImage(reader->GetOutput()->GetNthElement(i));
- FltkFilterWatcher qlwatcher(visuGenerator->GetProgressSource(),0,0,200,20,"Generating QuickLook ...");
+ FltkFilterWatcher qlwatcher(visuGenerator->GetProgressSource(), 0, 0, 200, 20,"Generating QuickLook ...");
visuGenerator->GenerateLayer();
RenderingFunctionType::Pointer rendrerFunction = visuGenerator->GetRenderingFunction();
@@ -175,7 +174,7 @@ ImageViewerManagerModel
pixelView->SetModel(pixelModel);
/** Controller*/
- WidgetControllerPointerType controller = this->BuiltController(rendering, visuView ,pixelModel );
+ WidgetControllerPointerType controller = this->BuiltController(rendering, visuView , pixelModel );
/** Finish Builting the visu*/
visuView->SetController(controller);
@@ -186,7 +185,7 @@ ImageViewerManagerModel
/** Store all the information in the structure*/
ObjectsTracked currentComponent;
- currentComponent.fileName = reader->GetFileName(i);
+ currentComponent.fileName = reader->GetFileName(i);
currentComponent.pLayer = visuGenerator->GetLayer();
currentComponent.pReader = reader->GetImageFileReader(i);
currentComponent.pRendering = rendering;
@@ -389,7 +388,6 @@ ImageViewerManagerModel
phaseFunction->SetChannelList(channels);
-
//Update the layer
m_ObjectTrackedList.at(selectedItem-1).pLayer->SetRenderingFunction(phaseFunction);
m_ObjectTrackedList.at(selectedItem-1).pRenderFunction = phaseFunction;
@@ -424,7 +422,7 @@ ImageViewerManagerModel
VisuModelPointerType leftRenderModel = m_ObjectTrackedList.at(leftChoice-1).pRendering;
//Get the views related to the choosen images
- VisuViewPointerType pRightVisuView = m_ObjectTrackedList.at(rightChoice-1).pVisuView;;
+ VisuViewPointerType pRightVisuView = m_ObjectTrackedList.at(rightChoice-1).pVisuView; ;
VisuViewPointerType pLeftVisuView = m_ObjectTrackedList.at(leftChoice-1).pVisuView;
//Pixel View
@@ -510,7 +508,7 @@ ImageViewerManagerModel
VisuViewPointerType view = m_ObjectTrackedList.at(selectedItem-1).pVisuView;
PixelDescriptionModelPointerType pixelModel = m_ObjectTrackedList.at(selectedItem-1).pPixelModel;
- m_ObjectTrackedList.at(selectedItem-1).pWidgetController = this->BuiltController(render,view,pixelModel);
+ m_ObjectTrackedList.at(selectedItem-1).pWidgetController = this->BuiltController(render, view, pixelModel);
m_ObjectTrackedList.at(selectedItem-1).pVisuView->SetController(m_ObjectTrackedList.at(selectedItem-1).pWidgetController);
}
diff --git a/Legacy/ViewerManager/Model/otbImageViewerManagerModel.h b/Legacy/ViewerManager/Model/otbImageViewerManagerModel.h
index d40a1e8e47..8291b016cc 100644
--- a/Legacy/ViewerManager/Model/otbImageViewerManagerModel.h
+++ b/Legacy/ViewerManager/Model/otbImageViewerManagerModel.h
@@ -77,11 +77,11 @@ public:
/** Image Type*/
typedef VectorImage<PixelType , 2> ImageType;
typedef itk::RGBAPixel<unsigned char> RGBPixelType;
- typedef Image<RGBPixelType,2> ViewerImageType;
+ typedef Image<RGBPixelType, 2> ViewerImageType;
typedef ImageType::Pointer ImagePointerType;
/** typedef support for layers */
- typedef otb::ImageLayer<ImageType,ViewerImageType> LayerType;
+ typedef otb::ImageLayer<ImageType, ViewerImageType> LayerType;
typedef LayerType::Pointer LayerPointerType;
typedef otb::ImageLayerGenerator<LayerType> LayerGeneratorType;
@@ -110,17 +110,17 @@ public:
typedef ImageWidgetController WidgetControllerType;
typedef WidgetControllerType::Pointer WidgetControllerPointerType;
- typedef WidgetResizingActionHandler<VisuModelType,VisuViewType> ResizingHandlerType;
+ typedef WidgetResizingActionHandler<VisuModelType, VisuViewType> ResizingHandlerType;
typedef ResizingHandlerType::Pointer ResizingHandlerPointerType;
- typedef otb::ChangeScaledExtractRegionActionHandler<VisuModelType,VisuViewType> ChangeScaledRegionHandlerType;
- typedef otb::ChangeExtractRegionActionHandler<VisuModelType,VisuViewType> ChangeRegionHandlerType;
- typedef otb::ChangeScaleActionHandler<VisuModelType,VisuViewType> ChangeScaleHandlerType;
- typedef otb::ArrowKeyMoveActionHandler<VisuModelType,VisuViewType> ArrowKeyMoveActionHandlerType;
+ typedef otb::ChangeScaledExtractRegionActionHandler<VisuModelType, VisuViewType> ChangeScaledRegionHandlerType;
+ typedef otb::ChangeExtractRegionActionHandler<VisuModelType, VisuViewType> ChangeRegionHandlerType;
+ typedef otb::ChangeScaleActionHandler<VisuModelType, VisuViewType> ChangeScaleHandlerType;
+ typedef otb::ArrowKeyMoveActionHandler<VisuModelType, VisuViewType> ArrowKeyMoveActionHandlerType;
typedef otb::PixelDescriptionModel<ViewerImageType> PixelDescriptionModelType;
typedef PixelDescriptionModelType::Pointer PixelDescriptionModelPointerType;
typedef PixelDescriptionView<PixelDescriptionModelType> PixelDescriptionViewType;
- typedef otb::PixelDescriptionActionHandler<PixelDescriptionModelType,VisuViewType> PixelDescriptionActionHandlerType;
+ typedef otb::PixelDescriptionActionHandler<PixelDescriptionModelType, VisuViewType> PixelDescriptionActionHandlerType;
typedef Curves2DWidget CurvesWidgetType;
@@ -157,8 +157,8 @@ 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 UpdateAmplitudeChannelOrder(int realChoice , int imChoice,unsigned int selectedItem );
- virtual void UpdatePhaseChannelOrder(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);
@@ -169,8 +169,8 @@ public:
}
/** Boolean Flags */
- itkGetMacro(HasImageOpened,bool);
- itkGetMacro(HasChangedChannelOrder,bool);
+ itkGetMacro(HasImageOpened, bool);
+ itkGetMacro(HasChangedChannelOrder, bool);
protected:
/** This is protected for the singleton. Use GetInstance() instead. */
@@ -206,7 +206,6 @@ private:
};
-
}
#endif
diff --git a/Legacy/ViewerManager/View/otbAutoScaleActionHandler.h b/Legacy/ViewerManager/View/otbAutoScaleActionHandler.h
index 376fd30de5..34e894b688 100644
--- a/Legacy/ViewerManager/View/otbAutoScaleActionHandler.h
+++ b/Legacy/ViewerManager/View/otbAutoScaleActionHandler.h
@@ -24,7 +24,7 @@ namespace otb
{
/** \class AutoScaleActionHandler
* \brief Implements basic Scroll, Full and Zoom widgets resizing.
-*
+*
* \sa ImageWidgetController
* \sa ImageWidgetActionHandler
*/
@@ -44,7 +44,7 @@ public:
itkNewMacro(Self);
/** Runtime information */
- itkTypeMacro(AutoScaleActionHandler,ImageWidgetActionHandler);
+ itkTypeMacro(AutoScaleActionHandler, ImageWidgetActionHandler);
/** Preview Typedef typedefs */
typedef TWidgetType WidgetType;
@@ -61,21 +61,21 @@ public:
{
if(widgetId == m_PreviewWidget->GetIdentifier() )
{
- otbMsgDevMacro(<<"AutoScaleActionHandler::HandleWidgetResize(): handling ("<<widgetId<<", "<<w<<", "<<h<<")");
- typename WidgetType::SizeType size = m_PreviewWidget->GetOpenGlBufferedRegion().GetSize();
-
- double zoomW = static_cast<double>(w)/static_cast<double>(size[0]);
- double zoomH = static_cast<double>(h)/static_cast<double>(size[1]);
- m_PreviewWidget->SetIsotropicZoom(std::min(zoomW,zoomH));
-
- return true;
+ otbMsgDevMacro(<<"AutoScaleActionHandler::HandleWidgetResize(): handling ("<<widgetId<<", "<<w<<", "<<h<<")");
+ typename WidgetType::SizeType size = m_PreviewWidget->GetOpenGlBufferedRegion().GetSize();
+
+ double zoomW = static_cast<double>(w)/static_cast<double>(size[0]);
+ double zoomH = static_cast<double>(h)/static_cast<double>(size[1]);
+ m_PreviewWidget->SetIsotropicZoom(std::min(zoomW, zoomH));
+
+ return true;
}
return false;
}
/** Set/Get the pointer to PreviewWidget */
- itkSetObjectMacro(PreviewWidget,WidgetType);
+ itkSetObjectMacro(PreviewWidget, WidgetType);
protected:
/** Constructor */
@@ -87,7 +87,7 @@ protected:
/** Printself method */
void PrintSelf(std::ostream& os, itk::Indent indent) const
{
- Superclass::PrintSelf(os,indent);
+ Superclass::PrintSelf(os, indent);
}
private:
@@ -96,7 +96,7 @@ private:
WidgetPointerType m_PreviewWidget;
-}; // end class
+}; // end class
} // end namespace otb
#endif
diff --git a/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.cxx b/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
index d0ac4a57ed..55a40ba27b 100644
--- a/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
+++ b/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.cxx
@@ -29,8 +29,8 @@ namespace otb
*/
ImageViewerManagerViewGUI
-::ImageViewerManagerViewGUI():m_TemplateViewerName(""),m_DisplayedLabel("+ "),
- m_UndisplayedLabel("- "),m_DiaporamaCurrentIndex(0)
+::ImageViewerManagerViewGUI():m_TemplateViewerName(""), m_DisplayedLabel("+ "),
+ m_UndisplayedLabel("- "), m_DiaporamaCurrentIndex(0)
{
m_VisuView = VisuViewType::New();
@@ -88,13 +88,13 @@ ImageViewerManagerViewGUI
::OpenImage()
{
std::string pikedFileName="";
- char * cfname ;
- cfname = fl_file_chooser("Pick an image file", "*.*",pikedFileName.c_str());
+ char * cfname;
+ cfname = fl_file_chooser("Pick an image file", "*.*", pikedFileName.c_str());
if (cfname == NULL || strlen(cfname)<1)
{
otbMsgDebugMacro(<<"Empty file name!");
- return ;
+ return;
}
Fl::check();
@@ -116,7 +116,7 @@ ImageViewerManagerViewGUI
for ( unsigned int i = 0; i < numberOfOpenedImages; i++ )
{
//Initialise the boolean pair
- PairType pair(false,false); //(Not displayed , Packed View)
+ PairType pair(false, false); //(Not displayed , Packed View)
//Put a new WidgetManager in the list
if(bSplitted->value() && !bPacked->value())
@@ -166,17 +166,17 @@ ImageViewerManagerViewGUI
{
unsigned int selectedItem = guiImageList->value();
if (selectedItem == 0)
- return; // no image selected, return
+ return; // no image selected, return
//DipalyPreviewWidget
this->DisplayPreviewWidget(selectedItem);
//Update the widget dispalyed
if(m_DisplayStatusList[selectedItem-1].first)
- {
- m_WidgetManagerList->GetNthElement(selectedItem-1)->Refresh();
- this->Display(m_WidgetManagerList,selectedItem);
- }
+ {
+ m_WidgetManagerList->GetNthElement(selectedItem-1)->Refresh();
+ this->Display(m_WidgetManagerList, selectedItem);
+ }
this->UpdateInformation(selectedItem);
}
@@ -204,15 +204,15 @@ ImageViewerManagerViewGUI
if(guiLinkSetupWindow->shown() != 0)
{
if(guiImageList->size() > 1)
- {
- if(m_LinkedDisplayStatusList[selectedItem-1])
- for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size() ; i++)
- if(m_LinkedDisplayStatusList[i])
- {
- m_LinkWidgetManagerList->GetNthElement(i)->Hide();
- m_LinkedDisplayStatusList[i] = false;
- }
- }
+ {
+ if(m_LinkedDisplayStatusList[selectedItem-1])
+ for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size(); i++)
+ if(m_LinkedDisplayStatusList[i])
+ {
+ m_LinkWidgetManagerList->GetNthElement(i)->Hide();
+ m_LinkedDisplayStatusList[i] = false;
+ }
+ }
}
@@ -223,7 +223,7 @@ ImageViewerManagerViewGUI
//Link when all images are closed
if(guiLinkSetupWindow->shown() != 0)
if(guiImageList->size() == 0)
- this->LinkSetupOk();
+ this->LinkSetupOk();
//Erase from the lists
m_DisplayStatusList.erase( m_DisplayStatusList.begin()+(selectedItem-1));
@@ -236,43 +236,43 @@ ImageViewerManagerViewGUI
if(guiDiaporama->shown() != 0)
{
if(guiImageList->size() > 0)
- {
- //If the closed image is the current showed in the diaporama
- if(selectedItem == m_DiaporamaCurrentIndex+1)
- {
- //if the closed image is the last one in the diapo : show the previous
- if(selectedItem -1 == static_cast<unsigned int>(guiImageList->size()))
- {
- this->DiaporamaPrevious();
- }
- else
- {
- //if the closed image is the first one : show the next one
- this->UpdateDiaporamaProgressBar();
- ++m_DiaporamaCurrentIndex; //Increment to show the next image
- this->DisplayDiaporama();
- --m_DiaporamaCurrentIndex; //Decrement because we remove the first image, so the current display become the first
- }
- }
- else
- {
- if(selectedItem < m_DiaporamaCurrentIndex+1)
- {
- --m_DiaporamaCurrentIndex; //Increment the current index because an image before the one displayed is removed
- }
- this->UpdateDiaporamaProgressBar();
- }
- }
+ {
+ //If the closed image is the current showed in the diaporama
+ if(selectedItem == m_DiaporamaCurrentIndex+1)
+ {
+ //if the closed image is the last one in the diapo : show the previous
+ if(selectedItem -1 == static_cast<unsigned int>(guiImageList->size()))
+ {
+ this->DiaporamaPrevious();
+ }
+ else
+ {
+ //if the closed image is the first one : show the next one
+ this->UpdateDiaporamaProgressBar();
+ ++m_DiaporamaCurrentIndex; //Increment to show the next image
+ this->DisplayDiaporama();
+ --m_DiaporamaCurrentIndex; //Decrement because we remove the first image, so the current display become the first
+ }
+ }
+ else
+ {
+ if(selectedItem < m_DiaporamaCurrentIndex+1)
+ {
+ --m_DiaporamaCurrentIndex; //Increment the current index because an image before the one displayed is removed
+ }
+ this->UpdateDiaporamaProgressBar();
+ }
+ }
}
//Case all Images closed
if(guiDiaporama->shown() != 0)
{
if(m_DisplayStatusList.size() == 0)
- {
- m_DiaporamaCurrentIndex=0;
- this->DiaporamaQuit(); //If no image to display anymore : quit the diaporamaGUI
- }
+ {
+ m_DiaporamaCurrentIndex=0;
+ this->DiaporamaQuit(); //If no image to display anymore : quit the diaporamaGUI
+ }
}
//
@@ -287,7 +287,6 @@ ImageViewerManagerViewGUI
this->UpdateLinkSetupWindow();
-
}
/**
@@ -310,11 +309,11 @@ ImageViewerManagerViewGUI
//Update the Image List widget
unsigned int len = m_ImageViewerManagerModel->GetObjectList().size();
std::string fileName = m_ImageViewerManagerModel->GetObjectList().at(len-1).fileName;
- int slashIndex = fileName.find_last_of("/",fileName.size());
+ int slashIndex = fileName.find_last_of("/", fileName.size());
itk::OStringStream oss;
oss<<m_UndisplayedLabel;
- oss<<m_TemplateViewerName<<fileName.substr(slashIndex+1,fileName.size());
+ oss<<m_TemplateViewerName<<fileName.substr(slashIndex+1, fileName.size());
guiImageList->add(oss.str().c_str());
guiImageList->redraw();
}
@@ -378,7 +377,6 @@ ImageViewerManagerViewGUI
}
-
/**
* Compute the size of the
*/
@@ -392,7 +390,7 @@ ImageViewerManagerViewGUI
double zoomW = static_cast<double>(w)/static_cast<double>(size[0]);
double zoomH = static_cast<double>(h)/static_cast<double>(size[1]);
- return std::min(zoomW,zoomH);
+ return std::min(zoomW, zoomH);
}
/**
@@ -412,18 +410,18 @@ ImageViewerManagerViewGUI
{
//check what to do
if(!m_DisplayStatusList[selectedItem-1].first)
- {
- //New Display
- m_DisplayStatusList[selectedItem-1].first = true;
- this->UpdateImageListShowed(selectedItem, m_DisplayedLabel);
- this->Display(m_WidgetManagerList,selectedItem);
- }
+ {
+ //New Display
+ m_DisplayStatusList[selectedItem-1].first = true;
+ this->UpdateImageListShowed(selectedItem, m_DisplayedLabel);
+ this->Display(m_WidgetManagerList, selectedItem);
+ }
else
- {
- m_DisplayStatusList[selectedItem-1].first = false;
- this->UpdateImageListShowed(selectedItem, m_UndisplayedLabel);
- this->Undisplay(selectedItem);
- }
+ {
+ m_DisplayStatusList[selectedItem-1].first = false;
+ this->UpdateImageListShowed(selectedItem, m_UndisplayedLabel);
+ this->Undisplay(selectedItem);
+ }
}
}
@@ -444,7 +442,6 @@ ImageViewerManagerViewGUI
-
curveWidget->ClearAllCurves();
if (pRenderingFunction->GetPixelRepresentationSize() >=3)
@@ -521,11 +518,11 @@ ImageViewerManagerViewGUI
SplittedWidgetManagerType::Pointer widgetManager = SplittedWidgetManagerType::New();
m_WidgetManagerList->GetNthElement(selectedItem-1)->Hide();
- m_WidgetManagerList->SetNthElement(selectedItem-1,widgetManager);
+ m_WidgetManagerList->SetNthElement(selectedItem-1, widgetManager);
//Update the list link
m_LinkWidgetManagerList->GetNthElement(selectedItem-1)->Hide();
- m_LinkWidgetManagerList->SetNthElement(selectedItem-1,widgetManager);
+ m_LinkWidgetManagerList->SetNthElement(selectedItem-1, widgetManager);
if(m_LinkedDisplayStatusList[selectedItem-1])
{
@@ -537,16 +534,16 @@ ImageViewerManagerViewGUI
{
//Update the view mode if the link mode is not updated
if(!m_DisplayStatusList[selectedItem-1].first && !m_LinkedDisplayStatusList[selectedItem-1])
- {
- m_DisplayStatusList[selectedItem-1].second = true;
- }
+ {
+ m_DisplayStatusList[selectedItem-1].second = true;
+ }
//If already displayed : update the view mode and display the new viewMode
if(m_DisplayStatusList[selectedItem-1].first && !m_LinkedDisplayStatusList[selectedItem-1] )
- {
- m_DisplayStatusList[selectedItem-1].second = true;
- this->Display(m_WidgetManagerList, selectedItem);
- }
+ {
+ m_DisplayStatusList[selectedItem-1].second = true;
+ this->Display(m_WidgetManagerList, selectedItem);
+ }
}
}
@@ -567,11 +564,11 @@ ImageViewerManagerViewGUI
//
PackedWidgetManagerType::Pointer widgetManager = PackedWidgetManagerType::New();
m_WidgetManagerList->GetNthElement(selectedItem-1)->Hide();
- m_WidgetManagerList->SetNthElement(selectedItem-1,widgetManager);
+ m_WidgetManagerList->SetNthElement(selectedItem-1, widgetManager);
//Update the link list
m_LinkWidgetManagerList->GetNthElement(selectedItem-1)->Hide();
- m_LinkWidgetManagerList->SetNthElement(selectedItem-1,widgetManager);
+ m_LinkWidgetManagerList->SetNthElement(selectedItem-1, widgetManager);
if(m_LinkedDisplayStatusList[selectedItem-1])
{
@@ -584,16 +581,16 @@ ImageViewerManagerViewGUI
{
//Update the view mode
if(!m_DisplayStatusList[selectedItem-1].first && !m_LinkedDisplayStatusList[selectedItem-1])
- {
- m_DisplayStatusList[selectedItem-1].second = false;
- }
+ {
+ m_DisplayStatusList[selectedItem-1].second = false;
+ }
//If already displayed : update the view mode and display the new viewMode
if(m_DisplayStatusList[selectedItem-1].first && !m_LinkedDisplayStatusList[selectedItem-1] )
- {
- m_DisplayStatusList[selectedItem-1].second = false;
- this->Display(m_WidgetManagerList, selectedItem);
- }
+ {
+ m_DisplayStatusList[selectedItem-1].second = false;
+ this->Display(m_WidgetManagerList, selectedItem);
+ }
}
}
@@ -607,12 +604,12 @@ ImageViewerManagerViewGUI
{
/* Update the ImageList using the status label "+" or "-" */
std::string fileName = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).fileName;
- int slashIndex = fileName.find_last_of("/",fileName.size());
+ int slashIndex = fileName.find_last_of("/", fileName.size());
itk::OStringStream oss;
oss<<status;
- oss<<m_TemplateViewerName<<fileName.substr(slashIndex+1,fileName.size());
- guiImageList->text(selectedItem,oss.str().c_str());
+ oss<<m_TemplateViewerName<<fileName.substr(slashIndex+1, fileName.size());
+ guiImageList->text(selectedItem, oss.str().c_str());
oss.str("");
}
@@ -648,18 +645,18 @@ ImageViewerManagerViewGUI
::CloseAllDisplayedImages(bool showHideEvent)
{
// Set the display Label to undislayed
- for(unsigned int i = 0; i<m_DisplayStatusList.size() ; i++)
+ for(unsigned int i = 0; i<m_DisplayStatusList.size(); i++)
{
if(m_DisplayStatusList[i].first)
- {
- if(showHideEvent)
- {
- this->UpdateImageListShowed(i+1, m_UndisplayedLabel);
- m_DisplayStatusList[i].first = false;
- }
- m_WidgetManagerList->GetNthElement(i)->Hide();
- m_WidgetManagerList->GetNthElement(i)->UnRegisterAll();
- }
+ {
+ if(showHideEvent)
+ {
+ this->UpdateImageListShowed(i+1, m_UndisplayedLabel);
+ m_DisplayStatusList[i].first = false;
+ }
+ m_WidgetManagerList->GetNthElement(i)->Hide();
+ m_WidgetManagerList->GetNthElement(i)->UnRegisterAll();
+ }
}
}
@@ -670,9 +667,9 @@ ImageViewerManagerViewGUI
ImageViewerManagerViewGUI
::ShowTemporaryClosedDisplay()
{
- for(unsigned int i = 0; i<m_DisplayStatusList.size() ; i++)
+ for(unsigned int i = 0; i<m_DisplayStatusList.size(); i++)
if(m_DisplayStatusList[i].first )
- this->Display(m_WidgetManagerList,i+1);
+ this->Display(m_WidgetManagerList, i+1);
}
@@ -685,11 +682,11 @@ ImageViewerManagerViewGUI
{
guiMainWindow->hide();
- for(unsigned int i = 0; i<m_DisplayStatusList.size() ; i++)
+ for(unsigned int i = 0; i<m_DisplayStatusList.size(); i++)
if(m_DisplayStatusList[i].first)
{
- m_WidgetManagerList->GetNthElement(i)->Hide();
- m_WidgetManagerList->GetNthElement(i)->UnRegisterAll();
+ m_WidgetManagerList->GetNthElement(i)->Hide();
+ m_WidgetManagerList->GetNthElement(i)->UnRegisterAll();
}
//Quit the Diaporama if shown
@@ -704,11 +701,11 @@ ImageViewerManagerViewGUI
{
guiLinkSetupWindow->hide();
//Close the displays linked
- for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size() ; i++)
- if(m_LinkedDisplayStatusList[i])
- {
- m_LinkWidgetManagerList->GetNthElement(i)->Hide();
- }
+ for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size(); i++)
+ if(m_LinkedDisplayStatusList[i])
+ {
+ m_LinkWidgetManagerList->GetNthElement(i)->Hide();
+ }
}
}
@@ -724,7 +721,7 @@ ImageViewerManagerViewGUI
oss.str("");
std::string selectedImageName = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).fileName;
// Clear the info buffer
- guiViewerInformation->buffer()->remove(0,guiViewerInformation->buffer()->length());
+ guiViewerInformation->buffer()->remove(0, guiViewerInformation->buffer()->length());
oss<<"Filename: "<<selectedImageName<<std::endl;
guiViewerInformation->insert(oss.str().c_str());
oss.str("");
@@ -840,9 +837,9 @@ ImageViewerManagerViewGUI
++i;
}
- guiRedChannelChoice->value(std::min(channels[0] + 1,nbComponent));
- guiGreenChannelChoice->value(std::min(channels[1] + 1,nbComponent));
- guiBlueChannelChoice->value(std::min(channels[2] + 1,nbComponent));
+ guiRedChannelChoice->value(std::min(channels[0] + 1, nbComponent));
+ guiGreenChannelChoice->value(std::min(channels[1] + 1, nbComponent));
+ guiBlueChannelChoice->value(std::min(channels[2] + 1, nbComponent));
}
@@ -886,7 +883,7 @@ ImageViewerManagerViewGUI
channels.push_back(0);
}
- guiGrayscaleChannelChoice->value(std::min(channels[0] + 1,nbComponent));
+ guiGrayscaleChannelChoice->value(std::min(channels[0] + 1, nbComponent));
}
@@ -927,8 +924,8 @@ ImageViewerManagerViewGUI
++i;
}
- guiRealChannelChoice->value(std::min(channels[0] + 1,nbComponent));
- guiImaginaryChannelChoice->value(std::min(channels[1] + 1,nbComponent));
+ guiRealChannelChoice->value(std::min(channels[0] + 1, nbComponent));
+ guiImaginaryChannelChoice->value(std::min(channels[1] + 1, nbComponent));
}
@@ -976,13 +973,13 @@ ImageViewerManagerViewGUI
int realChoice = static_cast<int>(guiRealChannelChoice->value() - 1);
int imagChoice = static_cast<int>(guiImaginaryChannelChoice->value() - 1);
if (bAmplitude->value())
- {
- m_ImageViewerManagerController->UpdateAmplitudeChannelOrder(realChoice, imagChoice, selectedItem);
- }
+ {
+ m_ImageViewerManagerController->UpdateAmplitudeChannelOrder(realChoice, imagChoice, selectedItem);
+ }
else
- {
- m_ImageViewerManagerController->UpdatePhaseChannelOrder(realChoice, imagChoice, selectedItem);
- }
+ {
+ m_ImageViewerManagerController->UpdatePhaseChannelOrder(realChoice, imagChoice, selectedItem);
+ }
}
}
@@ -994,7 +991,6 @@ ImageViewerManagerViewGUI
}
-
void
ImageViewerManagerViewGUI
::Diaporama()
@@ -1028,8 +1024,8 @@ ImageViewerManagerViewGUI
::CutFileName(unsigned int selectedItem)
{
std::string fileName = m_ImageViewerManagerModel->GetObjectList().at(selectedItem).fileName;
- int slashIndex = fileName.find_last_of("/",fileName.size());
- std::string fileNameCut = fileName.substr(slashIndex+1,fileName.size());
+ int slashIndex = fileName.find_last_of("/", fileName.size());
+ std::string fileNameCut = fileName.substr(slashIndex+1, fileName.size());
return fileNameCut.c_str();
}
@@ -1176,7 +1172,7 @@ ImageViewerManagerViewGUI
//Fill the guiLinkList
- for (int i = 0 ; i < guiImageList->size() ; i++)
+ for (int i = 0; i < guiImageList->size(); i++)
{
oss.str("");
oss<<this->CutFileName(i);
@@ -1213,7 +1209,7 @@ ImageViewerManagerViewGUI
//Update a list to
//Call the controller
- this->m_ImageViewerManagerController->Link(leftChoice, rightChoice,offSet);
+ this->m_ImageViewerManagerController->Link(leftChoice, rightChoice, offSet);
//Close the temporary Showed images without clearing the showed list
this->CloseAllDisplayedImages(false);
@@ -1223,7 +1219,7 @@ ImageViewerManagerViewGUI
m_LinkedDisplayStatusList[rightChoice-1] = true;
//store the images linked together
- UIntPairType linkPair(leftChoice,rightChoice);
+ UIntPairType linkPair(leftChoice, rightChoice);
m_LinkedImageList.push_back(linkPair);
//Diplay the Linked images
@@ -1242,13 +1238,13 @@ ImageViewerManagerViewGUI
guiLinkSetupWindow->hide();
//Close the displays linked
- for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size() ; i++)
+ for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size(); i++)
{
if(m_LinkedDisplayStatusList[i])
- {
- m_LinkWidgetManagerList->GetNthElement(i)->Hide();
- m_LinkedDisplayStatusList[i] = false;
- }
+ {
+ m_LinkWidgetManagerList->GetNthElement(i)->Hide();
+ m_LinkedDisplayStatusList[i] = false;
+ }
}
//Display temporary closed displays if any
if(guiImageList->size()>0)
@@ -1263,11 +1259,11 @@ ImageViewerManagerViewGUI
::LinkSetupRemove()
{
//Close the displays linked
- for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size() ; i++)
+ for(unsigned int i = 0; i<m_LinkedDisplayStatusList.size(); i++)
if(m_LinkedDisplayStatusList[i])
{
- m_LinkWidgetManagerList->GetNthElement(i)->Hide();
- m_LinkedDisplayStatusList[i] = false;
+ m_LinkWidgetManagerList->GetNthElement(i)->Hide();
+ m_LinkedDisplayStatusList[i] = false;
}
}
@@ -1280,24 +1276,24 @@ ImageViewerManagerViewGUI
{
std::vector<unsigned int> tempElementToRemove;
- for(unsigned int i = 0 ; i< m_LinkedImageList.size(); i++ )
+ for(unsigned int i = 0; i< m_LinkedImageList.size(); i++ )
{
if(m_LinkedImageList[i].first == selectedItem || m_LinkedImageList[i].second == selectedItem)
- {
+ {
- if(m_LinkedImageList[i].first == selectedItem )
- m_ImageViewerManagerController->UpdateImageViewController(m_LinkedImageList[i].second);
+ if(m_LinkedImageList[i].first == selectedItem )
+ m_ImageViewerManagerController->UpdateImageViewController(m_LinkedImageList[i].second);
- if(m_LinkedImageList[i].second == selectedItem)
- m_ImageViewerManagerController->UpdateImageViewController(m_LinkedImageList[i].first);
+ if(m_LinkedImageList[i].second == selectedItem)
+ m_ImageViewerManagerController->UpdateImageViewController(m_LinkedImageList[i].first);
- tempElementToRemove.push_back(i);
- }
+ tempElementToRemove.push_back(i);
+ }
}
//Remove element from the list
unsigned counter = 0;
- for(unsigned int p = 0; p < tempElementToRemove.size() ; p ++ )
+ for(unsigned int p = 0; p < tempElementToRemove.size(); p ++ )
{
m_LinkedImageList.erase(m_LinkedImageList.begin()+tempElementToRemove[p] - counter); // counter because the size of the list is decreasing after each iteration
counter++;
diff --git a/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.h b/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.h
index 9c41c60283..39d1bae2b8 100644
--- a/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.h
+++ b/Legacy/ViewerManager/View/otbImageViewerManagerViewGUI.h
@@ -69,7 +69,7 @@ public:
itkNewMacro(Self);
/** Creation through object factory macro */
- itkTypeMacro(ImageViewerManagerViewGUI,Object);
+ itkTypeMacro(ImageViewerManagerViewGUI, Object);
/** Controller */
typedef ImageViewerManagerControllerInterface::Pointer ImageViewerManagerControllerInterfacePointerType;
@@ -110,7 +110,7 @@ public:
/** vector to store the status of images : diplayed or not displayed*/
//---> Note : if the packed view is selected : 2nd boolean false, Splitted view : 2nd boolean true
typedef std::pair<bool, bool> PairType;
- typedef std::pair<unsigned int ,unsigned int> UIntPairType;
+ typedef std::pair<unsigned int , unsigned int> UIntPairType;
typedef std::vector<PairType> BoolVector;
typedef std::vector<UIntPairType> UIntPairVector;
@@ -120,7 +120,7 @@ public:
/** Method to set the controller*/
- itkGetObjectMacro(ImageViewerManagerController,ImageViewerManagerControllerInterface);
+ itkGetObjectMacro(ImageViewerManagerController, ImageViewerManagerControllerInterface);
void SetImageViewerManagerController(ImageViewerManagerControllerInterface *pController)
{
@@ -130,8 +130,8 @@ public:
}
// Visu
- itkGetMacro(VisuView,VisuViewPointerType);
- itkGetMacro(PreviewWidget,ImageWidgetPointerType );
+ itkGetMacro(VisuView, VisuViewPointerType);
+ itkGetMacro(PreviewWidget, ImageWidgetPointerType );
// Show()
virtual void Show();
@@ -209,7 +209,7 @@ private:
UIntPairVector m_LinkedImageList;
std::string m_TemplateViewerName;
std::string m_DisplayedLabel;
- std::string m_UndisplayedLabel ;
+ std::string m_UndisplayedLabel;
//Widget Manager
WidgetManagerList::Pointer m_WidgetManagerList;
diff --git a/Legacy/ViewerManager/otbImageViewerManager.cxx b/Legacy/ViewerManager/otbImageViewerManager.cxx
index 08be5cd96e..661900fda8 100644
--- a/Legacy/ViewerManager/otbImageViewerManager.cxx
+++ b/Legacy/ViewerManager/otbImageViewerManager.cxx
@@ -33,14 +33,14 @@ int main(int argc, char* argv[])
// ParserType::Pointer parser = ParserType::New();
// //parser->AddInputImage(false); //Optionnal parameter
-// parser->AddOptionNParams("--InputImage","Input Images","-in",false);
+// parser->AddOptionNParams("--InputImage","Input Images","-in", false);
// typedef otb::CommandLineArgumentParseResult ParserResultType;
// ParserResultType::Pointer parseResult = ParserResultType::New();
// try
// {
-// parser->ParseCommandLine(argc,argv,parseResult);
+// parser->ParseCommandLine(argc, argv, parseResult);
// }
// catch ( itk::ExceptionObject & err )
// {
@@ -68,17 +68,17 @@ int main(int argc, char* argv[])
//
view->Show();
- for (int i = 1; i<argc;++i)
+ for (int i = 1; i<argc; ++i)
{
view->OpenImage(argv[i]);
}
// if ( parseResult->IsOptionInputImagePresent() )
// {
-// for(int i = 0; i<parseResult->GetNumberOfParameters("--InputImage") ; i++ )
-// {
-// view->OpenImage(parseResult->GetParameterString("--InputImage",i).c_str());
-// }
+// for(int i = 0; i<parseResult->GetNumberOfParameters("--InputImage"); i++ )
+// {
+// view->OpenImage(parseResult->GetParameterString("--InputImage", i).c_str());
+// }
// }
Fl::check();
--
GitLab