+/*
+# ---------------------------------------------------------------------
+#
+# 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$
_factory = factory;
_sceneManager = sceneManager;
- _xGeneral = -100;
+ _xGeneral = -50;
_yGeneral = 100;
_zGeneral = GPOSITION_Z; // ?????
/// 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;
+//EED 2022-01-16
+// double px = _xGeneral + (_countBoxes%2)*100;
+// _yGeneral = _yGeneral - 30;
+ double px = _xGeneral + (_countBoxes%2)*BOX_WIDTH*3.0;
+ _yGeneral = _yGeneral - BOX_HEIGHT*3.0;
double py = _yGeneral;
-
- _sceneManager->configGBlackBox(idBox, px,py,_zGeneral,boxName, false , px+100, py-10 , _zGeneral );
+ _sceneManager->configGBlackBox(idBox, px,py,_zGeneral,boxName, false , px+BOX_WIDTH, py-BOX_HEIGHT , _zGeneral );
}
//=========================================================================