diff --git a/examples/contourplot/README.md b/examples/contourplot/README.md index e398f799bd..fbf8e940d2 100644 --- a/examples/contourplot/README.md +++ b/examples/contourplot/README.md @@ -60,7 +60,7 @@ Then this image column can be drawn with a `JKQTPColumnContourPlot`: graph->setWidth(w); graph->setHeight(h); // color-map is "BlueGreenRed" - graph->setPalette(JKQTPMathImageBlueGreenRed); + graph->setColorPalette(JKQTPMathImageBlueGreenRed); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("electric potential [V]"); // add some levels for the contours. These are chosen to be at the actual potential values diff --git a/examples/imageplot/README.md b/examples/imageplot/README.md index 91bca29f4e..d495f2ed16 100644 --- a/examples/imageplot/README.md +++ b/examples/imageplot/README.md @@ -75,7 +75,7 @@ int main(int argc, char* argv[]) graph->setWidth(w); graph->setHeight(h); // color-map is "MATLAB" - graph->setPalette(JKQTPMathImageMATLAB); + graph->setColorPalette(JKQTPMathImageMATLAB); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale diff --git a/examples/imageplot_cimg/README.md b/examples/imageplot_cimg/README.md index 0754abcf01..93112ff53c 100644 --- a/examples/imageplot_cimg/README.md +++ b/examples/imageplot_cimg/README.md @@ -85,7 +85,7 @@ int main(int argc, char* argv[]) graph->setWidth(w); graph->setHeight(h); // color-map is "MATLAB" - graph->setPalette(JKQTPMathImageMATLAB); + graph->setColorPalette(JKQTPMathImageMATLAB); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale diff --git a/examples/imageplot_cimg/imageplot_cimg.cpp b/examples/imageplot_cimg/imageplot_cimg.cpp index bd080d0703..9531ac12f2 100644 --- a/examples/imageplot_cimg/imageplot_cimg.cpp +++ b/examples/imageplot_cimg/imageplot_cimg.cpp @@ -77,7 +77,7 @@ int main(int argc, char* argv[]) graph->setWidth(w); graph->setHeight(h); // color-map is "MATLAB" - graph->setPalette(JKQTPMathImageMATLAB); + graph->setColorPalette(JKQTPMathImageMATLAB); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale diff --git a/examples/imageplot_modifier/README.md b/examples/imageplot_modifier/README.md index 069a6c4a7e..50504d77f4 100644 --- a/examples/imageplot_modifier/README.md +++ b/examples/imageplot_modifier/README.md @@ -74,7 +74,7 @@ int main(int argc, char* argv[]) graph->setWidth(NX); graph->setHeight(NY); // color-map is "MATLAB" - graph->setPalette(JKQTPMathImageMATLAB); + graph->setColorPalette(JKQTPMathImageMATLAB); // determine min/max of data automatically and use it to set the range of the color-scale graph->setAutoImageRange(true); diff --git a/examples/imageplot_nodatastore/README.md b/examples/imageplot_nodatastore/README.md index c75a495143..20a0c5ea08 100644 --- a/examples/imageplot_nodatastore/README.md +++ b/examples/imageplot_nodatastore/README.md @@ -64,7 +64,7 @@ int main(int argc, char* argv[]) graph->setWidth(w); graph->setHeight(h); // color-map is "BLUEYELLOW" - graph->setPalette(JKQTPMathImageBLUEYELLOW); + graph->setColorPalette(JKQTPMathImageBLUEYELLOW); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale diff --git a/examples/imageplot_opencv/README.md b/examples/imageplot_opencv/README.md index 3c08f92ba0..96711de59c 100644 --- a/examples/imageplot_opencv/README.md +++ b/examples/imageplot_opencv/README.md @@ -84,7 +84,7 @@ int main(int argc, char* argv[]) graph->setWidth(w); graph->setHeight(h); // color-map is "MATLAB" - graph->setPalette(JKQTPMathImageMATLAB); + graph->setColorPalette(JKQTPMathImageMATLAB); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale diff --git a/examples/imageplot_opencv/imageplot_opencv.cpp b/examples/imageplot_opencv/imageplot_opencv.cpp index c017e31a71..83583e833a 100644 --- a/examples/imageplot_opencv/imageplot_opencv.cpp +++ b/examples/imageplot_opencv/imageplot_opencv.cpp @@ -79,7 +79,7 @@ int main(int argc, char* argv[]) graph->setWidth(w); graph->setHeight(h); // color-map is "MATLAB" - graph->setPalette(JKQTPMathImageMATLAB); + graph->setColorPalette(JKQTPMathImageMATLAB); // get coordinate axis of color-bar and set its label graph->getColorBarRightAxis()->setAxisLabel("light intensity [A.U.]"); // determine min/max of data automatically and use it to set the range of the color-scale diff --git a/examples/imageplot_userpal/README.md b/examples/imageplot_userpal/README.md index e724cd2daf..1b4492da38 100644 --- a/examples/imageplot_userpal/README.md +++ b/examples/imageplot_userpal/README.md @@ -47,7 +47,7 @@ This function returns an integer, which you can cast to a `JKQTPMathImageColorPa ```.cpp JKQTPColumnMathImage* graph=new JKQTPColumnMathImage(plot); // ... - graph->setPalette(static_cast(userpalette_id)); + graph->setColorPalette(static_cast(userpalette_id)); ``` # Load Palettes from Files @@ -156,7 +156,7 @@ The rest of the example program [`imageplot_userpal.cpp`](https://github.com/jkr graph->setWidth(1); graph->setHeight(1); // color-map is taken from cmbPalette - plot->connect(cmbPalette, &JKQTPMathImageColorPaletteComboBox::currentPaletteChanged,[&](JKQTPMathImageColorPalette p) { graph->setPalette(p); plot->redrawPlot(); }); + plot->connect(cmbPalette, &JKQTPMathImageColorPaletteComboBox::currentPaletteChanged,[&](JKQTPMathImageColorPalette p) { graph->setColorPalette(p); plot->redrawPlot(); }); cmbPalette->setCurrentColorPalette(graph->getPalette()); @@ -181,7 +181,7 @@ The rest of the example program [`imageplot_userpal.cpp`](https://github.com/jkr ```.cpp JKQTPMathImageColorPaletteComboBox* cmbPalette=new JKQTPMathImageColorPaletteComboBox(&win); // ... - plot->connect(cmbPalette, &JKQTPMathImageColorPaletteComboBox::currentPaletteChanged,[&](JKQTPMathImageColorPalette p) { graph->setPalette(p); plot->redrawPlot(); }); + plot->connect(cmbPalette, &JKQTPMathImageColorPaletteComboBox::currentPaletteChanged,[&](JKQTPMathImageColorPalette p) { graph->setColorPalette(p); plot->redrawPlot(); }); cmbPalette->setCurrentColorPalette(graph->getPalette()); ``` diff --git a/examples/jkqtplot_test/TestWidgetContourPlots.cpp b/examples/jkqtplot_test/TestWidgetContourPlots.cpp index efb3d48e8f..a1700af08a 100644 --- a/examples/jkqtplot_test/TestWidgetContourPlots.cpp +++ b/examples/jkqtplot_test/TestWidgetContourPlots.cpp @@ -101,7 +101,7 @@ TestWidgetContourPlots::TestWidgetContourPlots(QWidget *parent) : cp->setNx(histAlexNx); cp->setNy(histAlexNy); cp->setImageColumn(colHist2D); -// cp->setPalette(JKQTPMathImageINVERTED_OCEAN); +// cp->setColorPalette(JKQTPMathImageINVERTED_OCEAN); cp->setContourLevels(levels); cp->setTitle("contour plot"); plotContour->addGraph(cp); diff --git a/examples/parametriccurve/README.md b/examples/parametriccurve/README.md index 927d3ce9d9..0412e85c3f 100644 --- a/examples/parametriccurve/README.md +++ b/examples/parametriccurve/README.md @@ -39,7 +39,7 @@ If you use `JKQTPXYParametrizedScatterGraph` instead of `JKQTPXYLineGraph`, you graph2->setXColumn(columnX); graph2->setYColumn(columnY); graph2->setColorColumn(columnR); - graph2->setPalette(JKQTPMathImageMATLAB); + graph2->setColorPalette(ette(JKQTPMathImageMATLAB); graph2->setSymbolType(JKQTPNoSymbol); graph2->setDrawLine(true); graph2->setTitle("colored spiral"); diff --git a/examples/paramscatterplot/README.md b/examples/paramscatterplot/README.md index b504375b3a..e8a879589d 100644 --- a/examples/paramscatterplot/README.md +++ b/examples/paramscatterplot/README.md @@ -79,7 +79,7 @@ The second variant for setting the color of each datapoint is by mapping the val graph2->setXColumn(columnX); graph2->setYColumn(columnY2); graph2->setColorColumn(columnC); - graph2->setPalette(JKQTPMathImageRYGB); + graph2->setColorPalette(JKQTPMathImageRYGB); graph2->setSymbolType(JKQTPFilledRect); graph2->setDrawLine(true); graph2->setTitle("2: color"); @@ -96,7 +96,7 @@ Note also that it is possible to combine any of parametrizations above in a sing graph5->setYColumn(columnY5); graph5->setColorColumn(columnC); graph5->setSizeColumn(columnS); - graph5->setPalette(JKQTPMathImageBLUEYELLOW); + graph5->setColorPalette(JKQTPMathImageBLUEYELLOW); graph5->setDrawLine(true); graph5->setTitle("5: color+size"); graph5->getColorBarRightAxis()->setAxisLabel("color scale for graph5"); diff --git a/examples/paramscatterplot_image/README.md b/examples/paramscatterplot_image/README.md index adff6e8e59..dd31df01f1 100644 --- a/examples/paramscatterplot_image/README.md +++ b/examples/paramscatterplot_image/README.md @@ -39,7 +39,7 @@ Now we can use th datavectors to add a `JKQTPXYParametrizedScatterGraph`: graph1->setSizeColumn(columnS); graph1->setSymbolType(JKQTPFilledCircle); graph1->setColorColumn(columnG); - graph1->setPalette(JKQTPMathImageMATLAB); + graph1->setColorPalette(JKQTPMathImageMATLAB); graph1->setDrawLine(false); graph1->setTitle(""); plot.addGraph(graph1);