First stab at showing effect of added points on a given poly.

[ttedit] / src / editwindow.h

diff --git a/src/editwindow.h b/src/editwindow.h
old mode 100755 (executable)
new mode 100644 (file)
index 846e891..77104bd
--- a/src/editwindow.h
+++ b/src/editwindow.h
@@ -8,41 +8,55 @@
 #ifndef __EDITWINDOW_H__
 #define __EDITWINDOW_H__
 
-#include <wx/wx.h>                                                             // So that whoever uses this can without having
-                                                                                               // to pull in a bunch of references manually
-#include "types.h"
-#include "ttedit.h"                                                            // For TTEditApp
+#include <QtWidgets>
+#include <stdint.h>
 #include "toolwindow.h"                                                        // For ToolType enum
 #include "glyphpoints.h"
+#include "painter.h"
 
-class TTEditWindow: public wxWindow
+
+class EditWindow: public QWidget
 {
-       private:
-               TTEditApp & app;                                                // Reference to the application object
-               double scale;                                                   // Window scaling factor
-               int32 offsetX, offsetY;                                 // Window offsets
-               ToolType tool;                                                  // Current tool
-               GlyphPoints pts;                                                // Glyph point structure
-               int32 ptHighlight, oldPtHighlight, ptNextHighlight, oldPtNextHighlight;
-               bool polyFirstPoint;
+       Q_OBJECT
 
-       protected:
        public:
-               wxBitmap * bmp;
-               wxPoint pt, ptOffset, ptPrevious;
-
-               // Constructor and destructor
-               TTEditWindow(wxFrame * parent, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = 0);
-               ~TTEditWindow(void);
-
-               void OnPaint(wxPaintEvent &e);
-               void OnMouseEvent(wxMouseEvent &e);
+               EditWindow(QWidget * parent = NULL);
+               QSize minimumSizeHint() const;
+               QSize sizeHint() const;
 
        protected:
-               wxPoint GetAdjustedMousePosition(wxMouseEvent &e);
-               wxPoint GetAdjustedClientPosition(wxCoord x, wxCoord y);
+               void paintEvent(QPaintEvent *);
+               void mousePressEvent(QMouseEvent *);
+               void mouseMoveEvent(QMouseEvent *);
+               void mouseReleaseEvent(QMouseEvent *);
+               void keyPressEvent(QKeyEvent *);
+               void keyReleaseEvent(QKeyEvent *);
+
+       private:
+               void CreateCursors(void);
+               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);
 
-       DECLARE_EVENT_TABLE()
+       public:
+               QImage image;
+               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;
+               Vector rotationCenter, rotationZeroPoint, rotationCurrentPoint;
+               double rotationAngle;
+
+               ToolWindow * toolPalette;
+               QCursor cur[12];
+               bool selectedPoints[65536];     // Potential memory leak :-O
+               QRect selection;
+               bool selectionInProgress;
 };
 
 #endif // __EDITWINDOW_H__