Skip to content
GitLab
Explore
Sign in
Register
Commits on Source (2)
Favour ttf-ubuntu-font-family over the one in assets
· bffb0654
Shayan Doust
authored
Aug 31, 2019
bffb0654
Add ubuntu font family to control & remove font dir from libfast-data
· 29226a9e
Shayan Doust
authored
Aug 31, 2019
29226a9e
Show whitespace changes
Inline
Side-by-side
debian/control
View file @
29226a9e
...
...
@@ -83,7 +83,8 @@ Package: libfast-data
Architecture: all
Depends: ${misc:Depends}
Recommends: libfast,
libfast-examples
libfast-examples,
ttf-ubuntu-font-family
Description: public data for "FAST" Heterogeneous Medical Image Computing
An open-source cross-platform framework with the main goal of making it
easier to do processing and visualization of medical images on
...
...
debian/libfast-data.install
View file @
29226a9e
debian
/
missing
-
sources
/
FAST_Test_Data
.
xz
usr
/
lib
/
fast
doc
/
fonts
usr
/
share
/
doc
/
fast
/
assets
doc
/
images
usr
/
share
/
doc
/
fast
/
assets
debian/patches/modify_assets_location.patch
View file @
29226a9e
Index: fast/source/FAST/Config.cpp
===================================================================
--- fast.orig/source/FAST/Config.cpp 2019-08-31 0
3:52:37.422447649
+0100
+++ fast/source/FAST/Config.cpp 2019-08-31 0
3:53:13.398310010
+0100
--- fast.orig/source/FAST/Config.cpp 2019-08-31 0
5:16:29.263196520
+0100
+++ fast/source/FAST/Config.cpp 2019-08-31 0
5:16:29.259196536
+0100
@@ -78,7 +78,7 @@
mTestDataPath = getPath() + "../data/";
mKernelSourcePath = getPath() + "../source/FAST/";
...
...
@@ -20,3 +20,19 @@ Index: fast/source/FAST/Config.cpp
mPipelinePath = getPath() + "../pipelines/";
loadConfiguration();
}
Index: fast/source/FAST/Visualization/Window.cpp
===================================================================
--- fast.orig/source/FAST/Visualization/Window.cpp 2019-08-31 00:17:50.187752432 +0100
+++ fast/source/FAST/Visualization/Window.cpp 2019-08-31 05:18:33.434721458 +0100
@@ -121,9 +121,9 @@
QApplication::setWindowIcon(QIcon((Config::getDocumentationPath() + "images/fast_icon.png").c_str()));
// Add all fonts in fonts folder
- for(auto&& filename : getDirectoryList(join(Config::getDocumentationPath(), "fonts"))) {
+ for(auto&& filename : getDirectoryList(join("/usr/share/fonts/truetype", "ubuntu"))) {
if(filename.substr(filename.size()-4) == ".ttf") {
- QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "fonts", filename).c_str());
+ QFontDatabase::addApplicationFont(join(Config::getDocumentationPath(), "ubuntu", filename).c_str());
}
}
} else {