Clean code

diff --git a/bbtk/bbs/boxes/Mesh_Application.bbg b/bbtk/bbs/boxes/Mesh_Application.bbg
index 77470ee0ca6065a43c4398a41e012d4a68139bd4..ca0feb73420d7f56b8af24c400ca32aaa50243ce 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_Application.bbg
+++ b/bbtk/bbs/boxes/Mesh_Application.bbg
@@ -120,8 +120,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:MeshContours_Widget:Box17
 ISEXEC:FALSE
--74.651823:-57.192059:-900.000000
--51.856823:-59.692059:-900.000000
+-75.989823:-59.570726:-900.000000
+-53.194823:-62.070726:-900.000000
 PORT
 colorMesh:"1 0 0"
 FIN_BOX
@@ -844,8 +844,8 @@ FIN_BOX
 BOX
 std:MultipleInputs:Box137
 ISEXEC:FALSE
--69.253480:7.527069:-900.000000
--47.173480:5.027069:-900.000000
+-67.472602:9.703698:-900.000000
+-45.392602:7.203698:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:wxVtkBaseView_Info:Box140
@@ -1592,9 +1592,6 @@ CONNECTION
 Box137:BoxChange:Box124:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
-Box08:BoxChange:Box137:In1
-NumberOfControlPoints:0
-CONNECTION
 Box123:BoxChange:Box112:BoxExecute
 NumberOfControlPoints:0
 CONNECTION
@@ -1624,4 +1621,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box117:boxChange:Box10:freeplane_boxexecute
 NumberOfControlPoints:0
+CONNECTION
+Box125:BoxChange:Box137:BoxExecute
+NumberOfControlPoints:0
 APP_END

diff --git a/bbtk/bbs/boxes/Mesh_Application.bbs b/bbtk/bbs/boxes/Mesh_Application.bbs
index c859174ac93fcb38b2f360e01efdd5eae3e3ffb3..6236d9041cf07277e99b12093f01474131bea9e7 100644 (file)
--- a/bbtk/bbs/boxes/Mesh_Application.bbs
+++ b/bbtk/bbs/boxes/Mesh_Application.bbs
@@ -546,7 +546,6 @@ connect Box125.Out Box117.possiblePoint
 connect Box137.BoxChange Box127.BoxExecute
 connect Box137.BoxChange Box122.BoxExecute
 connect Box137.BoxChange Box124.BoxExecute
-connect Box08.BoxChange Box137.In1
 connect Box123.BoxChange Box112.BoxExecute
 connect Box137.BoxChange Box140.BoxExecute
 connect Box67.Out Box140.wxVtkBaseView1
@@ -557,6 +556,7 @@ connect Box139.BoxChange Box17._execute
 connect Box47.ChangePosition Box139.In2
 connect Box140.BoxChange Box47.boxChange
 connect Box117.boxChange Box10.freeplane_boxexecute
+connect Box125.BoxChange Box137.BoxExecute
 
 # Complex input ports
 input MeshIn Box56.In " "

diff --git a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx
index 1cff46ae89e5427fe7672f259b6fa3e7db5bd194..eb580f879fe89d13d7e82cd2a2f6eacb92c6e716 100644 (file)
--- a/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx
+++ b/bbtk/src/bbcreaMaracasVisuwxVtkBaseView_Info.cxx
@@ -113,7 +113,7 @@ bool InteractorwxVtkBaseView::OnMiddleButtonDown()
             return false;
         } // if _vtkbaseview
     } // if _box
-    return true;
+       return true;
 }
 
 bool InteractorwxVtkBaseView::OnMiddleButtonUp()
@@ -131,7 +131,7 @@ bool InteractorwxVtkBaseView::OnMiddleButtonUp()
             return false;
         } // if _vtkbaseview
     } // if _box
-    return true;
+       return true;
 }
 
 
@@ -168,7 +168,7 @@ bool InteractorwxVtkBaseView::OnMouseMove()
             return false;
         } // if ok
     } // if _box
-    return true;
+       return true;
 }
 
 bool InteractorwxVtkBaseView::OnRightButtonDown()
@@ -219,7 +219,7 @@ bool InteractorwxVtkBaseView::OnLeftDClick()
             return false;
         } // if _vtkbaseview
     } // if _box
-    return true;
+     return true;
 }
 
 bool InteractorwxVtkBaseView::OnRightDClick()

diff --git a/bbtk/src/bbmaracasvisuShowNPoints.cxx b/bbtk/src/bbmaracasvisuShowNPoints.cxx
index 32adb3005d98f7d795fd0f96809975008f265755..7843235b8bd7550134a4356c45b37fc9f96da26f 100644 (file)
--- a/bbtk/src/bbmaracasvisuShowNPoints.cxx
+++ b/bbtk/src/bbmaracasvisuShowNPoints.cxx
@@ -99,7 +99,6 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ShowNPoints,bbtk::WxBlackBox);
 //-----------------------------------------------------------------
 void ShowNPoints::Process()
 {
-    printf("EED ShowNPoints::Process Start\n");
        if (mwxwidget!=NULL)
        {
                mwxwidget->SetRenderer( bbGetInputRenderer() );
@@ -119,9 +118,7 @@ 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 )
             {
@@ -139,7 +136,6 @@ void ShowNPoints::Process()
         bbSetOutputlstSelectedIndexs( mwxwidget->GetLstSelectedIndexs() );
         bbSetOutputWidgetShowNPoints( (WidgetShowNPoints*)mwxwidget );
        } // mwxwidget
-    printf("EED ShowNPoints::Process End\n");
 }
 
 //-----------------------------------------------------------------