haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting.

This commit is contained in:
Jeff Young 2021-01-09 12:08:04 +00:00
parent cf2dd0bd38
commit e4f29d358c
2 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/footprint_info.cpp
View File

@ -92,10 +92,9 @@ bool operator<( const FOOTPRINT_INFO& lhs, const FOOTPRINT_INFO& rhs )
void FOOTPRINT_LIST::DisplayErrors( wxTopLevelWindow* aWindow ) void FOOTPRINT_LIST::DisplayErrors( wxTopLevelWindow* aWindow )
{ {
// @todo: go to a more HTML !<table>! ? centric output, possibly with // @todo: go to a more HTML !<table>! ? centric output, possibly with recommendations
// recommendations for remedy of errors. Add numeric error codes // for remedy of errors. Add numeric error codes to PARSE_ERROR, and switch on them for
// to PARSE_ERROR, and switch on them for remedies, etc. Full // remedies, etc. Full access is provided to everything in every exception!
// access is provided to everything in every exception!
HTML_MESSAGE_BOX dlg( aWindow, _( "Load Error" ) ); HTML_MESSAGE_BOX dlg( aWindow, _( "Load Error" ) );

30
pcbnew/load_select_footprint.cpp
View File

@ -43,9 +43,7 @@ using namespace std::placeholders;
#include <kiway.h> #include <kiway.h>
#include <lib_id.h> #include <lib_id.h>
#include <macros.h> #include <macros.h>
#include <pcb_draw_panel_gal.h>
#include <pcb_edit_frame.h> #include <pcb_edit_frame.h>
#include <pcbnew.h>
#include <pcbnew_settings.h> #include <pcbnew_settings.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <view/view_controls.h> #include <view/view_controls.h>
@ -120,16 +118,15 @@ bool FOOTPRINT_EDIT_FRAME::LoadFootprintFromBoard( FOOTPRINT* aFootprint )
AddFootprintToBoard( newFootprint ); AddFootprintToBoard( newFootprint );
// Clear references to any net info, because the footprint editor // Clear references to any net info, because the footprint editor does know any thing about
// does know any thing about nets handled by the current edited board. // nets handled by the current edited board.
// Morever we do not want to save any reference to an unknown net when // Morever we do not want to save any reference to an unknown net when saving the footprint
// saving the footprint in lib cache // in lib cache so we force the ORPHANED dummy net info for all pads.
// so we force the ORPHANED dummy net info for all pads
newFootprint->ClearAllNets(); newFootprint->ClearAllNets();
GetCanvas()->GetViewControls()->SetCrossHairCursorPosition( VECTOR2D( 0, 0 ), false ); GetCanvas()->GetViewControls()->SetCrossHairCursorPosition( VECTOR2D( 0, 0 ), false );
PlaceFootprint( newFootprint ); PlaceFootprint( newFootprint );
newFootprint->SetPosition( wxPoint( 0, 0 ) ); // cursor in GAL may not be initialized at the moment newFootprint->SetPosition( wxPoint( 0, 0 ) ); // cursor in GAL may not yet be initialized
// Put it on FRONT layer, // Put it on FRONT layer,
// because this is the default in Footprint Editor, and in libs // because this is the default in Footprint Editor, and in libs
@ -179,7 +176,7 @@ wxString PCB_BASE_FRAME::SelectFootprintFromLibBrowser()
// (for this reason delete operator cannot be used blindly with "top level" windows) // (for this reason delete operator cannot be used blindly with "top level" windows)
// so gives a slice of time to delete the viewer frame. // so gives a slice of time to delete the viewer frame.
// This is especially important in OpenGL mode to avoid recreating context before // This is especially important in OpenGL mode to avoid recreating context before
// the old one is deleted // the old one is deleted.
wxSafeYield(); wxSafeYield();
} }
@ -212,13 +209,12 @@ FOOTPRINT* PCB_BASE_FRAME::SelectFootprintFromLibTree( LIB_ID aPreselect )
_( "Loading Footprint Libraries" ), 3 ); _( "Loading Footprint Libraries" ), 3 );
GFootprintList.ReadFootprintFiles( fpTable, nullptr, progressReporter ); GFootprintList.ReadFootprintFiles( fpTable, nullptr, progressReporter );
bool cancel = progressReporter->WasCancelled(); bool cancel = progressReporter->WasCancelled();
// Force immediate deletion of the WX_PROGRESS_REPORTER
// ( do not use Destroy(), or use Destroy() followed by wxSafeYield() ) // Force immediate deletion of the WX_PROGRESS_REPORTER. Do not use Destroy(), or use
// because on Windows, APP_PROGRESS_DIALOG or WX_PROGRESS_REPORTER has some side // Destroy() followed by wxSafeYield() because on Windows, APP_PROGRESS_DIALOG and
// effects on the event loop manager. // WX_PROGRESS_REPORTER have some side effects on the event loop manager. For instance, a
// A side effect is the call of ShowModal() or ShowQuasiModal() of a dialog following // subsequent call to ShowModal() or ShowQuasiModal() for a dialog following the use of a
// the use of a WX_PROGRESS_REPORTER // WX_PROGRESS_REPORTER results in incorrect modal or quasi modal behavior.
// has a broken behavior (incorrect modal or quasi modal behavior).
delete progressReporter; delete progressReporter;
if( cancel ) if( cancel )
@ -434,7 +430,7 @@ bool FOOTPRINT_EDIT_FRAME::SaveLibraryAs( const wxString& aLibraryPath )
} }
static FOOTPRINT* s_FootprintInitialCopy = NULL; // Copy of footprint for abort/undo command static FOOTPRINT* s_FootprintInitialCopy = NULL; // Copy of footprint for abort/undo command
static PICKED_ITEMS_LIST s_PickedList; // A pick-list to save initial footprint static PICKED_ITEMS_LIST s_PickedList; // A pick-list to save initial footprint
// and dragged tracks // and dragged tracks