From 2f379568e8d56fb19af027272106f585dc2580c1 Mon Sep 17 00:00:00 2001
From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Mon, 28 Aug 2023 13:07:39 +0200
Subject: [PATCH] #3539 ShowNPoints single selection

---
 bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg     | 22 +++++++++----------
 bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs     |  2 +-
 ...bcreaMaracasVisuManualContourModel_Box.cxx |  7 ++----
 bbtk/src/bbmaracasvisuShowNPoints.cxx         |  4 ++++
 .../wxWindows/widgets/WidgetShowNPoints.cxx   |  2 +-
 5 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
index 2fd7de9..933042c 100644
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbg
@@ -194,8 +194,8 @@ FIN_BOX
 BOX
 creaVtk:BooleanOperationPolyDataFilter:Box77
 ISEXEC:FALSE
--87.438358:-24.762722:-900.000000
--63.708358:-27.262722:-900.000000
+-87.603116:-25.092238:-900.000000
+-63.873116:-27.592238:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
@@ -204,10 +204,10 @@ FIN_BOX
 BOX
 wx:ComboBox:Box78
 ISEXEC:FALSE
--153.877713:-5.775167:-900.000000
--127.597713:-8.275167:-900.000000
+-150.912071:6.911190:-900.000000
+-124.632071:4.411190:-900.000000
 PORT
-In:"Union Intersection Difference"
+In:"Union Intersection Difference Replace"
 FIN_BOX
 BOX
 wx:LayoutLine:Box79
@@ -222,8 +222,8 @@ FIN_BOX
 BOX
 wx:CommandButton:Box80
 ISEXEC:FALSE
--107.184095:21.801731:-900.000000
--84.909095:19.301731:-900.000000
+-107.475974:19.466702:-900.000000
+-85.200974:16.966702:-900.000000
 PORT
 Label:"Run"
 FIN_BOX
@@ -488,8 +488,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box96
 ISEXEC:FALSE
--157.021318:90.558496:-900.000000
--127.981318:88.058496:-900.000000
+-360.168851:83.553409:-900.000000
+-331.128851:81.053409:-900.000000
 FIN_BOX
 BOX
 creaVtk:PolyDataNormals:Box97
@@ -674,8 +674,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ShowNPoints_Tools:Box132
 ISEXEC:FALSE
-60.800054:-98.532649:-900.000000
-83.345054:-101.032649:-900.000000
+57.881268:-57.377761:-900.000000
+80.426268:-59.877761:-900.000000
 PORT
 BoxProcessMode:"Manual"
 PORT
diff --git a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
index 625c3c4..4e10fcf 100644
--- a/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
+++ b/bbtk/bbs/boxes/Mesh_tool_ApplySurface.bbs
@@ -69,7 +69,7 @@ new creaVtk:BooleanOperationPolyDataFilter Box77
   set Box77.ReorientDifferenceCells "false"
 
 new wx:ComboBox Box78
-  set Box78.In "Union Intersection Difference"
+  set Box78.In "Union Intersection Difference Replace"
 
 new wx:LayoutLine Box79
   set Box79.Orientation "H"
diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index 19c5e65..07692b4 100644
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -839,7 +839,6 @@ void ManualContourModel_Box::Process()
 
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
-    printf("EED ManualContourModel_Box::Process  Start\n");
 	if (bbGetInputActive()==true)
 	{
 		lstInconsistentContourY.clear();
@@ -936,12 +935,12 @@ void ManualContourModel_Box::Process()
 	// Step 3.3. SIN Normalice points around contours	
 			if (bbGetInputParam().size()==1)
 			{
-                printf("EED ManualContourModel_Box::Process Step 3.3. SIN   A\n");
+//                printf("EED ManualContourModel_Box::Process Step 3.3. SIN   A\n");
 				if (bbGetInputParam()[0]==1) // type param 1
 				{
                     if (bbGetInputOpenClose()==true)
                     {
-                        printf("EED ManualContourModel_Box::Process Step 3.3. SIN   B\n");
+//                        printf("EED ManualContourModel_Box::Process Step 3.3. SIN   B\n");
                         RedistributionPointsAllContours_SIN( &lstOutX,&lstOutY,&lstOutZ,&lstIndexsOut);
                         ShiftValues( &lstOutX, &lstOutY, &lstOutZ, &lstIndexsOut );
                     } // if OpenClose
@@ -1010,8 +1009,6 @@ void ManualContourModel_Box::Process()
 			bbSetOutputLstPssblIncnsnstntCntrID( lstInconsistentContourID );
 		} // if DoubleContour 
 	} // if Active
-    printf("EED ManualContourModel_Box::Process  End\n");
-
 }
 
 //===== 
diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index 7843235..32adb30 100644
--- a/bbtk/src/bbmaracasvisuShowNPoints.cxx
+++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx
@@ -99,6 +99,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 //-----------------------------------------------------------------
 void ShowNPoints::Process()
 {
+    printf("EED ShowNPoints::Process Start\n");
 	if (mwxwidget!=NULL)
 	{
 		mwxwidget->SetRenderer( bbGetInputRenderer() );
@@ -118,7 +119,9 @@ void ShowNPoints::Process()
 //            firsttime=false;
             if ( mwxwidget->GetModelShowNPoints()->GetFirstTime()==false )
             {
+                printf("EED ShowNPoints::Process 1\n");
                 mwxwidget->DetectCollectionActive();
+                printf("EED ShowNPoints::Process 2\n");
             }
             if ( mwxwidget->GetModelShowNPoints()->GetFirstTime()==true )
             {
@@ -136,6 +139,7 @@ void ShowNPoints::Process()
         bbSetOutputlstSelectedIndexs( mwxwidget->GetLstSelectedIndexs() );
         bbSetOutputWidgetShowNPoints( (WidgetShowNPoints*)mwxwidget );
 	} // mwxwidget
+    printf("EED ShowNPoints::Process End\n");
 }
 
 //-----------------------------------------------------------------
diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
index 280e0c7..80ab6f8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/WidgetShowNPoints.cxx
@@ -1669,7 +1669,7 @@ void WidgetShowNPoints::OnNextCollection(wxCommandEvent &event)
 void WidgetShowNPoints::DetectCollectionActive()
 {
     int id;
-    if ( cbVisuActualCollection->GetValue()==false  )
+    if ( (cbVisuActualCollection!=NULL) && (cbVisuActualCollection->GetValue()==false ) )
     {
         int i,size=lstModelShowNPoints.size();
         for (i=0;i<size;i++)
-- 
2.47.1