version 2.0.0_alpha

Important! All QtWraps macros renamed!
Qt 6 support
Graphic export feature
qad_types cross-Qt small changes

libs/graphic/graphic.h

@@ -124,19 +124,20 @@ public:
 
 	typedef QVector<QVector<QPointF> > GraphicsData;
 	enum GraphicAction {gaNone, gaZoomInRect, gaZoomRangeX, gaZoomRangeY, gaMove};
-	enum Button {NoButtons = 0x0,
-				AllButtons = 0xFFFFFFFF,
-				Autofit = 0x01,
-				Grid = 0x02,
-				CursorAxis = 0x04,
-				Fullscreen = 0x20,
+	enum Button {NoButtons   = 0x0,
+				AllButtons   = 0xFFFFFFFF,
+				Autofit      = 0x01,
+				Grid         = 0x02,
+				CursorAxis   = 0x04,
+				Fullscreen   = 0x20,
 				BorderInputs = 0x40,
-				Legend = 0x80,
-				Configure = 0x100,
-				Save = 0x200,
-				Clear = 0x800,
-				Close = 0x1000,
-				Pause = 0x2000,
+				Legend       = 0x80,
+				Configure    = 0x100,
+				Save         = 0x200,
+				Export       = 0x400,
+				Clear        = 0x800,
+				Close        = 0x1000,
+				Pause        = 0x2000,
 				StandartButtons = 0x2FFF
 				};
 	enum Alignment {Left, Right};
@@ -314,9 +315,11 @@ public slots:
 	void setVisualRect(const QRectF & rect);
 	void setDefaultRect(const QRectF & rect);
 	void autofit() {on_graphic_buttonAutofit_clicked();}
-	void saveImage();
+	void saveImage(QString filename);
+	void exportGraphics(QString filename);
 	void clear();
-	void update(bool force = false);
+	void update(bool force);
+	void update() {update(false);}
 	void updateGraphics() {findGraphicsRect(); update();}
 	void setCurrentGraphic(int arg) {if (arg < 0 || arg >= graphics.size()) return; curGraphic = arg;}
 	void setTraceGraphic(int arg) {if (arg < 0 || arg >= graphics.size()) return; curTrace = arg;}
@@ -421,7 +424,8 @@ protected slots:
 	void on_graphic_buttonAutofit_clicked();
 	void on_graphic_buttonConfigure_clicked();
 	void on_graphic_buttonFullscreen_clicked() {fullscreen();}
-	void on_graphic_buttonSave_clicked() {saveImage();}
+	void on_graphic_buttonSave_clicked();
+	void on_graphic_buttonExport_clicked();
 	void on_graphic_checkGrid_toggled(bool checked) {grid = checked; update();}
 	void on_graphic_checkGuides_toggled(bool checked);
 	void on_graphic_actionExpandX_triggered(bool checked);
@@ -462,7 +466,9 @@ public:
 	__GraphicRegistrator__() {
 		qRegisterMetaType<QVector<QPointF> >("QVector<QPointF>");
 		qRegisterMetaType<Graphic::GraphicsData>("Graphic::GraphicsData");
+#if QT_VERSION_MAJOR <= 5
 		qRegisterMetaTypeStreamOperators<Graphic::GraphicsData>("Graphic::GraphicsData");
+#endif
 	}
 };