const added to GetBitmap it was my fault.

[wxWidgets.git] / utils / ogl / src / drawnp.h

diff --git a/utils/ogl/src/drawnp.h b/utils/ogl/src/drawnp.h
index a08aef7bb5793bbcd803c2d5c39ba45024b20287..ab5ef12631efd04914e90f6ec6e95e0c9c30efa8 100644 (file)
--- a/utils/ogl/src/drawnp.h
+++ b/utils/ogl/src/drawnp.h
@@ -48,6 +48,7 @@
 #define  DRAWOP_DRAW_ARC            27
 #define  DRAWOP_DRAW_TEXT           28
 #define  DRAWOP_DRAW_SPLINE         29
 #define  DRAWOP_DRAW_ARC            27
 #define  DRAWOP_DRAW_TEXT           28
 #define  DRAWOP_DRAW_SPLINE         29

+#define  DRAWOP_DRAW_ELLIPTIC_ARC   30

 
 /*
  * Base, virtual class
 
 /*
  * Base, virtual class


@@ -56,18 +57,34 @@
  
 class wxDrawOp: public wxObject
 {
  
 class wxDrawOp: public wxObject
 {

- public:
-  int op;
-
-  inline wxDrawOp(int theOp) { op = theOp; }
+public:
+  inline wxDrawOp(int theOp) { m_op = theOp; }

   inline ~wxDrawOp() {}
   inline ~wxDrawOp() {}

-  inline virtual void Scale(float xScale, float yScale) {};
-  inline virtual void Translate(float x, float y) {};
-  inline virtual void Rotate(float x, float y, float sinTheta, float cosTheta) {};
-  virtual void Do(wxDC& dc, float xoffset, float yoffset) = 0;
+  inline virtual void Scale(double xScale, double yScale) {};
+  inline virtual void Translate(double x, double y) {};
+  inline virtual void Rotate(double x, double y, double theta, double sinTheta, double cosTheta) {};
+  virtual void Do(wxDC& dc, double xoffset, double yoffset) = 0;

   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;
   virtual wxDrawOp *Copy(wxPseudoMetaFile *newImage) = 0;

-  virtual wxExpr *WritewxExpr(wxPseudoMetaFile *image) = 0;
-  virtual void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
+  virtual wxExpr *WriteExpr(wxPseudoMetaFile *image) = 0;
+  virtual void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr) = 0;
+
+  inline int GetOp() const { return m_op; }
+
+  // Draw an outline using the current operation. By default, return FALSE (not drawn)
+  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
+    double oldW, double oldH) { return FALSE; }
+
+  // Get the perimeter point using this data
+  virtual bool GetPerimeterPoint(double x1, double y1,
+                                     double x2, double y2,
+                                     double *x3, double *y3,
+                                     double xOffset, double yOffset,
+                                     bool attachmentMode)
+  { return FALSE; }
+
+protected:
+  int           m_op;
+

 };
 
 /*
 };
 
 /*


@@ -78,17 +95,19 @@ class wxDrawOp: public wxObject
 class wxOpSetGDI: public wxDrawOp
 {
  public:
 class wxOpSetGDI: public wxDrawOp
 {
  public:

-  int mode;
-  int gdiIndex;
-  wxPseudoMetaFile *image;
-  unsigned char r;
-  unsigned char g;
-  unsigned char b;

   wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);
   wxOpSetGDI(int theOp, wxPseudoMetaFile *theImage, int theGdiIndex, int theMode = 0);

-  void Do(wxDC& dc, float xoffset, float yoffset);
+  void Do(wxDC& dc, double xoffset, double yoffset);

   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  int               m_mode;
+  int               m_gdiIndex;
+  wxPseudoMetaFile* m_image;
+  unsigned char     m_r;
+  unsigned char     m_g;
+  unsigned char     m_b;

 };
 
 /*
 };
 
 /*


@@ -98,18 +117,20 @@ class wxOpSetGDI: public wxDrawOp
  
 class wxOpSetClipping: public wxDrawOp
 {
  
 class wxOpSetClipping: public wxDrawOp
 {

- public:
-  float x1;
-  float y1;
-  float x2;
-  float y2;
-  wxOpSetClipping(int theOp, float theX1, float theY1, float theX2, float theY2);
-  void Do(wxDC& dc, float xoffset, float yoffset);
-  void Scale(float xScale, float yScale);
-  void Translate(float x, float y);
+public:
+  wxOpSetClipping(int theOp, double theX1, double theY1, double theX2, double theY2);
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  void Scale(double xScale, double yScale);
+  void Translate(double x, double y);

   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  double     m_x1;
+  double     m_y1;
+  double     m_x2;
+  double     m_y2;

 };
 
 /*
 };
 
 /*


@@ -120,24 +141,27 @@ class wxOpSetClipping: public wxDrawOp
 class wxOpDraw: public wxDrawOp
 {
  public:
 class wxOpDraw: public wxDrawOp
 {
  public:

-  float x1;
-  float y1;
-  float x2;
-  float y2;
-  float x3;
-  float radius;
-  char *textString;
-
-  wxOpDraw(int theOp, float theX1, float theY1, float theX2, float theY2,
-         float radius = 0.0, char *s = NULL);
+  wxOpDraw(int theOp, double theX1, double theY1, double theX2, double theY2,
+         double radius = 0.0, char *s = NULL);

   ~wxOpDraw();
   ~wxOpDraw();

-  void Do(wxDC& dc, float xoffset, float yoffset);
-  void Scale(float scaleX, float scaleY);
-  void Translate(float x, float y);
-  void Rotate(float x, float y, float sinTheta, float cosTheta);
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  void Scale(double scaleX, double scaleY);
+  void Translate(double x, double y);
+  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);

   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+public:
+  double     m_x1;
+  double     m_y1;
+  double     m_x2;
+  double     m_y2;
+  double     m_x3;
+  double     m_y3;
+  double     m_radius;
+  char*     m_textString;
+

 };
 
 /*
 };
 
 /*


@@ -147,19 +171,32 @@ class wxOpDraw: public wxDrawOp
 
 class wxOpPolyDraw: public wxDrawOp
 {
 
 class wxOpPolyDraw: public wxDrawOp
 {

- public:
-  wxRealPoint *points;
-  int noPoints;
-  
+public:

   wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
   ~wxOpPolyDraw();
   wxOpPolyDraw(int theOp, int n, wxRealPoint *thePoints);
   ~wxOpPolyDraw();

-  void Do(wxDC& dc, float xoffset, float yoffset);
-  void Scale(float scaleX, float scaleY);
-  void Translate(float x, float y);
-  void Rotate(float x, float y, float sinTheta, float cosTheta);
+  void Do(wxDC& dc, double xoffset, double yoffset);
+  void Scale(double scaleX, double scaleY);
+  void Translate(double x, double y);
+  void Rotate(double x, double y, double theta, double sinTheta, double cosTheta);

   wxDrawOp *Copy(wxPseudoMetaFile *newImage);
   wxDrawOp *Copy(wxPseudoMetaFile *newImage);

-  wxExpr *WritewxExpr(wxPseudoMetaFile *image);
-  void ReadwxExpr(wxPseudoMetaFile *image, wxExpr *expr);
+  wxExpr *WriteExpr(wxPseudoMetaFile *image);
+  void ReadExpr(wxPseudoMetaFile *image, wxExpr *expr);
+
+  // Draw an outline using the current operation.
+  virtual bool OnDrawOutline(wxDC& dc, double x, double y, double w, double h,
+    double oldW, double oldH);
+
+  // Get the perimeter point using this data
+  bool GetPerimeterPoint(double x1, double y1,
+                                     double x2, double y2,
+                                     double *x3, double *y3,
+                                     double xOffset, double yOffset,
+                                     bool attachmentMode);
+
+public:
+  wxRealPoint*  m_points;
+  int           m_noPoints;
+  

 };
 
 #endif
 };
 
 #endif