NotificationsYou must be signed in to change notification settings
Fork1
Star22

Commit1e0162b

committed

fix: balance ascii pie aspect and disable grid

1 parentda3c3cd commit1e0162bCopy full SHA for 1e0162b

File tree

2 files changed

+18

-4

lines changed

src
- backends/ascii
  - fortplot_ascii.f90
- figures/management
  - fortplot_figure_render_engine.f90

2 files changed

+18

-4

lines changed

`‎src/backends/ascii/fortplot_ascii.f90‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ module fortplot_ascii`
`26`	`26`	`implicit none`
`27`	`27`
`28`	`28`	`private`
`29`		`-public:: ascii_context, create_ascii_canvas`
	`29`	`+public:: ascii_context, create_ascii_canvas, ASCII_CHAR_ASPECT`
	`30`	`+`
	`31`	`+real(wp),parameter:: ASCII_CHAR_ASPECT=2.0_wp`
`30`	`32`
`31`	`33`	`real(wp),parameter:: ASCII_CHAR_ASPECT=2.0_wp`
`32`	`34`

`‎src/figures/management/fortplot_figure_render_engine.f90‎`

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ module fortplot_figure_render_engine`
`24`	`24`	`use fortplot_pdf_coordinate, only: calculate_pdf_plot_area`
`25`	`25`	`use fortplot_png, only: png_context`
`26`	`26`	`use fortplot_pdf, only: pdf_context`
`27`		`-use fortplot_ascii, only: ascii_context`
	`27`	`+use fortplot_ascii, only: ascii_context, ASCII_CHAR_ASPECT`
`28`	`28`	`implicit none`
`29`	`29`
`30`	`30`	`private`
`@@ -82,6 +82,7 @@ subroutine render_single_axis(state, plots, plot_count, annotations, annotation_`
`82`	`82`	`logical:: have_pie_pixels`
`83`	`83`	`logical:: has_pie_plots`
`84`	`84`	`logical:: pie_only`
	`85`	`+logical:: ascii_backend`
`85`	`86`
`86`	`87`	`call calculate_figure_data_ranges(plots, plot_count, &`
`87`	`88`	`state%xlim_set, state%ylim_set, &`
`@@ -94,6 +95,13 @@ subroutine render_single_axis(state, plots, plot_count, annotations, annotation_`
`94`	`95`	`state%xscale, state%yscale, &`
`95`	`96`	`state%symlog_threshold, axis_filter=AXIS_PRIMARY)`
`96`	`97`
	`98`	`+ ascii_backend=.false.`
	`99`	`+ selecttype (backend_ptr=> state%backend)`
	`100`	`+ class is (ascii_context)`
	`101`	`+ ascii_backend=.true.`
	`102`	`+ class default`
	`103`	`+end select`
	`104`	`+`
`97`	`105`	`if (state%has_twinx)then`
`98`	`106`	`x_min_dummy= state%x_min`
`99`	`107`	`x_max_dummy= state%x_max`
`@@ -144,6 +152,7 @@ subroutine render_single_axis(state, plots, plot_count, annotations, annotation_`
`144`	`152`
`145`	`153`	`has_pie_plots= contains_pie_plot(plots, plot_count)`
`146`	`154`	`pie_only=.false.`
	`155`	`+ ascii_backend=.false.`
`147`	`156`	`if (has_pie_plots)then`
`148`	`157`	`have_pie_pixels=.false.`
`149`	`158`	`selecttype (bk=> state%backend)`
`@@ -157,8 +166,9 @@ subroutine render_single_axis(state, plots, plot_count, annotations, annotation_`
`157`	`166`	`have_pie_pixels=.true.`
`158`	`167`	`class is (ascii_context)`
`159`	`168`	`pie_plot_width_px=real(max(1, bk%plot_width-3), wp)`
`160`		`- pie_plot_height_px=real(max(1, bk%plot_height-3), wp)`
	`169`	`+ pie_plot_height_px=real(max(1, bk%plot_height-3), wp)* ASCII_CHAR_ASPECT`
`161`	`170`	`have_pie_pixels=.true.`
	`171`	`+ ascii_backend=.true.`
`162`	`172`	`class default`
`163`	`173`	`end select`
`164`	`174`
`@@ -177,7 +187,8 @@ subroutine render_single_axis(state, plots, plot_count, annotations, annotation_`
`177`	`187`	`call render_figure_background(state%backend)`
`178`	`188`
`179`	`189`	`if (state%grid_enabled)then`
`180`		`-call render_grid_lines(state%backend, state%grid_enabled, &`
	`190`	`+if (.not. ascii_backend)then`
	`191`	`+call render_grid_lines(state%backend, state%grid_enabled, &`
`181`	`192`	`state%grid_which, state%grid_axis, &`
`182`	`193`	`state%grid_alpha, state%width, state%height, &`
`183`	`194`	`state%margin_left, state%margin_right, &`
`@@ -188,6 +199,7 @@ subroutine render_single_axis(state, plots, plot_count, annotations, annotation_`
`188`	`199`	`state%x_min_transformed, state%x_max_transformed, &`
`189`	`200`	`state%y_min_transformed, state%y_max_transformed, &`
`190`	`201`	`state%grid_linestyle)`
	`202`	`+end if`
`191`	`203`	`end if`
`192`	`204`
`193`	`205`	`if (.not. pie_only)then`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit1e0162b

File tree

2 files changed

2 files changed

`‎src/backends/ascii/fortplot_ascii.f90‎`

`‎src/figures/management/fortplot_figure_render_engine.f90‎`

0 commit comments