Skip to content

Commit 2ca0260

Browse files
ajbairdajbaird
committed
abaird - fixing some rebase issues
1 parent 72141ba commit 2ca0260

File tree

4 files changed

+46
-261
lines changed

4 files changed

+46
-261
lines changed

‎projects/biogears/libBiogears/include/biogears/cdm/patient/actions/SEChestTube.h‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ specific language governing permissions and limitations under the License.
1414
#include <biogears/cdm/patient/actions/SEPatientAction.h>
1515
#include <biogears/cdm/enums/SEPatientActionsEnums.h>
1616

17-
#include <biogears/schema/cdm/PatientActions.hxx>
18-
1917
#include <random>
2018

2119
namespace biogears {
@@ -33,15 +31,12 @@ class BIOGEARS_API SEChestTube : public SEPatientAction {
3331
static constexpr const char* TypeTag() { return "SEChestTube"; };
3432
const char* classname() const override { return TypeTag(); }
3533

36-
virtual void Clear() override; // clear memory
34+
virtual void Invalidate() override; //clear memory
3735

3836
virtual bool IsValid() const override;
3937
virtual bool IsActive() const override;
4038
virtual void SetActive(bool b);
4139

42-
virtual bool Load(const CDM::ChestTubeData& in, std::default_random_engine* rd = nullptr);
43-
virtual CDM::ChestTubeData* Unload() const override;
44-
4540
virtual SESide GetSide() const;
4641
virtual void SetSide(SESide LeftOrRight);
4742
virtual bool HasSide() const;
@@ -52,9 +47,6 @@ class BIOGEARS_API SEChestTube : public SEPatientAction {
5247
bool operator==(const SEChestTube& rhs) const;
5348
bool operator!=(const SEChestTube& rhs) const;
5449

55-
protected:
56-
virtual void Unload(CDM::ChestTubeData& data) const;
57-
5850
protected:
5951
SESide m_Side;
6052
SEOnOff m_State;

‎projects/biogears/libBiogears/src/cdm/patient/actions/SEChestTube.cpp‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ SEChestTube::SEChestTube()
2323
//-------------------------------------------------------------------------------
2424
SEChestTube::~SEChestTube()
2525
{
26-
Clear();
26+
Invalidate();
2727
}
2828
//-------------------------------------------------------------------------------
29-
void SEChestTube::Clear()
29+
void SEChestTube::Invalidate()
3030
{
31-
SEPatientAction::Clear();
31+
SEPatientAction::Invalidate();
3232
m_State = SEOnOff::Off;
3333
m_Side = SESide::Invalid;
3434
}
@@ -48,24 +48,6 @@ void SEChestTube::SetActive(bool b)
4848
m_State = b ? SEOnOff::On : SEOnOff::Off;
4949
}
5050
//-------------------------------------------------------------------------------
51-
bool SEChestTube::Load(const CDM::ChestTubeData& in, std::default_random_engine* rd)
52-
{
53-
io::PatientActions::UnMarshall(in, *this, rd);
54-
return true;
55-
}
56-
//-------------------------------------------------------------------------------
57-
CDM::ChestTubeData* SEChestTube::Unload() const
58-
{
59-
CDM::ChestTubeData* data(new CDM::ChestTubeData());
60-
Unload(*data);
61-
return data;
62-
}
63-
//-------------------------------------------------------------------------------
64-
void SEChestTube::Unload(CDM::ChestTubeData& data) const
65-
{
66-
io::PatientActions::Marshall(*this, data);
67-
}
68-
//-------------------------------------------------------------------------------
6951
SESide SEChestTube::GetSide() const
7052
{
7153
return m_Side;

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

Lines changed: 16 additions & 158 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,8 @@ void SEPatientActionCollection::Invalidate()
331331
RemoveConsumeNutrients();
332332
RemoveLeftChestOcclusiveDressing();
333333
RemoveRightChestOcclusiveDressing();
334+
RemoveLeftChestTube();
335+
RemoveRightChestTube();
334336
RemoveExercise();
335337
RemoveEbola();
336338
RemoveInfection();
@@ -350,158 +352,14 @@ void SEPatientActionCollection::Invalidate()
350352
RemoveUrinate();
351353
RemoveOverride();
352354

353-
DELETE_MAP_SECOND(m_Escharotomies);
354-
DELETE_MAP_SECOND(m_Hemorrhages);
355-
DELETE_MAP_SECOND(m_PainStimuli);
356-
DELETE_MAP_SECOND(m_SubstanceBolus);
357-
DELETE_MAP_SECOND(m_SubstanceInfusions);
358-
DELETE_MAP_SECOND(m_SubstanceOralDoses);
359-
DELETE_MAP_SECOND(m_SubstanceCompoundInfusions);
360-
DELETE_MAP_SECOND(m_Tourniquets);
361-
}
362-
//-------------------------------------------------------------------------------
363-
void SEPatientActionCollection::Unload(std::vector<CDM::ActionData*>& to)
364-
{
365-
if (HasAcuteRespiratoryDistress()) {
366-
to.push_back(GetAcuteRespiratoryDistress()->Unload());
367-
}
368-
if (HasAcuteStress()) {
369-
to.push_back(GetAcuteStress()->Unload());
370-
}
371-
if (HasExampleAction()) {
372-
to.push_back(GetExampleAction()->Unload());
373-
}
374-
if (HasAirwayObstruction()) {
375-
to.push_back(GetAirwayObstruction()->Unload());
376-
}
377-
if (HasApnea()) {
378-
to.push_back(GetApnea()->Unload());
379-
}
380-
if (HasAsthmaAttack()) {
381-
to.push_back(GetAsthmaAttack()->Unload());
382-
}
383-
if (HasBrainInjury()) {
384-
to.push_back(GetBrainInjury()->Unload());
385-
}
386-
if (HasBronchoconstriction()) {
387-
to.push_back(GetBronchoconstriction()->Unload());
388-
}
389-
if (HasBurnWound()) {
390-
to.push_back(GetBurnWound()->Unload());
391-
}
392-
if (HasCardiacArrest()) {
393-
to.push_back(GetCardiacArrest()->Unload());
394-
}
395-
if (HasChestCompressionForce()) {
396-
to.push_back(GetChestCompressionForce()->Unload());
397-
}
398-
if (HasChestCompressionForceScale()) {
399-
to.push_back(GetChestCompressionForceScale()->Unload());
400-
}
401-
if (HasLeftChestOcclusiveDressing()) {
402-
to.push_back(GetLeftChestOcclusiveDressing()->Unload());
403-
}
404-
if (HasRightChestOcclusiveDressing()) {
405-
to.push_back(GetRightChestOcclusiveDressing()->Unload());
406-
}
407-
if (HasLeftChestTube()) {
408-
to.push_back(GetLeftChestTube()->Unload());
409-
}
410-
if (HasRightChestTube()) {
411-
to.push_back(GetRightChestTube()->Unload());
412-
}
413-
if (HasConsciousRespiration()) {
414-
to.push_back(GetConsciousRespiration()->Unload());
415-
}
416-
if (HasConsumeNutrients()) {
417-
to.push_back(GetConsumeNutrients()->Unload());
418-
}
419-
if (HasEscharotomy()) {
420-
for (auto itr : GetEscharotomies()) {
421-
to.push_back(itr.second->Unload());
422-
}
423-
}
424-
if (HasEbola()) {
425-
to.push_back(GetEbola()->Unload());
426-
}
427-
if (HasExercise()) {
428-
to.push_back(GetExercise()->Unload());
429-
}
430-
if (HasHemorrhage()) {
431-
for (auto itr : GetHemorrhages()) {
432-
to.push_back(itr.second->Unload());
433-
}
434-
}
435-
if (HasInfection()) {
436-
to.push_back(GetInfection()->Unload());
437-
}
438-
if (HasIntubation()) {
439-
to.push_back(GetIntubation()->Unload());
440-
}
441-
if (HasMechanicalVentilation()) {
442-
to.push_back(GetMechanicalVentilation()->Unload());
443-
}
444-
if (HasNasalCannula()) {
445-
to.push_back(GetNasalCannula()->Unload());
446-
}
447-
if (HasLeftNeedleDecompression()) {
448-
to.push_back(GetLeftNeedleDecompression()->Unload());
449-
}
450-
if (HasRightNeedleDecompression()) {
451-
to.push_back(GetRightNeedleDecompression()->Unload());
452-
}
453-
if (HasPainStimulus()) {
454-
for (auto itr : GetPainStimuli()) {
455-
to.push_back(itr.second->Unload());
456-
}
457-
}
458-
if (HasPericardialEffusion()) {
459-
to.push_back(GetPericardialEffusion()->Unload());
460-
}
461-
if (HasPulmonaryShunt()) {
462-
to.push_back(GetPulmonaryShunt()->Unload());
463-
}
464-
if (HasRadiationAbsorbedDose()) {
465-
to.push_back(GetRadiationAbsorbedDose()->Unload());
466-
}
467-
if (HasSleepState()) {
468-
to.push_back(GetSleepState()->Unload());
469-
}
470-
if (HasLeftClosedTensionPneumothorax()) {
471-
to.push_back(GetLeftClosedTensionPneumothorax()->Unload());
472-
}
473-
if (HasLeftOpenTensionPneumothorax()) {
474-
to.push_back(GetLeftOpenTensionPneumothorax()->Unload());
475-
}
476-
if (HasRightClosedTensionPneumothorax()) {
477-
to.push_back(GetRightClosedTensionPneumothorax()->Unload());
478-
}
479-
if (HasRightOpenTensionPneumothorax()) {
480-
to.push_back(GetRightOpenTensionPneumothorax()->Unload());
481-
}
482-
for (auto itr : GetSubstanceBoluses()) {
483-
to.push_back(itr.second->Unload());
484-
}
485-
for (auto itr : GetSubstanceInfusions()) {
486-
to.push_back(itr.second->Unload());
487-
}
488-
for (auto itr : GetSubstanceOralDoses()) {
489-
to.push_back(itr.second->Unload());
490-
}
491-
for (auto itr : GetSubstanceCompoundInfusions()) {
492-
to.push_back(itr.second->Unload());
493-
}
494-
if (HasTourniquet()) {
495-
for (auto itr : GetTourniquets()) {
496-
to.push_back(itr.second->Unload());
497-
}
498-
}
499-
if (HasUrinate()) {
500-
to.push_back(GetUrinate()->Unload());
501-
}
502-
if (HasOverride()) {
503-
to.push_back((GetOverride()->Unload()));
504-
}
355+
DELETE_MAP_OF_POINTERS(m_Escharotomies);
356+
DELETE_MAP_OF_POINTERS(m_Hemorrhages);
357+
DELETE_MAP_OF_POINTERS(m_PainStimuli);
358+
DELETE_MAP_OF_POINTERS(m_SubstanceBolus);
359+
DELETE_MAP_OF_POINTERS(m_SubstanceInfusions);
360+
DELETE_MAP_OF_POINTERS(m_SubstanceOralDoses);
361+
DELETE_MAP_OF_POINTERS(m_SubstanceCompoundInfusions);
362+
DELETE_MAP_OF_POINTERS(m_Tourniquets);
505363
}
506364
//-------------------------------------------------------------------------------
507365
bool SEPatientActionCollection::ProcessAction(const SEPatientAction& action, const PhysiologyEngine& engine)
@@ -725,23 +583,23 @@ bool SEPatientActionCollection::ProcessAction(const SEPatientAction& action, con
725583
}
726584
}
727585

728-
auto chestTube = dynamic_cast<const SEChestTube*>(&action);
729-
if (chestTube != nullptr) {
730-
if (chestTube->Side() == SESide::Left) {
586+
auto chestTu = dynamic_cast<const SEChestTube*>(&action);
587+
if (chestTu != nullptr) {
588+
if (chestTu->GetSide() == SESide::Left) {
731589
if (m_LeftChestTube == nullptr) {
732590
m_LeftChestTube = new SEChestTube();
733591
}
734-
m_LeftChestTube->Load(*chestTube);
592+
CDM_PATIENT_ACTION_COPY(ChestTube, *chestTu, *m_LeftChestTube)
735593
if (!m_LeftChestTube->IsActive()) {
736594
RemoveLeftChestTube();
737595
return true;
738596
}
739597
return IsValid(*m_LeftChestTube);
740-
} else if (chestTube->Side() == SESide::Right) {
598+
} else if (chestTu->GetSide() == SESide::Right) {
741599
if (m_RightChestTube == nullptr) {
742600
m_RightChestTube = new SEChestTube();
743601
}
744-
m_RightChestTube->Load(*chestTube);
602+
CDM_PATIENT_ACTION_COPY(ChestTube, *chestTu, *m_RightChestTube)
745603
if (!m_RightChestTube->IsActive()) {
746604
RemoveRightChestTube();
747605
return true;

0 commit comments

Comments
 (0)