From 89194c974f0b8692e440317daace5ec8064a0b21 Mon Sep 17 00:00:00 2001 From: Juan Prieto Date: Tue, 16 Jun 2009 13:26:31 +0000 Subject: [PATCH] *** empty log message *** --- bbtk/src/bbCreaContournDimensions.cxx | 2 +- .../wxContourMainFrame.cxx | 3 ++- lib/kernel_ManagerContour_NDimensions/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bbtk/src/bbCreaContournDimensions.cxx b/bbtk/src/bbCreaContournDimensions.cxx index 536f1bf..d7ff4b8 100644 --- a/bbtk/src/bbCreaContournDimensions.cxx +++ b/bbtk/src/bbCreaContournDimensions.cxx @@ -30,7 +30,7 @@ void nDimensions::Process() if(currentimg != NULL){ int contourtype = bbGetInputContourType(); //wxContourMainFrame::getInstance()->getValuesXYZ(vectx, vecty, vectz, &size); - wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype); + //wxContourMainFrame::getInstance()->getMaskValue(mask, value, contourtype); } bbSetOutputX(vectx); diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index 4ce7c46..7d2b694 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -99,7 +99,7 @@ char wxContourMainFrame::COPY = 'C'; if(images.size() > 0) { - _images = images; + this->setVectImages(images); } @@ -108,6 +108,7 @@ char wxContourMainFrame::COPY = 'C'; void wxContourMainFrame::setVectImages(std::vector imgs) { + _images = imgs; #if defined(__GNUC__) std::string str_home(getenv("HOME")); #elif defined(_WIN32) diff --git a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt index 8af7af3..0fcd339 100644 --- a/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt +++ b/lib/kernel_ManagerContour_NDimensions/CMakeLists.txt @@ -60,7 +60,7 @@ IF ( BUILD_${LIBRARY_NAME} ) ADD_LIBRARY(${LIBRARY_NAME} STATIC ${${LIBRARY_NAME}_SOURCES}) # LINK - TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES}) + TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES} ) #--------------------------------------------------------------------------- -- 2.47.1