Updates will be applied on October 27th between 12pm - 12:45pm EDT (UTC-0400). Gitlab may be slow during the maintenance window.

Commit c7e9e7ff authored by Aaron Bray's avatar Aaron Bray
Browse files

Complete MechVent Aerosols, exposing actions/conditions and methodology data via api

parent c44b83c2
......@@ -65,13 +65,18 @@ bool SEAcuteStress::HasSeverity() const
{
return m_Severity==nullptr?false:m_Severity->IsValid();
}
SEScalar0To1& SEAcuteStress::GetSeverity()
{
if(m_Severity==nullptr)
m_Severity=new SEScalar0To1();
return *m_Severity;
}
double SEAcuteStress::GetSeverity() const
{
if (m_Severity == nullptr)
return SEScalar::dNaN();
return m_Severity->GetValue();
}
void SEAcuteStress::ToString(std::ostream &str) const
{
......
......@@ -26,7 +26,8 @@ protected:
public:
virtual bool HasSeverity() const;
virtual SEScalar0To1& GetSeverity();
virtual SEScalar0To1& GetSeverity();
virtual double GetSeverity() const;
virtual void ToString(std::ostream &str) const;
......
......@@ -65,13 +65,18 @@ bool SEAirwayObstruction::HasSeverity() const
{
return m_Severity==nullptr?false:m_Severity->IsValid();
}
SEScalar0To1& SEAirwayObstruction::GetSeverity()
{
if(m_Severity==nullptr)
m_Severity=new SEScalar0To1();
return *m_Severity;
}
double SEAirwayObstruction::GetSeverity() const
{
if (m_Severity == nullptr)
return SEScalar::dNaN();
return m_Severity->GetValue();
}
void SEAirwayObstruction::ToString(std::ostream &str) const
{
......
......@@ -26,7 +26,8 @@ protected:
public:
virtual bool HasSeverity() const;
virtual SEScalar0To1& GetSeverity();
virtual SEScalar0To1& GetSeverity();
virtual double GetSeverity() const;
virtual void ToString(std::ostream &str) const;
......
......@@ -65,13 +65,18 @@ bool SEApnea::HasSeverity() const
{
return m_Severity==nullptr?false:m_Severity->IsValid();
}
SEScalar0To1& SEApnea::GetSeverity()
{
if(m_Severity==nullptr)
m_Severity=new SEScalar0To1();
return *m_Severity;
}
double SEApnea::GetSeverity() const
{
if (m_Severity == nullptr)
return SEScalar::dNaN();
return m_Severity->GetValue();
}
void SEApnea::ToString(std::ostream &str) const
{
......
......@@ -26,7 +26,8 @@ protected:
public:
virtual bool HasSeverity() const;
virtual SEScalar0To1& GetSeverity();
virtual SEScalar0To1& GetSeverity();
virtual double GetSeverity() const;
virtual void ToString(std::ostream &str) const;
......
......@@ -69,6 +69,12 @@ SEScalar0To1& SEAsthmaAttack::GetSeverity()
m_Severity=new SEScalar0To1();
return *m_Severity;
}
double SEAsthmaAttack::GetSeverity() const
{
if (m_Severity == nullptr)
return SEScalar::dNaN();
return m_Severity->GetValue();
}
void SEAsthmaAttack::ToString(std::ostream &str) const
{
......
......@@ -26,7 +26,8 @@ protected:
public:
virtual bool HasSeverity() const;
virtual SEScalar0To1& GetSeverity();
virtual SEScalar0To1& GetSeverity();
virtual double GetSeverity() const;
virtual void ToString(std::ostream &str) const;
......
......@@ -73,6 +73,12 @@ SEScalar0To1& SEBrainInjury::GetSeverity()
m_Severity=new SEScalar0To1();
return *m_Severity;
}
double SEBrainInjury::GetSeverity() const
{
if (m_Severity == nullptr)
return SEScalar::dNaN();
return m_Severity->GetValue();
}
cdm::eBrainInjury_Type SEBrainInjury::GetType() const
{
......
......@@ -29,7 +29,8 @@ protected:
public:
virtual bool HasSeverity() const;
virtual SEScalar0To1& GetSeverity();
virtual SEScalar0To1& GetSeverity();
virtual double GetSeverity() const;
virtual cdm::eBrainInjury_Type GetType() const;
virtual void SetType(cdm::eBrainInjury_Type t);
......
......@@ -67,6 +67,12 @@ SEScalarTime& SEBreathHold::GetPeriod()
m_Period = new SEScalarTime();
return *m_Period;
}
double SEBreathHold::GetPeriod(const TimeUnit& unit) const
{
if (m_Period == nullptr)
return SEScalar::dNaN();
return m_Period->GetValue(unit);
}
void SEBreathHold::ToString(std::ostream &str) const
{
......
......@@ -28,6 +28,7 @@ public:
virtual bool HasPeriod() const;
virtual SEScalarTime& GetPeriod();
virtual double GetPeriod(const TimeUnit& unit) const;
virtual void ToString(std::ostream &str) const;
protected:
......
......@@ -69,6 +69,12 @@ SEScalar0To1& SEBronchoconstriction::GetSeverity()
m_Severity=new SEScalar0To1();
return *m_Severity;
}
double SEBronchoconstriction::GetSeverity() const
{
if (m_Severity == nullptr)
return SEScalar::dNaN();
return m_Severity->GetValue();
}
void SEBronchoconstriction::ToString(std::ostream &str) const
{
......
......@@ -26,7 +26,8 @@ protected:
public:
virtual bool HasSeverity() const;
virtual SEScalar0To1& GetSeverity();
virtual SEScalar0To1& GetSeverity();
virtual double GetSeverity() const;
virtual void ToString(std::ostream &str) const;
......
......@@ -61,6 +61,6 @@ void SECardiacArrest::ToString(std::ostream &str) const
str << "Patient Action : Cardiac Arrest";
if (HasComment())
str << "\n\tComment: " << m_Comment;
str << "\n\tState: " << m_State;
str << "\n\tState: " << cdm::eSwitch_Name(m_State);;
str << std::flush;
}
\ No newline at end of file
......@@ -62,13 +62,18 @@ bool SEChestCompressionForce::HasForce() const
{
return m_Force == nullptr ? false : m_Force->IsValid();
}
SEScalarForce& SEChestCompressionForce::GetForce()
{
if (m_Force == nullptr)
m_Force = new SEScalarForce();
return *m_Force;
}
double SEChestCompressionForce::GetForce(const ForceUnit& unit) const
{
if (m_Force == nullptr)
return SEScalar::dNaN();
return m_Force->GetValue(unit);
}
void SEChestCompressionForce::ToString(std::ostream &str) const
{
......
......@@ -28,6 +28,7 @@ public:
virtual bool HasForce() const;
virtual SEScalarForce& GetForce();
virtual double GetForce(const ForceUnit& unit) const;
virtual void ToString(std::ostream &str) const;
......
......@@ -75,6 +75,12 @@ SEScalar0To1& SEChestCompressionForceScale::GetForceScale()
m_ForceScale = new SEScalar0To1();
return *m_ForceScale;
}
double SEChestCompressionForceScale::GetForceScale() const
{
if (m_ForceScale == nullptr)
return SEScalar::dNaN();
return m_ForceScale->GetValue();
}
bool SEChestCompressionForceScale::HasForcePeriod() const
{
......@@ -86,6 +92,12 @@ SEScalarTime& SEChestCompressionForceScale::GetForcePeriod()
m_ForcePeriod = new SEScalarTime();
return *m_ForcePeriod;
}
double SEChestCompressionForceScale::GetForcePeriod(const TimeUnit& unit) const
{
if (m_ForcePeriod == nullptr)
return SEScalar::dNaN();
return m_ForcePeriod->GetValue(unit);
}
void SEChestCompressionForceScale::ToString(std::ostream &str) const
{
......
......@@ -26,9 +26,11 @@ public:
virtual bool HasForceScale() const;
virtual SEScalar0To1& GetForceScale();
virtual double GetForceScale() const;
virtual bool HasForcePeriod() const;
virtual SEScalarTime& GetForcePeriod();
virtual double GetForcePeriod(const TimeUnit& unit) const;
virtual void ToString(std::ostream &str) const;
......
......@@ -70,6 +70,12 @@ SEScalar0To1& SEExercise::GetIntensity()
m_Intensity = new SEScalar0To1();
return *m_Intensity;
}
double SEExercise::GetIntensity() const
{
if (m_Intensity == nullptr)
return SEScalar::dNaN();
return m_Intensity->GetValue();
}
void SEExercise::ToString(std::ostream &str) const
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment