From 4af0bfd5fe3f57837d677327b59408d348927307 Mon Sep 17 00:00:00 2001 From: "eduardo.davila@creatis.insa-lyon.fr" Date: Tue, 7 Nov 2023 18:36:16 +0100 Subject: [PATCH] #3512 clean bbs2 python version --- kernel/appli/bbs2cpp/bbs2.cxx | 12 +- packages/std/src/bbstdMultipleInputs.xml | 2 +- .../vtk/src/bbvtkExtractVtkImageFilter.cxx~ | 117 ------------------ packages/vtk/src/bbvtkUpdateRender.cxx~ | 62 ---------- packages/vtk/src/bbvtkUpdateRender.h | 2 +- 5 files changed, 12 insertions(+), 183 deletions(-) delete mode 100644 packages/vtk/src/bbvtkExtractVtkImageFilter.cxx~ delete mode 100644 packages/vtk/src/bbvtkUpdateRender.cxx~ diff --git a/kernel/appli/bbs2cpp/bbs2.cxx b/kernel/appli/bbs2cpp/bbs2.cxx index 180e8da..25c1290 100644 --- a/kernel/appli/bbs2cpp/bbs2.cxx +++ b/kernel/appli/bbs2cpp/bbs2.cxx @@ -58,10 +58,18 @@ int main(int argc, char* argv[]) printf("bbs2 \n"); return 1; } - std::string fileBase,file,path; + +//EED 2023-11-07 + // std::string fileBase,file,path; + // std::string extention( argv[2] ); + // fileBase = bbtk::Utilities::ExtractScriptName(argv[1],path); + // file = fileBase + std::string(".") + extention; + + std::string fileBase,path; std::string extention( argv[2] ); fileBase = bbtk::Utilities::ExtractScriptName(argv[1],path); - file = fileBase + std::string(".") + extention; + std::string file(path+"/"+fileBase+"."+extention); + printf("file %s \n",file.c_str() ); if ( extention.compare("cxx")==0) { diff --git a/packages/std/src/bbstdMultipleInputs.xml b/packages/std/src/bbstdMultipleInputs.xml index bf71438..2d01e05 100644 --- a/packages/std/src/bbstdMultipleInputs.xml +++ b/packages/std/src/bbstdMultipleInputs.xml @@ -3,7 +3,7 @@ laurent.guigues@creatis.insa-lyon.fr - This box has multiple Void inputs and one Void output. Hence it relays any input modification to its output. It is usefull to plug different BoxChange outputs into the same BoxExecute input. + (C++,Python) This box has multiple Void inputs and one Void output. Hence it relays any input modification to its output. It is usefull to plug different BoxChange outputs into the same BoxExecute input. misc diff --git a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx~ b/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx~ deleted file mode 100644 index efbbe22..0000000 --- a/packages/vtk/src/bbvtkExtractVtkImageFilter.cxx~ +++ /dev/null @@ -1,117 +0,0 @@ -/* - # --------------------------------------------------------------------- - # - # 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. - # ------------------------------------------------------------------------ */ - - -//===== -// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) -//===== -#include "bbvtkExtractVtkImageFilter.h" -#include "bbvtkPackage.h" -namespace bbvtk -{ - -BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,ExtractVtkImageFilter) -BBTK_BLACK_BOX_IMPLEMENTATION(ExtractVtkImageFilter,bbtk::AtomicBlackBox); -//===== -// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) -//===== -void ExtractVtkImageFilter::Process() -{ - int voi[6]; - - voi[0] = bbGetInputIndex()[0]; - voi[1] = bbGetInputIndex()[0]+bbGetInputSize()[0]-1; - voi[2] = bbGetInputIndex()[1]; - voi[3] = bbGetInputIndex()[1]+bbGetInputSize()[1]-1; - voi[4] = bbGetInputIndex()[2]; - voi[5] = bbGetInputIndex()[2]+bbGetInputSize()[2]-1; - - _extract->SetInput( bbGetInputIn() ); - _extract->SetVOI(voi); - _extract->UpdateWholeExtent(); - _extract->Modified(); - _extract->Update(); - bbSetOutputOut(_extract->GetOutput()); -} - -//===== -// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) -//===== -void ExtractVtkImageFilter::bbUserSetDefaultValues() -{ - -// SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX -// Here we initialize the input 'In' to 0 - - _extract =NULL; - - bbSetInputIn(0); - - std::vector tmpIndex; - tmpIndex.push_back(0); - tmpIndex.push_back(0); - tmpIndex.push_back(0); - std::vector tmpSize; - tmpSize.push_back(1); - tmpSize.push_back(1); - tmpSize.push_back(1); - bbSetInputIndex(tmpIndex); - bbSetInputSize(tmpSize); - - bbSetOutputOut(0); - -} -//===== -// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) -//===== -void ExtractVtkImageFilter::bbUserInitializeProcessing() -{ - -// THE INITIALIZATION METHOD BODY : -// Here does nothing -// but this is where you should allocate the internal/output pointers -// if any - _extract = vtkExtractVOI::New(); - - -} -//===== -// Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost) -//===== -void ExtractVtkImageFilter::bbUserFinalizeProcessing() -{ - -// THE FINALIZATION METHOD BODY : -// Here does nothing -// but this is where you should desallocate the internal/output pointers -// if any - - _extract->Delete(); -} -} -// EO namespace bbvtk - - diff --git a/packages/vtk/src/bbvtkUpdateRender.cxx~ b/packages/vtk/src/bbvtkUpdateRender.cxx~ deleted file mode 100644 index 691f32c..0000000 --- a/packages/vtk/src/bbvtkUpdateRender.cxx~ +++ /dev/null @@ -1,62 +0,0 @@ -/* - # --------------------------------------------------------------------- - # - # 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. - # ------------------------------------------------------------------------ */ - - - -#include "bbvtkUpdateRender.h" -#include "bbvtkPackage.h" -namespace bbvtk { - - BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk, UpdateRender) - BBTK_BLACK_BOX_IMPLEMENTATION(UpdateRender, bbtk::AtomicBlackBox); - - void UpdateRender::Process() - { - if(bbGetInputActive()) - { - if (bbGetInputRenderer()!=NULL) - { - bbGetInputRenderer()->GetRenderWindow()->Render(); - } - } // Active - } - - void UpdateRender::bbUserSetDefaultValues() { - bbSetInputActive(false); - bbSetInputRenderer(NULL); - } - - void UpdateRender::bbUserInitializeProcessing() { - - } - - void UpdateRender::bbUserFinalizeProcessing() { - - } -} -// EO namespace bbvtk - - diff --git a/packages/vtk/src/bbvtkUpdateRender.h b/packages/vtk/src/bbvtkUpdateRender.h index 7916436..6550840 100644 --- a/packages/vtk/src/bbvtkUpdateRender.h +++ b/packages/vtk/src/bbvtkUpdateRender.h @@ -57,7 +57,7 @@ class bbvtk_EXPORT UpdateRender BBTK_BEGIN_DESCRIBE_BLACK_BOX(UpdateRender,bbtk::AtomicBlackBox); BBTK_NAME("UpdateRender"); BBTK_AUTHOR("JLGR"); -BBTK_DESCRIPTION("refresh 3d scene (JavaScript)"); +BBTK_DESCRIPTION("(C++,Python,JavaScript) Refresh 3d scene"); BBTK_CATEGORY(""); BBTK_INPUT(UpdateRender,Renderer,"Render to update",vtkRenderer*,""); BBTK_INPUT(UpdateRender,Active,"Enable render update (default is false).",bool,""); -- 2.45.1