From 3ccf5751d0661eb345be4b35876ebbc6d5f0b244 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Mon, 6 Dec 2021 17:45:49 +0100
Subject: [PATCH] #3478 ContourExtractData

---
 bbtk/bbs/appli/exampleMeshDeformation.bbg     | 20 ++++++++++---------
 bbtk/bbs/appli/exampleMeshDeformation.bbs     |  1 +
 .../bbcreaMaracasVisuContourControlPoints.cxx |  1 +
 .../bbcreaMaracasVisuContourControlPoints.h   |  8 ++++----
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/bbtk/bbs/appli/exampleMeshDeformation.bbg b/bbtk/bbs/appli/exampleMeshDeformation.bbg
index ce458f6..e73b247 100644
--- a/bbtk/bbs/appli/exampleMeshDeformation.bbg
+++ b/bbtk/bbs/appli/exampleMeshDeformation.bbg
@@ -20,7 +20,7 @@ BOX
 creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
 46.202085:35.327152:-900.000000
-113.002085:25.327152:-900.000000
+82.077085:25.327152:-900.000000
 FIN_BOX
 BOX
 creaVtk:OutputWindow:Box02
@@ -32,7 +32,7 @@ BOX
 wx:LayoutSplit:Box03
 ISEXEC:TRUE
 97.223001:-183.795519:-900.000000
-136.303001:-193.795519:-900.000000
+133.898001:-193.795519:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
@@ -40,19 +40,19 @@ BOX
 wx:LayoutLine:Box04
 ISEXEC:FALSE
 -98.519823:-84.186848:-900.000000
--40.959823:-94.186848:-900.000000
+57.560000:-94.186848:-900.000000
 FIN_BOX
 BOX
 vtk:PolyDataToActor:Box06
 ISEXEC:FALSE
 -12.906688:-9.541436:-900.000000
-32.333312:-19.541436:-900.000000
+45.240000:-19.541436:-900.000000
 FIN_BOX
 BOX
 wx:Slider:Box07
 ISEXEC:FALSE
 -99.730636:73.177947:-900.000000
--48.330636:63.177947:-900.000000
+51.400000:63.177947:-900.000000
 PORT
 Label:"true"
 PORT
@@ -108,7 +108,7 @@ BOX
 wx:CheckBox:Box13
 ISEXEC:FALSE
 -85.323644:15.751855:-900.000000
--48.998644:5.751855:-900.000000
+36.000000:5.751855:-900.000000
 PORT
 In:"false"
 PORT
@@ -138,7 +138,7 @@ BOX
 wx:CheckBox:Box18
 ISEXEC:FALSE
 -70.908661:-10.460208:-900.000000
--34.583661:-20.460208:-900.000000
+36.000000:-20.460208:-900.000000
 PORT
 In:"false"
 PORT
@@ -148,7 +148,7 @@ BOX
 wx:ComboBox:Box19
 ISEXEC:FALSE
 -126.349291:43.032686:-900.000000
--81.109291:33.032686:-900.000000
+45.240000:33.032686:-900.000000
 PORT
 In:"Outline Wireframe Surface"
 PORT
@@ -164,7 +164,7 @@ BOX
 std:MultipleInputs:Box21
 ISEXEC:FALSE
 -8.080687:-104.467523:-900.000000
-31.619313:-114.467523:-900.000000
+36.000000:-114.467523:-900.000000
 FIN_BOX
 BOX
 creaVtk:ImageThreshold:Box65
@@ -237,6 +237,8 @@ wx:LayoutLine:Box30
 ISEXEC:FALSE
 -209.450866:-55.766397:-900.000000
 -151.890866:-65.766397:-900.000000
+PORT
+Orientation:"H"
 FIN_BOX
 CONNECTIONS:47
 CONNECTION
diff --git a/bbtk/bbs/appli/exampleMeshDeformation.bbs b/bbtk/bbs/appli/exampleMeshDeformation.bbs
index 0b07804..f04230e 100644
--- a/bbtk/bbs/appli/exampleMeshDeformation.bbs
+++ b/bbtk/bbs/appli/exampleMeshDeformation.bbs
@@ -104,6 +104,7 @@ new wx:CheckBox Box29
   set Box29.Title "Deformation ON/OFF"
 
 new wx:LayoutLine Box30
+  set Box30.Orientation "H"
 
 
 connect Box01.Widget Box03.Widget2
diff --git a/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx b/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
index 2433525..3fd817c 100644
--- a/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
+++ b/bbtk/src/bbcreaMaracasVisuContourControlPoints.cxx
@@ -80,6 +80,7 @@ void ContourControlPoints::Process()
 		}
 		_mViewContour_1->RefreshContour();
 
+        bbSetOutputManualBaseModel( _mContourModel_1 );
 
 	} // wxVtkBaseView
 
diff --git a/bbtk/src/bbcreaMaracasVisuContourControlPoints.h b/bbtk/src/bbcreaMaracasVisuContourControlPoints.h
index 04d294f..1f1dd37 100644
--- a/bbtk/src/bbcreaMaracasVisuContourControlPoints.h
+++ b/bbtk/src/bbcreaMaracasVisuContourControlPoints.h
@@ -28,13 +28,13 @@ class bbcreaMaracasVisu_EXPORT ContourControlPoints
   BBTK_DECLARE_INPUT(Type,int);
   BBTK_DECLARE_INPUT(OpenClose,bool);
   BBTK_DECLARE_INPUT(wxVtkBaseView,wxVtkBaseView*);
-//  BBTK_DECLARE_OUTPUT(Out,double);
+  BBTK_DECLARE_OUTPUT(ManualBaseModel,manualBaseModel*);
   BBTK_PROCESS(Process);
   void Process();
 
 	manualContourControler 	*_manContourControl_1;
-	manualContourModel	*_mContourModel_1;
-	manualViewContour	*_mViewContour_1;
+	manualContourModel	    *_mContourModel_1;
+	manualViewContour	    *_mViewContour_1;
 
 
 //===== 
@@ -53,7 +53,7 @@ BBTK_BEGIN_DESCRIBE_BLACK_BOX(ContourControlPoints,bbtk::AtomicBlackBox);
   BBTK_INPUT(ContourControlPoints,OpenClose,"Open=true or Close=false contour (default false)",bool,"");
   BBTK_INPUT(ContourControlPoints,Visible,"Visible (default true)",bool,"");
   BBTK_INPUT(ContourControlPoints,wxVtkBaseView,"wxVtkBaseView",wxVtkBaseView*,"");
-//  BBTK_OUTPUT(ContourControlPoints,Out,"First output",double,"");
+  BBTK_OUTPUT(ContourControlPoints,ManualBaseModel,"manualBaseModel",manualBaseModel*,"");
 
 BBTK_END_DESCRIBE_BLACK_BOX(ContourControlPoints);
 //===== 
-- 
2.45.1