Skip to content

Commit

Permalink
minor code improvementa
Browse files Browse the repository at this point in the history
  • Loading branch information
@jkriege2 @Snolandia
jkriege2 authored and Snolandia committed Nov 22, 2024
1 parent f562f3d commit c3e1bcc
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
30 changes: 15 additions & 15 deletions lib/jkqtcommon/jkqtpbasicimagetools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {


{
const auto palette=JKQTPMathImageDefault_STEP;
static const auto palette=JKQTPMathImageDefault_STEP;
const QString palN="jkqtplotterdefault_step";
const QString palNT=QObject::tr("steps: JKQTPlotter Default");
lutstore[palette]=JKQTPImageTools::LUTData(palN, palNT);
Expand Down Expand Up @@ -232,7 +232,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
JKQTPPaletteList lst { jkqtp_qRgbOpaque(0xB2182B),
static const JKQTPPaletteList lst { jkqtp_qRgbOpaque(0xB2182B),
jkqtp_qRgbOpaque(0xD6604D),
jkqtp_qRgbOpaque(0xF4A582),
jkqtp_qRgbOpaque(0xFDDBC7),
Expand All @@ -248,7 +248,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
JKQTPPaletteList lst { QColor(165,0,38),
static const JKQTPPaletteList lst { QColor(165,0,38),
QColor(253,254,194),
QColor(49,54,149)
};
Expand All @@ -259,7 +259,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
JKQTPPaletteList lst { QColor(49,54,149),
static const JKQTPPaletteList lst { QColor(49,54,149),
QColor(253,254,194),
QColor(0,104,55)
};
Expand All @@ -270,7 +270,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
jkqtp_qRgbOpaque(0x8C510A),
jkqtp_qRgbOpaque(0xBF812D),
jkqtp_qRgbOpaque(0xDFC27D),
Expand All @@ -289,7 +289,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
jkqtp_qRgbOpaque(0xB35806),
jkqtp_qRgbOpaque(0xE08214),
jkqtp_qRgbOpaque(0xFDB863),
Expand All @@ -307,7 +307,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
jkqtp_qRgbOpaque(0xFFFFD9),
jkqtp_qRgbOpaque(0xEDF8B1),
jkqtp_qRgbOpaque(0xC7E9B4),
Expand All @@ -326,7 +326,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {


{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
jkqtp_qRgbOpaque(0xF7FCF0),
jkqtp_qRgbOpaque(0xE0F3DB),
jkqtp_qRgbOpaque(0xCCEBC5),
Expand All @@ -344,7 +344,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor("blue"),
QColor("green"),
QColor("red")
Expand All @@ -356,7 +356,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor("magenta"),
QColor("yellow")
};
Expand All @@ -365,7 +365,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor("red"),
QColor("blue")
};
Expand All @@ -374,7 +374,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor(142,1,82),
QColor(246,246,246),
QColor(39,100,25)
Expand All @@ -387,7 +387,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {


{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor(103,0,31),
QColor(254,254,254),
QColor(26,26,26)
Expand All @@ -399,7 +399,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor(58,76,192),
QColor(220,220,220),
QColor(179,3,38)
Expand All @@ -411,7 +411,7 @@ QMap<int, JKQTPImageTools::LUTData > JKQTPImageTools::getDefaultLUTs() {
}

{
const JKQTPPaletteList lst= {
static const JKQTPPaletteList lst= {
QColor::fromRgbF(0.0f, 0.0f, 0.3f),
QColor::fromRgbF(0.0f, 0.0f, 1.0f),
QColor::fromRgbF(1.0f, 1.0f, 1.0f),
Expand Down
2 changes: 1 addition & 1 deletion lib/jkqtplotter/graphs/jkqtpbarchart.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPBarVerticalStackableGraph: public JKQTPBarVert
JKQTPBarVerticalStackableGraph* stackParent;

/** \brief used to generate stacked plots: returns the upper boundary of the parent plot in a stack, for the index-th datapoint */
double getParentStackedMax(int index) const ;
double getParentStackedMax(int index) const override;


/** \copydoc JKQTPBarGraphBase::hasStackParent() */
Expand Down
4 changes: 2 additions & 2 deletions lib/jkqtplotter/jkqtpkey.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,8 +384,8 @@ class JKQTPLOTTER_LIB_EXPORT JKQTPMainKey: public JKQTPBaseKey {
/** \brief returns all graph classes from parent JKQTBasePlotter for the key */
QList<const JKQTPPlotElement*> getPlotElements() const;
/** \brief provides the keyStyle to use for sizing/drawing this object (extracted from the parent JKQTBasePlotters's */
virtual const JKQTPKeyStyle& keyStyle() const;
virtual const JKQTPKeyStyle& keyStyle() const override;
/** \brief provides the keyStyle to use for sizing/drawing this object */
virtual JKQTPKeyStyle& keyStyle();
virtual JKQTPKeyStyle& keyStyle() override;
};
#endif // JKQTPKEY_H

0 comments on commit c3e1bcc

Please sign in to comment.