[apps/toolbox] Order of submenus & New electricity constants (#34)

2026-01-18 16:27:34 +01:00 · 2021-10-06 18:26:17 +02:00
parent 83c63a7011
commit 9fdedecbff
10 changed files with 256 additions and 3 deletions
--- a/apps/math_toolbox.cpp
+++ b/apps/math_toolbox.cpp
@@ -711,6 +711,54 @@ const ToolboxMessageTree Electromagnetism[] = {

 };

+const ToolboxMessageTree Resistivity[] = {
+  ToolboxMessageTree::Leaf(I18n::Message::Silver, I18n::Message::Rstvt_Silver, false, I18n::Message::Rstvt_Silver),
+  ToolboxMessageTree::Leaf(I18n::Message::Copper, I18n::Message::Rstvt_Copper, false, I18n::Message::Rstvt_Copper),
+  ToolboxMessageTree::Leaf(I18n::Message::Gold, I18n::Message::Rstvt_Gold, false, I18n::Message::Rstvt_Gold),
+  ToolboxMessageTree::Leaf(I18n::Message::Aluminium, I18n::Message::Rstvt_Aluminium, false, I18n::Message::Rstvt_Aluminium),
+  ToolboxMessageTree::Leaf(I18n::Message::Calcium, I18n::Message::Rstvt_Calcium, false, I18n::Message::Rstvt_Calcium),
+  ToolboxMessageTree::Leaf(I18n::Message::Tungsten, I18n::Message::Rstvt_Tungsten, false, I18n::Message::Rstvt_Tungsten),
+  ToolboxMessageTree::Leaf(I18n::Message::Zinc, I18n::Message::Rstvt_Zinc, false, I18n::Message::Rstvt_Zinc),
+  ToolboxMessageTree::Leaf(I18n::Message::Cobalt, I18n::Message::Rstvt_Cobalt, false, I18n::Message::Rstvt_Cobalt),
+  ToolboxMessageTree::Leaf(I18n::Message::Nickel, I18n::Message::Rstvt_Nickel, false, I18n::Message::Rstvt_Nickel),
+  ToolboxMessageTree::Leaf(I18n::Message::Lithium, I18n::Message::Rstvt_Lithium, false, I18n::Message::Rstvt_Lithium),
+  ToolboxMessageTree::Leaf(I18n::Message::Iron, I18n::Message::Rstvt_Iron, false, I18n::Message::Rstvt_Iron),
+  ToolboxMessageTree::Leaf(I18n::Message::Platinum, I18n::Message::Rstvt_Platinum, false, I18n::Message::Rstvt_Platinum),
+  ToolboxMessageTree::Leaf(I18n::Message::Tin, I18n::Message::Rstvt_Tin, false, I18n::Message::Rstvt_Tin),
+  ToolboxMessageTree::Leaf(I18n::Message::Sea_water, I18n::Message::Rstvt_Sea_water, false, I18n::Message::Rstvt_Sea_water),
+  ToolboxMessageTree::Leaf(I18n::Message::Water, I18n::Message::Rstvt_Water, false, I18n::Message::Rstvt_Water),
+  ToolboxMessageTree::Leaf(I18n::Message::Air, I18n::Message::Rstvt_Air, false, I18n::Message::Rstvt_Air),
+  ToolboxMessageTree::Leaf(I18n::Message::Wood, I18n::Message::Rstvt_Wood, false, I18n::Message::Rstvt_Wood),
+  ToolboxMessageTree::Leaf(I18n::Message::Glass, I18n::Message::Rstvt_Glass, false, I18n::Message::Rstvt_Glass)
+};
+
+const ToolboxMessageTree Conductivity[] = {
+  ToolboxMessageTree::Leaf(I18n::Message::Silver, I18n::Message::Cndcvt_Silver, false, I18n::Message::Cndcvt_Silver),
+  ToolboxMessageTree::Leaf(I18n::Message::Copper, I18n::Message::Cndcvt_Copper, false, I18n::Message::Cndcvt_Copper),
+  ToolboxMessageTree::Leaf(I18n::Message::Gold, I18n::Message::Cndcvt_Gold, false, I18n::Message::Cndcvt_Gold),
+  ToolboxMessageTree::Leaf(I18n::Message::Aluminium, I18n::Message::Cndcvt_Aluminium, false, I18n::Message::Cndcvt_Aluminium),
+  ToolboxMessageTree::Leaf(I18n::Message::Calcium, I18n::Message::Cndcvt_Calcium, false, I18n::Message::Cndcvt_Calcium),
+  ToolboxMessageTree::Leaf(I18n::Message::Tungsten, I18n::Message::Cndcvt_Tungsten, false, I18n::Message::Cndcvt_Tungsten),
+  ToolboxMessageTree::Leaf(I18n::Message::Zinc, I18n::Message::Cndcvt_Zinc, false, I18n::Message::Cndcvt_Zinc),
+  ToolboxMessageTree::Leaf(I18n::Message::Cobalt, I18n::Message::Cndcvt_Cobalt, false, I18n::Message::Cndcvt_Cobalt),
+  ToolboxMessageTree::Leaf(I18n::Message::Nickel, I18n::Message::Cndcvt_Nickel, false, I18n::Message::Cndcvt_Nickel),
+  ToolboxMessageTree::Leaf(I18n::Message::Lithium, I18n::Message::Cndcvt_Lithium, false, I18n::Message::Cndcvt_Lithium),
+  ToolboxMessageTree::Leaf(I18n::Message::Iron, I18n::Message::Cndcvt_Iron, false, I18n::Message::Cndcvt_Iron),
+  ToolboxMessageTree::Leaf(I18n::Message::Platinum, I18n::Message::Cndcvt_Platinum, false, I18n::Message::Cndcvt_Platinum),
+  ToolboxMessageTree::Leaf(I18n::Message::Tin, I18n::Message::Cndcvt_Tin, false, I18n::Message::Cndcvt_Tin),
+  ToolboxMessageTree::Leaf(I18n::Message::Sea_water, I18n::Message::Cndcvt_Sea_water, false, I18n::Message::Cndcvt_Sea_water),
+  ToolboxMessageTree::Leaf(I18n::Message::Water, I18n::Message::Cndcvt_Water, false, I18n::Message::Cndcvt_Water),
+  ToolboxMessageTree::Leaf(I18n::Message::Air, I18n::Message::Cndcvt_Air, false, I18n::Message::Cndcvt_Air),
+  ToolboxMessageTree::Leaf(I18n::Message::Wood, I18n::Message::Cndcvt_Wood, false, I18n::Message::Cndcvt_Wood),
+  ToolboxMessageTree::Leaf(I18n::Message::Glass, I18n::Message::Cndcvt_Glass, false, I18n::Message::Cndcvt_Glass)
+};
+
+const ToolboxMessageTree Electricity[] = {
+  ToolboxMessageTree::Leaf(I18n::Message::ElementalChargeTag, I18n::Message::ElementalCharge, false, I18n::Message::ElementalCharge),
+  ToolboxMessageTree::Node(I18n::Message::ResistivityConstants, Resistivity),
+  ToolboxMessageTree::Node(I18n::Message::ConductivityConstants, Conductivity)
+};
+
 const ToolboxMessageTree ParticleMass[] = {
  ToolboxMessageTree::Leaf(I18n::Message::ElectronMassTag, I18n::Message::ElectronMass, false, I18n::Message::ElectronMass),
  ToolboxMessageTree::Leaf(I18n::Message::MuonMassTag, I18n::Message::MuonMass, false, I18n::Message::MuonMass),
@@ -788,6 +836,7 @@ const ToolboxMessageTree PlanckUnits[] = {
 const ToolboxMessageTree Physics[] = {
  ToolboxMessageTree::Node(I18n::Message::FundamentalConstants, FundamentalConstants),
  ToolboxMessageTree::Node(I18n::Message::Electromagnetism, Electromagnetism),
+  ToolboxMessageTree::Node(I18n::Message::Electricity, Electricity),
  ToolboxMessageTree::Node(I18n::Message::NuclearConstants, Nuclear),
  ToolboxMessageTree::Node(I18n::Message::Thermodynamics, Thermodynamics),
  ToolboxMessageTree::Node(I18n::Message::Gravitation, Gravitation),
@@ -805,15 +854,15 @@ const ToolboxMessageTree menu[] = {
  ToolboxMessageTree::Leaf(I18n::Message::LogCommandWithArg, I18n::Message::BasedLogarithm),
  ToolboxMessageTree::Node(I18n::Message::Calculation, calculChildren),
  ToolboxMessageTree::Node(I18n::Message::ComplexNumber, complexChildren),
-  ToolboxMessageTree::Node(I18n::Message::Combinatorics, combinatoricsChildren),
-  ToolboxMessageTree::Node(I18n::Message::Probability, probabilityChildren),
+  ToolboxMessageTree::Node(I18n::Message::Unit, unitChildren),
  ToolboxMessageTree::Node(I18n::Message::Arithmetic, arithmeticChildren),
  ToolboxMessageTree::Node(I18n::Message::Matrices, matricesChildren),
+  ToolboxMessageTree::Node(I18n::Message::Probability, probabilityChildren),
  ToolboxMessageTree::Node(I18n::Message::Vectors, vectorsChildren),
 #if LIST_ARE_DEFINED
  ToolboxMessageTree::Node(I18n::Message::Lists,listsChildren),
 #endif
-  ToolboxMessageTree::Node(I18n::Message::Unit, unitChildren),
+  ToolboxMessageTree::Node(I18n::Message::Combinatorics, combinatoricsChildren),
  ToolboxMessageTree::Node(I18n::Message::RandomAndApproximation, randomAndApproximationChildren),
  ToolboxMessageTree::Node(I18n::Message::HyperbolicTrigonometry, trigonometryChildren),
  ToolboxMessageTree::Node(I18n::Message::Fluctuation, predictionChildren),
--- a/apps/shared.universal.i18n
+++ b/apps/shared.universal.i18n
@@ -458,3 +458,39 @@ HartreeConstant = "4.3597447222071·10^-18_J"
 MagneticFluxQuantum = "2.067833848·10^-15_Wb"
 ConductanceQuantum = "7.748091729·10^-5_S"
 CirculationQuantum = "3.6369475516·10^-4_m^2_s^-1"
+Cndcvt_Silver = "6.30·10^7_S_m^-1"
+Cndcvt_Copper = "5.96·10^7_S_m^-1"
+Cndcvt_Gold = "4.11·10^7_S_m^-1"
+Cndcvt_Aluminium = "3.77·10^7_S_m^-1"
+Cndcvt_Calcium = "2.98·10^7_S_m^-1"
+Cndcvt_Tungsten = "1.79·10^7_S_m^-1"
+Cndcvt_Zinc = "1.69·10^7_S_m^-1"
+Cndcvt_Cobalt = "1.60·10^7_S_m^-1"
+Cndcvt_Nickel = "1.43·10^7_S_m^-1"
+Cndcvt_Lithium = "1.08·10^7_S_m^-1"
+Cndcvt_Iron = "1.00·10^7_S_m^-1"
+Cndcvt_Platinum = "9.43·10^6_S_m^-1"
+Cndcvt_Tin = "9.17·10^6_S_m^-1"
+Cndcvt_Sea_water = "4.80_S_m^-1"
+Cndcvt_Water = "5.00·10^-3_S_m^-1"
+Cndcvt_Air = "1.00·10^-13_S_m^-1"
+Cndcvt_Glass = "1.00·10^-13_S_m^-1"
+Cndcvt_Wood = "1.00·10^-3_S_m^-1"
+Rstvt_Silver = "1.59·10^-8_Ω_m"
+Rstvt_Copper = "1.68·10^-8_Ω_m"
+Rstvt_Gold = "2.44·10^-8_Ω_m"
+Rstvt_Aluminium = "2.65·10^-8_Ω_m"
+Rstvt_Calcium = "3.36·10^-8_Ω_m"
+Rstvt_Tungsten = "5.60·10^-8_Ω_m"
+Rstvt_Zinc = "5.90·10^-8_Ω_m"
+Rstvt_Cobalt = "6.24·10^-8_Ω_m"
+Rstvt_Nickel = "6.99·10^-8_Ω_m"
+Rstvt_Lithium = "9.28·10^-8_Ω_m"
+Rstvt_Iron = "9.70·10^-8_Ω_m"
+Rstvt_Platinum = "1.06·10^-7_Ω_m"
+Rstvt_Tin = "1.09·10^-7_Ω_m"
+Rstvt_Sea_water = "2.1·10^-1_Ω_m"
+Rstvt_Water = "1.01·10^3_Ω_m"
+Rstvt_Air = "1.00·10^9_Ω_m"
+Rstvt_Glass = "5.00·10^14_Ω_m"
+Rstvt_Wood = "1.00·10^3_Ω_m"
--- a/apps/toolbox.de.i18n
+++ b/apps/toolbox.de.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Avogadro-Konstante"
 GasTag = "Gaskonstante"
 Electromagnetism = "Elektromagnetismus"
 CoulombTag = "Coulomb-Konstante"
+ConductivityConstants = "Leitfähigkeitskonstanten"
+Electricity = "Elektrizität"
+ResistivityConstants = "Konstanten der Widerstandsfähigkeit"
+Silver = "Silber"
+Copper = "Kupfer"
+Gold = "Gold"
+Aluminium = "Aluminium"
+Calcium = "Kalzium"
+Tungsten = "Wolfram"
+Zinc = "Zink"
+Cobalt = "Kobalt"
+Nickel = "Nickel"
+Lithium = "Lithium"
+Iron = "eisen"
+Platinum = "Platin"
+Tin = "Zinn"
+Sea_water = "Meerwasser"
+Water = "Wasser"
+Air = "Luft"
+Glass = "Glas"
+Wood = "Holz"
 Vacuum_permittivityTag = "Vakuum-Durchlässigkeit"
 Vacuum_permeabilityTag = "Vakuumdurchlässigkeit"
 PlanckTag = "Planck - Konstante"
--- a/apps/toolbox.en.i18n
+++ b/apps/toolbox.en.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Avogadro Constant"
 GasTag = "Gas Constant"
 Electromagnetism = "Electromagnetism"
 CoulombTag = "Coulomb Constant"
+ConductivityConstants = "Conductivity constants"
+Electricity = "Electricity"
+ResistivityConstants = "Resistivity Constants"
+Silver = "Silver"
+Copper = "Copper"
+Gold = "Gold"
+Aluminium = "Aluminium"
+Calcium = "Calcium"
+Tungsten = "Tungsten"
+Zinc = "Zinc"
+Cobalt = "Cobalt"
+Nickel = "Nickel"
+Lithium = "Lithium"
+Iron = "Iron"
+Platinum = "Platinum"
+Tin = "Tin"
+Sea_water = "Sea Water"
+Water = "Water"
+Air = "Air"
+Glass = "Glass"
+Wood = "Wood"
 Vacuum_permittivityTag = "Vacuum permittivity"
 Vacuum_permeabilityTag = "Vacuum permeability"
 PlanckTag = "Planck Constant"
--- a/apps/toolbox.es.i18n
+++ b/apps/toolbox.es.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Constante de Avogadro"
 GasTag = "Constante de gas"
 Electromagnetism = "Electromagnetismo"
 CoulombTag = "Constante de Coulomb"
+ConductivityConstants = "Constantes de conductividad"
+Electricity = "Electricidad"
+ResistivityConstants = "Constantes de resistividad"
+Silver = "Plata"
+Copper = "cobre"
+Gold = "Oro"
+Aluminium = "Aluminio"
+Calcium = "Calcio"
+Tungsten = "Tungsteno"
+Zinc = "Zinc"
+Cobalt = "Cobalto"
+Nickel = "Níquel"
+Lithium = "Litio"
+Iron = "Hierro"
+Platinum = "Platino"
+Tin = "Tin"
+Sea_water = "Agua de mar"
+Water = "Agua"
+Air = "Aire"
+Glass = "Vidrio"
+Wood = "Madera"
 Vacuum_permittivityTag = "Permisividad de vacío"
 Vacuum_permeabilityTag = "Permeabilidad al vacío"
 PlanckTag = "Constante de Planck"
--- a/apps/toolbox.fr.i18n
+++ b/apps/toolbox.fr.i18n
@@ -429,6 +429,27 @@ BoltzmannTag = "Constante de Boltzmann"
 AvogadroTag = "Constante d'Avogadro"
 GasTag = "Constante des gaz parfaits"
 Electromagnetism = "Electromagnétisme"
+ConductivityConstants = "Constantes de Conductivité"
+Electricity = "Electricité"
+ResistivityConstants = "Constantes de Resistivité"
+Silver = "Argent"
+Copper = "Cuivre"
+Gold = "Or"
+Aluminium = "Aluminium"
+Calcium = "Calcium"
+Tungsten = "Tungstène"
+Zinc = "Zinc"
+Cobalt = "Cobalt"
+Nickel = "Nickel"
+Lithium = "Lithium"
+Iron = "Fer"
+Platinum = "Platine"
+Tin = "Étain"
+Sea_water = "Eau de mer"
+Water = "Eau"
+Air = "Air"
+Glass = "Verre"
+Wood = "Bois"
 CoulombTag = "Constante de Coulomb"
 EscapeVelocity = "Vitesse de libération"
 EscapeVelocityFromEarth = "De la Terre"
--- a/apps/toolbox.hu.i18n
+++ b/apps/toolbox.hu.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Avogadro Állandó"
 GasTag = "Gázállandó"
 Electromagnetism = "Elektromágnesesség"
 CoulombTag = "Coulomb állandó"
+ConductivityConstants = "Vezetőképességi konstansok"
+Electricity = "Elektromosság"
+ResistivityConstants = "Ellenállósági konstansok"
+Silver = "Ezüst"
+Copper = "Réz"
+Gold = "Arany"
+Aluminium = "Alumínium"
+Calcium = "Kalcium"
+Tungsten = "Wolfram"
+Zinc = "Cink"
+Cobalt = "Cobalt"
+Nickel = "Nickel"
+Lithium = "Lítium"
+Iron = "Vas"
+Platinum = "Platina"
+Tin = "Bádog"
+Sea_water = "Tengeri víz"
+Water = "Víz"
+Air = "Air"
+Glass = "Üveg"
+Wood = "Wood"
 Vacuum_permittivityTag = "Vákuum-engedély"
 Vacuum_permeabilityTag = "Vákuumpermeabilitás"
 PlanckTag = "Planck Állandó"
--- a/apps/toolbox.it.i18n
+++ b/apps/toolbox.it.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Costanto di Avogadro"
 GasTag = "Costante dei gas"
 Electromagnetism = "Elettromagnetismo"
 CoulombTag = "Costante di coulomb"
+ConductivityConstants = "Costanti di conducibilità"
+Electricity = "Elettricità"
+ResistivityConstants = "Costanti di resistività"
+Silver = "Argento"
+Copper = "Rame"
+Gold = "Oro"
+Aluminium = "Aluminio"
+Calcium = "Calcio"
+Tungsten = "Tungsteno"
+Zinc = "Zinco"
+Cobalt = "Cobalto"
+Nickel = "Nichel"
+Lithium = "Litio"
+Iron = "Ferro"
+Platinum = "Platino"
+Tin = "Stagno"
+Sea_water = "Acqua di mare"
+Water = "Acqua"
+Air = "Aria"
+Glass = "Vetro"
+Wood = "Legno"
 Vacuum_permittivityTag = "Permittività del vuoto"
 Vacuum_permeabilityTag = "Permeabilità al vuoto"
 PlanckTag = "Costante di Planck"
--- a/apps/toolbox.nl.i18n
+++ b/apps/toolbox.nl.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Avogadroconstante"
 GasTag = "Gasconstante"
 Electromagnetism = "Elektromagnetisme"
 CoulombTag = "Coulombconstante"
+ConductivityConstants = "Geleidingsconstanten"
+Electricity = "Elektriciteit"
+ResistivityConstants = "Weerstandsconstanten"
+Silver = "Zilver"
+Copper = "Koper"
+Gold = "Goud"
+Aluminium = "Aluminium"
+Calcium = "Calcium"
+Tungsten = "Tungsten"
+Zinc = "Zink"
+Cobalt = "Kobalt"
+Nickel = "Nikkel"
+Lithium = "Lithium"
+Iron = "IJzer"
+Platinum = "Platina"
+Tin = "Tin"
+Sea_water = "Zeewater"
+Water = "Water"
+Air = "Lucht"
+Glass = "Glas"
+Wood = "Hout"
 Vacuum_permittivityTag = "Elektrische veldconstante"
 Vacuum_permeabilityTag = "Magnetische veldconstante"
 PlanckTag = "Planckconstante"
--- a/apps/toolbox.pt.i18n
+++ b/apps/toolbox.pt.i18n
@@ -430,6 +430,27 @@ AvogadroTag = "Constante Avogadro"
 GasTag = "Constante de gás"
 Electromagnetism = "Eletromagnetismo"
 CoulombTag = "Constante de Coulomb"
+ConductivityConstants = "Constantes de condutividade"
+Electricity = "Electricidade"
+ResistivityConstants = "Constantes de resistividade"
+Silver = "Prata"
+Copper = "Cobre"
+Gold = "Ouro"
+Aluminium = "Alumínio"
+Calcium = "Cálcio"
+Tungsten = "Tungsténio"
+Zinc = "Zinco"
+Cobalt = "Cobalto"
+Nickel = "Níquel"
+Lithium = "Lítio"
+Iron = "Ferro de engomar"
+Platinum = "Platina"
+Tin = "Lata"
+Sea_water = "Água do mar"
+Water = "Água"
+Air = "Ar"
+Glass = "Vidro"
+Wood = "Madeira"
 Vacuum_permittivityTag = "Permissividade a vácuo"
 Vacuum_permeabilityTag = "Permeabilidade ao vácuo"
 PlanckTag = "Constante de Planck"