From: Eduardo Davila Date: Thu, 5 Nov 2009 16:21:53 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: CREATOOLS.2-0-3~128 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=b9d9021717d8036639d4e934f0392d2bc7e3fd3f;p=creaMaracasVisu.git *** empty log message *** --- diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt index 5ae2131..017c99b 100644 --- a/install/CMakeLists.txt +++ b/install/CMakeLists.txt @@ -10,8 +10,8 @@ INCLUDE(InstallRequiredSystemLibraries) -SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "creaMaracasVisu - CREATIS-LRMN") -SET(CPACK_PACKAGE_VENDOR "CREATIS-LRMN") +SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PROJECT_NAME} - CREATIS") +SET(CPACK_PACKAGE_VENDOR "CREATIS") SET(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt") SET(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_MAJOR_VERSION}) @@ -36,8 +36,6 @@ FOREACH( iLST ${DATA_FILES} ) ) ENDFOREACH(iLST) -#SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") - #IF (BUILD_BBTK_PACKAGE_creaMaracasVisu) @@ -49,13 +47,13 @@ ENDFOREACH(iLST) #ELSE (BUILD_BBTK_PACKAGE_creaMaracasVisu) IF(WIN32) - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") ELSE(WIN32) - SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/creaMaracasVisu-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") + SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools/${PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") ENDIF(WIN32) IF(WIN32) - SET(CMAKE_INSTALL_PREFIX C:/CreaTools/creaMaracasVisu) + SET(CMAKE_INSTALL_PREFIX C:/CreaTools/${PROJECT_NAME}) ENDIF(WIN32) @@ -68,9 +66,9 @@ IF(WIN32 AND NOT UNIX) # sure there is at least one set of four (4) backlasshes. #EED SET(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}/kernel/install/gnome/bbi-icon2.bmp") # SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin/BBI_EXE.exe") - SET(CPACK_NSIS_DISPLAY_NAME "creaMaracasVisu") - SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/creaMaracasVisu") - SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/creaMaracasVisu") + SET(CPACK_NSIS_DISPLAY_NAME "${PROJECT_NAME}") + SET(CPACK_NSIS_HELP_LINK "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") + SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.creatis.insa-lyon.fr/creatools/${PROJECT_NAME}") SET(CPACK_NSIS_CONTACT "info-dev@creatis.insa-lyon.fr") SET(CPACK_NSIS_MODIFY_PATH ON) ELSE(WIN32 AND NOT UNIX) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp index 7859143..309a4ce 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp @@ -159,9 +159,13 @@ void manualViewContour::RefreshText() // virtual } } - int id = _id_viewPoint_for_text; - double px = _manContModel->GetManualPoint(id)->GetX(); - double py = _manContModel->GetManualPoint(id)->GetY(); + if (_id_viewPoint_for_text>=size) + { + _id_viewPoint_for_text=0; + } + + double px = _manContModel->GetManualPoint(_id_viewPoint_for_text)->GetX(); + double py = _manContModel->GetManualPoint(_id_viewPoint_for_text)->GetY(); //EED 27 sep 2006 px=px*_spc[0]; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx index 9dae456..14a9073 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorScrollZ.cxx @@ -17,7 +17,9 @@ vtkInteractorScrollZ::~vtkInteractorScrollZ() bool vtkInteractorScrollZ::OnRightButtonDown() { vtkRenderWindowInteractor *interactor = _vtkInteractorStyleBaseView->GetInteractor(); +printf("EED %p vtkInteractorScrollZ::OnRightButtonDown A", this ); if ((interactor->GetControlKey()==0) && (interactor->GetShiftKey()==0) ){ +printf("EED %p vtkInteractorScrollZ::OnRightButtonDown B", this ); _stateFordware = true; _fordwareX = interactor->GetEventPosition()[0]; _fordwareY = interactor->GetEventPosition()[1]; @@ -38,6 +40,7 @@ bool vtkInteractorScrollZ::OnRightButtonUp() bool vtkInteractorScrollZ::OnMouseMove () { if (_stateFordware==true){ +printf("EED %p vtkInteractorScrollZ::OnMouseMove \n", this); //int fx = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[0]; // JPRx int fy = _vtkInteractorStyleBaseView->GetInteractor()->GetEventPosition()[1]; int delta = (_fordwareY - fy)/3; diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx index 2e059d0..8cfed90 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/vtkInteractorStyleBaseView.cxx @@ -99,8 +99,9 @@ void vtkInteractorStyleBaseView::RemoveInteractorStyleMaracas(InteractorStyleMa { _lstInteractorStyleMaracas.erase(iter); removed = true; + } else { + iter++; } - iter++; } } //--------------------------------------------------------------------------- @@ -130,8 +131,16 @@ void vtkInteractorStyleBaseView::CallLstInteractorStyleMaracas(int type) for (i=0;iGetActive()==true){ +printf("EED %p vtkInteractorStyleBaseView A i=%d size=%d sizeLst%d\n", this, i, size, _lstInteractorStyleMaracas.size() ); + if (i < _lstInteractorStyleMaracas.size() ) + { + intStyMar = _lstInteractorStyleMaracas[i]; + } else { + intStyMar=NULL; + } +printf("EED %p vtkInteractorStyleBaseView B i=%d size=%d sizeLst%d\n", this, i, size, _lstInteractorStyleMaracas.size() ); + if (intStyMar!=NULL && intStyMar->GetActive()==true){ +printf("EED %p vtkInteractorStyleBaseView C i=%d size=%d sizeLst%d\n", this, i, size, _lstInteractorStyleMaracas.size() ); if (type ==1) { // OnRightButtonDown if (intStyMar->OnRightButtonDown()==false)