git-svn-id: svn://db.shs.com.ru/libs@35 a8b55f48-bf90-11e4-a774-851b48703e85

qad_graphic/graphic.cpp

@@ -461,7 +461,7 @@ void Graphic::setHistorySize(double val) {
 	double x;
 	for (int i = 0; i < graphics.size(); ++i) {
 		QPolygonF & pol(graphics[i].polyline);
-		if (pol.isEmpty()) continue;
+		if (pol.isEmpty() || history <= 0.) continue;
 		x = pol.back().x() - history;
 		for (int j = pol.size() - 2; j >= 0 ; --j)
 			if (pol[j].x() < x) {
@@ -1088,6 +1088,7 @@ void Graphic::tick(int index, bool slide, bool update_) {
 	if (slide) {
 		mutex.lock();
 		GraphicType & t(graphics[index]);
+		if (history > 0.)
 			while (t.polyline.size() > 1) {
 				if (fabs(t.polyline.back().x() - t.polyline.front().x()) <= history) break;
 				t.polyline.pop_front();

qad_graphic/graphic.h

@@ -198,6 +198,7 @@ public:
 	Graduation graduationY() const {return grad_y;}
 	double graduationStepX() const {return gridx;}
 	double graduationStepY() const {return gridy;}
+	QVector<QPointF> graphicData(const int index = 0) const {return graphics[index].polyline;}
 	GraphicsData graphicsData() const;
 	QWidget * viewport() const {return canvas;}
     QByteArray save();

qad_graphic/uglwidget.h

@@ -1,7 +1,7 @@
 #ifndef UGLWIDGET_H
 #define UGLWIDGET_H
 
-#include <QtOpenGL/QGLWidget>
+#include <QGLWidget>
 #ifndef GL_MULTISAMPLE
 #define GL_MULTISAMPLE 0x809D
 #endif

qad_graphic/uwidget.h

@@ -1,7 +1,7 @@
 #ifndef UWIDGET_H
 #define UWIDGET_H
 
-#include <QtGui/QWidget>
+#include <QWidget>
 #include <QPainter>
 #include <QStyle>
 #include <QStyleOption>