From 1a8a3ec53282897cf506adeee7b49e5e2c0fe9f5 Mon Sep 17 00:00:00 2001
From: Juan Prieto <Juan.Prieto@creatis.insa-lyon.fr>
Date: Thu, 2 Jul 2009 07:17:14 +0000
Subject: [PATCH] *** empty log message ***

---
 bbtk/src/bbmaracasvisuImageActor.cxx          |  5 +--
 bbtk/src/bbmaracasvisuImageActor.h            |  2 ++
 .../src/bbmaracasvisuTransferFunctionView.cxx | 14 ++++++--
 .../widgets/pPlotter/HistogramWidget.cxx      | 35 ++++++++++++++++++-
 .../widgets/pPlotter/HistogramWidget.h        |  4 ++-
 5 files changed, 54 insertions(+), 6 deletions(-)

diff --git a/bbtk/src/bbmaracasvisuImageActor.cxx b/bbtk/src/bbmaracasvisuImageActor.cxx
index f95af03..3d54751 100644
--- a/bbtk/src/bbmaracasvisuImageActor.cxx
+++ b/bbtk/src/bbmaracasvisuImageActor.cxx
@@ -17,8 +17,7 @@ void ImageActor::Process()
 		vtkLinearTransform* transform	= bbGetInputTransform();
 
 		if(img != NULL){
-			imageactor = vtkImageActor::New();
-			vtkImageShiftScale *imageshiftscale = vtkImageShiftScale::New();
+			
 			imageshiftscale->SetInput( img );	
 			imageshiftscale->SetOutputScalarTypeToUnsignedChar();	
 			imageactor->SetInput( imageshiftscale->GetOutput() );	
@@ -57,6 +56,8 @@ void ImageActor::bbUserSetDefaultValues()
 	//-----------------------------------------------------------------	
 	void ImageActor::bbUserInitializeProcessing()
 	{
+		imageactor = vtkImageActor::New();
+		imageshiftscale = vtkImageShiftScale::New();
 	}
 	
 	//-----------------------------------------------------------------	
diff --git a/bbtk/src/bbmaracasvisuImageActor.h b/bbtk/src/bbmaracasvisuImageActor.h
index 908b5de..73a936a 100644
--- a/bbtk/src/bbmaracasvisuImageActor.h
+++ b/bbtk/src/bbmaracasvisuImageActor.h
@@ -10,6 +10,7 @@
 #include <vtkRenderer.h>
 #include <vtkTransform.h>
 #include <vtkLinearTransform.h>
+#include <vtkImageShiftScale.h>
 
 
 namespace bbcreaMaracasVisu
@@ -28,6 +29,7 @@ class bbcreaMaracasVisu_EXPORT ImageActor
   void Process();
   bool firsttime;
   vtkImageActor *imageactor;
+  vtkImageShiftScale *imageshiftscale;
 };
 
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ImageActor,bbtk::AtomicBlackBox);
diff --git a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
index 0693ec1..f95262d 100644
--- a/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
+++ b/bbtk/src/bbmaracasvisuTransferFunctionView.cxx
@@ -9,27 +9,37 @@ BBTK_BLACK_BOX_IMPLEMENTATION(TransferFunctionView,bbtk::WxBlackBox);
 //-----------------------------------------------------
 void TransferFunctionView::Process()
 {
+	if(bbGetInputIn()!=NULL){
+		mwxwidget->initializeHistogram(bbGetInputIn());	
+		mwxwidget->Refresh();
+	}
+	
+	
+
 }
 
 //-----------------------------------------------------
 void TransferFunctionView::CreateWidget(wxWindow* parent)
 {
 	bbtkDebugMessageInc("Core",9,"TransferFunctionView::CreateWxWindow()"<<std::endl);
-	mwxwidget = new HistogramWidget(parent, -1, wxPoint(0,0), wxSize(400,400),wxNO_BORDER ,bbGetInputIn(),1);
+
+	mwxwidget = new HistogramWidget(parent, -1);
     bbtkDebugDecTab("Core",9);
-	bbSetOutputWidget( mwxwidget );
+	bbSetOutputWidget( mwxwidget );	
 }
 
 //-----------------------------------------------------
 void TransferFunctionView::bbUserSetDefaultValues()
 {
 	mwxwidget = NULL;
+
 }
 
 	
 	//-----------------------------------------------------------------	
 	void TransferFunctionView::bbUserInitializeProcessing()
 	{
+		bbSetInputIn(NULL);
 	}
 	
 	//-----------------------------------------------------------------	
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx
index affe13c..d5dd0d7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.cxx
@@ -41,7 +41,7 @@ HistogramWidget::HistogramWidget( wxWindow *parent, wxWindowID id, const wxPoint
 	}
  */
 	HistogramWidget::HistogramWidget( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData,int type):
-	wxPanel(parent,id,pos,size,flag)
+	wxPanel(parent,id,pos,size)
 	{
 		 SetBackgroundColour(wxColour(255,255,255));
 		//histogram
@@ -67,6 +67,39 @@ HistogramWidget::HistogramWidget( wxWindow *parent, wxWindowID id, const wxPoint
 		
 	}
 
+	HistogramWidget::HistogramWidget( wxWindow *parent, wxWindowID id)
+		: wxPanel(parent,id){
+
+
+			SetBackgroundColour(wxColour(255,255,255));
+			histogram = NULL;	
+			
+			//plotter
+			plotter=new pPlotter(this, 400,350);
+
+			//is a plotter of histograms
+			plotter->setType(2);
+			//setting the popMenu
+			plotter->setPopUpMenu(true,true,true,true,true,true,false,false,false,false,false,false,false);
+			histogramSize=0;
+			idTransferenceFunction=-1;
+			idHistogram=-1;
+			transferenceFunctionHasColor=true;
+			transferenceFunctionHasPoints=true;
+			this->type=type;;
+		
+				
+	}
+
+	void HistogramWidget::initializeHistogram(vtkImageData* img){
+		if(histogram ==NULL){
+			histogram= new pHistogram(img);
+		}		
+		//draw
+		drawHistogram();
+		drawTransferenceFunction();
+	}
+
 	HistogramWidget::~HistogramWidget()
 	{
 		delete histogram;
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
index f559cc4..7b48d59 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
@@ -39,7 +39,9 @@ public:
 	
  
 	HistogramWidget( wxWindow *parent, wxWindowID id, const wxPoint &pos, const wxSize &size, int flag,vtkImageData* imageData,int type);
-	
+
+	HistogramWidget( wxWindow *parent, wxWindowID id);
+	void initializeHistogram(vtkImageData* img);
 	~HistogramWidget();
 
 	/*
-- 
2.46.0