mirrors/JKQtPlotter
1
0
Fork 0
mirror of https://github.com/jkriege2/JKQtPlotter.git synced 2024-12-25 18:11:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #6 from srazi/master

Browse Source 
MSVC: Fix
This commit is contained in:
Jan W. Krieger 2018-12-19 10:29:36 +01:00 committed by GitHub
commit 71b562f29c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/jkqtplotter/jkqtpbaseplotter.h
View File

@ -759,7 +759,7 @@ class LIB_EXPORT JKQtBasePlotter: public QObject {
* will be managed (freed) by this class. If \a datastore_internal is \c false the class will use tha datastore provided * will be managed (freed) by this class. If \a datastore_internal is \c false the class will use tha datastore provided
* in \a datast as an external datastore. You can modify this later by using useInternalDatastore() and useExternalDatastore(). * in \a datast as an external datastore. You can modify this later by using useInternalDatastore() and useExternalDatastore().
*/ */
JKQtBasePlotter(bool datastore_internal=true, QObject* parent=nullptr, JKQTPdatastore* datast=nullptr); JKQtBasePlotter(bool datastore_internal, QObject* parent=nullptr, JKQTPdatastore* datast=nullptr);
/** \brief class destructor */ /** \brief class destructor */
virtual ~JKQtBasePlotter(); virtual ~JKQtBasePlotter();

2
lib/jkqtplottertools/jkqtpimagetools.h
View File

@ -527,7 +527,7 @@ QStringList LIB_EXPORT JKQTPimagePlot_getPredefinedPalettes();
int* LIB_EXPORT JKQTPimagePlot_getCreateLUT(QList<int *> &lutstore, JKQTPMathImageColorPalette palette); LIB_EXPORT int* JKQTPimagePlot_getCreateLUT(QList<int *> &lutstore, JKQTPMathImageColorPalette palette);
void LIB_EXPORT JKQTPimagePlot_freeLUTs(QList<int *> &lutstore); void LIB_EXPORT JKQTPimagePlot_freeLUTs(QList<int *> &lutstore);

1
test/test_multiplot/test_multiplot.pro
View File

@ -16,6 +16,7 @@ INCLUDEPATH += ../../lib
CONFIG (debug, debug|release):LIBS += -L../../lib/debug -ljkqtplotterlib CONFIG (debug, debug|release):LIBS += -L../../lib/debug -ljkqtplotterlib
CONFIG (release):LIBS += -L../../lib/release -ljkqtplotterlib CONFIG (release):LIBS += -L../../lib/release -ljkqtplotterlib
win32-msvc*: DEFINES += _USE_MATH_DEFINES
# here you can activate some debug options # here you can activate some debug options
#DEFINES += SHOW_JKQTPLOTTER_DEBUG #DEFINES += SHOW_JKQTPLOTTER_DEBUG