修复qwt示例

2023-09-18 08:37:20 +08:00
parent 59e4c39f91
commit f21dfb4776
25 changed files with 102 additions and 122 deletions
--- a/third/qwtdemo/examples/animation/animation.pro
+++ b/third/qwtdemo/examples/animation/animation.pro
@@ -10,6 +10,6 @@ SOURCES     += main.cpp
 SOURCES     += plot.cpp
 HEADERS     += plot.h

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/barchart/barchart.pro
+++ b/third/qwtdemo/examples/barchart/barchart.pro
@@ -10,6 +10,6 @@ SOURCES     += main.cpp
 SOURCES     += barchart.cpp
 HEADERS     += barchart.h

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/bode/bode.pro
+++ b/third/qwtdemo/examples/bode/bode.pro
@@ -6,14 +6,15 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-SOURCES += main.cpp
-SOURCES += plot.cpp
-SOURCES += mainwindow.cpp
-HEADERS += plot.h
 HEADERS += mainwindow.h
 HEADERS += complexnumber.h
 HEADERS += pixmaps.h

-include     ($$PWD/../../qwt/qwt.pri)
+SOURCES += main.cpp
+SOURCES += plot.cpp
+SOURCES += mainwindow.cpp
+HEADERS += plot.h
+
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/controls/controls.pro
+++ b/third/qwtdemo/examples/controls/controls.pro
@@ -27,6 +27,6 @@ SOURCES = \
    dialtab.cpp \
    main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/cpuplot/cpuplot.pro
+++ b/third/qwtdemo/examples/cpuplot/cpuplot.pro
@@ -6,16 +6,14 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS =  \
-    cpuplot.h \
-    cpustat.h \
-    cpupiemarker.h 
+HEADERS += cpuplot.h
+HEADERS += cpustat.h
+HEADERS += cpupiemarker.h

-SOURCES = \
-    cpuplot.cpp \
-    cpustat.cpp \
-    cpupiemarker.cpp 
+SOURCES += cpuplot.cpp
+SOURCES += cpustat.cpp
+SOURCES += cpupiemarker.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/curvdemo1/curvdemo1.pro
+++ b/third/qwtdemo/examples/curvdemo1/curvdemo1.pro
@@ -9,6 +9,6 @@ DESTDIR     = $$PWD/../bin
 SOURCES = \
    curvdemo1.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/dials/attitude_indicator.cpp
+++ b/third/qwtdemo/examples/dials/attitude_indicator.cpp
@@ -1,9 +1,10 @@
-#include "attitude_indicator.h"
+#include "attitude_indicator.h"
 #include <qwt_point_polar.h>
 #include <qwt_round_scale_draw.h>
 #include <qevent.h>
 #include <qpainter.h>
 #include <qpolygon.h>
+#include <qpainterpath.h>

 AttitudeIndicatorNeedle::AttitudeIndicatorNeedle( const QColor &color )
 {
--- a/third/qwtdemo/examples/dials/dials.pro
+++ b/third/qwtdemo/examples/dials/dials.pro
@@ -19,6 +19,6 @@ SOURCES = \
    compass_grid.cpp \
    dials.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/distrowatch/distrowatch.pro
+++ b/third/qwtdemo/examples/distrowatch/distrowatch.pro
@@ -13,6 +13,6 @@ SOURCES = \
    barchart.cpp \
    main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/event_filter/event_filter.pro
+++ b/third/qwtdemo/examples/event_filter/event_filter.pro
@@ -19,6 +19,6 @@ SOURCES = \
    plot.cpp \
    event_filter.cpp 

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/friedberg/friedberg.pro
+++ b/third/qwtdemo/examples/friedberg/friedberg.pro
@@ -6,15 +6,13 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS = \
-    plot.h \
-    friedberg2007.h
+HEADERS += plot.h
+HEADERS += friedberg2007.h

-SOURCES = \
-    friedberg2007.cpp \
-    plot.cpp \
-    main.cpp
+SOURCES += friedberg2007.cpp
+SOURCES += plot.cpp
+SOURCES += main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/itemeditor/itemeditor.pro
+++ b/third/qwtdemo/examples/itemeditor/itemeditor.pro
@@ -17,6 +17,6 @@ SOURCES = \
    plot.cpp \
    main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/legends/legends.pro
+++ b/third/qwtdemo/examples/legends/legends.pro
@@ -18,6 +18,6 @@ SOURCES = \
    plot.cpp \
    main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/oscilloscope/oscilloscope.pro
+++ b/third/qwtdemo/examples/oscilloscope/oscilloscope.pro
@@ -25,6 +25,6 @@ SOURCES = \
    mainwindow.cpp \
    main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/radio/radio.pro
+++ b/third/qwtdemo/examples/radio/radio.pro
@@ -17,6 +17,6 @@ SOURCES = \
    tunerfrm.cpp \
    radio.cpp 

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/rasterview/rasterview.pro
+++ b/third/qwtdemo/examples/rasterview/rasterview.pro
@@ -6,13 +6,10 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS = \
-     plot.h 
+HEADERS += plot.h
+SOURCES += plot.cpp
+SOURCES += main.cpp

-SOURCES = \
-    plot.cpp \
-    main.cpp
-
-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/realtime/realtime.pro
+++ b/third/qwtdemo/examples/realtime/realtime.pro
@@ -21,6 +21,6 @@ SOURCES = \
    incrementalplot.cpp \
    randomplot.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/refreshtest/refreshtest.pro
+++ b/third/qwtdemo/examples/refreshtest/refreshtest.pro
@@ -6,20 +6,18 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS = \
-    settings.h \
-    circularbuffer.h \
-    panel.h \
-    plot.h \
-    mainwindow.h
+HEADERS += settings.h
+HEADERS += circularbuffer.h
+HEADERS += panel.h
+HEADERS += plot.h
+HEADERS += mainwindow.h

-SOURCES = \
-    circularbuffer.cpp \
-    panel.cpp \
-    plot.cpp \
-    mainwindow.cpp \
-    main.cpp
+SOURCES += circularbuffer.cpp
+SOURCES += panel.cpp
+SOURCES += plot.cpp
+SOURCES += mainwindow.cpp
+SOURCES += main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/scatterplot/scatterplot.pro
+++ b/third/qwtdemo/examples/scatterplot/scatterplot.pro
@@ -6,15 +6,13 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS = \
-    mainwindow.h \
-    plot.h
+HEADERS += mainwindow.h
+HEADERS += plot.h

-SOURCES = \
-    main.cpp \
-    mainwindow.cpp \
-    plot.cpp
+SOURCES += main.cpp
+SOURCES += mainwindow.cpp
+SOURCES += plot.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/simpleplot/simpleplot.pro
+++ b/third/qwtdemo/examples/simpleplot/simpleplot.pro
@@ -6,9 +6,8 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-SOURCES = \
-    simpleplot.cpp
+SOURCES += simpleplot.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/sinusplot/sinusplot.pro
+++ b/third/qwtdemo/examples/sinusplot/sinusplot.pro
@@ -6,9 +6,8 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-SOURCES = \
-    sinusplot.cpp
+SOURCES += sinusplot.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/spectrogram/spectrogram.pro
+++ b/third/qwtdemo/examples/spectrogram/spectrogram.pro
@@ -6,13 +6,10 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS = \
-     plot.h 
+HEADERS += plot.h
+SOURCES += plot.cpp
+SOURCES += main.cpp

-SOURCES = \
-    plot.cpp \
-    main.cpp
-
-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/stockchart/stockchart.pro
+++ b/third/qwtdemo/examples/stockchart/stockchart.pro
@@ -6,19 +6,17 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-HEADERS = \
-    legend.h \
-    griditem.h \
-    plot.h \
-    quotefactory.h
+HEADERS += legend.h
+HEADERS += griditem.h
+HEADERS += plot.h
+HEADERS += quotefactory.h

-SOURCES = \
-    legend.cpp \
-    griditem.cpp \
-    quotefactory.cpp \
-    plot.cpp \
-    main.cpp
+SOURCES += legend.cpp
+SOURCES += griditem.cpp
+SOURCES += quotefactory.cpp
+SOURCES += plot.cpp
+SOURCES += main.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/sysinfo/sysinfo.pro
+++ b/third/qwtdemo/examples/sysinfo/sysinfo.pro
@@ -6,9 +6,8 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-SOURCES = \
-    sysinfo.cpp 
+SOURCES += sysinfo.cpp

-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)
--- a/third/qwtdemo/examples/tvplot/tvplot.pro
+++ b/third/qwtdemo/examples/tvplot/tvplot.pro
@@ -6,13 +6,10 @@ UI_DIR      = temp/ui
 OBJECTS_DIR = temp/obj
 DESTDIR     = $$PWD/../bin

-SOURCES = \
-    tvplot.cpp \
-    main.cpp
+HEADERS += tvplot.h
+SOURCES += tvplot.cpp
+SOURCES += main.cpp

-HEADERS = \
-    tvplot.h
-
-include     ($$PWD/../../qwt/qwt.pri)
 INCLUDEPATH += $$PWD
-INCLUDEPATH += $$PWD/../../qwt
+INCLUDEPATH += $$PWD/../../../3rd_qwt
+include ($$PWD/../../../3rd_qwt/3rd_qwt.pri)