diff --git a/demos/simulation/rectifier/rectifier.kicad_sch b/demos/simulation/rectifier/rectifier.kicad_sch index b208cd2f59..61eb566e14 100644 --- a/demos/simulation/rectifier/rectifier.kicad_sch +++ b/demos/simulation/rectifier/rectifier.kicad_sch @@ -454,7 +454,7 @@ (property "Fieldname" "Value" (id 4) (at 118.11 93.98 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 118.11 93.98 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 118.11 93.98 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 118.11 93.98 90) @@ -524,7 +524,7 @@ (property "Spice_Primitive" "C" (id 5) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 6) (at 137.16 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 6) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (pin "1" (uuid 91d3786e-a107-4b4b-bb3d-5312a687559c)) @@ -550,7 +550,7 @@ (property "Fieldname" "Value" (id 4) (at 146.05 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 146.05 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 146.05 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 146.05 101.6 90) diff --git a/demos/simulation/sallen_key/sallen_key.kicad_sch b/demos/simulation/sallen_key/sallen_key.kicad_sch index 3c26f9ca86..1a2ef67812 100644 --- a/demos/simulation/sallen_key/sallen_key.kicad_sch +++ b/demos/simulation/sallen_key/sallen_key.kicad_sch @@ -806,7 +806,7 @@ (property "Fieldname" "Value" (id 4) (at 176.53 109.22 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 176.53 109.22 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 176.53 109.22 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 176.53 109.22 90) @@ -835,7 +835,7 @@ (property "Fieldname" "Value" (id 4) (at 162.56 109.22 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 162.56 109.22 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 162.56 109.22 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 162.56 109.22 90) @@ -887,7 +887,7 @@ (property "Spice_Primitive" "C" (id 5) (at 186.69 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 6) (at 186.69 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 6) (at 186.69 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (pin "1" (uuid f26dfb31-49c6-4c2c-94ed-a4dda9281e00)) diff --git a/eeschema/sim/sim_model.cpp b/eeschema/sim/sim_model.cpp index ad228f008a..570596bbaa 100644 --- a/eeschema/sim/sim_model.cpp +++ b/eeschema/sim/sim_model.cpp @@ -1296,7 +1296,6 @@ void SIM_MODEL::MigrateSimModel( T_symbol& aSymbol, const PROJECT* aProject ) bool modelFromValueField = false; if( aSymbol.FindField( wxT( "Spice_Primitive" ) ) - || aSymbol.FindField( wxT( "SpiceMapping" ) ) || aSymbol.FindField( wxT( "Spice_Node_Sequence" ) ) || aSymbol.FindField( wxT( "Spice_Model" ) ) || aSymbol.FindField( wxT( "Spice_Netlist_Enabled" ) ) @@ -1308,9 +1307,6 @@ void SIM_MODEL::MigrateSimModel( T_symbol& aSymbol, const PROJECT* aProject ) aSymbol.RemoveField( primitiveField ); } - if( T_field* spiceMapping = aSymbol.FindField( wxT( "SpiceMapping" ) ) ) - spiceMapping->SetName( wxT( "Spice_Node_Sequence" ) ); - if( T_field* nodeSequenceField = aSymbol.FindField( wxT( "Spice_Node_Sequence" ) ) ) { const wxString delimiters( "{:,; }" ); diff --git a/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch b/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch index b208cd2f59..61eb566e14 100644 --- a/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch +++ b/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch @@ -454,7 +454,7 @@ (property "Fieldname" "Value" (id 4) (at 118.11 93.98 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 118.11 93.98 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 118.11 93.98 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 118.11 93.98 90) @@ -524,7 +524,7 @@ (property "Spice_Primitive" "C" (id 5) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 6) (at 137.16 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 6) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (pin "1" (uuid 91d3786e-a107-4b4b-bb3d-5312a687559c)) @@ -550,7 +550,7 @@ (property "Fieldname" "Value" (id 4) (at 146.05 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 146.05 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 146.05 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 146.05 101.6 90) diff --git a/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch-bak b/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch-bak index 8ec866b5ab..3499b2835f 100644 --- a/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch-bak +++ b/qa/data/eeschema/spice_netlists/legacy_rectifier/legacy_rectifier.kicad_sch-bak @@ -418,7 +418,7 @@ (property "Fieldname" "Value" (id 4) (at 118.11 93.98 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 118.11 93.98 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 118.11 93.98 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 118.11 93.98 90) @@ -486,7 +486,7 @@ (property "Spice_Primitive" "C" (id 5) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 6) (at 137.16 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 6) (at 137.16 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (pin "1" (uuid 8927c4f6-bfd9-437a-8ad5-25802d51ce9d)) @@ -511,7 +511,7 @@ (property "Fieldname" "Value" (id 4) (at 146.05 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 146.05 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 146.05 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 146.05 101.6 90) diff --git a/qa/data/eeschema/spice_netlists/legacy_sallen_key/legacy_sallen_key.kicad_sch b/qa/data/eeschema/spice_netlists/legacy_sallen_key/legacy_sallen_key.kicad_sch index 52c901b29e..94dd62922d 100644 --- a/qa/data/eeschema/spice_netlists/legacy_sallen_key/legacy_sallen_key.kicad_sch +++ b/qa/data/eeschema/spice_netlists/legacy_sallen_key/legacy_sallen_key.kicad_sch @@ -798,7 +798,7 @@ (property "Fieldname" "Value" (id 4) (at 176.53 109.22 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 176.53 109.22 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 176.53 109.22 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 176.53 109.22 90) @@ -827,7 +827,7 @@ (property "Fieldname" "Value" (id 4) (at 162.56 109.22 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 5) (at 162.56 109.22 0) + (property "Spice_Node_Sequence" "1 2" (id 5) (at 162.56 109.22 0) (effects (font (size 1.524 1.524)) hide) ) (property "Spice_Primitive" "R" (id 6) (at 162.56 109.22 90) @@ -879,7 +879,7 @@ (property "Spice_Primitive" "C" (id 5) (at 186.69 101.6 0) (effects (font (size 1.524 1.524)) hide) ) - (property "SpiceMapping" "1 2" (id 6) (at 186.69 101.6 0) + (property "Spice_Node_Sequence" "1 2" (id 6) (at 186.69 101.6 0) (effects (font (size 1.524 1.524)) hide) ) (pin "1" (uuid f26dfb31-49c6-4c2c-94ed-a4dda9281e00))