Post Pcbnew NETLIST_READER change clean up. (81271ad4) · Commits · Elphel / kicad-source-mirror

common/CMakeLists.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -117,9 +117,9 @@ set(PCB_COMMON_SRCS
		../pcbnew/class_zone_settings.cpp
		../pcbnew/classpcb.cpp
		../pcbnew/collectors.cpp
		../pcbnew/netlist_reader_common.cpp
		../pcbnew/netlist_reader_firstformat.cpp
		../pcbnew/netlist_reader_kicad.cpp
		../pcbnew/netlist_reader.cpp
		../pcbnew/legacy_netlist_reader.cpp
		../pcbnew/kicad_netlist_reader.cpp
		../pcbnew/sel_layer.cpp
		../pcbnew/pcb_plot_params.cpp
		../pcbnew/io_mgr.cpp

cvpcb/CMakeLists.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -36,12 +36,8 @@ set(CVPCB_SRCS
		cvframe.cpp
		cvpcb.cpp
		listboxes.cpp
		loadcmp.cpp
		menubar.cpp
		readschematicnetlist.cpp
		read_write_cmpfile.cpp
		readwrite_dlgs.cpp
		setvisu.cpp
		tool_cvpcb.cpp
		)

cvpcb/class_DisplayFootprintsFrame.cpp

+143 −29

Original line number	Diff line number	Diff line
		@@ -35,19 +35,17 @@
		#include <macros.h>
		#include <bitmaps.h>
		#include <msgpanel.h>
		#include <wildcards_and_files_ext.h>

		#include <io_mgr.h>
		#include <class_module.h>
		#include <class_board.h>

		#include <cvpcb.h>
		#include <cvpcb_mainframe.h>
		#include <class_DisplayFootprintsFrame.h>
		#include <cvpcb_id.h>
		#include <cvstruct.h>

		/*
		* NOTE: There is something in 3d_viewer.h that causes a compiler error in
		* <boost/foreach.hpp> in Linux so move it after cvpcb.h where it is
		* included to prevent the error from occurring.
		*/
		#include <3d_viewer.h>


		@@ -70,9 +68,6 @@ END_EVENT_TABLE()

		#define DISPLAY_FOOTPRINTS_FRAME_NAME wxT( "CmpFrame" )

		/***************************************************************************/
		/* DISPLAY_FOOTPRINTS_FRAME: the frame to display the current focused footprint */
		/***************************************************************************/

		DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* parent,
		const wxString& title,
		@@ -98,6 +93,7 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* parent,
		if( (m_LastGridSizeId <= 0) \|\|
		(m_LastGridSizeId > (ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000)) )
		m_LastGridSizeId = ID_POPUP_GRID_LEVEL_500 - ID_POPUP_GRID_LEVEL_1000;

		GetScreen()->SetGrid( ID_POPUP_GRID_LEVEL_1000 + m_LastGridSizeId );

		// Initialize some display options
		@@ -155,9 +151,6 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME()
		}


		/* Called when the frame is closed
		* Save current settings (frame position and size
		*/
		void DISPLAY_FOOTPRINTS_FRAME::OnCloseWindow( wxCloseEvent& event )
		{
		if( m_Draw3DFrame )
		@@ -426,9 +419,6 @@ void DISPLAY_FOOTPRINTS_FRAME::GeneralControl( wxDC* aDC, const wxPoint& aPositi
		}


		/**
		* Display 3D frame of current footprint selection.
		*/
		void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event )
		{
		if( m_Draw3DFrame )
		@@ -463,33 +453,157 @@ void PCB_SCREEN::ClearUndoORRedoList( UNDO_REDO_CONTAINER&, int )
		}


		/**
		* Function IsGridVisible() , virtual
		* @return true if the grid must be shown
		*/
		bool DISPLAY_FOOTPRINTS_FRAME::IsGridVisible() const
		{
		return m_DrawGrid;
		}


		/**
		* Function SetGridVisibility() , virtual
		* It may be overloaded by derived classes
		* if you want to store/retrieve the grid visibility in configuration.
		* @param aVisible = true if the grid must be shown
		*/
		void DISPLAY_FOOTPRINTS_FRAME::SetGridVisibility(bool aVisible)
		{
		m_DrawGrid = aVisible;
		}


		/**
		* Function GetGridColor() , virtual
		* @return the color of the grid
		*/
		EDA_COLOR_T DISPLAY_FOOTPRINTS_FRAME::GetGridColor() const
		{
		return DARKGRAY;
		}


		MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& aFootprintName )
		{
		CVPCB_MAINFRAME* parent = ( CVPCB_MAINFRAME* ) GetParent();

		try
		{
		PLUGIN::RELEASER pi( IO_MGR::PluginFind( IO_MGR::LEGACY ) );

		for( unsigned i = 0; i < parent->m_ModuleLibNames.GetCount(); ++i )
		{
		wxFileName fn = parent->m_ModuleLibNames[i];

		fn.SetExt( LegacyFootprintLibPathExtension );

		wxString libPath = wxGetApp().FindLibraryPath( fn );

		if( !libPath )
		{
		wxString msg = wxString::Format( _( "PCB footprint library file <%s> could not "
		"be found in the default search paths." ),
		fn.GetFullName().GetData() );

		// @todo we should not be using wxMessageBox directly.
		wxMessageBox( msg, titleLibLoadError, wxOK \| wxICON_ERROR, this );
		continue;
		}

		MODULE* footprint = pi->FootprintLoad( libPath, aFootprintName );

		if( footprint )
		{
		footprint->SetParent( (EDA_ITEM*) GetBoard() );
		footprint->SetPosition( wxPoint( 0, 0 ) );
		return footprint;
		}
		}
		}
		catch( IO_ERROR ioe )
		{
		DisplayError( this, ioe.errorText );
		return NULL;
		}

		wxString msg = wxString::Format( _( "Footprint '%s' not found" ), aFootprintName.GetData() );
		DisplayError( this, msg );
		return NULL;
		}


		void DISPLAY_FOOTPRINTS_FRAME::InitDisplay()
		{
		wxString msg;
		CVPCB_MAINFRAME * parentframe = (CVPCB_MAINFRAME *) GetParent();
		wxString footprintName = parentframe->m_FootprintList->GetSelectedFootprint();

		if( !footprintName.IsEmpty() )
		{
		msg.Printf( _( "Footprint: %s" ), GetChars( footprintName ) );
		SetTitle( msg );
		FOOTPRINT_INFO* module_info = parentframe->m_footprints.GetModuleInfo( footprintName );

		const wxChar *libname;
		if( module_info )
		libname = GetChars( module_info->m_LibName );
		else
		libname = GetChars( wxT( "???" ) );
		msg.Printf( _( "Lib: %s" ), libname );

		SetStatusText( msg, 0 );

		if( GetBoard()->m_Modules.GetCount() )
		{
		// there is only one module in the list
		GetBoard()->m_Modules.DeleteAll();
		}

		MODULE* module = Get_Module( footprintName );

		if( module )
		GetBoard()->m_Modules.PushBack( module );

		Zoom_Automatique( false );

		}
		else // No footprint to display. Erase old footprint, if any
		{
		if( GetBoard()->m_Modules.GetCount() )
		{
		GetBoard()->m_Modules.DeleteAll();
		Zoom_Automatique( false );
		SetStatusText( wxEmptyString, 0 );
		}
		}

		// Display new cursor coordinates and zoom value:
		UpdateStatusBar();

		GetCanvas()->Refresh();

		if( m_Draw3DFrame )
		m_Draw3DFrame->NewDisplay();
		}


		void DISPLAY_FOOTPRINTS_FRAME::RedrawActiveWindow( wxDC* DC, bool EraseBg )
		{
		if( !GetBoard() )
		return;

		m_canvas->DrawBackGround( DC );
		GetBoard()->Draw( m_canvas, DC, GR_COPY );

		MODULE* Module = GetBoard()->m_Modules;

		if ( Module )
		{
		MSG_PANEL_ITEMS items;
		Module->GetMsgPanelInfo( items );
		SetMsgPanel( items );
		}

		m_canvas->DrawCrossHair( DC );
		}


		/*
		* Redraw the BOARD items but not cursors, axis or grid.
		*/
		void BOARD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC,
		GR_DRAWMODE aDrawMode, const wxPoint& aOffset )
		{
		if( m_Modules )
		{
		m_Modules->Draw( aPanel, aDC, GR_COPY );
		}
		}

cvpcb/class_DisplayFootprintsFrame.h

+33 −0

Original line number	Diff line number	Diff line
		/*
		* This program source code file is part of KiCad, a free EDA CAD application.
		*
		* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
		* Copyright (C) 2007-2011 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 class_DisplayFootprintsFrame.h
		*/
		@@ -23,7 +47,12 @@ public:
		~DISPLAY_FOOTPRINTS_FRAME();

		void OnCloseWindow( wxCloseEvent& Event );

		/*
		* Draws the current highlighted footprint.
		*/
		void RedrawActiveWindow( wxDC* DC, bool EraseBg );

		void ReCreateHToolbar();
		void ReCreateVToolbar();
		void ReCreateOptToolbar();
		@@ -69,6 +98,10 @@ public:
		MODULE* Get_Module( const wxString& CmpName );

		void Process_Settings( wxCommandEvent& event );

		/**
		* Display 3D frame of current footprint selection.
		*/
		void Show3D_Frame( wxCommandEvent& event );

		/* SaveCopyInUndoList() virtual

cvpcb/cvframe.cpp

+119 −5

Original line number	Diff line number	Diff line
		@@ -725,11 +725,7 @@ void CVPCB_MAINFRAME::UpdateTitle()
		SetTitle( title );
		}

		/**
		* Send a remote command to Eeschema via a socket,
		* Commands are
		* $PART: "reference" put cursor on component anchor
		*/

		void CVPCB_MAINFRAME::SendMessageToEESCHEMA()
		{
		char cmd[1024];
		@@ -754,3 +750,121 @@ void CVPCB_MAINFRAME::SendMessageToEESCHEMA()
		SendCommand( MSG_TO_SCH, cmd );

		}


		int CVPCB_MAINFRAME::ReadSchematicNetlist()
		{
		wxBusyCursor dummy; // Shows an hourglass while loading.
		NETLIST_READER* netlistReader;
		wxString msg;
		wxString compFootprintLinkFileName;
		wxFileName fn = m_NetlistFileName;

		// Load the footprint association file if it has already been created.
		fn.SetExt( ComponentFileExtension );

		if( fn.FileExists() && fn.IsFileReadable() )
		compFootprintLinkFileName = fn.GetFullPath();

		m_netlist.Clear();

		try
		{
		netlistReader = NETLIST_READER::GetNetlistReader( &m_netlist,
		m_NetlistFileName.GetFullPath(),
		compFootprintLinkFileName );
		std::auto_ptr< NETLIST_READER > nlr( netlistReader );
		netlistReader->LoadNetlist();
		}
		catch( IO_ERROR& ioe )
		{
		msg = wxString::Format( _( "Error loading netlist.\n%s" ), ioe.errorText.GetData() );
		wxMessageBox( msg, _( "Netlist Load Error" ), wxOK \| wxICON_ERROR );
		return 1;
		}


		// We also remove footprint name if it is "$noname" because this is a dummy name,
		// not the actual name of the footprint.
		for( unsigned ii = 0; ii < m_netlist.GetCount(); ii++ )
		{
		if( m_netlist.GetComponent( ii )->GetFootprintLibName() == wxT( "$noname" ) )
		m_netlist.GetComponent( ii )->SetFootprintLibName( wxEmptyString );
		}

		// Sort components by reference:
		m_netlist.SortByReference();

		return 0;
		}


		/* File header. */
		static char HeaderLinkFile[] = { "Cmp-Mod V01" };


		bool CVPCB_MAINFRAME::WriteComponentLinkFile( const wxString& aFullFileName )
		{
		COMPONENT* component;
		FILE* outputFile;
		wxFileName fn( aFullFileName );
		wxString Title = wxGetApp().GetTitle() + wxT( " " ) + GetBuildVersion();

		outputFile = wxFopen( fn.GetFullPath(), wxT( "wt" ) );

		if( outputFile == NULL )
		return false;

		int retval = 0;

		/*
		* The header is:
		* Cmp-Mod V01 Created by CvPcb (2012-02-08 BZR 3403)-testing date = 10/02/2012 20:45:59
		* and write block per component like:
		* BeginCmp
		* TimeStamp = /322D3011;
		* Reference = BUS1;
		* ValeurCmp = BUSPC;
		* IdModule = BUS_PC;
		* EndCmp
		*/
		retval \|= fprintf( outputFile, "%s", HeaderLinkFile );
		retval \|= fprintf( outputFile, " Created by %s", TO_UTF8( Title ) );
		retval \|= fprintf( outputFile, " date = %s\n", TO_UTF8( DateAndTime() ) );

		for( unsigned i = 0; i < m_netlist.GetCount(); i++ )
		{
		component = m_netlist.GetComponent( i );
		retval \|= fprintf( outputFile, "\nBeginCmp\n" );
		retval \|= fprintf( outputFile, "TimeStamp = %s;\n", TO_UTF8( component->GetTimeStamp() ) );
		retval \|= fprintf( outputFile, "Reference = %s;\n", TO_UTF8( component->GetReference() ) );
		retval \|= fprintf( outputFile, "ValeurCmp = %s;\n", TO_UTF8( component->GetValue() ) );
		retval \|= fprintf( outputFile, "IdModule = %s;\n",
		TO_UTF8( component->GetFootprintLibName() ) );
		retval \|= fprintf( outputFile, "EndCmp\n" );
		}

		retval \|= fprintf( outputFile, "\nEndListe\n" );
		fclose( outputFile );
		return retval >= 0;
		}


		void CVPCB_MAINFRAME::CreateScreenCmp()
		{
		if( m_DisplayFootprintFrame == NULL )
		{
		m_DisplayFootprintFrame = new DISPLAY_FOOTPRINTS_FRAME( this, _( "Module" ),
		wxPoint( 0, 0 ),
		wxSize( 600, 400 ),
		KICAD_DEFAULT_DRAWFRAME_STYLE );
		m_DisplayFootprintFrame->Show( true );
		}
		else
		{
		if( m_DisplayFootprintFrame->IsIconized() )
		m_DisplayFootprintFrame->Iconize( false );
		}

		m_DisplayFootprintFrame->InitDisplay();
		}

Admin message