From 6c18582a960fd8e665ed85ef4e30249c19ca9c81 Mon Sep 17 00:00:00 2001 From: raburton Date: Tue, 11 Sep 2007 07:34:46 +0000 Subject: [PATCH] set eol-style native on new files --- gerbview/gerbview_config.cpp | 288 +++++++++++++++++----------------- gerbview/hotkeys.cpp | 296 +++++++++++++++++------------------ gerbview/hotkeys.h | 52 +++--- 3 files changed, 318 insertions(+), 318 deletions(-) diff --git a/gerbview/gerbview_config.cpp b/gerbview/gerbview_config.cpp index 5cc7ae86b6..9764a2670c 100644 --- a/gerbview/gerbview_config.cpp +++ b/gerbview/gerbview_config.cpp @@ -1,144 +1,144 @@ - /******************************************/ - /** gerbview_config.cpp : configuration pour Gerbview */ - /******************************************/ - -/* lit ou met a jour la configuration de PCBNEW */ - -#include "fctsys.h" - -#include "common.h" -#include "gerbview.h" -#include "pcbplot.h" -#include "id.h" -#include "hotkeys_basic.h" -#include "hotkeys.h" -#include "gerbview_config.h" - -#include "protos.h" - -/* Routines Locales */ - -/* Variables locales */ - -#define HOTKEY_FILENAME wxT("gerbview") - - -/*************************************************************/ -void WinEDA_GerberFrame::Process_Config(wxCommandEvent& event) -/*************************************************************/ -{ -int id = event.GetId(); -wxPoint pos; -wxString FullFileName; - - pos = GetPosition(); - pos.x += 20; pos.y += 20; - - switch( id ) - { - case ID_COLORS_SETUP : - DisplayColorSetupFrame(this, pos); - break; - - case ID_CONFIG_REQ : // Creation de la fenetre de configuration - { - InstallConfigFrame(pos); - break; - } - - case ID_PCB_TRACK_SIZE_SETUP: - case ID_PCB_LOOK_SETUP: - case ID_OPTIONS_SETUP: - InstallPcbOptionsFrame(pos, id); - break; - - case ID_CONFIG_SAVE: - Update_config(); - break; - - case ID_PREFERENCES_CREATE_CONFIG_HOTKEYS: - FullFileName = DEFAULT_HOTKEY_FILENAME_PATH; - FullFileName += HOTKEY_FILENAME; - FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; - WriteHotkeyConfigFile(FullFileName, s_Gerbview_Hokeys_Descr, true); - break; - - case ID_PREFERENCES_READ_CONFIG_HOTKEYS: - Read_Hotkey_Config( this, true); - break; - - default: - DisplayError(this, wxT("WinEDA_GerberFrame::Process_Config internal error")); - } -} - - -/*****************************************************/ -bool Read_Config(void) -/*****************************************************/ -/* lit la configuration, si elle n'a pas deja etee lue - 1 - lit gerbview.cnf - 2 - si non trouve lit /gerbview.cnf - 3 - si non trouve: init des variables aux valeurs par defaut - - Retourne un pointeur su le message d'erreur a afficher -*/ -{ - g_Prj_Config_Filename_ext = wxT(".cnf"); - EDA_Appl->ReadProjectConfig( wxT("gerbview"), GROUP, ParamCfgList, FALSE); - - /* Inits autres variables */ - if (ScreenPcb) ScreenPcb->SetGrid(TmpGrid); - if ( g_PhotoFilenameExt.IsEmpty() ) g_PhotoFilenameExt = wxT(".pho"); - if ( g_DrillFilenameExt.IsEmpty() ) g_DrillFilenameExt = wxT(".drl"); - if ( g_PenFilenameExt.IsEmpty() ) g_PenFilenameExt = wxT(".pen"); - - return TRUE; -} - - - -/******************************************/ -void WinEDA_GerberFrame::Update_config(void) -/******************************************/ -/* - creation du fichier de config -*/ -{ -wxString FullFileName; -wxString mask( wxT("*") ), - - g_Prj_Config_Filename_ext = wxT(".cnf";) - mask += g_Prj_Config_Filename_ext; - FullFileName = wxT("gerbview"); - ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext ); - - FullFileName = EDA_FileSelector(_("Save config file"), - wxEmptyString, /* Chemin par defaut */ - FullFileName, /* nom fichier par defaut */ - g_Prj_Config_Filename_ext, /* extension par defaut */ - mask, /* Masque d'affichage */ - this, - wxFD_SAVE, - TRUE - ); - if ( FullFileName.IsEmpty() ) return; - - /* ecriture de la configuration */ - EDA_Appl->WriteProjectConfig(FullFileName, GROUP, ParamCfgList); -} - -/***************************************************************/ -bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose ) -/***************************************************************/ -/* - * Read the hotkey files config for pcbnew and module_edit -*/ -{ - wxString FullFileName = DEFAULT_HOTKEY_FILENAME_PATH; - FullFileName += HOTKEY_FILENAME; - FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; - return frame->ReadHotkeyConfigFile(FullFileName, s_Gerbview_Hokeys_Descr, verbose); -} - - + /******************************************/ + /** gerbview_config.cpp : configuration pour Gerbview */ + /******************************************/ + +/* lit ou met a jour la configuration de PCBNEW */ + +#include "fctsys.h" + +#include "common.h" +#include "gerbview.h" +#include "pcbplot.h" +#include "id.h" +#include "hotkeys_basic.h" +#include "hotkeys.h" +#include "gerbview_config.h" + +#include "protos.h" + +/* Routines Locales */ + +/* Variables locales */ + +#define HOTKEY_FILENAME wxT("gerbview") + + +/*************************************************************/ +void WinEDA_GerberFrame::Process_Config(wxCommandEvent& event) +/*************************************************************/ +{ +int id = event.GetId(); +wxPoint pos; +wxString FullFileName; + + pos = GetPosition(); + pos.x += 20; pos.y += 20; + + switch( id ) + { + case ID_COLORS_SETUP : + DisplayColorSetupFrame(this, pos); + break; + + case ID_CONFIG_REQ : // Creation de la fenetre de configuration + { + InstallConfigFrame(pos); + break; + } + + case ID_PCB_TRACK_SIZE_SETUP: + case ID_PCB_LOOK_SETUP: + case ID_OPTIONS_SETUP: + InstallPcbOptionsFrame(pos, id); + break; + + case ID_CONFIG_SAVE: + Update_config(); + break; + + case ID_PREFERENCES_CREATE_CONFIG_HOTKEYS: + FullFileName = DEFAULT_HOTKEY_FILENAME_PATH; + FullFileName += HOTKEY_FILENAME; + FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; + WriteHotkeyConfigFile(FullFileName, s_Gerbview_Hokeys_Descr, true); + break; + + case ID_PREFERENCES_READ_CONFIG_HOTKEYS: + Read_Hotkey_Config( this, true); + break; + + default: + DisplayError(this, wxT("WinEDA_GerberFrame::Process_Config internal error")); + } +} + + +/*****************************************************/ +bool Read_Config(void) +/*****************************************************/ +/* lit la configuration, si elle n'a pas deja etee lue + 1 - lit gerbview.cnf + 2 - si non trouve lit /gerbview.cnf + 3 - si non trouve: init des variables aux valeurs par defaut + + Retourne un pointeur su le message d'erreur a afficher +*/ +{ + g_Prj_Config_Filename_ext = wxT(".cnf"); + EDA_Appl->ReadProjectConfig( wxT("gerbview"), GROUP, ParamCfgList, FALSE); + + /* Inits autres variables */ + if (ScreenPcb) ScreenPcb->SetGrid(TmpGrid); + if ( g_PhotoFilenameExt.IsEmpty() ) g_PhotoFilenameExt = wxT(".pho"); + if ( g_DrillFilenameExt.IsEmpty() ) g_DrillFilenameExt = wxT(".drl"); + if ( g_PenFilenameExt.IsEmpty() ) g_PenFilenameExt = wxT(".pen"); + + return TRUE; +} + + + +/******************************************/ +void WinEDA_GerberFrame::Update_config(void) +/******************************************/ +/* + creation du fichier de config +*/ +{ +wxString FullFileName; +wxString mask( wxT("*") ), + + g_Prj_Config_Filename_ext = wxT(".cnf";) + mask += g_Prj_Config_Filename_ext; + FullFileName = wxT("gerbview"); + ChangeFileNameExt( FullFileName, g_Prj_Config_Filename_ext ); + + FullFileName = EDA_FileSelector(_("Save config file"), + wxEmptyString, /* Chemin par defaut */ + FullFileName, /* nom fichier par defaut */ + g_Prj_Config_Filename_ext, /* extension par defaut */ + mask, /* Masque d'affichage */ + this, + wxFD_SAVE, + TRUE + ); + if ( FullFileName.IsEmpty() ) return; + + /* ecriture de la configuration */ + EDA_Appl->WriteProjectConfig(FullFileName, GROUP, ParamCfgList); +} + +/***************************************************************/ +bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose ) +/***************************************************************/ +/* + * Read the hotkey files config for pcbnew and module_edit +*/ +{ + wxString FullFileName = DEFAULT_HOTKEY_FILENAME_PATH; + FullFileName += HOTKEY_FILENAME; + FullFileName += DEFAULT_HOTKEY_FILENAME_EXT; + return frame->ReadHotkeyConfigFile(FullFileName, s_Gerbview_Hokeys_Descr, verbose); +} + + diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp index c319b3b341..895769d697 100644 --- a/gerbview/hotkeys.cpp +++ b/gerbview/hotkeys.cpp @@ -1,148 +1,148 @@ -/***************/ -/* hotkeys.cpp */ -/***************/ - -#include "fctsys.h" - -#include "gr_basic.h" - -#include "common.h" -#include "pcbnew.h" -#include "id.h" -#include "hotkeys.h" - -#include "protos.h" - -/* How to add a new hotkey: - * add a new id in the enum hotkey_id_commnand like MY_NEW_ID_FUNCTION. - * add a new Ki_HotkeyInfo entry like: - * static Ki_HotkeyInfo HkMyNewEntry(wxT("Command Label"), MY_NEW_ID_FUNCTION, default key value); - * "Command Label" is the name used in hotkey list display, and the identifier in the hotkey list file - * MY_NEW_ID_FUNCTION is an equivalent id function used in the switch in OnHotKey() function. - * default key value is the default hotkey for this command. Can be overrided by the user hotkey list file - * add the HkMyNewEntry pointer in the s_board_edit_Hotkey_List list ( or/and the s_module_edit_Hotkey_List list) - * Add the new code in the switch in OnHotKey() function. - * when the variable PopupOn is true, an item is currently edited. - * This can be usefull if the new function cannot be executed while an item is currently being edited - * ( For example, one cannot start a new wire when a component is moving.) - * - * Note: If an hotkey is a special key, be sure the corresponding wxWidget keycode (WXK_XXXX) - * is handled in the hotkey_name_descr s_Hotkey_Name_List list (see hotkeys_basic.cpp) - * and see this list for some ascii keys (space ...) - */ - -/* local variables */ -/* Hotkey list: */ -static Ki_HotkeyInfo HkResetLocalCoord( wxT( "Reset local coord." ), HK_RESET_LOCAL_COORD, ' ' ); -static Ki_HotkeyInfo HkZoomCenter( wxT( "Zoom Center" ), HK_ZOOM_CENTER, WXK_F4 ); -static Ki_HotkeyInfo HkZoomRedraw( wxT( "Zoom Redraw" ), HK_ZOOM_REDRAW, WXK_F3 ); -static Ki_HotkeyInfo HkZoomOut( wxT( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2 ); -static Ki_HotkeyInfo HkZoomIn( wxT( "Zoom In" ), HK_ZOOM_IN, WXK_F1 ); -static Ki_HotkeyInfo HkHelp( wxT( "Help: this message" ), HK_HELP, '?' ); -static Ki_HotkeyInfo HkSwitchUnits( wxT( "Switch Units" ), HK_SWITCH_UNITS, 'U' ); -static Ki_HotkeyInfo HkTrackDisplayMode( wxT( - "Track Display Mode" ), - HK_SWITCH_TRACK_DISPLAY_MODE, 'F' ); - -static Ki_HotkeyInfo HkSwitch2NextCopperLayer( wxT( - "Switch to Next Layer" ), - HK_SWITCH_LAYER_TO_NEXT, '+' ); -static Ki_HotkeyInfo HkSwitch2PreviousCopperLayer( wxT( - "Switch to Previous Layer" ), - HK_SWITCH_LAYER_TO_PREVIOUS, '-' ); - -// List of common hotkey descriptors -Ki_HotkeyInfo* s_Gerbview_Hotkey_List[] = { - &HkHelp, - &HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter, - &HkSwitchUnits, &HkResetLocalCoord, - &HkTrackDisplayMode, - &HkSwitch2NextCopperLayer, - &HkSwitch2PreviousCopperLayer, - NULL -}; - - -// list of sections and corresponding hotkey list for pcbnew (used to create an hotkey config file) -struct Ki_HotkeyInfoSectionDescriptor s_Gerbview_Hokeys_Descr[] = -{ - { &g_CommonSectionTag, s_Gerbview_Hotkey_List, NULL }, - { NULL, NULL, NULL } -}; - - -/***********************************************************/ -void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey, - EDA_BaseStruct* DrawStruct ) -/***********************************************************/ - -/* Hot keys. Some commands are relatives to the item under the mouse cursor - * Commands are case insensitive - * @param DC = current device context - * @param hotkey = hothey code (ascii or wxWidget code for special keys) - * @param DrawStruct = NULL or pointer on a EDA_BaseStruct under the mouse cursor - */ - -{ - // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to handle...) - if( (hotkey & GR_KB_CTRL) != 0 ) - hotkey += 'A' - 1; - /* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */ - if( (hotkey >= 'a') && (hotkey <= 'z') ) - hotkey += 'A' - 'a'; - - int CommandCode = GetCommandCodeFromHotkey( hotkey, s_Gerbview_Hotkey_List ); - - switch( CommandCode ) - { - default: - case HK_NOT_FOUND: - return; - break; - - case HK_HELP: // Display Current hotkey list - DisplayHotkeyList( this, s_Gerbview_Hokeys_Descr ); - break; - - case HK_ZOOM_IN: - OnZoom( ID_ZOOM_PLUS_KEY ); - break; - - case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_MOINS_KEY ); - break; - - case HK_ZOOM_REDRAW: - OnZoom( ID_ZOOM_REDRAW_KEY ); - break; - - case HK_ZOOM_CENTER: - OnZoom( ID_ZOOM_CENTER_KEY ); - break; - - - case HK_RESET_LOCAL_COORD: /*Reset the relative coord */ - GetScreen()->m_O_Curseur = GetScreen()->m_Curseur; - break; - - - case HK_SWITCH_UNITS: - g_UnitMetric = (g_UnitMetric == INCHES ) ? MILLIMETRE : INCHES; - break; - - case HK_SWITCH_TRACK_DISPLAY_MODE: - DisplayOpt.DisplayPcbTrackFill ^= 1; DisplayOpt.DisplayPcbTrackFill &= 1; - GetScreen()->SetRefreshReq(); - break; - - case HK_SWITCH_LAYER_TO_PREVIOUS: - if( GetScreen()->m_Active_Layer > 0 ) - GetScreen()->m_Active_Layer--; - break; - - case HK_SWITCH_LAYER_TO_NEXT: - if( GetScreen()->m_Active_Layer < 31 ) - GetScreen()->m_Active_Layer++; - break; - } -} +/***************/ +/* hotkeys.cpp */ +/***************/ + +#include "fctsys.h" + +#include "gr_basic.h" + +#include "common.h" +#include "pcbnew.h" +#include "id.h" +#include "hotkeys.h" + +#include "protos.h" + +/* How to add a new hotkey: + * add a new id in the enum hotkey_id_commnand like MY_NEW_ID_FUNCTION. + * add a new Ki_HotkeyInfo entry like: + * static Ki_HotkeyInfo HkMyNewEntry(wxT("Command Label"), MY_NEW_ID_FUNCTION, default key value); + * "Command Label" is the name used in hotkey list display, and the identifier in the hotkey list file + * MY_NEW_ID_FUNCTION is an equivalent id function used in the switch in OnHotKey() function. + * default key value is the default hotkey for this command. Can be overrided by the user hotkey list file + * add the HkMyNewEntry pointer in the s_board_edit_Hotkey_List list ( or/and the s_module_edit_Hotkey_List list) + * Add the new code in the switch in OnHotKey() function. + * when the variable PopupOn is true, an item is currently edited. + * This can be usefull if the new function cannot be executed while an item is currently being edited + * ( For example, one cannot start a new wire when a component is moving.) + * + * Note: If an hotkey is a special key, be sure the corresponding wxWidget keycode (WXK_XXXX) + * is handled in the hotkey_name_descr s_Hotkey_Name_List list (see hotkeys_basic.cpp) + * and see this list for some ascii keys (space ...) + */ + +/* local variables */ +/* Hotkey list: */ +static Ki_HotkeyInfo HkResetLocalCoord( wxT( "Reset local coord." ), HK_RESET_LOCAL_COORD, ' ' ); +static Ki_HotkeyInfo HkZoomCenter( wxT( "Zoom Center" ), HK_ZOOM_CENTER, WXK_F4 ); +static Ki_HotkeyInfo HkZoomRedraw( wxT( "Zoom Redraw" ), HK_ZOOM_REDRAW, WXK_F3 ); +static Ki_HotkeyInfo HkZoomOut( wxT( "Zoom Out" ), HK_ZOOM_OUT, WXK_F2 ); +static Ki_HotkeyInfo HkZoomIn( wxT( "Zoom In" ), HK_ZOOM_IN, WXK_F1 ); +static Ki_HotkeyInfo HkHelp( wxT( "Help: this message" ), HK_HELP, '?' ); +static Ki_HotkeyInfo HkSwitchUnits( wxT( "Switch Units" ), HK_SWITCH_UNITS, 'U' ); +static Ki_HotkeyInfo HkTrackDisplayMode( wxT( + "Track Display Mode" ), + HK_SWITCH_TRACK_DISPLAY_MODE, 'F' ); + +static Ki_HotkeyInfo HkSwitch2NextCopperLayer( wxT( + "Switch to Next Layer" ), + HK_SWITCH_LAYER_TO_NEXT, '+' ); +static Ki_HotkeyInfo HkSwitch2PreviousCopperLayer( wxT( + "Switch to Previous Layer" ), + HK_SWITCH_LAYER_TO_PREVIOUS, '-' ); + +// List of common hotkey descriptors +Ki_HotkeyInfo* s_Gerbview_Hotkey_List[] = { + &HkHelp, + &HkZoomIn, &HkZoomOut, &HkZoomRedraw, &HkZoomCenter, + &HkSwitchUnits, &HkResetLocalCoord, + &HkTrackDisplayMode, + &HkSwitch2NextCopperLayer, + &HkSwitch2PreviousCopperLayer, + NULL +}; + + +// list of sections and corresponding hotkey list for pcbnew (used to create an hotkey config file) +struct Ki_HotkeyInfoSectionDescriptor s_Gerbview_Hokeys_Descr[] = +{ + { &g_CommonSectionTag, s_Gerbview_Hotkey_List, NULL }, + { NULL, NULL, NULL } +}; + + +/***********************************************************/ +void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey, + EDA_BaseStruct* DrawStruct ) +/***********************************************************/ + +/* Hot keys. Some commands are relatives to the item under the mouse cursor + * Commands are case insensitive + * @param DC = current device context + * @param hotkey = hothey code (ascii or wxWidget code for special keys) + * @param DrawStruct = NULL or pointer on a EDA_BaseStruct under the mouse cursor + */ + +{ + // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to handle...) + if( (hotkey & GR_KB_CTRL) != 0 ) + hotkey += 'A' - 1; + /* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */ + if( (hotkey >= 'a') && (hotkey <= 'z') ) + hotkey += 'A' - 'a'; + + int CommandCode = GetCommandCodeFromHotkey( hotkey, s_Gerbview_Hotkey_List ); + + switch( CommandCode ) + { + default: + case HK_NOT_FOUND: + return; + break; + + case HK_HELP: // Display Current hotkey list + DisplayHotkeyList( this, s_Gerbview_Hokeys_Descr ); + break; + + case HK_ZOOM_IN: + OnZoom( ID_ZOOM_PLUS_KEY ); + break; + + case HK_ZOOM_OUT: + OnZoom( ID_ZOOM_MOINS_KEY ); + break; + + case HK_ZOOM_REDRAW: + OnZoom( ID_ZOOM_REDRAW_KEY ); + break; + + case HK_ZOOM_CENTER: + OnZoom( ID_ZOOM_CENTER_KEY ); + break; + + + case HK_RESET_LOCAL_COORD: /*Reset the relative coord */ + GetScreen()->m_O_Curseur = GetScreen()->m_Curseur; + break; + + + case HK_SWITCH_UNITS: + g_UnitMetric = (g_UnitMetric == INCHES ) ? MILLIMETRE : INCHES; + break; + + case HK_SWITCH_TRACK_DISPLAY_MODE: + DisplayOpt.DisplayPcbTrackFill ^= 1; DisplayOpt.DisplayPcbTrackFill &= 1; + GetScreen()->SetRefreshReq(); + break; + + case HK_SWITCH_LAYER_TO_PREVIOUS: + if( GetScreen()->m_Active_Layer > 0 ) + GetScreen()->m_Active_Layer--; + break; + + case HK_SWITCH_LAYER_TO_NEXT: + if( GetScreen()->m_Active_Layer < 31 ) + GetScreen()->m_Active_Layer++; + break; + } +} diff --git a/gerbview/hotkeys.h b/gerbview/hotkeys.h index d6af0766fd..48e9598210 100644 --- a/gerbview/hotkeys.h +++ b/gerbview/hotkeys.h @@ -1,26 +1,26 @@ -/***************/ -/* hotkeys.h */ -/***************/ -#ifndef KOTKEYS_H -#define KOTKEYS_H - -#include "hotkeys_basic.h" - -enum hotkey_id_commnand { - HK_NOT_FOUND = 0, - HK_RESET_LOCAL_COORD, - HK_HELP, - HK_SWITCH_UNITS, - HK_SWITCH_TRACK_DISPLAY_MODE, - HK_ZOOM_IN, - HK_ZOOM_OUT, - HK_ZOOM_REDRAW, - HK_ZOOM_CENTER, - HK_SWITCH_LAYER_TO_NEXT, - HK_SWITCH_LAYER_TO_PREVIOUS -}; - -// List of hotkey descriptors for pcbnew -extern struct Ki_HotkeyInfoSectionDescriptor s_Gerbview_Hokeys_Descr[]; - -#endif // KOTKEYS_H +/***************/ +/* hotkeys.h */ +/***************/ +#ifndef KOTKEYS_H +#define KOTKEYS_H + +#include "hotkeys_basic.h" + +enum hotkey_id_commnand { + HK_NOT_FOUND = 0, + HK_RESET_LOCAL_COORD, + HK_HELP, + HK_SWITCH_UNITS, + HK_SWITCH_TRACK_DISPLAY_MODE, + HK_ZOOM_IN, + HK_ZOOM_OUT, + HK_ZOOM_REDRAW, + HK_ZOOM_CENTER, + HK_SWITCH_LAYER_TO_NEXT, + HK_SWITCH_LAYER_TO_PREVIOUS +}; + +// List of hotkey descriptors for pcbnew +extern struct Ki_HotkeyInfoSectionDescriptor s_Gerbview_Hokeys_Descr[]; + +#endif // KOTKEYS_H