Skip to content

Commit 615f7b0

Browse files
committed
Remove the qwt library dependency; Upgrade to Qt 6; Addd new polar plot for phase function; Add the option to save induvidual plots; Fix naming conventions; add two new sample files; Add new unit tests
1 parent e0895f3 commit 615f7b0

34 files changed

Lines changed: 12114 additions & 5162 deletions
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
0.2 3.18198e+05 1.42 -0.2 1.36
2+
0.3 1.30094e+06 1.377 0 1.34
3+
0.4 3.24211e+05 1.54 -0.45 1.33
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
0.2,3.18198e+05,1.42,-0.2,1.36
2+
0.3,1.30094e+06,1.377,0,1.34
3+
0.4,3.24211e+05,1.54,-0.45,1.33

src/app/app.pro

Lines changed: 2 additions & 115 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
## app project file
33
##################################################
44

5-
#Build tests
6-
#QMAKE_POST_LINK += "&& cd ../test && $(MAKE) && ./$$TARGET"
7-
85
QT += core gui widgets printsupport
96

107
greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
118

12-
TARGET = MieSimulatorGUI_v2_0
9+
TARGET = MieSimulatorGUI_v1_4
1310
CONFIG -= -qt-freetype
1411
TEMPLATE = app
1512
DEFINES += QT_DEPRECATED_WARNINGS
@@ -53,64 +50,6 @@ DISTFILES += \
5350
misc/MieSimulatorGUI.png
5451

5552
HEADERS += \
56-
lib/qwt/qtconcurrentrun.h \
57-
lib/qwt/qwt.h \
58-
lib/qwt/qwt_abstract_legend.h \
59-
lib/qwt/qwt_abstract_scale.h \
60-
lib/qwt/qwt_abstract_scale_draw.h \
61-
lib/qwt/qwt_abstract_slider.h \
62-
lib/qwt/qwt_clipper.h \
63-
lib/qwt/qwt_color_map.h \
64-
lib/qwt/qwt_curve_fitter.h \
65-
lib/qwt/qwt_dyngrid_layout.h \
66-
lib/qwt/qwt_global.h \
67-
lib/qwt/qwt_graphic.h \
68-
lib/qwt/qwt_interval.h \
69-
lib/qwt/qwt_legend.h \
70-
lib/qwt/qwt_legend_data.h \
71-
lib/qwt/qwt_legend_label.h \
72-
lib/qwt/qwt_math.h \
73-
lib/qwt/qwt_null_paintdevice.h \
74-
lib/qwt/qwt_painter.h \
75-
lib/qwt/qwt_painter_command.h \
76-
lib/qwt/qwt_pixel_matrix.h \
77-
lib/qwt/qwt_plot.h \
78-
lib/qwt/qwt_plot_canvas.h \
79-
lib/qwt/qwt_plot_curve.h \
80-
lib/qwt/qwt_plot_dict.h \
81-
lib/qwt/qwt_plot_item.h \
82-
lib/qwt/qwt_plot_layout.h \
83-
lib/qwt/qwt_plot_seriesitem.h \
84-
lib/qwt/qwt_point_3d.h \
85-
lib/qwt/qwt_point_data.h \
86-
lib/qwt/qwt_point_mapper.h \
87-
lib/qwt/qwt_point_polar.h \
88-
lib/qwt/qwt_polar.h \
89-
lib/qwt/qwt_polar_canvas.h \
90-
lib/qwt/qwt_polar_curve.h \
91-
lib/qwt/qwt_polar_global.h \
92-
lib/qwt/qwt_polar_grid.h \
93-
lib/qwt/qwt_polar_item.h \
94-
lib/qwt/qwt_polar_itemdict.h \
95-
lib/qwt/qwt_polar_layout.h \
96-
lib/qwt/qwt_polar_plot.h \
97-
lib/qwt/qwt_round_scale_draw.h \
98-
lib/qwt/qwt_samples.h \
99-
lib/qwt/qwt_scale_div.h \
100-
lib/qwt/qwt_scale_draw.h \
101-
lib/qwt/qwt_scale_engine.h \
102-
lib/qwt/qwt_scale_map.h \
103-
lib/qwt/qwt_scale_widget.h \
104-
lib/qwt/qwt_series_data.h \
105-
lib/qwt/qwt_series_store.h \
106-
lib/qwt/qwt_slider.h \
107-
lib/qwt/qwt_spline.h \
108-
lib/qwt/qwt_symbol.h \
109-
lib/qwt/qwt_text.h \
110-
lib/qwt/qwt_text_engine.h \
111-
lib/qwt/qwt_text_label.h \
112-
lib/qwt/qwt_transform.h \
113-
lib/qwt/qwt_widget_overlay.h \
11453
lib/qcustomplot.h \
11554
calc/calculate.h \
11655
calc/miesimulation.h \
@@ -122,59 +61,7 @@ HEADERS += \
12261
dialog/plotdata.h \
12362
parameters.h
12463

125-
SOURCES += \
126-
lib/qwt/qwt_abstract_legend.cpp \
127-
lib/qwt/qwt_abstract_scale.cpp \
128-
lib/qwt/qwt_abstract_scale_draw.cpp \
129-
lib/qwt/qwt_abstract_slider.cpp \
130-
lib/qwt/qwt_clipper.cpp \
131-
lib/qwt/qwt_color_map.cpp \
132-
lib/qwt/qwt_curve_fitter.cpp \
133-
lib/qwt/qwt_dyngrid_layout.cpp \
134-
lib/qwt/qwt_graphic.cpp \
135-
lib/qwt/qwt_interval.cpp \
136-
lib/qwt/qwt_legend.cpp \
137-
lib/qwt/qwt_legend_data.cpp \
138-
lib/qwt/qwt_legend_label.cpp \
139-
lib/qwt/qwt_math.cpp \
140-
lib/qwt/qwt_null_paintdevice.cpp \
141-
lib/qwt/qwt_painter.cpp \
142-
lib/qwt/qwt_painter_command.cpp \
143-
lib/qwt/qwt_pixel_matrix.cpp \
144-
lib/qwt/qwt_plot.cpp \
145-
lib/qwt/qwt_plot_axis.cpp \
146-
lib/qwt/qwt_plot_canvas.cpp \
147-
lib/qwt/qwt_plot_curve.cpp \
148-
lib/qwt/qwt_plot_dict.cpp \
149-
lib/qwt/qwt_plot_item.cpp \
150-
lib/qwt/qwt_plot_layout.cpp \
151-
lib/qwt/qwt_plot_seriesitem.cpp \
152-
lib/qwt/qwt_point_3d.cpp \
153-
lib/qwt/qwt_point_data.cpp \
154-
lib/qwt/qwt_point_mapper.cpp \
155-
lib/qwt/qwt_point_polar.cpp \
156-
lib/qwt/qwt_polar_canvas.cpp \
157-
lib/qwt/qwt_polar_curve.cpp \
158-
lib/qwt/qwt_polar_grid.cpp \
159-
lib/qwt/qwt_polar_item.cpp \
160-
lib/qwt/qwt_polar_itemdict.cpp \
161-
lib/qwt/qwt_polar_layout.cpp \
162-
lib/qwt/qwt_polar_plot.cpp \
163-
lib/qwt/qwt_round_scale_draw.cpp \
164-
lib/qwt/qwt_scale_div.cpp \
165-
lib/qwt/qwt_scale_draw.cpp \
166-
lib/qwt/qwt_scale_engine.cpp \
167-
lib/qwt/qwt_scale_map.cpp \
168-
lib/qwt/qwt_scale_widget.cpp \
169-
lib/qwt/qwt_series_data.cpp \
170-
lib/qwt/qwt_slider.cpp \
171-
lib/qwt/qwt_spline.cpp \
172-
lib/qwt/qwt_symbol.cpp \
173-
lib/qwt/qwt_text.cpp \
174-
lib/qwt/qwt_text_engine.cpp \
175-
lib/qwt/qwt_text_label.cpp \
176-
lib/qwt/qwt_transform.cpp \
177-
lib/qwt/qwt_widget_overlay.cpp \
64+
SOURCES += \
17865
lib/qcustomplot.cpp \
17966
calc/calculate.cpp \
18067
calc/miesimulation.cpp \

0 commit comments

Comments
 (0)