updated copyright year, s/wxWindows/wxWidgets/

[wxWidgets.git] / src / common / graphcmn.cpp

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index eb9d9084fae471b661409a6e04e5aa1ced0bef7b..16e83757db604558ff906118935282181c93d3ac 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -26,8 +26,49 @@
 
 #include "wx/graphics.h"
 
+#ifndef WX_PRECOMP
+    #include "wx/icon.h"
+    #include "wx/bitmap.h"
+    #include "wx/dcmemory.h"
+#endif
+
 #if wxUSE_GRAPHICS_CONTEXT
 
+#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES)
+#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0
+#endif
+
+//-----------------------------------------------------------------------------
+// constants
+//-----------------------------------------------------------------------------
+
+const double RAD2DEG = 180.0 / M_PI;
+const short kEmulatedMode = -1;
+const short kUnsupportedMode = -2;
+
+//-----------------------------------------------------------------------------
+// Local functions
+//-----------------------------------------------------------------------------
+
+static inline double dmin(double a, double b)
+{
+    return a < b ? a : b;
+}
+static inline double dmax(double a, double b)
+{
+    return a > b ? a : b;
+}
+
+static inline double DegToRad(double deg)
+{
+    return (deg * M_PI) / 180.0;
+}
+static inline double RadToDeg(double deg)
+{
+    return (deg * 180.0) / M_PI;
+}
+
+
 wxPoint2DDouble wxGraphicsPath::GetCurrentPoint()
 {
     wxDouble x,y ;
@@ -68,8 +109,8 @@ void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x,
     wxPoint2DDouble start = GetCurrentPoint() ;
     wxPoint2DDouble end(x,y);
     wxPoint2DDouble c(cx,cy);
-    c1 = (1/3.0) * start + (2/3.0) * c;
-    c2 = (2/3.0) * c + (1/3.0) * end ;
+    c1 = wxDouble(1/3.0) * start + wxDouble(2/3.0) * c;
+    c2 = wxDouble(2/3.0) * c + wxDouble(1/3.0) * end ;
     AddCurveToPoint(c1.m_x,c1.m_y,c2.m_x,c2.m_y,x,y);
 }
 
@@ -89,6 +130,43 @@ void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r )
     CloseSubpath();
 }
 
+// draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
+void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
+{   
+    wxPoint2DDouble current = GetCurrentPoint();
+    wxPoint2DDouble p1(x1,y1);
+    wxPoint2DDouble p2(x2,y2);
+
+    wxPoint2DDouble v1 = current - p1 ;
+    v1.Normalize();
+    wxPoint2DDouble v2 = p2 - p1 ;
+    v2.Normalize();
+
+    wxDouble alpha = v1.GetVectorAngle() - v2.GetVectorAngle();
+
+    if ( alpha < 0 )
+        alpha = 360 + alpha ;
+    // TODO obtuse angles
+
+    alpha = DegToRad(alpha);
+
+    wxDouble dist = r / sin(alpha/2) * cos(alpha/2) ;
+    // calculate tangential points
+    wxPoint2DDouble t1 = dist*v1 + p1 ;
+    wxPoint2DDouble t2 = dist*v2 + p1 ;
+
+    wxPoint2DDouble nv1 = v1 ;
+    nv1.SetVectorAngle(v1.GetVectorAngle()-90);
+    wxPoint2DDouble c = t1 + r*nv1;
+
+    wxDouble a1 = v1.GetVectorAngle()+90 ;
+    wxDouble a2 = v2.GetVectorAngle()-90 ;
+
+    AddLineToPoint(t1);
+    AddArc(c.m_x,c.m_y,r,DegToRad(a1),DegToRad(a2),true);
+    AddLineToPoint(p2);
+}
+
 //-----------------------------------------------------------------------------
 // wxGraphicsContext Convenience Methods
 //-----------------------------------------------------------------------------
@@ -209,44 +287,8 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoint
     delete path;
 }
 
-// draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1)
-void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r )
-{   
-    // TODO
-}
-
 IMPLEMENT_ABSTRACT_CLASS(wxGCDC, wxObject)
 
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-const double RAD2DEG = 180.0 / M_PI;
-const short kEmulatedMode = -1;
-const short kUnsupportedMode = -2;
-
-//-----------------------------------------------------------------------------
-// Local functions
-//-----------------------------------------------------------------------------
-
-static inline double dmin(double a, double b)
-{
-    return a < b ? a : b;
-}
-static inline double dmax(double a, double b)
-{
-    return a > b ? a : b;
-}
-
-static inline double DegToRad(double deg)
-{
-    return (deg * M_PI) / 180.0;
-}
-static inline double RadToDeg(double deg)
-{
-    return (deg * 180.0) / M_PI;
-}
-
 //-----------------------------------------------------------------------------
 // wxDC bridge class
 //-----------------------------------------------------------------------------
@@ -262,7 +304,8 @@ wxGCDC::wxGCDC(const wxWindowDC& dc)
     Init();
     m_graphicContext = wxGraphicsContext::Create(dc);
     m_ok = true;
-    m_graphicContext->SetFont(dc.GetFont());
+    if ( dc.GetFont().Ok())
+        m_graphicContext->SetFont(dc.GetFont());
 }
 
 void wxGCDC::Init()
@@ -785,7 +828,9 @@ void wxGCDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
     m_graphicContext->Scale( factor , 1.0) ;
     if ( fill && (sa!=ea) )
         path->MoveToPoint(0,0);
-    path->AddArc( 0, 0, hh/2 , DegToRad(sa) , DegToRad(ea), sa > ea );
+    // since these angles (ea,sa) are measured counter-clockwise, we invert them to
+    // get clockwise angles
+    path->AddArc( 0, 0, hh/2 , DegToRad(-sa) , DegToRad(-ea), sa > ea );
     if ( fill && (sa!=ea) )
         path->AddLineToPoint(0,0);
     m_graphicContext->DrawPath( path );