fin de l'ICD

Code/Learning/otbSVMModel.h

@@ -456,11 +456,7 @@ private:
   struct svm_problem m_Problem;
   struct svm_node* m_XSpace;
   
-  ///** SVM Model Vector for composed kernel */
-  //std::vector<struct svm_model*> m_ModelList;
-  /** Ponderation list to apply to each svm_model of the composed kernel*/
-  //std::vector<double> m_PonderationModelList;
-
+ 
   /** Pointer to generic kernel functor */
 //  GenericKernelFunctorBase * m_GenericKernelFunctor;
 

Code/Learning/otbSVMModel.txx

@@ -41,15 +41,24 @@ SVMModel< TInputPixel, TLabel >::SVMModel()
   m_Problem.x = new struct svm_node*[1];
   m_XSpace = new struct svm_node[1];
  
+
+  //m_GenericKernelFunctor = NULL;
+  m_Model->param.kernel_generic = NULL;
+  m_Model->param.kernel_composed = NULL;
+  m_Model->param.nr_weight = 0;
+  m_Model->param.weight_label = NULL;
+  m_Model->param.weight = NULL;
+  m_Model->delete_composed = false;
+
   //m_GenericKernelFunctor = NULL;
- //  m_Model->param.kernel_generic = NULL;
-//   m_Model->param.nr_weight = 0;
-//   m_Model->param.weight_label = NULL;
-//   m_Model->param.weight = NULL;
-//   m_Parameters.kernel_generic = NULL;
-//   m_Parameters.nr_weight = 0;
-//   m_Parameters.weight_label = NULL;
-//   m_Parameters.weight = NULL;
+  //m_Model->param.kernel_generic = NULL;
+  //m_Model->param.nr_weight = 0;
+  //m_Model->param.weight_label = NULL;
+  //m_Model->param.weight = NULL;
+  //m_Parameters.kernel_generic = NULL;
+  //m_Parameters.nr_weight = 0;
+  //m_Parameters.weight_label = NULL;
+  //m_Parameters.weight = NULL;
 
 }
 

Code/Visu/otbImageViewerBase.h

@@ -213,6 +213,8 @@ namespace otb
       itkGetMacro(ShowScrollWidget,bool);
       itkSetMacro(UseImageOverlay,bool);
       itkGetMacro(UseImageOverlay,bool);
+      itkSetMacro(ShowHistograms,bool);
+      itkGetMacro(ShowHistograms,bool);
       itkGetObjectMacro(TransfertFunctionList,TransfertFunctionListType);
 
 
@@ -430,6 +432,9 @@ namespace otb
       ImagePointerType m_InputImageOverlay;
       /// true if scroll widget is used
       bool m_UseScroll;
+      /// Show the histograms
+      bool m_ShowHistograms;
+      
       /// Intial sizes
       unsigned int m_ScrollMaxInitialSize;
       unsigned int m_FullMaxInitialSize;

Code/Visu/otbImageViewerBase.txx

@@ -72,6 +72,7 @@ namespace otb
     m_RedHistogramWidget = HistogramWidgetType::New();
     m_GreenHistogramWidget = HistogramWidgetType::New();
     m_BlueHistogramWidget = HistogramWidgetType::New();
+    m_ShowHistograms = true;
   }
   
   /// Destructor
@@ -408,14 +409,16 @@ namespace otb
     {
       m_ZoomWidget->Show();
     }
-
-    m_RedHistogramWidget->show();
-    
-    if(this->GetViewModelIsRGB())
+    if(m_ShowHistograms)
       {
-	m_GreenHistogramWidget->show();
-	m_BlueHistogramWidget->show();
-   }
+	m_RedHistogramWidget->show();
+	
+	if(this->GetViewModelIsRGB())
+	  {
+	    m_GreenHistogramWidget->show();
+	    m_BlueHistogramWidget->show();
+	  }
+      }
 
     Fl::check();
     //comment: std::cout<<"Leaving show method"<<std::endl;