X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Feditwindow.h;h=77104bd4d442287b704108ee3ce44492da24da01;hb=3fe885b75511c9fbfe18a5c509260e83bb7ac136;hp=98691a46e755eee681dd23a4aad6311ca7c8be8e;hpb=2b16243b0aa693d18ce49a071cdae73cadc37c4f;p=ttedit

diff --git a/src/editwindow.h b/src/editwindow.h
old mode 100755
new mode 100644
index 98691a4..77104bd
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -8,10 +8,12 @@
 #ifndef __EDITWINDOW_H__
 #define __EDITWINDOW_H__
 
-#include <QtGui>
-#include "types.h"
+#include <QtWidgets>
+#include <stdint.h>
 #include "toolwindow.h"							// For ToolType enum
 #include "glyphpoints.h"
+#include "painter.h"
+
 
 class EditWindow: public QWidget
 {
@@ -23,34 +25,38 @@ class EditWindow: public QWidget
 		QSize sizeHint() const;
 
 	protected:
-		void paintEvent(QPaintEvent * event);
-		void mousePressEvent(QMouseEvent * event);
-		void mouseMoveEvent(QMouseEvent * event);
-		void mouseReleaseEvent(QMouseEvent * event);
+		void paintEvent(QPaintEvent *);
+		void mousePressEvent(QMouseEvent *);
+		void mouseMoveEvent(QMouseEvent *);
+		void mouseReleaseEvent(QMouseEvent *);
+		void keyPressEvent(QKeyEvent *);
+		void keyReleaseEvent(QKeyEvent *);
 
 	private:
 		void CreateCursors(void);
-		QPoint GetAdjustedMousePosition(QMouseEvent * event);
-		QPoint GetAdjustedClientPosition(int x, int y);
-		void DrawGlyph(QPainter & p, GlyphPoints & glyph);
-		void DrawGlyphPoly(QPainter & p, GlyphPoints & glyph, uint16 poly);
+		void DrawGlyph(Painter & p, GlyphPoints & glyph);
+		void DrawGlyphPoly(Painter & p, GlyphPoints & glyph, uint16_t poly);
+		void DrawGlyphSegment(Painter & p, IPoint p1, IPoint p2, IPoint p3);
+		void ClearSelection(void);
 
 	public:
 		QImage image;
-		QPoint pt, ptOffset, ptPrevious;
-		double scale;							// Window scaling factor
-		int32 offsetX, offsetY;					// Window offsets
-		ToolType tool;							// Current tool
-		GlyphPoints pts;						// Glyph point structure
-		int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-		int16 polyHighlight, oldPolyHighlight;
+		Vector pt, ptOffset, ptPrevious, addPoint;
+		bool addPointOnCurve;
+		ToolType tool;						// Current tool
+		GlyphPoints pts;					// Glyph point structure
+		int32_t ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
+		int16_t polyHighlight, oldPolyHighlight;
 		bool polyFirstPoint;
 		bool showRotationCenter, haveZeroPoint;
-		QPoint rotationCenter, rotationZeroPoint, rotationCurrentPoint;
+		Vector rotationCenter, rotationZeroPoint, rotationCurrentPoint;
 		double rotationAngle;
 
 		ToolWindow * toolPalette;
-		QCursor cur[11];
+		QCursor cur[12];
+		bool selectedPoints[65536];	// Potential memory leak :-O
+		QRect selection;
+		bool selectionInProgress;
 };
 
 #endif	// __EDITWINDOW_H__