* More cleanup (common wrappers moved to scripting, instead of pcbnew/scripting)
* Added a first test 'testLoadSave.py'
This commit is contained in:
Miguel Angel Ajo
parent
f422350605
commit
06c570bab3
|
|
@ -1,6 +1,8 @@
|
|||
add_definitions(-DPCBNEW)
|
||||
|
||||
if (KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES)
|
||||
|
||||
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/scripting)
|
||||
|
||||
FIND_PACKAGE(SWIG REQUIRED)
|
||||
INCLUDE(${SWIG_USE_FILE})
|
||||
|
|
@ -22,6 +24,7 @@ include_directories(
|
|||
../polygon
|
||||
../common/dialogs
|
||||
./scripting
|
||||
../scripting
|
||||
${INC_AFTER}
|
||||
)
|
||||
|
||||
|
|
@ -230,9 +233,9 @@ set(PCBNEW_COMMON_SRCS
|
|||
if (KICAD_SCRIPTING)
|
||||
|
||||
set(PCBNEW_SCRIPTING_PYTHON_HELPERS
|
||||
scripting/wx_python_helpers.cpp
|
||||
../scripting/wx_python_helpers.cpp
|
||||
../scripting/python_scripting.cpp
|
||||
scripting/pcbnew_scripting_helpers.cpp
|
||||
scripting/python_scripting.cpp
|
||||
)
|
||||
|
||||
set(PCBNEW_SCRIPTING_SRCS
|
||||
|
|
@ -247,7 +250,7 @@ endif()
|
|||
|
||||
if (KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES)
|
||||
|
||||
set(SWIG_FLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/../.. -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/../include -DDEBUG)
|
||||
set(SWIG_FLAGS -I${CMAKE_CURRENT_SOURCE_DIR}/../.. -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/../include -I${CMAKE_CURRENT_SOURCE_DIR}/../scripting -DDEBUG)
|
||||
|
||||
# collect CFLAGS , and pass them to swig later
|
||||
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@
|
|||
#include <class_board.h>
|
||||
|
||||
#include <dialogs/dialog_scripting.h>
|
||||
#include <scripting/python_scripting.h>
|
||||
#include <scripting/pcbnew_scripting_helpers.h>
|
||||
#include <python_scripting.h>
|
||||
#include <pcbnew_scripting_helpers.h>
|
||||
|
||||
// Colors for layers and items
|
||||
COLORS_DESIGN_SETTINGS g_ColorsSettings;
|
||||
|
|
|
|||
|
|
@ -1,51 +0,0 @@
|
|||
//%module kicad
|
||||
|
||||
/* OFF NOW, it triggers an error with GCC 4.6 and swig-2.0.4 or trunk..
|
||||
http://sourceforge.net/tracker/index.php?func=detail&aid=3391906&group_id=1645&atid=101645
|
||||
|
||||
%include <std_vector.i>
|
||||
%include <std_string.i>
|
||||
*/
|
||||
%nodefaultctor EDA_ITEM;
|
||||
|
||||
|
||||
/* swig tries to wrap SetBack/SetNext on derived classes, but this method is
|
||||
private for most childs, so if we don't ignore it it won't compile */
|
||||
|
||||
%ignore EDA_ITEM::SetBack;
|
||||
%ignore EDA_ITEM::SetNext;
|
||||
|
||||
|
||||
%ignore InitKiCadAbout;
|
||||
%ignore GetCommandOptions;
|
||||
|
||||
%{
|
||||
#include <dlist.h>
|
||||
#include <base_struct.h>
|
||||
#include <common.h>
|
||||
#include <wx_python_helpers.h>
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
#include <class_title_block.h>
|
||||
#include <class_colors_design_settings.h>
|
||||
|
||||
%}
|
||||
|
||||
/* all the wx wrappers for wxString, wxPoint, wxRect, wxChar .. */
|
||||
%include <wx.i>
|
||||
|
||||
|
||||
%include <dlist.h>
|
||||
%include <base_struct.h>
|
||||
%include <common.h>
|
||||
%include <class_title_block.h>
|
||||
%include <class_colors_design_settings.h>
|
||||
|
||||
|
||||
/*
|
||||
namespace std
|
||||
{
|
||||
%template(intVector) vector<int>;
|
||||
}
|
||||
*/
|
||||
|
|
@ -1,3 +1,33 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2012 NBEE Embedded Systems, Miguel Angel Ajo <miguelangel@nbee.es>
|
||||
* Copyright (C) 1992-2012 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file pcbnew.i
|
||||
* @brief Specific pcbnew wrappers
|
||||
*/
|
||||
|
||||
|
||||
%module pcbnew
|
||||
%include "kicad.i"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,33 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2012 NBEE Embedded Systems, Miguel Angel Ajo <miguelangel@nbee.es>
|
||||
* Copyright (C) 1992-2012 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file pcbnew_scripting_helpers.cpp
|
||||
* @brief Scripting helper functions for pcbnew functionality
|
||||
*/
|
||||
|
||||
|
||||
#include <pcbnew_scripting_helpers.h>
|
||||
#include <pcbnew.h>
|
||||
#include <pcbnew_id.h>
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
pcb = pcbnew.GetBoard()
|
||||
|
||||
m = pcb.m_Modules.item()
|
||||
m = pcb.m_Modules
|
||||
|
||||
while m:
|
||||
print m.GetPosition()
|
||||
p = m.m_Pads.item()
|
||||
p = m.m_Pads
|
||||
while p:
|
||||
print "p=>",p.GetPosition(),p.GetPadName()
|
||||
print p.GetPosition()
|
||||
|
|
|
|||
|
|
@ -0,0 +1,29 @@
|
|||
from pcbnew import *
|
||||
import unittest
|
||||
|
||||
class TestLoadSave(unittest.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
self.TITLE="Test Board"
|
||||
self.COMMENT1="For load/save test"
|
||||
self.FILENAME="/tmp/test.brd"
|
||||
|
||||
def test_00_save(self):
|
||||
pcb = BOARD()
|
||||
pcb.GetTitleBlock().SetTitle(self.TITLE)
|
||||
pcb.GetTitleBlock().SetComment1(self.COMMENT1)
|
||||
result = SaveBoard(self.FILENAME,pcb)
|
||||
self.assertTrue(result)
|
||||
|
||||
def test_01_load(self):
|
||||
pcb2 = LoadBoard(self.FILENAME)
|
||||
self.assertIsNotNone(pcb2)
|
||||
|
||||
def test_02_titleblock_ok(self):
|
||||
pcb2 = LoadBoard(self.FILENAME)
|
||||
tb = pcb2.GetTitleBlock()
|
||||
self.assertEqual(tb.GetTitle(),self.TITLE)
|
||||
self.assertEqual(tb.GetComment1(),self.COMMENT1)
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
@ -0,0 +1,79 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2012 NBEE Embedded Systems, Miguel Angel Ajo <miguelangel@nbee.es>
|
||||
* Copyright (C) 1992-2012 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file kicad.i
|
||||
* @brief General wrappers for kicad / wx structures and classes
|
||||
*/
|
||||
|
||||
|
||||
/* OFF NOW, it triggers an error with GCC 4.6 and swig-2.0.4 or trunk..
|
||||
http://sourceforge.net/tracker/index.php?func=detail&aid=3391906&group_id=1645&atid=101645
|
||||
|
||||
%include <std_vector.i>
|
||||
%include <std_string.i>
|
||||
*/
|
||||
%nodefaultctor EDA_ITEM;
|
||||
|
||||
|
||||
/* swig tries to wrap SetBack/SetNext on derived classes, but this method is
|
||||
private for most childs, so if we don't ignore it it won't compile */
|
||||
|
||||
%ignore EDA_ITEM::SetBack;
|
||||
%ignore EDA_ITEM::SetNext;
|
||||
|
||||
|
||||
%ignore InitKiCadAbout;
|
||||
%ignore GetCommandOptions;
|
||||
|
||||
%{
|
||||
#include <dlist.h>
|
||||
#include <base_struct.h>
|
||||
#include <common.h>
|
||||
#include <wx_python_helpers.h>
|
||||
#include <cstddef>
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
#include <class_title_block.h>
|
||||
#include <class_colors_design_settings.h>
|
||||
|
||||
%}
|
||||
|
||||
/* all the wx wrappers for wxString, wxPoint, wxRect, wxChar .. */
|
||||
%include <wx.i>
|
||||
|
||||
|
||||
%include <dlist.h>
|
||||
%include <base_struct.h>
|
||||
%include <common.h>
|
||||
%include <class_title_block.h>
|
||||
%include <class_colors_design_settings.h>
|
||||
|
||||
|
||||
/*
|
||||
namespace std
|
||||
{
|
||||
%template(intVector) vector<int>;
|
||||
}
|
||||
*/
|
||||
|
|
@ -1,3 +1,31 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2012 NBEE Embedded Systems, Miguel Angel Ajo <miguelangel@nbee.es>
|
||||
* Copyright (C) 1992-2012 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file python_scripting.cpp
|
||||
* @brief methods to add scripting capabilities inside pcbnew
|
||||
*/
|
||||
|
||||
#include <python_scripting.h>
|
||||
|
||||
|
|
@ -1,3 +1,31 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2012 Miguel Angel Ajo <miguelangel@nbee.es>
|
||||
* Copyright (C) 1992-2012 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file wx.i
|
||||
* @brief wx wrappers for basic things, wxString, wxPoint, wxRect, etc..
|
||||
*/
|
||||
|
||||
%{
|
||||
#include <wx_python_helpers.h>
|
||||
|
|
@ -1,3 +1,32 @@
|
|||
/*
|
||||
* This program source code file is part of KiCad, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 2012 Miguel Angel Ajo <miguelangel@nbee.es>
|
||||
* Copyright (C) 1992-2012 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
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file wx_python_helpers.cpp
|
||||
* @brief Python wrapping helpers for wx structures/objects
|
||||
*/
|
||||
|
||||
#include <Python.h>
|
||||
#include <wx/intl.h>
|
||||
#include <wx/string.h>
|
||||
Loading…
Reference in New Issue