Browse Source

Fix minor compil warnings

fusion360
jean-pierre charras 1 year ago
parent
commit
814e54af9b
  1. 2
      3d-viewer/3d_cache/sg/ifsg_api.cpp
  2. 8
      eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp
  3. 2
      eeschema/sim/sim_model_raw_spice.cpp
  4. 8
      pcbnew/dialogs/panel_fp_lib_table.cpp

2
3d-viewer/3d_cache/sg/ifsg_api.cpp

@ -476,7 +476,7 @@ SGVECTOR S3D::CalcTriNorm( const SGPOINT& p1, const SGPOINT& p2, const SGPOINT&
// normal
tri = glm::cross( pts[1] - pts[0], pts[2] - pts[0] );
glm::normalize( tri );
(void)glm::normalize( tri );
return SGVECTOR( tri.x, tri.y, tri.z );
}

8
eeschema/sch_io/cadstar/sch_io_cadstar_archive.cpp

@ -98,8 +98,8 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi
wxCHECK_MSG( libTable, nullptr, "Could not load symbol lib table." );
wxFileName fn = aSchematic->Prj().GetProjectFullName();
wxString libName = CADSTAR_SCH_ARCHIVE_LOADER::CreateLibName( fn, nullptr );
wxFileName prj_fn = aSchematic->Prj().GetProjectFullName();
wxString libName = CADSTAR_SCH_ARCHIVE_LOADER::CreateLibName( prj_fn, nullptr );
wxFileName libFileName( aSchematic->Prj().GetProjectPath(), libName,
FILEEXT::KiCadSymbolLibFileExtension );
@ -117,12 +117,12 @@ SCH_SHEET* SCH_IO_CADSTAR_ARCHIVE::LoadSchematicFile( const wxString& aFi
new SYMBOL_LIB_TABLE_ROW( libName, libTableUri, wxString( "KiCad" ) ) );
// Save project symbol library table.
wxFileName fn( aSchematic->Prj().GetProjectPath(),
wxFileName libtab_fn( aSchematic->Prj().GetProjectPath(),
SYMBOL_LIB_TABLE::GetSymbolLibTableFileName() );
// So output formatter goes out of scope and closes the file before reloading.
{
FILE_OUTPUTFORMATTER formatter( fn.GetFullPath() );
FILE_OUTPUTFORMATTER formatter( libtab_fn.GetFullPath() );
libTable->Format( &formatter, 0 );
}

2
eeschema/sim/sim_model_raw_spice.cpp

@ -147,7 +147,7 @@ void SIM_MODEL_RAW_SPICE::AssignSymbolPinNumberToModelPin( const std::string& aM
if( pinIndex > 0 )
{
while( m_modelPins.size() < pinIndex )
while( (int)m_modelPins.size() < pinIndex )
m_modelPins.push_back( { fmt::format( "{}", m_modelPins.size() + 1 ), wxEmptyString } );
m_modelPins[ --pinIndex /* convert to 0-based */ ].symbolPinNumber = aSymbolPinNumber;

8
pcbnew/dialogs/panel_fp_lib_table.cpp

@ -304,12 +304,12 @@ void PANEL_FP_LIB_TABLE::setupGrid( WX_GRID* aGrid )
{
PCBNEW_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<PCBNEW_SETTINGS>();
auto autoSizeCol = [&]( WX_GRID* aGrid, int aCol )
auto autoSizeCol = [&]( WX_GRID* aLocGrid, int aCol )
{
int prevWidth = aGrid->GetColSize( aCol );
int prevWidth = aLocGrid->GetColSize( aCol );
aGrid->AutoSizeColumn( aCol, false );
aGrid->SetColSize( aCol, std::max( prevWidth, aGrid->GetColSize( aCol ) ) );
aLocGrid->AutoSizeColumn( aCol, false );
aLocGrid->SetColSize( aCol, std::max( prevWidth, aLocGrid->GetColSize( aCol ) ) );
};
// Give a bit more room for wxChoice editors

Loading…
Cancel
Save