Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Fix other places where "IN" is used instead of INCH (mainly QA tests)

revert-0c36e162
jean-pierre charras 9 months ago
parent
1a10b5fb64
commit
0acdabd1eb
16 changed files with 20 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      pcbnew/pcb_io/altium/altium_parser_pcb.cpp
  2. 2
      pcbnew/pcb_io/altium/altium_parser_pcb.h
  3. 4
      pcbnew/pcb_io/altium/altium_pcb.cpp
  4. 2
      qa/tests/pcbnew/drc/test_custom_rule_severities.cpp
  5. 2
      qa/tests/pcbnew/drc/test_drc_component_classes.cpp
  6. 2
      qa/tests/pcbnew/drc/test_drc_copper_conn.cpp
  7. 2
      qa/tests/pcbnew/drc/test_drc_copper_graphics.cpp
  8. 2
      qa/tests/pcbnew/drc/test_drc_copper_sliver.cpp
  9. 2
      qa/tests/pcbnew/drc/test_drc_incorrect_text_mirror.cpp
  10. 2
      qa/tests/pcbnew/drc/test_drc_multi_netclasses.cpp
  11. 4
      qa/tests/pcbnew/drc/test_drc_regressions.cpp
  12. 2
      qa/tests/pcbnew/drc/test_drc_skew.cpp
  13. 2
      qa/tests/pcbnew/drc/test_drc_starved_thermal.cpp
  14. 2
      qa/tests/pcbnew/drc/test_solder_mask_bridging.cpp
  15. 4
      qa/tests/pcbnew/test_tracks_cleaner.cpp
  16. 4
      qa/tests/pcbnew/test_zone_filler.cpp

2
pcbnew/pcb_io/altium/altium_parser_pcb.cpp
View File

@ -444,7 +444,7 @@ ADIMENSION6::ADIMENSION6( ALTIUM_BINARY_PARSER& aReader )
wxString dimensionunit = ALTIUM_PROPS_UTILS::ReadString( props, wxT( "TEXTDIMENSIONUNIT" ), wxT( "Millimeters" ) );
if( dimensionunit == wxT( "Inches" ) ) textunit = ALTIUM_UNIT::IN;
if( dimensionunit == wxT( "Inches" ) ) textunit = ALTIUM_UNIT::INCH;
else if( dimensionunit == wxT( "Mils" ) ) textunit = ALTIUM_UNIT::MILS;
else if( dimensionunit == wxT( "Millimeters" ) ) textunit = ALTIUM_UNIT::MM;
else if( dimensionunit == wxT( "Centimeters" ) ) textunit = ALTIUM_UNIT::CM;

2
pcbnew/pcb_io/altium/altium_parser_pcb.h
View File

@ -50,7 +50,7 @@ enum class ALTIUM_UNIT
{
UNKNOWN = 0,
IN = 1,
INCH = 1,
MILS = 2,
MM = 3,
CM = 4

4
pcbnew/pcb_io/altium/altium_pcb.cpp
View File

@ -1646,7 +1646,7 @@ void ALTIUM_PCB::HelperParseDimensions6Linear( const ADIMENSION6& aElem )
switch( aElem.textunit )
{
case ALTIUM_UNIT::IN: dimension->SetUnits( EDA_UNITS::INCH ); break;
case ALTIUM_UNIT::INCH: dimension->SetUnits( EDA_UNITS::INCH ); break;
case ALTIUM_UNIT::MILS: dimension->SetUnits( EDA_UNITS::MILS ); break;
case ALTIUM_UNIT::MM: dimension->SetUnits( EDA_UNITS::MM ); break;
case ALTIUM_UNIT::CM: dimension->SetUnits( EDA_UNITS::MM ); break;
@ -1697,7 +1697,7 @@ void ALTIUM_PCB::HelperParseDimensions6Radial(const ADIMENSION6 &aElem)
switch( aElem.textunit )
{
case ALTIUM_UNIT::IN: dimension->SetUnits( EDA_UNITS::INCH ); break;
case ALTIUM_UNIT::INCH: dimension->SetUnits( EDA_UNITS::INCH ); break;
case ALTIUM_UNIT::MILS: dimension->SetUnits( EDA_UNITS::MILS ); break;
case ALTIUM_UNIT::MM: dimension->SetUnits( EDA_UNITS::MM ); break;
case ALTIUM_UNIT::CM: dimension->SetUnits( EDA_UNITS::MM ); break;

2
qa/tests/pcbnew/drc/test_custom_rule_severities.cpp
View File

@ -83,7 +83,7 @@ BOOST_FIXTURE_TEST_CASE( DRCCustomRuleSeverityTest, DRC_REGRESSION_TEST_FIXTURE
{
BOOST_CHECK_EQUAL( violations.size(), 8 );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_component_classes.cpp
View File

@ -90,7 +90,7 @@ BOOST_FIXTURE_TEST_CASE( DRCComponentClasses, DRC_REGRESSION_TEST_FIXTURE )
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_copper_conn.cpp
View File

@ -96,7 +96,7 @@ BOOST_FIXTURE_TEST_CASE( DRCCopperConn, DRC_REGRESSION_TEST_FIXTURE )
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_copper_graphics.cpp
View File

@ -88,7 +88,7 @@ BOOST_FIXTURE_TEST_CASE( DRCCopperGraphicsTest, DRC_COPPER_GRAPHICS_TEST_FIXTURE
{
BOOST_CHECK_EQUAL( violations.size(), expected_err_cnt );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_copper_sliver.cpp
View File

@ -94,7 +94,7 @@ BOOST_DATA_TEST_CASE_F( DRC_REGRESSION_TEST_FIXTURE, DRCCopperSliver,
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_incorrect_text_mirror.cpp
View File

@ -78,7 +78,7 @@ BOOST_FIXTURE_TEST_CASE( DRCIncorrectTextMirror, DRC_INCORRECT_TEXT_MIRROR_TEST_
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_multi_netclasses.cpp
View File

@ -93,7 +93,7 @@ BOOST_FIXTURE_TEST_CASE( DRCMultiNetclasses, DRC_REGRESSION_TEST_FIXTURE )
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

4
qa/tests/pcbnew/drc/test_drc_regressions.cpp
View File

@ -105,7 +105,7 @@ BOOST_FIXTURE_TEST_CASE( DRCFalsePositiveRegressions, DRC_REGRESSION_TEST_FIXTUR
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );
@ -196,7 +196,7 @@ BOOST_FIXTURE_TEST_CASE( DRCFalseNegativeRegressions, DRC_REGRESSION_TEST_FIXTUR
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_skew.cpp
View File

@ -94,7 +94,7 @@ BOOST_FIXTURE_TEST_CASE( DRCSkew, DRC_REGRESSION_TEST_FIXTURE )
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_drc_starved_thermal.cpp
View File

@ -82,7 +82,7 @@ BOOST_FIXTURE_TEST_CASE( DRCStarvedThermal, DRC_REGRESSION_TEST_FIXTURE )
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

2
qa/tests/pcbnew/drc/test_solder_mask_bridging.cpp
View File

@ -80,7 +80,7 @@ BOOST_FIXTURE_TEST_CASE( DRCSolderMaskBridgingTest, DRC_SOLDER_MASK_BRIDGING_TES
{
BOOST_CHECK_EQUAL( violations.size(), expected_err_cnt );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

4
qa/tests/pcbnew/test_tracks_cleaner.cpp
View File

@ -128,7 +128,7 @@ BOOST_DATA_TEST_CASE_F( TRACK_CLEANER_TEST_FIXTURE, FailedToCleanRegressionTests
BOOST_CHECK_EQUAL( dryRunItems.size(), entry.m_Expected );
BOOST_CHECK_EQUAL( realRunItems.size(), entry.m_Expected );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );
@ -222,7 +222,7 @@ BOOST_DATA_TEST_CASE_F( TRACK_CLEANER_TEST_FIXTURE, TrackCleanerRegressionTests,
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

4
qa/tests/pcbnew/test_zone_filler.cpp
View File

@ -214,7 +214,7 @@ BOOST_DATA_TEST_CASE_F( ZONE_FILL_TEST_FIXTURE, RegressionZoneFillTests,
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );
@ -261,7 +261,7 @@ BOOST_DATA_TEST_CASE_F( ZONE_FILL_TEST_FIXTURE, RegressionSliverZoneFillTests,
}
else
{
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::IN );
UNITS_PROVIDER unitsProvider( pcbIUScale, EDA_UNITS::INCH );
std::map<KIID, EDA_ITEM*> itemMap;
m_board->FillItemMap( itemMap );

Write Preview
Loading…
Cancel
Save