diff --git a/src/wizard/controller/frmResultSummaryPanel.py b/src/wizard/controller/frmResultSummaryPanel.py index 6f10861..6e58798 100644 --- a/src/wizard/controller/frmResultSummaryPanel.py +++ b/src/wizard/controller/frmResultSummaryPanel.py @@ -53,6 +53,13 @@ def __populate_date_fields(self): if self.existing_result is None: return + if self.existing_result.SampledMediumCV is not None: + self.comboSamp.SetValue(self.existing_result.SampledMediumCV) + + if self.existing_result.AggregationStatisticCV is not None: + self.comboAgg.SetValue(self.existing_result.AggregationStatisticCV) + + # Set Result Date Time if self.existing_result.ResultDateTime is not None: year = self.existing_result.ResultDateTime.year diff --git a/src/wizard/view/clsResultPage.py b/src/wizard/view/clsResultPage.py index a090a07..6437581 100644 --- a/src/wizard/view/clsResultPage.py +++ b/src/wizard/view/clsResultPage.py @@ -250,7 +250,7 @@ def __init__( self, parent ): bSizerX.Add( self.staticXUnits, 0, wx.ALL, 5 ) comboXUnitsChoices = [] - self.comboXUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboXUnitsChoices, 0 ) + self.comboXUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboXUnitsChoices, style=wx.CB_READONLY) self.comboXUnits.SetMinSize(wx.Size(160, -1)) bSizerX.Add( self.comboXUnits, 0, wx.ALL, 5 ) @@ -278,7 +278,7 @@ def __init__( self, parent ): bSizerY.Add( self.staticYUnits, 0, wx.ALL, 5 ) comboYUnitsChoices = [] - self.comboYUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboYUnitsChoices, 0 ) + self.comboYUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboYUnitsChoices, style=wx.CB_READONLY) self.comboYUnits.SetMinSize( wx.Size( 160,-1 ) ) bSizerY.Add( self.comboYUnits, 0, wx.ALL, 5 ) @@ -307,7 +307,7 @@ def __init__( self, parent ): bSizerZ.Add( self.m_staticText422110, 0, wx.ALL, 5 ) comboZUnitsChoices = [] - self.comboZUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboZUnitsChoices, 0 ) + self.comboZUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboZUnitsChoices, style=wx.CB_READONLY) self.comboZUnits.SetMinSize( wx.Size( 160,-1 ) ) bSizerZ.Add( self.comboZUnits, 0, wx.ALL, 5 ) @@ -334,7 +334,7 @@ def __init__( self, parent ): bSizerIntended.Add( self.m_staticText4221101, 0, wx.ALL, 5 ) comboIntendedUnitsChoices = [] - self.comboIntendedUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboIntendedUnitsChoices, 0 ) + self.comboIntendedUnits = wx.ComboBox( sbSizerOpt.GetStaticBox(), wx.ID_ANY, wx.EmptyString, wx.DefaultPosition, wx.DefaultSize, comboIntendedUnitsChoices, style=wx.CB_READONLY) self.comboIntendedUnits.SetMinSize( wx.Size( 160,-1 ) ) bSizerIntended.Add( self.comboIntendedUnits, 0, wx.ALL, 5 )