diff --git a/instat/dlgRegressionSimple.vb b/instat/dlgRegressionSimple.vb index 3b38fc3d3d4..e7470c8dc60 100644 --- a/instat/dlgRegressionSimple.vb +++ b/instat/dlgRegressionSimple.vb @@ -81,12 +81,12 @@ Public Class dlgRegressionSimple ucrModelName.Reset() ucrModelPreview.SetName("") SetRCode() - TestOKEnabled() DistributionsOffered() sdgSimpleRegOptions.chkDisplayCLimits.Enabled = True sdgSimpleRegOptions.lblDisplayCLevel.Enabled = True sdgSimpleRegOptions.nudDisplayCLevel.Enabled = True SetEnableDists() + TestOKEnabled() End Sub Private Sub LM() @@ -254,8 +254,8 @@ Public Class dlgRegressionSimple End Sub Private Sub cmdDisplayOptions_Click(sender As Object, e As EventArgs) Handles cmdDisplayOptions.Click - sdgSimpleRegOptions.ShowDialog() Display() + sdgSimpleRegOptions.ShowDialog() End Sub Public Sub ConvertToVariate() diff --git a/instat/dlgThreeVariablesModelling.vb b/instat/dlgThreeVariablesModelling.vb index f0eb471f1e7..efeca8dc5f6 100644 --- a/instat/dlgThreeVariablesModelling.vb +++ b/instat/dlgThreeVariablesModelling.vb @@ -44,10 +44,7 @@ Public Class dlgThreeVariableModelling ucrResponse.Selector = ucrSelectorThreeVariableModelling ucrFirstExplanatory.Selector = ucrSelectorThreeVariableModelling ucrSecondExplanatory.Selector = ucrSelectorThreeVariableModelling - ucrModelOperator.cboInput.Items.Add("+") - ucrModelOperator.cboInput.Items.Add("*") - ucrModelOperator.cboInput.Items.Add(":") - ucrModelOperator.cboInput.Items.Add("/") + ucrModelOperator.SetItems({"+", "*", ":", "/"}) ucrFamily.SetGLMDistributions() ucrModelName.SetDataFrameSelector(ucrSelectorThreeVariableModelling.ucrAvailableDataFrames) ucrModelName.SetPrefix("reg") @@ -63,8 +60,6 @@ Public Class dlgThreeVariableModelling sdgModelOptions.SetRCIFunction(clsRCIFunction) sdgVariableTransformations.SetRCIFunction(clsRCIFunction) AssignModelName() - ModelOperator() - TestOKEnabled() ucrModelName.SetValidationTypeAsRVariable() End Sub @@ -94,10 +89,10 @@ Public Class dlgThreeVariableModelling ucrModelPreview.Reset() ResponseConvert() ModelOperator() - TestOKEnabled() sdgSimpleRegOptions.chkDisplayCLimits.Enabled = True sdgSimpleRegOptions.lblDisplayCLevel.Enabled = True sdgSimpleRegOptions.nudDisplayCLevel.Enabled = True + TestOKEnabled() End Sub Public Sub TestOKEnabled() @@ -116,10 +111,6 @@ Public Class dlgThreeVariableModelling AssignModelName() End Sub - Private Sub cmdRegressionOptions_Click(sender As Object, e As EventArgs) Handles cmdDisplayOptions.Click - sdgSimpleRegOptions.ShowDialog() - End Sub - Public Sub ResponseConvert() If Not ucrResponse.IsEmpty Then ucrFamily.RecieverDatatype(ucrSelectorThreeVariableModelling.ucrAvailableDataFrames.cboAvailableDataFrames.Text, ucrResponse.GetVariableNames(bWithQuotes:=False))