Commit 5017a54b authored by Aaron Bray's avatar Aaron Bray
Browse files

Pretty much cleaned up all headers, looking at a few things in Java

parent e22828cd
......@@ -4,3 +4,38 @@
#include "stdafx.h"
#include "substance/SESubstanceTransport.h"
#include "properties/SEScalarMass.h"
#include "properties/SEScalarMassPerVolume.h"
#include "properties/SEScalarVolume.h"
#include "properties/SEScalarVolumePerTime.h"
SEGasTransporter::SEGasTransporter(Logger* logger) : SESubstanceTransporter<SEGasTransportGraph, VolumePerTimeUnit, VolumeUnit, VolumeUnit, NoUnit>(
VolumePerTimeUnit::L_Per_s, VolumeUnit::L, VolumeUnit::L, NoUnit::unitless, logger)
{
}
SEGasTransporter::SEGasTransporter(const VolumePerTimeUnit& fUnit, const VolumeUnit& qUnit, const VolumeUnit& eUnit, Logger* logger)
: SESubstanceTransporter<SEGasTransportGraph, VolumePerTimeUnit, VolumeUnit, VolumeUnit, NoUnit>(fUnit, qUnit, eUnit, NoUnit::unitless, logger)
{
}
SEGasTransporter::~SEGasTransporter()
{
}
SELiquidTransporter::SELiquidTransporter(Logger* logger) : SESubstanceTransporter<SELiquidTransportGraph, VolumePerTimeUnit, VolumeUnit, MassUnit, MassPerVolumeUnit>(
VolumePerTimeUnit::L_Per_s, VolumeUnit::mL, MassUnit::ug, MassPerVolumeUnit::ug_Per_mL, logger)
{
}
SELiquidTransporter::SELiquidTransporter(const VolumePerTimeUnit& fUnit, const VolumeUnit& qUnit, const MassUnit& eUnit, const MassPerVolumeUnit& iUnit, Logger* logger)
: SESubstanceTransporter<SELiquidTransportGraph, VolumePerTimeUnit, VolumeUnit, MassUnit, MassPerVolumeUnit>(fUnit, qUnit, eUnit, iUnit, logger)
{
}
SELiquidTransporter::~SELiquidTransporter()
{
}
\ No newline at end of file
......@@ -99,7 +99,20 @@ protected:
const IntensiveUnit &m_IntensiveUnit;
};
using SEGasTransporter = SESubstanceTransporter<SEGasTransportGraph, VolumePerTimeUnit, VolumeUnit, VolumeUnit, NoUnit>;
using SELiquidTransporter = SESubstanceTransporter<SELiquidTransportGraph, VolumePerTimeUnit, VolumeUnit, MassUnit, MassPerVolumeUnit>;
class SEGasTransporter : public SESubstanceTransporter<SEGasTransportGraph, VolumePerTimeUnit, VolumeUnit, VolumeUnit, NoUnit>
{
public:
SEGasTransporter(Logger* logger);
SEGasTransporter(const VolumePerTimeUnit& fUnit, const VolumeUnit& qUnit, const VolumeUnit& eUnit, Logger* logger);
~SEGasTransporter();
};
class SELiquidTransporter : public SESubstanceTransporter<SELiquidTransportGraph, VolumePerTimeUnit, VolumeUnit, MassUnit, MassPerVolumeUnit>
{
public:
SELiquidTransporter(Logger* logger);
SELiquidTransporter(const VolumePerTimeUnit& fUnit, const VolumeUnit& qUnit, const MassUnit& eUnit, const MassPerVolumeUnit& iUnit, Logger* logger);
~SELiquidTransporter();
};
#include "substance/SESubstanceTransport.inl"
\ No newline at end of file
......@@ -6,6 +6,7 @@ CDM_BIND_DECL(ElectroCardioGramWaveformListData)
PROTO_PUSH
#include "bind/cdm/ElectroCardioGramEnums.pb.h"
PROTO_POP
class SEElectroCardioGramWaveform;
class CDM_DECL SEElectroCardioGramWaveformInterpolator : public Loggable
{
......
......@@ -4,12 +4,12 @@
package mil.tatrc.physiology.datamodel.actions;
import com.kitware.physiology.cdm.Actions.SerializeStateData;
import com.kitware.physiology.cdm.Actions.SerializeStateData.eSerializationType;
import com.kitware.physiology.cdm.ActionEnums.eSerialization;
public class SESerializeState extends SEAction
{
protected String filename;
protected eSerializationType type;
protected String filename;
protected eSerialization.Type type;
public SESerializeState()
{
......@@ -41,7 +41,7 @@ public class SESerializeState extends SEAction
public static void load(SerializeStateData src, SESerializeState dst)
{
SEAction.load(src.getAction(), dst);
if(src.getType()!=eSerializationType.UNRECOGNIZED)
if(src.getType()!=eSerialization.Type.UNRECOGNIZED)
dst.type = src.getType();
if(src.getFilename()!=null)
dst.setFilename(src.getFilename());
......@@ -82,11 +82,11 @@ public class SESerializeState extends SEAction
{
return type!=null;
}
public eSerializationType getType()
public eSerialization.Type getType()
{
return type;
}
public void setType(eSerializationType t)
public void setType(eSerialization.Type t)
{
this.type = t;
}
......
......@@ -5,7 +5,7 @@ package mil.tatrc.physiology.datamodel.compartment;
import java.util.HashMap;
import java.util.Map;
import com.kitware.physiology.cdm.Compartment.eCompartmentType;
import com.kitware.physiology.cdm.CompartmentEnums.eCompartment;
public class SECompartmentManager
{
......@@ -27,7 +27,7 @@ public class SECompartmentManager
tissue.clear();
}
public SECompartment GetCompartment(String name, eCompartmentType type)
public SECompartment GetCompartment(String name, eCompartment.Type type)
{
switch(type)
{
......
......@@ -5,19 +5,20 @@ package mil.tatrc.physiology.datamodel.datarequests;
import java.io.Serializable;
import com.kitware.physiology.cdm.Properties.DecimalFormatData;
import com.kitware.physiology.cdm.Scenario.DataRequestData;
import com.kitware.physiology.cdm.Scenario.DataRequestData.eCategory;
import com.kitware.physiology.cdm.Scenario.DecimalFormatData;
import com.kitware.physiology.cdm.ScenarioEnums.eDataRequest;
import com.kitware.physiology.cdm.ScenarioEnums.eDecimalFormat;
public class SEDataRequest implements Serializable
{
protected String propertyName;
protected String unit;
protected eCategory category;
protected eDataRequest.Category category;
protected String compartmentName;
protected String substanceName;
protected Integer precision;
protected DecimalFormatData.eType format;
protected eDecimalFormat.Type format;
public SEDataRequest()
{
......@@ -40,7 +41,7 @@ public class SEDataRequest implements Serializable
dst.reset();
dst.propertyName = src.getPropertyName();
dst.unit = src.getUnit();
if(src.getCategory()!=eCategory.UNRECOGNIZED)
if(src.getCategory()!=eDataRequest.Category.UNRECOGNIZED)
dst.category = src.getCategory();
dst.compartmentName = src.getCompartmentName();
dst.substanceName = src.getSubstanceName();
......@@ -102,9 +103,9 @@ public class SEDataRequest implements Serializable
public void setUnit(String unit){ this.unit = unit; }
public boolean hasUnit(){ return unit==null||unit.isEmpty() ? false : true; }
public eCategory getCategory(){ return category; }
public void setCategory(eCategory c){ this.category = c; }
public boolean hasCategory(){ return category==null||category==eCategory.UNRECOGNIZED ? false : true; }
public eDataRequest.Category getCategory(){ return category; }
public void setCategory(eDataRequest.Category c){ this.category = c; }
public boolean hasCategory(){ return category==null||category==eDataRequest.Category.UNRECOGNIZED ? false : true; }
public String getCompartmentName(){ return compartmentName; }
public void setCompartmentName(String c){ this.compartmentName = c; }
......@@ -114,9 +115,9 @@ public class SEDataRequest implements Serializable
public void setSubstanceName(String s){ this.substanceName = s; }
public boolean hasSubstanceName(){ return substanceName==null||substanceName.isEmpty() ? false : true; }
public DecimalFormatData.eType getFormat(){ return format; }
public void setFormat(DecimalFormatData.eType f){ this.format = f; }
public boolean hasFormat(){ return format==null||format==DecimalFormatData.eType.UNRECOGNIZED ? false : true; }
public eDecimalFormat.Type getFormat(){ return format; }
public void setFormat(eDecimalFormat.Type f){ this.format = f; }
public boolean hasFormat(){ return format==null||format==eDecimalFormat.Type.UNRECOGNIZED ? false : true; }
public Integer getPrecision(){ return precision; }
public void setPrecision(Integer p){ this.precision = p; }
......
......@@ -7,7 +7,9 @@ import java.lang.reflect.Method;
import java.util.*;
import com.kitware.physiology.cdm.AnesthesiaMachine.AnesthesiaMachineData;
import com.kitware.physiology.cdm.AnesthesiaMachineEnums.eAnesthesiaMachine;
import com.kitware.physiology.cdm.Patient.PatientData;
import com.kitware.physiology.cdm.PatientEnums.ePatient;
import mil.tatrc.physiology.datamodel.compartment.SECompartment;
import mil.tatrc.physiology.datamodel.patient.SEPatient;
......@@ -56,7 +58,7 @@ public class CDM2MD
// PATIENT
WriteDoxyTable(SEPatient.class, "", writer, skipProperties);
WriteDoxyTable(PatientData.eEvent.class, "PatientData_", writer, skipProperties);
WriteDoxyTable(ePatient.Event.class, "PatientData_", writer, skipProperties);
Set<Class<? extends SEPatientAction>> pActions = FindObjects.findClassSubTypes("mil.tatrc.physiology.datamodel.patient.actions", SEPatientAction.class);
for(Class<?> c : pActions)
WriteDoxyTable(c, "", writer, skipProperties);
......@@ -86,7 +88,7 @@ public class CDM2MD
// ANESTHESIA MACHINE
WriteDoxyTable(AnesthesiaMachineData.eEvent.class, "Anesthesia", writer, skipProperties);
WriteDoxyTable(eAnesthesiaMachine.Event.class, "Anesthesia", writer, skipProperties);
Set<Class<? extends Object>> anes = FindObjects.findAllClasses("mil.tatrc.physiology.datamodel.system.equipment.anesthesia");
for(Class<?> c : anes)
WriteDoxyTable(c, "", writer, skipProperties);
......
......@@ -9,14 +9,13 @@ import mil.tatrc.physiology.utilities.FileUtils;
import com.google.protobuf.TextFormat;
import com.google.protobuf.TextFormat.ParseException;
import com.kitware.physiology.cdm.Patient.PatientData.eSex;
import com.kitware.physiology.cdm.PatientEnums.ePatient.*;
import com.kitware.physiology.cdm.Patient.PatientData;
import com.kitware.physiology.cdm.Patient.PatientData.eEvent;
public class SEPatient
{
protected String name;
protected eSex sex;
protected Sex sex;
protected SEScalarTime age;
protected SEScalarMass weight;
protected SEScalarLength height;
......@@ -47,7 +46,7 @@ public class SEPatient
protected SEScalarVolume totalLungCapacity;
protected SEScalarVolume vitalCapacity;
protected Map<eEvent,Boolean> events = new HashMap<eEvent,Boolean>();
protected Map<Event,Boolean> events = new HashMap<Event,Boolean>();
public SEPatient()
{
......@@ -133,7 +132,7 @@ public class SEPatient
{
dst.reset();
dst.setName(src.getName());
if(src.getSex()!=eSex.UNRECOGNIZED)
if(src.getSex()!=Sex.UNRECOGNIZED)
dst.setSex(src.getSex());
if(src.hasAge())
SEScalarTime.load(src.getAge(),dst.getAge());
......@@ -259,11 +258,11 @@ public class SEPatient
dst.setVitalCapacity(SEScalarVolume.unload(src.vitalCapacity));
}
public void setEvent(eEvent type, boolean active)
public void setEvent(Event type, boolean active)
{
this.events.put(type, active);
}
public boolean isEventActive(eEvent type)
public boolean isEventActive(Event type)
{
if(!this.events.containsKey(type))
return false;
......@@ -274,8 +273,8 @@ public class SEPatient
public void setName(String name){this.name=name;}
public boolean hasName(){return this.name==null?false:true;}
public eSex getSex() { return this.sex;}
public void setSex(eSex name){this.sex=name;}
public Sex getSex() { return this.sex;}
public void setSex(Sex name){this.sex=name;}
public boolean hasSex(){return this.sex==null?false:true;}
public SEScalarTime getAge()
......
......@@ -4,14 +4,14 @@
package mil.tatrc.physiology.datamodel.patient.actions;
import com.kitware.physiology.cdm.PatientActions.BrainInjuryData;
import com.kitware.physiology.cdm.PatientActions.BrainInjuryData.eType;
import com.kitware.physiology.cdm.PatientActionEnums.eBrainInjury.Type;
import mil.tatrc.physiology.datamodel.properties.SEScalar0To1;
public class SEBrainInjury extends SEPatientAction
{
protected SEScalar0To1 severity;
protected eType type;
protected SEScalar0To1 severity;
protected Type type;
public SEBrainInjury()
{
......@@ -47,7 +47,7 @@ public class SEBrainInjury extends SEPatientAction
public static void load(BrainInjuryData src, SEBrainInjury dst)
{
SEPatientAction.load(src.getPatientAction(), dst);
if(src.getType()!=eType.UNRECOGNIZED)
if(src.getType()!=Type.UNRECOGNIZED)
dst.setType(src.getType());
if(src.hasSeverity())
SEScalar0To1.load(src.getSeverity(),dst.getSeverity());
......@@ -69,11 +69,11 @@ public class SEBrainInjury extends SEPatientAction
dst.setSeverity(SEScalar0To1.unload(src.severity));
}
public eType getType()
public Type getType()
{
return type;
}
public void setType(eType t)
public void setType(Type t)
{
type = t;
}
......
......@@ -4,11 +4,11 @@
package mil.tatrc.physiology.datamodel.patient.actions;
import com.kitware.physiology.cdm.PatientActions.IntubationData;
import com.kitware.physiology.cdm.PatientActions.IntubationData.eType;
import com.kitware.physiology.cdm.PatientActionEnums.eIntubation.Type;
public class SEIntubation extends SEPatientAction
{
protected eType type;
protected Type type;
public SEIntubation()
{
......@@ -37,7 +37,7 @@ public class SEIntubation extends SEPatientAction
public static void load(IntubationData src, SEIntubation dst)
{
SEPatientAction.load(src.getPatientAction(), dst);
if(src.getType()!=eType.UNRECOGNIZED)
if(src.getType()!=Type.UNRECOGNIZED)
dst.type = src.getType();
}
......@@ -55,11 +55,11 @@ public class SEIntubation extends SEPatientAction
dst.setType(src.type);
}
public eType getType()
public Type getType()
{
return type;
}
public void setType(eType t)
public void setType(Type t)
{
type = t;
}
......
......@@ -8,6 +8,7 @@ import java.util.List;
import com.kitware.physiology.cdm.PatientActions.MechanicalVentilationData;
import com.kitware.physiology.cdm.Enums.eSwitch;
import com.kitware.physiology.cdm.Substance.SubstanceData;
import com.kitware.physiology.cdm.SubstanceEnums.eSubstance;
import mil.tatrc.physiology.utilities.Log;
import mil.tatrc.physiology.datamodel.properties.*;
......@@ -118,7 +119,7 @@ public class SEMechanicalVentilation extends SEPatientAction
{
Log.error("Substance does not exist : "+subData.getName());
}
if(sub.getState() != SubstanceData.eState.Gas)
if(sub.getState() != eSubstance.State.Gas)
{
Log.error("Gas Fraction substance must be a gas, "+subData.getName()+" is not a gas...");
}
......
......@@ -4,11 +4,11 @@
package mil.tatrc.physiology.datamodel.patient.actions;
import com.kitware.physiology.cdm.PatientActions.PatientAssessmentRequestData;
import com.kitware.physiology.cdm.PatientAssessments.PatientAssessmentData.eType;
import com.kitware.physiology.cdm.PatientAssessmentEnums.ePatientAssessment.Type;
public class SEPatientAssessmentRequest extends SEPatientAction
{
protected eType type;
protected Type type;
public SEPatientAssessmentRequest()
{
......@@ -37,7 +37,7 @@ public class SEPatientAssessmentRequest extends SEPatientAction
public static void load(PatientAssessmentRequestData src, SEPatientAssessmentRequest dst)
{
SEPatientAction.load(src.getPatientAction(), dst);
if(src.getType()!=eType.UNRECOGNIZED)
if(src.getType()!=Type.UNRECOGNIZED)
dst.type = src.getType();
}
......@@ -55,11 +55,11 @@ public class SEPatientAssessmentRequest extends SEPatientAction
dst.setType(src.type);
}
public eType getType()
public Type getType()
{
return type;
}
public void setType(eType type)
public void setType(Type type)
{
this.type = type;
}
......
......@@ -4,7 +4,7 @@
package mil.tatrc.physiology.datamodel.patient.actions;
import com.kitware.physiology.cdm.PatientActions.SubstanceBolusData;
import com.kitware.physiology.cdm.PatientActions.SubstanceBolusData.eAdministrationRoute;
import com.kitware.physiology.cdm.PatientActionEnums.eSubstanceAdministration.Route;
import mil.tatrc.physiology.datamodel.properties.SEScalarMassPerVolume;
import mil.tatrc.physiology.datamodel.properties.SEScalarVolume;
......@@ -12,7 +12,7 @@ import mil.tatrc.physiology.datamodel.substance.SESubstance;
public class SESubstanceBolus extends SEPatientAction
{
protected eAdministrationRoute adminRoute;
protected Route adminRoute;
protected SEScalarMassPerVolume concentration;
protected SEScalarVolume dose;
protected SESubstance substance;
......@@ -66,7 +66,7 @@ public class SESubstanceBolus extends SEPatientAction
SEScalarVolume.load(src.getDose(),dst.getDose());
if(src.hasConcentration())
SEScalarMassPerVolume.load(src.getConcentration(),dst.getConcentration());
if(src.getAdministrationRoute()!=eAdministrationRoute.UNRECOGNIZED)
if(src.getAdministrationRoute()!=Route.UNRECOGNIZED)
dst.adminRoute = src.getAdministrationRoute();
}
......@@ -90,11 +90,11 @@ public class SESubstanceBolus extends SEPatientAction
dst.setSubstance(src.substance.getName());
}
public eAdministrationRoute getAdminRoute()
public Route getAdminRoute()
{
return adminRoute;
}
public void setAdminRoute(eAdministrationRoute adminRoute)
public void setAdminRoute(Route adminRoute)
{
this.adminRoute = adminRoute;
}
......
......@@ -5,25 +5,25 @@ package mil.tatrc.physiology.datamodel.patient.assessments;
import com.google.protobuf.TextFormat;
import com.google.protobuf.TextFormat.ParseException;
import com.kitware.physiology.cdm.PatientAssessments.UrinalysisData;
import com.kitware.physiology.cdm.PatientAssessments.UrinalysisData.*;
import com.kitware.physiology.cdm.PatientAssessmentEnums.eUrinalysis.*;
import mil.tatrc.physiology.datamodel.properties.*;
import mil.tatrc.physiology.utilities.FileUtils;
public class SEUrinalysis extends SEPatientAssessment
{
protected eUrineColor color;
protected eClarityIndicator appearance;
protected ePresenceIndicator glucose;
protected ePresenceIndicator ketone;
protected UrineColor color;
protected ClarityIndicator appearance;
protected PresenceIndicator glucose;
protected PresenceIndicator ketone;
protected SEScalar bilirubin;
protected SEScalar specificGravity;
protected ePresenceIndicator blood;
protected PresenceIndicator blood;
protected SEScalar pH;
protected ePresenceIndicator protein;
protected PresenceIndicator protein;
protected SEScalarMassPerVolume urobilinogen;
protected ePresenceIndicator nitrite;
protected ePresenceIndicator leukocyteEsterase;
protected PresenceIndicator nitrite;
protected PresenceIndicator leukocyteEsterase;
public void clear()
{
......@@ -77,29 +77,29 @@ public class SEUrinalysis extends SEPatientAssessment
public static void load(UrinalysisData src, SEUrinalysis dst)
{
SEPatientAssessment.load(src.getPatientAssessment(), dst);
if(src.getColor()!=eUrineColor.UNRECOGNIZED)
if(src.getColor()!=UrineColor.UNRECOGNIZED)
dst.setColor(src.getColor());
if(src.getAppearance()!=eClarityIndicator.UNRECOGNIZED)
if(src.getAppearance()!=ClarityIndicator.UNRECOGNIZED)
dst.setAppearance(src.getAppearance());
if(src.getGlucose()!=ePresenceIndicator.UNRECOGNIZED)
if(src.getGlucose()!=PresenceIndicator.UNRECOGNIZED)
dst.setGlucose(src.getGlucose());
if(src.getKetone()!=ePresenceIndicator.UNRECOGNIZED)
if(src.getKetone()!=PresenceIndicator.UNRECOGNIZED)
dst.setKetone(src.getKetone());
if(src.hasBilirubin())
SEScalar.load(src.getBilirubin(),dst.getBilirubin());
if(src.hasSpecificGravity())
SEScalar.load(src.getSpecificGravity(),dst.getSpecificGravity());
if(src.getBlood()!=ePresenceIndicator.UNRECOGNIZED)
if(src.getBlood()!=PresenceIndicator.UNRECOGNIZED)
dst.setBlood(src.getBlood());
if(src.hasPH())
SEScalar.load(src.getPH(),dst.getPH());
if(src.getProtein()!=ePresenceIndicator.UNRECOGNIZED)
if(src.getProtein()!=PresenceIndicator.UNRECOGNIZED)
dst.setProtein(src.getProtein());
if(src.hasUrobilinogen())
SEScalarMassPerVolume.load(src.getUrobilinogen(),dst.getUrobilinogen());
if(src.getNitrite()!=ePresenceIndicator.UNRECOGNIZED)
if(src.getNitrite()!=PresenceIndicator.UNRECOGNIZED)
dst.setNitrite(src.getNitrite());
if(src.getLeukocyteEsterase()!=ePresenceIndicator.UNRECOGNIZED)
if(src.getLeukocyteEsterase()!=PresenceIndicator.UNRECOGNIZED)
dst.setLeukocyteEsterase(src.getLeukocyteEsterase());
}
......@@ -139,21 +139,21 @@ public class SEUrinalysis extends SEPatientAssessment
dst.setLeukocyteEsterase(src.leukocyteEsterase);
}
public eUrineColor getColor() { return this.color;}
public void setColor(eUrineColor color){this.color=color;}
public boolean hasColor(){return this.color==null?false:color!=eUrineColor.NullColor;}
public UrineColor getColor() { return this.color;}
public void setColor(UrineColor color){this.color=color;}
public boolean hasColor(){return this.color==null?false:color!=UrineColor.NullColor;}
public eClarityIndicator getAppearance() { return this.appearance;}
public void setAppearance(eClarityIndicator a){this.appearance=a;}
public boolean hasAppearance(){return this.appearance==null?false:appearance!=eClarityIndicator.NullClarity;}
public ClarityIndicator getAppearance() { return this.appearance;}
public void setAppearance(ClarityIndicator a){this.appearance=a;}
public boolean hasAppearance(){return this.appearance==null?false:appearance!=ClarityIndicator.NullClarity;}
public ePresenceIndicator getGlucose() { return this.glucose;}
public void setGlucose(ePresenceIndicator g){this.glucose=g;}
public boolean hasGlucose(){return this.glucose==null?false:glucose!=ePresenceIndicator.NullPresence;}
public PresenceIndicator getGlucose() { return this.glucose;}
public void setGlucose(PresenceIndicator g){this.glucose=g;}
public boolean hasGlucose(){return this.glucose==null?false:glucose!=PresenceIndicator.NullPresence;}
public ePresenceIndicator getKetone() { return this.ketone;}
public void setKetone(ePresenceIndicator k){this.ketone=k;}
public boolean hasKetone(){return this.ketone==null?false:ketone!=ePresenceIndicator.NullPresence;}
public PresenceIndicator getKetone() { return this.ketone;}
public void setKetone(PresenceIndicator k){this.ketone=k;}
public boolean hasKetone(){return this.ketone==null?false:ketone!=PresenceIndicator.NullPresence;}
public boolean hasBilirubin()
{
......@@ -177,9 +177,9 @@ public class SEUrinalysis extends SEPatientAssessment
return specificGravity;
}
public ePresenceIndicator getBlood() { return this.blood;}
public void setBlood(ePresenceIndicator b){this.blood=b;}
public boolean hasBlood(){return this.blood==null?false:blood!=ePresenceIndicator.NullPresence;}
public PresenceIndicator getBlood() { return this.blood;}
public void setBlood(PresenceIndicator b){this.blood=b;}
public boolean hasBlood(){return this.blood==null?false:blood!=PresenceIndicator.NullPresence;}
public boolean hasPH()
{
......@@ -192,9 +192,9 @@ public class SEUrinalysis extends SEPatientAssessment
return pH;
}
public ePresenceIndicator getProtein() { return this.protein;}
public void setProtein(ePresenceIndicator p){this.protein=p;}
public boolean hasProtein(){return this.protein==null?false:protein!=ePresenceIndicator.NullPresence;}
public PresenceIndicator getProtein() {