Commit 0784aa02 authored by Aaron Bray's avatar Aaron Bray

Update for data request fixes from Pulse

parent c575a3ca
......@@ -77,7 +77,7 @@ if(NOT Pulse_FOUND)
ExternalProject_Add(Pulse
PREFIX Pulse
GIT_REPOSITORY https://gitlab.kitware.com/physiology/engine.git
GIT_TAG 1176de8449f44ce157026bd1e04c09eb934ba591
GIT_TAG b3f108cedb76f3be71f0de4418a0103ec197ba9d
#GIT_SHALLOW 1
#URL https://gitlab.kitware.com/physiology/engine/-/archive/REL_2_1_0/engine-REL_2_1_0.zip
#URL_MD5 29d0e8729d45de2d72218d4bcabe33b5ee0af738
......
......@@ -33,7 +33,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Set the possible values of build type for cmake-gui
if(MSVC OR XCode)
set(CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE TYPE INTERNAL FORCE )
set(CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE STRING INTERNAL FORCE )
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "RelWithDebInfo")
endif()
......
......@@ -666,12 +666,10 @@ SEDataRequest& QDataRequestWidget::GetDataRequest()
case 1: // Extracellular
cmpt = m_Controls->TissueCmptBox->currentText();
// TODO Units Box
//return drMgr.CreateTissueCompartmentDataRequest(RemoveSpacing(cmpt),RemoveSpacing(prop));
break;
return drMgr.CreateLiquidCompartmentDataRequest(RemoveSpacing(cmpt),RemoveSpacing(prop));
case 2: // Intracellular
// TODO Units Box
/*cmpt = m_Controls->TissueCmptBox->currentText();
break;*/
return drMgr.CreateLiquidCompartmentDataRequest(RemoveSpacing(cmpt), RemoveSpacing(prop));
case 3: // Pulmonary
cmpt = m_Controls->PulmonaryCmptBox->currentText();
prop = m_Controls->GasCmptPropsBox->currentText();
......@@ -682,16 +680,12 @@ SEDataRequest& QDataRequestWidget::GetDataRequest()
// TODO Units Box
prop = m_Controls->ThermalCmptPropsBox->currentText();
cmpt = m_Controls->TemperatureCmptBox->currentText();
//return drMgr.CreateLiquidCompartmentDataRequest(RemoveSpacing(cmpt),RemoveSpacing(prop));
//return drMgr.CreateThermalCompartmentDataRequest(RemoveSpacing(cmpt),RemoveSpacing(prop));
break;
return drMgr.CreateThermalCompartmentDataRequest(RemoveSpacing(cmpt),RemoveSpacing(prop));
case 5: // Tissue
// TODO Units Box
cmpt = m_Controls->TissueCmptBox->currentText();
prop = m_Controls->TissueCmptPropsBox->currentText();
//return drMgr.CreateLiquidCompartmentDataRequest(RemoveSpacing(cmpt),RemoveSpacing(prop));
//return drMgr.CreateTissueCompartmentDataRequest(RemoveSpacing(prop));
break;
return drMgr.CreateTissueCompartmentDataRequest(RemoveSpacing(cmpt), RemoveSpacing(prop));
case 6: // Urine
// TODO Units Box
cmpt = m_Controls->UrineCmptBox->currentText();
......@@ -741,7 +735,7 @@ SEDataRequest& QDataRequestWidget::GetDataRequest()
cmpt = m_Controls->VascularCmptBox->currentText();
break;
}
return drMgr.CreateLiquidCompartmentDataRequest(RemoveSpacing(cmpt),*substance,RemoveSpacing(prop));
return drMgr.CreateLiquidCompartmentDataRequest(RemoveSpacing(cmpt),*substance,RemoveSpacing(prop));
case 4://Environment
prop = m_Controls->EnvironmentBox->currentText();
......
......@@ -218,10 +218,7 @@ void QPlotSetWidget::ProcessPhysiology(PhysiologyEngine& pulse)
for (size_t i = 0; i < m_Controls->Plots.size(); i++)
{
dr = m_Controls->DataRequests[i];
if (dr->HasUnit())
v = pulse.GetEngineTracker()->GetScalar(*dr)->GetValue(*dr->GetUnit());
else
v = pulse.GetEngineTracker()->GetScalar(*dr)->GetValue();
v = pulse.GetEngineTracker()->GetValue(*dr);
m_Controls->Plots[i]->Append(time, v);
}
}
......
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