remove page size globals from eeschema (d3afe95c) · Commits · Elphel / kicad-source-mirror

CMakeLists.txt

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,8 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMakeModules)

	option(USE_PNG_BITMAPS "use PNG bitmaps instead of XPM (default ON)" ON)		option(USE_PNG_BITMAPS "use PNG bitmaps instead of XPM (default ON)" ON)

	option(USE_NEW_PCBNEW_LOAD "use new plugin support for legacy file format (default OFF)" OFF)		option(USE_NEW_PCBNEW_LOAD "use new plugin support for legacy file format (default ON)" ON)
	option(USE_NEW_PCBNEW_SAVE "use new plugin support for legacy file format (default OFF)" OFF)		option(USE_NEW_PCBNEW_SAVE "use new plugin support for legacy file format (default ON)" ON)

	# Russian GOST patch		# Russian GOST patch
	option(wxUSE_UNICODE "enable/disable building unicode (default OFF)")		option(wxUSE_UNICODE "enable/disable building unicode (default OFF)")
	@@ -265,6 +265,11 @@ add_subdirectory(bitmap2component)
	add_subdirectory(pcb_calculator)		add_subdirectory(pcb_calculator)
	#add_subdirectory(new)		#add_subdirectory(new)


			add_executable( container_test EXCLUDE_FROM_ALL container_test.cpp )
			target_link_libraries( container_test common polygon bitmaps ${wxWidgets_LIBRARIES} )


	#############		#############
	# Resources #		# Resources #
	#############		#############

common/common.cpp

+14 −15

cvpcb/class_DisplayFootprintsFrame.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
	SetIcon( icon );		SetIcon( icon );

	SetBoard( new BOARD() );		SetBoard( new BOARD() );
	SetScreen( new PCB_SCREEN( GetPageSettings().GetSizeIU() ) );		SetScreen( new PCB_SCREEN( GetPageSizeIU() ) );

	LoadSettings();		LoadSettings();

cvpcb/class_footprints_listbox.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list )
	for( unsigned ii = 0; ii < list.GetCount(); ii++ )		for( unsigned ii = 0; ii < list.GetCount(); ii++ )
	{		{
	FOOTPRINT_INFO & footprint = list.GetItem(ii);		FOOTPRINT_INFO & footprint = list.GetItem(ii);
	msg.Printf( wxT( "%3d %s" ), m_FullFootprintList.GetCount() + 1,		msg.Printf( wxT( "%3d %s" ), (int) m_FullFootprintList.GetCount() + 1,
	GetChars(footprint.m_Module) );		GetChars(footprint.m_Module) );
	m_FullFootprintList.Add( msg );		m_FullFootprintList.Add( msg );
	}		}

cvpcb/cvframe.cpp

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -605,7 +605,7 @@ void CVPCB_MAINFRAME::DisplayStatus()
	{		{
	wxString msg;		wxString msg;

	msg.Printf( _( "Components: %d (free: %d)" ), m_components.size(), m_undefinedComponentCnt );		msg.Printf( _( "Components: %d (free: %d)" ), (int) m_components.size(), m_undefinedComponentCnt );
	SetStatusText( msg, 0 );		SetStatusText( msg, 0 );

	SetStatusText( wxEmptyString, 1 );		SetStatusText( wxEmptyString, 1 );
	@@ -614,10 +614,10 @@ void CVPCB_MAINFRAME::DisplayStatus()
	{		{
	if( m_FootprintList->m_UseFootprintFullList )		if( m_FootprintList->m_UseFootprintFullList )
	msg.Printf( _( "Footprints (All): %d" ),		msg.Printf( _( "Footprints (All): %d" ),
	m_FootprintList->m_ActiveFootprintList->GetCount() );		(int) m_FootprintList->m_ActiveFootprintList->GetCount() );
	else		else
	msg.Printf( _( "Footprints (filtered): %d" ),		msg.Printf( _( "Footprints (filtered): %d" ),
	m_FootprintList->m_ActiveFootprintList->GetCount() );		(int) m_FootprintList->m_ActiveFootprintList->GetCount() );
	}		}
	else		else
	{		{

Original line number	Original line	Diff line number	Diff line
	@@ -178,24 +178,24 @@ bool EnsureTextCtrlWidth( wxTextCtrl* aCtrl, const wxString* aString )

	// Standard page sizes in 1/1000 inch		// Standard page sizes in 1/1000 inch
	#if defined(KICAD_GOST)		#if defined(KICAD_GOST)
	static const PAGE_INFO pageA4( wxSize( 8283, 11700 ), wxPoint( 0, 0 ), wxT( "A4" ) );		static const PAGE_INFO pageA4( wxSize( 8283, 11700 ), wxT( "A4" ) );
	#else		#else
	static const PAGE_INFO pageA4( wxSize( 11700, 8267 ), wxPoint( 0, 0 ), wxT( "A4" ) );		static const PAGE_INFO pageA4( wxSize( 11700, 8267 ), wxT( "A4" ) );
	#endif		#endif
	static const PAGE_INFO pageA3( wxSize( 16535, 11700 ), wxPoint( 0, 0 ), wxT( "A3" ) );		static const PAGE_INFO pageA3( wxSize( 16535, 11700 ), wxT( "A3" ) );
	static const PAGE_INFO pageA2( wxSize( 23400, 16535 ), wxPoint( 0, 0 ), wxT( "A2" ) );		static const PAGE_INFO pageA2( wxSize( 23400, 16535 ), wxT( "A2" ) );
	static const PAGE_INFO pageA1( wxSize( 33070, 23400 ), wxPoint( 0, 0 ), wxT( "A1" ) );		static const PAGE_INFO pageA1( wxSize( 33070, 23400 ), wxT( "A1" ) );
	static const PAGE_INFO pageA0( wxSize( 46800, 33070 ), wxPoint( 0, 0 ), wxT( "A0" ) );		static const PAGE_INFO pageA0( wxSize( 46800, 33070 ), wxT( "A0" ) );
	static const PAGE_INFO pageA( wxSize( 11000, 8500 ), wxPoint( 0, 0 ), wxT( "A" ) );		static const PAGE_INFO pageA( wxSize( 11000, 8500 ), wxT( "A" ) );
	static const PAGE_INFO pageB( wxSize( 17000, 11000 ), wxPoint( 0, 0 ), wxT( "B" ) );		static const PAGE_INFO pageB( wxSize( 17000, 11000 ), wxT( "B" ) );
	static const PAGE_INFO pageC( wxSize( 22000, 17000 ), wxPoint( 0, 0 ), wxT( "C" ) );		static const PAGE_INFO pageC( wxSize( 22000, 17000 ), wxT( "C" ) );
	static const PAGE_INFO pageD( wxSize( 34000, 22000 ), wxPoint( 0, 0 ), wxT( "D" ) );		static const PAGE_INFO pageD( wxSize( 34000, 22000 ), wxT( "D" ) );
	static const PAGE_INFO pageE( wxSize( 44000, 34000 ), wxPoint( 0, 0 ), wxT( "E" ) );		static const PAGE_INFO pageE( wxSize( 44000, 34000 ), wxT( "E" ) );
	static const PAGE_INFO pageGERBER(wxSize( 32000, 32000 ), wxPoint( 0, 0 ), wxT( "GERBER" ) );		static const PAGE_INFO pageGERBER(wxSize( 32000, 32000 ), wxT( "GERBER" ) );

	double PAGE_INFO::s_user_width = 17.0;		double PAGE_INFO::s_user_width = 17.0;
	double PAGE_INFO::s_user_height = 11.0;		double PAGE_INFO::s_user_height = 11.0;
	static const PAGE_INFO pageUser( wxSize( 17000, 11000 ), wxPoint( 0, 0 ), wxT( "User" ) );		static const PAGE_INFO pageUser( wxSize( 17000, 11000 ), wxT( "User" ) );

	static const PAGE_INFO* stdPageSizes[] = {		static const PAGE_INFO* stdPageSizes[] = {
	&pageA4,		&pageA4,
	@@ -263,13 +263,12 @@ bool PAGE_INFO::SetType( const wxString& aType )
	}		}


	PAGE_INFO::PAGE_INFO( const wxSize& aSizeMils, const wxPoint& aOffsetMils, const wxString& aType )		PAGE_INFO::PAGE_INFO( const wxSize& aSizeMils, const wxString& aType )
	{		{
	// aSizeMils is in 1/1000th of an inch		// aSizeMils is in 1/1000th of an inch
	SetWidthInches( aSizeMils.x / 1000.0 );		SetWidthInches( aSizeMils.x / 1000.0 );
	SetHeightInches( aSizeMils.y / 1000.0 );		SetHeightInches( aSizeMils.y / 1000.0 );

	m_Offset = aOffsetMils;
	m_Type = aType;		m_Type = aType;

	// Adjust the default value for margins to 400 mils (0,4 inch or 10 mm)		// Adjust the default value for margins to 400 mils (0,4 inch or 10 mm)

Admin message