* additional JKQTPColorDerivationMode

* bugfixes for Boxplots
* style improvements
This commit is contained in:
jkriege2 2020-09-28 15:37:45 +02:00
parent a371dc86a5
commit 48ec6060ab
12 changed files with 110 additions and 69 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 KiB

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

After

Width:  |  Height:  |  Size: 95 KiB

View File

@ -381,7 +381,7 @@ void JKQTPBoxplotElementBase::setPercentile75(double __value)
this->percentile75 = __value;
}
void JKQTPBoxplotElementBase::setData(double pos, double min, double q75, double median, double mean, double q25, double max)
void JKQTPBoxplotElementBase::setData(double pos, double min, double q25, double median, double mean, double q75, double max)
{
this->pos=pos;
this->min=min;

View File

@ -247,7 +247,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBoxplotElementBase: public JKQTPPlotElement, p
/** \copydoc percentile75 */
void setPercentile75(double __value);
/** \brief set all properties of the plot at once \see pos, median, min, mean, max, percentile25, percentile75 */
void setData(double pos, double min, double q75, double median, double mean, double q25, double max);
void setData(double pos, double min, double q25, double median, double mean, double q75, double max);
/** \copydoc drawMedian */
void setDrawMedian(bool __value);

View File

@ -1012,6 +1012,9 @@ JKQTBasePlotter::JKQTPPen JKQTBasePlotter::getPlotStyle(int i, JKQTPPlotStyleTyp
if (type==JKQTPPlotStyleType::Barchart || type==JKQTPPlotStyleType::Boxplot || type==JKQTPPlotStyleType::Impulses) {
basePenStyle=Qt::SolidLine;
}
if (type==JKQTPPlotStyleType::Boxplot) {
basebrushStyle=Qt::SolidPattern;
}
const QColor lineColor=JKQTPGetDerivedColor(baseProps.graphColorDerivationMode, baseColor);
const QColor errorColor=JKQTPGetDerivedColor(baseProps.errorColorDerivationMode, baseColor);

View File

@ -49,11 +49,14 @@ void JKQTGraphsSpecificStyleProperties::modifyForDefaultStyle(JKQTPPlotStyleType
case JKQTPPlotStyleType::Boxplot:
defaultLineWidth=1;
fillColorDerivationMode=JKQTPFFCMWhite;
graphColorDerivationMode=JKQTPFFCMSameNonTransparentColor;
break;
case JKQTPPlotStyleType::Annotation:
graphColorDerivationMode=JKQTPFFCMSameNonTransparentColor;
defaultSymbolSize=16;
break;
case JKQTPPlotStyleType::Geometric:
graphColorDerivationMode=JKQTPFFCMSameNonTransparentColor;
fillColorDerivationMode=JKQTPFFCMFullyTransparentColor;
break;
}

View File

@ -385,26 +385,32 @@ QString JKQTPColorDerivationMode2String(JKQTPColorDerivationMode mode)
case JKQTPFFCMGrey25: return "grey25";
case JKQTPFFCMGrey50: return "grey50";
case JKQTPFFCMGrey75: return "grey75";
case JKQTPFFCMTransparentBlack: return "transparent_black";
case JKQTPFFCMTransparentWhite: return "transparent_white";
case JKQTPFFCMTransparentGrey25: return "transparent_grey25";
case JKQTPFFCMTransparentGrey50: return "transparent_grey50";
case JKQTPFFCMTransparentGrey75: return "transparent_grey75";
case JKQTPFFCMBlackTransparent: return "black_transparent";
case JKQTPFFCMWhiteTransparent: return "white_transparent";
case JKQTPFFCMGrey25Transparent: return "grey25_transparent";
case JKQTPFFCMGrey50Transparent: return "grey50_transparent";
case JKQTPFFCMGrey75Transparent: return "grey75_transparent";
case JKQTPFFCMSameColor: return "same";
case JKQTPFFCMInvertedColor: return "inverted";
case JKQTPFFCMTransparentInvertedColor: return "transparent_inverted";
case JKQTPFFCMInvertedTransparentColor: return "inverted_transparent";
case JKQTPFFCMInvertedNonTransparentColor: return "inverted_non_transparent";
case JKQTPFFCMLighterColor: return "lighter";
case JKQTPFFCMEvenLighterColor: return "even_lighter";
case JKQTPFFCMDarkerColor: return "darker";
case JKQTPFFCMEvenDarkerColor: return "even_darker";
case JKQTPFFCMLighterAndTransparentColor: return "lighter_and_transparent";
case JKQTPFFCMEvenLighterAndTransparentColor: return "even_lighter_and_transparent";
case JKQTPFFCMDarkerAndTransparentColor: return "darker_and_transparent";
case JKQTPFFCMEvenDarkerAndTransparentColor: return "even_darker_and_transparent";
case JKQTPFFCMMoreTransparentColor: return "more_transparent";
case JKQTPFFCMEvenMoreTransparentColor: return "even_more_transparent";
case JKQTPFFCMLessTransparentColor: return "less_transparent";
case JKQTPFFCMEvenLessTransparentColor: return "even_less_transparent";
case JKQTPFFCMLighterAndTransparentColor: return "lighter_transparent";
case JKQTPFFCMEvenLighterAndTransparentColor: return "even_lighter_transparent";
case JKQTPFFCMDarkerAndTransparentColor: return "darker_transparent";
case JKQTPFFCMEvenDarkerAndTransparentColor: return "even_darker_transparent";
case JKQTPFFCMLighterAndNonTransparentColor: return "lighter_non_transparent";
case JKQTPFFCMEvenLighterAndNonTransparentColor: return "even_lighter_non_transparent";
case JKQTPFFCMDarkerAndNonTransparentColor: return "darker_non_transparent";
case JKQTPFFCMEvenDarkerAndNonTransparentColor: return "even_darker_non_transparent";
case JKQTPFFCMSameMoreTransparentColor: return "same_more_transparent";
case JKQTPFFCMSameEvenMoreTransparentColor: return "same_even_more_transparent";
case JKQTPFFCMSameLessTransparentColor: return "same_less_transparent";
case JKQTPFFCMSameEvenLessTransparentColor: return "same_even_less_transparent";
case JKQTPFFCMSameNonTransparentColor: return "same_non_transparent";
}
return "same";
}
@ -412,88 +418,109 @@ QString JKQTPColorDerivationMode2String(JKQTPColorDerivationMode mode)
JKQTPColorDerivationMode String2JKQTPColorDerivationMode(const QString &mode)
{
const QString m=mode.trimmed().toLower();
if (m=="transparent" || m=="no_color") return JKQTPFFCMFullyTransparentColor;
if (m=="same") return JKQTPFFCMSameColor;
if (m=="transparent" || m=="no_color" || m=="none") return JKQTPFFCMFullyTransparentColor;
if (m=="same"||m=="same_color") return JKQTPFFCMSameColor;
if (m=="black") return JKQTPFFCMBlack;
if (m=="white") return JKQTPFFCMWhite;
if (m=="grey25") return JKQTPFFCMGrey25;
if (m=="grey50") return JKQTPFFCMGrey50;
if (m=="grey75") return JKQTPFFCMGrey75;
if (m=="transparent_black" || m=="black_transparent") return JKQTPFFCMTransparentBlack;
if (m=="transparent_white" || m=="white_transparent") return JKQTPFFCMTransparentWhite;
if (m=="transparent_grey25" || m=="grey25_transparent") return JKQTPFFCMTransparentGrey25;
if (m=="transparent_grey50" || m=="grey50_transparent") return JKQTPFFCMTransparentGrey50;
if (m=="transparent_grey75" || m=="grey75_transparent") return JKQTPFFCMTransparentGrey75;
if (m=="transparent_black" || m=="black_transparent") return JKQTPFFCMBlackTransparent;
if (m=="transparent_white" || m=="white_transparent") return JKQTPFFCMWhiteTransparent;
if (m=="transparent_grey25" || m=="grey25_transparent") return JKQTPFFCMGrey25Transparent;
if (m=="transparent_grey50" || m=="grey50_transparent") return JKQTPFFCMGrey50Transparent;
if (m=="transparent_grey75" || m=="grey75_transparent") return JKQTPFFCMGrey75Transparent;
if (m=="inverted") return JKQTPFFCMInvertedColor;
if (m=="transparent_inverted" || m=="inverted_transparent") return JKQTPFFCMTransparentInvertedColor;
if (m=="transparent_inverted" || m=="inverted_transparent") return JKQTPFFCMInvertedTransparentColor;
if (m=="non_transparent_inverted" || m=="inverted_non_transparent") return JKQTPFFCMInvertedNonTransparentColor;
if (m=="lighter") return JKQTPFFCMLighterColor;
if (m=="even_lighter") return JKQTPFFCMEvenLighterColor;
if (m=="darker") return JKQTPFFCMDarkerColor;
if (m=="even_darker") return JKQTPFFCMEvenDarkerColor;
if (m=="lighter_and_transparent") return JKQTPFFCMLighterAndTransparentColor;
if (m=="even_lighter_and_transparent") return JKQTPFFCMEvenLighterAndTransparentColor;
if (m=="darker_and_transparent") return JKQTPFFCMDarkerAndTransparentColor;
if (m=="even_darker_and_transparent") return JKQTPFFCMEvenDarkerAndTransparentColor;
if (m=="more_transparent") return JKQTPFFCMMoreTransparentColor;
if (m=="even_more_transparent") return JKQTPFFCMEvenMoreTransparentColor;
if (m=="less_transparent") return JKQTPFFCMLessTransparentColor;
if (m=="even_less_transparent") return JKQTPFFCMEvenLessTransparentColor;
if (m=="lighter_transparent"||m=="lighter_and_transparent") return JKQTPFFCMLighterAndTransparentColor;
if (m=="even_lighter_transparent"||m=="even_lighter_and_transparent") return JKQTPFFCMEvenLighterAndTransparentColor;
if (m=="darker_transparent"||m=="darker_and_transparent") return JKQTPFFCMDarkerAndTransparentColor;
if (m=="even_darker_transparent"||m=="even_darker_and_transparent") return JKQTPFFCMEvenDarkerAndTransparentColor;
if (m=="lighter_non_transparent"||m=="lighter_and_non_transparent") return JKQTPFFCMLighterAndNonTransparentColor;
if (m=="even_lighter_non_transparent"||m=="even_lighter_and_non_transparent") return JKQTPFFCMEvenLighterAndNonTransparentColor;
if (m=="darker_non_transparent"||m=="darker_and_non_transparent") return JKQTPFFCMDarkerAndNonTransparentColor;
if (m=="even_darker_non_transparent"||m=="even_darker_and_non_transparent") return JKQTPFFCMEvenDarkerAndNonTransparentColor;
if (m=="same_more_transparent"||m=="more_transparent") return JKQTPFFCMSameMoreTransparentColor;
if (m=="same_even_more_transparent"||m=="even_more_transparent") return JKQTPFFCMSameEvenMoreTransparentColor;
if (m=="same_less_transparent"||m=="less_transparent") return JKQTPFFCMSameLessTransparentColor;
if (m=="same_even_less_transparent"||m=="even_less_transparent") return JKQTPFFCMSameEvenLessTransparentColor;
if (m=="same_non_transparent" || m=="non_transparent") return JKQTPFFCMSameNonTransparentColor;
return JKQTPFFCMSameColor;
}
QColor JKQTPGetDerivedColor(JKQTPColorDerivationMode mode, const QColor &basecolor)
{
switch(mode) {
case JKQTPFFCMSameColor: return basecolor;
case JKQTPFFCMFullyTransparentColor: return QColor(Qt::transparent);
case JKQTPFFCMBlack: return QColor(Qt::black);
case JKQTPFFCMWhite: return QColor(Qt::white);
case JKQTPFFCMGrey25: return QColor(64,64,64);
case JKQTPFFCMGrey50: return QColor(127,127,127);
case JKQTPFFCMGrey75: return QColor(191,191,191);
case JKQTPFFCMTransparentBlack: return QColor(0,0,0,175);
case JKQTPFFCMTransparentWhite: return QColor(255,255,255,175);
case JKQTPFFCMTransparentGrey25: return QColor(64,64,64,175);
case JKQTPFFCMTransparentGrey50: return QColor(127,127,127,175);
case JKQTPFFCMTransparentGrey75: return QColor(191,191,191,175);
case JKQTPFFCMBlackTransparent: return QColor(0,0,0,175);
case JKQTPFFCMWhiteTransparent: return QColor(255,255,255,175);
case JKQTPFFCMGrey25Transparent: return QColor(64,64,64,175);
case JKQTPFFCMGrey50Transparent: return QColor(127,127,127,175);
case JKQTPFFCMGrey75Transparent: return QColor(191,191,191,175);
case JKQTPFFCMSameColor:
case JKQTPFFCMSameNonTransparentColor: {
QColor c=basecolor;
if (mode==JKQTPFFCMSameNonTransparentColor) c.setAlphaF(1.0);
return c;
}
case JKQTPFFCMSameMoreTransparentColor: { QColor c=basecolor; c.setAlphaF(0.66*c.alphaF()); return c; }
case JKQTPFFCMSameEvenMoreTransparentColor: { QColor c=basecolor; c.setAlphaF(0.33*c.alphaF()); return c; }
case JKQTPFFCMSameLessTransparentColor: { QColor c=basecolor; c.setAlphaF(c.alphaF()+(1.0-c.alphaF())*0.33); return c; }
case JKQTPFFCMSameEvenLessTransparentColor: { QColor c=basecolor; c.setAlphaF(c.alphaF()+(1.0-c.alphaF())*0.66); return c; }
case JKQTPFFCMInvertedColor:
case JKQTPFFCMTransparentInvertedColor: {
case JKQTPFFCMInvertedTransparentColor:
case JKQTPFFCMInvertedNonTransparentColor: {
QColor c(255-basecolor.red(), 255-basecolor.green(), 255-basecolor.blue(), basecolor.alpha());
if (mode==JKQTPFFCMTransparentInvertedColor) c.setAlphaF(0.66*c.alphaF());
if (mode==JKQTPFFCMInvertedTransparentColor) c.setAlphaF(0.66*c.alphaF());
if (mode==JKQTPFFCMInvertedNonTransparentColor) c.setAlphaF(1.0);
return c;
}
case JKQTPFFCMLighterColor:
case JKQTPFFCMLighterAndTransparentColor:{
case JKQTPFFCMLighterAndTransparentColor:
case JKQTPFFCMLighterAndNonTransparentColor: {
QColor c=basecolor.lighter();
if (basecolor==QColor("black")) c=QColor(64,64,64);
if (mode==JKQTPFFCMLighterAndTransparentColor) c.setAlphaF(0.66*c.alphaF());
if (mode==JKQTPFFCMLighterAndNonTransparentColor) c.setAlphaF(1.0);
return c;
}
case JKQTPFFCMEvenLighterColor:
case JKQTPFFCMEvenLighterAndTransparentColor: {
case JKQTPFFCMEvenLighterAndTransparentColor:
case JKQTPFFCMEvenLighterAndNonTransparentColor: {
QColor c=basecolor.lighter().lighter();
if (basecolor==QColor("black")) c=QColor(127,127,127);
if (mode==JKQTPFFCMEvenLighterAndTransparentColor) c.setAlphaF(0.66*c.alphaF());
if (mode==JKQTPFFCMEvenLighterAndNonTransparentColor) c.setAlphaF(1.0);
return c;
}
case JKQTPFFCMDarkerColor:
case JKQTPFFCMDarkerAndTransparentColor: {
case JKQTPFFCMDarkerAndTransparentColor:
case JKQTPFFCMDarkerAndNonTransparentColor: {
QColor c=basecolor.darker();
if (basecolor==QColor("white")) c= QColor(191,191,191);
if (mode==JKQTPFFCMDarkerAndTransparentColor) c.setAlphaF(0.66*c.alphaF());
if (mode==JKQTPFFCMDarkerAndNonTransparentColor) c.setAlphaF(1.0);
return c;
}
case JKQTPFFCMEvenDarkerColor:
case JKQTPFFCMEvenDarkerAndTransparentColor: {
case JKQTPFFCMEvenDarkerAndTransparentColor:
case JKQTPFFCMEvenDarkerAndNonTransparentColor: {
QColor c=basecolor.darker().darker();
if (basecolor==QColor("white")) c= QColor(127,127,127);
if (mode==JKQTPFFCMEvenDarkerAndTransparentColor) c.setAlphaF(0.66*c.alphaF());
if (mode==JKQTPFFCMEvenDarkerAndNonTransparentColor) c.setAlphaF(1.0);
return c;
}
case JKQTPFFCMMoreTransparentColor: { QColor c=basecolor; c.setAlphaF(0.66*c.alphaF()); return c; }
case JKQTPFFCMEvenMoreTransparentColor: { QColor c=basecolor; c.setAlphaF(0.33*c.alphaF()); return c; }
case JKQTPFFCMLessTransparentColor: { QColor c=basecolor; c.setAlphaF(c.alphaF()+(1.0-c.alphaF())*0.33); return c; }
case JKQTPFFCMEvenLessTransparentColor: { QColor c=basecolor; c.setAlphaF(c.alphaF()+(1.0-c.alphaF())*0.66); return c; }
}
return basecolor;
}

View File

@ -230,14 +230,20 @@ enum JKQTPColorDerivationMode {
JKQTPFFCMGrey50, /*!< \brief fill with 50% grey */
JKQTPFFCMGrey25, /*!< \brief fill with 25% grey */
JKQTPFFCMWhite, /*!< \brief fill with white */
JKQTPFFCMTransparentBlack, /*!< \brief fill with black, slightly transparent */
JKQTPFFCMTransparentGrey75, /*!< \brief fill with 75% grey, slightly transparent */
JKQTPFFCMTransparentGrey50, /*!< \brief fill with 50% grey, slightly transparent */
JKQTPFFCMTransparentGrey25, /*!< \brief fill with 25% grey, slightly transparent */
JKQTPFFCMTransparentWhite, /*!< \brief fill with white, slightly transparent */
JKQTPFFCMBlackTransparent, /*!< \brief fill with black, slightly transparent */
JKQTPFFCMGrey75Transparent, /*!< \brief fill with 75% grey, slightly transparent */
JKQTPFFCMGrey50Transparent, /*!< \brief fill with 50% grey, slightly transparent */
JKQTPFFCMGrey25Transparent, /*!< \brief fill with 25% grey, slightly transparent */
JKQTPFFCMWhiteTransparent, /*!< \brief fill with white, slightly transparent */
JKQTPFFCMSameColor, /*!< \brief fill with the same color */
JKQTPFFCMSameNonTransparentColor, /*!< \brief fill with the same color, but remove any transparency (if any) */
JKQTPFFCMSameMoreTransparentColor, /*!< \brief fill with the a partly transparent color */
JKQTPFFCMSameEvenMoreTransparentColor, /*!< \brief fill with the a more transparent color than JKQTPFFCMMoreTransparentColor */
JKQTPFFCMSameLessTransparentColor, /*!< \brief fill with the a partly transparent color */
JKQTPFFCMSameEvenLessTransparentColor, /*!< \brief fill with the a more transparent color than JKQTPFFCMLessTransparentColor*/
JKQTPFFCMInvertedColor, /*!< \brief fill with the inverted color */
JKQTPFFCMTransparentInvertedColor, /*!< \brief fill with the inverted color, slightly transparent */
JKQTPFFCMInvertedTransparentColor, /*!< \brief fill with the inverted color, slightly transparent */
JKQTPFFCMInvertedNonTransparentColor, /*!< \brief fill with the inverted color, non-transparent (even if the basecolor had some transparency) */
JKQTPFFCMLighterColor, /*!< \brief fill with the a lighter color */
JKQTPFFCMEvenLighterColor, /*!< \brief fill with the an even lighter color than JKQTPFFCMLighterColor */
JKQTPFFCMDarkerColor, /*!< \brief fill with the a darker color */
@ -246,10 +252,10 @@ enum JKQTPColorDerivationMode {
JKQTPFFCMEvenLighterAndTransparentColor, /*!< \brief fill with the an even lighter color than JKQTPFFCMLighterColor, that is in addition a bit transparent */
JKQTPFFCMDarkerAndTransparentColor, /*!< \brief fill with the a darker color, that is in addition a bit transparent */
JKQTPFFCMEvenDarkerAndTransparentColor, /*!< \brief fill with the an even darker color than JKQTPFFCMDarkerColor, that is in addition a bit transparent */
JKQTPFFCMMoreTransparentColor, /*!< \brief fill with the a partly transparent color */
JKQTPFFCMEvenMoreTransparentColor, /*!< \brief fill with the a more transparent color than JKQTPFFCMMoreTransparentColor */
JKQTPFFCMLessTransparentColor, /*!< \brief fill with the a partly transparent color */
JKQTPFFCMEvenLessTransparentColor, /*!< \brief fill with the a more transparent color than JKQTPFFCMLessTransparentColor*/
JKQTPFFCMLighterAndNonTransparentColor, /*!< \brief fill with the a lighter color, that is non-transparent (even if the basecolor had some transparency) */
JKQTPFFCMEvenLighterAndNonTransparentColor, /*!< \brief fill with the an even lighter color than JKQTPFFCMLighterColor, that is non-transparent (even if the basecolor had some transparency) */
JKQTPFFCMDarkerAndNonTransparentColor, /*!< \brief fill with the a darker color, that is non-transparent (even if the basecolor had some transparency) */
JKQTPFFCMEvenDarkerAndNonTransparentColor, /*!< \brief fill with the an even darker color than JKQTPFFCMDarkerColor, that is non-transparent (even if the basecolor had some transparency) */
};
/** \brief use a JKQTPColorDerivationMode to derive a color from \a col as specified

View File

@ -10,6 +10,7 @@ graphs\graphs_base\error_fill_color_mode=even_lighter_and_transparent
graphs\graphs_base\symbol_fill_color_mode=grey75
graphs\graphs_annotation\fill_color_mode=transparent
graphs\graphs_barchart\linewidth=1
graphs\graphs_boxplot\fill_color_mode=white
text_default_size=10
text_default_font_name=XITS
plot_label_font_name=XITS

View File

@ -9,6 +9,7 @@ graphs\graphs_base\symbol_fill_color_mode=darker
graphs\graphs_base\error_color_mode=lighter
graphs\graphs_barchart\linewidth=0
graphs\graphs_barchart\fill_color_mode=same
graphs\graphs_boxplot\graph_color_mode=same_non_transparent
graphs\graphs_filled\fill_color_mode=more_transparent
graphs\graphs_geometric\color=white
graphs\graphs_annotation\color=white

View File

@ -327,7 +327,7 @@ graphs\graphs_base\error_fill_style=solid
graphs\graphs_base\graph_color_mode=same
graphs\graphs_base\fill_color_mode=lighter
graphs\graphs_base\error_color_mode=darker
graphs\graphs_base\error_fill_color_mode=lighter_and_transparent
graphs\graphs_base\error_fill_color_mode=lighter_transparent
graphs\graphs_base\symbol_fill_color_mode=lighter
graphs\graphs_barchart\linewidth=0
graphs\graphs_barchart\symbol_size=10
@ -339,7 +339,7 @@ graphs\graphs_barchart\error_fill_style=solid
graphs\graphs_barchart\graph_color_mode=lighter
graphs\graphs_barchart\fill_color_mode=lighter
graphs\graphs_barchart\error_color_mode=darker
graphs\graphs_barchart\error_fill_color_mode=lighter_and_transparent
graphs\graphs_barchart\error_fill_color_mode=lighter_transparent
graphs\graphs_barchart\symbol_fill_color_mode=lighter
graphs\graphs_boxplot\linewidth=1
graphs\graphs_boxplot\symbol_size=10
@ -348,10 +348,10 @@ graphs\graphs_boxplot\error_indicator_width=1
graphs\graphs_boxplot\head_decorator_size_factor=8
graphs\graphs_boxplot\head_decorator_type=filled_arrow
graphs\graphs_boxplot\error_fill_style=solid
graphs\graphs_boxplot\graph_color_mode=same
graphs\graphs_boxplot\graph_color_mode=same_non_transparent
graphs\graphs_boxplot\fill_color_mode=white
graphs\graphs_boxplot\error_color_mode=darker
graphs\graphs_boxplot\error_fill_color_mode=lighter_and_transparent
graphs\graphs_boxplot\error_fill_color_mode=lighter_transparent
graphs\graphs_boxplot\symbol_fill_color_mode=lighter
graphs\graphs_filled\linewidth=2
graphs\graphs_filled\symbol_size=10
@ -361,9 +361,9 @@ graphs\graphs_filled\head_decorator_size_factor=8
graphs\graphs_filled\head_decorator_type=filled_arrow
graphs\graphs_filled\error_fill_style=solid
graphs\graphs_filled\graph_color_mode=same
graphs\graphs_filled\fill_color_mode=lighter_and_transparent
graphs\graphs_filled\fill_color_mode=lighter_transparent
graphs\graphs_filled\error_color_mode=darker
graphs\graphs_filled\error_fill_color_mode=lighter_and_transparent
graphs\graphs_filled\error_fill_color_mode=lighter_transparent
graphs\graphs_filled\symbol_fill_color_mode=lighter
graphs\graphs_impulses\linewidth=3
graphs\graphs_impulses\symbol_size=10
@ -375,7 +375,7 @@ graphs\graphs_impulses\error_fill_style=solid
graphs\graphs_impulses\graph_color_mode=same
graphs\graphs_impulses\fill_color_mode=lighter
graphs\graphs_impulses\error_color_mode=darker
graphs\graphs_impulses\error_fill_color_mode=lighter_and_transparent
graphs\graphs_impulses\error_fill_color_mode=lighter_transparent
graphs\graphs_impulses\symbol_fill_color_mode=lighter
graphs\graphs_geometric\linewidth=2
graphs\graphs_geometric\symbol_size=10
@ -384,10 +384,10 @@ graphs\graphs_geometric\error_indicator_width=1
graphs\graphs_geometric\head_decorator_size_factor=8
graphs\graphs_geometric\head_decorator_type=filled_arrow
graphs\graphs_geometric\error_fill_style=solid
graphs\graphs_geometric\graph_color_mode=same
graphs\graphs_geometric\graph_color_mode=same_non_transparent
graphs\graphs_geometric\fill_color_mode=transparent
graphs\graphs_geometric\error_color_mode=darker
graphs\graphs_geometric\error_fill_color_mode=lighter_and_transparent
graphs\graphs_geometric\error_fill_color_mode=lighter_transparent
graphs\graphs_geometric\symbol_fill_color_mode=lighter
graphs\graphs_geometric\color=black
graphs\graphs_geometric\line_style=solid
@ -400,10 +400,10 @@ graphs\graphs_annotation\error_indicator_width=1
graphs\graphs_annotation\head_decorator_size_factor=8
graphs\graphs_annotation\head_decorator_type=filled_arrow
graphs\graphs_annotation\error_fill_style=solid
graphs\graphs_annotation\graph_color_mode=same
graphs\graphs_annotation\graph_color_mode=same_non_transparent
graphs\graphs_annotation\fill_color_mode=lighter
graphs\graphs_annotation\error_color_mode=darker
graphs\graphs_annotation\error_fill_color_mode=lighter_and_transparent
graphs\graphs_annotation\error_fill_color_mode=lighter_transparent
graphs\graphs_annotation\symbol_fill_color_mode=lighter
graphs\graphs_annotation\color=black
graphs\graphs_annotation\line_style=solid