"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "lib/array3ditem.h" between
kpl-4.1.tar.gz and kpl-5.0.tar.gz

About: Kpl is a KDE program for two- and three-dimensional graphical presentation (plots) of data sets and functions. Multidimensional nonlinear parameter and general linear least square parameter fits can be performed.

array3ditem.h  (kpl-4.1):array3ditem.h  (kpl-5.0)
/*************************************************************************** /***************************************************************************
array3ditem.h - description array3ditem.h - description
------------------- -------------------
begin : Tue Dec 25 2001 begin : Tue Dec 25 2001
copyright : (C) 2015 by Werner Stille copyright : (C) 2017 by Werner Stille
email : stille@uni-freiburg.de email : kpl@werner-stille.de
***************************************************************************/ ***************************************************************************/
/*************************************************************************** /***************************************************************************
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by * * it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or * * the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. * * (at your option) any later version. *
* * * *
***************************************************************************/ ***************************************************************************/
skipping to change at line 29 skipping to change at line 29
#define ARRAY3DITEM_H #define ARRAY3DITEM_H
#include <QTransform> #include <QTransform>
#include "arrayitem.h" #include "arrayitem.h"
#include "threeditem.h" #include "threeditem.h"
/** /**
* 3D arrayitem class. Provides methods for 3D plotting of arrays. * 3D arrayitem class. Provides methods for 3D plotting of arrays.
* @author Werner Stille * @author Werner Stille
*/ */
class KDE_EXPORT Array3DItem : public ThreeDItem class Q_DECL_EXPORT Array3DItem : public ThreeDItem
{ {
public: public:
/** Specific QGraphicsItem type number for function type() */ /** Specific QGraphicsItem type number for function type() */
enum { enum {
Type = UserType + Array3D Type = UserType + Array3D
/**< Specific QGraphicsItem type number of Array3DItem for function /**< Specific QGraphicsItem type number of Array3DItem for function
* type(). * type().
*/ */
}; };
/** /**
skipping to change at line 124 skipping to change at line 124
ArrayItem::DecimalCharacter decimalChar = ArrayItem::Point, ArrayItem::DecimalCharacter decimalChar = ArrayItem::Point,
int numDigX = -1, int numDigY = -1, int numDigZ = -1, int numDigX = -1, int numDigY = -1, int numDigZ = -1,
int minTicX = 5, int minTicY = 2, int minTicZ = 5, int expX = 0, int minTicX = 5, int minTicY = 2, int minTicZ = 5, int expX = 0,
int expY = 0, int expZ = 0, double xMin = 0, double yMin = 0, int expY = 0, int expZ = 0, double xMin = 0, double yMin = 0,
double zMin = 0, double xTic = 5, double yTic = 2, double zMin = 0, double xTic = 5, double yTic = 2,
double zTic = 5, double deltaX = 0, double deltaZ = 0, double zTic = 5, double deltaX = 0, double deltaZ = 0,
double phi = 20, double theta = -20, double boxX = 7.5, double phi = 20, double theta = -20, double boxX = 7.5,
double boxY = 7.5, double boxZ = 7.5, double xRef = 7.5, double boxY = 7.5, double boxZ = 7.5, double xRef = 7.5,
double yRef = 4, double fx = 1, double fy = 1, double fz = 1, double yRef = 4, double fx = 1, double fy = 1, double fz = 1,
int rowStart = 0, int n = 0, double smooth = 0, int rowStart = 0, int n = 0, double smooth = 0,
const KUrl& url = KUrl(), bool showFrame = true, const QUrl& url = QUrl(), bool showFrame = true,
bool internal = false, bool collapsed = false, bool internal = false, bool collapsed = false,
bool visible = true); bool visible = true);
/** Copy constructor. */ /** Copy constructor. */
Array3DItem(const Array3DItem& a); Array3DItem(const Array3DItem& a);
/** /**
* Constructor. Initializes corresponding to plot file. * Constructor. Initializes corresponding to plot file.
* @param plo pointer to KConfigGroup object containing item data. * @param plo pointer to KConfigGroup object containing item data.
* @param urlPlo URL of plot file. * @param urlPlo URL of plot file.
* @param x0 default value for left page margin in centimeters. * @param x0 default value for left page margin in centimeters.
* @param y0 default value for bottom page margin in centimeters. * @param y0 default value for bottom page margin in centimeters.
skipping to change at line 146 skipping to change at line 146
* @param height default value for height in centimeters. * @param height default value for height in centimeters.
* @param colorFrame default value for color for frame and labels. * @param colorFrame default value for color for frame and labels.
* @param colorGrid default value for color for grids and tics. * @param colorGrid default value for color for grids and tics.
* @param colorData color for data plot. * @param colorData color for data plot.
* @param gridMode default grid mode. * @param gridMode default grid mode.
* @param colX default x column index. * @param colX default x column index.
* @param colY default y column index. * @param colY default y column index.
* @param colErr default y error column index. * @param colErr default y error column index.
* @param errorBars default, true to plot error bars. * @param errorBars default, true to plot error bars.
*/ */
Array3DItem(const KConfigGroup* plo, const KUrl& urlPlo, double x0 = 4, Array3DItem(const KConfigGroup* plo, const QUrl& urlPlo, double x0 = 4,
double y0 = 3, double width = 15, double height = 10, double y0 = 3, double width = 15, double height = 10,
unsigned colorFrame = 0, unsigned colorGrid = 0, unsigned colorFrame = 0, unsigned colorGrid = 0,
unsigned colorData = 0, GridMode gridMode = AxesWithLabels, unsigned colorData = 0, GridMode gridMode = AxesWithLabels,
int colX = 0, int colY = 1, int colErr = 0, int colX = 0, int colY = 1, int colErr = 0,
bool errorBars = false); bool errorBars = false);
/** Destructor. */ /** Destructor. */
~Array3DItem(); ~Array3DItem();
/** Calculates value table. */ /** Calculates value table. */
void calcTable() const; void calcTable() const;
/** Returns y error column index. */ /** Returns y error column index. */
skipping to change at line 253 skipping to change at line 253
inline void setRowStart(int rowStart) { m_rowStart = rowStart; }; inline void setRowStart(int rowStart) { m_rowStart = rowStart; };
/** /**
* Sets smoothing factor. * Sets smoothing factor.
* @param smooth factor. * @param smooth factor.
*/ */
inline void setSmf(double smooth) { m_smf = smooth; }; inline void setSmf(double smooth) { m_smf = smooth; };
/** /**
* Sets URL. * Sets URL.
* @param url URL of data file. * @param url URL of data file.
*/ */
inline void setUrl(const KUrl& url) { m_url = url; }; inline void setUrl(const QUrl& url) { m_url = url; };
/** Returns smoothing factor. */ /** Returns smoothing factor. */
inline double smf() const { return m_smf; }; inline double smf() const { return m_smf; };
/** Returns specific QGraphicsItem type number. */ /** Returns specific QGraphicsItem type number. */
virtual int type() const { return Type; }; virtual int type() const { return Type; };
/** Returns URL of data file. */ /** Returns URL of data file. */
inline const KUrl& url() const { return m_url; }; inline const QUrl& url() const { return m_url; };
/** Applies changes and forces redrawing. */ /** Applies changes and forces redrawing. */
void update(); void update();
/** /**
* Writes into plot file. * Writes into plot file.
* @param plo KConfigGroup object. * @param plo KConfigGroup object.
* @param urlPlo URL of plot file. * @param urlPlo URL of plot file.
* @param absolute true to save absolute paths. * @param absolute true to save absolute paths.
*/ */
void writePlo(KConfigGroup* plo, const KUrl& urlPlo, bool absolute) const; void writePlo(KConfigGroup* plo, const QUrl& urlPlo, bool absolute) const;
protected: protected:
bool m_internal, m_errorBars; bool m_internal, m_errorBars;
mutable bool errorBarso; mutable bool errorBarso;
int m_colX, m_colY, m_colZ, m_colErr, m_rowStart, m_count, m_numRows, int m_colX, m_colY, m_colZ, m_colErr, m_rowStart, m_count, m_numRows,
m_numCols; m_numCols;
ArrayItem::DecimalCharacter m_decimalCharacter; ArrayItem::DecimalCharacter m_decimalCharacter;
mutable int colXo, colYo, colZo, colErro, rowStarto, counto; mutable int colXo, colYo, colZo, colErro, rowStarto, counto;
double m_smf; double m_smf;
mutable double smfo; mutable double smfo;
double** m_data; double** m_data;
KUrl m_url; QUrl m_url;
}; };
#endif #endif
 End of changes. 8 change blocks. 
9 lines changed or deleted 9 lines changed or added

Home  |  About  |  All  |  Newest  |  Fossies Dox  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTPS