Commit 573f9841 authored by Maciej Suminski's avatar Maciej Suminski
Browse files

Better way of marking 'brightened' mode for items.

parent 86f520f7

common/painter.cpp

+0 −22
Original line number Original line Diff line number Diff line
@@ -79,25 +79,3 @@ void PAINTER::SetGAL( GAL* aGal ) 
{

{

    m_gal = aGal;

    m_gal = aGal;

}
 
}
 




void PAINTER::DrawBrightened( const VIEW_ITEM* aItem )

{

    BOX2I box = aItem->ViewBBox();



    RenderTarget oldTarget = m_gal->GetTarget();

    m_gal->SetTarget( TARGET_OVERLAY );



    m_gal->PushDepth();

    m_gal->SetLayerDepth( -1.0 );



    // Draw an outline that marks items as brightened

    m_gal->SetIsStroke( true );

    m_gal->SetLineWidth( 100000.0 );

    m_gal->SetStrokeColor( m_brightenedColor );



    m_gal->DrawRectangle( box.GetOrigin(), box.GetOrigin() + box.GetSize() );

    m_gal->PopDepth();



    m_gal->SetTarget( oldTarget );

}

common/view/view.cpp

+0 −6
Original line number Original line Diff line number Diff line
@@ -596,12 +596,6 @@ void VIEW::draw( VIEW_ITEM* aItem, int aLayer, bool aImmediate ) const 
        if( !m_painter->Draw( aItem, aLayer ) )

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

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

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

    }

    }



    // Draws a bright contour around the item

    if( static_cast<const EDA_ITEM*>( aItem )->IsBrightened() )

    {

        m_painter->DrawBrightened( aItem );

    }

}

}

include/base_struct.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -474,11 +474,11 @@ public: 




    inline void SetSelected() { SetFlags( SELECTED ); ViewUpdate( COLOR ); }

    inline void SetSelected() { SetFlags( SELECTED ); ViewUpdate( COLOR ); }

    inline void SetHighlighted() { SetFlags( HIGHLIGHTED ); ViewUpdate( COLOR ); }

    inline void SetHighlighted() { SetFlags( HIGHLIGHTED ); ViewUpdate( COLOR ); }

    inline void SetBrightened() { SetFlags( BRIGHTENED ); ViewUpdate( COLOR ); }

    inline void SetBrightened() { SetFlags( BRIGHTENED ); }





    inline void ClearSelected() { ClearFlags( SELECTED ); ViewUpdate( COLOR ); }

    inline void ClearSelected() { ClearFlags( SELECTED ); ViewUpdate( COLOR ); }

    inline void ClearHighlighted() { ClearFlags( HIGHLIGHTED ); ViewUpdate( COLOR ); }

    inline void ClearHighlighted() { ClearFlags( HIGHLIGHTED ); ViewUpdate( COLOR ); }

    inline void ClearBrightened() { ClearFlags( BRIGHTENED ); ViewUpdate( COLOR ); }

    inline void ClearBrightened() { ClearFlags( BRIGHTENED ); }





    void SetModified();

    void SetModified();

include/painter.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -224,13 +224,6 @@ public: 
     */

     */

    virtual bool Draw( const VIEW_ITEM* aItem, int aLayer ) = 0;

    virtual bool Draw( const VIEW_ITEM* aItem, int aLayer ) = 0;





    /**

     * Function DrawBrightened

     * Draws a special marking for the item.

     * @param aItem is the item that is going to be marked.

     */

    virtual void DrawBrightened( const VIEW_ITEM* aItem );



protected:

protected:

    /// Instance of graphic abstraction layer that gives an interface to call

    /// Instance of graphic abstraction layer that gives an interface to call

    /// commands used to draw (eg. DrawLine, DrawCircle, etc.)

    /// commands used to draw (eg. DrawLine, DrawCircle, etc.)

pcbnew/CMakeLists.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -221,6 +221,7 @@ set(PCBNEW_CLASS_SRCS 
    

    

    tools/selection_tool.cpp

    tools/selection_tool.cpp

    tools/selection_area.cpp

    tools/selection_area.cpp

    tools/bright_box.cpp

    tools/move_tool.cpp

    tools/move_tool.cpp

    tools/pcb_tools.cpp

    tools/pcb_tools.cpp

    )

    )