Skip to content

Commit e1937bc

Browse files
Copilotdrbergman
Copilot
and
drbergman
committed
Add robust resolution variables for JPEG and GIF generation
Co-authored-by: drbergman <22732264+drbergman@users.noreply.github.com>
1 parent 74f6562 commit e1937bc

20 files changed

Lines changed: 140 additions & 160 deletions

File tree

‎Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -472,17 +472,16 @@ untar:
472472
FRAMERATE := 24
473473
OUTPUT := output
474474

475+
MAGICK_DENSITY := 96
476+
MAGICK_RESIZE_X := 1024
477+
MAGICK_RESIZE_Y := 1024
478+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
479+
475480
jpeg:
476-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
477-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
478-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
479-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
480-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
481-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
482-
rm -f __H*.txt __W*.txt __resize.txt
481+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
483482

484483
gif:
485-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
484+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
486485

487486
movie:
488487
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/Makefile-default‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -472,17 +472,16 @@ untar:
472472
FRAMERATE := 24
473473
OUTPUT := output
474474

475+
MAGICK_DENSITY := 96
476+
MAGICK_RESIZE_X := 1024
477+
MAGICK_RESIZE_Y := 1024
478+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
479+
475480
jpeg:
476-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
477-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
478-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
479-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
480-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
481-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
482-
rm -f __H*.txt __W*.txt __resize.txt
481+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
483482

484483
gif:
485-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
484+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
486485

487486
movie:
488487
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/asymmetric_division/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ untar:
224224
FRAMERATE := 24
225225
OUTPUT := output
226226

227+
MAGICK_DENSITY := 96
228+
MAGICK_RESIZE_X := 1024
229+
MAGICK_RESIZE_Y := 1024
230+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
231+
227232
jpeg:
228-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
229-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
230-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
231-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
232-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
233-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
234-
rm -f __H*.txt __W*.txt __resize.txt
233+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
235234

236235
gif:
237-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
236+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
238237

239238
movie:
240239
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/biorobots/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ untar:
224224
FRAMERATE := 24
225225
OUTPUT := output
226226

227+
MAGICK_DENSITY := 96
228+
MAGICK_RESIZE_X := 1024
229+
MAGICK_RESIZE_Y := 1024
230+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
231+
227232
jpeg:
228-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
229-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
230-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
231-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
232-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
233-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
234-
rm -f __H*.txt __W*.txt __resize.txt
233+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
235234

236235
gif:
237-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
236+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
238237

239238
movie:
240239
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/cancer_biorobots/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ untar:
224224
FRAMERATE := 24
225225
OUTPUT := output
226226

227+
MAGICK_DENSITY := 96
228+
MAGICK_RESIZE_X := 1024
229+
MAGICK_RESIZE_Y := 1024
230+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
231+
227232
jpeg:
228-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
229-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
230-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
231-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
232-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
233-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
234-
rm -f __H*.txt __W*.txt __resize.txt
233+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
235234

236235
gif:
237-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
236+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
238237

239238
movie:
240239
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/cancer_immune/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,16 @@ untar:
220220
FRAMERATE := 24
221221
OUTPUT := output
222222

223+
MAGICK_DENSITY := 96
224+
MAGICK_RESIZE_X := 1024
225+
MAGICK_RESIZE_Y := 1024
226+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
227+
223228
jpeg:
224-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
225-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
226-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
227-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
228-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
229-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
230-
rm -f __H*.txt __W*.txt __resize.txt
229+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
231230

232231
gif:
233-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
232+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
234233

235234
movie:
236235
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/celltypes3/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ untar:
224224
FRAMERATE := 24
225225
OUTPUT := output
226226

227+
MAGICK_DENSITY := 96
228+
MAGICK_RESIZE_X := 1024
229+
MAGICK_RESIZE_Y := 1024
230+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
231+
227232
jpeg:
228-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
229-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
230-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
231-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
232-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
233-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
234-
rm -f __H*.txt __W*.txt __resize.txt
233+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
235234

236235
gif:
237-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
236+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
238237

239238
movie:
240239
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/custom_division/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ untar:
224224
FRAMERATE := 24
225225
OUTPUT := output
226226

227+
MAGICK_DENSITY := 96
228+
MAGICK_RESIZE_X := 1024
229+
MAGICK_RESIZE_Y := 1024
230+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
231+
227232
jpeg:
228-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
229-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
230-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
231-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
232-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
233-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
234-
rm -f __H*.txt __W*.txt __resize.txt
233+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
235234

236235
gif:
237-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
236+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
238237

239238
movie:
240239
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/episode/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,16 @@ untar:
235235
FRAMERATE := 24
236236
OUTPUT := output/episode00000000
237237

238+
MAGICK_DENSITY := 96
239+
MAGICK_RESIZE_X := 1024
240+
MAGICK_RESIZE_Y := 1024
241+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
242+
238243
jpeg:
239-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
240-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
241-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
242-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
243-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
244-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
245-
rm -f __H*.txt __W*.txt __resize.txt
244+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
246245

247246
gif:
248-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
247+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
249248

250249
movie:
251250
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

‎sample_projects/heterogeneity/Makefile‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -224,17 +224,16 @@ untar:
224224
FRAMERATE := 24
225225
OUTPUT := output
226226

227+
MAGICK_DENSITY := 96
228+
MAGICK_RESIZE_X := 1024
229+
MAGICK_RESIZE_Y := 1024
230+
MAGICK_RESIZE := $(MAGICK_RESIZE_X)x$(MAGICK_RESIZE_Y)
231+
227232
jpeg:
228-
@magick identify -format "%h" $(OUTPUT)/initial.svg > __H.txt
229-
@magick identify -format "%w" $(OUTPUT)/initial.svg > __W.txt
230-
@expr 2 \* \( $$(grep . __H.txt) / 2 \) > __H1.txt
231-
@expr 2 \* \( $$(grep . __W.txt) / 2 \) > __W1.txt
232-
@echo "$$(grep . __W1.txt)!x$$(grep . __H1.txt)!" > __resize.txt
233-
@magick mogrify -format jpg -resize $$(grep . __resize.txt) $(OUTPUT)/s*.svg
234-
rm -f __H*.txt __W*.txt __resize.txt
233+
magick mogrify -density $(MAGICK_DENSITY) -format jpg -resize $(MAGICK_RESIZE) $(OUTPUT)/s*.svg
235234

236235
gif:
237-
magick convert $(OUTPUT)/s*.svg $(OUTPUT)/out.gif
236+
magick -density $(MAGICK_DENSITY) $(OUTPUT)/s*.svg -resize $(MAGICK_RESIZE) $(OUTPUT)/out.gif
238237

239238
movie:
240239
ffmpeg -r $(FRAMERATE) -f image2 -i $(OUTPUT)/snapshot%08d.jpg -vcodec libx264 -pix_fmt yuv420p -strict -2 -tune animation -crf 15 -acodec none $(OUTPUT)/out.mp4

0 commit comments

Comments
 (0)