Commit f9f0b46b authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Small GAL refactorization, mostly correcting constness.

parent 3106d253

common/gal/cairo/cairo_gal.cpp

+1 −4
Original line number Diff line number Diff line
@@ -35,9 +35,6 @@ 


using namespace KIGFX;



///> Opacity of a single layer

const float LAYER_ALPHA = 0.8;



CAIRO_GAL::CAIRO_GAL( wxWindow* aParent, wxEvtHandler* aMouseListener,

        wxEvtHandler* aPaintListener, const wxString& aName ) :

    wxWindow( aParent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxEXPAND, aName )
@@ -430,7 +427,7 @@ void CAIRO_GAL::SetLayerDepth( double aLayerDepth ) 
}





void CAIRO_GAL::Transform( MATRIX3x3D aTransformation )

void CAIRO_GAL::Transform( const MATRIX3x3D& aTransformation )

{

    cairo_matrix_t cairoTransformation;

common/gal/graphics_abstraction_layer.cpp

+6 −6
Original line number Diff line number Diff line
@@ -112,17 +112,17 @@ void GAL::DrawGrid() 
    SetTarget( TARGET_NONCACHED );



    // Draw the origin marker

    double origSize = static_cast<double>( gridOriginMarkerSize ) / worldScale;

    double originSize = gridOriginMarkerSize / worldScale;

    SetLayerDepth( GAL::GRID_DEPTH );

    SetIsFill( false );

    SetIsStroke( true );

    SetStrokeColor( COLOR4D( 1.0, 1.0, 1.0, 1.0 ) );

    SetLineWidth( gridLineWidth / worldScale );

    DrawLine( gridOrigin + VECTOR2D( -origSize, -origSize ),

              gridOrigin + VECTOR2D( origSize, origSize ) );

    DrawLine( gridOrigin + VECTOR2D( -origSize, origSize ),

              gridOrigin + VECTOR2D( origSize, -origSize ) );

    DrawCircle( gridOrigin, origSize * 0.7 );

    DrawLine( gridOrigin + VECTOR2D( -originSize, -originSize ),

              gridOrigin + VECTOR2D( originSize, originSize ) );

    DrawLine( gridOrigin + VECTOR2D( -originSize, originSize ),

              gridOrigin + VECTOR2D( originSize, -originSize ) );

    DrawCircle( gridOrigin, originSize * 0.7 );



    // Draw the grid

    // For the drawing the start points, end points and increments have

common/gal/opengl/opengl_gal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -600,7 +600,7 @@ void OPENGL_GAL::SetStrokeColor( const COLOR4D& aColor ) 
}





void OPENGL_GAL::Transform( MATRIX3x3D aTransformation )

void OPENGL_GAL::Transform( const MATRIX3x3D& aTransformation )

{

    GLdouble matrixData[16] = { 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 };

common/view/view.cpp

+2 −2
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ int VIEW::Query( const BOX2I& aRect, std::vector<LAYER_ITEM_PAIR>& aResult ) 


VECTOR2D VIEW::ToWorld( const VECTOR2D& aCoord, bool aAbsolute ) const

{

    MATRIX3x3D matrix = m_gal->GetWorldScreenMatrix().Inverse();

    const MATRIX3x3D& matrix = m_gal->GetScreenWorldMatrix();



    if( aAbsolute )

    {
@@ -212,7 +212,7 @@ VECTOR2D VIEW::ToWorld( const VECTOR2D& aCoord, bool aAbsolute ) const 


VECTOR2D VIEW::ToScreen( const VECTOR2D& aCoord, bool aAbsolute ) const

{

    MATRIX3x3D matrix = m_gal->GetWorldScreenMatrix();

    const MATRIX3x3D& matrix = m_gal->GetWorldScreenMatrix();



    if( aAbsolute )

    {

common/view/wx_view_controls.cpp

+1 −3
Original line number Diff line number Diff line
@@ -35,9 +35,7 @@ using namespace KIGFX; 
const wxEventType WX_VIEW_CONTROLS::EVT_REFRESH_MOUSE = wxNewEventType();



WX_VIEW_CONTROLS::WX_VIEW_CONTROLS( VIEW* aView, wxWindow* aParentPanel ) :

    VIEW_CONTROLS( aView ),

    m_state( IDLE ),

    m_parentPanel( aParentPanel )

    VIEW_CONTROLS( aView ), m_state( IDLE ), m_parentPanel( aParentPanel )

{

    m_parentPanel->Connect( wxEVT_MOTION,

                            wxMouseEventHandler( WX_VIEW_CONTROLS::onMotion ), NULL, this );