Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Change assets location
· 711905b9
Shayan Doust
authored
Aug 31, 2019
711905b9
Change data relative location for test suite
· ccebeb27
Shayan Doust
authored
Sep 01, 2019
ccebeb27
Show whitespace changes
Inline
Side-by-side
debian/libfast-examples.install
View file @
ccebeb27
...
...
@@ -19,8 +19,6 @@ debian/tmp/usr/fast/bin/neuralNetworkCTSegmentation usr/lib/fast
debian
/
tmp
/
usr
/
fast
/
bin
/
neuralNetworkUltrasoundSegmentation
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
neuralNetworkWSIClassification
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
NonLocalMeans2D
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
qtInteroperability
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
seededRegionGrowingSegmentation
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
simpleGUI
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
streamImagesFromDisk
usr
/
lib
/
fast
debian
/
tmp
/
usr
/
fast
/
bin
/
testFAST
usr
/
lib
/
fast
debian/patches/modify_assets_location.patch
View file @
ccebeb27
Index: fast/source/FAST/Config.cpp
===================================================================
--- fast.orig/source/FAST/Config.cpp 2019-08-31 05:16:29.263196520 +0100
+++ fast/source/FAST/Config.cpp 2019-08-31 05:16:29.259196536 +0100
@@ -78,7 +78,7 @@
mTestDataPath = getPath() + "../data/";
--- fast.orig/source/FAST/Config.cpp 2019-09-01 14:13:34.474079768 +0100
+++ fast/source/FAST/Config.cpp 2019-09-01 14:15:00.472653570 +0100
@@ -75,10 +75,10 @@
return;
// Set default paths
- mTestDataPath = getPath() + "../data/";
+ mTestDataPath = getPath() + "../usr/lib/fast/data/";
mKernelSourcePath = getPath() + "../source/FAST/";
mKernelBinaryPath = getPath() + "kernel_binaries/";
- mDocumentationPath = getPath() + "../doc/";
+ mDocumentationPath = getPath() + "../usr/share/
doc/
fast/assets/";
+ mDocumentationPath = getPath() + "../usr/share/fast/assets/";
mPipelinePath = getPath() + "../pipelines/";
#ifdef WIN32
mLibraryPath = getPath() + "/bin/";
@@ -199,7 +199,7 @@
mTestDataPath = getPath() + "../data/";
@@ -196,10 +196,10 @@
mBasePath = path;
if (mBasePath[mBasePath.size() - 1] != '/')
mBasePath += "/";
- mTestDataPath = getPath() + "../data/";
+ mTestDataPath = getPath() + "../usr/lib/fast/data/";
mKernelSourcePath = getPath() + "../source/FAST/";
mKernelBinaryPath = getPath() + "kernel_binaries/";
- mDocumentationPath = getPath() + "../doc/";
+ mDocumentationPath = getPath() + "../usr/share/
doc/
fast/assets/";
+ mDocumentationPath = getPath() + "../usr/share/fast/assets/";
mPipelinePath = getPath() + "../pipelines/";
loadConfiguration();
}
Index: fast/source/FAST/Visualization/Window.cpp
===================================================================
--- fast.orig/source/FAST/Visualization/Window.cpp 2019-0
8-31 00:17:50.187752432
+0100
+++ fast/source/FAST/Visualization/Window.cpp 2019-0
8-31 05:18:33.434721458
+0100
--- fast.orig/source/FAST/Visualization/Window.cpp 2019-0
9-01 14:13:34.474079768
+0100
+++ fast/source/FAST/Visualization/Window.cpp 2019-0
9-01 14:13:34.470079733
+0100
@@ -121,9 +121,9 @@
QApplication::setWindowIcon(QIcon((Config::getDocumentationPath() + "images/fast_icon.png").c_str()));
...
...
debian/patches/modify_libs_and_output.patch
View file @
ccebeb27
...
...
@@ -5,8 +5,8 @@ Author: Shayan Doust <hello@shayandoust.me>
Index: fast/CMakeLists.txt
===================================================================
--- fast.orig/CMakeLists.txt 2019-08-31
03:5
3:
2
1.
358279557
+0100
+++ fast/CMakeLists.txt 2019-08-31
03:53:45.362187721
+0100
--- fast.orig/CMakeLists.txt 2019-08-31
12:1
3:
1
1.
067543072
+0100
+++ fast/CMakeLists.txt 2019-08-31
12:13:59.735356876
+0100
@@ -34,7 +34,7 @@
option(FAST_MODULE_WholeSlideImaging "Build whole slide imaging module" OFF)
option(FAST_MODULE_Clarius "Build clarius ultrasound module" OFF)
...
...
@@ -56,13 +56,12 @@ Index: fast/CMakeLists.txt
## Build test executable
if(FAST_BUILD_TESTS)
add_executable(testFAST ${FAST_TEST_SOURCE_FILES} source/FAST/Algorithms/CoherentPointDrift/Rigid.cpp source/FAST/Algorithms/CoherentPointDrift/Rigid.hpp source/FAST/Algorithms/CoherentPointDrift/Affine.cpp source/FAST/Algorithms/CoherentPointDrift/Affine.hpp)
@@ -242,6 +263,1
1
@@
@@ -242,6 +263,1
0
@@
# dlls automatically to the bin folder.
include(cmake/FASTCustomCommands.cmake)
endif(NOT FAST_BUILD_QT5 AND WIN32)
+execute_process(COMMAND mkdir -p usr/share/doc/fast/assets)
+execute_process(COMMAND cp -r ../doc/fonts usr/share/doc/fast/assets)
+execute_process(COMMAND cp -r ../doc/images usr/share/doc/fast/assets)
+execute_process(COMMAND mkdir -p usr/share/fast/assets)
+execute_process(COMMAND cp -r ../doc/images usr/share/fast/assets)
+install(TARGETS FAST-STATIC DESTINATION .)
+install(TARGETS FAST DESTINATION .)
...
...