diff --git a/Report/images/fig_03_navigation_hub.png b/Report/images/fig_03_navigation_hub.png index 5901e16..d2fc0e8 100644 Binary files a/Report/images/fig_03_navigation_hub.png and b/Report/images/fig_03_navigation_hub.png differ diff --git a/Report/images/fig_04_domain_class.png b/Report/images/fig_04_domain_class.png index 3abad9a..57717dd 100644 Binary files a/Report/images/fig_04_domain_class.png and b/Report/images/fig_04_domain_class.png differ diff --git a/Report/images/fig_15_bpmn_vault.png b/Report/images/fig_15_bpmn_vault.png index 7b27d66..652dda8 100644 Binary files a/Report/images/fig_15_bpmn_vault.png and b/Report/images/fig_15_bpmn_vault.png differ diff --git a/Report/images/fig_16_dfd_level0.png b/Report/images/fig_16_dfd_level0.png index 3e0b0d0..b98ce72 100644 Binary files a/Report/images/fig_16_dfd_level0.png and b/Report/images/fig_16_dfd_level0.png differ diff --git a/Report/includes/common.typ b/Report/includes/common.typ index c117d30..34a684a 100644 --- a/Report/includes/common.typ +++ b/Report/includes/common.typ @@ -201,7 +201,11 @@ #let pz-fig(path, caption, lbl) = [ #figure( - image("../images/" + path, width: 100%), + image( + "../images/" + path, + width: 100%, + fit: "contain", + ), caption: caption, ) #label(lbl) diff --git a/Report/puml/fig_03_navigation_hub.puml b/Report/puml/fig_03_navigation_hub.puml index 171904e..d213d73 100644 --- a/Report/puml/fig_03_navigation_hub.puml +++ b/Report/puml/fig_03_navigation_hub.puml @@ -1,5 +1,5 @@ @startuml fig_03_navigation_hub -scale 3 +scale 2 title Wallenc — навигация от главного экрана и связь с фоновой синхронизацией (проект) diff --git a/Report/puml/fig_04_domain_class.puml b/Report/puml/fig_04_domain_class.puml index 4512922..30485cb 100644 --- a/Report/puml/fig_04_domain_class.puml +++ b/Report/puml/fig_04_domain_class.puml @@ -1,9 +1,12 @@ @startuml fig_04_domain_class -scale 2 +scale 1.15 skinparam shadowing false -skinparam classFontSize 11 +skinparam classFontSize 10 +skinparam packageStyle rectangle +skinparam nodesep 12 +skinparam ranksep 18 -' PNG (лимит растра по умолчанию 4096): PLANTUML_LIMIT_SIZE=8192 java -Xmx2g -jar plantuml.jar -charset UTF-8 -tpng … +' render_puml.sh: PLANTUML_LIMIT_SIZE=16384 package usecases { class ManageStoragesEncryptionUseCase { diff --git a/Report/puml/fig_15_bpmn_vault.puml b/Report/puml/fig_15_bpmn_vault.puml index 44f95a1..fda1ae1 100644 --- a/Report/puml/fig_15_bpmn_vault.puml +++ b/Report/puml/fig_15_bpmn_vault.puml @@ -1,5 +1,5 @@ @startuml fig_15_bpmn_vault -scale 3 +scale 2 title BPMN: жизненный цикл vault skinparam defaultFontName "DejaVu Sans" skinparam activity { diff --git a/Report/puml/fig_16_dfd_level0.puml b/Report/puml/fig_16_dfd_level0.puml index 7f234a8..4ad09a0 100644 --- a/Report/puml/fig_16_dfd_level0.puml +++ b/Report/puml/fig_16_dfd_level0.puml @@ -1,5 +1,5 @@ @startuml fig_16_dfd_level0 -scale 3 +scale 2 title DFD уровень 0: Wallenc skinparam defaultFontName "DejaVu Sans" diff --git a/Report/scripts/render_puml.sh b/Report/scripts/render_puml.sh index 57752ae..bc07c22 100755 --- a/Report/scripts/render_puml.sh +++ b/Report/scripts/render_puml.sh @@ -33,8 +33,12 @@ if ((${#PUML_FILES[@]} == 0)); then exit 1 fi -export PLANTUML_LIMIT_SIZE=8192 -"$JAVA_BIN" -Djava.awt.headless=true -jar "$JAR" \ +# Лимит растра PlantUML (по умолчанию 4096); fig_04_domain_class упирался в 8192. +export PLANTUML_LIMIT_SIZE="${PLANTUML_LIMIT_SIZE:-16384}" +"$JAVA_BIN" -Djava.awt.headless=true \ + -DPLANTUML_LIMIT_SIZE="$PLANTUML_LIMIT_SIZE" \ + -Xmx3g \ + -jar "$JAR" \ -charset UTF-8 -tpng -o "$IMG_DIR" "${PUML_FILES[@]}" echo "Done. $(ls -1 "$IMG_DIR"/fig_*.png 2>/dev/null | wc -l) PNG in images/"