nomsg

Code/Visu/otbColorImageViewer.h

@@ -5,12 +5,14 @@
 #include "otbImageViewerGUI.h"
 #include "itkImage.h"
 #include "itkRGBPixel.h"
+#include "itkProcessObject.h"
 
 namespace otb
 {
 
 template <class ImagePixelType, class OverlayPixelType>
-class ColorImageViewer : public otbImageViewerGUI
+class ITK_EXPORT ColorImageViewer :     public otbImageViewerGUI
+//                                        public itk::ProcessObject
 {
 public:
 
@@ -29,6 +31,7 @@ public:
   typedef itk::Image< itk::RGBPixel<ImagePixelType>, 3 >   ImageType;
   typedef itk::Image< OverlayPixelType, 3 > OverlayType;
   typedef GLColorImageView< ImagePixelType, OverlayPixelType > GLColorImageViewType;
+  typedef typename GLColorImageViewType::Pointer GLColorImageViewPointer;
   typedef typename GLColorImageViewType::ColorTablePointer ColorTablePointer;
 
 
@@ -91,17 +94,15 @@ public:
 
 
 private:
-  GLColorImageViewType * glSliceView;
-};
+//  GLColorImageViewType * glSliceView;
+  GLColorImageViewPointer glSliceView;
 
+};
 
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include <otbColorImageViewer.txx>
+#include "otbColorImageViewer.txx"
 #endif
 
-
-
-
 #endif

Code/Visu/otbColorImageViewer.txx

@@ -9,7 +9,11 @@ template <class ImagePixelType, class OverlayPixelType>
 ColorImageViewer<ImagePixelType,OverlayPixelType>
 ::ColorImageViewer()
 {
-  glSliceView = 0;
+
+//        this->SetNumberOfRequiredInputs(1);
+//        this->SetNumberOfRequiredOutputs(0);
+        
+//  glSliceView = 0;
   CreateGUI();
 }
 
@@ -23,8 +27,6 @@ ColorImageViewer<ImagePixelType,OverlayPixelType>
 }
 
 
-
-
 template <class ImagePixelType, class OverlayPixelType>
 void
 ColorImageViewer<ImagePixelType,OverlayPixelType>
@@ -92,6 +94,8 @@ void
 ColorImageViewer<ImagePixelType,OverlayPixelType>
 ::Show(void)
 {
+  this->Update();
+
   static bool firstTime = true;
   iviewWindow->show();
   glSliceView->show();
@@ -374,7 +378,9 @@ ColorImageViewer<ImagePixelType,OverlayPixelType>
   const char * label = original->label();
 
 
-  this->glSliceView = new GLColorImageViewType(x,y,w,h,label);
+//  this->glSliceView = new GLColorImageViewType(x,y,w,h,label);
+  this->glSliceView = GLColorImageViewType::New();
+  this->glSliceView->Init(x,y,w,h,label);
 
   glSliceView->box( FL_EMBOSSED_BOX );
 

Code/Visu/otbImageViewer.h

@@ -27,6 +27,7 @@ public:
   typedef itk::Image< ImagePixelType, 3 >   ImageType;
   typedef itk::Image< OverlayPixelType, 3 > OverlayType;
   typedef GLImageView< ImagePixelType, OverlayPixelType > GLImageViewType;
+  typedef typename GLImageViewType::Pointer GLImageViewPointer;
   typedef typename GLImageViewType::ColorTablePointer ColorTablePointer;
 
 
@@ -87,16 +88,17 @@ public:
     glSliceView->SetOverlayColorIndex( c );
     }
 
-
 private:
-  GLImageViewType * glSliceView;
+//  GLImageViewType * glSliceView;
+ GLImageViewPointer glSliceView;
+
 };
 
 
 } // end namespace otb
 
 #ifndef OTB_MANUAL_INSTANTIATION
-#include <otbImageViewer.txx>
+#include "otbImageViewer.txx"
 #endif
 
 

Code/Visu/otbImageViewer.txx

@@ -9,7 +9,7 @@ template <class ImagePixelType, class OverlayPixelType>
 ImageViewer<ImagePixelType,OverlayPixelType>
 ::ImageViewer()
 {
-  glSliceView = 0;
+//  glSliceView = 0;
   CreateGUI();
 }
 
@@ -374,7 +374,9 @@ ImageViewer<ImagePixelType,OverlayPixelType>
   const char * label = original->label();
 
 
-  this->glSliceView = new GLImageViewType(x,y,w,h,label);
+//  this->glSliceView = new GLImageViewType(x,y,w,h,label);
+  this->glSliceView = GLImageViewType::New();
+  this->glSliceView->Init(x,y,w,h,label);
 
   glSliceView->box( FL_EMBOSSED_BOX );