From af034e6e8b0c37b1d47956c36857827e31f78aca Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Wed, 9 Mar 2016 11:35:35 +0100 Subject: [PATCH] #2878 CreaMiniTools Bug New Normal Box ExecSystemCommand not blockuing/blocking --- .../bbs/boxes/commandMenu.bbg | 67 +++++++-- .../bbs/boxes/commandMenu.bbs | 79 ++++++----- .../bbs/boxes/maxiToolsMenu.bbg | 131 ++++++++++-------- .../bbs/boxes/maxiToolsMenu.bbs | 73 +++++----- 4 files changed, 211 insertions(+), 139 deletions(-) diff --git a/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbg b/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbg index 781c50f..6e9caca 100755 --- a/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbg +++ b/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbg @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBG BlackBox Diagram file -# - /home/daniel/creatis/all/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbg +# - E:\creatis\creaToolsCompilation4\creatools_sources\creaMiniTools\bbtk_package_creaMiniTools\bbs\boxes\commandMenu.bbg # ---------------------------------- APP_START @@ -16,12 +16,12 @@ CommandMenu 70.622014:-99.994145:-900.000000 FIN_COMPLEX_PORT COMPLEXINPUTS:0 -BOXES:29 +BOXES:33 BOX wx:CommandButton:BBEditorButton ISEXEC:FALSE -33.172636:222.014465:-900.000000 -104.347636:212.014465:-900.000000 +23.321687:238.022257:-900.000000 +94.496687:228.022257:-900.000000 PORT Label:"bbEditor (Graphical Pipeline Editor)" FIN_BOX @@ -78,8 +78,6 @@ std:ExecSystemCommand:BBEditorComm ISEXEC:FALSE 33.479318:202.164366:-900.000000 104.654318:192.164366:-900.000000 -PORT -In:"bbEditor &" FIN_BOX BOX wx:LayoutTab:Tabs @@ -158,8 +156,6 @@ std:ExecSystemCommand:CreaDevManagerComm ISEXEC:FALSE -79.019149:97.738353:-900.000000 -7.844149:87.738353:-900.000000 -PORT -In:"creaDevManager &" FIN_BOX BOX wx:StaticBox:CPP @@ -244,18 +240,48 @@ FIN_BOX BOX creaMiniTools:MiniToolsIcons:Box29 ISEXEC:FALSE --81.964825:136.058613:-900.000000 --36.389825:126.058613:-900.000000 +-108.644479:152.066405:-900.000000 +-63.069479:142.066405:-900.000000 FIN_BOX BOX wx:BitmapButton:Box30 ISEXEC:FALSE --78.967939:118.676675:-900.000000 --33.392939:108.676675:-900.000000 +-101.543031:136.326292:-900.000000 +-55.968031:126.326292:-900.000000 PORT Label:"Crea Development Manager" FIN_BOX -CONNECTIONS:29 +BOX +std:Configuration:Box31 +ISEXEC:FALSE +-72.383022:269.074964:-900.000000 +-26.808022:259.074964:-900.000000 +FIN_BOX +BOX +std:ConcatStrings:Box32 +ISEXEC:FALSE +-67.252320:115.482248:-900.000000 +-21.677320:105.482248:-900.000000 +PORT +In2:"creaDevManager &" +FIN_BOX +BOX +std:StringSelect:Box33 +ISEXEC:FALSE +-62.429459:249.598817:-900.000000 +-16.854459:239.598817:-900.000000 +PORT +In1:"start /b " +FIN_BOX +BOX +std:ConcatStrings:Box34 +ISEXEC:FALSE +41.005507:217.993688:-900.000000 +86.580507:207.993688:-900.000000 +PORT +In2:"bbEditor &" +FIN_BOX +CONNECTIONS:34 CONNECTION BBIButton:BoxChange:BBIComm:BoxExecute NumberOfControlPoints:0 @@ -343,4 +369,19 @@ NumberOfControlPoints:0 CONNECTION Box30:BoxChange:CreaDevManagerComm:BoxExecute NumberOfControlPoints:0 +CONNECTION +Box32:Out:CreaDevManagerComm:In +NumberOfControlPoints:0 +CONNECTION +Box31:SystemType:Box33:In +NumberOfControlPoints:0 +CONNECTION +Box33:Out:Box32:In1 +NumberOfControlPoints:0 +CONNECTION +Box34:Out:BBEditorComm:In +NumberOfControlPoints:0 +CONNECTION +Box33:Out:Box34:In1 +NumberOfControlPoints:0 APP_END diff --git a/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbs b/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbs index fa88185..5ef9f7c 100755 --- a/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbs +++ b/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbs @@ -1,6 +1,6 @@ # ---------------------------------- # - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box) -# - /home/daniel/creatis/all/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/boxes/commandMenu.bbs +# - E:\creatis\creaToolsCompilation4\creatools_sources\creaMiniTools\bbtk_package_creaMiniTools\bbs\boxes\commandMenu.bbs # ---------------------------------- include std @@ -16,96 +16,105 @@ description "Description ??" category "" -new CommandButton BBEditorButton +new wx:CommandButton BBEditorButton set BBEditorButton.Label "bbEditor (Graphical Pipeline Editor)" -new CommandButton BBIButton +new wx:CommandButton BBIButton set BBIButton.Label "bbi (Script Interpreter)" -new CommandButton BBStudioButton +new wx:CommandButton BBStudioButton set BBStudioButton.Label "bbStudio (Script Management)" -new CommandButton CreaNewProjectButton +new wx:CommandButton CreaNewProjectButton set CreaNewProjectButton.Label "Crea New Project (Create a blank project)" -new ExecSystemCommand CreaNewProjectComm +new std:ExecSystemCommand CreaNewProjectComm set CreaNewProjectComm.In "creaNewProject &" -new ExecSystemCommand BBIComm +new std:ExecSystemCommand BBIComm set BBIComm.In "bbi &" -new ExecSystemCommand BBStudioComm +new std:ExecSystemCommand BBStudioComm set BBStudioComm.In "bbStudio &" -new ExecSystemCommand BBEditorComm - set BBEditorComm.In "bbEditor &" +new std:ExecSystemCommand BBEditorComm -new LayoutTab Tabs +new wx:LayoutTab Tabs -new CommandButton CreatePackageBBTKButton +new wx:CommandButton CreatePackageBBTKButton set CreatePackageBBTKButton.Label "Create Package BBTK" -new CommandButton CreateBoxBBTKButton +new wx:CommandButton CreateBoxBBTKButton set CreateBoxBBTKButton.Label "Create Box BBTK" -new ExecSystemCommand CreatePackageBBTKComm +new std:ExecSystemCommand CreatePackageBBTKComm set CreatePackageBBTKComm.In "bbi toolsbbtk/appli/GUICreatePackage.bbs &" -new ExecSystemCommand CreateBoxBBTKComm +new std:ExecSystemCommand CreateBoxBBTKComm set CreateBoxBBTKComm.In "bbi toolsbbtk/appli/GUICreateBlackBox.bbs &" -new LayoutLine CPPLayout +new wx:LayoutLine CPPLayout set CPPLayout.Orientation "H" -new LayoutLine Layout +new wx:LayoutLine Layout set Layout.Orientation "H" set Layout.WinTitle "DevTools" -new CommandButton PlugPackageButton +new wx:CommandButton PlugPackageButton set PlugPackageButton.Label "Plug Package (Link packages with BBTK)" -new ExecSystemCommand PlugPackageComm +new std:ExecSystemCommand PlugPackageComm set PlugPackageComm.In "bbi toolsbbtk/appli/GUIPlugPackage.bbs &" -new ExecSystemCommand CreaDevManagerComm - set CreaDevManagerComm.In "creaDevManager &" +new std:ExecSystemCommand CreaDevManagerComm -new StaticBox CPP +new wx:StaticBox CPP set CPP.BoxTitle "C++" -new StaticBox Scripts +new wx:StaticBox Scripts set Scripts.BoxTitle "Scripts (bbg/bbs)" -new StaticBox DCPP +new wx:StaticBox DCPP set DCPP.BoxTitle "C++" -new StaticBox DScripts +new wx:StaticBox DScripts set DScripts.BoxTitle "Scripts (bbg/bbs)" -new LayoutLine ScriptsLayout +new wx:LayoutLine ScriptsLayout set ScriptsLayout.Orientation "V" -new LayoutLine DCPPLayout +new wx:LayoutLine DCPPLayout set DCPPLayout.Orientation "V" -new LayoutLine DScriptsLayout +new wx:LayoutLine DScriptsLayout set DScriptsLayout.Orientation "V" -new LayoutSplit DeprecatedTools +new wx:LayoutSplit DeprecatedTools set DeprecatedTools.Orientation "V" set DeprecatedTools.Proportion "80" set DeprecatedTools.WinTitle "DeprecatedTools" -new LayoutSplit ActiveTools +new wx:LayoutSplit ActiveTools set ActiveTools.Orientation "V" set ActiveTools.Proportion "33" set ActiveTools.WinTitle "Active Tools" -new MiniToolsIcons Box29 +new creaMiniTools:MiniToolsIcons Box29 -new BitmapButton Box30 +new wx:BitmapButton Box30 set Box30.Label "Crea Development Manager" +new std:Configuration Box31 + +new std:ConcatStrings Box32 + set Box32.In2 "creaDevManager &" + +new std:StringSelect Box33 + set Box33.In1 "start /b " + +new std:ConcatStrings Box34 + set Box34.In2 "bbEditor &" + connect BBIButton.BoxChange BBIComm.BoxExecute connect CreaNewProjectButton.BoxChange CreaNewProjectComm.BoxExecute @@ -135,11 +144,17 @@ connect Scripts.Widget ActiveTools.Widget2 connect Box29.IconCreaDevManager Box30.Bitmap connect Box30.Widget CPPLayout.Widget1 connect Box30.BoxChange CreaDevManagerComm.BoxExecute +connect Box32.Out CreaDevManagerComm.In +connect Box31.SystemType Box33.In +connect Box33.Out Box32.In1 +connect Box34.Out BBEditorComm.In +connect Box33.Out Box34.In1 # Complex input ports # Complex output ports output CommandMenu Layout.Widget " " +message endefine diff --git a/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbg b/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbg index 995eee3..2f87d86 100755 --- a/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbg +++ b/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbg @@ -1,31 +1,6 @@ -# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la Sant�) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ - # ---------------------------------- -# - BBTKGEditor v 1.2 BBG BlackBox Diagram file -# - /Users/davila/Creatis/All5/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbg +# - BBTKGEditor v 1.4 BBG BlackBox Diagram file +# - E:\creatis\creaToolsCompilation4\creatools_sources\creaMiniTools\bbtk_package_creaMiniTools\bbs\boxes\maxiToolsMenu.bbg # ---------------------------------- APP_START @@ -35,76 +10,106 @@ AUTHOR:Author ?? COMPLEXBOX:TRUE COMPLEXBOXNAME:maxiToolsMenu PACKAGENAME:creaMiniTools -COMPLEXINPUTS:0 COMPLEXOUTPUTS:1 COMPLEX_PORT widget --4.801404:35.590973:900.000000 +-4.801404:35.590973:-900.000000 FIN_COMPLEX_PORT -BOXES:8 +COMPLEXINPUTS:0 +BOXES:12 BOX wx:CommandButton:Box00 ISEXEC:FALSE --92.918799:171.862201:900.000000 --47.343799:161.862201:900.000000 +-109.023415:205.709191:-900.000000 +-63.448415:195.709191:-900.000000 PORT -Label:"creaContoursApp" +Label:"creaContoursApp ups4" FIN_BOX BOX std:ExecSystemCommand:Box04 ISEXEC:FALSE --103.459042:153.595971:900.000000 --32.284042:143.595971:900.000000 -PORT -In:"creaContourApp &" +-102.225515:122.413984:-900.000000 +-31.050515:112.413984:-900.000000 FIN_BOX BOX wx:CommandButton:Box11 ISEXEC:FALSE --13.889473:176.083494:900.000000 -31.685527:166.083494:900.000000 +-16.892029:204.744251:-900.000000 +28.682971:194.744251:-900.000000 PORT Label:"Image Tool" FIN_BOX BOX std:ExecSystemCommand:Box12 ISEXEC:FALSE -7.795831:150.214977:900.000000 -78.970831:140.214977:900.000000 -PORT -In:"bbi creaMiniTools/appli/ImageTool.bbs &" +2.944985:122.975610:-900.000000 +74.119985:112.975610:-900.000000 FIN_BOX BOX wx:LayoutLine:Box10 ISEXEC:FALSE --8.056005:79.011334:900.000000 -49.503995:69.011334:900.000000 +-8.056005:79.011334:-900.000000 +49.503995:69.011334:-900.000000 FIN_BOX BOX wx:CommandButton:Box14 ISEXEC:FALSE -63.249181:171.751961:900.000000 -108.824181:161.751961:900.000000 +79.899716:206.144870:-900.000000 +125.474716:196.144870:-900.000000 PORT Label:"Compare 2 images" FIN_BOX BOX std:ExecSystemCommand:Box15 ISEXEC:FALSE -107.708857:124.116594:900.000000 -178.883857:114.116594:900.000000 -PORT -In:"bbi creaMiniTools/appli/ImagesCompare.bbs &" +107.708857:124.116594:-900.000000 +178.883857:114.116594:-900.000000 FIN_BOX BOX wx:LayoutCenter:Box16 ISEXEC:FALSE --5.028178:54.780672:900.000000 -40.546822:44.780672:900.000000 +-5.028178:54.780672:-900.000000 +40.546822:44.780672:-900.000000 PORT WinTitle:"Tools" FIN_BOX -CONNECTIONS:8 +BOX +std:StringSelect:Box09 +ISEXEC:FALSE +-94.560704:141.674363:-900.000000 +-48.985704:131.674363:-900.000000 +PORT +In0:"creaContourApp &" +PORT +In1:"start /b creaContourApp &" +FIN_BOX +BOX +std:Configuration:Box13 +ISEXEC:FALSE +-53.616765:178.250949:-900.000000 +-8.041765:168.250949:-900.000000 +FIN_BOX +BOX +std:StringSelect:Box17 +ISEXEC:FALSE +10.142533:144.882972:-900.000000 +55.717533:134.882972:-900.000000 +PORT +In0:"bbi creaMiniTools/appli/ImageTool.bbs &" +PORT +In1:"start /b bbi creaMiniTools/appli/ImageTool.bbs &" +FIN_BOX +BOX +std:StringSelect:Box18 +ISEXEC:FALSE +113.726345:151.449860:-900.000000 +159.301345:141.449860:-900.000000 +PORT +In0:"bbi creaMiniTools/appli/ImagesCompare.bbs &" +PORT +In1:"start /b bbi creaMiniTools/appli/ImagesCompare.bbs &" +FIN_BOX +CONNECTIONS:14 CONNECTION Box00:BoxChange:Box04:BoxExecute NumberOfControlPoints:0 @@ -129,4 +134,22 @@ NumberOfControlPoints:0 CONNECTION Box16:Widget:widget:widget NumberOfControlPoints:0 +CONNECTION +Box09:Out:Box04:In +NumberOfControlPoints:0 +CONNECTION +Box13:SystemType:Box09:In +NumberOfControlPoints:0 +CONNECTION +Box13:SystemType:Box18:In +NumberOfControlPoints:0 +CONNECTION +Box13:SystemType:Box17:In +NumberOfControlPoints:0 +CONNECTION +Box17:Out:Box12:In +NumberOfControlPoints:0 +CONNECTION +Box18:Out:Box15:In +NumberOfControlPoints:0 APP_END diff --git a/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbs b/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbs index 677e9c3..f855feb 100644 --- a/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbs +++ b/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbs @@ -1,31 +1,6 @@ -# --------------------------------------------------------------------- -# -# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image -# pour la Sant�) -# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton -# Previous Authors : Laurent Guigues, Jean-Pierre Roux -# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil -# -# This software is governed by the CeCILL-B license under French law and -# abiding by the rules of distribution of free software. You can use, -# modify and/ or redistribute the software under the terms of the CeCILL-B -# license as circulated by CEA, CNRS and INRIA at the following URL -# http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html -# or in the file LICENSE.txt. -# -# As a counterpart to the access to the source code and rights to copy, -# modify and redistribute granted by the license, users are provided only -# with a limited warranty and the software's author, the holder of the -# economic rights, and the successive licensors have only limited -# liability. -# -# The fact that you are presently reading this means that you have had -# knowledge of the CeCILL-B license and that you accept its terms. -# ------------------------------------------------------------------------ */ - # ---------------------------------- -# - BBTKGEditor v 1.2 BBS BlackBox Script (Complex Box) -# - /Users/davila/Creatis/All5/creatools_source/creaMiniTools/bbtk_package_creaMiniTools/bbs/boxes/maxiToolsMenu.bbs +# - BBTKGEditor v 1.4 BBS BlackBox Script (Complex Box) +# - E:\creatis\creaToolsCompilation4\creatools_sources\creaMiniTools\bbtk_package_creaMiniTools\bbs\boxes\maxiToolsMenu.bbs # ---------------------------------- include std @@ -40,29 +15,40 @@ description "Description ??" category "" -new CommandButton Box00 - set Box00.Label "creaContoursApp" +new wx:CommandButton Box00 + set Box00.Label "creaContoursApp ups4" -new ExecSystemCommand Box04 - set Box04.In "creaContourApp &" +new std:ExecSystemCommand Box04 -new CommandButton Box11 +new wx:CommandButton Box11 set Box11.Label "Image Tool" -new ExecSystemCommand Box12 - set Box12.In "bbi creaMiniTools/appli/ImageTool.bbs &" +new std:ExecSystemCommand Box12 -new LayoutLine Box10 +new wx:LayoutLine Box10 -new CommandButton Box14 +new wx:CommandButton Box14 set Box14.Label "Compare 2 images" -new ExecSystemCommand Box15 - set Box15.In "bbi creaMiniTools/appli/ImagesCompare.bbs &" +new std:ExecSystemCommand Box15 -new LayoutCenter Box16 +new wx:LayoutCenter Box16 set Box16.WinTitle "Tools" +new std:StringSelect Box09 + set Box09.In0 "creaContourApp &" + set Box09.In1 "start /b creaContourApp &" + +new std:Configuration Box13 + +new std:StringSelect Box17 + set Box17.In0 "bbi creaMiniTools/appli/ImageTool.bbs &" + set Box17.In1 "start /b bbi creaMiniTools/appli/ImageTool.bbs &" + +new std:StringSelect Box18 + set Box18.In0 "bbi creaMiniTools/appli/ImagesCompare.bbs &" + set Box18.In1 "start /b bbi creaMiniTools/appli/ImagesCompare.bbs &" + connect Box00.BoxChange Box04.BoxExecute connect Box11.BoxChange Box12.BoxExecute @@ -71,11 +57,18 @@ connect Box00.Widget Box10.Widget2 connect Box14.BoxChange Box15.BoxExecute connect Box14.Widget Box10.Widget4 connect Box10.Widget Box16.Widget2 - +connect Box09.Out Box04.In +connect Box13.SystemType Box09.In +connect Box13.SystemType Box18.In +connect Box13.SystemType Box17.In +connect Box17.Out Box12.In +connect Box18.Out Box15.In # Complex input ports # Complex output ports output widget Box16.Widget " " +message + endefine -- 2.45.0