From: Eduardo Davila Date: Wed, 30 May 2012 17:17:00 +0000 (+0000) Subject: no message X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=bf1bdd88621c0556024de37768c2d17d12f2a265;p=bbtk.git no message --- diff --git a/kernel/cmake/BBTKVersion.cmake b/kernel/cmake/BBTKVersion.cmake index 8aa14b6..da59a82 100644 --- a/kernel/cmake/BBTKVersion.cmake +++ b/kernel/cmake/BBTKVersion.cmake @@ -3,7 +3,7 @@ SET(BBTK_VERSION_DATE "19/03/2010") SET(BBTK_MAJOR_VERSION 0) SET(BBTK_MINOR_VERSION 9) -SET(BBTK_BUILD_VERSION 5) +SET(BBTK_BUILD_VERSION 6) SET(BBTK_VERSION "${BBTK_MAJOR_VERSION}.${BBTK_MINOR_VERSION}.${BBTK_BUILD_VERSION}") # Now in bbtkConfigure.h file (cf. core/src) diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index cfd3c6e..3d4aef1 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.cxx,v $ Language: C++ - Date: $Date: 2010/09/12 14:59:29 $ - Version: $Revision: 1.51 $ + Date: $Date: 2012/05/30 17:17:00 $ + Version: $Revision: 1.52 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -115,6 +115,7 @@ namespace bbtk bbtkMessage("output",2,p->GetDescription()<AddFactory(GetThisPointer()); +printf("EED Factory::DoLoadPackage > %s %s %s \n",libname.c_str(), pkgname.c_str(),path.c_str()); mPackageMap[pkgname] = p; return true; } @@ -140,6 +141,8 @@ namespace bbtk void Factory::LoadPackage( const std::string& name ) { + + // Note : in the following : // name : the user supplied name // - abreviated name e.g. pkg pkg.so libbpkg libbbpkg.so @@ -149,6 +152,8 @@ namespace bbtk // // lastname : string before the last / (if any), or user supplied name + + if(name != ""){ bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<.so std::string upath; + + pkgname = Utilities::ExtractPackageName(name,upath); + + printf("EED Factory::LoadPackage A. %s\n", name.c_str()); + printf("EED Factory::LoadPackage A. %s\n", upath.c_str()); + printf("EED Factory::LoadPackage A. %s\n", pkgname.c_str()); + bbtkMessage("debug",1,"Package name ["<GetName()<<"\")"<AddFactory(GetThisPointer()); + +printf("EED Factory::InsertPackage %s\n", p->GetName().c_str() ); + mPackageMap[p->GetName()] = p; bbtkDebugDecTab("kernel",9); diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index 749d11a..99a7514 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ Language: C++ - Date: $Date: 2010/09/18 22:31:40 $ - Version: $Revision: 1.91 $ + Date: $Date: 2012/05/30 17:17:00 $ + Version: $Revision: 1.92 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -498,6 +498,7 @@ namespace bbtk void Interpreter::commandLoad(const std::string &packageName) //virtual { + printf("EED Interpreter::commandLoad %s\n", packageName.c_str()); GetExecuter()->LoadPackage(packageName); } diff --git a/kernel/src/bbtkInterpreterVirtual.cxx b/kernel/src/bbtkInterpreterVirtual.cxx index 49d951f..e3ce34b 100644 --- a/kernel/src/bbtkInterpreterVirtual.cxx +++ b/kernel/src/bbtkInterpreterVirtual.cxx @@ -1332,6 +1332,7 @@ namespace bbtk i++) { std::string full_path(*i); +printf("EED InterpreterVirtual::SwitchToFile 1. >>%s\n", full_path.c_str() ); // we *really* want '.' to be the current working directory if (full_path == ".") { @@ -1362,6 +1363,9 @@ namespace bbtk std::vector::iterator i; for (i=script_paths.begin();i!=script_paths.end();i++) { + +printf("EED InterpreterVirtual::SwitchToFile jaja >> %s\n", (*i).c_str() ); + bbtkMessage("interpreter",1, "--> Looking in '" << *i << "'" << std::endl); @@ -1372,6 +1376,9 @@ namespace bbtk for (std::vector::iterator j = Filenames.begin(); j!= Filenames.end(); ++j) { + +printf("EED InterpreterVirtual::SwitchToFile kkkkk >> %s\n", (*j).c_str() ); + int lgr = (*j).size(); if (lgr < 5) continue; // ignore non .bbp file @@ -1466,6 +1473,7 @@ namespace bbtk } std::string tfullPathScriptName = Utilities::MakePkgnameFromPath(path, name, false); + //Addition JCP tfullPathScriptName.size()>=4 if(tfullPathScriptName.size()>=4){ if (tfullPathScriptName.substr(tfullPathScriptName.size()-4, 3)==".bb") @@ -1526,6 +1534,7 @@ namespace bbtk bbtkError("No ["<SetCurrentFileName(fullPathScriptName); if (source) SetCurrentFileName(fullPathScriptName); diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx index 5e927d0..1ec74e2 100644 --- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx +++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx @@ -90,6 +90,11 @@ void GetXCoherentInfoGdcmReader::Process() reader=NULL; } reader = vtkGdcmReader::New(); + + //EED 21 mars 2012 FLIP probleme ..PLOP.. + reader->SetFlipY(false); + + //reader->SetFileName( bbGetInputIn().c_str() ); reader->SetCoherentFileList(l); reader->Update(); diff --git a/packages/vtk/data/hola.mhd b/packages/vtk/data/hola.mhd index e624826..db3c23d 100644 --- a/packages/vtk/data/hola.mhd +++ b/packages/vtk/data/hola.mhd @@ -1,18 +1,18 @@ ObjectType = Image NDims = 3 +BinaryData = True +BinaryDataByteOrderMSB = False +CompressedData = False +TransformMatrix = 1 0 0 0 1 0 0 0 1 +CenterOfRotation = 0 0 0 +ElementSpacing = 0.7 0.7 0.7 DimSize = 127 147 187 +AnatomicalOrientation = ??? ElementType = MET_USHORT -HeaderSize = 0 ElementNumberOfChannels = 1 -ElementSpacing = 0.7 0.7 0.7 -Position = 0 0 0 -TransformMatrix = 1 0 0 0 1 0 0 0 1 Offset = 0 0 0 -CenterOfRotation = 0 0 0 +HeaderSize = 0 -BinaryData = True -BinaryDataByteOrderMSB = False -CompressedData = False ElementDataFile = hola.raw diff --git a/packages/vtk/data/hola.raw b/packages/vtk/data/hola.raw index 9945f10..77b3ddf 100644 Binary files a/packages/vtk/data/hola.raw and b/packages/vtk/data/hola.raw differ diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx index 8ef685a..7345f82 100644 --- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer3D.cxx,v $ Language: C++ - Date: $Date: 2011/05/05 16:07:19 $ - Version: $Revision: 1.21 $ + Date: $Date: 2012/05/30 17:17:02 $ + Version: $Revision: 1.22 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -80,6 +80,8 @@ namespace bbwxvtk camera->SetViewUp ( spx*0, -spy*1, spz*0); camera->SetPosition( spx*(x1+x2)/2, spy*(y1+y2)/2, -spz*10000000); camera->SetFocalPoint ( spx*(x1+x2)/2 , spy*(y1+y2)/2 , spz*0); + + // camera->SetParallelScale( spx*(x2-x1)/2.0 ); renderer->ResetCamera(x1,x2,y1,y2,z1,z2); diff --git a/packages/wxvtk/src/wxvtkImageViewer2.cxx b/packages/wxvtk/src/wxvtkImageViewer2.cxx index 2fac472..45ab995 100644 --- a/packages/wxvtk/src/wxvtkImageViewer2.cxx +++ b/packages/wxvtk/src/wxvtkImageViewer2.cxx @@ -26,7 +26,7 @@ #include "vtkRenderWindowInteractor.h" #include "vtkRenderer.h" -vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.5 $"); +vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.6 $"); vtkStandardNewMacro(wxvtkImageViewer2); //---------------------------------------------------------------------------- @@ -310,26 +310,54 @@ void wxvtkImageViewer2::UpdateOrientation() vtkCamera *cam = this->Renderer ? this->Renderer->GetActiveCamera() : NULL; if (cam) { + +// EED 21 mars FLIP problem ..PLOP.. switch (this->SliceOrientation) - { - case wxvtkImageViewer2::SLICE_ORIENTATION_XY: - cam->SetFocalPoint(0,0,0); - cam->SetPosition(0,0,1); // -1 if medical ? - cam->SetViewUp(0,1,0); - break; - - case wxvtkImageViewer2::SLICE_ORIENTATION_XZ: - cam->SetFocalPoint(0,0,0); - cam->SetPosition(0,-1,0); // 1 if medical ? - cam->SetViewUp(0,0,1); - break; - - case wxvtkImageViewer2::SLICE_ORIENTATION_YZ: - cam->SetFocalPoint(0,0,0); - cam->SetPosition(1,0,0); // -1 if medical ? - cam->SetViewUp(0,0,1); - break; + { + case wxvtkImageViewer2::SLICE_ORIENTATION_YZ: + cam->SetViewUp(0,0,-1); + cam->SetPosition(-1,0,0); // -1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(0,-1,0); // 1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XY: + cam->SetViewUp(0,-1,0); + cam->SetPosition(0,0,-1); + cam->SetFocalPoint(0,0,0); + break; } + +/* + switch (this->SliceOrientation) + { + case wxvtkImageViewer2::SLICE_ORIENTATION_YZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(1,0,0); // -1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XZ: + cam->SetViewUp(0,0,1); + cam->SetPosition(0,-1,0); // 1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + case wxvtkImageViewer2::SLICE_ORIENTATION_XY: + cam->SetViewUp(0,1,0); + cam->SetPosition(0,0,1); // -1 if medical ? + cam->SetFocalPoint(0,0,0); + break; + + + } +*/ + } }