diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 4ef0f9f307..cc74a87d79 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -438,7 +438,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject { * * \see JKQTPSetSystemDefaultBaseStyle(), JKQTPSetSystemDefaultBaseStyle(), getCurrentPlotterStyle(), \ref jkqtpplotter_styling */ - void loadCurrentPlotterStyle(const QSettings& settings, const QString& group="plot/"); + void loadCurrentPlotterStyle(const QSettings& settings, const QString& group="plots/"); /** \brief store the current style properties for this JKQTBasePlotter with properties loaded from \a settings * * \param settings the QSettings object to write to @@ -446,7 +446,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTBasePlotter: public QObject { * * \see JKQTPSetSystemDefaultBaseStyle(), JKQTPSetSystemDefaultBaseStyle(), getCurrentPlotterStyle(), \ref jkqtpplotter_styling */ - void saveCurrentPlotterStyle(QSettings& settings, const QString& group="plot/") const; + void saveCurrentPlotterStyle(QSettings& settings, const QString& group="plots/") const; diff --git a/lib/jkqtplotter/jkqtplotter.h b/lib/jkqtplotter/jkqtplotter.h index d926d44121..13466d24ea 100644 --- a/lib/jkqtplotter/jkqtplotter.h +++ b/lib/jkqtplotter/jkqtplotter.h @@ -889,7 +889,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget { * * \see JKQTPSetSystemDefaultStyle(), JKQTPSetSystemDefaultStyle(), getCurrentPlotterStyle(), \ref jkqtpplotter_styling */ - void loadCurrentPlotterStyle(const QSettings& settings, const QString& group="plot/", bool alsoLoadBaseStyle=true); + void loadCurrentPlotterStyle(const QSettings& settings, const QString& group="plots/", bool alsoLoadBaseStyle=true); /** \brief store the current style properties for this JKQTBasePlotter with properties loaded from \a settings * * \param settings the QSettings object to write to @@ -898,7 +898,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPlotter: public QWidget { * * \see JKQTPSetSystemDefaultStyle(), JKQTPSetSystemDefaultStyle(), getCurrentPlotterStyle(), \ref jkqtpplotter_styling */ - void saveCurrentPlotterStyle(QSettings& settings, const QString& group="plot/", bool alsoSaveBaseStyle=true) const; + void saveCurrentPlotterStyle(QSettings& settings, const QString& group="plots/", bool alsoSaveBaseStyle=true) const; /** \brief \copydoc actMouseLeftAsToolTip */ QAction *getActMouseLeftAsToolTip() const; diff --git a/lib/jkqtplotter/resources/styles/blackandwhite.ini b/lib/jkqtplotter/resources/styles/blackandwhite.ini index ec313278c0..18a93cc5d5 100644 --- a/lib/jkqtplotter/resources/styles/blackandwhite.ini +++ b/lib/jkqtplotter/resources/styles/blackandwhite.ini @@ -1,4 +1,4 @@ -[plot] +[plots] widget_background_color=white graphs\graphs_base\linewidth=1 graphs\palette=InvGray diff --git a/lib/jkqtplotter/resources/styles/blueprint.ini b/lib/jkqtplotter/resources/styles/blueprint.ini index 1459b7235f..80c1db5660 100644 --- a/lib/jkqtplotter/resources/styles/blueprint.ini +++ b/lib/jkqtplotter/resources/styles/blueprint.ini @@ -1,4 +1,4 @@ -[plot] +[plots] widget_background_color=#212571 widget_background_color_for_export=#212571 plot_background_color=transparent diff --git a/lib/jkqtplotter/resources/styles/dark.ini b/lib/jkqtplotter/resources/styles/dark.ini index 74a0e9444b..a513de89a9 100644 --- a/lib/jkqtplotter/resources/styles/dark.ini +++ b/lib/jkqtplotter/resources/styles/dark.ini @@ -1,4 +1,4 @@ -[plot] +[plots] widget_background_color=#212121 widget_background_color_for_export=#212121 plot_background_color=transparent diff --git a/lib/jkqtplotter/resources/styles/default.ini b/lib/jkqtplotter/resources/styles/default.ini index 59f1c463ab..eac68f3816 100644 --- a/lib/jkqtplotter/resources/styles/default.ini +++ b/lib/jkqtplotter/resources/styles/default.ini @@ -1,4 +1,4 @@ -[plot] +[plots] max_tooltip_distance=16 useraction_catch_sensitivity=1 useraction_overlay_color=#000045 @@ -85,18 +85,10 @@ axis_x\draw_mode2=line+ticks axis_x\line_width=1.5 axis_x\axis_lines_offset=0 axis_x\min_ticks=5 -axis_x\grid\enabled=true -axis_x\grid\color=gray -axis_x\grid\width=0.75 -axis_x\grid\style=dash axis_x\axis_label\distance=5 axis_x\axis_label\font_size=8 axis_x\axis_label\position=center axis_x\axis_label\type=exponent -axis_x\minor_grid\enabled=false -axis_x\minor_grid\color=gray -axis_x\minor_grid\style=dot -axis_x\minor_grid\width=0.5 axis_x\minor_tick\labels_enabled=false axis_x\minor_tick\inside_length=1.5 axis_x\minor_tick\label_font_size=6.4 @@ -117,24 +109,24 @@ axis_x\zero_line\enabled=true axis_x\zero_line\line_width=1.5 axis_x\zero_line\color=black axis_x\zero_line\style=solid +axis_x\grid\enabled=true +axis_x\grid\color=gray +axis_x\grid\width=0.75 +axis_x\grid\style=dash +axis_x\minor_grid\enabled=false +axis_x\minor_grid\color=gray +axis_x\minor_grid\width=0.5 +axis_x\minor_grid\style=dot axis_y\color=black axis_y\draw_mode1=all axis_y\draw_mode2=line+ticks axis_y\line_width=1.5 axis_y\axis_lines_offset=0 axis_y\min_ticks=5 -axis_y\grid\enabled=true -axis_y\grid\color=gray -axis_y\grid\width=0.75 -axis_y\grid\style=dash axis_y\axis_label\distance=5 axis_y\axis_label\font_size=8 axis_y\axis_label\position=center axis_y\axis_label\type=exponent -axis_y\minor_grid\enabled=false -axis_y\minor_grid\color=gray -axis_y\minor_grid\style=dot -axis_y\minor_grid\width=0.5 axis_y\minor_tick\labels_enabled=false axis_y\minor_tick\inside_length=1.5 axis_y\minor_tick\label_font_size=6.4 @@ -155,24 +147,24 @@ axis_y\zero_line\enabled=true axis_y\zero_line\line_width=1.5 axis_y\zero_line\color=black axis_y\zero_line\style=solid +axis_y\grid\enabled=true +axis_y\grid\color=gray +axis_y\grid\width=0.75 +axis_y\grid\style=dash +axis_y\minor_grid\enabled=false +axis_y\minor_grid\color=gray +axis_y\minor_grid\width=0.5 +axis_y\minor_grid\style=dot axis_colorbar_right\color=black axis_colorbar_right\draw_mode1=all axis_colorbar_right\draw_mode2=line+ticks axis_colorbar_right\line_width=1.5 axis_colorbar_right\axis_lines_offset=0 axis_colorbar_right\min_ticks=5 -axis_colorbar_right\grid\enabled=true -axis_colorbar_right\grid\color=gray -axis_colorbar_right\grid\width=0.75 -axis_colorbar_right\grid\style=dash axis_colorbar_right\axis_label\distance=5 axis_colorbar_right\axis_label\font_size=8 axis_colorbar_right\axis_label\position=center axis_colorbar_right\axis_label\type=exponent -axis_colorbar_right\minor_grid\enabled=false -axis_colorbar_right\minor_grid\color=gray -axis_colorbar_right\minor_grid\style=dot -axis_colorbar_right\minor_grid\width=0.5 axis_colorbar_right\minor_tick\labels_enabled=false axis_colorbar_right\minor_tick\inside_length=1.5 axis_colorbar_right\minor_tick\label_font_size=6.4 @@ -193,24 +185,24 @@ axis_colorbar_right\zero_line\enabled=true axis_colorbar_right\zero_line\line_width=1.5 axis_colorbar_right\zero_line\color=black axis_colorbar_right\zero_line\style=solid +axis_colorbar_right\grid\enabled=true +axis_colorbar_right\grid\color=gray +axis_colorbar_right\grid\width=0.75 +axis_colorbar_right\grid\style=dash +axis_colorbar_right\minor_grid\enabled=false +axis_colorbar_right\minor_grid\color=gray +axis_colorbar_right\minor_grid\width=0.5 +axis_colorbar_right\minor_grid\style=dot axis_colorbar_top\color=black axis_colorbar_top\draw_mode1=all axis_colorbar_top\draw_mode2=line+ticks axis_colorbar_top\line_width=1.5 axis_colorbar_top\axis_lines_offset=0 axis_colorbar_top\min_ticks=5 -axis_colorbar_top\grid\enabled=true -axis_colorbar_top\grid\color=gray -axis_colorbar_top\grid\width=0.75 -axis_colorbar_top\grid\style=dash axis_colorbar_top\axis_label\distance=5 axis_colorbar_top\axis_label\font_size=8 axis_colorbar_top\axis_label\position=center axis_colorbar_top\axis_label\type=exponent -axis_colorbar_top\minor_grid\enabled=false -axis_colorbar_top\minor_grid\color=gray -axis_colorbar_top\minor_grid\style=dot -axis_colorbar_top\minor_grid\width=0.5 axis_colorbar_top\minor_tick\labels_enabled=false axis_colorbar_top\minor_tick\inside_length=1.5 axis_colorbar_top\minor_tick\label_font_size=6.4 @@ -231,6 +223,14 @@ axis_colorbar_top\zero_line\enabled=true axis_colorbar_top\zero_line\line_width=1.5 axis_colorbar_top\zero_line\color=black axis_colorbar_top\zero_line\style=solid +axis_colorbar_top\grid\enabled=true +axis_colorbar_top\grid\color=gray +axis_colorbar_top\grid\width=0.75 +axis_colorbar_top\grid\style=dash +axis_colorbar_top\minor_grid\enabled=false +axis_colorbar_top\minor_grid\color=gray +axis_colorbar_top\minor_grid\width=0.5 +axis_colorbar_top\minor_grid\style=dot graphs\antialiase=true graphs\palette=Matlab graphs\auto_styles\color0=red diff --git a/lib/jkqtplotter/resources/styles/simple_axesoffset.ini b/lib/jkqtplotter/resources/styles/simple_axesoffset.ini index 19b83e24d9..fc8899e26e 100644 --- a/lib/jkqtplotter/resources/styles/simple_axesoffset.ini +++ b/lib/jkqtplotter/resources/styles/simple_axesoffset.ini @@ -1,4 +1,4 @@ -[plot] +[plots] widget_background_color=white plot_frame_width=1 plot_frame_rounded=3 diff --git a/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini b/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini index 1830ed76b0..0229d19c03 100644 --- a/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini +++ b/lib/jkqtplotter/resources/styles/simple_axesoffset_plotbox.ini @@ -1,4 +1,4 @@ -[plot] +[plots] widget_background_color=white plot_frame_visible=true plot_frame_width=1 diff --git a/lib/jkqtplotter/resources/styles/simple_gridandticks.ini b/lib/jkqtplotter/resources/styles/simple_gridandticks.ini index 3e3823caff..1520205806 100644 --- a/lib/jkqtplotter/resources/styles/simple_gridandticks.ini +++ b/lib/jkqtplotter/resources/styles/simple_gridandticks.ini @@ -1,4 +1,4 @@ -[plot] +[plots] widget_background_color=white axis_x\draw_mode1=ticks+labels+axislabel axis_x\draw_mode2=none