Properly order netlist pages

We cannot reorder these without updating the defines. So, keep the GUI in line with the definitions Fixes https://gitlab.com/kicad/code/kicad/issues/21730
Ensure that we are checking case differences
2025-09-13 17:53:11 +02:00 · 2025-09-12 23:34:29 -07:00 · 2025-09-12 23:27:06 -07:00 · 2025-09-12 23:26:20 -07:00 · 2025-09-12 23:25:22 -07:00
6 changed files with 11 additions and 96 deletions
--- a/eeschema/dialogs/dialog_export_netlist.cpp
+++ b/eeschema/dialogs/dialog_export_netlist.cpp
@ -227,16 +227,16 @@ DIALOG_EXPORT_NETLIST::DIALOG_EXPORT_NETLIST( SCH_EDIT_FRAME* aEditFrame, wxWind
    page->m_LeftBoxSizer->Add( label, 0, wxBOTTOM, 10 );
    m_PanelNetType[PANELALLEGRO] = page;

-    page = new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "PADS" ), NET_TYPE_PADS, false );
-    label = new wxStaticText( page, wxID_ANY, _( "Export netlist in PADS format" ) );
-    page->m_LeftBoxSizer->Add( label, 0, wxBOTTOM, 10 );
-    m_PanelNetType[PANELPADS] = page;
-
    page = new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "CadStar" ), NET_TYPE_CADSTAR, false );
    label = new wxStaticText( page, wxID_ANY, _( "Export netlist in CadStar format" ) );
    page->m_LeftBoxSizer->Add( label, 0, wxBOTTOM, 10 );
    m_PanelNetType[PANELCADSTAR] = page;

+    page = new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "PADS" ), NET_TYPE_PADS, false );
+    label = new wxStaticText( page, wxID_ANY, _( "Export netlist in PADS format" ) );
+    page->m_LeftBoxSizer->Add( label, 0, wxBOTTOM, 10 );
+    m_PanelNetType[PANELPADS] = page;
+
    InstallPageSpice();
    InstallPageSpiceModel();

--- a/eeschema/lib_symbol.cpp
+++ b/eeschema/lib_symbol.cpp
@ -1706,7 +1706,7 @@ int LIB_SYMBOL::Compare( const LIB_SYMBOL& aRhs, int aCompareFlags, REPORTER* aR
            if( aCompareFlags & SCH_ITEM::COMPARE_FLAGS::EQUALITY )
            {
                // Compare field text content
-                tmp = aField->GetText().CmpNoCase( bField->GetText() );
+                tmp = aField->GetText().compare( bField->GetText() );
            }

            if( tmp == 0 )
--- a/qa/data/cli/basic_test/basic_test.erc.json
+++ b/qa/data/cli/basic_test/basic_test.erc.json
@ -1,7 +1,7 @@
 {
    "$schema": "https://schemas.kicad.org/erc.v1.json",
    "coordinate_units": "mm",
-    "date": "2025-08-20T22:34:08+0000",
+    "date": "2025-09-12T21:52:37-0700",
    "kicad_version": "9.99.0",
    "sheets": [
        {
@ -158,51 +158,6 @@
                    "severity": "warning",
                    "type": "footprint_link_issues"
                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR03 [GND]",
-                            "pos": {
-                                "x": 1.2192,
-                                "y": 0.8382
-                            },
-                            "uuid": "5d9a8cf4-5c54-4c57-accb-dd6295272287"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR04 [GND]",
-                            "pos": {
-                                "x": 1.1176,
-                                "y": 1.0033
-                            },
-                            "uuid": "a45b22f2-0929-43b6-b1fb-e2272cb68106"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR01 [GND]",
-                            "pos": {
-                                "x": 1.1938,
-                                "y": 0.9652
-                            },
-                            "uuid": "19ba0538-2910-44b8-9336-edf1ff095912"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
                {
                    "description": "Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'",
                    "items": [
@ -248,21 +203,6 @@
                    "severity": "warning",
                    "type": "lib_symbol_issues"
                },
-                {
-                    "description": "Symbol 'GND' doesn't match copy in library 'power'",
-                    "items": [
-                        {
-                            "description": "Symbol #PWR02 [GND]",
-                            "pos": {
-                                "x": 1.4097,
-                                "y": 0.8763
-                            },
-                            "uuid": "62fef766-bfdd-4a4a-a8fa-79183473dd3b"
-                        }
-                    ],
-                    "severity": "warning",
-                    "type": "lib_symbol_mismatch"
-                },
                {
                    "description": "Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'",
                    "items": [
--- a/qa/data/cli/basic_test/basic_test.erc.rpt
+++ b/qa/data/cli/basic_test/basic_test.erc.rpt
@ -1,4 +1,4 @@
-ERC report (2025-08-20T22:34:08+0000, Encoding UTF8)
+ERC report (2025-09-12T21:52:36-0700, Encoding UTF8)

 ***** Sheet /
 [power_pin_not_driven]: Input Power pin not driven by any Output Power pins
@ -31,15 +31,6 @@ ERC report (2025-08-20T22:34:08+0000, Encoding UTF8)
 [footprint_link_issues]: Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'
    ; warning
    @(121.92 mm, 80.01 mm): Symbol C1 [C_Small]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(121.92 mm, 83.82 mm): Symbol #PWR03 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(111.76 mm, 100.33 mm): Symbol #PWR04 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(119.38 mm, 96.52 mm): Symbol #PWR01 [GND]
 [footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'
    ; warning
    @(127.00 mm, 93.98 mm): Symbol R1 [R_US]
@ -49,9 +40,6 @@ ERC report (2025-08-20T22:34:08+0000, Encoding UTF8)
 [lib_symbol_issues]: The current configuration does not include the symbol library 'Amplifier_Operational'
    ; warning
    @(143.51 mm, 78.74 mm): Symbol U1 [TLV2371DBV]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(140.97 mm, 87.63 mm): Symbol #PWR02 [GND]
 [footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'
    ; warning
    @(149.86 mm, 93.98 mm): Symbol R2 [R_US]
@ -62,4 +50,4 @@ ERC report (2025-08-20T22:34:08+0000, Encoding UTF8)
    ; warning
    @(177.80 mm, 78.74 mm): Symbol J3 [Conn_01x01_Pin]

- ** ERC messages: 20  Errors 2  Warnings 18
+ ** ERC messages: 16  Errors 2  Warnings 14
--- a/qa/data/cli/basic_test/basic_test.erc.unitsin.rpt
+++ b/qa/data/cli/basic_test/basic_test.erc.unitsin.rpt
@ -1,4 +1,4 @@
-ERC report (2025-08-20T22:34:09+0000, Encoding UTF8)
+ERC report (2025-09-12T21:52:37-0700, Encoding UTF8)

 ***** Sheet /
 [power_pin_not_driven]: Input Power pin not driven by any Output Power pins
@ -31,15 +31,6 @@ ERC report (2025-08-20T22:34:09+0000, Encoding UTF8)
 [footprint_link_issues]: Footprint 'C_1206_3216Metric' not found in library 'Capacitor_SMD'
    ; warning
    @(4.800 in, 3.150 in): Symbol C1 [C_Small]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(4.800 in, 3.300 in): Symbol #PWR03 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(4.400 in, 3.950 in): Symbol #PWR04 [GND]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(4.700 in, 3.800 in): Symbol #PWR01 [GND]
 [footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'
    ; warning
    @(5.000 in, 3.700 in): Symbol R1 [R_US]
@ -49,9 +40,6 @@ ERC report (2025-08-20T22:34:09+0000, Encoding UTF8)
 [lib_symbol_issues]: The current configuration does not include the symbol library 'Amplifier_Operational'
    ; warning
    @(5.650 in, 3.100 in): Symbol U1 [TLV2371DBV]
-[lib_symbol_mismatch]: Symbol 'GND' doesn't match copy in library 'power'
-    ; warning
-    @(5.550 in, 3.450 in): Symbol #PWR02 [GND]
 [footprint_link_issues]: Footprint 'R_1206_3216Metric' not found in library 'Resistor_SMD'
    ; warning
    @(5.900 in, 3.700 in): Symbol R2 [R_US]
@ -62,4 +50,4 @@ ERC report (2025-08-20T22:34:09+0000, Encoding UTF8)
    ; warning
    @(7.000 in, 3.100 in): Symbol J3 [Conn_01x01_Pin]

- ** ERC messages: 20  Errors 2  Warnings 18
+ ** ERC messages: 16  Errors 2  Warnings 14
--- a/qa/tests/cli/test_sch.py
+++ b/qa/tests/cli/test_sch.py
@ -194,7 +194,6 @@ def test_sch_export_erc( kitest,
    stdout, stderr, exitcode = utils.run_and_capture( command )

    assert exitcode == expected_exit_code
-    assert stderr == ''

    # some of our netlist formats are not cross platform so skip for now
    if not skip_compare:
Author	SHA1	Message	Date
Seth Hillbrand	497afffd48	Properly order netlist pages We cannot reorder these without updating the defines. So, keep the GUI in line with the definitions Fixes https://gitlab.com/kicad/code/kicad/issues/21730	2025-09-12 23:34:29 -07:00
Seth Hillbrand	89be756d1a	Ensure that we are checking case differences When comparing symbols, look for case differences in values since netlists are indeed case sensitive	2025-09-12 23:27:06 -07:00
Seth Hillbrand	a6decf15b5	Don't assert on stderr messages These can be things like missing library tables, directory creation, etc	2025-09-12 23:26:20 -07:00
Seth Hillbrand	4229b3cc76	Update cli golden files with new output format	2025-09-12 23:25:22 -07:00