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)
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 $
=========================================================================*/
/* ---------------------------------------------------------------------
bbtkMessage("output",2,p->GetDescription()<<std::endl);
//===================================================================
p->AddFactory(GetThisPointer<Factory>());
+printf("EED Factory::DoLoadPackage > %s %s %s \n",libname.c_str(), pkgname.c_str(),path.c_str());
mPackageMap[pkgname] = p;
return true;
}
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
//
// lastname : string before the last / (if any), or user supplied name
+
+
if(name != ""){
bbtkDebugMessageInc("kernel",7,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
bbtkMessage("debug",1,"Factory::LoadPackage(\""<<name<<"\")"<<std::endl);
std::string pkgname; // e.g. libbb<pkgname>.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 ["<<pkgname<<"]"<<std::endl);
bbtkMessage("debug",1,"Package path ["<<upath<<"]"<<std::endl);
// no loading package if already loaded
PackageMapType::iterator iUnload;
iUnload = mPackageMap.find(pkgname);
+
+ PackageMapType::iterator it;
+std::cout << "EED Factory::LoadPackage PackageMap ";
+ for ( it=mPackageMap.begin() ; it != mPackageMap.end(); it++ )
+ std::cout << (*it).first << " ";
+ std::cout << std::endl;
if (iUnload != mPackageMap.end())
{
// *all* the cases. JP
//==================================================
- //std::cout << "upath [" << upath << "]" << std::endl;
+ printf("\nEED Factory::LoadPackage B. %s\n\n", name.c_str());
+ //std::cout << "upath [" << name << "]" << std::endl;
bool ok = false;
bool foundFile = false;
p->GetName()<<"\")"<<std::endl);
p->AddFactory(GetThisPointer<Factory>());
+
+printf("EED Factory::InsertPackage %s\n", p->GetName().c_str() );
+
mPackageMap[p->GetName()] = p;
bbtkDebugDecTab("kernel",9);
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 $
=========================================================================*/
/* ---------------------------------------------------------------------
void Interpreter::commandLoad(const std::string &packageName) //virtual
{
+ printf("EED Interpreter::commandLoad %s\n", packageName.c_str());
GetExecuter()->LoadPackage(packageName);
}
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 == ".")
{
std::vector<std::string>::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);
for (std::vector<std::string>::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
}
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")
bbtkError("No ["<<pkgname<<".bbs/.bbp] script found");
return;
} else {
+//EED printf("EED D. SwitchToFile %s\n", fullPathScriptName.c_str() );
LoadScript(fullPathScriptName,name);
//EED Borrame if (source) GetExecuter()->SetCurrentFileName(fullPathScriptName);
if (source) SetCurrentFileName(fullPathScriptName);
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();
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
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
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);
#include "vtkRenderWindowInteractor.h"
#include "vtkRenderer.h"
-vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.5 $");
+vtkCxxRevisionMacro(wxvtkImageViewer2, "$Revision: 1.6 $");
vtkStandardNewMacro(wxvtkImageViewer2);
//----------------------------------------------------------------------------
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;
+
+
+ }
+*/
+
}
}
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff