[med-svn] [Git][med-team/sight][master] 2 commits: Update changelog
Flavien Bridault
gitlab at salsa.debian.org
Mon Sep 2 16:06:57 BST 2019
Flavien Bridault pushed to branch master at Debian Med / sight
Commits:
98e4cb0b by Flavien Bridault at 2019-09-02T06:41:56Z
Update changelog
- - - - -
e6e61d5b by Flavien Bridault at 2019-09-02T15:06:49Z
Fix patches
- - - - -
3 changed files:
- debian/changelog
- debian/patches/revert_qVTK_widget.patch
- debian/patches/skip_conan_deps.patch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+sight (19.0.0-1) UNRELEASED; urgency=medium
+
+ * New upstream version
+
+ -- Flavien Bridault <fbridault at ircad.fr> Mon, 02 Sep 2019 06:41:05 +0000
+
sight (18.1.0-1) unstable; urgency=medium
[ Andreas Tille ]
=====================================
debian/patches/revert_qVTK_widget.patch
=====================================
@@ -35,7 +35,7 @@ Description: Revert QVTKOpenGLWidget usage that do no exist in VTK 6.3
private:
- QPointer<QVTKOpenGLNativeWidget> m_QVTKOpenGLWidget;
-+ QPointer<QVTKWidget> m_QVTKOpenGLWidget;
++ QPointer<QVTKWidget> m_qVTKWidget;
vtkRenderWindowInteractor* m_interactor;
@@ -82,6 +82,15 @@ Description: Revert QVTKOpenGLWidget usage that do no exist in VTK 6.3
SLM_TRACE_FUNC();
--- sight.orig/Bundles/visu/visuVTKQt/src/visuVTKQt/VtkRenderWindowInteractorManager.cpp
+++ sight/Bundles/visu/visuVTKQt/src/visuVTKQt/VtkRenderWindowInteractorManager.cpp
+@@ -39,7 +39,7 @@
+ #include <QMimeData>
+ #include <QSurfaceFormat>
+ #include <QVBoxLayout>
+-#include <QVTKOpenGLNativeWidget.h>
++#include <QVTKWidget.h>
+ #include <vtkGenericOpenGLRenderWindow.h>
+ #include <vtkRenderer.h>
+ #include <vtkRenderWindow.h>
@@ -119,25 +119,22 @@
SLM_ASSERT("Invalid parent.", _parent );
m_parentContainer = ::fwGuiQt::container::QtContainer::dynamicCast( _parent );
@@ -127,3 +136,61 @@ Description: Revert QVTKOpenGLWidget usage that do no exist in VTK 6.3
m_parentContainer->clean();
}
+--- sight.orig/SrcLib/visu/fwRenderVTK/include/fwRenderVTK/vtk/fwVtkCellPicker.hpp
++++ sight/SrcLib/visu/fwRenderVTK/include/fwRenderVTK/vtk/fwVtkCellPicker.hpp
+@@ -93,7 +93,7 @@
+ int SubId; // picked cell subId
+ double PCoords[3]; // picked cell parametric coordinates
+
+- virtual double IntersectWithLine(const double p1[3], const double p2[3], double tol,
++ virtual double IntersectWithLine(double p1[3], double p2[3], double tol,
+ vtkAssemblyPath* path, vtkProp3D* p,
+ vtkAbstractMapper3D* m) override;
+ void Initialize() override;
+--- sight.orig/SrcLib/visu/fwRenderVTK/src/fwRenderVTK/vtk/fwVtkCellPicker.cpp
++++ sight/SrcLib/visu/fwRenderVTK/src/fwRenderVTK/vtk/fwVtkCellPicker.cpp
+@@ -76,7 +76,7 @@
+
+ //------------------------------------------------------------------------------
+
+-double fwVtkCellPicker::IntersectWithLine(const double p1[], const double p2[], double tol,
++double fwVtkCellPicker::IntersectWithLine(double p1[], double p2[], double tol,
+ vtkAssemblyPath* path,
+ vtkProp3D* prop3D,
+ vtkAbstractMapper3D* m)
+--- sight.orig/Bundles/visu/visuVTKAdaptor/src/visuVTKAdaptor/SMaterial.cpp
++++ sight/Bundles/visu/visuVTKAdaptor/src/visuVTKAdaptor/SMaterial.cpp
+@@ -1,3 +1,4 @@
++
+ /************************************************************************
+ *
+ * Copyright (C) 2009-2019 IRCAD France
+@@ -177,7 +178,7 @@
+ vtkTex = vtkSmartPointer< vtkTexture >::New();
+ vtkTex->SetInputData(vtkImage);
+ vtkTex->SetLookupTable(lut);
+- vtkTex->SetColorMode(VTK_COLOR_MODE_MAP_SCALARS);
++ vtkTex->SetMapColorScalarsThroughLookupTable(1);
+ }
+ else
+ {
+--- sight.orig/Bundles/visu/visuVTKAdaptor/src/visuVTKAdaptor/SSnapshot.cpp
++++ sight/Bundles/visu/visuVTKAdaptor/src/visuVTKAdaptor/SSnapshot.cpp
+@@ -101,7 +101,7 @@
+ ::fwData::Image::sptr imageToSnap = ::fwData::Image::New();
+
+ vtkWindowToImageFilter* snapper = vtkWindowToImageFilter::New();
+- snapper->SetScale( 1 );
++ snapper->SetMagnification( 1 );
+ snapper->SetInput( this->getRenderer()->GetRenderWindow() );
+ snapper->Update();
+
+@@ -148,7 +148,7 @@
+ }
+
+ vtkWindowToImageFilter* snapper = vtkWindowToImageFilter::New();
+- snapper->SetScale( 1 );
++ snapper->SetMagnification( 1 );
+ snapper->SetInput( this->getRenderer()->GetRenderWindow() );
+
+ writer->SetInputConnection( snapper->GetOutputPort() );
=====================================
debian/patches/skip_conan_deps.patch
=====================================
@@ -21,7 +21,7 @@
+
+ execute_process( COMMAND uname -m COMMAND tr -d '\n' OUTPUT_VARIABLE ARCHITECTURE )
+
-+ set(CPACK_PACKAGE_FILE_NAME "${PRJ_NAME}-${VERSION}-linux_${ARCHITECTURE}-Sight_${GIT_TAG}")
++ set(CPACK_PACKAGE_FILE_NAME "${PRJ_NAME}-${VERSION}-linux_${ARCHITECTURE}")
+ set(CPACK_PACKAGE_VENDOR "IRCAD-IHU")
+ set(CPACK_PACKAGE_NAME "${PRJ_NAME}")
+ set(CPACK_PACKAGE_VERSION "${VERSION}")
@@ -43,3 +43,58 @@
if("${${PRJ_NAME}_TYPE}" STREQUAL "APP")
string(TOLOWER ${PRJ_NAME} APP_NAME)
configure_file(${FWCMAKE_RESOURCE_PATH}/install/linux/template.sh.in ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME} @ONLY)
+--- sight.orig/CMake/build/SightConfig.cmake.in
++++ sight/CMake/build/SightConfig.cmake.in
+@@ -13,6 +13,9 @@
+ add_definitions(${CONAN_DEFINES})
+ set(FW_CONAN_CONFIGURED 1)
+ endif()
++else()
++ string(TOLOWER ${PRJ_NAME} APP_NAME)
++ configure_file(${FWCMAKE_RESOURCE_PATH}/install/linux/template.sh.in ${CMAKE_CURRENT_BINARY_DIR}/${APP_NAME} @ONLY)
+ endif()
+
+ setExternalLibrariesDir()
+--- sight.orig/CMake/install/generic_install.cmake
++++ sight/CMake/install/generic_install.cmake
+@@ -10,7 +10,7 @@
+
+ macro(generic_install)
+
+- if(BUILD_SDK)
++ if(BUILD_SDK AND NOT USE_SYSTEM_LIB)
+ installConanDepsForSDK("${CONAN_DEPS_LIST}")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GIT_TAG_MAJOR})
+ set(CPACK_PACKAGE_VERSION_MINOR ${GIT_TAG_MINOR})
+@@ -20,7 +20,9 @@
+ set(CPACK_GENERATOR TGZ)
+ include(CPack)
+ else()
+- install_qt_plugins()
++ if(NOT USE_SYSTEM_LIB)
++ install_qt_plugins()
++ endif()
+ if(APPLE)
+ osx_install(${FWPROJECT_NAME})
+ elseif(WIN32)
+--- sight.orig/CMake/build/macros.cmake
++++ sight/CMake/build/macros.cmake
+@@ -32,7 +32,10 @@
+ include(${FWCMAKE_BUILD_FILES_DIR}/plugin_config.cmake)
+ include(${FWCMAKE_BUILD_FILES_DIR}/profile_config.cmake)
+ include(${FWCMAKE_INSTALL_FILES_DIR}/generic_install.cmake)
+-include(${FWCMAKE_INSTALL_FILES_DIR}/get_git_rev.cmake)
++
++if(NOT FW_BUILD_EXTERNAL)
++ include(${FWCMAKE_INSTALL_FILES_DIR}/get_git_rev.cmake)
++endif()
+
+ file(REMOVE "${CMAKE_BINARY_DIR}/cmake/SightRequirements.cmake")
+
+@@ -1051,4 +1054,4 @@
+ target_compile_options(${PROJECT} PRIVATE "-Werror")
+ endif ()
+ endif()
+-endmacro()
+\ No newline at end of file
++endmacro()
View it on GitLab: https://salsa.debian.org/med-team/sight/compare/cc00952e23b249d56188e519fca5f32c9bb56923...e6e61d5b7e2d90a7b404d903b37f5777cb5d1343
--
View it on GitLab: https://salsa.debian.org/med-team/sight/compare/cc00952e23b249d56188e519fca5f32c9bb56923...e6e61d5b7e2d90a7b404d903b37f5777cb5d1343
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20190902/6a15c86f/attachment-0001.html>
More information about the debian-med-commit
mailing list