electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unnecessary newlines in STEP exporter logging.

Browse Source
This commit is contained in:
Alex Shvartzkop
2025-08-20 14:54:27 +03:00
parent eecf0cd685
commit 4cfa2e3a38
1 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pcbnew/exporters/step/step_pcb_model.cpp
+59 -59
View File
@@ -644,7 +644,7 @@ static bool fuseShapes( auto& aInputShapes, TopoDS_Shape& aOutShape, REPORTER* a
if( mkFuse.HasErrors() || mkFuse.HasWarnings() )
{
aReporter->Report( _( "** Got problems while fusing shapes **\n" ), RPT_SEVERITY_ERROR );
aReporter->Report( _( "** Got problems while fusing shapes **" ), RPT_SEVERITY_ERROR );
if( mkFuse.HasErrors() )
{
@@ -679,7 +679,7 @@ static bool fuseShapes( auto& aInputShapes, TopoDS_Shape& aOutShape, REPORTER* a
if( unifiedShapes.IsNull() )
{
aReporter->Report( _( "** ShapeUpgrade_UnifySameDomain produced a null shape **\n" ),
aReporter->Report( _( "** ShapeUpgrade_UnifySameDomain produced a null shape **" ),
RPT_SEVERITY_ERROR );
}
else
@@ -940,7 +940,7 @@ bool STEP_PCB_MODEL::AddPadShape( const PAD* aPad, const VECTOR2D& aOrigin, bool
}
if( !success ) // Error
m_reporter->Report( _( "OCC error adding pad/via polygon.\n" ), RPT_SEVERITY_ERROR );
m_reporter->Report( _( "OCC error adding pad/via polygon." ), RPT_SEVERITY_ERROR );
if( !padShapes.empty() )
{
@@ -1185,7 +1185,7 @@ bool STEP_PCB_MODEL::AddPolygonShapes( const SHAPE_POLY_SET* aPolyShapes, PCB_LA
if( !MakeShapes( targetVec, *aPolyShapes, m_simplifyShapes, thickness, z_pos, aOrigin ) )
{
m_reporter->Report( wxString::Format( _( "Could not add shape (%d points) to copper layer %s.\n" ),
m_reporter->Report( wxString::Format( _( "Could not add shape (%d points) to copper layer %s." ),
aPolyShapes->FullPointCount(),
LayerName( aLayer ) ),
RPT_SEVERITY_ERROR );
@@ -1203,13 +1203,13 @@ bool STEP_PCB_MODEL::AddComponent( const std::string& aFileNameUTF8, const std::
{
if( aFileNameUTF8.empty() )
{
m_reporter->Report( wxString::Format( _( "No model defined for %s.\n" ), aRefDes ),
m_reporter->Report( wxString::Format( _( "No model defined for %s." ), aRefDes ),
RPT_SEVERITY_WARNING );
return false;
}
wxString fileName( wxString::FromUTF8( aFileNameUTF8.c_str() ) );
m_reporter->Report( wxString::Format( wxT( "Adding component %s.\n" ), aRefDes ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxString::Format( wxT( "Adding component %s." ), aRefDes ), RPT_SEVERITY_DEBUG );
// first retrieve a label
TDF_Label lmodel;
@@ -1218,7 +1218,7 @@ bool STEP_PCB_MODEL::AddComponent( const std::string& aFileNameUTF8, const std::
if( !getModelLabel( aFileNameUTF8, aScale, lmodel, aSubstituteModels, &errorMessage ) )
{
if( errorMessage.IsEmpty() )
errorMessage.Printf( _( "No model for filename '%s'.\n" ), fileName );
errorMessage.Printf( _( "No model for filename '%s'." ), fileName );
m_reporter->Report( errorMessage, RPT_SEVERITY_ERROR );
return false;
@@ -1229,7 +1229,7 @@ bool STEP_PCB_MODEL::AddComponent( const std::string& aFileNameUTF8, const std::
if( !getModelLocation( aBottom, aPosition, aRotation, aOffset, aOrientation, toploc ) )
{
m_reporter->Report( wxString::Format( _( "No location data for filename '%s'.\n" ), fileName ),
m_reporter->Report( wxString::Format( _( "No location data for filename '%s'." ), fileName ),
RPT_SEVERITY_ERROR );
return false;
}
@@ -1239,7 +1239,7 @@ bool STEP_PCB_MODEL::AddComponent( const std::string& aFileNameUTF8, const std::
if( llabel.IsNull() )
{
m_reporter->Report( wxString::Format( _( "Could not add component with filename '%s'.\n" ), fileName ),
m_reporter->Report( wxString::Format( _( "Could not add component with filename '%s'." ), fileName ),
RPT_SEVERITY_ERROR );
return false;
}
@@ -1409,7 +1409,7 @@ bool STEP_PCB_MODEL::MakeShapeAsThickSegment( TopoDS_Shape& aShape,
}
catch( const Standard_Failure& e )
{
m_reporter->Report( wxString::Format( _( "OCC exception building shape segment: %s\n" ),
m_reporter->Report( wxString::Format( _( "OCC exception building shape segment: %s" ),
e.GetMessageString() ),
RPT_SEVERITY_ERROR );
return false;
@@ -1424,7 +1424,7 @@ bool STEP_PCB_MODEL::MakeShapeAsThickSegment( TopoDS_Shape& aShape,
}
catch( const Standard_Failure& e )
{
m_reporter->Report( wxString::Format( _( "OCC exception building face: %s\n" ),
m_reporter->Report( wxString::Format( _( "OCC exception building face: %s" ),
e.GetMessageString() ),
RPT_SEVERITY_ERROR );
return false;
@@ -1436,7 +1436,7 @@ bool STEP_PCB_MODEL::MakeShapeAsThickSegment( TopoDS_Shape& aShape,
if( aShape.IsNull() )
{
m_reporter->Report( _( "Failed to create a prismatic shape\n" ),
m_reporter->Report( _( "Failed to create a prismatic shape" ),
RPT_SEVERITY_ERROR );
return false;
}
@@ -1508,7 +1508,7 @@ static bool makeWireFromChain( BRepLib_MakeWire& aMkWire, const SHAPE_LINE_CHAIN
if( !mkEdge.IsDone() || mkEdge.Edge().IsNull() )
{
aReporter->Report( wxString::Format( _( "Failed to make segment edge (%d %d) -> (%d %d), "
"skipping\n" ),
"skipping" ),
aPt0.x, aPt0.y,
aPt1.x, aPt1.y ),
RPT_SEVERITY_ERROR );
@@ -1519,7 +1519,7 @@ static bool makeWireFromChain( BRepLib_MakeWire& aMkWire, const SHAPE_LINE_CHAIN
if( aMkWire.Error() != BRepLib_WireDone )
{
aReporter->Report( wxString::Format( _( "Failed to add segment edge (%d %d) -> (%d %d)\n" ),
aReporter->Report( wxString::Format( _( "Failed to add segment edge (%d %d) -> (%d %d)" ),
aPt0.x, aPt0.y,
aPt1.x, aPt1.y ),
RPT_SEVERITY_ERROR );
@@ -1556,7 +1556,7 @@ static bool makeWireFromChain( BRepLib_MakeWire& aMkWire, const SHAPE_LINE_CHAIN
if( !aMkWire.IsDone() )
{
aReporter->Report( wxString::Format( _( "Failed to add arc curve from (%d %d), arc p0 "
"(%d %d), mid (%d %d), p1 (%d %d)\n" ),
"(%d %d), mid (%d %d), p1 (%d %d)" ),
aPt0.x, aPt0.y,
aArc.GetP0().x, aArc.GetP0().y,
aArc.GetArcMid().x, aArc.GetArcMid().y,
@@ -1631,7 +1631,7 @@ static bool makeWireFromChain( BRepLib_MakeWire& aMkWire, const SHAPE_LINE_CHAIN
if( lastPt != firstPt && !addSegment( lastPt, firstPt ) )
{
aReporter->Report( wxString::Format( _( "Failed to close wire at %d, %d -> %d, %d **\n" ),
aReporter->Report( wxString::Format( _( "Failed to close wire at %d, %d -> %d, %d **" ),
lastPt.x, lastPt.y,
firstPt.x, firstPt.y ),
RPT_SEVERITY_ERROR );
@@ -1641,7 +1641,7 @@ static bool makeWireFromChain( BRepLib_MakeWire& aMkWire, const SHAPE_LINE_CHAIN
}
catch( const Standard_Failure& e )
{
aReporter->Report( wxString::Format( _( "OCC exception creating wire: %s\n" ),
aReporter->Report( wxString::Format( _( "OCC exception creating wire: %s" ),
e.GetMessageString() ),
RPT_SEVERITY_ERROR );
return false;
@@ -1682,7 +1682,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
/*if( approximated.IsSelfIntersecting() )
{
m_reporter->Report( wxString::Format( _( "Approximated polygon self-intersection check failed\n"
"z: %g; bounding box: %s\n" ) ),
"z: %g; bounding box: %s" ) ),
aZposition,
formatBBox( workingPoly.BBox() ) ),
RPT_SEVERITY_ERROR );
@@ -1724,7 +1724,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
else
{
m_reporter->Report( wxString::Format( _( "Wire not done (contour points %d): OCC error %d\n"
"z: %g; bounding box: %s\n" ),
"z: %g; bounding box: %s" ),
static_cast<int>( aContour.PointCount() ),
static_cast<int>( mkWire.Error() ),
formatBBox( aContour.BBox() ) ),
@@ -1738,7 +1738,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
if( !check.IsValid() )
{
m_reporter->Report( wxString::Format( _( "Wire self-interference check failed\n"
"z: %g; bounding box: %s\n" ),
"z: %g; bounding box: %s" ),
aZposition,
formatBBox( aContour.BBox() ) ),
RPT_SEVERITY_ERROR );
@@ -1759,7 +1759,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
if( aConvertToArcs && wire.IsNull() )
{
m_reporter->Report( wxString::Format( _( "Using non-simplified polygon.\n" ) ),
m_reporter->Report( wxString::Format( _( "Using non-simplified polygon." ) ),
RPT_SEVERITY_DEBUG );
// Fall back to original shape
@@ -1778,7 +1778,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
else
{
m_reporter->Report( wxString::Format( wxT( "** Outline skipped **\n"
"z: %g; bounding box: %s\n" ),
"z: %g; bounding box: %s" ),
aZposition,
formatBBox( polygon[contId].BBox() ) ),
RPT_SEVERITY_DEBUG );
@@ -1797,7 +1797,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
else
{
m_reporter->Report( wxString::Format( wxT( "** Hole skipped **\n"
"z: %g; bounding box: %s\n" ),
"z: %g; bounding box: %s" ),
aZposition,
formatBBox( polygon[contId].BBox() ) ),
RPT_SEVERITY_DEBUG );
@@ -1806,7 +1806,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
}
catch( const Standard_Failure& e )
{
m_reporter->Report( wxString::Format( _( "OCC exception creating contour %d: %s\n" ),
m_reporter->Report( wxString::Format( _( "OCC exception creating contour %d: %s" ),
static_cast<int>( contId ),
e.GetMessageString() ),
RPT_SEVERITY_ERROR );
@@ -1825,7 +1825,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
if( prism.IsNull() )
{
m_reporter->Report( _( "Failed to create a prismatic shape\n" ), RPT_SEVERITY_ERROR );
m_reporter->Report( _( "Failed to create a prismatic shape" ), RPT_SEVERITY_ERROR );
return false;
}
}
@@ -1836,7 +1836,7 @@ bool STEP_PCB_MODEL::MakeShapes( std::vector<TopoDS_Shape>& aShapes, const SHAPE
}
else
{
m_reporter->Report( _( "** Face skipped **\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( _( "** Face skipped **" ), RPT_SEVERITY_DEBUG );
}
}
@@ -1907,7 +1907,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
m_hasPCB = true; // whether or not operations fail we note that CreatePCB has been invoked
// Support for more than one main outline (more than one board)
m_reporter->Report( wxString::Format( wxT( "Build board outlines (%d outlines) with %d points.\n" ),
m_reporter->Report( wxString::Format( wxT( "Build board outlines (%d outlines) with %d points." ),
aOutline.OutlineCount(),
aOutline.FullPointCount() ),
RPT_SEVERITY_DEBUG );
@@ -1926,7 +1926,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
if( !MakeShapes( m_board_outlines, aOutline, false, boardThickness, boardZPos, aOrigin ) )
{
// Error
m_reporter->Report( _( "OCC error creating main outline.\n" ), RPT_SEVERITY_ERROR );
m_reporter->Report( _( "OCC error creating main outline." ), RPT_SEVERITY_ERROR );
}
#else
// Workaround for bug #17446 Holes are missing from STEP export with circular PCB outline
@@ -1943,7 +1943,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
if( !MakeShapes( m_board_outlines, polyset, false, boardThickness, boardZPos,
aOrigin ) )
{
m_reporter->Report( _( "OCC error creating main outline.\n" ),
m_reporter->Report( _( "OCC error creating main outline." ),
RPT_SEVERITY_ERROR );
}
}
@@ -1952,7 +1952,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
if( !MakeShapes( m_boardCutouts, polyset, false, boardThickness, boardZPos,
aOrigin ) )
{
m_reporter->Report( _( "OCC error creating hole in main outline.\n" ),
m_reporter->Report( _( "OCC error creating hole in main outline." ),
RPT_SEVERITY_ERROR );
}
}
@@ -1967,7 +1967,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
BRepBndLib::Add( brdShape, brdBndBox );
// subtract cutouts (if any)
m_reporter->Report( wxString::Format( wxT( "Build board cutouts and holes (%d hole(s)).\n" ),
m_reporter->Report( wxString::Format( wxT( "Build board cutouts and holes (%d hole(s))." ),
(int) ( m_boardCutouts.size() + m_copperCutouts.size() ) ),
RPT_SEVERITY_DEBUG );
@@ -1994,7 +1994,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
[&tp, this]( const wxString& aWhat, std::map<wxString, std::vector<TopoDS_Shape>>& aShapesMap,
std::vector<TopoDS_Shape>& aHolesList, Bnd_BoundSortBox& aBSBHoles )
{
m_reporter->Report( wxString::Format( _( "Subtracting holes for %s\n" ), aWhat ),
m_reporter->Report( wxString::Format( _( "Subtracting holes for %s" ), aWhat ),
RPT_SEVERITY_DEBUG );
for( auto& [netname, vec] : aShapesMap )
@@ -2039,7 +2039,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
if( cut.HasErrors() || cut.HasWarnings() )
{
m_reporter->Report( wxString::Format( _( "** Got problems while cutting "
"%s net '%s' **\n" ),
"%s net '%s' **" ),
aWhat,
UnescapeString( netname ) ),
RPT_SEVERITY_ERROR );
@@ -2123,7 +2123,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
for( const auto& [netname, shapes] : m_board_copper_vias )
addShapes( netname, shapes );
m_reporter->Report( wxT( "Fusing shapes\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "Fusing shapes" ), RPT_SEVERITY_DEBUG );
// Do fusing in parallel
std::mutex mutex;
@@ -2154,7 +2154,7 @@ bool STEP_PCB_MODEL::CreatePCB( SHAPE_POLY_SET& aOutline, VECTOR2D aOrigin, bool
}
// push the board to the data structure
m_reporter->Report( wxT( "Generate board full shape.\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "Generate board full shape." ), RPT_SEVERITY_DEBUG );
// AddComponent adds a label that has a reference (not a parent/child relation) to the real
// label. We need to extract that real label to name it for the STEP output cleanly
@@ -2331,7 +2331,7 @@ bool STEP_PCB_MODEL::WriteIGES( const wxString& aFileName )
{
if( !isBoardOutlineValid() )
{
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'." ),
aFileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2363,7 +2363,7 @@ bool STEP_PCB_MODEL::WriteSTEP( const wxString& aFileName, bool aOptimize )
{
if( !isBoardOutlineValid() )
{
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'." ),
aFileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2433,7 +2433,7 @@ bool STEP_PCB_MODEL::WriteSTEP( const wxString& aFileName, bool aOptimize )
if( !wxRenameFile( tmpfname, fn.GetFullName(), true ) )
{
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'." ),
tmpfname,
fn.GetFullName() ),
RPT_SEVERITY_ERROR );
@@ -2451,7 +2451,7 @@ bool STEP_PCB_MODEL::WriteBREP( const wxString& aFileName )
{
if( !isBoardOutlineValid() )
{
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'." ),
aFileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2614,8 +2614,8 @@ bool STEP_PCB_MODEL::WriteXAO( const wxString& aFileName )
int groupNumber = 1;
m_reporter->Report( wxT( "Pad definitions:\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "Number\tName\tArea (m^2)\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "Pad definitions:" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "Number\tName\tArea (m^2)" ), RPT_SEVERITY_DEBUG );
for( int dim = 0; dim <= 3; dim++ )
{
@@ -2645,7 +2645,7 @@ bool STEP_PCB_MODEL::WriteXAO( const wxString& aFileName )
file << " </group>" << std::endl;
m_reporter->Report( wxString::Format( "%d\t%s\t%g\n",
m_reporter->Report( wxString::Format( "%d\t%s\t%g",
groupNumber,
name,
groupAreas[name] ),
@@ -2655,7 +2655,7 @@ bool STEP_PCB_MODEL::WriteXAO( const wxString& aFileName )
}
}
m_reporter->Report( wxT( "\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "" ), RPT_SEVERITY_DEBUG );
file << " </groups>" << std::endl;
file << " <fields count=\"0\"/>" << std::endl;
@@ -2692,7 +2692,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
case FMT_IGES:
if( !readIGES( doc, aFileNameUTF8.c_str() ) )
{
m_reporter->Report( wxString::Format( wxT( "readIGES() failed on filename '%s'.\n" ),
m_reporter->Report( wxString::Format( wxT( "readIGES() failed on filename '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2702,7 +2702,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
case FMT_STEP:
if( !readSTEP( doc, aFileNameUTF8.c_str() ) )
{
m_reporter->Report( wxString::Format( wxT( "readSTEP() failed on filename '%s'.\n" ),
m_reporter->Report( wxString::Format( wxT( "readSTEP() failed on filename '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2722,7 +2722,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
if( size == wxInvalidOffset )
{
m_reporter->Report( wxString::Format( wxT( "getModelLabel() failed on filename '%s'.\n" ),
m_reporter->Report( wxString::Format( wxT( "getModelLabel() failed on filename '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2747,7 +2747,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
}
catch( ... )
{
m_reporter->Report( wxString::Format( wxT( "failed to decompress '%s'.\n" ),
m_reporter->Report( wxString::Format( wxT( "failed to decompress '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
}
@@ -2864,7 +2864,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
}
else
{
m_reporter->Report( wxString::Format( wxT( "readVRML() failed on filename '%s'.\n" ),
m_reporter->Report( wxString::Format( wxT( "readVRML() failed on filename '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2874,7 +2874,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
else // Substitution is not allowed
{
if( aErrorMessage )
aErrorMessage->Printf( wxT( "Cannot load any VRML model for this export.\n" ) );
aErrorMessage->Printf( wxT( "Cannot load any VRML model for this export." ) );
return false;
}
@@ -2884,7 +2884,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
// TODO: implement IDF and EMN converters
default:
m_reporter->Report( wxString::Format( _( "Cannot identify actual file type for '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "Cannot identify actual file type for '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -2894,7 +2894,7 @@ bool STEP_PCB_MODEL::getModelLabel( const std::string& aFileNameUTF8, VECTOR3D a
if( aLabel.IsNull() )
{
m_reporter->Report( wxString::Format( _( "Could not transfer model data from file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "Could not transfer model data from file '%s'." ),
fileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -3137,7 +3137,7 @@ bool STEP_PCB_MODEL::performMeshing( Handle( XCAFDoc_ShapeTool ) & aShapeTool )
TDF_LabelSequence freeShapes;
aShapeTool->GetFreeShapes( freeShapes );
m_reporter->Report( wxT( "Meshing model\n" ), RPT_SEVERITY_DEBUG );
m_reporter->Report( wxT( "Meshing model" ), RPT_SEVERITY_DEBUG );
// GLTF is a mesh format, we have to trigger opencascade to mesh the shapes we composited into the asesmbly
// To mesh models, lets just grab the free shape root and execute on them
@@ -3164,7 +3164,7 @@ bool STEP_PCB_MODEL::WriteGLTF( const wxString& aFileName )
{
if( !isBoardOutlineValid() )
{
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'." ),
aFileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -3215,7 +3215,7 @@ bool STEP_PCB_MODEL::WriteGLTF( const wxString& aFileName )
if( !wxRenameFile( tmpGltfname, fn.GetFullName(), true ) )
{
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'." ),
tmpGltfname,
fn.GetFullName() ),
RPT_SEVERITY_ERROR );
@@ -3232,13 +3232,13 @@ bool STEP_PCB_MODEL::WriteGLTF( const wxString& aFileName )
bool STEP_PCB_MODEL::WritePLY( const wxString& aFileName )
{
#if OCC_VERSION_HEX < 0x070700
m_reporter->Report( wxT( "PLY export is not supported before OCCT 7.7.0\n" ), RPT_SEVERITY_ERROR );
m_reporter->Report( wxT( "PLY export is not supported before OCCT 7.7.0" ), RPT_SEVERITY_ERROR );
return false;
#else
if( !isBoardOutlineValid() )
{
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'." ),
aFileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -3288,7 +3288,7 @@ bool STEP_PCB_MODEL::WritePLY( const wxString& aFileName )
if( !wxRenameFile( tmpFname, fn.GetFullName(), true ) )
{
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'." ),
tmpFname,
fn.GetFullName() ),
RPT_SEVERITY_ERROR );
@@ -3307,7 +3307,7 @@ bool STEP_PCB_MODEL::WriteSTL( const wxString& aFileName )
{
if( !isBoardOutlineValid() )
{
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "No valid PCB assembly; cannot create output file '%s'." ),
aFileName ),
RPT_SEVERITY_ERROR );
return false;
@@ -3337,7 +3337,7 @@ bool STEP_PCB_MODEL::WriteSTL( const wxString& aFileName )
if( !wxRenameFile( tmpFname, fn.GetFullName(), true ) )
{
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'.\n" ),
m_reporter->Report( wxString::Format( _( "Cannot rename temporary file '%s' to '%s'." ),
tmpFname,
fn.GetFullName() ),
RPT_SEVERITY_ERROR );