mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-11-15 10:05:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed several (pedantic) compiler warnings

Browse Source 
fixed CMake problems
This commit is contained in:
jkriege2 2022-07-23 16:05:13 +02:00
parent 8558896f9b
commit c399959774
15 changed files with 74 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/jkqtplotter_deployqt.cmake
View File

@ -8,7 +8,14 @@ function(jkqtplotter_deployqt TARGET_NAME)
find_program(WINDEPLOYQT_EXECUTABLE NAMES windeployqt.debug.bat HINTS "${_qt_bin_dir}")
else()
find_program(WINDEPLOYQT_EXECUTABLE NAMES windeployqt HINTS "${_qt_bin_dir}")
endif()
endif()
if (NOT EXISTS ${WINDEPLOYQT_EXECUTABLE})
find_program(WINDEPLOYQT_EXECUTABLE NAMES windeployqt HINTS "${_qt_bin_dir}")
endif()
if (NOT EXISTS ${WINDEPLOYQT_EXECUTABLE})
find_program(WINDEPLOYQT_EXECUTABLE NAMES windeployqt.exe HINTS "${_qt_bin_dir}")
endif()

6
examples/filledgraphs/filledgraphs.cpp
View File

@ -67,11 +67,11 @@ int main(int argc, char* argv[])
// set graph colors (lines: non-transparent, fill: semi-transparent) and style
QColor col;
col=QColor("red"); graphR->setColor(col);
col.setAlphaF(0.25); graphR->setFillColor(col);
col.setAlphaF(0.25f); graphR->setFillColor(col);
col=QColor("green"); graphG->setColor(col);
col.setAlphaF(0.25); graphG->setFillColor(col);
col.setAlphaF(0.25f); graphG->setFillColor(col);
col=QColor("blue"); graphB->setColor(col);
col.setAlphaF(0.25); graphB->setFillColor(col);
col.setAlphaF(0.25f); graphB->setFillColor(col);
graphR->setLineWidth(1);
graphG->setLineWidth(1);
graphB->setLineWidth(1);

2
examples/jkqtmathtext_test/testform.cpp
View File

@ -518,7 +518,7 @@ void TestForm::updateMath()
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
QString mathTest="";
//QString symbolTest="\\lfloor\\rfloor\\lceil\\rceil\\langle\\rangle\\sum\\int \\iint \\oint \\prod \\leftrightarrow \\leftarrow\\Leftarrow\\rightarrow\\Rightarrow\\pm\\mp\\leq\\geq\\ll\\gg\\hbar\\euro\\bbC\\bbH\\bbN\\bbP\\bbQ\\bbZ\\bbR\\Angstrom\\Alef\\Bet\\Gimel\\Dalet\\nexists\\ni\\notni\\circ\\tilde\\oiint\\oiiint\\emptyset\\odot\\ominus\\subsetnot\\DC\\bot\\cdots\\perthousand\\leftharpoonup\\rightharpoonup \\upharpoonleft \\downharpoonleft \\leftrightharpoon \\rightleftharpoon \\coprod \\leftharpoondown \\rightharpoondown \\nwarrow \\nearrow \\mapsto \\cent \\pound \\yen \\div \\multimap \\maporiginal \\mapimage \\bigcap \\bigcup \\benzene \\times \\cdot \\propto \\equiv \\Im \\Re \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ ";
//QString mathTest="$\\left\\|\\stackrel{1}{2}\\right\\|\\cdot\\left|\\begin{Bmatrix}1123&2^2&\\frac{3}{4}\\\\4&5_5&6\\\\72_8&8_{\\text{längerer Index}}&9&10&11\\end{Bmatrix}\\right|\\cdots f(x)$";
//QString mathTest="$\\left\\|\\stackrel{1}{2}\\right\\|\\cdot\\left|\\begin{Bmatrix}1123&2^2&\\frac{3}{4}\\\\4&5_5&6\\\\72_8&8_{\\text{l\"{a}erer Index}}&9&10&11\\end{Bmatrix}\\right|\\cdots f(x)$";
//QString mathTest="0";
//QString text="x_0 \\sqrt{a^2+b^2}\\underbrace{underbrace}{x_0} (\\bf{Test})\\_\\it{Text} ... ! Equator\\alpha\\beta $f(x)=\\sin(x{\\cdot}y)$ \\ul{Text\\ol{\\gamma}} \\script{Script}, \\tt{Typewriter}, \\sf{sans serif}";
//QString text="$\\sum_{i=0_{j=-1_{k=-45}}}^{n^{m^{123456789}}}\\left(\\left(\\left(\\int_0^\\inf\\left[r+i^{\\left\\{2^2\\right\\}}\\right]{\\dd}r\\right)\\right)\\right)$ \\bf{Test}\\_\\it{Text} ... ! \\sc{&Equator \\&}\\alpha\\beta $f(x)=\\sin(x\\cdot\\cos(a+{\\ii}b))$ \\ul{Text\\gamma} \\script{Script-Text}\\tt{ and Typewriter} \\sf{also sans serif}";

6
lib/CMakeLists.txt
View File

@ -39,6 +39,12 @@ message( STATUS "Installing to: ${CMAKE_INSTALL_PREFIX}" )
message( STATUS "=============================================================================" )
message( STATUS )
message( STATUS )
message( STATUS "............................................................................." )
message( STATUS ".. BUILDING LIBRARIES" )
message( STATUS "............................................................................." )
configure_file(${CMAKE_CURRENT_LIST_DIR}/jkqtplotter_version.h.in
${CMAKE_CURRENT_BINARY_DIR}/jkqtplotter_version.h)

4
lib/jkqtcommon/private/jkqtcommon_precomp.h
View File

@ -23,7 +23,9 @@
You should have received a copy of the GNU Lesser General Public License (LGPL)
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _USE_MATH_DEFINES
#ifndef _USE_MATH_DEFINES
# define _USE_MATH_DEFINES
#endif
#include <QColor>

4
lib/jkqtcommon_statistics_and_math/jkqtpmathparser.cpp
View File

@ -20,7 +20,9 @@
#define COMPILING_THIS_JKMATHPARSER
#define _USE_MATH_DEFINES
#ifndef _USE_MATH_DEFINES
# define _USE_MATH_DEFINES
#endif
#include <cmath>
#include "jkqtcommon_statistics_and_math/jkqtpmathparser.h" // class's header file
#include <iostream>

4
lib/jkqtcommon_statistics_and_math/private/jkqtcommon_statistics_and_math_precomp.h
View File

@ -23,7 +23,9 @@
You should have received a copy of the GNU Lesser General Public License (LGPL)
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _USE_MATH_DEFINES
#ifndef _USE_MATH_DEFINES
# define _USE_MATH_DEFINES
#endif
#include <QtGlobal>
#include <cfloat>

4
lib/jkqtfastplotter/CMakeLists.txt
View File

@ -40,6 +40,10 @@ function(JKQtFastPlotter_setDefaultLibOptions TARGETNAME)
set_property(TARGET ${TARGETNAME} PROPERTY CXX_STANDARD ${JKQtPlotter_QT_CXX_STANDARD})
set_property(TARGET ${TARGETNAME} PROPERTY CXX_STANDARD_REQUIRED ${JKQtPlotter_QT_CXX_STANDARD_REQUIRED})
target_compile_features(${TARGETNAME} PUBLIC ${JKQtPlotter_QT_CXX_COMPILE_FEATURE})
if(${QT_VERSION_MAJOR} VERSION_GREATER_EQUAL "6")
target_link_libraries(${TARGETNAME} PUBLIC Qt${QT_VERSION_MAJOR}::OpenGLWidgets)
endif()
if(MINGW)
# COMPILER-SETTINGS FOR MINGW
target_compile_options(${TARGETNAME} PUBLIC -fexceptions)

4
lib/jkqtmathtext/private/jkqtmathtext_precomp.h
View File

@ -24,7 +24,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define _USE_MATH_DEFINES
#ifndef _USE_MATH_DEFINES
# define _USE_MATH_DEFINES
#endif
#include "jkqtcommon/jkqtpcodestructuring.h"
#include "jkqtcommon/jkqtpstringtools.h"

16
lib/jkqtplotter/graphs/jkqtpbarchart.cpp
View File

@ -150,7 +150,7 @@ void JKQTPBarVerticalGraph::setBarPositionColumn(int column)
void JKQTPBarVerticalGraph::setBarPositionColumn(size_t column)
{
xColumn=column;
xColumn=static_cast<int>(column);
}
void JKQTPBarVerticalGraph::setBarHeightColumn(int column)
@ -160,7 +160,7 @@ void JKQTPBarVerticalGraph::setBarHeightColumn(int column)
void JKQTPBarVerticalGraph::setBarHeightColumn(size_t column)
{
yColumn=column;
yColumn=static_cast<int>(column);
}
bool JKQTPBarVerticalGraph::considerForAutoscaling(JKQTPBarGraphBase *other) const
@ -206,7 +206,7 @@ void JKQTPBarHorizontalGraph::setBarPositionColumn(int column)
void JKQTPBarHorizontalGraph::setBarPositionColumn(size_t column)
{
yColumn=column;
yColumn=static_cast<int>(column);
}
void JKQTPBarHorizontalGraph::setBarHeightColumn(int column)
@ -216,7 +216,7 @@ void JKQTPBarHorizontalGraph::setBarHeightColumn(int column)
void JKQTPBarHorizontalGraph::setBarHeightColumn(size_t column)
{
xColumn=column;
xColumn=static_cast<int>(column);
}
bool JKQTPBarHorizontalGraph::considerForAutoscaling(JKQTPBarGraphBase *other) const
@ -397,7 +397,7 @@ void JKQTPBarHorizontalErrorGraph::setBarErrorColumn(int column)
void JKQTPBarHorizontalErrorGraph::setBarErrorColumn(size_t column)
{
setXErrorColumn(column);
setXErrorColumn(static_cast<int>(column));
}
void JKQTPBarHorizontalErrorGraph::setBarLowerErrorColumn(int column)
@ -407,7 +407,7 @@ void JKQTPBarHorizontalErrorGraph::setBarLowerErrorColumn(int column)
void JKQTPBarHorizontalErrorGraph::setBarLowerErrorColumn(size_t column)
{
setXErrorColumnLower(column);
setXErrorColumnLower(static_cast<int>(column));
}
JKQTPBarVerticalErrorGraph::JKQTPBarVerticalErrorGraph(JKQTBasePlotter *parent):
@ -523,7 +523,7 @@ void JKQTPBarVerticalErrorGraph::setBarErrorColumn(int column)
void JKQTPBarVerticalErrorGraph::setBarErrorColumn(size_t column)
{
setYErrorColumn(column);
setYErrorColumn(static_cast<int>(column));
}
void JKQTPBarVerticalErrorGraph::setBarLowerErrorColumn(int column)
@ -533,7 +533,7 @@ void JKQTPBarVerticalErrorGraph::setBarLowerErrorColumn(int column)
void JKQTPBarVerticalErrorGraph::setBarLowerErrorColumn(size_t column)
{
setYErrorColumnLower(column);
setYErrorColumnLower(static_cast<int>(column));
}
void JKQTPBarVerticalErrorGraph::drawErrorsAfter(JKQTPEnhancedPainter &painter)

18
lib/jkqtplotter/jkqtpbaseplotter.cpp
View File

@ -1210,7 +1210,7 @@ void JKQTBasePlotter::drawKey(JKQTPEnhancedPainter& painter) {
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p("orange");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth);
p.setStyle(Qt::DashLine);
painter.setPen(p);
@ -1285,7 +1285,7 @@ void JKQTBasePlotter::drawPlot(JKQTPEnhancedPainter& painter) {
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p("blue");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth);
painter.setBrush(QBrush(QColor(Qt::transparent)));
painter.setPen(p);
@ -1314,20 +1314,20 @@ void JKQTBasePlotter::drawPlot(JKQTPEnhancedPainter& painter) {
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p("red");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth);
p.setStyle(Qt::DashLine);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
painter.drawRect(QRectF(internalPlotBorderLeft, internalPlotBorderTop, internalPlotWidth, internalPlotHeight));
p.setColor(QColor("maroon"));
col=p.color(); col.setAlphaF(0.8); p.setColor(col);
col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth);
p.setStyle(Qt::DotLine);
painter.setPen(p);
painter.drawRect(QRectF(internalPlotBorderLeft_notIncludingOutsidePlotSections, internalPlotBorderTop_notIncludingOutsidePlotSections, widgetWidth-internalPlotBorderLeft_notIncludingOutsidePlotSections-internalPlotBorderRight_notIncludingOutsidePlotSections, widgetHeight-internalPlotBorderTop_notIncludingOutsidePlotSections-internalPlotBorderBottom_notIncludingOutsidePlotSections));
p.setColor(QColor("yellow"));
col=p.color(); col.setAlphaF(0.8); p.setColor(col);
col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth);
p.setStyle(Qt::SolidLine);
painter.setPen(p);
@ -4175,7 +4175,7 @@ void JKQTBasePlotter::drawGraphs(JKQTPEnhancedPainter& painter){
painter.save(); auto __finalpaint=JKQTPFinally([&painter]() {painter.restore();});
QPen p("green");
p.setWidthF(plotterStyle.debugRegionLineWidth);
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
if (rleft.width()>0 && rleft.height()>0) painter.drawRect(rleft);
@ -4241,7 +4241,7 @@ void JKQTBasePlotter::drawKeyContents(JKQTPEnhancedPainter& painter, double x, d
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaintinner=JKQTPFinally([&painter]() {painter.restore();});
QPen p("orange");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth/2.0);
p.setStyle(Qt::DashLine);
painter.setPen(p);
@ -4276,7 +4276,7 @@ void JKQTBasePlotter::drawKeyContents(JKQTPEnhancedPainter& painter, double x, d
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaintinner=JKQTPFinally([&painter]() {painter.restore();});
QPen p("orange");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth/2.0);
p.setStyle(Qt::DashLine);
painter.setPen(p);
@ -4325,7 +4325,7 @@ void JKQTBasePlotter::drawKeyContents(JKQTPEnhancedPainter& painter, double x, d
if (plotterStyle.debugShowRegionBoxes) {
painter.save(); auto __finalpaintinner=JKQTPFinally([&painter]() {painter.restore();});
QPen p("orange");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(plotterStyle.debugRegionLineWidth/2.0);
p.setStyle(Qt::DashLine);
painter.setPen(p);

12
lib/jkqtplotter/jkqtpcoordinateaxes.cpp
View File

@ -1551,7 +1551,7 @@ void JKQTPVerticalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
if (getParent()->getCurrentPlotterStyle().debugShowRegionBoxes) {
painter.save(); auto __finalpaintinnerif=JKQTPFinally([&painter]() {painter.restore();});
QPen p("magenta");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth/2.0);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
@ -1591,7 +1591,7 @@ void JKQTPVerticalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
if (getParent()->getCurrentPlotterStyle().debugShowRegionBoxes) {
painter.save(); auto __finalpaintinnerif=JKQTPFinally([&painter]() {painter.restore();});
QPen p("magenta");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth/2.0);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
@ -1607,7 +1607,7 @@ void JKQTPVerticalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
painter.save(); auto __finalpaintif=JKQTPFinally([&painter]() {painter.restore();});
QPen p("cyan");
p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth);
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
QSizeF s1, s2;
@ -2147,7 +2147,7 @@ void JKQTPHorizontalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
if (getParent()->getCurrentPlotterStyle().debugShowRegionBoxes) {
painter.save(); auto __finalpaintinnerif=JKQTPFinally([&painter]() {painter.restore();});
QPen p("magenta");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth/2.0);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
@ -2186,7 +2186,7 @@ void JKQTPHorizontalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
if (getParent()->getCurrentPlotterStyle().debugShowRegionBoxes) {
painter.save(); auto __finalpaintinnerif=JKQTPFinally([&painter]() {painter.restore();});
QPen p("magenta");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth/2.0);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));
@ -2200,7 +2200,7 @@ void JKQTPHorizontalAxis::drawAxes(JKQTPEnhancedPainter& painter) {
if (getParent()->getCurrentPlotterStyle().debugShowRegionBoxes) {
painter.save(); auto __finalpaintif=JKQTPFinally([&painter]() {painter.restore();});
QPen p("cyan");
QColor col=p.color(); col.setAlphaF(0.8); p.setColor(col);
QColor col=p.color(); col.setAlphaF(0.8f); p.setColor(col);
p.setWidthF(getParent()->getCurrentPlotterStyle().debugRegionLineWidth);
painter.setPen(p);
painter.setBrush(QBrush(QColor(Qt::transparent)));

2
lib/jkqtplotter/jkqtpdatastorage.cpp
View File

@ -711,7 +711,7 @@ void JKQTPDatastore::copyColumnData(size_t toColumn, size_t fromColumn)
{
resizeColumn(toColumn, getRows(fromColumn));
std::copy(begin(fromColumn), end(fromColumn), begin(toColumn));
setColumnImageWidth(toColumn, getColumnImageWidth(fromColumn));
setColumnImageWidth(toColumn, getColumnImageWidth(static_cast<int>(fromColumn)));
}

4
lib/jkqtplotter/jkqtpgraphsbase.cpp
View File

@ -828,7 +828,7 @@ bool JKQTPXYYGraph::getIndexRange(int &imin, int &imax) const
if (parent==nullptr) return false;
if (yColumn2<0) return false;
const JKQTPDatastore* datastore=parent->getDatastore();
const auto rows=datastore->getRows(static_cast<size_t>(yColumn2));
const int rows=static_cast<int>(datastore->getRows(static_cast<size_t>(yColumn2)));
imax=qMin<int>(imax, rows);
}
return ok;
@ -971,7 +971,7 @@ bool JKQTPXXYGraph::getIndexRange(int &imin, int &imax) const
if (parent==nullptr) return false;
if (xColumn2<0) return false;
const JKQTPDatastore* datastore=parent->getDatastore();
const auto rows=datastore->getRows(static_cast<size_t>(xColumn2));
const int rows=static_cast<int>(datastore->getRows(static_cast<size_t>(xColumn2)));
imax=qMin<int>(imax, rows);
}
return ok;

28
lib/jkqtplotter/jkqtptools.cpp
View File

@ -371,8 +371,8 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
targetColor("black"),
colorModificationStrength(200),
transparencyModification(TransparencyChangeMode::SameTransparency),
targetTransparency(0.5),
transparencyModficationStrength(0.66)
targetTransparency(0.5f),
transparencyModficationStrength(0.66f)
{
switch(mode) {
case JKQTPFFCMFullyTransparentColor:
@ -427,19 +427,19 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
break;
case JKQTPFFCMSameMoreTransparentColor:
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMSameEvenMoreTransparentColor:
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.66;
transparencyModficationStrength=0.66f;
break;
case JKQTPFFCMSameLessTransparentColor:
transparencyModification=TransparencyChangeMode::LessTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMSameEvenLessTransparentColor:
transparencyModification=TransparencyChangeMode::LessTransparent;
transparencyModficationStrength=0.66;
transparencyModficationStrength=0.66f;
break;
case JKQTPFFCMInvertedColor:
colorModification=ColorChangeMode::InvertColor;
@ -447,7 +447,7 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
case JKQTPFFCMInvertedTransparentColor:
colorModification=ColorChangeMode::InvertColor;
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMInvertedNonTransparentColor:
colorModification=ColorChangeMode::InvertColor;
@ -463,7 +463,7 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
colorModification=ColorChangeMode::LighterColor;
colorModificationStrength=150;
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMLighterAndNonTransparentColor:
colorModification=ColorChangeMode::LighterColor;
@ -480,13 +480,13 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
colorModification=ColorChangeMode::LighterColor;
colorModificationStrength=200;
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMEvenLighterAndNonTransparentColor:
colorModification=ColorChangeMode::LighterColor;
colorModificationStrength=200;
transparencyModification=TransparencyChangeMode::ReplaceTransparency;
targetTransparency=0.0;
targetTransparency=0.0f;
break;
@ -498,13 +498,13 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
colorModification=ColorChangeMode::DarkerColor;
colorModificationStrength=200;
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMDarkerAndNonTransparentColor:
colorModification=ColorChangeMode::DarkerColor;
colorModificationStrength=200;
transparencyModification=TransparencyChangeMode::ReplaceTransparency;
targetTransparency=0.0;
targetTransparency=0.0f;
break;
case JKQTPFFCMEvenDarkerColor:
@ -515,13 +515,13 @@ JKQTPColorDerivationMode::JKQTPColorDerivationMode(PredefinedModes mode):
colorModification=ColorChangeMode::DarkerColor;
colorModificationStrength=300;
transparencyModification=TransparencyChangeMode::MoreTransparent;
transparencyModficationStrength=0.33;
transparencyModficationStrength=0.33f;
break;
case JKQTPFFCMEvenDarkerAndNonTransparentColor:
colorModification=ColorChangeMode::DarkerColor;
colorModificationStrength=300;
transparencyModification=TransparencyChangeMode::ReplaceTransparency;
targetTransparency=0.0;
targetTransparency=0.0f;
break;
}
}