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

Removed some dead code.

parent 90a3b97c

common/view/view.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -586,7 +586,7 @@ void VIEW::draw( VIEW_ITEM* aItem, int aLayer, bool aImmediate ) const 
            group = m_gal->BeginGroup();

            group = m_gal->BeginGroup();

            aItem->setGroup( aLayer, group );

            aItem->setGroup( aLayer, group );

            if( !m_painter->Draw( aItem, aLayer ) )

            if( !m_painter->Draw( aItem, aLayer ) )

                aItem->ViewDraw( aLayer, m_gal, BOX2I() ); // Alternative drawing method

                aItem->ViewDraw( aLayer, m_gal ); // Alternative drawing method

            m_gal->EndGroup();

            m_gal->EndGroup();

        }

        }

    }

    }
@@ -594,7 +594,7 @@ void VIEW::draw( VIEW_ITEM* aItem, int aLayer, bool aImmediate ) const 
    {

    {

        // Immediate mode

        // Immediate mode

        if( !m_painter->Draw( aItem, aLayer ) )

        if( !m_painter->Draw( aItem, aLayer ) )

            aItem->ViewDraw( aLayer, m_gal, BOX2I() );  // Alternative drawing method

            aItem->ViewDraw( aLayer, m_gal );  // Alternative drawing method

    }

    }





    // Draws a bright contour around the item

    // Draws a bright contour around the item
@@ -673,7 +673,7 @@ struct VIEW::recacheLayer 
            int group = gal->BeginGroup();

            int group = gal->BeginGroup();

            aItem->setGroup( layer, group );

            aItem->setGroup( layer, group );

            if( !view->m_painter->Draw( aItem, layer ) )

            if( !view->m_painter->Draw( aItem, layer ) )

                aItem->ViewDraw( layer, gal, BOX2I() ); // Alternative drawing method

                aItem->ViewDraw( layer, gal ); // Alternative drawing method

            gal->EndGroup();

            gal->EndGroup();

        }

        }

        else

        else

common/view/view_group.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -85,7 +85,7 @@ const BOX2I VIEW_GROUP::ViewBBox() const 
}

}









void VIEW_GROUP::ViewDraw( int aLayer, GAL* aGal, const BOX2I& aVisibleArea ) const

void VIEW_GROUP::ViewDraw( int aLayer, GAL* aGal ) const

{

{

    PAINTER* painter = m_view->GetPainter();

    PAINTER* painter = m_view->GetPainter();
@@ -103,7 +103,7 @@ void VIEW_GROUP::ViewDraw( int aLayer, GAL* aGal, const BOX2I& aVisibleArea ) co 
                aGal->SetLayerDepth( m_view->GetLayerOrder( layers[i] ) );

                aGal->SetLayerDepth( m_view->GetLayerOrder( layers[i] ) );





                if( !painter->Draw( item, layers[i] ) )

                if( !painter->Draw( item, layers[i] ) )

                    item->ViewDraw( layers[i], aGal, aVisibleArea );  // Alternative drawing method

                    item->ViewDraw( layers[i], aGal );  // Alternative drawing method

            }

            }

        }

        }

    }

    }

common/view/view_item.cpp

+1 −6
Original line number Original line Diff line number Diff line
@@ -48,17 +48,12 @@ void VIEW_ITEM::ViewSetVisible( bool aIsVisible ) 
}

}









void VIEW_ITEM::ViewUpdate( int aUpdateFlags, bool aForceImmediateRedraw )

void VIEW_ITEM::ViewUpdate( int aUpdateFlags )

{

{

    if( !m_view )

    if( !m_view )

        return;

        return;





    m_view->invalidateItem( this, aUpdateFlags );

    m_view->invalidateItem( this, aUpdateFlags );



    if( aForceImmediateRedraw )

    {

        m_view->Redraw();

    }

}

}

common/worksheet_item.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ const BOX2I WORKSHEET_ITEM::ViewBBox() const 
}

}









void WORKSHEET_ITEM::ViewDraw( int aLayer, GAL* aGal, const BOX2I& aVisibleArea ) const

void WORKSHEET_ITEM::ViewDraw( int aLayer, GAL* aGal ) const

{

{

    RENDER_SETTINGS* settings = m_view->GetPainter()->GetSettings();

    RENDER_SETTINGS* settings = m_view->GetPainter()->GetSettings();

    wxString fileName( m_fileName );

    wxString fileName( m_fileName );
@@ -85,7 +85,7 @@ void WORKSHEET_ITEM::ViewDraw( int aLayer, GAL* aGal, const BOX2I& aVisibleArea 




    drawList.SetPenSize( settings->GetWorksheetLineWidth() );

    drawList.SetPenSize( settings->GetWorksheetLineWidth() );

    // Sorry, but I don't get this multi #ifdef from include/convert_to_biu.h, so here goes a magic

    // Sorry, but I don't get this multi #ifdef from include/convert_to_biu.h, so here goes a magic

    // number. IU_PER_MILS should be 25400 (as in a different compiltion unit), but somehow

    // number. IU_PER_MILS should be 25400 (as in a different compilation unit), but somehow

    // it equals 1 in this case..

    // it equals 1 in this case..

    drawList.SetMilsToIUfactor( 25400 /* IU_PER_MILS */ );

    drawList.SetMilsToIUfactor( 25400 /* IU_PER_MILS */ );

    drawList.SetSheetNumber( m_sheetNumber );

    drawList.SetSheetNumber( m_sheetNumber );

include/view/view_group.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -107,9 +107,8 @@ public: 
     *

     *

     * @param aLayer is the layer which should be drawn.

     * @param aLayer is the layer which should be drawn.

     * @param aGal is the GAL that should be used for drawing.

     * @param aGal is the GAL that should be used for drawing.

     * @param aVisibleArea is limiting the drawing area.

     */

     */

    virtual void ViewDraw( int aLayer, GAL* aGal, const BOX2I& aVisibleArea ) const;

    virtual void ViewDraw( int aLayer, GAL* aGal ) const;





    /**

    /**

     * Function ViewGetLayers()

     * Function ViewGetLayers()