Compare commits

...

2 Commits

1 changed files with 12 additions and 12 deletions

View File

@ -1745,12 +1745,12 @@ class SampleDataTab(QWidget):
stg.frac_vol_fine[profil_position_num, :], stg.frac_vol_fine[profil_position_num, :],
color=color_plot) color=color_plot)
self.axis_plot_PSD[0].set_xscale('log') self.axis_plot_PSD[0].set_xscale('log')
self.axis_plot_PSD[0].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[0].set_xlabel('Radius (m)')
self.axis_plot_PSD[0].set_ylabel('Class size volume fraction') self.axis_plot_PSD[0].set_ylabel('Class size volume fraction')
self.axis_plot_PSD[1].plot() self.axis_plot_PSD[1].plot()
self.axis_plot_PSD[1].set_xscale('log') self.axis_plot_PSD[1].set_xscale('log')
self.axis_plot_PSD[1].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[1].set_xlabel('Radius (m)')
self.axis_plot_PSD[1].set_ylabel('Class size volume fraction') self.axis_plot_PSD[1].set_ylabel('Class size volume fraction')
elif self.combobox_PSD_plot.currentIndex() == 1: elif self.combobox_PSD_plot.currentIndex() == 1:
@ -1760,12 +1760,12 @@ class SampleDataTab(QWidget):
stg.frac_vol_fine_cumul[profil_position_num, :], stg.frac_vol_fine_cumul[profil_position_num, :],
color=color_plot) color=color_plot)
self.axis_plot_PSD[0].set_xscale('log') self.axis_plot_PSD[0].set_xscale('log')
self.axis_plot_PSD[0].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[0].set_xlabel('Radius (m)')
self.axis_plot_PSD[0].set_ylabel('Cumulative size volume fraction') self.axis_plot_PSD[0].set_ylabel('Cumulative size volume fraction')
self.axis_plot_PSD[1].plot() self.axis_plot_PSD[1].plot()
self.axis_plot_PSD[1].set_xscale('log') self.axis_plot_PSD[1].set_xscale('log')
self.axis_plot_PSD[1].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[1].set_xlabel('Radius (m)')
self.axis_plot_PSD[1].set_ylabel('Class size volume fraction') self.axis_plot_PSD[1].set_ylabel('Class size volume fraction')
self.figure_plot_PSD.canvas.draw_idle() self.figure_plot_PSD.canvas.draw_idle()
@ -1784,14 +1784,14 @@ class SampleDataTab(QWidget):
self.axis_plot_PSD[0].plot() self.axis_plot_PSD[0].plot()
self.axis_plot_PSD[0].set_xscale('log') self.axis_plot_PSD[0].set_xscale('log')
self.axis_plot_PSD[0].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[0].set_xlabel('Radius (m)')
self.axis_plot_PSD[0].set_ylabel('Class size volume fraction') self.axis_plot_PSD[0].set_ylabel('Class size volume fraction')
self.axis_plot_PSD[1].plot(stg.radius_grain_sand, self.axis_plot_PSD[1].plot(stg.radius_grain_sand,
stg.frac_vol_sand[profil_position_num, :], stg.frac_vol_sand[profil_position_num, :],
color=color_plot) color=color_plot)
self.axis_plot_PSD[1].set_xscale('log') self.axis_plot_PSD[1].set_xscale('log')
self.axis_plot_PSD[1].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[1].set_xlabel('Radius (m)')
self.axis_plot_PSD[1].set_ylabel('Class size volume fraction') self.axis_plot_PSD[1].set_ylabel('Class size volume fraction')
elif self.combobox_PSD_plot.currentIndex() == 1: elif self.combobox_PSD_plot.currentIndex() == 1:
@ -1800,14 +1800,14 @@ class SampleDataTab(QWidget):
self.axis_plot_PSD[0].plot() self.axis_plot_PSD[0].plot()
self.axis_plot_PSD[0].set_xscale('log') self.axis_plot_PSD[0].set_xscale('log')
self.axis_plot_PSD[0].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[0].set_xlabel('Radius (m)')
self.axis_plot_PSD[0].set_ylabel('Cumulative size volume fraction') self.axis_plot_PSD[0].set_ylabel('Cumulative size volume fraction')
self.axis_plot_PSD[1].plot(stg.radius_grain_sand, self.axis_plot_PSD[1].plot(stg.radius_grain_sand,
stg.frac_vol_sand_cumul[profil_position_num, :], stg.frac_vol_sand_cumul[profil_position_num, :],
color=color_plot) color=color_plot)
self.axis_plot_PSD[1].set_xscale('log') self.axis_plot_PSD[1].set_xscale('log')
self.axis_plot_PSD[1].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[1].set_xlabel('Radius (m)')
self.axis_plot_PSD[1].set_ylabel('Cumulative size volume fraction') self.axis_plot_PSD[1].set_ylabel('Cumulative size volume fraction')
self.figure_plot_PSD.canvas.draw_idle() self.figure_plot_PSD.canvas.draw_idle()
@ -1829,7 +1829,7 @@ class SampleDataTab(QWidget):
stg.frac_vol_fine[profil_position_num_fine, :], stg.frac_vol_fine[profil_position_num_fine, :],
color=color_plot_fine) color=color_plot_fine)
self.axis_plot_PSD[0].set_xscale('log') self.axis_plot_PSD[0].set_xscale('log')
self.axis_plot_PSD[0].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[0].set_xlabel('Radius (m)')
self.axis_plot_PSD[0].set_ylabel('Class size volume fraction') self.axis_plot_PSD[0].set_ylabel('Class size volume fraction')
for profil_position_num_sand, color_plot_sand in zip(position_list_sand, color_list_sand): for profil_position_num_sand, color_plot_sand in zip(position_list_sand, color_list_sand):
@ -1838,7 +1838,7 @@ class SampleDataTab(QWidget):
stg.frac_vol_sand[profil_position_num_sand, :], stg.frac_vol_sand[profil_position_num_sand, :],
color=color_plot_sand) color=color_plot_sand)
self.axis_plot_PSD[1].set_xscale('log') self.axis_plot_PSD[1].set_xscale('log')
self.axis_plot_PSD[1].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[1].set_xlabel('Radius (m)')
self.axis_plot_PSD[1].set_ylabel('Class size volume fraction') self.axis_plot_PSD[1].set_ylabel('Class size volume fraction')
elif self.combobox_PSD_plot.currentIndex() == 1: elif self.combobox_PSD_plot.currentIndex() == 1:
@ -1848,7 +1848,7 @@ class SampleDataTab(QWidget):
stg.frac_vol_fine_cumul[profil_position_num_fine, :], stg.frac_vol_fine_cumul[profil_position_num_fine, :],
color=color_plot_fine) color=color_plot_fine)
self.axis_plot_PSD[0].set_xscale('log') self.axis_plot_PSD[0].set_xscale('log')
self.axis_plot_PSD[0].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[0].set_xlabel('Radius (m)')
self.axis_plot_PSD[0].set_ylabel('Cumulative size volume fraction') self.axis_plot_PSD[0].set_ylabel('Cumulative size volume fraction')
for profil_position_num_sand, color_plot_sand in zip(position_list_sand, color_list_sand): for profil_position_num_sand, color_plot_sand in zip(position_list_sand, color_list_sand):
@ -1856,7 +1856,7 @@ class SampleDataTab(QWidget):
stg.frac_vol_sand_cumul[profil_position_num_sand, :], stg.frac_vol_sand_cumul[profil_position_num_sand, :],
color=color_plot_sand) color=color_plot_sand)
self.axis_plot_PSD[1].set_xscale('log') self.axis_plot_PSD[1].set_xscale('log')
self.axis_plot_PSD[1].set_xlabel('Radius ($\mu m$)') self.axis_plot_PSD[1].set_xlabel('Radius (m)')
self.axis_plot_PSD[1].set_ylabel('Cumulative size volume fraction') self.axis_plot_PSD[1].set_ylabel('Cumulative size volume fraction')
self.figure_plot_PSD.canvas.draw_idle() self.figure_plot_PSD.canvas.draw_idle()