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

Replace log debugging output with tracing. 

Replace all instances of wxLogDebug with wxLogTrace in the common and
kicad folders to prevent unwanted debugging output.

Add new trace flags for locale and screen object tracing.

The usual smattering of code policy fixes.
This commit is contained in:
Wayne Stambaugh 2018-10-17 15:03:33 -04:00
parent c22a247dbc
commit f584b30c73
7 changed files with 124 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/base_screen.cpp
View File

@ -3,8 +3,8 @@
* *
* Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr * Copyright (C) 2012 Jean-Pierre Charras, jean-pierre.charras@ujf-grenoble.fr
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2012 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2012 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -36,9 +36,12 @@
#include <base_screen.h> #include <base_screen.h>
#include <id.h> #include <id.h>
#include <base_units.h> #include <base_units.h>
#include <trace_helpers.h>
wxString BASE_SCREEN::m_PageLayoutDescrFileName; // the name of the page layout descr file. wxString BASE_SCREEN::m_PageLayoutDescrFileName; // the name of the page layout descr file.
BASE_SCREEN::BASE_SCREEN( KICAD_T aType ) : BASE_SCREEN::BASE_SCREEN( KICAD_T aType ) :
EDA_ITEM( aType ) EDA_ITEM( aType )
{ {
@ -122,7 +125,7 @@ bool BASE_SCREEN::SetZoom( double iu_per_du )
if( iu_per_du == m_Zoom ) if( iu_per_du == m_Zoom )
return false; return false;
//wxLogDebug( "Zoom:%.16g 1/Zoom:%.16g", iu_per_du, 1/iu_per_du ); wxLogTrace( traceScreen, "Zoom:%.16g 1/Zoom:%.16g", iu_per_du, 1/iu_per_du );
if( iu_per_du < GetMinAllowedZoom() ) if( iu_per_du < GetMinAllowedZoom() )
return false; return false;
@ -282,21 +285,20 @@ int BASE_SCREEN::SetGrid( int aCommandId )
} }
void BASE_SCREEN::AddGrid( const GRID_TYPE& grid ) void BASE_SCREEN::AddGrid( const GRID_TYPE& grid )
{ {
for( unsigned i = 0; i < m_grids.size(); i++ ) for( unsigned i = 0; i < m_grids.size(); i++ )
{ {
if( m_grids[i].m_Size == grid.m_Size && grid.m_CmdId != ID_POPUP_GRID_USER ) if( m_grids[i].m_Size == grid.m_Size && grid.m_CmdId != ID_POPUP_GRID_USER )
{ {
wxLogDebug( wxT( "Discarding duplicate grid size( %g, %g )." ), wxLogTrace( traceScreen, "Discarding duplicate grid size( %g, %g ).",
grid.m_Size.x, grid.m_Size.y ); grid.m_Size.x, grid.m_Size.y );
return; return;
} }
if( m_grids[i].m_CmdId == grid.m_CmdId ) if( m_grids[i].m_CmdId == grid.m_CmdId )
{ {
wxLogDebug( wxT( "Changing grid ID %d from size( %g, %g ) to " ) \ wxLogTrace( traceScreen, wxT( "Changing grid ID %d from size( %g, %g ) to " ) \
wxT( "size( %g, %g )." ), wxT( "size( %g, %g )." ),
grid.m_CmdId, m_grids[i].m_Size.x, grid.m_CmdId, m_grids[i].m_Size.x,
m_grids[i].m_Size.y, grid.m_Size.x, grid.m_Size.y ); m_grids[i].m_Size.y, grid.m_Size.x, grid.m_Size.y );
@ -380,7 +382,8 @@ wxPoint BASE_SCREEN::getNearestGridPosition( const wxPoint& aPosition,
} }
wxPoint BASE_SCREEN::getCursorPosition( bool aOnGrid, const wxPoint& aGridOrigin, wxRealPoint* aGridSize ) const wxPoint BASE_SCREEN::getCursorPosition( bool aOnGrid, const wxPoint& aGridOrigin,
wxRealPoint* aGridSize ) const
{ {
if( aOnGrid ) if( aOnGrid )
return getNearestGridPosition( m_crossHairPosition, aGridOrigin, aGridSize ); return getNearestGridPosition( m_crossHairPosition, aGridOrigin, aGridSize );
@ -401,7 +404,8 @@ wxPoint BASE_SCREEN::getCrossHairScreenPosition() const
} }
void BASE_SCREEN::setCrossHairPosition( const wxPoint& aPosition, const wxPoint& aGridOrigin, bool aSnapToGrid ) void BASE_SCREEN::setCrossHairPosition( const wxPoint& aPosition, const wxPoint& aGridOrigin,
bool aSnapToGrid )
{ {
if( aSnapToGrid ) if( aSnapToGrid )
m_crossHairPosition = getNearestGridPosition( aPosition, aGridOrigin, NULL ); m_crossHairPosition = getNearestGridPosition( aPosition, aGridOrigin, NULL );
@ -425,6 +429,7 @@ void BASE_SCREEN::PushCommandToUndoList( PICKED_ITEMS_LIST* aNewitem )
if( m_UndoRedoCountMax > 0 ) if( m_UndoRedoCountMax > 0 )
{ {
int extraitems = GetUndoCommandCount() - m_UndoRedoCountMax; int extraitems = GetUndoCommandCount() - m_UndoRedoCountMax;
if( extraitems > 0 ) if( extraitems > 0 )
ClearUndoORRedoList( m_UndoList, extraitems ); ClearUndoORRedoList( m_UndoList, extraitems );
} }
@ -439,6 +444,7 @@ void BASE_SCREEN::PushCommandToRedoList( PICKED_ITEMS_LIST* aNewitem )
if( m_UndoRedoCountMax > 0 ) if( m_UndoRedoCountMax > 0 )
{ {
int extraitems = GetRedoCommandCount() - m_UndoRedoCountMax; int extraitems = GetRedoCommandCount() - m_UndoRedoCountMax;
if( extraitems > 0 ) if( extraitems > 0 )
ClearUndoORRedoList( m_RedoList, extraitems ); ClearUndoORRedoList( m_RedoList, extraitems );
} }
@ -447,13 +453,13 @@ void BASE_SCREEN::PushCommandToRedoList( PICKED_ITEMS_LIST* aNewitem )
PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromUndoList( ) PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromUndoList( )
{ {
return m_UndoList.PopCommand( ); return m_UndoList.PopCommand();
} }
PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromRedoList( ) PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromRedoList( )
{ {
return m_RedoList.PopCommand( ); return m_RedoList.PopCommand();
} }

56
common/pgm_base.cpp
View File

@ -54,6 +54,7 @@
#include <dialog_configure_paths.h> #include <dialog_configure_paths.h>
#include <lockfile.h> #include <lockfile.h>
#include <systemdirsappend.h> #include <systemdirsappend.h>
#include <trace_helpers.h>
#include <gal/gal_display_options.h> #include <gal/gal_display_options.h>
#define KICAD_COMMON wxT( "kicad_common" ) #define KICAD_COMMON wxT( "kicad_common" )
@ -195,7 +196,7 @@ void PGM_BASE::SetEditorName( const wxString& aFileName )
{ {
m_editor_name = aFileName; m_editor_name = aFileName;
wxASSERT( m_common_settings ); wxASSERT( m_common_settings );
m_common_settings->Write( wxT( "Editor" ), aFileName ); m_common_settings->Write( "Editor", aFileName );
} }
@ -205,7 +206,7 @@ const wxString& PGM_BASE::GetEditorName( bool aCanShowFileChooser )
if( !editorname ) if( !editorname )
{ {
if( !wxGetEnv( wxT( "EDITOR" ), &editorname ) ) if( !wxGetEnv( "EDITOR", &editorname ) )
{ {
// If there is no EDITOR variable set, try the desktop default // If there is no EDITOR variable set, try the desktop default
#ifdef __WXMAC__ #ifdef __WXMAC__
@ -284,7 +285,7 @@ bool PGM_BASE::InitPgm()
// Init KiCad environment // Init KiCad environment
// the environment variable KICAD (if exists) gives the kicad path: // the environment variable KICAD (if exists) gives the kicad path:
// something like set KICAD=d:\kicad // something like set KICAD=d:\kicad
bool isDefined = wxGetEnv( wxT( "KICAD" ), &m_kicad_env ); bool isDefined = wxGetEnv( "KICAD", &m_kicad_env );
if( isDefined ) // ensure m_kicad_env ends by "/" if( isDefined ) // ensure m_kicad_env ends by "/"
{ {
@ -295,7 +296,7 @@ bool PGM_BASE::InitPgm()
} }
// Init parameters for configuration // Init parameters for configuration
App().SetVendorName( wxT( "KiCad" ) ); App().SetVendorName( "KiCad" );
App().SetAppName( pgm_name.GetName().Lower() ); App().SetAppName( pgm_name.GetName().Lower() );
// Install some image handlers, mainly for help // Install some image handlers, mainly for help
@ -348,8 +349,8 @@ bool PGM_BASE::InitPgm()
#endif #endif
#if !defined( __WXMAC__ ) #if !defined( __WXMAC__ )
baseSharePath.AppendDir( wxT( "share" ) ); baseSharePath.AppendDir( "share" );
baseSharePath.AppendDir( wxT( "kicad" ) ); baseSharePath.AppendDir( "kicad" );
#endif #endif
// KISYSMOD // KISYSMOD
@ -363,7 +364,7 @@ bool PGM_BASE::InitPgm()
else else
{ {
tmpFileName = baseSharePath; tmpFileName = baseSharePath;
tmpFileName.AppendDir( wxT( "modules" ) ); tmpFileName.AppendDir( "modules" );
envVarItem.SetDefinedExternally( false ); envVarItem.SetDefinedExternally( false );
} }
@ -380,7 +381,7 @@ bool PGM_BASE::InitPgm()
} }
else else
{ {
tmpFileName.AppendDir( wxT( "packages3d" ) ); tmpFileName.AppendDir( "packages3d" );
envVarItem.SetDefinedExternally( false ); envVarItem.SetDefinedExternally( false );
} }
@ -413,7 +414,8 @@ bool PGM_BASE::InitPgm()
// Only add path if exists and can be read by the user. // Only add path if exists and can be read by the user.
if( fn.DirExists() && fn.IsDirReadable() ) if( fn.DirExists() && fn.IsDirReadable() )
{ {
wxLogDebug( "Checking template path '%s' exists", fn.GetPath() ); wxLogTrace( tracePathsAndFiles, "Checking template path '%s' exists",
fn.GetPath() );
templatePaths.AddPaths( fn.GetPath() ); templatePaths.AddPaths( fn.GetPath() );
} }
} }
@ -466,7 +468,7 @@ bool PGM_BASE::InitPgm()
else else
{ {
tmpFileName = baseSharePath; tmpFileName = baseSharePath;
tmpFileName.AppendDir( wxT( "library" ) ); tmpFileName.AppendDir( "library" );
envVarItem.SetDefinedExternally( false ); envVarItem.SetDefinedExternally( false );
} }
@ -590,7 +592,7 @@ void PGM_BASE::loadCommonSettings()
} }
} }
m_editor_name = m_common_settings->Read( wxT( "Editor" ) ); m_editor_name = m_common_settings->Read( "Editor" );
wxString entry, oldPath; wxString entry, oldPath;
wxArrayString entries; wxArrayString entries;
@ -602,7 +604,7 @@ void PGM_BASE::loadCommonSettings()
while( m_common_settings->GetNextEntry( entry, index ) ) while( m_common_settings->GetNextEntry( entry, index ) )
{ {
wxLogTrace( traceEnvVars, wxLogTrace( traceEnvVars,
wxT( "Enumerating over entry %s, %ld." ), GetChars( entry ), index ); "Enumerating over entry %s, %ld.", GetChars( entry ), index );
entries.Add( entry ); entries.Add( entry );
} }
@ -642,12 +644,12 @@ void PGM_BASE::SaveCommonSettings()
if( it->second.GetDefinedExternally() ) if( it->second.GetDefinedExternally() )
continue; continue;
wxLogTrace( traceEnvVars, wxT( "Saving environment variable config entry %s as %s" ), wxLogTrace( traceEnvVars, "Saving environment variable config entry %s as %s",
GetChars( it->first ), GetChars( it->second.GetValue() ) ); GetChars( it->first ), GetChars( it->second.GetValue() ) );
m_common_settings->Write( it->first, it->second.GetValue() ); m_common_settings->Write( it->first, it->second.GetValue() );
} }
m_common_settings->SetPath( wxT( ".." ) ); m_common_settings->SetPath( ".." );
} }
} }
@ -677,14 +679,14 @@ bool PGM_BASE::SetLanguage( bool first_time )
} }
// dictionary file name without extend (full name is kicad.mo) // dictionary file name without extend (full name is kicad.mo)
wxString dictionaryName( wxT( "kicad" ) ); wxString dictionaryName( "kicad" );
delete m_locale; delete m_locale;
m_locale = new wxLocale; m_locale = new wxLocale;
if( !m_locale->Init( m_language_id ) ) if( !m_locale->Init( m_language_id ) )
{ {
wxLogDebug( wxT( "This language is not supported by the system." ) ); wxLogTrace( traceLocale, "This language is not supported by the system." );
setLanguageId( wxLANGUAGE_DEFAULT ); setLanguageId( wxLANGUAGE_DEFAULT );
delete m_locale; delete m_locale;
@ -695,7 +697,7 @@ bool PGM_BASE::SetLanguage( bool first_time )
} }
else if( !first_time ) else if( !first_time )
{ {
wxLogDebug( wxT( "Search for dictionary %s.mo in %s" ), wxLogTrace( traceLocale, "Search for dictionary %s.mo in %s",
GetChars( dictionaryName ), GetChars( m_locale->GetName() ) ); GetChars( dictionaryName ), GetChars( m_locale->GetName() ) );
} }
@ -746,7 +748,7 @@ bool PGM_BASE::SetLanguage( bool first_time )
void PGM_BASE::SetLanguageIdentifier( int menu_id ) void PGM_BASE::SetLanguageIdentifier( int menu_id )
{ {
wxLogDebug( wxT( "Select language ID %d from %d possible languages." ), wxLogTrace( traceLocale, "Select language ID %d from %d possible languages.",
menu_id, DIM( s_Languages ) ); menu_id, DIM( s_Languages ) );
for( unsigned ii = 0; ii < DIM( s_Languages ); ii++ ) for( unsigned ii = 0; ii < DIM( s_Languages ); ii++ )
@ -772,23 +774,23 @@ void PGM_BASE::SetLanguagePath()
wxFileName fn( guesses[i], wxEmptyString ); wxFileName fn( guesses[i], wxEmptyString );
// Append path for Windows and unix KiCad package install // Append path for Windows and unix KiCad package install
fn.AppendDir( wxT( "share" ) ); fn.AppendDir( "share" );
fn.AppendDir( wxT( "internat" ) ); fn.AppendDir( "internat" );
if( fn.IsDirReadable() ) if( fn.IsDirReadable() )
{ {
wxLogDebug( wxT( "Adding locale lookup path: " ) + fn.GetPath() ); wxLogTrace( traceLocale, "Adding locale lookup path: " + fn.GetPath() );
wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() ); wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
} }
// Append path for unix standard install // Append path for unix standard install
fn.RemoveLastDir(); fn.RemoveLastDir();
fn.AppendDir( wxT( "kicad" ) ); fn.AppendDir( "kicad" );
fn.AppendDir( wxT( "internat" ) ); fn.AppendDir( "internat" );
if( fn.IsDirReadable() ) if( fn.IsDirReadable() )
{ {
wxLogDebug( wxT( "Adding locale lookup path: " ) + fn.GetPath() ); wxLogTrace( traceLocale, "Adding locale lookup path: " + fn.GetPath() );
wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() ); wxLocale::AddCatalogLookupPathPrefix( fn.GetPath() );
} }
} }
@ -843,12 +845,12 @@ bool PGM_BASE::SetLocalEnvVariable( const wxString& aName, const wxString& aValu
// Check to see if the environment variable is already set. // Check to see if the environment variable is already set.
if( wxGetEnv( aName, &env ) ) if( wxGetEnv( aName, &env ) )
{ {
wxLogTrace( traceEnvVars, wxT( "Environment variable %s already set to %s." ), wxLogTrace( traceEnvVars, "Environment variable %s already set to %s.",
GetChars( aName ), GetChars( env ) ); GetChars( aName ), GetChars( env ) );
return env == aValue; return env == aValue;
} }
wxLogTrace( traceEnvVars, wxT( "Setting local environment variable %s to %s." ), wxLogTrace( traceEnvVars, "Setting local environment variable %s to %s.",
GetChars( aName ), GetChars( aValue ) ); GetChars( aName ), GetChars( aValue ) );
return wxSetEnv( aName, aValue ); return wxSetEnv( aName, aValue );
@ -869,7 +871,7 @@ void PGM_BASE::SetLocalEnvVariables( const ENV_VAR_MAP& aEnvVarMap )
// is run. // is run.
for( ENV_VAR_MAP_ITER it = m_local_env_vars.begin(); it != m_local_env_vars.end(); ++it ) for( ENV_VAR_MAP_ITER it = m_local_env_vars.begin(); it != m_local_env_vars.end(); ++it )
{ {
wxLogTrace( traceEnvVars, wxT( "Setting local environment variable %s to %s." ), wxLogTrace( traceEnvVars, "Setting local environment variable %s to %s.",
GetChars( it->first ), GetChars( it->second.GetValue() ) ); GetChars( it->first ), GetChars( it->second.GetValue() ) );
wxSetEnv( it->first, it->second.GetValue() ); wxSetEnv( it->first, it->second.GetValue() );
} }

8
common/search_stack.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2014 CERN * Copyright (C) 2014 CERN
* Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2014-2018 KiCad Developers, see CHANGELOG.TXT for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,9 +24,9 @@
#include <macros.h> #include <macros.h>
#include <search_stack.h> #include <search_stack.h>
#include <trace_helpers.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#if defined(__MINGW32__) #if defined(__MINGW32__)
#define PATH_SEPS wxT( ";\r\n" ) #define PATH_SEPS wxT( ";\r\n" )
#else #else
@ -200,11 +200,11 @@ const wxString SEARCH_STACK::LastVisitedPath( const wxString& aSubPathToSearch )
#if defined(DEBUG) #if defined(DEBUG)
void SEARCH_STACK::Show( const wxString& aPrefix ) const void SEARCH_STACK::Show( const wxString& aPrefix ) const
{ {
wxLogDebug( wxT( "%s SEARCH_STACK:" ), GetChars( aPrefix ) ); wxLogTrace( tracePathsAndFiles, "%s SEARCH_STACK:", aPrefix );
for( unsigned i=0; i<GetCount(); ++i ) for( unsigned i=0; i<GetCount(); ++i )
{ {
wxLogDebug( wxT( " [%2u]:%s" ), i, TO_UTF8( (*this)[i] ) ); wxLogTrace( tracePathsAndFiles, " [%2u]:%s", i, TO_UTF8( (*this)[i] ) );
} }
} }
#endif #endif

31
common/searchhelpfilefullpath.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2014-2015 CERN * Copyright (C) 2014-2015 CERN
* Copyright (C) 2014-2015 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2014-2018 KiCad Developers, see CHANGELOG.TXT for contributors.
* @author Maciej Suminski <maciej.suminski@cern.ch> * @author Maciej Suminski <maciej.suminski@cern.ch>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <config.h> // to define DEFAULT_INSTALL_PATH #include <config.h> // to define DEFAULT_INSTALL_PATH
#include <macros.h> #include <macros.h>
#include <trace_helpers.h>
/** /**
@ -50,7 +51,7 @@ wxString FindFileInSearchPaths( const SEARCH_STACK& aStack,
fn.AppendDir( (*aSubdirs)[j] ); fn.AppendDir( (*aSubdirs)[j] );
} }
wxLogDebug( wxT( " %s" ), GetChars( fn.GetFullPath() ) ); wxLogTrace( tracePathsAndFiles, " %s", fn.GetFullPath() );
if( fn.DirExists() ) if( fn.DirExists() )
{ {
@ -85,10 +86,10 @@ wxString SearchHelpFileFullPath( const SEARCH_STACK& aSStack, const wxString& aB
// and in Contents/SharedSupport/help inside the // and in Contents/SharedSupport/help inside the
// bundle. // bundle.
// Below we account for an international subdirectory. // Below we account for an international subdirectory.
subdirs.Add( wxT( "help" ) ); subdirs.Add( "help" );
altsubdirs.Add( wxT( "Contents" ) ); altsubdirs.Add( "Contents" );
altsubdirs.Add( wxT( "SharedSupport" ) ); altsubdirs.Add( "SharedSupport" );
altsubdirs.Add( wxT( "help" ) ); altsubdirs.Add( "help" );
#endif #endif
#if ! defined(__WXMAC__) // && defined(__linux__) #if ! defined(__WXMAC__) // && defined(__linux__)
@ -105,17 +106,17 @@ wxString SearchHelpFileFullPath( const SEARCH_STACK& aSStack, const wxString& aB
// installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux. // installed into "<CMAKE_INSTALL_PREFIX>/share/doc/kicad/help" for linux.
// This is ${KICAD_HELP} var in that CMakeLists.txt file. // This is ${KICAD_HELP} var in that CMakeLists.txt file.
// Below we account for an international subdirectory. // Below we account for an international subdirectory.
subdirs.Add( wxT( "share" ) ); subdirs.Add( "share" );
subdirs.Add( wxT( "doc" ) ); subdirs.Add( "doc" );
subdirs.Add( wxT( "kicad" ) ); subdirs.Add( "kicad" );
subdirs.Add( wxT( "help" ) ); subdirs.Add( "help" );
// Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are // Based on kicad-doc.bzr/CMakeLists.txt, line 35, the help files are
// installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows. // installed into "<CMAKE_INSTALL_PREFIX>/doc/help" for Windows.
// This is ${KICAD_HELP} var in that CMakeLists.txt file. // This is ${KICAD_HELP} var in that CMakeLists.txt file.
// Below we account for an international subdirectory. // Below we account for an international subdirectory.
altsubdirs.Add( wxT( "doc" ) ); altsubdirs.Add( "doc" );
altsubdirs.Add( wxT( "help" ) ); altsubdirs.Add( "help" );
#endif #endif
// If there's a KICAD environment variable set, always use that guy's path first. // If there's a KICAD environment variable set, always use that guy's path first.
@ -140,14 +141,14 @@ wxString SearchHelpFileFullPath( const SEARCH_STACK& aSStack, const wxString& aB
// wxLocale::GetName() does not return always the short name // wxLocale::GetName() does not return always the short name
locale_name_dirs.Add( i18n->GetName().BeforeLast( '_' ) ); // short canonical name like fr locale_name_dirs.Add( i18n->GetName().BeforeLast( '_' ) ); // short canonical name like fr
locale_name_dirs.Add( wxT( "en" ) ); // default (en) locale_name_dirs.Add( "en" ); // default (en)
#if defined(DEBUG) && 1 #if defined(DEBUG) && 1
ss.Show( wxString( __func__ ) ); ss.Show( wxString( __func__ ) );
wxLogDebug( wxT( "%s: m_help_file:'%s'" ), __func__, GetChars( aBaseName ) ); wxLogTrace( tracePathsAndFiles, "%s: m_help_file:'%s'", __func__, aBaseName );
#endif #endif
wxLogDebug( wxT( "Checking SEARCH_STACK for file %s" ), GetChars( aBaseName ) ); wxLogTrace( tracePathsAndFiles, "Checking SEARCH_STACK for file %s", aBaseName );
// Help files can be html (.html ext) or pdf (.pdf ext) files. // Help files can be html (.html ext) or pdf (.pdf ext) files.
// Therefore, <BaseName>.html file is searched and if not found, // Therefore, <BaseName>.html file is searched and if not found,

2
common/trace_helpers.cpp
View File

@ -46,6 +46,8 @@ const wxChar* const traceKicadPcbPlugin = wxT( "KICAD_PCB_PLUGIN" );
const wxChar* const tracePrinting = wxT( "KICAD_PRINT" ); const wxChar* const tracePrinting = wxT( "KICAD_PRINT" );
const wxChar* const traceAutoSave = wxT( "KICAD_AUTOSAVE" ); const wxChar* const traceAutoSave = wxT( "KICAD_AUTOSAVE" );
const wxChar* const tracePathsAndFiles = wxT( "KICAD_PATHS_AND_FILES" ); const wxChar* const tracePathsAndFiles = wxT( "KICAD_PATHS_AND_FILES" );
const wxChar* const traceLocale = wxT( "KICAD_LOCALE" );
const wxChar* const traceScreen = wxT( "KICAD_SCREEN" );
wxString dump( const wxArrayString& aArray ) wxString dump( const wxArrayString& aArray )

10
include/trace_helpers.h
View File

@ -99,6 +99,16 @@ extern const wxChar* const tracePrinting;
*/ */
extern const wxChar* const tracePathsAndFiles; extern const wxChar* const tracePathsAndFiles;
/**
* Flag to enable locale debug output.
*/
extern const wxChar* const traceLocale;
/**
* Flag to enable debug output of #BASE_SCREEN and it's derivatives.
*/
extern const wxChar* const traceScreen;
///@} ///@}
/** /**

91
kicad/tree_project_frame.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2012 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2017 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -38,6 +38,7 @@
#include <bitmaps.h> #include <bitmaps.h>
#include <gestfich.h> #include <gestfich.h>
#include <menus_helpers.h> #include <menus_helpers.h>
#include <trace_helpers.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include "treeproject_item.h" #include "treeproject_item.h"
@ -476,6 +477,7 @@ bool TREE_PROJECT_FRAME::AddItemToTreeProject( const wxString& aName,
wxString fullFileName = aName.BeforeLast( '.' ); wxString fullFileName = aName.BeforeLast( '.' );
wxString rootName; wxString rootName;
TREEPROJECT_ITEM* itemData = GetItemIdData( m_root ); TREEPROJECT_ITEM* itemData = GetItemIdData( m_root );
if( itemData ) if( itemData )
rootName = itemData->GetFileName().BeforeLast( '.' ); rootName = itemData->GetFileName().BeforeLast( '.' );
@ -691,48 +693,49 @@ void TREE_PROJECT_FRAME::OnRight( wxTreeEvent& Event )
switch( tree_id ) switch( tree_id )
{ {
case TREE_PROJECT: case TREE_PROJECT:
// Add a swith to an other project option only if the selected item // Add a swith to an other project option only if the selected item
// is not the root item (current project) // is not the root item (current project)
if( curr_item != m_TreeProject->GetRootItem() ) if( curr_item != m_TreeProject->GetRootItem() )
{ {
AddMenuItem( &popupMenu, ID_PROJECT_SWITCH_TO_OTHER, AddMenuItem( &popupMenu, ID_PROJECT_SWITCH_TO_OTHER,
_( "&Switch to this Project" ), _( "&Switch to this Project" ),
_( "Close all editors, and switch to the selected project" ), _( "Close all editors, and switch to the selected project" ),
KiBitmap( open_project_xpm ) ); KiBitmap( open_project_xpm ) );
popupMenu.AppendSeparator(); popupMenu.AppendSeparator();
} }
AddMenuItem( &popupMenu, ID_PROJECT_NEWDIR,
_( "New D&irectory..." ),
_( "Create a New Directory" ),
KiBitmap( directory_xpm ) );
break;
case TREE_DIRECTORY: AddMenuItem( &popupMenu, ID_PROJECT_NEWDIR,
AddMenuItem( &popupMenu, ID_PROJECT_NEWDIR, _( "New D&irectory..." ),
_( "New D&irectory..." ), _( "Create a New Directory" ),
_( "Create a New Directory" ), KiBitmap( directory_xpm ) );
KiBitmap( directory_xpm ) ); break;
AddMenuItem( &popupMenu, ID_PROJECT_DELETE,
_( "&Delete Directory" ),
_( "Delete the Directory and its content" ),
KiBitmap( delete_xpm ) );
break;
default: case TREE_DIRECTORY:
AddMenuItem( &popupMenu, ID_PROJECT_TXTEDIT, AddMenuItem( &popupMenu, ID_PROJECT_NEWDIR,
_( "&Edit in a Text Editor" ), _( "New D&irectory..." ),
_( "Open the file in a Text Editor" ), _( "Create a New Directory" ),
KiBitmap( editor_xpm ) ); KiBitmap( directory_xpm ) );
AddMenuItem( &popupMenu, ID_PROJECT_RENAME, AddMenuItem( &popupMenu, ID_PROJECT_DELETE,
_( "&Rename File..." ), _( "&Delete Directory" ),
_( "Rename file" ), _( "Delete the Directory and its content" ),
KiBitmap( right_xpm ) ); KiBitmap( delete_xpm ) );
AddMenuItem( &popupMenu, ID_PROJECT_DELETE, break;
_( "&Delete File" ),
_( "Delete the Directory and its content" ), default:
KiBitmap( delete_xpm ) ); AddMenuItem( &popupMenu, ID_PROJECT_TXTEDIT,
break; _( "&Edit in a Text Editor" ),
_( "Open the file in a Text Editor" ),
KiBitmap( editor_xpm ) );
AddMenuItem( &popupMenu, ID_PROJECT_RENAME,
_( "&Rename File..." ),
_( "Rename file" ),
KiBitmap( right_xpm ) );
AddMenuItem( &popupMenu, ID_PROJECT_DELETE,
_( "&Delete File" ),
_( "Delete the Directory and its content" ),
KiBitmap( delete_xpm ) );
break;
} }
PopupMenu( &popupMenu ); PopupMenu( &popupMenu );
@ -1083,7 +1086,7 @@ void TREE_PROJECT_FRAME::FileWatcherReset()
// we can see wxString under a debugger, not a wxFileName // we can see wxString under a debugger, not a wxFileName
const wxString& path = itemData->GetFileName(); const wxString& path = itemData->GetFileName();
wxLogDebug( "%s: add '%s'\n", __func__, TO_UTF8( path ) ); wxLogTrace( traceFilesAndPaths, "%s: add '%s'\n", __func__, TO_UTF8( path ) );
if( wxFileName::IsDirReadable( path ) ) // linux whines about watching protected dir if( wxFileName::IsDirReadable( path ) ) // linux whines about watching protected dir
{ {
@ -1103,10 +1106,10 @@ void TREE_PROJECT_FRAME::FileWatcherReset()
#if defined(DEBUG) && 1 #if defined(DEBUG) && 1
wxArrayString paths; wxArrayString paths;
m_watcher->GetWatchedPaths( &paths ); m_watcher->GetWatchedPaths( &paths );
wxLogDebug( "%s: watched paths:", __func__ ); wxLogTrace( tracePathsAndFiles, "%s: watched paths:", __func__ );
for( unsigned ii = 0; ii < paths.GetCount(); ii++ ) for( unsigned ii = 0; ii < paths.GetCount(); ii++ )
wxLogDebug( " %s\n", TO_UTF8( paths[ii] ) ); wxLogTrace( tracePathsAndFiles, " %s\n", TO_UTF8( paths[ii] ) );
#endif #endif
} }