1.1 --- a/ViewerManager/View/otbImageViewerManagerViewGUI.cxx	Thu Jun 25 16:38:10 2009 +0200
     1.2 +++ b/ViewerManager/View/otbImageViewerManagerViewGUI.cxx	Fri Jun 26 10:11:26 2009 +0800
     1.3 @@ -449,32 +449,40 @@
     1.4     rhistogram->SetHistogramColor(m_Red);
     1.5     rhistogram->SetLabelColor(m_Red);
     1.6  
     1.7 -//    rhistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(pRenderingFuntion->GetRedChannelIndex()));
     1.8 -//    ghistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(pRenderingFuntion->GetGreenChannelIndex()));
     1.9 -//    bhistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(pRenderingFuntion->GetBlueChannelIndex()));
    1.10 +   curveWidget->ClearAllCurves();
    1.11 +
    1.12 +   if (pRenderingFuntion->GetPixelRepresentationSize() >=3)
    1.13 +   {
    1.14 +     bhistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(2));
    1.15 +     curveWidget->AddCurve(bhistogram);
    1.16 +   }
    1.17 +
    1.18 +   if (pRenderingFuntion->GetPixelRepresentationSize() >=2)
    1.19 +   {
    1.20 +     ghistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(1));
    1.21 +     curveWidget->AddCurve(ghistogram);
    1.22 +   }
    1.23 +
    1.24 +
    1.25     rhistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(0));
    1.26 -   ghistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(1));
    1.27 -   bhistogram->SetHistogram(m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pLayer->GetHistogramList()->GetNthElement(2));
    1.28 +   curveWidget->AddCurve(rhistogram);
    1.29  
    1.30 -   curveWidget->ClearAllCurves();
    1.31 -   curveWidget->AddCurve(bhistogram);
    1.32 -   curveWidget->AddCurve(ghistogram);
    1.33 -   curveWidget->AddCurve(rhistogram);
    1.34 +
    1.35     curveWidget->SetXAxisLabel("Pixels");
    1.36     curveWidget->SetYAxisLabel("Frequency");
    1.37  
    1.38     //Get the pixelView
    1.39     PixelDescriptionViewType::Pointer pixelView = m_ImageViewerManagerModel->GetObjectList().at(selectedItem-1).pPixelView;
    1.40  
    1.41 - //   //Edit the Widget Manager
    1.42 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->UnRegisterAll();
    1.43 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterFullWidget(currentVisuView->GetFullWidget());
    1.44 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterScrollWidget(currentVisuView->GetScrollWidget());
    1.45 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterZoomWidget(currentVisuView->GetZoomWidget());
    1.46 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterPixelDescriptionWidget(pixelView->GetPixelDescriptionWidget());
    1.47 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterHistogramWidget(curveWidget);
    1.48 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->SetLabel(this->CutFileName(selectedItem-1));
    1.49 - //   m_WidgetManagerList->GetNthElement(selectedItem-1)->Show();
    1.50 +   //   //Edit the Widget Manager
    1.51 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->UnRegisterAll();
    1.52 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterFullWidget(currentVisuView->GetFullWidget());
    1.53 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterScrollWidget(currentVisuView->GetScrollWidget());
    1.54 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterZoomWidget(currentVisuView->GetZoomWidget());
    1.55 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterPixelDescriptionWidget(pixelView->GetPixelDescriptionWidget());
    1.56 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->RegisterHistogramWidget(curveWidget);
    1.57 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->SetLabel(this->CutFileName(selectedItem-1));
    1.58 +   //   m_WidgetManagerList->GetNthElement(selectedItem-1)->Show();
    1.59  
    1.60     //widgetList->GetNthElement(selectedItem-1)->UnRegisterAll();
    1.61     widgetList->GetNthElement(selectedItem-1)->RegisterFullWidget(currentVisuView->GetFullWidget());