ADD_EXECUTABLE(bbPackageBrowser WIN32 ${SOURCES})
# SET_TARGET_PROPERTIES(bbPackageBrowser PROPERTIES LINK_FLAGS /subsystem:console )
ELSE(BBTK_USE_WXWIDGETS AND WIN32)
- ADD_EXECUTABLE(bbPackageBrowser ${SOURCES})
+ ADD_EXECUTABLE(bbPackageBrowser MACOSX_BUNDLE ${SOURCES})
ENDIF(BBTK_USE_WXWIDGETS AND WIN32)
ADD_EXECUTABLE(bbStudio WIN32 ${SOURCES})
SET_TARGET_PROPERTIES(bbStudio PROPERTIES LINK_FLAGS /subsystem:console )
ELSE(BBTK_USE_WXWIDGETS AND WIN32)
- ADD_EXECUTABLE(bbStudio ${SOURCES} )
+ ADD_EXECUTABLE(bbStudio MACOSX_BUNDLE ${SOURCES} )
ENDIF(BBTK_USE_WXWIDGETS AND WIN32)
ADD_EXECUTABLE(bbi WIN32 ${SOURCES})
SET_TARGET_PROPERTIES(bbi PROPERTIES LINK_FLAGS /subsystem:console )
ELSE(BBTK_USE_WXWIDGETS AND WIN32)
- ADD_EXECUTABLE(bbi ${SOURCES})
+ ADD_EXECUTABLE(bbi MACOSX_BUNDLE ${SOURCES})
ENDIF(BBTK_USE_WXWIDGETS AND WIN32)
// main frame
bool wxBBIApp::OnInit( )
{
- // std::cout << "OnInit"<<std::endl;
+ std::cout << "OnInit"<<std::endl;
wxApp::OnInit();
#ifdef __WXGTK__
//See http://www.wxwindows.org/faqgtk.htm#locale
{
// std::cout << "!I->Close"<<std::endl;
}
+
+ std::cout << "EO OnInit"<<std::endl;
+
return true;
}
int main(int argc, char* argv[])
-{
+{
wxMessageOutput::Set( new wxMessageOutputBest );
wxCmdLineParser parser(cmdLineDesc,argc,argv);
ADD_DEF( BBTK_COMPILE_ERROR_MESSAGES )
ENDIF (BBTK_COMPILE_ERROR_MESSAGES)
#-----------------------------------------------------------------------------
+
+IF (APPLE)
+ ADD_DEF(MACOSX)
+ENDIF(APPLE)
+#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Path for binaries
-IF(WIN32)
+IF(WIN32) # OR APPLE)
SET (EXECUTABLE_OUTPUT_REL_PATH "")
SET (LIBRARY_OUTPUT_REL_PATH "")
- SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
-ELSE(WIN32)
+ IF(WIN32)
+ SET (ADDITIONAL_DLL_PATH "C:/CreaTools/lib" CACHE PATH "Additional paths in which to look for dlls")
+ ENDIF(WIN32)
+ELSE(WIN32) # OR APPLE)
SET (EXECUTABLE_OUTPUT_REL_PATH bin)
SET (LIBRARY_OUTPUT_REL_PATH bin)
-ENDIF(WIN32)
+ENDIF(WIN32) # OR APPLE)
SET (EXECUTABLE_OUTPUT_PATH
${PROJECT_BINARY_DIR}/${EXECUTABLE_OUTPUT_REL_PATH})
SET(BBTK_BBFY ${BBTK_BIN_PATH}/bbfy.exe)
ELSE(WIN32)
SET(BBTK_LIB_PATH lib)
- SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
+# For Xcode : have to test the cmake generator !
+# IF (APPLE)
+# SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH}/Debug)
+# ELSE(APPLE)
+ SET(BBTK_BIN_PATH ${EXECUTABLE_OUTPUT_PATH})
+# ENDIF(APPLE)
SET(BBTK_BBI ${BBTK_BIN_PATH}/bbi)
SET(BBTK_BBS2CPP ${BBTK_BIN_PATH}/bbs2cpp)
SET(BBTK_BBC ${BBTK_BIN_PATH}/bbc)
<H1>Help Contents</H1>
-<a href="bbdoc/index-category.html#demo">Demos</a><br>
-<a href="bbdoc/index-category.html#example">Examples</a>
+<a href="bbdoc/index-category.html#demo" target="information">Demos</a><br>
+<a href="bbdoc/index-category.html#example" target="information">Examples</a>
<H2>Guides</H2>
Program: bbtk
Module: $RCSfile: bbtkConfigurationFile.cxx,v $
Language: C++
- Date: $Date: 2008/11/03 15:53:31 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2008/11/12 12:47:00 $
+ Version: $Revision: 1.21 $
=========================================================================*/
/* ---------------------------------------------------------------------
#include "bbtkUtilities.h"
#if defined(WIN32)
-#include <direct.h> // for getcwd
+# include <direct.h> // for getcwd
+# include <windows.h>
#endif
+#if defined(MACOSX) // assume this is OSX
+# include <sys/param.h>
+# include <mach-o/dyld.h> // _NSGetExecutablePath : must add -framework CoreFoundation to link line
+# include <string.h>
+# ifndef PATH_MAX
+# define PATH_MAX MAXPATHLEN
+# endif
+#endif // MACOSX
+
+#ifndef PATH_MAX // If not defined yet : do it
+# define PATH_MAX 2048
+#endif
namespace bbtk
// ==> Set system paths
mBin_path = GetExecutablePath();
//EED mInstall_path = mBin_path + mFile_separator + "..";
- mInstall_path = mBin_path + "/..";
- // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
+#ifdef MACOSX
+ mInstall_path = mBin_path + "/../../../..";
+#else
+ mInstall_path = mBin_path + "/..";
+#endif
+ // The relative path to the doc folder (=BBTK_DOC_REL_PATH)
mDoc_rel_path = BBTK_STRINGIFY_SYMBOL(BBTK_DOC_REL_PATH);
// The path to the doc folder (=mInstall_path+"/"+mDoc_rel_path)
//EED mDoc_path = mInstall_path + mFile_separator + mDoc_rel_path;
}
//=========================================================================
+
+
+ //=========================================================================
+ // From http://www.fltk.org/newsgroups.php?gfltk.general+v:22083
+ //
+ int get_app_path (char *pname, size_t pathsize)
+ {
+#ifdef LINUX
+ /* Oddly, the readlink(2) man page says no NULL is appended. */
+ /* So you have to do it yourself, based on the return value: */
+ pathsize --; /* Preserve a space to add the trailing NULL */
+ long result = readlink("/proc/self/exe", pname, pathsize);
+ if (result > 0)
+ {
+ pname[result] = 0; /* add the #@!%ing NULL */
+
+ if ((access(pname, 0) == 0))
+ return 0; /* file exists, return OK */
+ /*else name doesn't seem to exist, return FAIL (falls
+ through) */
+ }
+#endif /* LINUX */
+
+#ifdef WIN32
+ long result = GetModuleFileName(NULL, pname, pathsize);
+ if (result > 0)
+ {
+ /* fix up the dir slashes... */
+ int len = strlen(pname);
+ int idx;
+ for (idx = 0; idx < len; idx++)
+ {
+ if (pname[idx] == '\\') pname[idx] = '/';
+ }
+ if ((access(pname, 0) == 0))
+ return 0; /* file exists, return OK */
+ /*else name doesn't seem to exist, return FAIL (falls
+ through) */
+ }
+#endif /* WIN32 */
+
+#ifdef SOLARIS
+ char *p = getexecname();
+ if (p)
+ {
+ /* According to the Sun manpages, getexecname will
+ "normally" return an */
+ /* absolute path - BUT might not... AND that IF it is not,
+ pre-pending */
+ /* getcwd() will "usually" be the correct thing... Urgh!
+ */
+
+ /* check pathname is absolute (begins with a / ???) */
+ if (p[0] == '/') /* assume this means we have an
+ absolute path */
+ {
+ strncpy(pname, p, pathsize);
+ if ((access(pname, 0) == 0))
+ return 0; /* file exists, return OK */
+ }
+ else /* if not, prepend getcwd() then check if file
+ exists */
+ {
+ getcwd(pname, pathsize);
+ long result = strlen(pname);
+ strncat(pname, "/", (pathsize - result));
+ result ++;
+ strncat(pname, p, (pathsize - result));
+
+ if ((access(pname, 0) == 0))
+ return 0; /* file exists, return OK */
+ /*else name doesn't seem to exist, return FAIL
+ (falls through) */
+ }
+ }
+#endif /* SOLARIS */
+
+#ifdef MACOSX /* assume this is OSX */
+ /*
+ from http://www.hmug.org/man/3/NSModule.html
+
+ extern int _NSGetExecutablePath(char *buf, unsigned long
+ *bufsize);
+
+ _NSGetExecutablePath copies the path of the executable
+ into the buffer and returns 0 if the path was successfully
+ copied in the provided buffer. If the buffer is not large
+ enough, -1 is returned and the expected buffer size is
+ copied in *bufsize. Note that _NSGetExecutablePath will
+ return "a path" to the executable not a "real path" to the
+ executable. That is the path may be a symbolic link and
+ not the real file. And with deep directories the total
+ bufsize needed could be more than MAXPATHLEN.
+ */
+ int status = -1;
+ char *given_path = (char*)malloc(MAXPATHLEN * 2);
+ if (!given_path) return status;
+
+ uint32_t npathsize = MAXPATHLEN * 2;
+ long result = _NSGetExecutablePath(given_path, &npathsize);
+ if (result == 0)
+ { /* OK, we got something - now try and resolve the real path...
+ */
+ if (realpath(given_path, pname) != NULL)
+ {
+ if ((access(pname, 0) == 0))
+ status = 0; /* file exists, return OK */
+ }
+ }
+ free (given_path);
+ return status;
+#endif /* MACOSX */
+
+ return -1; /* Path Lookup Failed */
+ }
+
+
//=========================================================================
std::string ConfigurationFile::GetExecutablePath()
{
+ char name[PATH_MAX];
+ int err = get_app_path(name, PATH_MAX);
+ if (err)
+ {
+ bbtkError("Could not determine current executable path ?");
+ }
+
+ // remove the exe name
+ char *slash;
+ slash = strrchr(name, VALID_FILE_SEPARATOR_CHAR);
+ if (slash)
+ {
+ *slash = 0;
+ }
+ return name;
+ }
+
+/*
/// \todo : Think to delete it!
char *buf = (char *)malloc(512);
+ if (!buf)
+ {
+ bbtkError("Could not allocate 512 bytes !");
+ }
char *slash;
#if defined(WIN32)
{
*slash = 0;
}
-#elif defined(__GNUC__)
+#endif
+
+
+#if defined(__GNUC__)
int res;
res = readlink("/proc/self/exe", buf, 512);
if (res == -1)
- return "";
+ {
+ free(buf);
+
+ }
buf[res] = 0;
slash = strrchr(buf, '/');
if (slash)
{
*slash = 0;
}
-#else
- return "";
#endif
std::string ret(buf);
free(buf);
return ret;
}
//=========================================================================
-
+*/
//=========================================================================
void ConfigurationFile::InstallPath ()
Program: bbtk
Module: $RCSfile: bbtkSystem.h,v $
Language: C++
- Date: $Date: 2008/10/17 08:18:14 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2008/11/12 12:47:01 $
+ Version: $Revision: 1.10 $
=========================================================================*/
/* ---------------------------------------------------------------------
#if defined(_WIN32)
#define VALID_FILE_SEPARATOR "\\"
#define INVALID_FILE_SEPARATOR "/"
+#define VALID_FILE_SEPARATOR_CHAR '\\'
+#define INVALID_FILE_SEPARATOR_CHAR '/'
#else
#define INVALID_FILE_SEPARATOR "\\"
#define VALID_FILE_SEPARATOR "/"
+#define INVALID_FILE_SEPARATOR_CHAR '\\'
+#define VALID_FILE_SEPARATOR_CHAR '/'
#endif
#endif
Program: bbtk
Module: $RCSfile: bbtkUtilities.cxx,v $
Language: C++
- Date: $Date: 2008/10/17 08:18:14 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2008/11/12 12:47:01 $
+ Version: $Revision: 1.8 $
=========================================================================*/
/* ---------------------------------------------------------------------
else
libname += "libbb";
libname += pkgname;
- libname += ".so";
-
+#if defined(MACOSX)
+ libname += ".dylib";
+#else
+ libname += ".so";
+#endif
+
#elif defined(_WIN32)
if (c != '\\')
libname = path+"\\bb";
Program: bbtk
Module: $RCSfile: bbitkBinaryThresholdImageFilter.h,v $
Language: C++
- Date: $Date: 2008/10/17 08:18:21 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2008/11/12 12:47:03 $
+ Version: $Revision: 1.9 $
=========================================================================*/
/* ---------------------------------------------------------------------
typedef BinaryThresholdImageFilter<T> FilterType;
typename FilterType::Pointer f = FilterType::New("Temp");
- f->bbSetInputIn( this->bbGetInputIn().get<T*>());
+ typedef T* TPointer;
+ f->bbSetInputIn( this->bbGetInputIn().get < TPointer > ());
f->bbSetInputLowerThreshold ( (typename T::PixelType)
this->bbGetInputLowerThreshold() );
f->bbSetInputUpperThreshold ( (typename T::PixelType)
Program: bbtk
Module: $RCSfile: bbitkExtractImageFilter.h,v $
Language: C++
- Date: $Date: 2008/10/17 08:18:21 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2008/11/12 12:47:03 $
+ Version: $Revision: 1.9 $
=========================================================================*/
/* ---------------------------------------------------------------------
typedef T ImageType;
typedef ExtractImageFilter<ImageType> FilterType;
typename FilterType::Pointer f = FilterType::New("Temp");
- f->bbSetInputIn( this->bbGetInputIn().unsafe_get<T*>() );
+ typedef ImageType* ImageTypePointer;
+ f->bbSetInputIn( this->bbGetInputIn().unsafe_get<ImageTypePointer>() );
f->bbSetInputExtractionRegion ( this->bbGetInputRegion().get<typename T::RegionType>() );
f->bbExecute();
f->bbGetOutputOut()->Register();
Program: bbtk
Module: $RCSfile: bbitkvtkitkImage2vtkImageData.cxx,v $
Language: C++
- Date: $Date: 2008/10/17 08:18:24 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2008/11/12 12:47:05 $
+ Version: $Revision: 1.6 $
=========================================================================*/
/* ---------------------------------------------------------------------
template<class T>
void itkImage2vtkImageData::Convert()
- {
+ {
bbtkDebugMessage("process",5,"==> ["<<bbGetFullName()<<"] : Convert<"
<<bbtk::TypeName<T>()
<<">()"<<std::endl);
typedef T itkImageType;
+ typedef itkImageType* itkImageTypePointer;
typedef itk::ImageToVTKImageFilter< itkImageType > ItkToVtkConnection;
typename ItkToVtkConnection::Pointer conv;
bbtkDebugMessage("process",5," ["<<bbGetFullName()<<"] : No converter yet : creating it"<<std::endl);
conv = ItkToVtkConnection::New();
mConverter = conv;
- conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+ conv->SetInput( this->bbGetInputIn().get< itkImageTypePointer >() );
}
else
{
mConverter->UnRegister();
conv = ItkToVtkConnection::New();
mConverter = conv;
- conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+ conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
}
// Input image type did not change but input image pointer did:
// set new input
- else if ( this->bbGetInputIn().get<itkImageType*>()
+ else if ( this->bbGetInputIn().get<itkImageTypePointer>()
!= (itkImageType*)(conv->GetExporter()->GetInputs()[0].GetPointer()))
{
bbtkDebugMessage("process",5," ["<<bbGetFullName()<<"] : Converter input changed : resetting it"<<std::endl);
- conv->SetInput( this->bbGetInputIn().get<itkImageType*>() );
+ conv->SetInput( this->bbGetInputIn().get<itkImageTypePointer>() );
}
else
{
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff