From 97898b92aa9c61a8f15c25d1904758cf8fe26189 Mon Sep 17 00:00:00 2001 From: dickelbeck Date: Sat, 4 Aug 2007 00:47:36 +0000 Subject: [PATCH] beautified --- pcbnew/pcbnew.cpp | 113 +++++++++++++++++++++++----------------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/pcbnew/pcbnew.cpp b/pcbnew/pcbnew.cpp index facb3715f7..d38ba25613 100644 --- a/pcbnew/pcbnew.cpp +++ b/pcbnew/pcbnew.cpp @@ -1,6 +1,6 @@ - /*************************/ - /* PCBNEW: main program */ - /*************************/ +/*************************/ +/* PCBNEW: main program */ +/*************************/ #define MAIN #define eda_global @@ -24,78 +24,77 @@ #include "eda_dde.h" -wxString g_Main_Title( wxT("PCBNEW") ); +wxString g_Main_Title( wxT( "PCBNEW" ) ); -IMPLEMENT_APP(WinEDA_App) +IMPLEMENT_APP( WinEDA_App ) /****************************/ -bool WinEDA_App::OnInit(void) +bool WinEDA_App::OnInit( void ) /****************************/ { -wxString FFileName; + wxString FFileName; - EDA_Appl = this; - InitEDA_Appl( wxT("pcbnew") ); + EDA_Appl = this; + InitEDA_Appl( wxT( "pcbnew" ) ); - if ( m_Checker && m_Checker->IsAnotherRunning() ) + if( m_Checker && m_Checker->IsAnotherRunning() ) { - if ( ! IsOK(NULL, _("Pcbnew is already running, Continue?") ) ) - return false; + if( !IsOK( NULL, _( "Pcbnew is already running, Continue?" ) ) ) + return false; } - /* Add image handlers for screen hardcopy */ - wxImage::AddHandler( new wxPNGHandler ); - wxImage::AddHandler( new wxJPEGHandler ); + /* Add image handlers for screen hardcopy */ + wxImage::AddHandler( new wxPNGHandler ); + wxImage::AddHandler( new wxJPEGHandler ); - ScreenPcb = new PCB_SCREEN(PCB_FRAME); - GetSettings(); + ScreenPcb = new PCB_SCREEN( PCB_FRAME ); + GetSettings(); - if(argc > 1) - { - FFileName = MakeFileName(wxEmptyString, argv[1], PcbExtBuffer); - wxSetWorkingDirectory( wxPathOnly(FFileName) ); - } + if( argc > 1 ) + { + FFileName = MakeFileName( wxEmptyString, argv[1], PcbExtBuffer ); + wxSetWorkingDirectory( wxPathOnly( FFileName ) ); + } - Read_Config(FFileName); - g_DrawBgColor = BLACK; + Read_Config( FFileName ); + g_DrawBgColor = BLACK; - /* allocation de la memoire pour le fichier et autres buffers: */ - /* On reserve BUFMEMSIZE octets de ram pour calcul */ - buf_work = adr_lowmem = (char*)MyZMalloc(BUFMEMSIZE) ; /* adresse de la zone de calcul */ - adr_himem = adr_lowmem + BUFMEMSIZE; /* adr limite haute */ - adr_max = adr_lowmem; + /* allocation de la memoire pour le fichier et autres buffers: */ + /* On reserve BUFMEMSIZE octets de ram pour calcul */ + buf_work = adr_lowmem = (char*) MyZMalloc( BUFMEMSIZE ); /* adresse de la zone de calcul */ + adr_himem = adr_lowmem + BUFMEMSIZE; /* adr limite haute */ + adr_max = adr_lowmem; - if( adr_lowmem == NULL ) - { - printf( "No Memory, Fatal err Memory alloc\n" ); - return(FALSE) ; - } - m_PcbFrame = new WinEDA_PcbFrame(NULL, this, wxT("PcbNew"), - wxPoint(0,0), wxSize(600,400) ); - wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion(); - m_PcbFrame->SetTitle(Title); - ActiveScreen = ScreenPcb; - m_PcbFrame->m_Pcb = new BOARD(NULL, m_PcbFrame); + if( adr_lowmem == NULL ) + { + printf( "No Memory, Fatal err Memory alloc\n" ); + return FALSE; + } + m_PcbFrame = new WinEDA_PcbFrame( NULL, this, wxT( "PcbNew" ), + wxPoint( 0, 0 ), wxSize( 600, 400 ) ); + wxString Title = g_Main_Title + wxT( " " ) + GetBuildVersion(); + m_PcbFrame->SetTitle( Title ); + ActiveScreen = ScreenPcb; + m_PcbFrame->m_Pcb = new BOARD( NULL, m_PcbFrame ); - SetTopWindow(m_PcbFrame); - m_PcbFrame->Show(TRUE); + SetTopWindow( m_PcbFrame ); + m_PcbFrame->Show( TRUE ); - if( CreateServer(m_PcbFrame, KICAD_PCB_PORT_SERVICE_NUMBER) ) - { - SetupServerFunction(RemoteCommand); - } + if( CreateServer( m_PcbFrame, KICAD_PCB_PORT_SERVICE_NUMBER ) ) + { + SetupServerFunction( RemoteCommand ); + } - m_PcbFrame->Zoom_Automatique(TRUE); + m_PcbFrame->Zoom_Automatique( TRUE ); - /* Load file specified in the command line. */ - if ( ! FFileName.IsEmpty() ) - { - wxClientDC dc(m_PcbFrame->DrawPanel); - m_PcbFrame->DrawPanel->PrepareGraphicContext(&dc); - m_PcbFrame->LoadOnePcbFile(FFileName, &dc, FALSE); - } + /* Load file specified in the command line. */ + if( !FFileName.IsEmpty() ) + { + wxClientDC dc( m_PcbFrame->DrawPanel ); - return TRUE; + m_PcbFrame->DrawPanel->PrepareGraphicContext( &dc ); + m_PcbFrame->LoadOnePcbFile( FFileName, &dc, FALSE ); + } + + return TRUE; } - -