mirror of
https://github.com/jkriege2/JKQtPlotter.git
synced 2024-12-25 10:01:38 +08:00
bugfix attempt for compile error with QDataStream and JKQTPGraphSymbols
This commit is contained in:
parent
d46d82b17c
commit
ffe9e904bc
@ -40,6 +40,8 @@
|
|||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QGuiApplication>
|
#include <QGuiApplication>
|
||||||
|
#include <QDataStream>
|
||||||
|
#include <ostream>
|
||||||
#include "jkqtcommon/jkqtpmathtools.h"
|
#include "jkqtcommon/jkqtpmathtools.h"
|
||||||
#include "jkqtcommon/jkqtpcodestructuring.h"
|
#include "jkqtcommon/jkqtpcodestructuring.h"
|
||||||
|
|
||||||
@ -212,6 +214,7 @@ inline JKQTPGraphSymbols operator+(JKQTPGraphSymbols a, int64_t b) {
|
|||||||
return static_cast<JKQTPGraphSymbols>(static_cast<uint64_t>(a)+b);
|
return static_cast<JKQTPGraphSymbols>(static_cast<uint64_t>(a)+b);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/** \brief register a JKQTPCustomGraphSymbolFunctor that draws a custom symbol.Returns an ID that allows to access the symbol!
|
/** \brief register a JKQTPCustomGraphSymbolFunctor that draws a custom symbol.Returns an ID that allows to access the symbol!
|
||||||
* \ingroup jkqtptools_drawing
|
* \ingroup jkqtptools_drawing
|
||||||
*
|
*
|
||||||
@ -245,6 +248,18 @@ JKQTCOMMON_LIB_EXPORT QString JKQTPGraphSymbols2NameString(JKQTPGraphSymbols pos
|
|||||||
*/
|
*/
|
||||||
JKQTCOMMON_LIB_EXPORT JKQTPGraphSymbols String2JKQTPGraphSymbols(const QString& pos);
|
JKQTCOMMON_LIB_EXPORT JKQTPGraphSymbols String2JKQTPGraphSymbols(const QString& pos);
|
||||||
|
|
||||||
|
|
||||||
|
inline QDataStream& operator<<(QDataStream& str, JKQTPGraphSymbols s) {
|
||||||
|
str<<static_cast<uint64_t>(s);
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
inline QDataStream& operator>>(QDataStream& str, JKQTPGraphSymbols& s) {
|
||||||
|
str<<reinterpret_cast<uint64_t&>(s);
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
|
||||||
/*! \brief plot the specified symbol at pixel position x,y
|
/*! \brief plot the specified symbol at pixel position x,y
|
||||||
\ingroup jkqtptools_drawing
|
\ingroup jkqtptools_drawing
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user