From 1745b329d465b469357de59518f6339ce3391ba9 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 29 Jan 2025 18:43:20 +0300 Subject: [PATCH] changes --- instat/dlgScript.Designer.vb | 97 ++++++++++++++++++++++++------------ instat/dlgScript.vb | 67 +++++++++++++------------ 2 files changed, 100 insertions(+), 64 deletions(-) diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index 5b5246fe40..3ee9b78c73 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -92,13 +92,15 @@ Partial Class dlgScript Me.clmDesc = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.Label3 = New System.Windows.Forms.Label() Me.ucrCboExamplePackages = New instat.ucrInputComboBox() - Me.lblPreview = New System.Windows.Forms.Label() - Me.txtScript = New System.Windows.Forms.TextBox() - Me.ucrBase = New instat.ucrButtons() Me.tbPageRepeat = New System.Windows.Forms.TabPage() Me.lblSelectColumns = New System.Windows.Forms.Label() Me.ucrReceiverRank = New instat.ucrReceiverSingle() Me.ucrSelectorForRank = New instat.ucrSelectorByDataFrameAddRemove() + Me.lblPreview = New System.Windows.Forms.Label() + Me.txtScript = New System.Windows.Forms.TextBox() + Me.ucrBase = New instat.ucrButtons() + Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() + Me.lblExpression = New System.Windows.Forms.Label() Me.tbFeatures.SuspendLayout() Me.tbPageSaveData.SuspendLayout() Me.tbPageGetData.SuspendLayout() @@ -964,37 +966,10 @@ Partial Class dlgScript Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) Me.ucrCboExamplePackages.TabIndex = 51 ' - 'lblPreview - ' - Me.lblPreview.AutoSize = True - Me.lblPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPreview.Location = New System.Drawing.Point(9, 314) - Me.lblPreview.Name = "lblPreview" - Me.lblPreview.Size = New System.Drawing.Size(48, 13) - Me.lblPreview.TabIndex = 30 - Me.lblPreview.Text = "Preview:" - ' - 'txtScript - ' - Me.txtScript.Location = New System.Drawing.Point(5, 332) - Me.txtScript.Multiline = True - Me.txtScript.Name = "txtScript" - Me.txtScript.ScrollBars = System.Windows.Forms.ScrollBars.Both - Me.txtScript.Size = New System.Drawing.Size(445, 96) - Me.txtScript.TabIndex = 32 - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 431) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 16 - ' 'tbPageRepeat ' + Me.tbPageRepeat.Controls.Add(Me.lblExpression) + Me.tbPageRepeat.Controls.Add(Me.ucrReceiverForCalculation) Me.tbPageRepeat.Controls.Add(Me.lblSelectColumns) Me.tbPageRepeat.Controls.Add(Me.ucrReceiverRank) Me.tbPageRepeat.Controls.Add(Me.ucrSelectorForRank) @@ -1020,7 +995,7 @@ Partial Class dlgScript 'ucrReceiverRank ' Me.ucrReceiverRank.AutoSize = True - Me.ucrReceiverRank.frmParent = Me + Me.ucrReceiverRank.frmParent = Nothing Me.ucrReceiverRank.Location = New System.Drawing.Point(246, 48) Me.ucrReceiverRank.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRank.Name = "ucrReceiverRank" @@ -1042,6 +1017,60 @@ Partial Class dlgScript Me.ucrSelectorForRank.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorForRank.TabIndex = 9 ' + 'lblPreview + ' + Me.lblPreview.AutoSize = True + Me.lblPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblPreview.Location = New System.Drawing.Point(9, 314) + Me.lblPreview.Name = "lblPreview" + Me.lblPreview.Size = New System.Drawing.Size(48, 13) + Me.lblPreview.TabIndex = 30 + Me.lblPreview.Text = "Preview:" + ' + 'txtScript + ' + Me.txtScript.Location = New System.Drawing.Point(5, 332) + Me.txtScript.Multiline = True + Me.txtScript.Name = "txtScript" + Me.txtScript.ScrollBars = System.Windows.Forms.ScrollBars.Both + Me.txtScript.Size = New System.Drawing.Size(445, 96) + Me.txtScript.TabIndex = 32 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(6, 431) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 16 + ' + 'ucrReceiverForCalculation + ' + Me.ucrReceiverForCalculation.AutoSize = True + Me.ucrReceiverForCalculation.frmParent = Me + Me.ucrReceiverForCalculation.Location = New System.Drawing.Point(9, 235) + Me.ucrReceiverForCalculation.Margin = New System.Windows.Forms.Padding(2) + Me.ucrReceiverForCalculation.Name = "ucrReceiverForCalculation" + Me.ucrReceiverForCalculation.Selector = Nothing + Me.ucrReceiverForCalculation.Size = New System.Drawing.Size(390, 30) + Me.ucrReceiverForCalculation.strNcFilePath = "" + Me.ucrReceiverForCalculation.TabIndex = 121 + Me.ucrReceiverForCalculation.ucrSelector = Nothing + ' + 'lblExpression + ' + Me.lblExpression.AutoSize = True + Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExpression.Location = New System.Drawing.Point(12, 213) + Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblExpression.Name = "lblExpression" + Me.lblExpression.Size = New System.Drawing.Size(54, 13) + Me.lblExpression.TabIndex = 122 + Me.lblExpression.Tag = "Expression" + Me.lblExpression.Text = "Selection:" + ' 'dlgScript ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -1151,4 +1180,6 @@ Partial Class dlgScript Friend WithEvents lblSelectColumns As Label Friend WithEvents ucrReceiverRank As ucrReceiverSingle Friend WithEvents ucrSelectorForRank As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverForCalculation As ucrReceiverExpression + Friend WithEvents lblExpression As Label End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index 8e102e459b..35af5c4c89 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -444,48 +444,53 @@ Public Class dlgScript clsPipeOperator.ToScript(strScript:=strAssignedOperarorScript) - Dim strAssignedMapScript As String = "" + 'Dim strAssignedMapScript As String = "" - clsNamesFunction.SetRCommand("names") - clsNamesFunction.AddParameter("name", clsROperatorParameter:=clsPipeOperator, bIncludeArgumentName:=False, iPosition:=0) + 'clsNamesFunction.SetRCommand("names") + 'clsNamesFunction.AddParameter("name", clsROperatorParameter:=clsPipeOperator, bIncludeArgumentName:=False, iPosition:=0) - clsOpeningOperator.SetOperation("[[.x]]") - clsOpeningOperator.AddParameter("left", ucrSelectorForRank.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) - clsOpeningOperator.bForceIncludeOperation = True - clsOpeningOperator.bBrackets = False + 'clsOpeningOperator.SetOperation("[[.x]]") + 'clsOpeningOperator.AddParameter("left", ucrSelectorForRank.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + 'clsOpeningOperator.bForceIncludeOperation = True + 'clsOpeningOperator.bBrackets = False - clsRescaleFunction.SetPackageName("~scales") - clsRescaleFunction.SetRCommand("rescale") - clsRescaleFunction.AddParameter("scales", clsROperatorParameter:=clsOpeningOperator, bIncludeArgumentName:=False, iPosition:=0) - clsRescaleFunction.AddParameter("na.rm", "TRUE", iPosition:=1) + 'clsRescaleFunction.SetPackageName("~scales") + 'clsRescaleFunction.SetRCommand("rescale") + 'clsRescaleFunction.AddParameter("scales", clsROperatorParameter:=clsOpeningOperator, bIncludeArgumentName:=False, iPosition:=0) + 'clsRescaleFunction.AddParameter("na.rm", "TRUE", iPosition:=1) - clsMapFunction.SetPackageName("purrr") - clsMapFunction.SetRCommand("map") - clsMapFunction.AddParameter(".x", clsRFunctionParameter:=clsNamesFunction, iPosition:=0) - clsMapFunction.AddParameter(".f", clsRFunctionParameter:=clsRescaleFunction, iPosition:=1) + 'clsMapFunction.SetPackageName("purrr") + 'clsMapFunction.SetRCommand("map") + 'clsMapFunction.AddParameter(".x", clsRFunctionParameter:=clsNamesFunction, iPosition:=0) + 'clsMapFunction.AddParameter(".f", clsRFunctionParameter:=clsRescaleFunction, iPosition:=1) - clsBindColsFunction.SetPackageName("dplyr") - clsBindColsFunction.SetRCommand("bind_cols") - clsBindColsFunction.AddParameter("", ".", bIncludeArgumentName:=False, iPosition:=0) + 'clsBindColsFunction.SetPackageName("dplyr") + 'clsBindColsFunction.SetRCommand("bind_cols") + 'clsBindColsFunction.AddParameter("", ".", bIncludeArgumentName:=False, iPosition:=0) - clsPipeOperator2.SetOperation("%>%") - clsPipeOperator2.AddParameter("left", clsRFunctionParameter:=clsMapFunction, iPosition:=0) - clsPipeOperator2.AddParameter("right", clsRFunctionParameter:=clsBindColsFunction, iPosition:=1) - clsPipeOperator2.SetAssignTo("calc") + 'clsPipeOperator2.SetOperation("%>%") + 'clsPipeOperator2.AddParameter("left", clsRFunctionParameter:=clsMapFunction, iPosition:=0) + 'clsPipeOperator2.AddParameter("right", clsRFunctionParameter:=clsBindColsFunction, iPosition:=1) + 'clsPipeOperator2.SetAssignTo("calc") - clsPipeOperator2.ToScript(strScript:=strAssignedMapScript) + 'clsPipeOperator2.ToScript(strScript:=strAssignedMapScript) + 'strScript = Environment.NewLine & strAssignedOperarorScript & clsPipeOperator2.ToScript() - Dim strAssignedAddColsScripts As String = "" + 'Dim strAssignedAddColsScripts As String = "" - clsAddColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") - clsAddColumnsFunction.AddParameter("data_name", Chr(34) & ucrSelectorForRank.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) - clsAddColumnsFunction.AddParameter("col_name", Chr(34) & "calc" & Chr(34), iPosition:=1) - clsAddColumnsFunction.AddParameter("col_data", clsROperatorParameter:=clsPipeOperator2, iPosition:=2) - clsAddColumnsFunction.AddParameter("before", "FALSE", iPosition:=3) - clsAddColumnsFunction.ToScript(strScript:=strAssignedAddColsScripts) + 'clsAddColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$add_columns_to_data") + 'clsAddColumnsFunction.AddParameter("data_name", Chr(34) & ucrSelectorForRank.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + 'clsAddColumnsFunction.AddParameter("col_name", Chr(34) & "calc" & Chr(34), iPosition:=1) + 'clsAddColumnsFunction.AddParameter("col_data", clsROperatorParameter:=clsPipeOperator2, iPosition:=2) + 'clsAddColumnsFunction.AddParameter("before", "FALSE", iPosition:=3) + 'clsAddColumnsFunction.ToScript(strScript:=strAssignedAddColsScripts) - strScript = Environment.NewLine & strAssignedMapScript & clsAddColumnsFunction.ToScript() + 'strScript = Environment.NewLine & strAssignedMapScript & clsAddColumnsFunction.ToScript() + Dim strRdScript As String = strAssignedOperarorScript + + ' Combine scripts if applicable + strScript &= strRdScript End If