From: Eduardo DAVILA <davila@creatis.insa-lyon.fr>
Date: Wed, 19 Jan 2022 07:34:00 +0000 (+0100)
Subject: Clean code
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7c98cd9b3b5752be2759e1b0ed175314242ff1e6;p=creaMaracasVisu.git

Clean code
---

diff --git a/bbtk/bbs/boxes/SegmentationConnectivityEED.bbg b/bbtk/bbs/boxes/SegmentationConnectivityEED.bbg
index 2ad7d13..3c1a188 100644
--- a/bbtk/bbs/boxes/SegmentationConnectivityEED.bbg
+++ b/bbtk/bbs/boxes/SegmentationConnectivityEED.bbg
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBG BlackBox Diagram file
-# - /home/davila/Creatis/C10/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SegmentationConnectivityEED.bbg
+# - BBTKGEditor v 1.5 BBG BlackBox Diagram file
+# - /Users/davila/Creatis/C11/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SegmentationConnectivityEED.bbg
 # ----------------------------------
 
 APP_START
@@ -13,63 +13,63 @@ PACKAGENAME:creaMaracasVisu
 COMPLEXOUTPUTS:2
 COMPLEX_PORT
 resultImage
-104.590916:-412.449578:-900.000000
+73.213641:-123.734873:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 OutWidget
-56.143827:-415.269475:-900.000000
+39.300679:-124.580842:-900.000000
 FIN_COMPLEX_PORT
 COMPLEXINPUTS:4
 COMPLEX_PORT
 Threshold
-287.551302:88.983208:-900.000000
+201.285911:26.694962:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 pointSeed
-107.354939:99.775368:-900.000000
+75.148457:29.932610:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 InImage
--22.150977:108.278281:-900.000000
+-15.505684:32.483484:-900.000000
 FIN_COMPLEX_PORT
 COMPLEX_PORT
 Depth
-183.214488:94.857236:-900.000000
+128.250142:28.457171:-900.000000
 FIN_COMPLEX_PORT
 BOXES:37
 BOX
 creaMaracasVisu:ViewerNV:Box01
 ISEXEC:FALSE
--218.034362:-37.747977:-900.000000
--84.884281:-47.747977:-900.000000
+-152.624053:-11.324393:-900.000000
+-114.024053:-13.824393:-900.000000
 PORT
 nTypeView:"6 1 2 0"
 FIN_BOX
 BOX
 creaMaracasVisu:ImageChangeInformation:Box05
 ISEXEC:FALSE
--18.514127:33.418280:-900.000000
-33.010873:23.418280:-900.000000
+-12.959889:10.025484:-900.000000
+10.190111:7.525484:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box09
 ISEXEC:FALSE
--72.239823:-322.710201:-900.000000
--35.989823:-332.710201:-900.000000
+-50.567876:-96.813060:-900.000000
+-17.247876:-99.313060:-900.000000
 FIN_BOX
 BOX
 vtk:SegmentationConnectivity:Box12
 ISEXEC:FALSE
-58.121789:-1.265810:-900.000000
-110.121789:-11.265810:-900.000000
+42.851078:-1.757996:-900.000000
+66.061078:-4.257996:-900.000000
 PORT
 Value:"255"
 FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box13
 ISEXEC:FALSE
--310.837483:-180.661458:-900.000000
--90.404412:-190.661458:-900.000000
+-217.586238:-54.198437:-900.000000
+-177.226238:-56.698437:-900.000000
 PORT
 TypeControlsInterface:"2"
 PORT
@@ -80,16 +80,16 @@ FIN_BOX
 BOX
 wx:LayoutSplit:Box14
 ISEXEC:FALSE
--141.472047:-363.326153:-900.000000
--99.748519:-373.326153:-900.000000
+-99.030433:-108.997846:-900.000000
+-76.270433:-111.497846:-900.000000
 PORT
 Orientation:"H"
 FIN_BOX
 BOX
 creaVtk:ImageContinuousErode3D:Box15
 ISEXEC:FALSE
-86.766945:-27.946018:-900.000000
-138.391945:-37.946018:-900.000000
+63.655243:-11.188957:-900.000000
+86.820243:-13.688957:-900.000000
 PORT
 Repetitions:"2"
 PORT
@@ -102,8 +102,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box17
 ISEXEC:FALSE
--182.971774:-213.746563:-900.000000
--74.153795:-223.746563:-900.000000
+-128.080242:-64.123969:-900.000000
+-87.720242:-66.623969:-900.000000
 PORT
 TypeControlsInterface:"2"
 PORT
@@ -114,14 +114,14 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box18
 ISEXEC:FALSE
--198.282340:-320.226258:-900.000000
--88.505122:-330.226258:-900.000000
+-138.797638:-96.067877:-900.000000
+-105.477638:-98.567877:-900.000000
 FIN_BOX
 BOX
 vtk:SegmentationConnectivity:Box19
 ISEXEC:FALSE
-86.586442:-90.622348:-900.000000
-138.586442:-100.622348:-900.000000
+60.610509:-27.186704:-900.000000
+83.820509:-29.686704:-900.000000
 PORT
 ThresholdMinMax:"250 260"
 PORT
@@ -130,8 +130,8 @@ FIN_BOX
 BOX
 creaVtk:ImageContinuousDilate3D:Box21
 ISEXEC:FALSE
-120.268099:-116.594485:-900.000000
-171.868099:-126.594485:-900.000000
+84.187669:-34.978346:-900.000000
+107.352669:-37.478346:-900.000000
 PORT
 Repetitions:"0"
 PORT
@@ -144,8 +144,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ManualPaint_Model:Box22
 ISEXEC:FALSE
-132.271803:-217.538352:-900.000000
-192.911803:-227.538352:-900.000000
+92.590262:-65.261506:-900.000000
+127.670262:-67.761506:-900.000000
 PORT
 DistanceFill:"7"
 PORT
@@ -156,14 +156,14 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box23
 ISEXEC:FALSE
-279.652968:41.704292:-900.000000
-319.377968:31.704292:-900.000000
+195.757078:12.511288:-900.000000
+218.517078:10.011288:-900.000000
 FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box24
 ISEXEC:FALSE
--93.549175:-238.721391:-900.000000
--45.624175:-248.721391:-900.000000
+-65.484422:-71.616417:-900.000000
+-25.124422:-74.116417:-900.000000
 PORT
 TypeControlsInterface:"2"
 PORT
@@ -174,8 +174,8 @@ FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box25
 ISEXEC:FALSE
--46.164510:-259.315564:-900.000000
-1.760490:-269.315564:-900.000000
+-32.315157:-77.794669:-900.000000
+8.044843:-80.294669:-900.000000
 PORT
 TypeControlsInterface:"2"
 PORT
@@ -186,20 +186,20 @@ FIN_BOX
 BOX
 vtk:CreateImage:Box26
 ISEXEC:FALSE
-199.049406:-164.716260:-900.000000
-238.399406:-174.716260:-900.000000
+139.334584:-49.414878:-900.000000
+161.264584:-51.914878:-900.000000
 FIN_BOX
 BOX
 vtk:ImageVtkProperties:Box30
 ISEXEC:FALSE
-190.555886:-141.385916:-900.000000
-235.905886:-151.385916:-900.000000
+133.389120:-42.415775:-900.000000
+155.924120:-44.915775:-900.000000
 FIN_BOX
 BOX
 vtk:InversCrop:Box31
 ISEXEC:FALSE
-194.141721:-184.430525:-900.000000
-230.941721:-194.430525:-900.000000
+135.899205:-55.329157:-900.000000
+157.574205:-57.829157:-900.000000
 PORT
 Origin:"0 0 0"
 PORT
@@ -208,30 +208,30 @@ FIN_BOX
 BOX
 vtk:BinaryOperations:Box42
 ISEXEC:FALSE
-228.848881:-297.021504:-900.000000
-271.798881:-307.021504:-900.000000
+80.846226:-112.339858:-900.000000
+103.141226:-114.839858:-900.000000
 FIN_BOX
 BOX
 std:GetVectorStringElement:Box43
 ISEXEC:FALSE
-269.393064:-39.079678:-900.000000
-318.793064:-49.079678:-900.000000
+188.575145:-11.723903:-900.000000
+211.530145:-14.223903:-900.000000
 PORT
 I:"0"
 FIN_BOX
 BOX
 std:GetVectorStringElement:Box44
 ISEXEC:FALSE
-335.557143:-38.235763:-900.000000
-384.957143:-48.235763:-900.000000
+234.890000:-11.470729:-900.000000
+257.845000:-13.970729:-900.000000
 PORT
 I:"1"
 FIN_BOX
 BOX
 itk:BinaryThresholdImageFilter:Box45
 ISEXEC:FALSE
-301.535511:-181.107983:-900.000000
-353.710511:-191.107983:-900.000000
+211.074858:-54.332395:-900.000000
+234.299858:-56.832395:-900.000000
 PORT
 InsideValue:"126"
 PORT
@@ -240,20 +240,20 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box46
 ISEXEC:FALSE
-98.852025:37.311656:-900.000000
-138.577025:27.311656:-900.000000
+69.196417:11.193497:-900.000000
+91.956417:8.693497:-900.000000
 FIN_BOX
 BOX
 std:MagicBox:Box47
 ISEXEC:FALSE
-168.837546:40.909042:-900.000000
-204.912546:30.909042:-900.000000
+118.186282:12.272713:-900.000000
+139.786282:9.772713:-900.000000
 FIN_BOX
 BOX
 std:MathOperation:Box49
 ISEXEC:FALSE
-197.798232:-2.006132:-900.000000
-238.848232:-12.006132:-900.000000
+138.458762:-0.601840:-900.000000
+160.558762:-3.101840:-900.000000
 PORT
 In2:"2"
 PORT
@@ -262,16 +262,16 @@ FIN_BOX
 BOX
 std:ConcatStrings:Box50
 ISEXEC:FALSE
-151.373438:2.779371:-900.000000
-191.098438:-7.220629:-900.000000
+105.961407:0.833811:-900.000000
+128.721407:-1.666189:-900.000000
 PORT
 In1:"3"
 FIN_BOX
 BOX
 creaMaracasVisu:ColorLayerImageView:Box54
 ISEXEC:FALSE
--251.332481:-197.397418:-900.000000
--82.913893:-207.397418:-900.000000
+-175.932737:-59.219225:-900.000000
+-135.572737:-61.719225:-900.000000
 PORT
 TypeControlsInterface:"2"
 PORT
@@ -282,68 +282,68 @@ FIN_BOX
 BOX
 wx:LayoutLine:Box41
 ISEXEC:FALSE
--293.553421:-290.492249:-900.000000
--100.566127:-300.492249:-900.000000
+-205.487395:-87.147675:-900.000000
+-172.167395:-89.647675:-900.000000
 FIN_BOX
 BOX
 wx:OutputText:Box48
 ISEXEC:FALSE
--301.854860:-243.823607:-900.000000
--126.221791:-253.823607:-900.000000
+-211.298402:-73.147082:-900.000000
+-189.628402:-75.647082:-900.000000
 PORT
 Title:"Depth"
 FIN_BOX
 BOX
 wx:OutputText:Box52
 ISEXEC:FALSE
--276.517436:-256.409984:-900.000000
--123.047842:-266.409984:-900.000000
+-193.562205:-76.922995:-900.000000
+-171.892205:-79.422995:-900.000000
 PORT
 Title:"Seed"
 FIN_BOX
 BOX
 wx:OutputText:Box53
 ISEXEC:FALSE
--254.551016:-271.243698:-900.000000
--120.254767:-281.243698:-900.000000
+-178.185711:-81.373109:-900.000000
+-156.515711:-83.873109:-900.000000
 PORT
 Title:"Seed"
 FIN_BOX
 BOX
 wx:LayoutTab:Box55
 ISEXEC:FALSE
--318.814935:-219.886716:-900.000000
--103.740076:-229.886716:-900.000000
+-223.170454:-65.966015:-900.000000
+-189.850454:-68.466015:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box56
 ISEXEC:FALSE
--239.842490:-236.699818:-900.000000
--93.710398:-246.699818:-900.000000
+-167.889743:-71.009945:-900.000000
+-134.569743:-73.509945:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box57
 ISEXEC:FALSE
--190.058428:-253.036375:-900.000000
--87.489458:-263.036375:-900.000000
+-133.040900:-75.910912:-900.000000
+-99.720900:-78.410912:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box58
 ISEXEC:FALSE
--130.743465:-271.398247:-900.000000
--79.871981:-281.398247:-900.000000
+-91.520425:-81.419474:-900.000000
+-58.200425:-83.919474:-900.000000
 FIN_BOX
 BOX
 wx:LayoutTab:Box59
 ISEXEC:FALSE
--78.100132:-279.871812:-900.000000
--41.850132:-289.871812:-900.000000
+-54.670092:-83.961544:-900.000000
+-21.350092:-86.461544:-900.000000
 FIN_BOX
 BOX
 vtk:BinaryOperations:Box60
 ISEXEC:FALSE
-110.927168:-169.021578:-900.000000
-153.877168:-179.021578:-900.000000
+77.649018:-50.706473:-900.000000
+99.944018:-53.206473:-900.000000
 PORT
 Operation:"1"
 FIN_BOX
@@ -463,9 +463,6 @@ CONNECTION
 Box05:Out:Box45:In
 NumberOfControlPoints:0
 CONNECTION
-Box42:Out:resultImage:resultImage
-NumberOfControlPoints:0
-CONNECTION
 Threshold:Threshold:Box23:In1
 NumberOfControlPoints:0
 CONNECTION
@@ -594,4 +591,7 @@ NumberOfControlPoints:0
 CONNECTION
 Box60:Out:Box22:ByImagePoints
 NumberOfControlPoints:0
+CONNECTION
+Box42:Out:resultImage:resultImage
+NumberOfControlPoints:0
 APP_END
diff --git a/bbtk/bbs/boxes/SegmentationConnectivityEED.bbs b/bbtk/bbs/boxes/SegmentationConnectivityEED.bbs
index 9a8a590..08f2894 100644
--- a/bbtk/bbs/boxes/SegmentationConnectivityEED.bbs
+++ b/bbtk/bbs/boxes/SegmentationConnectivityEED.bbs
@@ -1,6 +1,6 @@
 # ----------------------------------
-# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box)
-# - /home/davila/Creatis/C10/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SegmentationConnectivityEED.bbs
+# - BBTKGEditor v 1.5 BBS BlackBox Script (Complex Box)
+# - /Users/davila/Creatis/C11/creatools_source/creaMaracasVisu/bbtk/bbs/boxes/SegmentationConnectivityEED.bbs
 # ----------------------------------
 
 include std
@@ -222,8 +222,8 @@ input Depth Box47.In " "
 input InImage Box05.In " "
 
 # Complex output ports
-output resultImage Box42.Out " "
 output OutWidget Box14.Widget " "
+output resultImage Box42.Out " "
 
 
 endefine
diff --git a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
index afd1af0..9ae31d9 100644
--- a/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
+++ b/bbtk/src/bbcreaMaracasVisuColorLayerImageView.cxx
@@ -77,38 +77,46 @@ BBTK_BLACK_BOX_IMPLEMENTATION(ColorLayerImageView,bbtk::WxBlackBox);
 //=====
 void ColorLayerImageView::Process()
 {
-    ColorLayerImageViewPanel_widgetBox *clivp = (ColorLayerImageViewPanel_widgetBox*)bbGetOutputWidget();
-  	 if (firsttime==true)
-	 {
-//		firsttime=false;
-    	clivp->SetActive( bbGetInputActive() );
-	 }
-    clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 0 , bbGetInputWxVtkBaseView() );
-    clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 1 , bbGetInputWxVtkBaseView1() );
-    clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 2 , bbGetInputWxVtkBaseView2() );
-    std::vector<double> range = bbGetInputlstRangeForColorBar();
-    clivp->GetColorLayerImageViewManager()->SetRangeForColorBar( range );
-    std::vector<int> colorbarposition = bbGetInputColorBarPosition();
-    clivp->GetColorLayerImageViewManager()->SetColorBarPosition( colorbarposition );
-    std::vector<double> base_color = bbGetInputlstBaseColor();
-    clivp->GetColorLayerImageViewManager()->SetBaseColors( base_color );
-    std::vector<double> grey_level_boundaries = bbGetInputlstGreyLevelBoundaries();
-    clivp->GetColorLayerImageViewManager()->SetGreyLevelBoundaries( grey_level_boundaries );
-    std::vector<double> transparence_level_boundaries = bbGetInputlstTransparenceBoundaries();
-    clivp->GetColorLayerImageViewManager()->SetBaseTransparence( transparence_level_boundaries );
-    clivp->GetColorLayerImageViewManager()->SetPlainOrGradientColor( bbGetInputPlainOrGradientColor() );
-    clivp->SetFittingMode( bbGetInputFittingMode() );
-    clivp->SetImage( bbGetInputIn() );
-    bbSetOutputNewImage( clivp->GetColorLayerImageViewManager()->GetImageChangeInformation(0) );
-    bbSetOutputLookupTable( clivp->GetColorLayerImageViewManager()->GetLookupTable(0) );
-   	bbSetOutputOutOpacity( clivp->GetOpacity() );
+ 
+    if ( !( (bbGetInputWxVtkBaseView()==NULL) && (bbGetInputWxVtkBaseView1()==NULL) && (bbGetInputWxVtkBaseView2()==NULL))  )
+    {
+        ColorLayerImageViewPanel_widgetBox *clivp = (ColorLayerImageViewPanel_widgetBox*)bbGetOutputWidget();
+           if (firsttime==true)
+         {
+    //        firsttime=false;
+            clivp->SetActive( bbGetInputActive() );
+         }
+        clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 0 , bbGetInputWxVtkBaseView() );
+        clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 1 , bbGetInputWxVtkBaseView1() );
+        clivp->GetColorLayerImageViewManager()->SetwxVtkBaseView( 2 , bbGetInputWxVtkBaseView2() );
+        std::vector<double> range = bbGetInputlstRangeForColorBar();
+        clivp->GetColorLayerImageViewManager()->SetRangeForColorBar( range );
+        std::vector<int> colorbarposition = bbGetInputColorBarPosition();
+        clivp->GetColorLayerImageViewManager()->SetColorBarPosition( colorbarposition );
+        std::vector<double> base_color = bbGetInputlstBaseColor();
+        clivp->GetColorLayerImageViewManager()->SetBaseColors( base_color );
+        std::vector<double> grey_level_boundaries = bbGetInputlstGreyLevelBoundaries();
+        clivp->GetColorLayerImageViewManager()->SetGreyLevelBoundaries( grey_level_boundaries );
+        std::vector<double> transparence_level_boundaries = bbGetInputlstTransparenceBoundaries();
+        clivp->GetColorLayerImageViewManager()->SetBaseTransparence( transparence_level_boundaries );
+        clivp->GetColorLayerImageViewManager()->SetPlainOrGradientColor( bbGetInputPlainOrGradientColor() );
+        clivp->SetFittingMode( bbGetInputFittingMode() );
+        clivp->SetImage( bbGetInputIn() );
+        bbSetOutputNewImage( clivp->GetColorLayerImageViewManager()->GetImageChangeInformation(0) );
+        bbSetOutputLookupTable( clivp->GetColorLayerImageViewManager()->GetLookupTable(0) );
+           bbSetOutputOutOpacity( clivp->GetOpacity() );
+        
+          if (firsttime==true)
+        {
+            firsttime=false;
+            clivp->ChangeOpacity();
+            clivp->SetBox(this);
+        }
+
+    } else {
+        printf("EED Error!!!  ColorLayerImageView::Process   (%s)  Missing Inputs:  WxVtkBaseView , WxVtkBaseView1 , WxVtkBaseView2 \n", bbGetFullName().c_str() );
+    }// if xxVtkBaseView
     
-  	if (firsttime==true)
-	{
-		firsttime=false;
-    	clivp->ChangeOpacity();
-		clivp->SetBox(this);
-	}
 }
 //=====
 // Don't edit this file. This file is generated from xml description..