#3249 Change FontSize - Box graphic scale

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / InterpreterBBS.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
index 3bd1dcf6eeb4cbeca5419b6cac9cdbf1cd7c6100..7365e982a8bc716c865e727b989933238e9556ba 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/InterpreterBBS.cxx
@@ -1,3 +1,28 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  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.
+# ------------------------------------------------------------------------  
+*/
+
 /*=========================================================================
 Program:   bbtk
 Module:    $RCSfile$
@@ -61,8 +86,7 @@ namespace bbtk
 
                _xGeneral               = -100;
                _yGeneral               = 100;
-               _zGeneral               = 900;   //  ?????
-printf("EED  InterpreterBBS::createGBlackBox 900-450\n");
+               _zGeneral               = GPOSITION_Z;   //  ?????
 
                _countBoxes             = 0;
                _countInputs    = 0;
@@ -85,14 +109,18 @@ printf("EED  InterpreterBBS::createGBlackBox 900-450\n");
        /// Creates a new black box in current complex box
     void InterpreterBBS::commandNew( const std::string& boxType, const std::string& boxName) // virtual
        {
-               _yGeneral                               = _yGeneral - 30;
                std::string packagename = _factory->GetPackageNameOfaBlackBox(boxType);
-               int idBox                               = _sceneManager->createGBlackBox( 0,0, packagename ,boxType);
+               std::string boxType2    = _factory->GetTypeNameOfaBlackBox(boxType);
+               int idBox                               = _sceneManager->createGBlackBox( 0,0, packagename ,boxType2);
                _countBoxes++;
-               double px                               = _xGeneral + (_countBoxes%2)*100;
-               double py                               = _yGeneral;
+//EED 2022-01-16
+//             double px                               = _xGeneral + (_countBoxes%2)*100;
+//        _yGeneral                = _yGeneral - 30;
+        double px                = _xGeneral + (_countBoxes%2)*70;
+        _yGeneral                = _yGeneral - 9;
 
-               _sceneManager->configGBlackBox(idBox, px,py,_zGeneral,boxName, false , px+100, py-10 , _zGeneral );
+               double py                               = _yGeneral;
+               _sceneManager->configGBlackBox(idBox, px,py,_zGeneral,boxName, false , px+BOX_WIDTH, py-BOX_HEIGHT , _zGeneral );
        }
        //=========================================================================
 
@@ -114,7 +142,7 @@ printf("EED  InterpreterBBS::createGBlackBox 900-450\n");
        {
                double xIn      = -100+50+_countInputs*50;
                double yIn      = 100;
-               double zIn      = 900;
+               double zIn      = GPOSITION_Z;
                _sceneManager->configGComBoxInputOutputPort(true,name,xIn,yIn,zIn);
                _sceneManager->configGConnetion( name,name,box,input);
                _countInputs++;
@@ -129,7 +157,7 @@ printf("EED  InterpreterBBS::createGBlackBox 900-450\n");
                _yGeneral       = _yGeneral - 30;
                double xIn      = -100+_countOutputs*30;
                double yIn      = _yGeneral;
-               double zIn      = 900;
+               double zIn      = GPOSITION_Z;
                _sceneManager->configGComBoxInputOutputPort(false,name,xIn,yIn,zIn);
                _sceneManager->configGConnetion( box,output,name,name);
                _countOutputs++;