From: trillos <trillos>
Date: Thu, 5 Nov 2009 14:15:13 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~31
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?p=creaRigidRegistration.git;a=commitdiff_plain;h=85c8838df7f9adbcb101fd6c6b4005dbfad325d3

*** empty log message ***
---

diff --git a/PackRecalage/bbs/appli/ExampleRecalage.bbs b/PackRecalage/bbs/appli/ExampleRecalage.bbs
index 8b91bb2..7e5cd3e 100644
--- a/PackRecalage/bbs/appli/ExampleRecalage.bbs
+++ b/PackRecalage/bbs/appli/ExampleRecalage.bbs
@@ -77,7 +77,7 @@ new Transform2DBox transform
   connect vector1.OutScaleY transform.ScaleY
   connect vector1.OutScaleZ transform.ScaleZ
   connect vector1.TransformAxis transform.Axis
-  set transform.3D true
+  //set transform.3D false
 
 new ReSlicerBox reslice1
   connect vector1.OriginReslicer reslice1.Origin
@@ -91,14 +91,23 @@ new ViewerNV viewer3
   connect reslice1.Out viewer3.In
 
 new CommandButton butExec
-  set butExec.Label "Execute"
-  connect butExec.BoxChange viewer3.BoxExecute
+  //set butExec.Label "Execute"
+ 
 
 //Tab for the first image
 
 new LayoutSplit tab1
    set tab1.Orientation H
-   connect showNpoints.Widget tab1.Widget1
+
+////////////////////
+
+new LayoutSplit hello
+  set hello.Orientation V
+
+  connect showNpoints.Widget hello.Widget1
+  connect butExec.Widget hello.Widget2
+
+   connect hello.Widget tab1.Widget1
    connect viewer.Widget tab1.Widget2
 
 //Tab for the second image
@@ -110,10 +119,12 @@ new LayoutSplit tab2
 
 //Tab for the result image
 
-new LayoutSplit result
-  set result.Orientation H
-  connect butExec.Widget result.Widget1
-  connect viewer3.Widget result.Widget2
+//new LayoutSplit result
+  //set result.Orientation H
+  //connect butExec.Widget result.Widget1
+  //connect viewer3.Widget result.Widget2
+  connect butExec.BoxChange viewer3.BoxExecute
+
 
 //Main window
 
@@ -121,6 +132,6 @@ new LayoutTab main
 set main.Orientation H
 connect tab1.Widget main.Widget1
 connect tab2.Widget main.Widget2
-connect result.Widget main.Widget3
+//connect result.Widget main.Widget3
 
 exec main
\ No newline at end of file
diff --git a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx
index 8cc5484..ae3c166 100644
--- a/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx
+++ b/PackRecalage/src/bbPackRecalageCalculateVectorBox.cxx
@@ -20,7 +20,8 @@ void CalculateVectorBox::Process()
 			_vector->Run();
 
 			bbSetOutputOrigin(_vector->GetOrigin());
-			bbSetOutputOriginReslicer(_vector->GetOriginReslicer());		
+			bbSetOutputOriginReslicer(_vector->GetOriginReslicer());
+			bbSetOutputOutAngle(_vector->GetAngle());
 		}
 	}
 }
diff --git a/PackRecalage/src/bbPackRecalageCheckBoardBox.cxx b/PackRecalage/src/bbPackRecalageCheckBoardBox.cxx
index 822022f..6502daf 100644
--- a/PackRecalage/src/bbPackRecalageCheckBoardBox.cxx
+++ b/PackRecalage/src/bbPackRecalageCheckBoardBox.cxx
@@ -1,5 +1,6 @@
 #include "bbPackRecalageCheckBoardBox.h"
 #include "bbPackRecalagePackage.h"
+
 namespace bbPackRecalage
 {
 
diff --git a/PackRecalage/src/bbPackRecalageReSlicerBox.cxx b/PackRecalage/src/bbPackRecalageReSlicerBox.cxx
index 7fcd742..e3bf963 100644
--- a/PackRecalage/src/bbPackRecalageReSlicerBox.cxx
+++ b/PackRecalage/src/bbPackRecalageReSlicerBox.cxx
@@ -20,6 +20,7 @@ void ReSlicerBox::Process()
 		slicer->SetResliceTransform(bbGetInputTransform());
  		slicer->SetOutputOrigin( 0 , 0 , 0 );
 		slicer->SetOutputOrigin( -(bbGetInputOrigin()[0]) , -(bbGetInputOrigin()[1]) , -(bbGetInputOrigin()[2]) );
+		std::cout << "Reslicer: Origin points: X = " <<  bbGetInputOrigin()[0] << " Y = " << bbGetInputOrigin()[1] << " Z = " << bbGetInputOrigin()[2] << std::endl;
 		slicer->Update();
 	
 		imageResult = vtkImageChangeInformation::New();