realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-13 17:53:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few more stagglers for floating point

Browse Source 
Update banned functions to better catch these

- page size
- erc/drc reports
- x/y position files
- color alpha
- footprint reports
- specctra
This commit is contained in:
Seth Hillbrand 2025-07-15 12:26:10 -07:00
parent 9cb3a37b6f
commit ab5aa661e9
9 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/CheckBannedFunctions.cmake
View File

@ -44,7 +44,7 @@ macro(check_banned_functions)
# Only error if the line does not end with //format:allow (allow spaces between // and format)
# we allow this for specific cases where the format specifier is needed because the
# string is shown to the user and needs to be formatted in their locale e.g. error messages
if(line MATCHES "%\\d*\\.?\\d*[fg]" AND NOT line MATCHES "format:allow")
if(line MATCHES "%[0-9]*\\.?[0-9]*[fg]" AND NOT line MATCHES "format:allow")
message(FATAL_ERROR "Banned format specifier '%f' or '%g' found in ${file}")
endif()
endforeach()

7
common/page_info.cpp
View File

@ -26,6 +26,7 @@
#include <macros.h>
#include <eda_units.h>
#include <richio.h> // for OUTPUTFORMATTER and IO_ERROR
#include <string_utils.h>
// late arriving wxPAPER_A0, wxPAPER_A1
@ -280,9 +281,9 @@ void PAGE_INFO::Format( OUTPUTFORMATTER* aFormatter ) const
// Internally, the page size is in mils
if( GetType() == PAGE_INFO::Custom )
{
aFormatter->Print( " %g %g",
GetWidthMils() * 25.4 / 1000.0,
GetHeightMils() * 25.4 / 1000.0 );
aFormatter->Print( " %s %s",
FormatDouble2Str( GetWidthMils() * 25.4 / 1000.0 ).c_str(),
FormatDouble2Str( GetHeightMils() * 25.4 / 1000.0 ).c_str() );
}
if( !IsCustom() && IsPortrait() )

8
eeschema/erc/erc_report.cpp
View File

@ -20,6 +20,7 @@
#include <wx/ffile.h>
#include <wx/string.h>
#include <locale_io.h>
#include <sch_screen.h>
#include <sch_marker.h>
#include <schematic.h>
@ -43,6 +44,9 @@ ERC_REPORT::ERC_REPORT( SCHEMATIC* aSchematic, EDA_UNITS aReportUnits ) :
wxString ERC_REPORT::GetTextReport()
{
// We need the global LOCALE_IO here in order to
// write the report in the c-locale.
LOCALE_IO locale;
UNITS_PROVIDER unitsProvider( schIUScale, m_reportUnits );
wxString msg = wxString::Format( _( "ERC report (%s, Encoding UTF8)\n" ),
@ -119,6 +123,10 @@ bool ERC_REPORT::WriteTextReport( const wxString& aFullFileName )
bool ERC_REPORT::WriteJsonReport( const wxString& aFullFileName )
{
// We need the global LOCALE_IO here in order to
// write the report in the c-locale.
LOCALE_IO locale;
std::ofstream jsonFileStream( aFullFileName.fn_str() );
UNITS_PROVIDER unitsProvider( pcbIUScale, m_reportUnits );

4
eeschema/erc/erc_report.h
View File

@ -33,7 +33,7 @@ public:
ERC_REPORT( SCHEMATIC* aSchematic, EDA_UNITS aReportUnits );
/**
* Returns the ERC report in "text" (human readable) format
* Returns the ERC report in "text" (human readable) format in the C-locale.
*
* @return The complete report
*/
@ -47,7 +47,7 @@ public:
bool WriteTextReport( const wxString& aFullFileName );
/**
* Writes a JSON formatted ERC Report to the given file path
* Writes a JSON formatted ERC Report to the given file path in the c-locale
*
* @return True if the file write completed successfully, false otherwise
*/

4
eeschema/sch_io/kicad_sexpr/sch_io_kicad_sexpr.cpp
View File

@ -989,11 +989,11 @@ void SCH_IO_KICAD_SEXPR::saveSheet( SCH_SHEET* aSheet, const SCH_SHEET_LIST& aSh
stroke.SetWidth( aSheet->GetBorderWidth() );
stroke.Format( m_out, schIUScale );
m_out->Print( "(fill (color %d %d %d %0.4f))",
m_out->Print( "(fill (color %d %d %d %s))",
KiROUND( aSheet->GetBackgroundColor().r * 255.0 ),
KiROUND( aSheet->GetBackgroundColor().g * 255.0 ),
KiROUND( aSheet->GetBackgroundColor().b * 255.0 ),
aSheet->GetBackgroundColor().a );
FormatDouble2Str( aSheet->GetBackgroundColor().a ).c_str() );
KICAD_FORMAT::FormatUuid( m_out, aSheet->m_Uuid );

2
pcbnew/board_stackup_manager/board_stackup.cpp
View File

@ -793,7 +793,7 @@ void BOARD_STACKUP::FormatBoardStackup( OUTPUTFORMATTER* aFormatter, const BOARD
}
if( item->HasEpsilonRValue() && item->HasMaterialValue( idx ) )
aFormatter->Print( "(epsilon_r %g)", item->GetEpsilonR( idx ) );
aFormatter->Print( "(epsilon_r %s)", FormatDouble2Str( item->GetEpsilonR( idx ) ).c_str() );
if( item->HasLossTangentValue() && item->HasMaterialValue( idx ) )
{

11
pcbnew/drc/drc_report.cpp
View File

@ -24,11 +24,12 @@
#include <build_version.h>
#include "drc_report.h"
#include <drc/drc_item.h>
#include <fstream>
#include <locale_io.h>
#include <macros.h>
#include <json_common.h>
#include <rc_json_schema.h>
#include <fstream>
DRC_REPORT::DRC_REPORT( BOARD* aBoard, EDA_UNITS aReportUnits,
std::shared_ptr<RC_ITEMS_PROVIDER> aMarkersProvider,
@ -46,7 +47,10 @@ DRC_REPORT::DRC_REPORT( BOARD* aBoard, EDA_UNITS aReportUnits,
bool DRC_REPORT::WriteTextReport( const wxString& aFullFileName )
{
FILE* fp = wxFopen( aFullFileName, wxT( "w" ) );
// We need the global LOCALE_IO here in order to
// write the report in the c-locale.
LOCALE_IO locale;
FILE* fp = wxFopen( aFullFileName, wxT( "w" ) );
if( fp == nullptr )
return false;
@ -113,6 +117,9 @@ bool DRC_REPORT::WriteTextReport( const wxString& aFullFileName )
bool DRC_REPORT::WriteJsonReport( const wxString& aFullFileName )
{
// We need the global LOCALE_IO here in order to
// write the report in the c-locale.
LOCALE_IO locale;
std::ofstream jsonFileStream( aFullFileName.fn_str() );
UNITS_PROVIDER unitsProvider( pcbIUScale, m_reportUnits );

53
pcbnew/exporters/place_file_exporter.cpp
View File

@ -34,6 +34,8 @@
#include <exporters/place_file_exporter.h>
#include <pad.h>
#include <fmt/format.h>
#include <wx/dirdlg.h>
class LIST_MOD // An helper class used to build a list of useful footprints.
@ -298,15 +300,11 @@ std::string PLACE_FILE_EXPORTER::GenReportData()
LOCALE_IO toggle;
// Generate header file comments.)
char line[1024];
snprintf( line, sizeof(line), "## Footprint report - date %s\n",
TO_UTF8( GetISO8601CurrentDateTime() ) );
buffer += line;
buffer += fmt::format( "## Footprint report - date {}\n", TO_UTF8( GetISO8601CurrentDateTime() ) );
wxString Title = GetBuildVersion();
snprintf( line, sizeof(line), "## Created by KiCad version %s\n",
TO_UTF8( Title ) );
buffer += line;
buffer += fmt::format( "## Printed by KiCad version {}\n", TO_UTF8( Title ) );
buffer += unit_text;
@ -316,15 +314,9 @@ std::string PLACE_FILE_EXPORTER::GenReportData()
buffer += "\n$BOARD\n";
snprintf( line, sizeof(line), "upper_left_corner %9.6f %9.6f\n",
buffer += fmt::format( "upper_left_corner {:9.6f} {:9.6f}\n",
bbbox.GetX() * conv_unit,
bbbox.GetY() * conv_unit );
buffer += line;
snprintf( line, sizeof(line), "lower_right_corner %9.6f %9.6f\n",
bbbox.GetRight() * conv_unit,
bbbox.GetBottom() * conv_unit );
buffer += line;
buffer += "$EndBOARD\n\n";
@ -344,13 +336,11 @@ std::string PLACE_FILE_EXPORTER::GenReportData()
wxString ref = footprint->Reference().GetShownText( false );
wxString value = footprint->Value().GetShownText( false );
snprintf( line, sizeof(line), "$MODULE %s\n", TO_UTF8( ref ) );
buffer += line;
buffer += fmt::format( "$MODULE {}\n", TO_UTF8( ref ) );
snprintf( line, sizeof(line), "reference %s\n", TO_UTF8( ref ) );
snprintf( line, sizeof(line), "value %s\n", TO_UTF8( value ) );
snprintf( line, sizeof(line), "footprint %s\n", footprint->GetFPID().Format().c_str() );
buffer += line;
buffer += fmt::format( "reference {}\n", TO_UTF8( ref ) );
buffer += fmt::format( "value {}\n", TO_UTF8( value ) );
buffer += fmt::format( "footprint {}\n", footprint->GetFPID().Format().c_str() );
buffer += "attribut";
@ -368,11 +358,10 @@ std::string PLACE_FILE_EXPORTER::GenReportData()
VECTOR2I footprint_pos = footprint->GetPosition();
footprint_pos -= m_place_Offset;
snprintf( line, sizeof(line), "position %9.6f %9.6f orientation %.2f\n",
buffer += fmt::format( "position {:9.6f} {:9.6f} orientation {:.2f}\n",
footprint_pos.x * conv_unit,
footprint_pos.y * conv_unit,
footprint->GetOrientation().AsDegrees() );
buffer += line;
if( footprint->GetLayer() == F_Cu )
buffer += "layer front\n";
@ -394,8 +383,7 @@ std::string PLACE_FILE_EXPORTER::GenReportData()
for( PAD* pad : sortedPads )
{
snprintf( line, sizeof(line), "$PAD \"%s\"\n", TO_UTF8( pad->GetNumber() ) );
buffer += line;
buffer += fmt::format( "$PAD \"{}\"\n", TO_UTF8( pad->GetNumber() ) );
int layer = 0;
@ -407,34 +395,29 @@ std::string PLACE_FILE_EXPORTER::GenReportData()
// TODO(JE) padstacks
static const char* layer_name[4] = { "nocopper", "back", "front", "both" };
snprintf( line, sizeof(line), "Shape %s Layer %s\n",
buffer += fmt::format( "Shape {} Layer {}\n",
TO_UTF8( pad->ShowPadShape( PADSTACK::ALL_LAYERS ) ),
layer_name[layer] );
buffer += line;
VECTOR2I padPos = pad->GetFPRelativePosition();
snprintf( line, sizeof(line), "position %9.6f %9.6f size %9.6f %9.6f orientation %.2f\n",
buffer += fmt::format( "position {:9.6f} {:9.6f} size {:9.6f} {:9.6f} orientation {:.2f}\n",
padPos.x * conv_unit,
padPos.y * conv_unit,
pad->GetSize( PADSTACK::ALL_LAYERS ).x * conv_unit,
pad->GetSize( PADSTACK::ALL_LAYERS ).y * conv_unit,
( pad->GetOrientation() - footprint->GetOrientation() ).AsDegrees() );
buffer += line;
pad->GetOrientation().AsDegrees() );
snprintf( line, sizeof(line), "drill %9.6f\n", pad->GetDrillSize().x * conv_unit );
buffer += line;
buffer += fmt::format( "drill {:9.6f}\n", pad->GetDrillSize().x * conv_unit );
snprintf( line, sizeof(line), "shape_offset %9.6f %9.6f\n",
buffer += fmt::format( "shape_offset {:9.6f} {:9.6f}\n",
pad->GetOffset( PADSTACK::ALL_LAYERS ).x * conv_unit,
pad->GetOffset( PADSTACK::ALL_LAYERS ).y * conv_unit );
buffer += line;
buffer += "$EndPAD\n";
}
snprintf( line, sizeof(line), "$EndMODULE %s\n\n", TO_UTF8( ref ) );
buffer += line;
buffer += fmt::format( "$EndMODULE {}\n\n", TO_UTF8( ref ) );
}
// Generate EOF.

5
pcbnew/specctra_import_export/specctra.cpp
View File

@ -55,6 +55,7 @@
#include <board.h>
#include <pcb_track.h>
#include <string_utils.h>
#include "specctra.h"
#include <macros.h>
@ -3949,9 +3950,9 @@ void PLACE::Format( OUTPUTFORMATTER* out, int nestLevel )
if( m_hasVertex )
{
out->Print( 0, " %.6f %.6f", m_vertex.x, m_vertex.y );
out->Print( 0, " %s %s", FormatDouble2Str( m_vertex.x ).c_str(), FormatDouble2Str( m_vertex.y ).c_str() );
out->Print( 0, " %s", GetTokenText( m_side ) );
out->Print( 0, " %.6f", m_rotation );
out->Print( 0, " %s", FormatDouble2Str( m_rotation ).c_str() );
}
const char* space = " "; // one space, as c string.