mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-24 09:31:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

some more fixes for reorganization

Browse Source
This commit is contained in:
jkriege2 2018-11-25 20:36:26 +01:00
parent d708424f8a
commit 9988df1506
6 changed files with 63 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,5 +1,5 @@
*.user
/test/build-*
build-*
# C++ objects and libs
@ -84,3 +84,6 @@ Sicherungskopie_*.cdr
Thumbs.db
*.prf
*.exe
/doc/html
.qmake.stash
moc_predefs.h

48
lib/jkqtplotter/jkqtpbasegraphs.cpp
View File

@ -1102,3 +1102,51 @@ bool JKQTPxyGraphErrors::errorUsesColumn(int c)
{
return (c==xErrorColumn)||(c==yErrorColumn)||(c==xErrorColumnLower)||(c==yErrorColumnLower);
}
void JKQTPxyGraphErrors::set_xErrorColumn(int __value) {
if (this->xErrorColumn != __value) {
this->xErrorColumn = __value;
if (xErrorColumn>=0 && xErrorStyle==JKQTPnoError) xErrorStyle=JKQTPerrorBars;
}
}
void JKQTPxyGraphErrors::set_xErrorColumnLower(int __value) {
if (this->xErrorColumnLower != __value) {
this->xErrorColumnLower = __value;
if (xErrorColumnLower>=0 && xErrorStyle==JKQTPnoError) xErrorStyle=JKQTPerrorBars;
} \
}
void JKQTPxyGraphErrors::set_yErrorColumn(int __value) {
if (this->yErrorColumn != __value) {
this->yErrorColumn = __value;
if (yErrorColumn>=0 && yErrorStyle==JKQTPnoError) yErrorStyle=JKQTPerrorBars;
}
}
void JKQTPxyGraphErrors::set_yErrorColumnLower(int __value) {
if (this->yErrorColumnLower != __value) {
this->yErrorColumnLower = __value;
if (yErrorColumnLower>=0 && yErrorStyle==JKQTPnoError) yErrorStyle=JKQTPerrorBars;
}
}
void JKQTPxyGraphErrors::set_xErrorColumn(size_t __value)
{
set_xErrorColumn(static_cast<int>(__value));
}
void JKQTPxyGraphErrors::set_xErrorColumnLower(size_t __value)
{
set_xErrorColumnLower(static_cast<int>(__value));
}
void JKQTPxyGraphErrors::set_yErrorColumn(size_t __value)
{
set_yErrorColumn(static_cast<int>(__value));
}
void JKQTPxyGraphErrors::set_yErrorColumnLower(size_t __value)
{
set_yErrorColumnLower(static_cast<int>(__value));
}

32
lib/jkqtplotter/jkqtpbasegraphs.h
View File

@ -517,30 +517,14 @@ class LIB_EXPORT JKQTPxyGraphErrors: public JKQTPgraphErrors {
/** \copydoc JKQTPgraphErrors::errorUsesColumn() */
virtual bool errorUsesColumn(int c);
inline void set_xErrorColumn(int __value) {
if (this->xErrorColumn != __value) { \
this->xErrorColumn = __value; \
if (xErrorColumn>=0 && xErrorStyle==JKQTPnoError) xErrorStyle=JKQTPerrorBars; \
} \
}
inline void set_xErrorColumnLower(int __value) {
if (this->xErrorColumnLower != __value) { \
this->xErrorColumnLower = __value; \
if (xErrorColumnLower>=0 && xErrorStyle==JKQTPnoError) xErrorStyle=JKQTPerrorBars; \
} \
}
inline void set_yErrorColumn(int __value) {
if (this->yErrorColumn != __value) { \
this->yErrorColumn = __value; \
if (yErrorColumn>=0 && yErrorStyle==JKQTPnoError) yErrorStyle=JKQTPerrorBars; \
} \
}
inline void set_yErrorColumnLower(int __value) {
if (this->yErrorColumnLower != __value) { \
this->yErrorColumnLower = __value; \
if (yErrorColumnLower>=0 && yErrorStyle==JKQTPnoError) yErrorStyle=JKQTPerrorBars; \
} \
}
void set_xErrorColumn(int __value);
void set_xErrorColumnLower(int __value);
void set_yErrorColumn(int __value);
void set_yErrorColumnLower(int __value);
void set_xErrorColumn(size_t __value);
void set_xErrorColumnLower(size_t __value);
void set_yErrorColumn(size_t __value);
void set_yErrorColumnLower(size_t __value);
protected:
/** \brief the column that contains the error of the x-component of the datapoints */

2
test/jkqtplotter_simpletest_barchart/jkqtplotter_simpletest_barchart.pro
View File

@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
TARGET = jkqtplotter_simpletest_barchart
# include JKQtPlotter source code
include(../../jkqtplotter.pri)
include(../../lib/jkqtplotter.pri)
# here you can activate some debug options
#DEFINES += SHOW_JKQTPLOTTER_DEBUG
#DEFINES += JKQTBP_AUTOTIMER

2
test/jkqtplotter_simpletest_stackedbars/jkqtplotter_simpletest_stackedbars.pro
View File

@ -10,7 +10,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport
TARGET = jkqtplotter_simpletest_stackedbars
# include JKQtPlotter source code
include(../../jkqtplotter.pri)
include(../../lib/jkqtplotter.pri)
# here you can activate some debug options
#DEFINES += SHOW_JKQTPLOTTER_DEBUG
#DEFINES += JKQTBP_AUTOTIMER

2
test/jkqtplotter_simpletest_symbols_and_errors/jkqtplotter_simpletest_symbols_and_errors.cpp
View File

@ -1,5 +1,5 @@
#include <QApplication>
#include "jkqtplotter.h"
#include "jkqtplotter/jkqtplotter.h"
// number of datapoints:
#define Ndata 10