From 5cbe78ff48271aa5c284e90f7e78211d6bb14f73 Mon Sep 17 00:00:00 2001 From: OTB Bot <otbbot@orfeo-toolbox.org> Date: Wed, 23 Nov 2011 19:55:42 +0100 Subject: [PATCH] STYLE --- Applications/Utils/otbQuicklook.cxx | 12 ++++++------ Testing/Code/Common/otbExtractROITestMetaData.cxx | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Applications/Utils/otbQuicklook.cxx b/Applications/Utils/otbQuicklook.cxx index 0b3d3a2d3a..2c6ea1b3de 100644 --- a/Applications/Utils/otbQuicklook.cxx +++ b/Applications/Utils/otbQuicklook.cxx @@ -99,8 +99,8 @@ private: AddParameter(ParameterType_Int, "sr", "Sampling ratio"); SetParameterDescription( "sr" , "Sampling Ratio, default is 2" ); - SetDefaultParameterInt("sr",2); - SetMinimumParameterIntValue("sr",1); + SetDefaultParameterInt("sr", 2); + SetMinimumParameterIntValue("sr", 1); MandatoryOff("sr"); AddParameter(ParameterType_Int, "sx", "Size X"); @@ -116,7 +116,7 @@ private: SetDefaultParameterInt("rox", 0); SetDefaultParameterInt("roy", 0); SetDefaultParameterInt("rsx", 0); - SetDefaultParameterInt("rsy", 0); + SetDefaultParameterInt("rsy", 0); } @@ -132,7 +132,7 @@ private: // Update the values of the channels to be selected unsigned int nbComponents = inImage->GetNumberOfComponentsPerPixel(); if (nbComponents != GetChoiceKeys("cl").size()) - { + { ClearChoices("cl"); for (unsigned int idx = 0; idx < nbComponents; ++idx) { @@ -207,7 +207,7 @@ bool CropRegionOfInterest() // The image on which the quicklook will be generated // Will eventually be the m_ExtractROIFilter output - if (HasUserValue("rox") || HasUserValue("roy") + if (HasUserValue("rox") || HasUserValue("roy") || HasUserValue("rsx") || HasUserValue("rsy") || (GetSelectedItems("cl").size() > 0)) { @@ -269,7 +269,7 @@ bool CropRegionOfInterest() { otbAppLogFATAL( << "Error in SizeX and/or SizeY : ratio must be greater than 1."); return; - } + } otbAppLogINFO( << "Ratio used: "<<Ratio << "."); m_ResamplingFilter->SetShrinkFactor( Ratio ); diff --git a/Testing/Code/Common/otbExtractROITestMetaData.cxx b/Testing/Code/Common/otbExtractROITestMetaData.cxx index 007fcce6bb..08838d1caa 100644 --- a/Testing/Code/Common/otbExtractROITestMetaData.cxx +++ b/Testing/Code/Common/otbExtractROITestMetaData.cxx @@ -102,7 +102,7 @@ int otbExtractROITestMetaData(int argc, char * argv[]) if( reader00->GetOutput()->GetProjectionRef() != "" || boost::algorithm::istarts_with(reader00->GetOutput()->GetProjectionRef(), "LOCAL_CS") ) { - std::cout<<"The read generated extract from index (0,0) must NOT contain a ProjectionReference."<<std::endl; + std::cout<<"The read generated extract from index (0, 0) must NOT contain a ProjectionReference."<<std::endl; std::cout<<"Found ProjectionReference: "<<reader00->GetOutput()->GetProjectionRef()<<std::endl; return EXIT_FAILURE; @@ -110,7 +110,7 @@ int otbExtractROITestMetaData(int argc, char * argv[]) if( reader00->GetOutput()->GetGCPCount() == 0) { - std::cout<<"The read generated extract from index (0,0) must contain a list a GCPs.."<<std::endl; + std::cout<<"The read generated extract from index (0, 0) must contain a list a GCPs.."<<std::endl; return EXIT_FAILURE; } @@ -120,14 +120,14 @@ int otbExtractROITestMetaData(int argc, char * argv[]) if( reader00->GetOutput()->GetProjectionRef() != "" || boost::algorithm::istarts_with(reader00->GetOutput()->GetProjectionRef(), "LOCAL_CS") ) { - std::cout<<"The read generated extract from index (x,y) must NOT contain a ProjectionReference."<<std::endl; + std::cout<<"The read generated extract from index (x, y) must NOT contain a ProjectionReference."<<std::endl; std::cout<<"Found ProjectionReference: "<<reader57->GetOutput()->GetProjectionRef()<<std::endl; return EXIT_FAILURE; } if( reader57->GetOutput()->GetGCPCount() != 0) { - std::cout<<"The read generated extract from index (x,y) must NOT contain a list a GCPs.."<<std::endl; + std::cout<<"The read generated extract from index (x, y) must NOT contain a list a GCPs.."<<std::endl; return EXIT_FAILURE; } -- GitLab