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

Corrected syntax in kicad2step's help message regarding user-specified origin. 

(cherry picked from commit 8456d6cea9)
This commit is contained in:
Adam Wahab 2022-06-28 23:24:13 +00:00 committed by Seth Hillbrand
parent 90ef84b958
commit 29d58ae063
1 changed files with 21 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
utils/kicad2step/kicad2step_app.cpp
View File

@ -30,12 +30,15 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <sstream> #include <sstream>
#include <iostream> #include <iostream>
#include <sstream> #include <regex>
#include "kicad2step.h" #include "kicad2step.h"
#include "kicad2step_frame_base.h" #include "kicad2step_frame_base.h"
#include <Standard_Failure.hxx> // In open cascade #include <Standard_Failure.hxx> // In open cascade
#define REGEX_QUANTITY "([\\s]*[+-]?[\\d]*[.]?[\\d]*)"
#define REGEX_DELIMITER "(?:[\\s]*x)"
#define REGEX_UNIT "([m]{2}|(?:in))"
class KICAD2MCAD_APP : public wxApp class KICAD2MCAD_APP : public wxApp
{ {
@ -48,8 +51,8 @@ public:
virtual bool OnCmdLineParsed( wxCmdLineParser& parser ) override; virtual bool OnCmdLineParsed( wxCmdLineParser& parser ) override;
private: private:
KICAD2STEP* m_converter; KICAD2STEP* m_converter;
KICAD2MCAD_PRMS m_params; KICAD2MCAD_PRMS m_params;
}; };
@ -146,49 +149,31 @@ bool KICAD2MCAD_APP::OnCmdLineParsed( wxCmdLineParser& parser )
if( parser.Found( wxT( "user-origin" ), &tstr ) ) if( parser.Found( wxT( "user-origin" ), &tstr ) )
{ {
std::istringstream istr; std::regex re_pattern( REGEX_QUANTITY REGEX_DELIMITER REGEX_QUANTITY REGEX_UNIT,
istr.str( std::string( tstr.ToUTF8() ) ); std::regex_constants::icase );
istr >> m_params.m_xOrigin; std::smatch sm;
std::string str( tstr.ToUTF8() );
std::regex_search( str, sm, re_pattern );
m_params.m_xOrigin = atof( sm.str( 1 ).c_str() );
m_params.m_yOrigin = atof( sm.str( 2 ).c_str() );
std::string tunit( sm[3] );
if( istr.fail() ) if( ( !sm.str( 1 ).compare( " " ) || !sm.str( 2 ).compare( " " ) ) || ( sm.size() != 4 ) )
{ {
parser.Usage(); parser.Usage();
return false; return false;
} }
char tmpc; if( !tunit.compare( "in" ) || !tunit.compare( "inch" ) )
istr >> tmpc; {
m_params.m_xOrigin *= 25.4;
if( istr.fail() || ( tmpc != 'x' && tmpc != 'X' ) ) m_params.m_yOrigin *= 25.4;
}
else if( tunit.compare( "mm" ) )
{ {
parser.Usage(); parser.Usage();
return false; return false;
} }
istr >> m_params.m_yOrigin;
if( istr.fail() )
{
parser.Usage();
return false;
}
if( !istr.eof() )
{
std::string tunit;
istr >> tunit;
if( !tunit.compare( "in" ) || !tunit.compare( "inch" ) )
{
m_params.m_xOrigin *= 25.4;
m_params.m_yOrigin *= 25.4;
}
else if( tunit.compare( "mm" ) )
{
parser.Usage();
return false;
}
}
} }
if( parser.Found( wxT( "min-distance" ), &tstr ) ) if( parser.Found( wxT( "min-distance" ), &tstr ) )