| Screenshot | Description | Notes | ||
|---|---|---|---|---|
| \image html simpletest_datastore_small.png - | \subpage JKQTPlotterAdvancedJKQTPDatastore - | Advanced Data Management with JKQTPDatastore + | \subpage JKQTPlotterBasicJKQTPDatastore + | Basic Data Management with JKQTPDatastore Copying data into a JKQTPDatastore Editing data inside a JKQTPDatastore Editing Image Data in a JKQTPDatastore |
#define for fixed default values (e.g. JKQTPImageTools::LUTSIZE, JKQTPImageTools::PALETTE_ICON_WIDTH, JKQTPlotterDrawinTools::ABS_MIN_LINEWIDTH, JKQTMathText::ABS_MIN_LINEWIDTH ...)\copydoc fontRoman- \see fontRoman for more information */ + /*! \copydoc fontRoman */ inline void setFontRoman(const QString & __value) { this->fontRoman = fontReplacements.value(__value, __value); @@ -352,127 +350,127 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { \see fontRoman for more information */ void setFontRomanOrSpecial(const QString & __value); - /*! \copydoc fontRoman \see fontRoman */ + /*! \copydoc fontRoman */ inline QString getFontRoman() const { return this->fontRoman; } - /*! \copydoc fontSans \see fontSans */ + /*! \copydoc fontSans */ inline void setFontSans(const QString & __value) { this->fontSans = fontReplacements.value(__value, __value); } - /*! \copydoc fontSans \see fontSans */ + /*! \copydoc fontSans */ inline QString getFontSans() const { return this->fontSans; } - /*! \copydoc fontTypewriter \see fontTypewriter */ + /*! \copydoc fontTypewriter */ inline void setFontTypewriter(const QString & __value) { this->fontTypewriter = __value; } - /*! \copydoc fontTypewriter \see fontTypewriter */ + /*! \copydoc fontTypewriter */ inline QString getFontTypewriter() const { return this->fontTypewriter; } - /*! \copydoc fontScript \see fontScript */ + /*! \copydoc fontScript */ inline void setFontScript(const QString & __value) { this->fontScript = __value; } - /*! \copydoc fontScript \see fontScript */ + /*! \copydoc fontScript */ inline QString getFontScript() const { return this->fontScript; } - /*! \copydoc fontGreek \see fontGreek */ + /*! \copydoc fontGreek */ inline void setFontGreek(const QString & __value) { this->fontGreek = __value; } - /*! \copydoc fontGreek \see fontGreek */ + /*! \copydoc fontGreek */ inline QString getFontGreek() const { return this->fontGreek; } - /*! \copydoc fontSymbol \see fontSymbol */ + /*! \copydoc fontSymbol */ inline void setFontSymbol(const QString & __value) { this->fontSymbol = __value; } - /*! \copydoc fontSymbol \see fontSymbol */ + /*! \copydoc fontSymbol */ inline QString getFontSymbol() const { return this->fontSymbol; } - /*! \copydoc fontBraces \see fontBraces */ + /*! \copydoc fontBraces */ inline void setFontBraces(const QString & __value) { this->fontBraces = __value; } - /*! \copydoc fontBraces \see fontBraces */ + /*! \copydoc fontBraces */ inline QString getFontBraces() const { return this->fontBraces; } - /*! \copydoc fontIntegrals \see fontIntegrals */ + /*! \copydoc fontIntegrals */ inline void setFontIntegrals(const QString & __value) { this->fontIntegrals = __value; } - /*! \copydoc fontIntegrals \see fontIntegrals */ + /*! \copydoc fontIntegrals */ inline QString getFontIntegrals() const { return this->fontIntegrals; } - /*! \copydoc fontCaligraphic \see fontCaligraphic */ + /*! \copydoc fontCaligraphic */ inline void setFontCaligraphic(const QString & __value) { this->fontCaligraphic = __value; } - /*! \copydoc fontCaligraphic \see fontCaligraphic */ + /*! \copydoc fontCaligraphic */ inline QString getFontCaligraphic() const { return this->fontCaligraphic; } - /*! \copydoc fontBlackboard \see fontBlackboard */ + /*! \copydoc fontBlackboard */ inline void setFontBlackboard(const QString & __value) { this->fontBlackboard = __value; } - /*! \copydoc fontBlackboard \see fontBlackboard */ + /*! \copydoc fontBlackboard */ inline QString getFontBlackboard() const { return this->fontBlackboard; } - /*! \copydoc fontLatexPrefix \see fontLatexPrefix */ + /*! \copydoc fontLatexPrefix */ inline void setFontLatexPrefix(const QString & __value) { this->fontLatexPrefix = __value; } - /*! \copydoc fontLatexPrefix \see fontLatexPrefix */ + /*! \copydoc fontLatexPrefix */ inline QString getFontLatexPrefix() const { return this->fontLatexPrefix; } - /*! \copydoc fontLatexPostfix \see fontLatexPostfix */ + /*! \copydoc fontLatexPostfix */ inline void setFontLatexPostfix(const QString & __value) { this->fontLatexPostfix = __value; } - /*! \copydoc fontLatexPostfix \see fontLatexPostfix */ + /*! \copydoc fontLatexPostfix */ inline QString getFontLatexPostfix() const { return this->fontLatexPostfix; } - /*! \copydoc fontEncoding \see fontEncoding */ + /*! \copydoc fontEncoding */ inline void setFontEncoding(const MTfontEncoding & __value) { this->fontEncoding = __value; } - /*! \copydoc fontEncoding \see fontEncoding */ + /*! \copydoc fontEncoding */ inline MTfontEncoding getFontEncoding() const { return this->fontEncoding; @@ -489,162 +487,162 @@ class JKQTP_LIB_EXPORT JKQTMathText : public QObject { inline bool isUsingXITSfonts() const { return this->useXITSfonts; } - /*! \copydoc brace_factor \see brace_factor */ + /*! \copydoc brace_factor */ inline void setBraceFactor(double __value) { this->brace_factor = __value; } - /*! \copydoc brace_factor \see brace_factor */ + /*! \copydoc brace_factor */ inline double getBraceFactor() const { return this->brace_factor; } - /*! \copydoc subsuper_size_factor \see subsuper_size_factor */ + /*! \copydoc subsuper_size_factor */ inline void setSubsuperSizeFactor(double __value) { this->subsuper_size_factor = __value; } - /*! \copydoc subsuper_size_factor \see subsuper_size_factor */ + /*! \copydoc subsuper_size_factor */ inline double getSubsuperSizeFactor() const { return this->subsuper_size_factor; } - /*! \copydoc italic_correction_factor \see italic_correction_factor */ + /*! \copydoc italic_correction_factor */ inline void setItalicCorrectionFactor(double __value) { this->italic_correction_factor = __value; } - /*! \copydoc italic_correction_factor \see italic_correction_factor */ + /*! \copydoc italic_correction_factor */ inline double getItalicCorrectionFactor() const { return this->italic_correction_factor; } - /*! \copydoc operatorsubsuper_size_factor \see operatorsubsuper_size_factor */ + /*! \copydoc operatorsubsuper_size_factor */ inline void setOperatorsubsuperSizeFactor(double __value) { this->operatorsubsuper_size_factor = __value; } - /*! \copydoc operatorsubsuper_size_factor \see operatorsubsuper_size_factor */ + /*! \copydoc operatorsubsuper_size_factor */ inline double getOperatorsubsuperSizeFactor() const { return this->operatorsubsuper_size_factor; } - /*! \copydoc mathoperator_width_factor \see mathoperator_width_factor */ + /*! \copydoc mathoperator_width_factor */ inline void setMathoperatorWidthFactor(double __value) { this->mathoperator_width_factor = __value; } - /*! \copydoc mathoperator_width_factor \see mathoperator_width_factor */ + /*! \copydoc mathoperator_width_factor */ inline double getMathoperatorWidthFactor() const { return this->mathoperator_width_factor; } - /*! \copydoc super_shift_factor \see super_shift_factor */ + /*! \copydoc super_shift_factor */ inline void setSuperShiftFactor(double __value) { this->super_shift_factor = __value; } - /*! \copydoc super_shift_factor \see super_shift_factor */ + /*! \copydoc super_shift_factor */ inline double getSuperShiftFactor() const { return this->super_shift_factor; } - /*! \copydoc sub_shift_factor \see sub_shift_factor */ + /*! \copydoc sub_shift_factor */ inline void setSubShiftFactor(double __value) { this->sub_shift_factor = __value; } - /*! \copydoc sub_shift_factor \see sub_shift_factor */ + /*! \copydoc sub_shift_factor */ inline double getSubShiftFactor() const { return this->sub_shift_factor; } - /*! \copydoc brace_shrink_factor \see brace_shrink_factor */ + /*! \copydoc brace_shrink_factor */ inline void setBraceShrinkFactor(double __value) { this->brace_shrink_factor = __value; } - /*! \copydoc brace_shrink_factor \see brace_shrink_factor */ + /*! \copydoc brace_shrink_factor */ inline double getBraceShrinkFactor() const { return this->brace_shrink_factor; } - /*! \copydoc underbrace_factor \see underbrace_factor */ + /*! \copydoc underbrace_factor */ inline void setUnderbraceFactor(double __value) { this->underbrace_factor = __value; } - /*! \copydoc underbrace_factor \see underbrace_factor */ + /*! \copydoc underbrace_factor */ inline double getUnderbraceFactor() const { return this->underbrace_factor; } - /*! \copydoc undersetFactor \see undersetFactor */ + /*! \copydoc undersetFactor */ inline void setUndersetFactor(double __value) { this->undersetFactor = __value; } - /*! \copydoc undersetFactor \see undersetFactor */ + /*! \copydoc undersetFactor */ inline double getUndersetFactor() const { return this->undersetFactor; } - /*! \copydoc frac_factor \see frac_factor */ + /*! \copydoc frac_factor */ inline void setFracFactor(double __value) { this->frac_factor = __value; } - /*! \copydoc frac_factor \see frac_factor */ + /*! \copydoc frac_factor */ inline double getFracFactor() const { return this->frac_factor; } - /*! \copydoc frac_shift_factor \see frac_shift_factor */ + /*! \copydoc frac_shift_factor */ inline void setFracShiftFactor(double __value) { this->frac_shift_factor = __value; } - /*! \copydoc frac_shift_factor \see frac_shift_factor */ + /*! \copydoc frac_shift_factor */ inline double getFracShiftFactor() const { return this->frac_shift_factor; } - /*! \copydoc brace_y_shift_factor \see brace_y_shift_factor */ + /*! \copydoc brace_y_shift_factor */ inline void setBraceYShiftFactor(double __value) { this->brace_y_shift_factor = __value; } - /*! \copydoc brace_y_shift_factor \see brace_y_shift_factor */ + /*! \copydoc brace_y_shift_factor */ inline double getBraceYShiftFactor() const { return this->brace_y_shift_factor; } - /*! \copydoc decoration_height_factor \see decoration_height_factor */ + /*! \copydoc decoration_height_factor */ inline void setDecorationHeightFactor(double __value) { this->decoration_height_factor = __value; } - /*! \copydoc decoration_height_factor \see decoration_height_factor */ + /*! \copydoc decoration_height_factor */ inline double getDecorationHeightFactor() const { return this->decoration_height_factor; } - /*! \copydoc expensiveRendering \see expensiveRendering */ + /*! \copydoc expensiveRendering */ inline void setExpensiveRendering(bool __value) { this->expensiveRendering = __value; } - /*! \copydoc expensiveRendering \see expensiveRendering */ + /*! \copydoc expensiveRendering */ inline bool getExpensiveRendering() const { return this->expensiveRendering; } - /*! \copydoc useUnparsed \see useUnparsed */ + /*! \copydoc useUnparsed */ inline void setUseUnparsed(bool __value) { this->useUnparsed = __value; } - /*! \copydoc useUnparsed \see useUnparsed */ + /*! \copydoc useUnparsed */ inline bool isUsingUnparsed() const { return this->useUnparsed; diff --git a/lib/jkqtplotter/jkqtpbaseplotter.h b/lib/jkqtplotter/jkqtpbaseplotter.h index 120feb0b64..fd86dcdd10 100644 --- a/lib/jkqtplotter/jkqtpbaseplotter.h +++ b/lib/jkqtplotter/jkqtpbaseplotter.h @@ -621,6 +621,7 @@ class JKQTP_LIB_EXPORT JKQTBasePlotter: public QObject { /*! \brief draw the contained graph (including grid prints) into the given JKQTPEnhancedPainter \param painter JKQTPEnhancedPainter to which the plot should be drawn \param rect rectangle to plot into + \param showOverlays decides whether to draw overlays */ void draw(JKQTPEnhancedPainter& painter, const QRect& rect, bool showOverlays=true); @@ -633,20 +634,27 @@ class JKQTP_LIB_EXPORT JKQTBasePlotter: public QObject { /*! \brief draw the contained graph (including grid prints) into the given JKQTPEnhancedPainter \param painter JKQTPEnhancedPainter to which the plot should be drawn \param pos where to plot the painter (left-top corner) + \param showOverlays decides whether to draw overlays */ void draw(JKQTPEnhancedPainter& painter, const QPoint& pos=QPoint(0,0), bool showOverlays=true); /*! \brief draw the contained graph (including grid prints) into the given JKQTPEnhancedPainter \param painter JKQTPEnhancedPainter to which the plot should be drawn \param rect rectangle to plot into + \param showOverlays decides whether to draw overlays */ void drawNonGrid(JKQTPEnhancedPainter& painter, const QRect& rect, bool showOverlays=true); /*! \brief draw the contained graph (including grid prints) into the given JKQTPEnhancedPainter \param painter JKQTPEnhancedPainter to which the plot should be drawn \param pos where to plot the painter (left-top corner) + \param showOverlays decides whether to draw overlays */ void drawNonGrid(JKQTPEnhancedPainter& painter, const QPoint& pos=QPoint(0,0), bool showOverlays=true); + /*! \brief draw the contained graph overlays (including grid prints) into the given JKQTPEnhancedPainter + \param painter JKQTPEnhancedPainter to which the plot should be drawn + \param pos where to plot the painter (left-top corner) + */ void drawNonGridOverlays(JKQTPEnhancedPainter &painter, const QPoint& pos=QPoint(0,0)); /** \brief emit plotUpdated() */ @@ -681,7 +689,7 @@ class JKQTP_LIB_EXPORT JKQTBasePlotter: public QObject { bool isUsingAntiAliasingForGraphs() const; /** \copydoc JKQTBasePlotterStyle::useAntiAliasingForText */ bool isUsingAntiAliasingForText() const; - /** \copydoc JKQTBasePlotterStyle:defaultGraphWidth: */ + /** \copydoc JKQTBasePlotterStyle::defaultGraphWidth */ double getGraphWidth() const; /** \copydoc JKQTBasePlotterStyle::widgetBackgroundBrush */ QColor getBackgroundColor() const; @@ -821,9 +829,9 @@ class JKQTP_LIB_EXPORT JKQTBasePlotter: public QObject { inline double getInternalPlotBorderBottom() const { return this->internalPlotBorderBottom; } /*! \brief returns the property internalPlotBorderRight ( \copybrief internalPlotBorderRight ). \details Description of the parameter internalPlotBorderRight is:
\copydoc internalPlotBorderRight. \see internalPlotBorderRight for more information */ inline double getInternalPlotBorderRight() const { return this->internalPlotBorderRight; } - /*! \brief returns the property plotWidth ( \copybrief plotWidth ). \details Description of the parameter plotWidth is:
\copydoc plotWidth. \see plotWidth for more information */ + /*! \copydoc internalPlotWidth */ inline int getPlotWidth() const { return this->internalPlotWidth; } - /*! \brief returns the property plotHeight ( \copybrief plotHeight ). \details Description of the parameter plotHeight is:
\copydoc plotHeight. \see plotHeight for more information */ + /*! \copydoc internalPlotHeight */ inline int getPlotHeight() const { return this->internalPlotHeight; } /** \brief returns the internal JKQTMathText, used to render text with LaTeX markup */ JKQTMathText* getMathText(); @@ -1746,12 +1754,22 @@ class JKQTP_LIB_EXPORT JKQTBasePlotter: public QObject { - /** \brief paints the plot onto the given JKQTPEnhancedPainter object */ + /** \brief paints the plot onto the given JKQTPEnhancedPainter object + * + * \param painter JKQTPEnhancedPainter to draw on + * \param showOverlays decides whether to draw overlays + */ void drawPlot(JKQTPEnhancedPainter& painter, bool showOverlays=true); /** \brief simply calls paintPlot() if grid printing mode is deactivated and prints the graph grid otherwise * \a pageRect is used to determine the size of the page to draw on. If this does not coincide with * the widget extents this function calculates a scaling factor so the graphs fit onto the page. This * is especially usefull when printing! + * + * \param painter JKQTPEnhancedPainter to draw on + * \param pageRect size of the page + * \param showOverlays decides whether to draw overlays + * \param scaleIfTooLarge scale image if it is too large for pageRect + * \param scaleIfTooSmall scale image if it is smaller than pageRect */ void gridPaint(JKQTPEnhancedPainter& painter, QSizeF pageRect, bool showOverlays=true, bool scaleIfTooLarge=true, bool scaleIfTooSmall=true); void gridPaintOverlays(JKQTPEnhancedPainter& painter, QSizeF pageRect); diff --git a/lib/jkqtplotter/jkqtpcoordinateaxes.h b/lib/jkqtplotter/jkqtpcoordinateaxes.h index 74ff681560..152b7dc9dc 100644 --- a/lib/jkqtplotter/jkqtpcoordinateaxes.h +++ b/lib/jkqtplotter/jkqtpcoordinateaxes.h @@ -231,150 +231,104 @@ class JKQTP_LIB_EXPORT JKQTPCoordinateAxis: public QObject { virtual void drawGrids(JKQTPEnhancedPainter& painter)=0; - /*! \copydoc tickSpacing - \see tickSpacing */ + /*! \copydoc tickSpacing */ inline double getTickSpacing() const { return this->tickSpacing; } - /*! \copydoc JKQTPCoordinateAxisStyle::labelDigits - \see JKQTPCoordinateAxisStyle::labelDigits */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelDigits */ inline int getLabelDigits() const { return this->axisStyle.labelDigits; } - /*! \copydoc autoAxisSpacing - \see autoAxisSpacing */ + /*! \copydoc autoAxisSpacing */ inline bool getAutoAxisSpacing() const { return this->autoAxisSpacing; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelsEnabled - \see JKQTPCoordinateAxisStyle::minorTickLabelsEnabled */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelsEnabled */ inline bool getMinorTickLabelsEnabled() const { return this->axisStyle.minorTickLabelsEnabled; } - /*! \copydoc logAxis - \see logAxis */ + /*! \copydoc logAxis */ inline bool getLogAxis() const { return this->logAxis; } - /*! \copydoc inverted - \see inverted */ + /*! \copydoc inverted */ inline bool getInverted() const { return this->inverted; } - /*! \copydoc logAxisBase - \see logAxisBase */ + /*! \copydoc logAxisBase */ inline double getLogAxisBase() const { return this->logAxisBase; } - /*! \copydoc userTickSpacing - \see userTickSpacing */ + /*! \copydoc userTickSpacing */ inline double getUserTickSpacing() const { return this->userTickSpacing; } - /*! \copydoc userLogTickSpacing - \see userLogTickSpacing */ + /*! \copydoc userLogTickSpacing */ inline double getUserLogTickSpacing() const { return this->userLogTickSpacing; } - /*! \copydoc JKQTPCoordinateAxisStyle::labelType - \see JKQTPCoordinateAxisStyle::labelType */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelType */ inline JKQTPCALabelType getLabelType() const { return this->axisStyle.labelType; } - /*! \copydoc axisLabel - \see axisLabel */ + /*! \copydoc axisLabel */ inline QString getAxisLabel() const { return this->axisLabel; } - /*! \copydoc JKQTPCoordinateAxisStyle::labelPosition - \see JKQTPCoordinateAxisStyle::labelPosition */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelPosition */ inline JKQTPLabelPosition getLabelPosition() const { return this->axisStyle.labelPosition; } - /*! \copydoc JKQTPCoordinateAxisStyle::labelFontSize - \see JKQTPCoordinateAxisStyle::labelFontSize */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelFontSize */ inline double getLabelFontSize() const { return this->axisStyle.labelFontSize; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelFontSize - \see JKQTPCoordinateAxisStyle::tickLabelFontSize */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelFontSize */ inline double getTickLabelFontSize() const { return this->axisStyle.tickLabelFontSize; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFontSize - \see JKQTPCoordinateAxisStyle::minorTickLabelFontSize */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFontSize */ inline double getMinorTickLabelFontSize() const { return this->axisStyle.minorTickLabelFontSize; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFullNumber - \see JKQTPCoordinateAxisStyle::minorTickLabelFullNumber */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFullNumber */ inline bool getMinorTickLabelFullNumber() const { return this->axisStyle.minorTickLabelFullNumber; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelAngle - \see JKQTPCoordinateAxisStyle::tickLabelAngle */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelAngle */ inline double getTickLabelAngle() const { return this->axisStyle.tickLabelAngle; } - /*! \copydoc JKQTPCoordinateAxisStyle::minTicks - \see JKQTPCoordinateAxisStyle::minTicks */ + /*! \copydoc JKQTPCoordinateAxisStyle::minTicks */ inline unsigned int getMinTicks() const { return this->axisStyle.minTicks; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorTicks - \see JKQTPCoordinateAxisStyle::minorTicks */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTicks */ inline unsigned int getMinorTicks() const { return this->axisStyle.minorTicks; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickOutsideLength - \see JKQTPCoordinateAxisStyle::tickOutsideLength */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickOutsideLength */ inline double getTickOutsideLength() const { return this->axisStyle.tickOutsideLength; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickOutsideLength - \see JKQTPCoordinateAxisStyle::minorTickOutsideLength */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickOutsideLength */ inline double getMinorTickOutsideLength() const { return this->axisStyle.minorTickOutsideLength; } - /*! \copydoc JKQTPCoordinateAxisStyle::axisColor - \see JKQTPCoordinateAxisStyle::axisColor */ + /*! \copydoc JKQTPCoordinateAxisStyle::axisColor */ inline QColor getAxisColor() const { return this->axisStyle.axisColor; } - /*! \copydoc JKQTPCoordinateAxisStyle::showZeroAxis - \see JKQTPCoordinateAxisStyle::showZeroAxis */ + /*! \copydoc JKQTPCoordinateAxisStyle::showZeroAxis */ inline bool getShowZeroAxis() const { return this->axisStyle.showZeroAxis; } - /*! \copydoc JKQTPCoordinateAxisStyle::gridColor - \see JKQTPCoordinateAxisStyle::gridColor */ + /*! \copydoc JKQTPCoordinateAxisStyle::gridColor */ inline QColor getGridColor() const { return this->axisStyle.gridColor; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorGridColor - \see JKQTPCoordinateAxisStyle::minorGridColor */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorGridColor */ inline QColor getMinorGridColor() const { return this->axisStyle.minorGridColor; } - /*! \copydoc JKQTPCoordinateAxisStyle::gridWidth - \see JKQTPCoordinateAxisStyle::gridWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::gridWidth */ inline double getGridWidth() const { return this->axisStyle.gridWidth; } - /*! \copydoc JKQTPCoordinateAxisStyle::gridStyle - \see JKQTPCoordinateAxisStyle::gridStyle */ + /*! \copydoc JKQTPCoordinateAxisStyle::gridStyle */ inline Qt::PenStyle getGridStyle() const { return this->axisStyle.gridStyle; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorGridWidth - \see JKQTPCoordinateAxisStyle::minorGridWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorGridWidth */ inline double getMinorGridWidth() const { return this->axisStyle.minorGridWidth; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorGridStyle - \see JKQTPCoordinateAxisStyle::minorGridStyle */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorGridStyle */ inline Qt::PenStyle getMinorGridStyle() const { return this->axisStyle.minorGridStyle; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickTimeFormat - \see JKQTPCoordinateAxisStyle::tickTimeFormat */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickTimeFormat */ inline QString getTickTimeFormat() const { return this->axisStyle.tickTimeFormat; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickDateFormat - \see JKQTPCoordinateAxisStyle::tickDateFormat */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickDateFormat */ inline QString getTickDateFormat() const { return this->axisStyle.tickDateFormat; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickDateTimeFormat - \see JKQTPCoordinateAxisStyle::tickDateTimeFormat */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickDateTimeFormat */ inline QString getTickDateTimeFormat() const { return this->axisStyle.tickDateTimeFormat; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickMode - \see JKQTPCoordinateAxisStyle::tickMode */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickMode */ inline JKQTPLabelTickMode getTickMode() const { return this->axisStyle.tickMode; } - /*! \copydoc JKQTPCoordinateAxisStyle::drawMode1 - \see JKQTPCoordinateAxisStyle::drawMode1 */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawMode1 */ inline JKQTPCADrawMode getDrawMode1() const { return this->axisStyle.drawMode1; } - /*! \copydoc JKQTPCoordinateAxisStyle::drawMode2 - \see JKQTPCoordinateAxisStyle::drawMode2 */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawMode2 */ inline JKQTPCADrawMode getDrawMode2() const { return this->axisStyle.drawMode2; } - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickWidth - \see JKQTPCoordinateAxisStyle::minorTickWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickWidth */ inline double getMinorTickWidth() const { return this->axisStyle.minorTickWidth; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickWidth - \see JKQTPCoordinateAxisStyle::tickWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickWidth */ inline double getTickWidth() const { return this->axisStyle.tickWidth; } - /*! \copydoc JKQTPCoordinateAxisStyle::lineWidth - \see JKQTPCoordinateAxisStyle::lineWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::lineWidth */ inline double getLineWidth() const { return this->axisStyle.lineWidth; } - /*! \copydoc JKQTPCoordinateAxisStyle::lineWidthZeroAxis - \see JKQTPCoordinateAxisStyle::lineWidthZeroAxis */ + /*! \copydoc JKQTPCoordinateAxisStyle::lineWidthZeroAxis */ inline double getLineWidthZeroAxis() const { return this->axisStyle.lineWidthZeroAxis; } - /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelDistance - \see JKQTPCoordinateAxisStyle::tickLabelDistance */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelDistance */ inline double getTickLabelDistance() const { return this->axisStyle.tickLabelDistance; } - /*! \copydoc JKQTPCoordinateAxisStyle::labelDistance - \see JKQTPCoordinateAxisStyle::labelDistance */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelDistance */ inline double getLabelDistance() const { return this->axisStyle.labelDistance; } - /*! \copydoc JKQTPCoordinateAxisStyle::drawGrid - \see JKQTPCoordinateAxisStyle::drawGrid */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawGrid */ inline bool getDrawGrid() const { return this->axisStyle.drawGrid; } - /*! \copydoc JKQTPCoordinateAxisStyle::drawMinorGrid - \see JKQTPCoordinateAxisStyle::drawMinorGrid */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawMinorGrid */ inline bool getDrawMinorGrid() const { return this->axisStyle.drawMinorGrid; } - /*! \copydoc JKQTPCoordinateAxisStyle::autoLabelDigits - \see JKQTPCoordinateAxisStyle::autoLabelDigits */ + /*! \copydoc JKQTPCoordinateAxisStyle::autoLabelDigits */ inline void setAutoLabelDigits(bool __value) { this->axisStyle.autoLabelDigits = __value; } - /*! \copydoc JKQTPCoordinateAxisStyle::autoLabelDigits - \see JKQTPCoordinateAxisStyle::autoLabelDigits */ + /*! \copydoc JKQTPCoordinateAxisStyle::autoLabelDigits */ inline bool getAutoLabelDigits() const { return this->axisStyle.autoLabelDigits; } - /*! \copydoc parent - \see parent */ + /*! \copydoc parent */ inline const JKQTBasePlotter* getParent() const { return this->parent; } /*! \brief returns the property parent ( \copybrief parent ). \details Description of the parameter parent is:
\copydoc parent. \see parent for more information */ inline JKQTBasePlotter* getParent() { return this->parent; } @@ -453,198 +407,150 @@ class JKQTP_LIB_EXPORT JKQTPCoordinateAxis: public QObject { /** \brief do not use an absolute range of plot axis */ void setNoAbsoluteRange(); - /*! \copydoc tickSpacing - \see tickSpacing */ + /*! \copydoc tickSpacing */ void setTickSpacing(double __value); - /*! \copydoc axisMinWidth - \see axisMinWidth */ + /*! \copydoc axisMinWidth */ void setAxisMinWidth(double __value); - /*! \copydoc autoAxisSpacing - \see autoAxisSpacing */ + /*! \copydoc autoAxisSpacing */ void setAutoAxisSpacing(bool __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelsEnabled - \see JKQTPCoordinateAxisStyle::minorTickLabelsEnabled */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelsEnabled */ void setMinorTickLabelsEnabled(bool __value); - /*! \copydoc logAxis - \see logAxis */ + /*! \copydoc logAxis */ void setLogAxis(bool __value) ; - /*! \copydoc logAxisBase - \see logAxisBase */ + /*! \copydoc logAxisBase */ void setLogAxisBase (double __value); - /*! \copydoc userTickSpacing - \see userTickSpacing */ + /*! \copydoc userTickSpacing */ void setUserTickSpacing (double __value); - /*! \copydoc userLogTickSpacing - \see userLogTickSpacing */ + /*! \copydoc userLogTickSpacing */ void setUserLogTickSpacing (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::labelType - \see JKQTPCoordinateAxisStyle::labelType */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelType */ void setLabelType (JKQTPCALabelType __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickMode - \see JKQTPCoordinateAxisStyle::tickMode */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickMode */ void setTickMode (JKQTPLabelTickMode __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickMode - \see JKQTPCoordinateAxisStyle::tickMode */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickMode */ void setTickMode (int __value); - /*! \copydoc axisLabel - \see axisLabel */ + /*! \copydoc axisLabel */ void setAxisLabel (const QString& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::labelPosition - \see JKQTPCoordinateAxisStyle::labelPosition */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelPosition */ void setLabelPosition (JKQTPLabelPosition __value); - /*! \copydoc JKQTPCoordinateAxisStyle::labelFontSize - \see JKQTPCoordinateAxisStyle::labelFontSize */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelFontSize */ void setLabelFontSize (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickTimeFormat - \see JKQTPCoordinateAxisStyle::tickTimeFormat */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickTimeFormat */ void setTickTimeFormat (const QString& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickDateFormat - \see JKQTPCoordinateAxisStyle::tickDateFormat */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickDateFormat */ void setTickDateFormat (const QString& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickDateTimeFormat - \see JKQTPCoordinateAxisStyle::tickDateTimeFormat */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickDateTimeFormat */ void setTickDateTimeFormat (const QString& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelFontSize - \see JKQTPCoordinateAxisStyle::tickLabelFontSize */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelFontSize */ void setTickLabelFontSize (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFontSize - \see JKQTPCoordinateAxisStyle::minorTickLabelFontSize */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFontSize */ void setMinorTickLabelFontSize (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFullNumber - \see JKQTPCoordinateAxisStyle::minorTickLabelFullNumber */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickLabelFullNumber */ void setMinorTickLabelFullNumber (bool __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minTicks - \see JKQTPCoordinateAxisStyle::minTicks */ + /*! \copydoc JKQTPCoordinateAxisStyle::minTicks */ void setMinTicks(unsigned int __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTicks - \see JKQTPCoordinateAxisStyle::minorTicks */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTicks */ void setMinorTicks (unsigned int __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTicks - \see JKQTPCoordinateAxisStyle::minorTicks */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTicks */ void setMinorTicks (int __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickOutsideLength - \see JKQTPCoordinateAxisStyle::tickOutsideLength */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickOutsideLength */ void setTickOutsideLength(double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickOutsideLength - \see JKQTPCoordinateAxisStyle::minorTickOutsideLength */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickOutsideLength */ void setMinorTickOutsideLength (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickInsideLength - \see JKQTPCoordinateAxisStyle::tickInsideLength */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickInsideLength */ void setTickInsideLength(double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickInsideLength - \see JKQTPCoordinateAxisStyle::minorTickInsideLength */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickInsideLength */ void setMinorTickInsideLength (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::axisColor - \see JKQTPCoordinateAxisStyle::axisColor */ + /*! \copydoc JKQTPCoordinateAxisStyle::axisColor */ void setAxisColor (const QColor& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::showZeroAxis - \see JKQTPCoordinateAxisStyle::showZeroAxis */ + /*! \copydoc JKQTPCoordinateAxisStyle::showZeroAxis */ void setShowZeroAxis(bool __value); - /*! \copydoc inverted - \see inverted */ + /*! \copydoc inverted */ void setInverted(bool __value); - /*! \copydoc JKQTPCoordinateAxisStyle::gridColor - \see JKQTPCoordinateAxisStyle::gridColor */ + /*! \copydoc JKQTPCoordinateAxisStyle::gridColor */ void setGridColor(const QColor& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorGridColor - \see JKQTPCoordinateAxisStyle::minorGridColor */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorGridColor */ void setMinorGridColor(const QColor& __value); - /*! \copydoc JKQTPCoordinateAxisStyle::gridWidth - \see JKQTPCoordinateAxisStyle::gridWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::gridWidth */ void setGridWidth (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::gridStyle - \see JKQTPCoordinateAxisStyle::gridStyle */ + /*! \copydoc JKQTPCoordinateAxisStyle::gridStyle */ void setGridStyle(Qt::PenStyle __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorGridWidth - \see JKQTPCoordinateAxisStyle::minorGridWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorGridWidth */ void setMinorGridWidth(double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorGridStyle - \see JKQTPCoordinateAxisStyle::minorGridStyle */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorGridStyle */ void setMinorGridStyle (Qt::PenStyle __value); - /*! \copydoc JKQTPCoordinateAxisStyle::drawMode1 - \see JKQTPCoordinateAxisStyle::drawMode1 */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawMode1 */ void setDrawMode1 (JKQTPCADrawMode __value); - /*! \copydoc JKQTPCoordinateAxisStyle::drawMode2 - \see JKQTPCoordinateAxisStyle::drawMode2 */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawMode2 */ void setDrawMode2(JKQTPCADrawMode __value); - /*! \copydoc JKQTPCoordinateAxisStyle::minorTickWidth - \see JKQTPCoordinateAxisStyle::minorTickWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::minorTickWidth */ void setMinorTickWidth(double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickWidth - \see JKQTPCoordinateAxisStyle::tickWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickWidth */ void setTickWidth (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::lineWidth - \see JKQTPCoordinateAxisStyle::lineWidth */ + /*! \copydoc JKQTPCoordinateAxisStyle::lineWidth */ void setLineWidth (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::lineWidthZeroAxis - \see JKQTPCoordinateAxisStyle::lineWidthZeroAxis */ + /*! \copydoc JKQTPCoordinateAxisStyle::lineWidthZeroAxis */ void setLineWidthZeroAxis (double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelDistance - \see JKQTPCoordinateAxisStyle::tickLabelDistance */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelDistance */ void setTickLabelDistance(double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::labelDistance - \see JKQTPCoordinateAxisStyle::labelDistance */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelDistance */ void setLabelDistance(double __value); - /*! \copydoc JKQTPCoordinateAxisStyle::labelDigits - \see JKQTPCoordinateAxisStyle::labelDigits */ + /*! \copydoc JKQTPCoordinateAxisStyle::labelDigits */ void setLabelDigits(int __value); - /*! \copydoc JKQTPCoordinateAxisStyle::drawGrid - \see JKQTPCoordinateAxisStyle::drawGrid */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawGrid */ void setDrawGrid(bool __value); - /*! \copydoc JKQTPCoordinateAxisStyle::drawMinorGrid - \see JKQTPCoordinateAxisStyle::drawMinorGrid */ + /*! \copydoc JKQTPCoordinateAxisStyle::drawMinorGrid */ void setDrawMinorGrid(bool __value); - /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelAngle - \see JKQTPCoordinateAxisStyle::tickLabelAngle */ + /*! \copydoc JKQTPCoordinateAxisStyle::tickLabelAngle */ void setTickLabelAngle(double __value); protected: diff --git a/lib/jkqtplotter/jkqtpdatastorage.h b/lib/jkqtplotter/jkqtpdatastorage.h index 398527553c..cbd1f05d72 100644 --- a/lib/jkqtplotter/jkqtpdatastorage.h +++ b/lib/jkqtplotter/jkqtpdatastorage.h @@ -82,7 +82,7 @@ enum class JKQTPDatastoreItemFormat { /** \brief This class manages chunks of memory that are used for column data in JKQTBasePlotter descendents * \ingroup jkqtpdatastorage * - * \see \ref JKQTPlotterAdvancedJKQTPDatastore for a detailed description of how to use this class for data management! + * \see \ref JKQTPlotterBasicJKQTPDatastore for a detailed description of how to use this class for data management! * * This class manages a list if JKQTPDatastoreItem onjects that may each contain a chunk of memory, containig * one or more columns of data. Each item can be accessed with get() by a specific ID which is returned by add(). @@ -180,7 +180,7 @@ class JKQTP_LIB_EXPORT JKQTPDatastore{ } /** \brief add a new columns which references a specified item and a specified column therein. - * \see \ref JKQTPlotterAdvancedJKQTPDatastore + * \see \ref JKQTPlotterBasicJKQTPDatastore */ size_t addColumnForItem(size_t itemID, size_t columnInItem, const QString& name=QString("")); @@ -275,8 +275,8 @@ class JKQTP_LIB_EXPORT JKQTPDatastore{ /** \brief adds a values in cintainer \a values to the column \a column. This changes the column length (number of rows). If the memory was externally managed before, it will be internally managed afterwards * * \tparam TContainer a container with standard iterators - * \param colum the column to extend - * \param vales vector with data to append to column \a column + * \param column the column to extend + * \param values vector with data to append to column \a column */ template
[0, stride, 2*stride, ... (rows-1)*stride] are copied!
* \return the ID of the newly created column
@@ -581,7 +583,7 @@ class JKQTP_LIB_EXPORT JKQTPDatastore{
* \endcode
* \note This function converts the input array \a data into an array of double!
- * \see \ref JKQTPlotterAdvancedJKQTPDatastore
+ * \see \ref JKQTPlotterBasicJKQTPDatastore
*/
template\copydoc JKQTPDatastoreItem::JKQTPDatastoreItemrows. \see JKQTPDatastoreItem::rows for more information */ \ + /*! \copydoc JKQTPDatastoreItem::rows */ inline size_t getRows() const { return rows; } - /*! \brief returns the property columns ( \copybrief columns ). \details Description of the parameter columns is:
\copydoc JKQTPDatastoreItem::columns. \see JKQTPDatastoreItem::columns for more information */ \ + /*! \copydoc JKQTPDatastoreItem::columns */ inline size_t getColumns() const { return columns; } diff --git a/lib/jkqtplotter/jkqtpgraphsbase.h b/lib/jkqtplotter/jkqtpgraphsbase.h index 879d9efa2c..497ffcb163 100644 --- a/lib/jkqtplotter/jkqtpgraphsbase.h +++ b/lib/jkqtplotter/jkqtpgraphsbase.h @@ -165,12 +165,12 @@ class JKQTP_LIB_EXPORT JKQTPPlotElement: public QObject { When writing a new graph, you can therefore implement hitTest() in one of these ways: # You simply fill m_hitTestData with appropriate data and rely on the implementation in JKQTPPlotElement to do the work for you: You then need to call clearHitTestData() at the start of your draw() function and whenever you draw a datapoint, you add - its location and metadata to the internal storage with addHitTestData(). + its location and metadata to the internal storage with addHitTestData() # You derive from a graph class that already has an implementation. JKQTPXYGraph is an example of this. That class searches through all x-/y-coordinates in the internally known columns and even takes into account possible graph errors in the label, when the graph is also derived from JKQTPXGraphErrorData or JKQTPYGraphErrorData. This implementation therefore covers - most graph types pre-packaged with JKQTPlotter. - # You implement the function from scratch. + most graph types pre-packaged with JKQTPlotter + # You implement the function from scratch . \see addHitTestData(), clearHitTestData(), m_hitTestData, HitTestLocation diff --git a/lib/jkqtplotter/jkqtpgraphsgeometric.h b/lib/jkqtplotter/jkqtpgraphsgeometric.h index b6de9e5c82..21c014bf96 100644 --- a/lib/jkqtplotter/jkqtpgraphsgeometric.h +++ b/lib/jkqtplotter/jkqtpgraphsgeometric.h @@ -94,6 +94,7 @@ class JKQTP_LIB_EXPORT JKQTPGeoBaseFilled: public JKQTPGeoBaseLine, public JKQTP \param style line style of drawing \param fillStyle filling style of the graph \param lineWidth lineWidth of drawing + \param parent the parent plotter class */ JKQTPGeoBaseFilled(QColor color, QColor fillColor, double lineWidth, Qt::PenStyle style=Qt::SolidLine, Qt::BrushStyle fillStyle=Qt::SolidPattern, JKQTBasePlotter* parent=nullptr); /*! \brief class contructor @@ -103,6 +104,7 @@ class JKQTP_LIB_EXPORT JKQTPGeoBaseFilled: public JKQTPGeoBaseLine, public JKQTP \param style line style of drawing \param fillStyle filling style of the graph \param lineWidth lineWidth of drawing + \param parent the parent plotter class */ JKQTPGeoBaseFilled(QColor color, QColor fillColor, double lineWidth, Qt::PenStyle style, Qt::BrushStyle fillStyle, JKQTPlotter* parent); /*! \brief class contructor @@ -111,6 +113,7 @@ class JKQTP_LIB_EXPORT JKQTPGeoBaseFilled: public JKQTPGeoBaseLine, public JKQTP \param fillColor color of the filling in the drawing \param style line style of drawing \param lineWidth lineWidth of drawing + \param parent the parent plotter class */ JKQTPGeoBaseFilled(QColor color, QColor fillColor, double lineWidth, Qt::PenStyle style, JKQTPlotter* parent); /*! \brief class contructor @@ -118,12 +121,14 @@ class JKQTP_LIB_EXPORT JKQTPGeoBaseFilled: public JKQTPGeoBaseLine, public JKQTP \param color color of drawing \param fillColor color of the filling in the drawing \param lineWidth lineWidth of drawing + \param parent the parent plotter class */ JKQTPGeoBaseFilled(QColor color, QColor fillColor, double lineWidth, JKQTPlotter* parent); /*! \brief class contructor \param color color of drawing \param fillColor color of the filling in the drawing + \param parent the parent plotter class */ JKQTPGeoBaseFilled(QColor color, QColor fillColor, JKQTPlotter* parent); @@ -322,6 +327,7 @@ class JKQTP_LIB_EXPORT JKQTPGeoLine: public JKQTPGeoBaseLine { \param color color of line \param lineWidth width of line \param style line style + \param parent the parent plotter class */ JKQTPGeoLine(JKQTBasePlotter* parent, double x1, double y1, double x2, double y2, QColor color, double lineWidth=1, Qt::PenStyle style=Qt::SolidLine); /*! \brief class constructor @@ -334,6 +340,7 @@ class JKQTP_LIB_EXPORT JKQTPGeoLine: public JKQTPGeoBaseLine { \param color color of line \param lineWidth width of line \param style line style + \param parent the parent plotter class */ JKQTPGeoLine(JKQTPlotter* parent, double x1, double y1, double x2, double y2, QColor color, double lineWidth=1, Qt::PenStyle style=Qt::SolidLine); /*! \brief class constructor @@ -525,7 +532,6 @@ class JKQTP_LIB_EXPORT JKQTPGeoPolyLines: public JKQTPGeoBaseLine { /*! \brief class constructor \param parent the parent plotter class - \param points points on the polygon \param color color of line \param lineWidth width of line \param style line style @@ -534,7 +540,6 @@ class JKQTP_LIB_EXPORT JKQTPGeoPolyLines: public JKQTPGeoBaseLine { /*! \brief class constructor \param parent the parent plotter class - \param points points on the polygon \param color color of line \param lineWidth width of line \param style line style @@ -926,6 +931,8 @@ class JKQTP_LIB_EXPORT JKQTPGeoArc: public JKQTPGeoBaseLine { \param y y-coordinate of center of ellipse \param width width of ellipse (2 * half axis) \param height of ellipse (2 * half axis) + \param angleStart if we only draw an arc, this is the starting angle in degrees + \param angleStop if we only draw an arc, this is the ending angle in degrees \param color color of line \param lineWidth width of line \param style line style @@ -939,6 +946,8 @@ class JKQTP_LIB_EXPORT JKQTPGeoArc: public JKQTPGeoBaseLine { \param y y-coordinate of center of ellipse \param width width of ellipse (2 * half axis) \param height of ellipse (2 * half axis) + \param angleStart if we only draw an arc, this is the starting angle in degrees + \param angleStop if we only draw an arc, this is the ending angle in degrees \param color color of line \param lineWidth width of line \param style line style @@ -1047,6 +1056,8 @@ class JKQTP_LIB_EXPORT JKQTPGeoPie: public JKQTPGeoEllipse { \param y y-coordinate of center of ellipse \param width width of ellipse (2 * half axis) \param height of ellipse (2 * half axis) + \param angleStart if we only draw an arc, this is the starting angle in degrees + \param angleStop if we only draw an arc, this is the ending angle in degrees \param color color of line \param lineWidth width of line \param style line style @@ -1061,6 +1072,8 @@ class JKQTP_LIB_EXPORT JKQTPGeoPie: public JKQTPGeoEllipse { \param y y-coordinate of center of ellipse \param width width of ellipse (2 * half axis) \param height of ellipse (2 * half axis) + \param angleStart if we only draw an arc, this is the starting angle in degrees + \param angleStop if we only draw an arc, this is the ending angle in degrees \param color color of line \param lineWidth width of line \param style line style @@ -1116,6 +1129,8 @@ class JKQTP_LIB_EXPORT JKQTPGeoChord: public JKQTPGeoPie { \param y y-coordinate of center of ellipse \param width width of ellipse (2 * half axis) \param height of ellipse (2 * half axis) + \param angleStart if we only draw an arc, this is the starting angle in degrees + \param angleStop if we only draw an arc, this is the ending angle in degrees \param color color of line \param lineWidth width of line \param style line style @@ -1130,6 +1145,8 @@ class JKQTP_LIB_EXPORT JKQTPGeoChord: public JKQTPGeoPie { \param y y-coordinate of center of ellipse \param width width of ellipse (2 * half axis) \param height of ellipse (2 * half axis) + \param angleStart if we only draw an arc, this is the starting angle in degrees + \param angleStop if we only draw an arc, this is the ending angle in degrees \param color color of line \param lineWidth width of line \param style line style diff --git a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h b/lib/jkqtplotter/jkqtpgraphsimageoverlays.h index b9bf02d800..a7d42d7f41 100644 --- a/lib/jkqtplotter/jkqtpgraphsimageoverlays.h +++ b/lib/jkqtplotter/jkqtpgraphsimageoverlays.h @@ -175,11 +175,11 @@ class JKQTP_LIB_EXPORT JKQTPOverlayImageEnhanced: public JKQTPOverlayImage { /*! \copydoc symbolLineWidth \see see symbolLineWidth for details */ double getSymbolLineWidth() const; - /*! \copydoc drawAsRectangles - \see see drawAsRectangles for details */ + /*! \copydoc drawMode + \see see drawMode for details */ void setDrawMode(OverlayImageEnhancedDrawMode __value); - /*! \copydoc drawAsRectangles - \see see drawAsRectangles for details */ + /*! \copydoc drawMode + \see see drawMode for details */ OverlayImageEnhancedDrawMode getDrawMode() const; /*! \copydoc symbolSizeFactor \see see symbolSizeFactor for details */ diff --git a/lib/jkqtplotter/jkqtpgraphsimagergb.h b/lib/jkqtplotter/jkqtpgraphsimagergb.h index 5b497c6097..089bf53faf 100644 --- a/lib/jkqtplotter/jkqtpgraphsimagergb.h +++ b/lib/jkqtplotter/jkqtpgraphsimagergb.h @@ -190,17 +190,17 @@ class JKQTP_LIB_EXPORT JKQTPRGBMathImage: public JKQTPMathImageBase { /*! \copydoc autoImageRange \see see autoImageRange for details */ bool getAutoImageRange() const; - /*! \copydoc imageName - \see see imageName for details */ + /*! \copydoc imageNameR + \see see imageNameR for details */ void setImageName(const QString & __value); - /*! \copydoc imageName - \see see imageName for details */ + /*! \copydoc imageNameR + \see see imageNameR for details */ QString getImageName() const; - /*! \copydoc imageName - \see see imageName for details */ + /*! \copydoc imageNameR + \see see imageNameR for details */ QString getImageNameR() const; - /*! \copydoc imageName - \see see imageName for details */ + /*! \copydoc imageNameR + \see see imageNameR for details */ void setImageNameR(const QString& m); /*! \copydoc imageNameG \see see imageNameG for details */ diff --git a/lib/jkqtplottertools/jkqtpimagetools.h b/lib/jkqtplottertools/jkqtpimagetools.h index d4a9be38a0..492e9949e3 100644 --- a/lib/jkqtplottertools/jkqtpimagetools.h +++ b/lib/jkqtplottertools/jkqtpimagetools.h @@ -623,7 +623,7 @@ extern JKQTP_LIB_EXPORT QList
-1.23\cdot 10^{-5})
+/** \brief convert a double to a string, encoding powers of ten as exponent in LaTeX notation (e.g. -1.23\\cdot 10^{-5})
* \ingroup jkqtptools_string
*/
JKQTP_LIB_EXPORT std::string jkqtp_floattolatexstr(double data, int past_comma=5, bool remove_trail0=false, double belowIsZero=1e-16, double minNoExponent=1e-3, double maxNoExponent=1e4);