MRG

Code/BasicFilters/otbVectorImageToImageListFilter.txx

@@ -23,6 +23,7 @@ PURPOSE.  See the above copyright notices for more information.
 #include "itkImageRegionConstIteratorWithIndex.h"
 #include <vector>
 #include "otbMacro.h"
+#include "itkProgressReporter.h"
 
 namespace otb
 {
@@ -82,7 +83,6 @@ void
 VectorImageToImageListFilter<TVectorImageType,TImageList>
 ::GenerateData(void)
 {
-
   OutputImageListPointerType outputPtr = this->GetOutput();
   InputVectorImagePointerType inputPtr = this->GetInput();
 
@@ -103,6 +103,8 @@ VectorImageToImageListFilter<TVectorImageType,TImageList>
 
   InputIteratorType inputIt(inputPtr,outputPtr->GetNthElement(0)->GetRequestedRegion());
 
+  itk::ProgressReporter progress(this,0,outputPtr->GetNthElement(0)->GetRequestedRegion().GetNumberOfPixels());
+
   inputIt.GoToBegin();
   while(!inputIt.IsAtEnd())
     {
@@ -121,6 +123,7 @@ VectorImageToImageListFilter<TVectorImageType,TImageList>
         itkGenericExceptionMacro("End of image for band "<<counter<<" at index "<<(*it).GetIndex()<<" !");
       }
   }
+      progress.CompletedPixel();
       ++inputIt;
     }
 }

Code/Gui/otbFltkWriterWatcher.cxx

@@ -64,6 +64,10 @@ void FltkWriterWatcher
   m_WriterProgress->label("writing");
   m_WriterProgress->align(FL_ALIGN_INSIDE);
   m_Window->end();
+
+  m_FilterProgress->show();
+  m_WriterProgress->show();
+  Fl::check();
 }
 
 FltkWriterWatcher

Code/Gui/otbFltkWriterWatcher.h

@@ -63,7 +63,8 @@ public:
     m_Window->hide();
   }
 
-  virtual void EndFilter(){}
+  virtual void EndFilter()
+  {}
 
 protected:
 
@@ -93,6 +94,7 @@ protected:
     m_Window->show();
     m_FilterProgress->show();
     m_WriterProgress->show();
+    Fl::check();
   }
 
 
@@ -102,6 +104,7 @@ protected:
     m_Window->show();
     m_FilterProgress->show();
     m_WriterProgress->show();
+    Fl::check();
   }
 
   void BuildGUI(int x, int y, int w, int h,const char * comment);

Code/IO/otbStreamingImageFileWriter.txx

@@ -459,6 +459,9 @@ StreamingImageFileWriter<TInputImage>
    */
   otbMsgDebugMacro(<< "Number Of Stream Divisions : " << numDivisions);
 
+  // Notify end event observers
+  this->InvokeEvent( itk::StartEvent() );
+
   this->UpdateProgress(0);
 
   unsigned int piece;

Examples/Projections/VectorDataProjectionExample.cxx

@@ -166,4 +166,4 @@ int main( int argc, char* argv[] )
 
   return EXIT_SUCCESS;
 
-}
+}
\ No newline at end of file

Testing/Code/Learning/CMakeLists.txt

@@ -143,12 +143,12 @@ ADD_TEST(leTvSVMClassifierImageOneClass ${LEARNING_TESTS2}
 	${TEMP}/leSVMClassifierImageOneClassOutput.png)
 
 ADD_TEST(leTvSVMClassifierImageWithGenericKernalLinear ${LEARNING_TESTS2}  
---compare-image ${TOL}  ${TEMP}/svm_classified_image.png
-                        ${TEMP}/svm_classified_image_with_generic_kernel_linear.png
-        otbSVMClassifierImage
+--compare-image ${TOL}  ${BASELINE}/leTvSVMClassifierImageWithGenericKernalLinearOutput.png
+                        ${TEMP}/leTvSVMClassifierImageWithGenericKernalLinearOutput.png
+	otbSVMClassifierImage
 	${INPUTDATA}/ROI_QB_MUL_4.tif
 	${INPUTDATA}/svm_model_image_generic_linear
-	${TEMP}/svm_classified_image_with_generic_kernel_linear.png)
+	${TEMP}/leTvSVMClassifierImageWithGenericKernalLinearOutput.png)