Commit 3fc45fb7 authored by Chris Pavlina's avatar Chris Pavlina Committed by Wayne Stambaugh
Browse files

Fix bug where user defined grid change does not update in GAL canvas. (fixes lp:146098)

parent 148ba430

pcbnew/dialogs/dialog_set_grid.cpp

+16 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
/*

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors.

 * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License
@@ -34,6 +34,8 @@ 
#include <pcbnew_id.h>

#include <dialog_set_grid_base.h>

#include <invoke_pcb_dialog.h>

#include <gal/graphics_abstraction_layer.h>

#include <class_draw_panel_gal.h>





class DIALOG_SET_GRID : public DIALOG_SET_GRID_BASE
@@ -216,12 +218,21 @@ bool PCB_BASE_FRAME::InvokeDialogGrid() 


        SetGridOrigin( grid_origin );



        GetScreen()->AddGrid( m_UserGridSize, m_UserGridUnit, ID_POPUP_GRID_USER );

        BASE_SCREEN* screen = GetScreen();



        screen->AddGrid( m_UserGridSize, m_UserGridUnit, ID_POPUP_GRID_USER );



        // If the user grid is the current option, recall SetGrid()

        // to force new values put in list as current grid value

        if( GetScreen()->GetGridId() == ID_POPUP_GRID_USER )

            GetScreen()->SetGrid( ID_POPUP_GRID_USER  );

        if( screen->GetGridId() == ID_POPUP_GRID_USER )

            screen->SetGrid( ID_POPUP_GRID_USER );



        if( IsGalCanvasActive() )

        {

            GetGalCanvas()->GetGAL()->SetGridSize( VECTOR2D( screen->GetGrid().m_Size.x,

                                                             screen->GetGrid().m_Size.y ) );

            GetGalCanvas()->GetView()->MarkTargetDirty( KIGFX::TARGET_NONCACHED );

        }



        m_canvas->Refresh();

pcbnew/dialogs/dialog_set_grid_base.cpp

+1 −1
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Oct  8 2012)

// C++ code generated with wxFormBuilder (version Mar 13 2015)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

pcbnew/dialogs/dialog_set_grid_base.fbp

+3 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="11" />

    <FileVersion major="1" minor="13" />

    <object class="Project" expanded="1">

        <property name="class_decoration"></property>

        <property name="code_generation">C++</property>
@@ -20,8 +20,10 @@ 
        <property name="path">.</property>

        <property name="precompiled_header"></property>

        <property name="relative_path">1</property>

        <property name="skip_lua_events">1</property>

        <property name="skip_php_events">1</property>

        <property name="skip_python_events">1</property>

        <property name="ui_table">UI</property>

        <property name="use_enum">0</property>

        <property name="use_microsoft_bom">0</property>

        <object class="Dialog" expanded="1">

pcbnew/dialogs/dialog_set_grid_base.h

+1 −1
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Oct  8 2012)

// C++ code generated with wxFormBuilder (version Mar 13 2015)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!