Adding more unit implicit conversions from string

OpenBioSim · Jan 6, 2024 · 3770b67 · 3770b67
1 parent 088abb0
commit 3770b67
Show file tree

Hide file tree

Showing 2 changed files with 83 additions and 4 deletions.
diff --git a/wrapper/Units/_Units.main.cpp b/wrapper/Units/_Units.main.cpp
@@ -52,6 +52,60 @@ BOOST_PYTHON_MODULE(_Units){
 
     bp::implicitly_convertible< QString, SireUnits::Dimension::GeneralUnit >();
 
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Mass >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::MolarMass >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Length >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Time >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Charge >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::MolarCharge >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Temperature >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Angle >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Area >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Volume >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Velocity >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::AngularVelocity >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Acceleration >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::AngularAcceleration >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Energy >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::MolarEnergy >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Power >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::MolarPower >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Density >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::MolarDensity >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Force >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Pressure >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Capacitance >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Current >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::Potential >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::HarmonicBondConstant >();
+
+    bp::implicitly_convertible< QString, SireUnits::Dimension::HarmonicAngleConstant >();
+
     register_SireUnits_dimensions();
 
     register_man_global_variables();

diff --git a/wrapper/Units/special_code.py b/wrapper/Units/special_code.py
@@ -49,9 +49,7 @@ def findGlobals():
 
             if match:
                 name = match.group(1)
-                print(
-                    '    scope().attr("%s") = %s;\n' % (name, name), file=FILE
-                )
+                print('    scope().attr("%s") = %s;\n' % (name, name), file=FILE)
 
     # add Celsius and Fahrenheit manually
     print('    scope().attr("celsius") = celsius;\n', file=FILE)
@@ -118,5 +116,32 @@ def fixMB(mb):
 implicitly_convertible = [
     ("SireUnits::Dimension::TempBase", "SireUnits::Dimension::Temperature"),
     ("double", "SireUnits::Dimension::GeneralUnit"),
-    ("QString", "SireUnits::Dimension::GeneralUnit")
+    ("QString", "SireUnits::Dimension::GeneralUnit"),
+    ("QString", "SireUnits::Dimension::Mass"),
+    ("QString", "SireUnits::Dimension::MolarMass"),
+    ("QString", "SireUnits::Dimension::Length"),
+    ("QString", "SireUnits::Dimension::Time"),
+    ("QString", "SireUnits::Dimension::Charge"),
+    ("QString", "SireUnits::Dimension::MolarCharge"),
+    ("QString", "SireUnits::Dimension::Temperature"),
+    ("QString", "SireUnits::Dimension::Angle"),
+    ("QString", "SireUnits::Dimension::Area"),
+    ("QString", "SireUnits::Dimension::Volume"),
+    ("QString", "SireUnits::Dimension::Velocity"),
+    ("QString", "SireUnits::Dimension::AngularVelocity"),
+    ("QString", "SireUnits::Dimension::Acceleration"),
+    ("QString", "SireUnits::Dimension::AngularAcceleration"),
+    ("QString", "SireUnits::Dimension::Energy"),
+    ("QString", "SireUnits::Dimension::MolarEnergy"),
+    ("QString", "SireUnits::Dimension::Power"),
+    ("QString", "SireUnits::Dimension::MolarPower"),
+    ("QString", "SireUnits::Dimension::Density"),
+    ("QString", "SireUnits::Dimension::MolarDensity"),
+    ("QString", "SireUnits::Dimension::Force"),
+    ("QString", "SireUnits::Dimension::Pressure"),
+    ("QString", "SireUnits::Dimension::Capacitance"),
+    ("QString", "SireUnits::Dimension::Current"),
+    ("QString", "SireUnits::Dimension::Potential"),
+    ("QString", "SireUnits::Dimension::HarmonicBondConstant"),
+    ("QString", "SireUnits::Dimension::HarmonicAngleConstant"),
 ]