From de9f22c85b154118325ddc81a617b109315c5dea Mon Sep 17 00:00:00 2001 From: Alex Sananka Date: Tue, 12 Sep 2017 18:00:35 +0300 Subject: [PATCH 1/2] deleting code and adding sub on dlgname --- instat/dlgDuplicatesConstructed.vb | 1 - instat/dlgName.vb | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/dlgDuplicatesConstructed.vb b/instat/dlgDuplicatesConstructed.vb index 1772a7bb8f2..adbc3d56549 100644 --- a/instat/dlgDuplicatesConstructed.vb +++ b/instat/dlgDuplicatesConstructed.vb @@ -176,7 +176,6 @@ Public Class dlgDuplicatesConstructed If Not ucrReceiverForSuccessiveValues.IsEmpty Then clsSubsetCol.AddParameter("col_name", ucrReceiverForSuccessiveValues.GetVariableNames()) clsSubsetCol.AddParameter("data_name", Chr(34) & ucrSelectorDuplicateswithVariables.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34)) - frmMain.clsRLink.RunInternalScriptGetValue(clsSubsetCol.ToScript) clsStreakFunction.AddParameter("ignore", clsSubsetCol.ToScript & "[" & clsSubsetCol.ToScript & ucrInputConditions.GetText & Chr(34) & ucrInputOmitValues.GetText & Chr(34) & "]", iPosition:=2) Else clsStreakFunction.AddParameter("ignore", "NULL") diff --git a/instat/dlgName.vb b/instat/dlgName.vb index 4b164fa7410..c73fe70e61a 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -60,6 +60,10 @@ Public Class dlgName ucrInputVariableLabel.SetParameter(New RParameter("label", 3)) End Sub + Private Sub ReopenDialog() + ucrSelectVariables.Reset() + End Sub + Public Sub SetDefaults() clsDefaultRFunction = New RFunction ucrInputVariableLabel.Reset() From 77aa594133723ed38e54017edb3bf84b8eecbabf Mon Sep 17 00:00:00 2001 From: Alex Sananka Date: Tue, 12 Sep 2017 18:37:03 +0300 Subject: [PATCH 2/2] running reopening --- instat/dlgName.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgName.vb b/instat/dlgName.vb index c73fe70e61a..2f715b64c9b 100644 --- a/instat/dlgName.vb +++ b/instat/dlgName.vb @@ -28,6 +28,8 @@ Public Class dlgName If bFirstLoad Then InitialiseDialog() bFirstLoad = False + Else + ReopenDialog() End If If bReset Then SetDefaults()