SET(BBTK_SHARE_REL_PATH @BBTK_SHARE_REL_PATH@)
SET(BBTK_DOC_REL_PATH @BBTK_DOC_REL_PATH@)
SET(BBTK_BBS_REL_PATH @BBTK_BBS_REL_PATH@)
+SET(BBTK_DATA_REL_PATH @BBTK_DATA_REL_PATH@)
SET(BBTK_CMAKE_REL_PATH @BBTK_CMAKE_REL_PATH@)
SET(BBTK_CMAKE_DIR ${BBTK_DIR}/${BBTK_CMAKE_REL_PATH})
#-----------------------------------------------------------------------------
MESSAGE(STATUS "* BBTK_SHARE_REL_PATH = ${BBTK_SHARE_REL_PATH}")
MESSAGE(STATUS "* BBTK_DOC_REL_PATH = ${BBTK_DOC_REL_PATH}")
MESSAGE(STATUS "* BBTK_BBS_REL_PATH = ${BBTK_BBS_REL_PATH}")
+ MESSAGE(STATUS "* BBTK_DATA_REL_PATH = ${BBTK_DATA_REL_PATH}")
MESSAGE(STATUS "* BBTK_CMAKE_REL_PATH = ${BBTK_CMAKE_REL_PATH}")
ENDIF(FIND_PACKAGE_VERBOSE)
SET(BBTK_USE_WXWIDGETS ON CACHE BOOL "Use wxWidgets" FORCE)
MESSAGE(STATUS "BBTK_USE_WXWIDGETS forced to ON by the compilation of the package ${BBTK_PACKAGE_NAME}")
# bbtk already links against wx ...
- # SET(${BBTK_PACKAGE_NAME}_LIBS
- # ${${BBTK_PACKAGE_NAME}_LIBS}
- # ${BBTK_WXWIDGETS_LIBRARIES}
- # )
+ IF(WIN32)
+ SET(${BBTK_PACKAGE_NAME}_LIBS
+ ${${BBTK_PACKAGE_NAME}_LIBS}
+ ${BBTK_WXWIDGETS_LIBRARIES}
+ )
+ ENDIF(WIN32)
ELSE(BBTK_CORE_PACKAGE)
# If linking against a non-wx bbtk : problem
IF(NOT BBTK_BUILT_WITH_WX)
MESSAGE(FATAL_ERROR "The bbtk package ${BBTK_PACKAGE_NAME} needs wxWidgets however the bbtk library which was found on your system was not compiled with wxWidgets : recompile it and rebuild the package.")
ELSE(NOT BBTK_BUILT_WITH_WX)
SET(USE_WXWIDGETS ON CACHE BOOL "Use wxWidgets" FORCE)
+# bbtk already links against wx ...
+ IF(WIN32)
+ SET(${BBTK_PACKAGE_NAME}_LIBS
+ ${${BBTK_PACKAGE_NAME}_LIBS}
+ ${BBTK_WXWIDGETS_LIBRARIES}
+ )
+ ENDIF(WIN32)
ENDIF(NOT BBTK_BUILT_WITH_WX)
ENDIF(BBTK_CORE_PACKAGE)
ENDIF(${BBTK_PACKAGE_NAME}_USE_WXWIDGETS)
# from build tree root or install tree root
# (different on win/lin)
IF(WIN32)
- SET(BBTK_SHARE_REL_PATH / )
+ SET(BBTK_SHARE_REL_PATH " ")
SET(BBTK_DOC_REL_PATH doc)
SET(BBTK_BBS_REL_PATH bbs)
- # SET(BBTK_RSC_REL_PATH rsc)
SET(BBTK_DATA_REL_PATH data)
ELSE(WIN32)
SET(BBTK_SHARE_REL_PATH share/bbtk)
SET(BBTK_DOC_REL_PATH share/bbtk/doc)
SET(BBTK_BBS_REL_PATH share/bbtk/bbs)
- # SET(BBTK_RSC_REL_PATH share/bbtk/rsc)
SET(BBTK_DATA_REL_PATH share/bbtk/data)
ENDIF(WIN32)
#-----------------------------------------------------------------------------
)
ENDFOREACH(file ${BBTK_CMAKE_FILES})
+ IF(UNIX)
+ SET(PREFIX lib/bbtk/)
+ENDIF(UNIX)
+
INSTALL(
FILES ${BBTK_CMAKE_FILES}
- DESTINATION lib/bbtk/${BBTK_CMAKE_REL_PATH}
+ DESTINATION ${PREFIX}${BBTK_CMAKE_REL_PATH}
)
Program: bbtk
Module: $RCSfile: bbtkBlackBox.cxx,v $
Language: C++
-Date: $Date: 2008/03/07 08:40:14 $
-Version: $Revision: 1.6 $
+Date: $Date: 2008/03/11 18:46:47 $
+Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See doc/license.txt or
namespace bbtk
{
+
+//EED
+ static bool bbmgSomeBoxExecuting = false;
+ static bool bbmgFreezeExecution = false;
+ static std::set<BlackBox*> bbmgExecutionList;
+
+
//=========================================================================
BlackBox::BlackBox(const std::string &name)
: bbmName(name), bbmStatus(MODIFIED),
}
//=========================================================================
+ bool BlackBox::bbGlobalGetSomeBoxExecuting()
+ {
+ return bbmgSomeBoxExecuting;
+ }
+
+ void BlackBox::bbGlobalSetSomeBoxExecuting(bool b)
+ {
+ bbmgSomeBoxExecuting = b;
+ }
+
+ void BlackBox::bbGlobalSetFreezeExecution(bool b)
+ {
+ bbmgFreezeExecution = b;
+ }
+
+ bool BlackBox::bbGlobalGetFreezeExecution()
+ {
+ return bbmgFreezeExecution;
+ }
+
+ void BlackBox::bbGlobalAddToExecutionList( BlackBox* b )
+ {
+ bbmgExecutionList.insert(b);
+ }
+
+
//=========================================================================
// Static members initialization
+/*EED
bool BlackBox::bbmgSomeBoxExecuting = false;
bool BlackBox::bbmgFreezeExecution = false;
std::set<BlackBox*> BlackBox::bbmgExecutionList;
+*/
//=========================================================================
Program: bbtk
Module: $RCSfile: bbtkBlackBox.h,v $
Language: C++
- Date: $Date: 2008/02/20 16:05:38 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2008/03/11 18:46:47 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See doc/license.txt or
#ifndef __bbtkBlackBox_h__
#define __bbtkBlackBox_h__
+#include "bbtkSystem.h"
#include "bbtkBlackBoxDescriptor.h"
//#include "bbtkConnection.h"
#include "bbtkBlackBoxInputConnector.h"
//@}
public:
- static bool bbGlobalGetSomeBoxExecuting()
- { return bbmgSomeBoxExecuting; }
- static void bbGlobalSetSomeBoxExecuting(bool b)
- { bbmgSomeBoxExecuting = b; }
+ static bool bbGlobalGetSomeBoxExecuting();
+ static void bbGlobalSetSomeBoxExecuting(bool b);
-
- static void bbGlobalSetFreezeExecution(bool b) { bbmgFreezeExecution = b;}
- static bool bbGlobalGetFreezeExecution() { return bbmgFreezeExecution; }
+ static void bbGlobalSetFreezeExecution(bool b);
+ static bool bbGlobalGetFreezeExecution();
/// Returns true if the box can "react",
/// which means execute in response to an input change
virtual bool bbCanReact() const;
- static void bbGlobalAddToExecutionList( BlackBox* b )
- {
- bbmgExecutionList.insert(b);
-}
-
+ static void bbGlobalAddToExecutionList( BlackBox* b );
static void bbGlobalProcessExecutionList();
//==================================================================
InputConnectorMapType mInputConnectorMap;
//==================================================================
-
+/*EED
static bool bbmgSomeBoxExecuting;
static bool bbmgFreezeExecution;
-
-
- static std::set<BlackBox*> bbmgExecutionList;
+ static std::set<BlackBox*> bbmgExecutionList;
+*/
};
// Class BlackBox
Program: bbtk
Module: $RCSfile: bbtkSystem.h,v $
Language: C++
- Date: $Date: 2008/01/28 10:49:11 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2008/03/11 18:46:47 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//#include "WWW.h"
#ifdef BBTK_EXPORT_SYMBOLS
#define BBTK_EXPORT __declspec( dllexport )
- #else
+#else
#define BBTK_EXPORT __declspec( dllimport )
#endif
#define BBTK_CDECL __cdecl
namespace bbtk
{
+
+//EED
+ static wxWindow* mgTopWindow = 0;
+ static int mgNbWindowsAlive = 0;
+ static int mgNbWindowsShown = 0;
+
+
void Wx::ResetCursor()
{
if (!GetTopWindow()) return;
//=========================================================================
//=========================================================================
+/*EED
// Static members
wxWindow* Wx::mgTopWindow = 0;
int Wx::mgNbWindowsAlive = 0;
int Wx::mgNbWindowsShown = 0;
+*/
//=========================================================================
+//EED
+ wxWindow* Wx::GetTopWindow()
+ {
+ return mgTopWindow;
+ }
+
+ void Wx::IncNbWindowsAlive()
+ {
+ mgNbWindowsAlive++;
+ }
+
+ int Wx::GetNbWindowsAlive()
+ {
+ return mgNbWindowsAlive;
+ }
+
+ bool Wx::IsSomeWindowAlive()
+ {
+ return (mgNbWindowsAlive>0);
+ }
+
+ void Wx::IncNbWindowsShown()
+ {
+ mgNbWindowsShown++;
+ }
+
+ int Wx::GetNbWindowsShown()
+ {
+ return mgNbWindowsShown;
+ }
+ bool Wx::IsSomeWindowShown()
+ {
+ return (mgNbWindowsShown>0);
+ }
}
static int mBeginBusyCallsCount;
/// Returns the global parent of all bbtk windows
- static wxWindow* GetTopWindow() { return mgTopWindow; }
+ static wxWindow* GetTopWindow();
/// Sets the global parent of all bbtk windows
static void SetTopWindow(wxWindow*);
- static void IncNbWindowsAlive() { mgNbWindowsAlive++; }
+ static void IncNbWindowsAlive();
static void DecNbWindowsAlive();
- static int GetNbWindowsAlive() { return mgNbWindowsAlive; }
- static bool IsSomeWindowAlive() { return (mgNbWindowsAlive>0);}
+ static int GetNbWindowsAlive();
+ static bool IsSomeWindowAlive();
- static void IncNbWindowsShown() { mgNbWindowsShown++; }
+ static void IncNbWindowsShown();
static void DecNbWindowsShown();
- static int GetNbWindowsShown() { return mgNbWindowsShown; }
- static bool IsSomeWindowShown() { return (mgNbWindowsShown>0);}
+ static int GetNbWindowsShown();
+ static bool IsSomeWindowShown();
+/*EED
private:
static wxWindow* mgTopWindow;
static int mgNbWindowsAlive;
static int mgNbWindowsShown;
-
+*/
}; // struct Wx
//==================================================================
-
+
+
//==================================================================
/// Conversion std::string to wxString
inline wxString std2wx(const std::string& s){
git://git.creatis.insa-lyon.fr / bbtk.git / commitdiff