update frm Ivan Masar

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

diff --git a/src/common/dcsvg.cpp b/src/common/dcsvg.cpp
index ebc4e74c6f8906d9f76f550e6a57a13f3b71e0d2..92f539abaf2cc48918ac36f47106fc293987281a 100644 (file)
--- a/src/common/dcsvg.cpp
+++ b/src/common/dcsvg.cpp
@@ -675,114 +675,36 @@ void wxSVGFileDC::write(const wxString &s)
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
 // coordinates transformations
 // ---------------------------------------------------------------------------
 

-wxCoord wxSVGFileDC::DeviceToLogicalX(wxCoord x) const
-{
-    return wxRound((x - m_deviceOriginX) / m_scaleX) * m_signX + m_logicalOriginX;
-}
-
-wxCoord wxSVGFileDC::DeviceToLogicalY(wxCoord y) const
-{
-    return wxRound((y - m_deviceOriginY) / m_scaleY) * m_signY + m_logicalOriginY;
-}
-
-wxCoord wxSVGFileDC::DeviceToLogicalXRel(wxCoord x) const
-{
-    return wxRound(x / m_scaleX);
-}
-
-wxCoord wxSVGFileDC::DeviceToLogicalYRel(wxCoord y) const
-{
-    return wxRound(y / m_scaleY);
-}
-
-wxCoord wxSVGFileDC::LogicalToDeviceX(wxCoord x) const
-{
-    return wxRound((x - m_logicalOriginX) * m_scaleX) * m_signX + m_deviceOriginX;
-}
-
-wxCoord wxSVGFileDC::LogicalToDeviceY(wxCoord y) const
-{
-    return wxRound((y - m_logicalOriginY) * m_scaleY) * m_signY + m_deviceOriginY;
-}
-
-wxCoord wxSVGFileDC::LogicalToDeviceXRel(wxCoord x) const
-{
-    return wxRound(x * m_scaleX);
-}
-
-wxCoord wxSVGFileDC::LogicalToDeviceYRel(wxCoord y) const
-{
-    return wxRound(y * m_scaleY);
-}
-
-void wxSVGFileDC::ComputeScaleAndOrigin()
+void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )

 {
 {

-    m_scaleX = m_logicalScaleX * m_userScaleX;
-    m_scaleY = m_logicalScaleY * m_userScaleY;
+    wxDCBase::SetAxisOrientation( xLeftRight, yBottomUp );

 }
 
 }
 

-void wxSVGFileDC::SetMapMode( int mode )
+void wxSVGFileDC::SetMapMode(int mode)

 {
 {

-    switch (mode)
-    {
-        case wxMM_TWIPS:
-            SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
-            break;
-        case wxMM_POINTS:
-            SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
-            break;
-        case wxMM_METRIC:
-            SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
-            break;
-        case wxMM_LOMETRIC:
-            SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
-            break;
-        default:
-        case wxMM_TEXT:
-            SetLogicalScale( 1.0, 1.0 );
-            break;
-    }
-    m_mappingMode = mode;
+    wxDCBase::SetMapMode(mode);

 }
 
 }
 

-void wxSVGFileDC::SetUserScale( double x, double y )
+void wxSVGFileDC::SetUserScale(double x, double y)

 {
 {

-    // allow negative ? -> no
-    m_userScaleX = x;
-    m_userScaleY = y;
-    ComputeScaleAndOrigin();
+    wxDCBase::SetUserScale(x,y);

 }
 
 }
 

-void wxSVGFileDC::SetLogicalScale( double x, double y )
+void wxSVGFileDC::SetLogicalScale(double x, double y)

 {
 {

-    // allow negative ?
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-    ComputeScaleAndOrigin();
+    wxDCBase::SetLogicalScale(x,y);

 }
 
 }
 

-void wxSVGFileDC::SetLogicalOrigin( wxCoord x, wxCoord y )
+void wxSVGFileDC::SetLogicalOrigin(wxCoord x, wxCoord y)

 {
 {

-    m_logicalOriginX = x * m_signX;   // is this still correct ?
-    m_logicalOriginY = y * m_signY;
-    ComputeScaleAndOrigin();
+    wxDCBase::SetLogicalOrigin(x,y);

 }
 
 }
 

-void wxSVGFileDC::SetDeviceOrigin( wxCoord x, wxCoord y )
+void wxSVGFileDC::SetDeviceOrigin(wxCoord x, wxCoord y)

 {
 {

-    // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
-    ComputeScaleAndOrigin();
+    wxDCBase::SetDeviceOrigin(x,y);

 }
 
 }
 

-void wxSVGFileDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    // only wxPostScripDC has m_signX = -1, we override SetAxisOrientation there
-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp  ? -1 :  1);
-    ComputeScaleAndOrigin();
-}

 
 
 #ifdef __BORLANDC__
 
 
 #ifdef __BORLANDC__