Skip to content

Commit f61105f

Browse files
committed
Fix issue of doc base color not using user setting
1 parent b22e37e commit f61105f

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,5 +169,5 @@ cython_debug/
169169
flask_session/
170170
/*_session/
171171

172-
sketch*.py
172+
sketch_*
173173
####################################################

local_settings.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,44 @@
55
"output_main": {
66
"request": True,
77
"format": "png",
8-
"doc_pad_h": 30,
9-
"doc_pad_v": 20,
8+
"doc_pad_h": 300,
9+
"doc_pad_v": 200,
1010
"doc_fill_color": "#FFFFFF",
1111
"base_stroke_color": "#23445D",
1212
"base_fill_color": "#BAC8D3",
1313
},
1414
"output_browser": {
1515
"request": True,
1616
"format": "png",
17-
"doc_pad_h": 30,
18-
"doc_pad_v": 20,
17+
"doc_pad_h": 300,
18+
"doc_pad_v": 200,
1919
"doc_fill_color": "#FFFFFF",
2020
"base_stroke_color": "#23445D",
2121
"base_fill_color": "#BAC8D3",
2222
},
2323
"output_mobiles": {
2424
"request": True,
2525
"format": "png",
26-
"doc_pad_h": 30,
27-
"doc_pad_v": 20,
26+
"doc_pad_h": 300,
27+
"doc_pad_v": 200,
2828
"doc_fill_color": "#FFFFFF",
2929
"base_stroke_color": "#23445D",
3030
"base_fill_color": "#BAC8D3",
3131
},
3232
"output_full": {
3333
"request": True,
3434
"format": "png",
35-
"doc_pad_h": 30,
36-
"doc_pad_v": 20,
35+
"doc_pad_h": 300,
36+
"doc_pad_v": 200,
3737
"doc_fill_color": "#FFFFFF",
3838
"base_stroke_color": "#23445D",
3939
"base_fill_color": "#BAC8D3",
4040
},
4141
"output_video": {
4242
"request": True,
4343
"format": "png",
44-
"doc_pad_h": 50,
45-
"doc_pad_v": 40,
44+
"doc_pad_h": 300,
45+
"doc_pad_v": 200,
4646
"doc_fill_color": "#FFFFFF",
4747
"base_stroke_color": "#23445D",
4848
"base_fill_color": "#BAC8D3",

output_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ def process_request_main(blueprint_user, blueprint_system, directory_main, direc
147147
width = 3176
148148
height = 1515
149149

150-
output_main_all_base = Image.new("RGB", (width, height), (255, 255, 255))
150+
output_main_all_base = Image.new(mode="RGB", size=(width, height), color=f"{blueprint_user['doc_fill_color']}")
151151

152152
output_main_desktop = Image.open(f"{directory_main}/{filename_output_main_desktop_final}")
153153
output_main_laptop = Image.open(f"{directory_main}/{filename_output_main_laptop_final}")

output_mobiles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def process_request_mobiles(blueprint_user, blueprint_system, directory_main, di
112112
width = 1605
113113
height = 1406
114114

115-
output_mobiles_all_base = Image.new("RGB", (width, height), (255, 255, 255))
115+
output_mobiles_all_base = Image.new(mode="RGB", size=(width, height), color=f"{blueprint_user['doc_fill_color']}")
116116

117117
output_mobiles_tablet = Image.open(f"{directory_main}/{filename_output_mobiles_tablet_final}")
118118
output_mobiles_smartphone = Image.open(f"{directory_main}/{filename_output_mobiles_smartphone_final}")

output_video.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def get_movie_base(blueprint, directory_main, svg_filename, png_filename):
7070
<?xml version="1.0" encoding="UTF-8"?>
7171
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
7272
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="1288px"
73-
height="808px" viewBox="-0.5 -0.5 1288 808" style="background-color: rgb(255, 255, 255);">
73+
height="808px" viewBox="-0.5 -0.5 1288 808" style="background-color: {blueprint["doc_fill_color"]};">
7474
<defs />
7575
<g>
7676
<rect x="2" y="2" width="1284" height="50" rx="7.5" ry="7.5" fill="{blueprint["base_fill_color"]}" stroke="{blueprint["base_stroke_color"]}"

0 commit comments

Comments
 (0)