Skip to content

Commit c4c9be0

Browse files
jchristophersonjchristopherson
committed
Clean up
1 parent abdf021 commit c4c9be0

13 files changed

Lines changed: 43 additions & 41 deletions

‎src/fplot_core.f90‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ module fplot_core
136136
! FPLOT_PLOT_DATA.F90
137137
public :: plot_data
138138
public :: pd_get_string_result
139+
public :: pd_clear_action
139140
public :: plot_data_colored
140141
public :: scatter_plot_data
141142
public :: spd_get_int_value

‎src/fplot_filled_plot_data.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ module fplot_filled_plot_data
2424
procedure, public :: get_command_string => fpd_get_cmd
2525
procedure, public :: get_data_string => fpd_get_data_cmd
2626
procedure, public :: define_data => fpd_define_data
27-
procedure, public :: clean_data => fpd_clean_data
27+
procedure, public :: clear_data => fpd_clear_data
2828
end type
2929

3030
contains
@@ -211,8 +211,8 @@ subroutine fpd_define_data(this, x, y, yc, err)
211211
end subroutine
212212

213213
! ------------------------------------------------------------------------------
214-
subroutine fpd_clean_data(this)
215-
!! Cleans the data from this data set.
214+
subroutine fpd_clear_data(this)
215+
!! Clears the data from this data set.
216216
class(filled_plot_data), intent(inout) :: this
217217
!! The filled_plot_data object.
218218
if (allocated(this%m_data)) deallocate(this%m_data)

‎src/fplot_plot_data.f90‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ module fplot_plot_data
1212
private
1313
public :: plot_data
1414
public :: pd_get_string_result
15+
public :: pd_clear_action
1516
public :: plot_data_colored
1617
public :: scatter_plot_data
1718
public :: spd_get_int_value
@@ -34,9 +35,9 @@ module fplot_plot_data
3435
procedure, public :: set_datablock_name => pd_set_datablock_name
3536
procedure, public :: create_unique_datablock_name => &
3637
pd_create_unique_datablock_name
37-
procedure, public :: clean => pd_clean
38+
procedure, public :: clear_all => pd_clear
3839
procedure(pd_get_string_result), deferred, public :: get_data_string
39-
procedure(pd_clean_action), deferred, public :: clean_data
40+
procedure(pd_clear_action), deferred, public :: clear_data
4041
end type
4142

4243
interface
@@ -49,8 +50,8 @@ function pd_get_string_result(this) result(x)
4950
!! The string.
5051
end function
5152

52-
subroutine pd_clean_action(this)
53-
!! Performs a cleaning operation.
53+
subroutine pd_clear_action(this)
54+
!! Performs a clearing operation.
5455
import plot_data
5556
class(plot_data), intent(inout) :: this
5657
!! The plot_data object.
@@ -259,16 +260,16 @@ subroutine pd_create_unique_datablock_name(this)
259260
end subroutine
260261

261262
! ------------------------------------------------------------------------------
262-
subroutine pd_clean(this)
263-
!! Cleans the data set by removing stored data and clearing the
264-
!! GNUPLOT datablock name. This routine also calls clean_data to
263+
subroutine pd_clear(this)
264+
!! Clears the data set by removing stored data and clearing the
265+
!! GNUPLOT datablock name. This routine also calls clear_data to
265266
!! ensure the data is cleared from the data set as well as the datablock
266267
!! name.
267268
class(plot_data), intent(inout) :: this
268269
!! The plot_data object.
269270

270271
call this%set_datablock_name("")
271-
call this%clean_data()
272+
call this%clear_data()
272273
end subroutine
273274

274275
! ******************************************************************************

‎src/fplot_plot_data_2d.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ module fplot_plot_data_2d
3333
procedure, public :: get_y_data => pd2d_get_y_array
3434
procedure, public :: get_color_data => pd2d_get_c_array
3535
procedure, public :: get_point_size_data => pd2d_get_ps_array
36-
procedure, public :: clean_data => pd2d_clean_data
36+
procedure, public :: clear_data => pd2d_clear_data
3737
end type
3838

3939
contains
@@ -461,8 +461,8 @@ function pd2d_get_ps_array(this) result(x)
461461
end function
462462

463463
! ------------------------------------------------------------------------------
464-
subroutine pd2d_clean_data(this)
465-
!! Cleans the data from this data set.
464+
subroutine pd2d_clear_data(this)
465+
!! Clears the data from this data set.
466466
class(plot_data_2d), intent(inout) :: this
467467
!! The plot_data_2d object.
468468
if (allocated(this%m_data)) deallocate(this%m_data)

‎src/fplot_plot_data_3d.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module fplot_plot_data_3d
2929
procedure, public :: get_z_data => pd3d_get_z_array
3030
procedure, public :: get_color_data => pd3d_get_c_array
3131
procedure, public :: get_point_size_data => pd3d_get_c_array
32-
procedure, public :: clean_data => pd3d_clean_data
32+
procedure, public :: clear_data => pd3d_clear_data
3333
end type
3434

3535
contains
@@ -438,8 +438,8 @@ function pd3d_get_ps_array(this) result(x)
438438
end function
439439

440440
! ------------------------------------------------------------------------------
441-
subroutine pd3d_clean_data(this)
442-
!! Cleans the data from this data set.
441+
subroutine pd3d_clear_data(this)
442+
!! Clears the data from this data set.
443443
class(plot_data_3d), intent(inout) :: this
444444
!! The plot_data_3d object.
445445
if (allocated(this%m_data)) deallocate(this%m_data)

‎src/fplot_plot_data_bar.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module fplot_plot_data_bar
5555
procedure, public :: set_data_1 => pdb_set_data_1_core
5656
procedure, public :: set_data_2 => pdb_set_data_2_core
5757
procedure, public :: set_data_3 => pdb_set_data_3_core
58-
procedure, public :: clean_data => pdb_clean_data
58+
procedure, public :: clear_data => pdb_clear_data
5959
end type
6060

6161
contains
@@ -585,8 +585,8 @@ subroutine pdb_set_data_3_core(this, labels, x, fmt, err)
585585
end subroutine
586586

587587
! ------------------------------------------------------------------------------
588-
subroutine pdb_clean_data(this)
589-
!! Cleans the data from this data set.
588+
subroutine pdb_clear_data(this)
589+
!! Clears the data from this data set.
590590
class(plot_data_bar), intent(inout) :: this
591591
!! The plot_data_bar object.
592592
if (allocated(this%m_axisLabels)) deallocate(this%m_axisLabels)

‎src/fplot_plot_data_box_whisker.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ module fplot_plot_data_box_whisker
5555
procedure, public :: set_fill_boxes => pdbw_set_fill_boxes
5656
procedure, public :: get_box_fill_opacity => pdbw_get_opacity
5757
procedure, public :: set_box_fill_opacity => pdbw_set_opacity
58-
procedure, public :: clean_data => pdbw_clean_data
58+
procedure, public :: clear_data => pdbw_clear_data
5959
end type
6060

6161
contains
@@ -381,8 +381,8 @@ subroutine pdbw_set_opacity(this, x)
381381
end subroutine
382382

383383
! ------------------------------------------------------------------------------
384-
subroutine pdbw_clean_data(this)
385-
!! Cleans the data from this data set.
384+
subroutine pdbw_clear_data(this)
385+
!! Clears the data from this data set.
386386
class(plot_data_box_whisker), intent(inout) :: this
387387
!! The plot_data_box_whisker object.
388388
if (allocated(this%m_x)) deallocate(this%m_x)

‎src/fplot_plot_data_error_bars.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ module fplot_plot_data_error_bars
4141
procedure, public :: get_use_error_box => pde_get_box
4242
procedure, public :: set_use_error_box => pde_set_box
4343
procedure, public :: get_use_range => pde_get_use_range
44-
procedure, public :: clean_data => pde_clean_data
44+
procedure, public :: clear_data => pde_clear_data
4545
procedure :: pde_define_x_err
4646
procedure :: pde_define_y_err
4747
procedure :: pde_define_xy_err
@@ -716,8 +716,8 @@ subroutine pde_define_xy_err_lim(this, x, y, xmin, xmax, ymin, &
716716
end subroutine
717717

718718
! ------------------------------------------------------------------------------
719-
subroutine pde_clean_data(this)
720-
!! Cleans the data from this data set.
719+
subroutine pde_clear_data(this)
720+
!! Clears the data from this data set.
721721
class(plot_data_error_bars), intent(inout) :: this
722722
!! The plot_data_error_bars object.
723723
if (allocated(this%m_data)) deallocate(this%m_data)

‎src/fplot_plot_data_histogram.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module fplot_plot_data_histogram
4040
procedure, public :: get_draw_against_y2 => pdh_get_use_y2
4141
procedure, public :: set_draw_against_y2 => pdh_set_use_y2
4242
procedure, public :: get => pdh_get_bin_data
43-
procedure, public :: clean_data => pdh_clean_data
43+
procedure, public :: clear_data => pdh_clear_data
4444
end type
4545

4646
contains
@@ -309,8 +309,8 @@ subroutine pdh_get_bin_data(this, i, x, cnt)
309309
end subroutine
310310

311311
! ------------------------------------------------------------------------------
312-
subroutine pdh_clean_data(this)
313-
!! Cleans the data from this data set.
312+
subroutine pdh_clear_data(this)
313+
!! Clears the data from this data set.
314314
class(plot_data_histogram), intent(inout) :: this
315315
!! The plot_data_histogram object.
316316
if (allocated(this%m_data)) deallocate(this%m_data)

‎src/fplot_plot_data_tri_2d.f90‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ module fplot_plot_data_tri_2d
3232
procedure, public :: set_line_width => pdt2d_set_line_width
3333
procedure, public :: get_line_style => pdt2d_get_line_style
3434
procedure, public :: set_line_style => pdt2d_set_line_style
35-
procedure, public :: clean_data => pdt2d_clean_data
35+
procedure, public :: clear_data => pdt2d_clear_data
3636
end type
3737

3838
contains
@@ -281,8 +281,8 @@ subroutine pdt2d_set_line_style(this, x)
281281
end subroutine
282282

283283
! ------------------------------------------------------------------------------
284-
subroutine pdt2d_clean_data(this)
285-
!! Cleans the data from this data set.
284+
subroutine pdt2d_clear_data(this)
285+
!! Clears the data from this data set.
286286
class(plot_data_tri_2d), intent(inout) :: this
287287
!! The plot_data_tri_2d object.
288288
if (allocated(this%m_indices)) deallocate(this%m_indices)

0 commit comments

Comments
 (0)