Connecting the burn time xsd updates to the implementation.

Author: ntatum94

projects/biogears/libBiogears/include/biogears/cdm/patient/actions/SEBurnWound.h

@@ -55,7 +55,8 @@ class BIOGEARS_API SEBurnWound : public SEPatientAction {
   bool HasDegreeOfBurn() const;
   CDM::enumBurnDegree::value GetDegreeOfBurn() const;
   void SetDegreeOfBurn(CDM::enumBurnDegree::value value);
-  void SEBurnWound::SetTimeOfBurn(SEScalarTime burnTime);
+  void SEBurnWound::SetTimeOfBurn(double burnTime);
+  double SEBurnWound::GetTimeOfBurn() const;
 
   double GetBurnIntensity() const;
 

projects/biogears/libBiogears/include/biogears/cdm/scenario/SEPatientActionCollection.h

@@ -434,8 +434,6 @@ class BIOGEARS_API SEPatientActionCollection : public Loggable {
   SEUrinate* m_Urinate;
   SEOverride* m_OverrideAction;
 
-  double m_BurnIntroductionTimeStamp;
-
   std::map<std::string, SEHemorrhage*> m_Hemorrhages;
   mutable std::map<std::string, SEHemorrhage*>::const_iterator m_HemorrhageItr;
 

projects/biogears/libBiogears/src/cdm/patient/actions/SEBurnWound.cpp

@@ -19,7 +19,7 @@ namespace biogears {
 SEBurnWound::SEBurnWound()
   : SEPatientAction()
   , m_DegreeModifier(1.0)
-  , m_burnInitiationTime(0.0)
+  , m_burnInitiationTime(0.0) // Automatically set on burn instantiation. Exists in xsd for state loading/unloading 
   , m_TBSA(new SEScalar0To1()) // User input, size of wound measured by total body surface area
   , m_compartments(5)
 {
@@ -42,6 +42,7 @@ void SEBurnWound::Clear()
   m_Inflammation = false;
   m_compartmentsAffected.clear();
   m_DegreeOfBurn = (CDM::enumBurnDegree::value)-1;
+  m_burnInitiationTime = 0.;
   m_TBSA->Clear();
 }
 //-----------------------------------------------------------------------------
@@ -66,6 +67,10 @@ bool SEBurnWound::Load(const CDM::BurnWoundData& in)
     SetDegreeOfBurn(in.DegreeOfBurn().get());
   }
 
+  if (in.BurnInitiationTime().present()) {
+    SetTimeOfBurn(in.BurnInitiationTime().get());
+  }
+
   m_compartmentsAffected.clear();
   std::string compt;
   for (const std::string compData : in.Compartments()) {
@@ -97,6 +102,9 @@ void SEBurnWound::Unload(CDM::BurnWoundData& data) const
     data.TotalBodySurfaceArea(std::unique_ptr<CDM::Scalar0To1Data>(m_TBSA->Unload()));
   if (HasDegreeOfBurn())
     data.DegreeOfBurn(m_DegreeOfBurn);
+  if (m_burnInitiationTime != 0.) {
+    data.BurnInitiationTime(m_burnInitiationTime);
+  }
   for (std::string compData : m_compartmentsAffected) {
     data.Compartments().push_back(compData);
   }
@@ -166,9 +174,14 @@ void SEBurnWound::SetDegreeOfBurn(CDM::enumBurnDegree::value bd)
   }
 }
 //-----------------------------------------------------------------------------
-void SEBurnWound::SetTimeOfBurn(SEScalarTime burnTime)
+void SEBurnWound::SetTimeOfBurn(double burnTime)
+{
+  m_burnInitiationTime = burnTime;
+}
+//-----------------------------------------------------------------------------
+double SEBurnWound::GetTimeOfBurn() const
 {
-  m_burnInitiationTime = burnTime.GetValue();
+  return m_burnInitiationTime;
 }
 //-----------------------------------------------------------------------------
 double SEBurnWound::GetBurnIntensity() const

projects/biogears/libBiogears/src/cdm/scenario/SEPatientActionCollection.cpp

@@ -634,7 +634,9 @@ bool SEPatientActionCollection::ProcessAction(const CDM::PatientActionData& acti
 
 
     m_BurnWound->Load(*burn);
-    m_BurnIntroductionTimeStamp = engine.GetSimulationTime(TimeUnit::s);
+    if (m_BurnWound->GetTimeOfBurn() == 0.0) {
+      m_BurnWound->SetTimeOfBurn(engine.GetSimulationTime(TimeUnit::s));
+    }
     if (!m_BurnWound->IsActive()) {
       RemoveBurnWound();
       return true;

projects/biogears/libBiogears/src/engine/Systems/Energy.cpp

@@ -744,7 +744,7 @@ void Energy::UpdateHeatResistance()
       double burnTemperature = (30.3 * std::exp(-1.0 * std::pow(t - 7.81, 2) / 11.7)) + GetSkinTemperature(TemperatureUnit::C);
       GetBurnSkinTemperature().SetValue(burnTemperature, TemperatureUnit::C);
     } else {
-      burnAction->SetTimeOfBurn(m_data.GetSimulationTime());
+      burnAction->SetTimeOfBurn(m_data.GetSimulationTime().GetValue());
     }
   }
 }

share/xsd/cdm/PatientActions.xsd

@@ -171,7 +171,8 @@ specific language governing permissions and limitations under the License.
     <xs:complexContent>
       <xs:extension base="PatientActionData">
         <xs:sequence>
-          <xs:element name="DegreeOfBurn" type="enumBurnDegree" minOccurs="0" maxOccurs="1"/>
+          <xs:element name="BurnInitiationTime" type="xs:double" minOccurs="0" maxOccurs="1"/> <!--Automatically set on burn instantiation. Exists here for state loading/unloading-->
+		  <xs:element name="DegreeOfBurn" type="enumBurnDegree" minOccurs="0" maxOccurs="1"/>
 		  <xs:element name="TotalBodySurfaceArea" type="Scalar0To1Data" minOccurs="1" maxOccurs="1"/>
           <xs:element name="Compartments" type="xs:string" minOccurs="0" maxOccurs="5"/>
           <!--Primarily used in calculating comaprtment syndrome. Not specifying will assume trunk-->