Skip to content

Commit aac9731

Browse files
JamesJCodeJamesJCode
JamesJCode
authored and
JamesJCode
committed
Refactor PCB calcs to common library, and add coupled stripline
Fixes https://gitlab.com/kicad/code/kicad/-/issues/16863
1 parent 2fd2fe6 commit aac9731

37 files changed

+5035
-1676
lines changed

common/CMakeLists.txt

+9
Original file line numberDiff line numberDiff line change
@@ -557,6 +557,14 @@ set( COMMON_IO_SRCS
557557
io/easyedapro/easyedapro_import_utils.cpp
558558
)
559559

560+
set ( COMMON_TRANSLINE_CALCULATION_SRCS
561+
transline_calculations/transline_calculation_base.cpp
562+
transline_calculations/microstrip.cpp
563+
transline_calculations/coupled_microstrip.cpp
564+
transline_calculations/stripline.cpp
565+
transline_calculations/coupled_stripline.cpp
566+
)
567+
560568
set( COMMON_IMPORT_GFX_SRCS
561569
import_gfx/graphics_import_mgr.cpp
562570
import_gfx/graphics_importer.cpp
@@ -591,6 +599,7 @@ set( COMMON_SRCS
591599
${FONT_SRCS}
592600
${COMMON_IMPORT_GFX_SRCS}
593601
${COMMON_GIT_SRCS}
602+
${COMMON_TRANSLINE_CALCULATION_SRCS}
594603
base_screen.cpp
595604
bin_mod.cpp
596605
bitmap_base.cpp

common/bitmap_info.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -4893,6 +4893,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
48934893
aBitmapInfoCache[BITMAPS::color_code_tolerance].emplace_back( BITMAPS::color_code_tolerance, wxT( "color_code_tolerance.png" ), -1, wxT( "light" ) );
48944894
aBitmapInfoCache[BITMAPS::color_code_value].emplace_back( BITMAPS::color_code_value, wxT( "color_code_value.png" ), -1, wxT( "light" ) );
48954895
aBitmapInfoCache[BITMAPS::color_code_value_and_name].emplace_back( BITMAPS::color_code_value_and_name, wxT( "color_code_value_and_name.png" ), -1, wxT( "light" ) );
4896+
aBitmapInfoCache[BITMAPS::coupled_stripline].emplace_back( BITMAPS::coupled_stripline, wxT( "coupled_stripline.png" ), -1, wxT( "light" ) );
48964897
aBitmapInfoCache[BITMAPS::creepage_clearance].emplace_back( BITMAPS::creepage_clearance, wxT( "creepage_clearance.png" ), -1, wxT( "light" ) );
48974898
aBitmapInfoCache[BITMAPS::cpw].emplace_back( BITMAPS::cpw, wxT( "cpw.png" ), -1, wxT( "light" ) );
48984899
aBitmapInfoCache[BITMAPS::cpw_back].emplace_back( BITMAPS::cpw_back, wxT( "cpw_back.png" ), -1, wxT( "light" ) );
@@ -4928,6 +4929,7 @@ void BuildBitmapInfo( std::unordered_map<BITMAPS, std::vector<BITMAP_INFO>>& aBi
49284929
aBitmapInfoCache[BITMAPS::color_code_tolerance].emplace_back( BITMAPS::color_code_tolerance, wxT( "color_code_tolerance_dark.png" ), -1, wxT( "dark" ) );
49294930
aBitmapInfoCache[BITMAPS::color_code_value].emplace_back( BITMAPS::color_code_value, wxT( "color_code_value_dark.png" ), -1, wxT( "dark" ) );
49304931
aBitmapInfoCache[BITMAPS::color_code_value_and_name].emplace_back( BITMAPS::color_code_value_and_name, wxT( "color_code_value_and_name_dark.png" ), -1, wxT( "dark" ) );
4932+
aBitmapInfoCache[BITMAPS::coupled_stripline].emplace_back( BITMAPS::coupled_stripline, wxT( "coupled_stripline_dark.png" ), -1, wxT( "dark" ) );
49314933
aBitmapInfoCache[BITMAPS::creepage_clearance].emplace_back( BITMAPS::creepage_clearance, wxT( "creepage_clearance_dark.png" ), -1, wxT( "dark" ) );
49324934
aBitmapInfoCache[BITMAPS::cpw].emplace_back( BITMAPS::cpw, wxT( "cpw_dark.png" ), -1, wxT( "dark" ) );
49334935
aBitmapInfoCache[BITMAPS::cpw_back].emplace_back( BITMAPS::cpw_back, wxT( "cpw_back_dark.png" ), -1, wxT( "dark" ) );

0 commit comments

Comments
 (0)