diff --git a/docs/Download.html b/docs/Download.html index 4fd4d8652f2..53242cc839e 100644 --- a/docs/Download.html +++ b/docs/Download.html @@ -79,11 +79,11 @@

Download R-Instat

-

If this is your first time downloading R-Instat, we recommend you download the Complete Installer. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes the required version of R (3.6.0 currently) to run R-Instat.

+

If this is your first time downloading R-Instat, we recommend you download the Complete Installer. The Complete Installer is the same version of R-Instat as the Basic Installer but also includes the required version of R (3.6.0 currently) to run R-Instat.

If you do not know if you have the latest version of R, download the Complete Installer. The Basic Installer does not include R.

R-Instat is currently a Windows only application. However, it can be accessed on Mac or Linux through use of a Virtual Windows Machine.

-

R-Instat 0.5.3 Complete Installer (.exe 577MB)

-

R-Instat 0.5.3 Basic Installer (.msi 499MB)

+

R-Instat 0.5.4 Complete Installer (.exe 577MB)

+

R-Instat 0.5.4 Basic Installer (.msi 499MB)

Installation & Documentation

diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index f7f03d48525..e3f2f494c8a 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -46,6 +46,11 @@ Partial Class dlgBarAndPieChart Me.rdoPieChart = New System.Windows.Forms.RadioButton() Me.rdoBarChart = New System.Windows.Forms.RadioButton() Me.cmdBarChartOptions = New System.Windows.Forms.Button() + Me.lblPosition = New System.Windows.Forms.Label() + Me.rdoColumnChart = New System.Windows.Forms.RadioButton() + Me.lblYvariable = New System.Windows.Forms.Label() + Me.cmdColumnChartOptions = New System.Windows.Forms.Button() + Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.ucrInputBarChartPosition = New instat.ucrInputComboBox() Me.ucrSaveBar = New instat.ucrSave() Me.ucrChkFlipCoordinates = New instat.ucrCheck() @@ -54,7 +59,6 @@ Partial Class dlgBarAndPieChart Me.ucrBarChartSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlOptions = New instat.UcrPanel() - Me.lblPosition = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'lblVariable @@ -114,6 +118,44 @@ Partial Class dlgBarAndPieChart Me.cmdBarChartOptions.Tag = "Bar_Chart_Options" Me.cmdBarChartOptions.UseVisualStyleBackColor = True ' + 'lblPosition + ' + resources.ApplyResources(Me.lblPosition, "lblPosition") + Me.lblPosition.Name = "lblPosition" + ' + 'rdoColumnChart + ' + resources.ApplyResources(Me.rdoColumnChart, "rdoColumnChart") + Me.rdoColumnChart.BackColor = System.Drawing.SystemColors.Control + Me.rdoColumnChart.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColumnChart.FlatAppearance.BorderSize = 2 + Me.rdoColumnChart.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColumnChart.Name = "rdoColumnChart" + Me.rdoColumnChart.TabStop = True + Me.rdoColumnChart.Tag = "Column_Chart" + Me.rdoColumnChart.UseVisualStyleBackColor = False + ' + 'lblYvariable + ' + resources.ApplyResources(Me.lblYvariable, "lblYvariable") + Me.lblYvariable.Name = "lblYvariable" + ' + 'cmdColumnChartOptions + ' + resources.ApplyResources(Me.cmdColumnChartOptions, "cmdColumnChartOptions") + Me.cmdColumnChartOptions.Name = "cmdColumnChartOptions" + Me.cmdColumnChartOptions.Tag = "Column_Chart_Options" + Me.cmdColumnChartOptions.UseVisualStyleBackColor = True + ' + 'ucrReceiverY + ' + Me.ucrReceiverY.frmParent = Me + resources.ApplyResources(Me.ucrReceiverY, "ucrReceiverY") + Me.ucrReceiverY.Name = "ucrReceiverY" + Me.ucrReceiverY.Selector = Nothing + Me.ucrReceiverY.strNcFilePath = "" + Me.ucrReceiverY.ucrSelector = Nothing + ' 'ucrInputBarChartPosition ' Me.ucrInputBarChartPosition.AddQuotesIfUnrecognised = True @@ -168,15 +210,14 @@ Partial Class dlgBarAndPieChart resources.ApplyResources(Me.ucrPnlOptions, "ucrPnlOptions") Me.ucrPnlOptions.Name = "ucrPnlOptions" ' - 'lblPosition - ' - resources.ApplyResources(Me.lblPosition, "lblPosition") - Me.lblPosition.Name = "lblPosition" - ' 'dlgBarAndPieChart ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.cmdColumnChartOptions) + Me.Controls.Add(Me.lblYvariable) + Me.Controls.Add(Me.ucrReceiverY) + Me.Controls.Add(Me.rdoColumnChart) Me.Controls.Add(Me.lblPosition) Me.Controls.Add(Me.ucrInputBarChartPosition) Me.Controls.Add(Me.ucrSaveBar) @@ -219,4 +260,8 @@ Partial Class dlgBarAndPieChart Friend WithEvents cmdBarChartOptions As Button Friend WithEvents ucrInputBarChartPosition As ucrInputComboBox Friend WithEvents lblPosition As Label + Friend WithEvents rdoColumnChart As RadioButton + Friend WithEvents lblYvariable As Label + Friend WithEvents ucrReceiverY As ucrReceiverSingle + Friend WithEvents cmdColumnChartOptions As Button End Class \ No newline at end of file diff --git a/instat/dlgBarAndPieChart.resx b/instat/dlgBarAndPieChart.resx index 57661dfb859..7c81550356d 100644 --- a/instat/dlgBarAndPieChart.resx +++ b/instat/dlgBarAndPieChart.resx @@ -148,7 +148,7 @@ $this - 8 + 12 True @@ -178,7 +178,7 @@ $this - 7 + 11 NoControl @@ -193,7 +193,7 @@ 11 - Options + Plot Options cmdOptions @@ -205,7 +205,7 @@ $this - 6 + 10 NoControl @@ -232,7 +232,7 @@ $this - 14 + 18 Button @@ -244,7 +244,7 @@ NoControl - 206, 12 + 176, 10 110, 28 @@ -268,7 +268,7 @@ $this - 5 + 9 Button @@ -280,7 +280,7 @@ NoControl - 98, 12 + 66, 10 110, 28 @@ -304,7 +304,7 @@ $this - 4 + 8 NoControl @@ -331,10 +331,142 @@ $this - 13 + 17 + + + True + + + NoControl + + + 256, 171 + + + 47, 13 + + + 8 + + + Position: + + + lblPosition + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + Button + + + Flat + + + NoControl + + + 286, 10 + + + 110, 28 + + + 15 + + + Column Chart + + + MiddleCenter + + + rdoColumnChart + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + True + + + NoControl + + + 255, 171 + + + 63, 13 + + + 17 + + + By Variable: + + + lblYvariable + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + + + NoControl + + + 10, 231 + + + 121, 25 + + + 18 + + + Column Chart Options + + + cmdColumnChartOptions + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 6, 13 + + + 431, 411 - 255, 188 + 255, 184 21, 17, 21, 17 @@ -355,10 +487,10 @@ $this - 1 + 5 - 10, 319 + 9, 328 255, 24 @@ -376,10 +508,10 @@ $this - 2 + 6 - 10, 293 + 9, 302 166, 20 @@ -397,43 +529,31 @@ $this - 3 - - - True - - - 6, 13 - - - 415, 400 - - - True + 7 - - 252, 170 + + 255, 141 - - 47, 13 + + 0, 0, 0, 0 - - 8 + + 120, 20 - - Position: + + 7 - - lblPosition + + ucrReceiverByFactor - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 0 + + 13 255, 91 @@ -457,7 +577,7 @@ $this - 10 + 14 10, 41 @@ -481,10 +601,10 @@ $this - 11 + 15 - 10, 345 + 9, 358 410, 52 @@ -502,13 +622,13 @@ $this - 12 + 16 - 87, 6 + 66, 6 - 241, 36 + 330, 36 0 @@ -523,13 +643,16 @@ $this - 15 + 19 + + + NoControl CenterScreen - Bar and Pie Chart + Bar, Pie and Column Chart dlgBarAndPieChart @@ -537,28 +660,28 @@ System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 255, 141 + + 255, 184 - + 0, 0, 0, 0 - + 120, 20 - - 7 + + 16 - - ucrReceiverByFactor + + ucrReceiverY - + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - + $this - - 9 + + 2 \ No newline at end of file diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index d277d4a304e..97d8e1801b3 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -21,6 +21,8 @@ Public Class dlgBarAndPieChart Private clsRgeomBarFunction As New RFunction Private clsBarAesFunction As New RFunction Private clsPieAesFunction As New RFunction + Private clsRColFunction As New RFunction + Private clsColAesFunction As New RFunction Private clsLocalRaesFunction As New RFunction Private clsBaseOperator As New ROperator Private clsRCoordPolarParam As New RParameter @@ -66,14 +68,18 @@ Public Class dlgBarAndPieChart ucrPnlOptions.AddRadioButton(rdoBarChart) ucrPnlOptions.AddRadioButton(rdoPieChart) + ucrPnlOptions.AddRadioButton(rdoColumnChart) ucrPnlOptions.AddParameterPresentCondition(rdoPieChart, "coord_polar") - ucrPnlOptions.AddParameterPresentCondition(rdoBarChart, "coord_polar", False) + ucrPnlOptions.AddParameterPresentCondition(rdoBarChart, "geom_bar") + ucrPnlOptions.AddParameterPresentCondition(rdoColumnChart, "geom_col") + + ucrPnlOptions.AddToLinkedControls({ucrChkFlipCoordinates}, {rdoColumnChart, rdoBarChart}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls(ucrInputBarChartPosition, {rdoBarChart}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrInputBarChartPosition.SetLinkedDisplayControl(lblPosition) - - ucrPnlOptions.AddToLinkedControls(ucrChkFlipCoordinates, {rdoBarChart}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlOptions.AddToLinkedControls(ucrReceiverByFactor, {rdoBarChart}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrReceiverByFactor}, {rdoBarChart, rdoColumnChart}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrReceiverByFactor.SetLinkedDisplayControl(lblByFactor) + ucrPnlOptions.AddToLinkedControls(ucrReceiverY, {rdoColumnChart}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrReceiverY.SetLinkedDisplayControl(lblYvariable) ucrBarChartSelector.SetParameter(New RParameter("data", 0)) ucrBarChartSelector.SetParameterIsrfunction() @@ -83,6 +89,7 @@ Public Class dlgBarAndPieChart ucrReceiverFirst.SetParameter(New RParameter("x", 0)) ucrReceiverFirst.bWithQuotes = False ucrReceiverFirst.SetParameterIsString() + ucrReceiverFirst.SetLinkedDisplayControl(lblVariable) ucrReceiverByFactor.Selector = ucrBarChartSelector ucrReceiverByFactor.SetIncludedDataTypes({"factor"}) @@ -91,6 +98,13 @@ Public Class dlgBarAndPieChart ucrReceiverByFactor.bWithQuotes = False ucrReceiverByFactor.SetParameterIsString() + ucrReceiverY.Selector = ucrBarChartSelector + ucrReceiverY.strSelectorHeading = "Y Variable" + ucrReceiverY.SetParameter(New RParameter("y", 1)) + ucrReceiverY.bWithQuotes = False + ucrReceiverY.SetParameterIsString() + ucrReceiverY.SetLinkedDisplayControl(lblYvariable) + ucrSaveBar.SetIsComboBox() ucrSaveBar.SetCheckBoxText("Save Graph") ucrSaveBar.SetDataFrameSelector(ucrBarChartSelector.ucrAvailableDataFrames) @@ -130,6 +144,8 @@ Public Class dlgBarAndPieChart clsRgeomBarFunction = New RFunction clsBarAesFunction = New RFunction clsPieAesFunction = New RFunction + clsColAesFunction = New RFunction + clsRColFunction = New RFunction ucrBarChartSelector.Reset() ucrBarChartSelector.SetGgplotFunction(clsBaseOperator) @@ -140,11 +156,14 @@ Public Class dlgBarAndPieChart clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("geomfunc", clsRFunctionParameter:=clsRgeomBarFunction, iPosition:=2) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsRgeomBarFunction, iPosition:=2) + clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsColAesFunction, iPosition:=1) + clsBarAesFunction.SetPackageName("ggplot2") clsBarAesFunction.SetRCommand("aes") @@ -157,6 +176,16 @@ Public Class dlgBarAndPieChart clsRgeomBarFunction.SetRCommand("geom_bar") clsRgeomBarFunction.AddParameter("position", Chr(34) & "dodge" & Chr(34), iPosition:=0) + clsColAesFunction.SetPackageName("ggplot2") + clsColAesFunction.SetRCommand("aes") + clsColAesFunction.AddParameter("x", Chr(34) & Chr(34)) + clsColAesFunction.AddParameter("y", Chr(34) & Chr(34)) + + clsRColFunction.SetPackageName("ggplot2") + clsRColFunction.SetRCommand("geom_col") + + + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -176,8 +205,12 @@ Public Class dlgBarAndPieChart Private Sub SetRCodeForControls(bReset As Boolean) ucrReceiverFirst.SetRCode(clsBarAesFunction, bReset) ucrReceiverFirst.AddAdditionalCodeParameterPair(clsPieAesFunction, New RParameter("fill", 0), iAdditionalPairNo:=1) + ucrReceiverFirst.AddAdditionalCodeParameterPair(clsColAesFunction, New RParameter("x", 0), iAdditionalPairNo:=2) ucrReceiverByFactor.SetRCode(clsBarAesFunction, bReset) + ucrReceiverByFactor.AddAdditionalCodeParameterPair(clsColAesFunction, New RParameter("fill", 0), iAdditionalPairNo:=1) + + ucrReceiverY.SetRCode(clsColAesFunction, bReset) ucrSaveBar.SetRCode(clsBaseOperator, bReset) ucrBarChartSelector.SetRCode(clsRggplotFunction, bReset) @@ -187,10 +220,24 @@ Public Class dlgBarAndPieChart End Sub Private Sub TestOkEnabled() - If ucrReceiverFirst.IsEmpty OrElse Not ucrSaveBar.IsComplete Then - ucrBase.OKEnabled(False) - Else - ucrBase.OKEnabled(True) + If rdoBarChart.Checked Then + If ucrReceiverFirst.IsEmpty OrElse Not ucrSaveBar.IsComplete Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + ElseIf rdoPieChart.Checked Then + If ucrReceiverFirst.IsEmpty OrElse Not ucrSaveBar.IsComplete Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + ElseIf rdoColumnChart.Checked Then + If Not ucrReceiverFirst.IsEmpty AndAlso Not ucrReceiverY.IsEmpty AndAlso ucrSaveBar.IsComplete Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End If End Sub @@ -234,6 +281,29 @@ Public Class dlgBarAndPieChart TestOkEnabled() End Sub + Private Sub cmdColumnChartOptions_Click(sender As Object, e As EventArgs) Handles cmdColumnChartOptions.Click + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsRColFunction, clsNewGlobalAesFunc:=clsColAesFunction, clsNewLocalAes:=clsLocalRaesFunction, bFixGeom:=True, ucrNewBaseSelector:=ucrBarChartSelector, bApplyAesGlobally:=True, bReset:=bResetBarLayerSubdialog) + sdgLayerOptions.ShowDialog() + bResetBarLayerSubdialog = False + If clsColAesFunction.ContainsParameter("x") Then + ucrReceiverFirst.Add(clsColAesFunction.GetParameter("x").strArgumentValue) + Else + ucrReceiverFirst.Clear() + End If + If clsColAesFunction.ContainsParameter("y") Then + ucrReceiverY.Add(clsColAesFunction.GetParameter("y").strArgumentValue) + Else + ucrReceiverY.Clear() + End If + If clsColAesFunction.ContainsParameter("fill") Then + ucrReceiverByFactor.Add(clsColAesFunction.GetParameter("fill").strArgumentValue) + Else + ucrReceiverByFactor.Clear() + End If + TestOkEnabled() + End Sub + + Private Sub cmdPieChartOptions_Click(sender As Object, e As EventArgs) Handles cmdPieChartOptions.Click sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsRgeomBarFunction, clsNewGlobalAesFunc:=clsPieAesFunction, clsNewLocalAes:=clsLocalRaesFunction, bFixGeom:=True, ucrNewBaseSelector:=ucrBarChartSelector, bApplyAesGlobally:=True, bReset:=bResetBarLayerSubdialog) sdgLayerOptions.ShowDialog() @@ -255,8 +325,13 @@ Public Class dlgBarAndPieChart clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) cmdPieChartOptions.Visible = False cmdBarChartOptions.Visible = True + cmdColumnChartOptions.Visible = False + If Not clsBaseOperator.ContainsParameter("geom_bar") Then + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsRgeomBarFunction, iPosition:=2) + End If clsRgeomBarFunction.RemoveParameterByName("width") clsBaseOperator.RemoveParameter(clsRCoordPolarParam) + clsBaseOperator.RemoveParameterByName("geom_col") If Not ucrSaveBar.bUserTyped Then ucrSaveBar.SetPrefix("bar") End If @@ -266,9 +341,11 @@ Public Class dlgBarAndPieChart clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsPieAesFunction, iPosition:=1) clsRgeomBarFunction.AddParameter("width", "1") clsBaseOperator.AddParameter(clsRCoordPolarParam) + clsBaseOperator.RemoveParameterByName("geom_col") ucrReceiverFirst.SetMeAsReceiver() cmdPieChartOptions.Visible = True cmdBarChartOptions.Visible = False + cmdColumnChartOptions.Visible = False If Not ucrSaveBar.bUserTyped Then ucrSaveBar.SetPrefix("pie") End If @@ -277,14 +354,55 @@ Public Class dlgBarAndPieChart If Not {"factor", "logical"}.Contains(ucrReceiverFirst.strCurrDataType) Then ucrReceiverFirst.Clear() End If + ElseIf rdoColumnChart.Checked Then + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsColAesFunction, iPosition:=1) + cmdPieChartOptions.Visible = False + cmdBarChartOptions.Visible = False + cmdColumnChartOptions.Visible = True + ucrReceiverFirst.SetIncludedDataTypes({"numeric", "factor"}) + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameter(clsRCoordPolarParam) + clsBaseOperator.AddParameter("geom_col", clsRFunctionParameter:=clsRColFunction, iPosition:=2) + ucrReceiverY.SetMeAsReceiver() + If Not ucrSaveBar.bUserTyped Then + ucrSaveBar.SetPrefix("column") + End If + End If + End Sub + Private Sub ChangeReceiverLocation() + If rdoBarChart.Checked Then + lblVariable.Text = "Variable" + lblVariable.Location = New Point(255, 76) + ucrReceiverFirst.Location = New Point(255, 91) + lblByFactor.Text = "By Factor (Optional):" + lblByFactor.Location = New Point(255, 126) + ucrReceiverByFactor.Location = New Point(255, 141) + lblPosition.Text = "Position" + lblPosition.Location = New Point(255, 171) + ucrInputBarChartPosition.Location = New Point(255, 184) + ElseIf rdoColumnChart.Checked Then + lblYvariable.Text = "Y Variable:" + lblYvariable.Location = New Point(255, 76) + ucrReceiverY.Location = New Point(255, 91) + lblVariable.Text = "X Variable:" + lblVariable.Location = New Point(255, 126) + ucrReceiverFirst.Location = New Point(255, 141) + lblByFactor.Text = "By Factor (Optional):" + lblByFactor.Location = New Point(255, 171) + ucrReceiverByFactor.Location = New Point(255, 184) + ElseIf rdoPieChart.Checked Then + lblVariable.Text = "Variable" + lblVariable.Location = New Point(255, 76) + ucrReceiverFirst.Location = New Point(255, 91) End If End Sub Private Sub ucrPnlOptions_ControlValueChanged() Handles ucrPnlOptions.ControlValueChanged SetDialogOptions() + ChangeReceiverLocation() End Sub - Private Sub CoreControls_ContentsChanged() Handles ucrReceiverFirst.ControlContentsChanged, ucrSaveBar.ControlContentsChanged + Private Sub CoreControls_ContentsChanged() Handles ucrReceiverFirst.ControlContentsChanged, ucrReceiverY.ControlContentsChanged, ucrSaveBar.ControlContentsChanged TestOkEnabled() End Sub End Class diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index 2764601a449..88692cc0869 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -141,6 +141,8 @@ Public Class dlgCalculator Me.Size = New System.Drawing.Size(iBasicWidth * 1.49, Me.Height) Case "Strings (Character Columns)" Me.Size = New System.Drawing.Size(iBasicWidth * 1.41, Me.Height) + Case "Factor" + Me.Size = New System.Drawing.Size(iBasicWidth * 1.42, Me.Height) Case "Probability" Me.Size = New System.Drawing.Size(iBasicWidth * 1.59, Me.Height) Case "Dates" diff --git a/instat/dlgFitModel.Designer.vb b/instat/dlgFitModel.Designer.vb index 72c75408f67..faa9f380406 100644 --- a/instat/dlgFitModel.Designer.vb +++ b/instat/dlgFitModel.Designer.vb @@ -71,6 +71,8 @@ Partial Class dlgFitModel Me.ucrReceiverResponseVar = New instat.ucrReceiverSingle() Me.ucrSelectorByDataFrameAddRemoveForFitModel = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrInputTryMessage = New instat.ucrInputTextBox() + Me.cmdTry = New System.Windows.Forms.Button() Me.grpFirstCalc.SuspendLayout() Me.grpSecondCalc.SuspendLayout() Me.SuspendLayout() @@ -288,10 +290,26 @@ Partial Class dlgFitModel resources.ApplyResources(Me.ucrBase, "ucrBase") Me.ucrBase.Name = "ucrBase" ' + 'ucrInputTryMessage + ' + Me.ucrInputTryMessage.AddQuotesIfUnrecognised = True + Me.ucrInputTryMessage.IsMultiline = False + Me.ucrInputTryMessage.IsReadOnly = True + resources.ApplyResources(Me.ucrInputTryMessage, "ucrInputTryMessage") + Me.ucrInputTryMessage.Name = "ucrInputTryMessage" + ' + 'cmdTry + ' + resources.ApplyResources(Me.cmdTry, "cmdTry") + Me.cmdTry.Name = "cmdTry" + Me.cmdTry.UseVisualStyleBackColor = True + ' 'dlgFitModel ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrInputTryMessage) + Me.Controls.Add(Me.cmdTry) Me.Controls.Add(Me.ucrModelName) Me.Controls.Add(Me.ucrChkConvertToVariate) Me.Controls.Add(Me.grpSecondCalc) @@ -351,4 +369,6 @@ Partial Class dlgFitModel Friend WithEvents cmdPower As Button Friend WithEvents ucrChkConvertToVariate As ucrCheck Friend WithEvents ucrModelName As ucrSave + Friend WithEvents ucrInputTryMessage As ucrInputTextBox + Friend WithEvents cmdTry As Button End Class diff --git a/instat/dlgFitModel.resx b/instat/dlgFitModel.resx index 87bcf444c34..d86c739b3cb 100644 --- a/instat/dlgFitModel.resx +++ b/instat/dlgFitModel.resx @@ -144,10 +144,10 @@ $this - 12 + 14 - 394, 243 + 394, 285 105, 23 @@ -168,13 +168,13 @@ $this - 10 + 12 True - 7, 248 + 7, 295 80, 13 @@ -195,10 +195,10 @@ $this - 8 + 10 - 394, 271 + 394, 313 105, 23 @@ -219,7 +219,7 @@ $this - 6 + 8 True @@ -246,7 +246,7 @@ $this - 5 + 7 Microsoft Sans Serif, 12pt @@ -532,7 +532,7 @@ 9 - 0 + l() cmdZero @@ -595,7 +595,7 @@ $this - 3 + 5 62, 10 @@ -778,10 +778,10 @@ $this - 2 + 4 - 10, 272 + 10, 316 277, 24 @@ -799,7 +799,7 @@ $this - 0 + 2 378, 43 @@ -820,7 +820,7 @@ $this - 1 + 3 True @@ -829,10 +829,64 @@ 6, 13 - 510, 357 + 510, 420 + + + 90, 251 + + + 2, 3, 2, 3 + + + 321, 22 + + + 16 + + + ucrInputTryMessage + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + + + NoControl + + + 14, 250 + + + 2, 3, 2, 3 + + + 74, 23 + + + 15 + + + Try + + + cmdTry + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 - 90, 245 + 90, 292 298, 21 @@ -850,7 +904,7 @@ $this - 7 + 9 10, 199 @@ -871,7 +925,7 @@ $this - 9 + 11 243, 43 @@ -895,7 +949,7 @@ $this - 11 + 13 10, 10 @@ -919,10 +973,10 @@ $this - 13 + 15 - 10, 300 + 10, 344 410, 52 @@ -940,7 +994,7 @@ $this - 14 + 16 CenterScreen @@ -973,6 +1027,6 @@ $this - 4 + 6 \ No newline at end of file diff --git a/instat/dlgFitModel.vb b/instat/dlgFitModel.vb index 7f408e16a40..8e39cc83d34 100644 --- a/instat/dlgFitModel.vb +++ b/instat/dlgFitModel.vb @@ -15,7 +15,10 @@ ' along with this program. If not, see . Imports instat.Translations +Imports RDotNet Public Class dlgFitModel + Private clsAttach As New RFunction + Private clsDetach As New RFunction Public bFirstLoad As Boolean = True Private bReset As Boolean = True Public bRCodeSet As Boolean = False @@ -174,6 +177,14 @@ Public Class dlgFitModel ucrBase.clsRsyntax.AddToAfterCodes(clsSummaryFunction, 2) clsLMOrGLM = clsLM bResetModelOptions = True + + clsAttach.SetRCommand("attach") + clsDetach.SetRCommand("detach") + clsAttach.AddParameter("what", clsRFunctionParameter:=ucrSelectorByDataFrameAddRemoveForFitModel.ucrAvailableDataFrames.clsCurrDataFrame) + clsDetach.AddParameter("name", clsRFunctionParameter:=ucrSelectorByDataFrameAddRemoveForFitModel.ucrAvailableDataFrames.clsCurrDataFrame) + clsDetach.AddParameter("unload", "TRUE") + ucrBase.clsRsyntax.AddToBeforeCodes(clsAttach) + ucrBase.clsRsyntax.AddToAfterCodes(clsDetach) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -240,7 +251,7 @@ Public Class dlgFitModel End Sub Private Sub cmdZero_Click(sender As Object, e As EventArgs) Handles cmdZero.Click - ucrReceiverExpressionFitModel.AddToReceiverAtCursorPosition("0") + ucrReceiverExpressionFitModel.AddToReceiverAtCursorPosition("I()", 1) End Sub Private Sub cmdClear_Click(sender As Object, e As EventArgs) Handles cmdClear.Click @@ -377,6 +388,8 @@ Public Class dlgFitModel Private Sub ucrReceiverExpressionFitModel_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverExpressionFitModel.ControlValueChanged, ucrReceiverResponseVar.ControlValueChanged ChooseRFunction() ResponseConvert() + ucrInputTryMessage.SetName("") + ucrInputTryMessage.txtInput.BackColor = SystemColors.Window End Sub Private Sub ucrConvertToVariate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkConvertToVariate.ControlValueChanged @@ -403,4 +416,63 @@ Public Class dlgFitModel Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk ucrReceiverExpressionFitModel.AddtoCombobox(ucrReceiverExpressionFitModel.GetText) End Sub + + Private Sub TryScript() + Dim strVecOutput As CharacterVector + Dim bValid As Boolean + Dim clsTY As RCodeStructure + Try + If ucrReceiverResponseVar.IsEmpty AndAlso ucrReceiverExpressionFitModel.IsEmpty Then + ucrInputTryMessage.SetName("") + Else + Dim strScriptCommands As String = "" + Dim lstScriptCommands As New List(Of String) + clsTY = ucrBase.clsRsyntax.clsBaseFunction.Clone() + clsTY.RemoveAssignTo() + + 'get the before th code scripts,base script and the after code script + lstScriptCommands.AddRange(ucrBase.clsRsyntax.GetBeforeCodesScripts()) + lstScriptCommands.Add(clsTY.ToScript()) + ' lstScriptCommands.AddRange(ucrBase.clsRsyntax.GetAfterCodesScripts()) + + 'concantenate the commands into one sentence for splitting purposes + strScriptCommands = "" + For i As Integer = 0 To lstScriptCommands.Count - 1 + strScriptCommands = strScriptCommands & Environment.NewLine & lstScriptCommands(i) + Next + 'split the whole commands into indidual commands so that we can run them individually + lstScriptCommands.Clear() 'clear the list first + lstScriptCommands.AddRange(strScriptCommands.Split(New String() {Environment.NewLine}, StringSplitOptions.None)) + + bValid = False + For Each str As String In lstScriptCommands + If Not String.IsNullOrWhiteSpace(str) Then + strVecOutput = frmMain.clsRLink.RunInternalScriptGetOutput(str, bSilent:=True) + If strVecOutput IsNot Nothing AndAlso strVecOutput.Length > 1 Then + bValid = True + 'don't break the if, because we may need to run of the detach command + End If + End If + Next + + If bValid Then + ucrInputTryMessage.SetName("Model runs without error") + ucrInputTryMessage.txtInput.BackColor = Color.LightGreen + Else + ucrInputTryMessage.SetName("Command produced an error or no output to display.") + ucrInputTryMessage.txtInput.BackColor = Color.LightCoral + End If + + End If + Catch ex As Exception + ucrInputTryMessage.SetName("Command produced an error. Modify input before running.") + ucrInputTryMessage.txtInput.BackColor = Color.LightCoral + End Try + End Sub + + Private Sub cmdTry_Click(sender As Object, e As EventArgs) Handles cmdTry.Click + TryScript() + End Sub + + End Class \ No newline at end of file diff --git a/instat/instat_oif0jzjc_wpftmp.vbproj b/instat/instat_oif0jzjc_wpftmp.vbproj new file mode 100644 index 00000000000..e1faeee9dd9 --- /dev/null +++ b/instat/instat_oif0jzjc_wpftmp.vbproj @@ -0,0 +1,5953 @@ + + + + + Debug + AnyCPU + {D62FCDDB-1E9E-4B63-B7AA-6482343C9736} + WinExe + instat.My.MyApplication + instat + instat + 512 + WindowsForms + v4.6.1 + true + false + + + C:\Users\deaspo\Desktop\applications\ + true + Disk + false + Foreground + 7 + Days + false + false + true + Missing Tool + Polycarp + Testing Instat + 1 + 1.0.0.%2a + false + true + true + true + + + AnyCPU + true + full + true + true + bin\Debug\ + instat.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + true + + + AnyCPU + pdbonly + false + true + true + bin\Release\ + instat.xml + 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 + true + + + On + + + Binary + + + Off + + + On + + + 86EEAB5D8DE8C40276DE8EE13475BF0BE1232B2D + + + instat_TemporaryKey.pfx + + + true + + + false + + + Resources\rinstat_icon_Hih_icon.ico + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + dlgGraphsGUI.vb + + + Form + + + dlgSurvivalDefine.vb + + + Form + + + dlgSurvivalDescribe.vb + + + Form + + + dlgSurvivalModel.vb + + + Form + + + dlgSurvivalObject.vb + + + Form + + + dlgSurvivalRates.vb + + + Form + + + sdgThemesSub.vb + + + Form + + + + dlgAddComment.vb + + + Form + + + dlgAddKey.vb + + + Form + + + dlgAddLink.vb + + + Form + + + dlgAnonymiseIDColumn.vb + + + Form + + + dlgAutoSaveRecovery.vb + + + Form + + + dlgBackupManager.vb + + + Form + + + dlgCalculateTreatmentDifferences.vb + + + Form + + + dlgCalculationsSummary.vb + + + Form + + + dlgAppend.vb + + + Form + + + dlgCliData.vb + + + Form + + + dlgClimaticBoxPlot.vb + + + Form + + + dlgClimaticCheckDataTemperature.vb + + + Form + + + dlgClimaticLengthOfSeason.vb + + + Form + + + dlgClimaticStationMaps.vb + + + Form + + + dlgClimaticSummary.vb + + + Form + + + dlgClimdexIndices.vb + + + Form + + + dlgClimSoft.vb + + + Form + + + dlgCompare.vb + + + Form + + + dlgCompareColumns.vb + + + Form + + + dlgCompareModels.vb + + + Form + + + dlgCompareTreatmentLines.vb + + + Form + + + dlgConversions.vb + + + Form + + + dlgCopyDataFrame.vb + + + Form + + + dlgCountinFactor.vb + + + Form + + + dlgCountryColouredMap.vb + + + Form + + + DlgDefineClimaticData.vb + + + Form + + + dlgCorruptionDescribe.vb + + + Form + + + dlgDefineCorruption.vb + + + Form + + + dlgDefineCorruptionOutputs.vb + + + Form + + + dlgDefineCRI.vb + + + Form + + + dlgDefineOptionsByContext.vb + + + Form + + + dlgDefineRedFlags.vb + + + Form + + + dlgEvapotranspiration.vb + + + Form + + + dlgHelpVignettes.vb + + + Form + + + dlgHypothesisTestsCalculator.vb + + + Form + + + dlgImportShapeFiles.vb + + + Form + + + dlgExportToCMSAF.vb + + + Form + + + dlgMosaicPlot.vb + + + Form + + + dlgVisualizeData.vb + + + Form + + + sdgComment.vb + + + Form + + + sdgMapOption.vb + + + Form + + + dlgMergeAdditionalData.vb + + + Form + + + dlgModelling.vb + + + Form + + + dlgOptionsByContextBoxplot.vb + + + Form + + + dlgOptionsByContextFItModel.vb + + + Form + + + dlgParallelCoordinatePlot.vb + + + Form + + + dlgTidyDailyData.vb + + + Form + + + dlgFindNonnumericValues.vb + + + Form + + + dlgSPI.vb + + + Form + + + dlgVariableSets.vb + + + Form + + + dlgDescribeTwoVarGraph.vb + + + Form + + + dlgDescribeTwoVariable.vb + + + Form + + + dlgDisplayDailyData.vb + + + Form + + + dlgDuplicates.vb + + + Form + + + dlgEnter.vb + + + Form + + + dlgExportGraphAsImage.vb + + + Form + + + dlgExportRObjects.vb + + + Form + + + dlgExportRWorkspace.vb + + + Form + + + dlgExportToCPT.vb + + + Form + + + dlgExportToOpenRefine.vb + + + Form + + + dlgCorruptionFile.vb + + + Form + + + dlgExtremesClimatic.vb + + + Form + + + dlgPlotRegion.vb + + + Form + + + dlgClimaticCheckDataRain.vb + + + Form + + + dlgViewLabelsAndLevels.vb + + + Form + + + dlgFitCorruptionModel.vb + + + Form + + + dlgFitModel.vb + + + Form + + + dlgFlatFrequencyTable.vb + + + Form + + + dlgFrequency.vb + + + Form + + + dlgImportFromCSPRO.vb + + + Form + + + dlgImportFromODK.vb + + + Form + + + dlgImportGriddedData.vb + + + Form + + + dlgImportOpenRefine.vb + + + Form + + + dlgInfill.vb + + + Form + + + dlgMakeDate.vb + + + Form + + + dlgCorruptionModel.vb + + + Form + + + dlgNewMarkovChains.vb + + + Form + + + dlgSummaryTables.vb + + + Form + + + dlgOneVarCompareModels.vb + + + Form + + + dlgOneVarFitModel.vb + + + Form + + + dlgOneVariableGraph.vb + + + Form + + + dlgOneVarUseModel.vb + + + Form + + + dlgOneWayFrequencies.vb + + + Form + + + dlgOpenNetCDF.vb + + + Form + + + dlgOpenSST.vb + + + Form + + + dlgCorruptionOrganise.vb + + + Form + + + dlgPICSARainfall.vb + + + Form + + + dlgPICSACrops.vb + + + Form + + + dlgPICSATemperature.vb + + + Form + + + dlgRatingScales.vb + + + Form + + + dlgRecodeNumericIntoQuantiles.vb + + + Form + + + dlgRenameDataFrame.vb + + + Form + + + dlgRugPlot.vb + + + Form + + + dlgShowModel.vb + + + Form + + + dlgStandardiseCountryNames.vb + + + Form + + + dlgStringDistance.vb + + + Form + + + dlgStringHandling.vb + + + Form + + + dlgSunshine.vb + + + Form + + + dlgTemperature.vb + + + Form + + + dlgThreeVariableFrequencies.vb + + + Form + + + dlgTransformClimatic.vb + + + Form + + + dlgTwoVariableUseModel.vb + + + Form + + + dlgTwoWayFrequencies.vb + + + Form + + + dlgUseDate.vb + + + Form + + + dlgViewAndRemoveKeys.vb + + + Form + + + dlgViewAndRemoveLinks.vb + + + Form + + + dlgViewGraph.vb + + + Form + + + frmGraphDisplay.vb + + + Form + + + frmOutputWindow.vb + + + Form + + + frmPackageIssues.vb + + + Form + + + ImportFromDatabases.vb + + + Form + + + + sdgAddLink.vb + + + Form + + + sdgAddNewDistribution.vb + + + Form + + + sdgClimdexIndices.vb + + + Form + + + sdgCorruptionCalculatedColumns.vb + + + Form + + + sdgCorruptionCountryLevelColumns.vb + + + Form + + + sdgCountryColouredMapOptions.vb + + + Form + + + sdgDescribeDisplay.vb + + + Form + + + sdgDescribeTwoVarGraph.vb + + + Form + + + sdgDoyRange.vb + + + Form + + + sdgFactorDataFrame.vb + + + Form + + + sdgFitCorruptionModelDisplay.vb + + + Form + + + sdgFrequency.vb + + + Form + + + sdgImportFromClimSoft.vb + + + Form + + + sdgInventoryPlot.vb + + + Form + + + sdgMerge.vb + + + Form + + + sdgOneVarCompareModels.vb + + + Form + + + sdgOneVarFitModDisplay.vb + + + Form + + + sdgOneVarFitModel.vb + + + Form + + + sdgOneVarGraph.vb + + + Form + + + sdgOneVarUseModFit.vb + + + Form + + + sdgCalculationsSummmary.vb + + + Form + + + sdgOneWayFrequencies.vb + + + Form + + + sdgOpenNetCDF.vb + + + Form + + + sdgParallelPlots.vb + + + Form + + + sdgPICSARainfallGraph.vb + + + Form + + + sdgPlotRegion.vb + + + Form + + + sdgProportionsPercentages.vb + + + Form + + + sdgSaveColumnPosition.vb + + + Form + + + sdgSelectMonth.vb + + + Form + + + sdgThemes.vb + + + Form + + + sdgTwoWayFrequencies.vb + + + Form + + + sdgWindrose.vb + + + Form + + + dlgUseModel.vb + + + Form + + + ucrAxes.vb + + + UserControl + + + + + + + + + dlgAdvanceOptions.vb + + + Form + + + dlgAlignment.vb + + + Form + + + dlgAnnualRaintotal.vb + + + Form + + + dlgBarAndPieChart.vb + + + Form + + + dlgBoxplotCountVariable.vb + + + Form + + + dlgBoxplotMethod.vb + + + Form + + + dlgCalculator.vb + + + Form + + + dlgCanonicalCorrelationAnalysis.vb + + + Form + + + dlgChiSquareTest.vb + + + Form + + + dlgCliBoxplot.vb + + + Form + + + dlgCliPlot.vb + + + Form + + + dlgColourbyProperty.vb + + + Form + + + dlgColumnMetadata.vb + + + Form + + + dlgColumnStats.vb + + + Form + + + dlgCombineText.vb + + + Form + + + dlgContrasts.vb + + + Form + + + dlgCumulativeDistribution.vb + + + Form + + + dlgDeleteObjects.vb + + + Form + + + dlgDeleteMetadata.vb + + + Form + + + dlgDeleteModels.vb + + + Form + + + dlgDeleteRowsOrColums.vb + + + Form + + + dlgDeleteDataFrames.vb + + + Form + + + dlgExportDataset.vb + + + Form + + + dlgFourVariableModelling.vb + + + Form + + + dlgFreezeColumns.vb + + + Form + + + dlgFromLibrary.vb + + + Form + + + dlgGeneralForGraphics.vb + + + Form + + + dlgHideDataframes.vb + + + Form + + + dlgHideShowColumns.vb + + + Form + + + dlgInsertColumn.vb + + + Form + + + dlgJitter.vb + + + Form + + + dlgFactorDataFrame.vb + + + Form + + + dlgMetadata.vb + + + Form + + + dlgOneWayANOVA.vb + + + Form + + + dlgPermuteColumn.vb + + + Form + + + dlgPopulationPyramids.vb + + + Form + + + dlgPrincipalComponentAnalysis.vb + + + Form + + + dlgPrintPreviewOptions.vb + + + Form + + + dlgRandomSubsets.vb + + + Form + + + dlgRecodeNumeric.vb + + + Form + + + dlgRenameObjects.vb + + + Form + + + dlgRenameMetadata.vb + + + Form + + + dlgReorderObjects.vb + + + Form + + + dlgReorderMetadata.vb + + + Form + + + dlgReorderColumns.vb + + + Form + + + dlgReorderLevels.vb + + + Form + + + dlgReorderDataFrame.vb + + + Form + + + dlgRestrict.vb + + + Form + + + dlgRowNamesOrNumbers.vb + + + Form + + + dlgScatterPlot.vb + + + Form + + + dlgDataFrameMetadata.vb + + + Form + + + dlgSplitText.vb + + + Form + + + dlgSummaryBarOrPieChart.vb + + + Form + + + dlgThemes.vb + + + Form + + + dlgTransformText.vb + + + Form + + + dlgTransposeColumns.vb + + + Form + + + dlgTwoSampleNonparametricTest.vb + + + Form + + + dlgRemoveUnusedLevels.vb + + + Form + + + dlgUseGraph.vb + + + Form + + + dlgViewObjects.vb + + + Form + + + dlgWindrose.vb + + + Form + + + dlgCombineforGraphics.vb + + + Form + + + dlgColumnStructures.vb + + + Form + + + frmSetupLoading.vb + + + Form + + + dlgRecodeFactor.vb + + + Form + + + sdgCanonicalCorrelation.vb + + + Form + + + sdgCreateFilter.vb + + + Form + + + sdgDataOptions.vb + + + Form + + + sdgSummaries.vb + + + Form + + + sdgLayerOptions.vb + + + Form + + + sdgCombineGraphOptions.vb + + + Form + + + sdgModelOptions.vb + + + Form + + + sdgPrincipalComponentAnalysis.vb + + + Form + + + sdgVariableTransformations.vb + + + Form + + + ucrAdditionalLayers.vb + + + UserControl + + + ucrCalculator.vb + + + UserControl + + + ucrCheck.vb + + + UserControl + + + ucrColors.vb + + + UserControl + + + ucrColumnMetadata.vb + + + UserControl + + + ucrCore.vb + + + UserControl + + + ucrDataFrameMetadata.vb + + + UserControl + + + ucrDataView.vb + + + UserControl + + + ucrDateTimePicker.vb + + + UserControl + + + ucrDayOfYear.vb + + + UserControl + + + ucrDialogDisabled.vb + + + UserControl + + + ucrElementRectControl.vb + + + UserControl + + + ucrFilter.vb + + + UserControl + + + ucrGeomListWithAes.vb + + + UserControl + + + ucrGeom.vb + + + UserControl + + + ucrGridUnit.vb + + + UserControl + + + ucrInputComboBox.vb + + + UserControl + + + sdgCorrPlot.vb + + + Form + + + sdgANOVAOptions.vb + + + Form + + + sdgRestrict.vb + + + Form + + + dlgConvertColumns.vb + + + Form + + + dlgCorrelation.vb + + + Form + + + dlgCountsTotals.vb + + + Form + + + dlgCPTtoTabularData.vb + + + Form + + + dlgCreateClimateObject.vb + + + Form + + + dlgCumulativeExceedance.vb + + + Form + + + dlgDayMonth.vb + + + Form + + + dlgOneVariableSummarise.vb + + + Form + + + dlgDotPlot.vb + + + Form + + + dlgDuplicateColumns.vb + + + Form + + + dlgExamine.vb + + + Form + + + dlgExpand.vb + + + Form + + + dlgExportforPICSA.vb + + + Form + + + dlgExtremeEvents.vb + + + Form + + + dlgExtremes.vb + + + Form + + + dlgFind.vb + + + Form + + + dlgFormat.vb + + + Form + + + dlgFreqTables.vb + + + Form + + + dlgGammaDistr.vb + + + Form + + + dlgGeneralANOVA.vb + + + Form + + + dlgGeneralisedLinearModels.vb + + + Form + + + dlgHistogram.vb + + + Form + + + dlgHistogramMethod.vb + + + Form + + + dlgImportDataset.vb + + + Form + + + dlgDummyVariables.vb + + + Form + + + dlgCombine.vb + + + Form + + + dlgInventoryMethod.vb + + + Form + + + dlgInventoryPlot.vb + + + Form + + + dlgLabelsLevels.vb + + + Form + + + dlgLockUnlock.vb + + + Form + + + dlgMerge.vb + + + Form + + + dlgMissingData.vb + + + Form + + + dlgMissingDataTable.vb + + + Form + + + dlgName.vb + + + Form + + + dlgNon-ParametricOneWayANOVA.vb + + + Form + + + dlgNon-ParametricOneSampleTests.vb + + + Form + + + dlgOneSample.vb + + + Form + + + dlgOptions.vb + + + Form + + + dlgOutputforCPT.vb + + + Form + + + dlgLinePlot.vb + + + Form + + + dlgPolynomials.vb + + + Form + + + dlgPrepare.vb + + + Form + + + dlgRandomSample.vb + + + Form + + + dlgRank.vb + + + Form + + + dlgReferenceLevel.vb + + + Form + + + dlgTwoVariableFitModel.vb + + + Form + + + dlgRegularSequence.vb + + + Form + + + dlgRemoveUnusedLabels.vb + + + Form + + + dlgReplaceValues.vb + + + Form + + + dlgRowSummary.vb + + + Form + + + dlgSaveAs.vb + + + Form + + + dlgSeasonalSummary.vb + + + Form + + + dlgSeasonalSummaryRain.vb + + + Form + + + dlgSelect.vb + + + Form + + + dlgSelectAndStuck.vb + + + Form + + + dlgShiftDailyData.vb + + + Form + + + dlgThreeVariablesModelling.vb + + + Form + + + dlgSite.vb + + + Form + + + dlgSort.vb + + + Form + + + dlgSpellLength.vb + + + Form + + + dlgSpells.vb + + + Form + + + dlgStack.vb + + + Form + + + dlgStackDailyData.vb + + + Form + + + dlgStartofRains.vb + + + Form + + + dlgBoxPlot.vb + + + Form + + + dlgStemAndLeaf.vb + + + Form + + + dlgSubset.vb + + + Form + + + dlgSummary.vb + + + Form + + + dlgThreeSummaries.vb + + + Form + + + dlgTransform.vb + + + Form + + + dlgNon_ParametricTwoWayAnova.vb + + + Form + + + dlgUnstack.vb + + + Form + + + dlgView.vb + + + Form + + + dlgEndOfRainsSeason.vb + + + Form + + + frmCommand.vb + + + Form + + + frmEditor.vb + + + Form + + + dlgNewDataFrame.vb + + + Form + + + frmLog.vb + + + Form + + + frmMain.vb + + + Form + + + frmMetaData.vb + + + Form + + + frmScript.vb + + + Form + + + frmVariables.vb + + + Form + + + + + True + Application.myapp + + + True + True + Resources.resx + + + True + Settings.settings + True + + + + + + sdgPlots.vb + + + Form + + + sdgSimpleRegOptions.vb + + + Form + + + + ucrButtons.vb + + + UserControl + + + ucrButtonsSubdialogue.vb + + + UserControl + + + ucrDataFrame.vb + + + UserControl + + + ucrDataFrameLength.vb + + + UserControl + + + ucrDataSelection.vb + + + UserControl + + + ucrDistributions.vb + + + UserControl + + + ucrDistributionsWithParameters.vb + + + UserControl + + + ucrFactor.vb + + + UserControl + + + ucrInput.vb + + + UserControl + + + ucrInputConfidenceLimit.vb + + + UserControl + + + ucrInputFactorLevels.vb + + + UserControl + + + ucrInputTextBox.vb + + + UserControl + + + ucrLayerParameters.vb + + + UserControl + + + ucrLayerParamsControls.vb + + + UserControl + + + ucrLog.vb + + + UserControl + + + ucrMultipleInput.vb + + + UserControl + + + ucrNewColumnName.vb + + + UserControl + + + ucrNud.vb + + + UserControl + + + ucrOutputWindow.vb + + + UserControl + + + ucrRadio.vb + + + UserControl + + + ucrReceiver.vb + + + UserControl + + + ucrReceiverExpression.vb + + + UserControl + + + ucrReceiverMetadataProperty.vb + + + UserControl + + + ucrReceiverMultiple.vb + + + UserControl + + + ucrReceiverSingle.vb + + + UserControl + + + ucrReorder.vb + + + UserControl + + + ucrSave.vb + + + UserControl + + + ucrSaveGraph.vb + + + UserControl + + + ucrSaveModel.vb + + + UserControl + + + ucrScript.vb + + + UserControl + + + ucrSelector.vb + + + UserControl + + + ucrSelectorAddRemove.vb + + + UserControl + + + ucrSelectorByDataFrame.vb + + + UserControl + + + ucrSelectorByDataFrameAddRemove.vb + + + UserControl + + + ucrELementTextControl.vb + + + UserControl + + + ucrElementLineControl.vb + + + UserControl + + + ucrVariablename.vb + + + UserControl + + + ucrVariablesAsFactor.vb + + + UserControl + + + ucrWPFRichTextBox.xaml + + + UcrPanel.vb + + + UserControl + + + + + dlgGraphsGUI.vb + + + dlgSurvivalDefine.vb + + + dlgSurvivalDescribe.vb + + + dlgSurvivalModel.vb + + + dlgSurvivalObject.vb + + + dlgSurvivalRates.vb + + + sdgThemesSub.vb + + + dlgAddComment.vb + + + dlgAddComment.vb + + + dlgAddKey.vb + + + dlgAddLink.vb + + + dlgAddLink.vb + + + dlgAnonymiseIDColumn.vb + + + dlgAutoSaveRecovery.vb + + + dlgAutoSaveRecovery.vb + + + dlgBackupManager.vb + + + dlgCalculateTreatmentDifferences.vb + + + dlgCalculationsSummary.vb + + + dlgCalculationsSummary.vb + + + dlgAdvanceOptions.vb + + + dlgAdvanceOptions.vb + + + dlgAlignment.vb + + + dlgAlignment.vb + + + dlgAnnualRaintotal.vb + + + dlgAnnualRaintotal.vb + + + dlgAppend.vb + + + dlgAppend.vb + + + dlgBarAndPieChart.vb + + + dlgBarAndPieChart.vb + + + dlgBoxPlot.vb + + + dlgBoxplotCountVariable.vb + + + dlgBoxplotCountVariable.vb + + + dlgBoxplotMethod.vb + + + dlgBoxplotMethod.vb + + + dlgCalculator.vb + + + dlgCalculator.vb + + + dlgCanonicalCorrelationAnalysis.vb + + + dlgCanonicalCorrelationAnalysis.vb + + + dlgChiSquareTest.vb + + + dlgChiSquareTest.vb + + + dlgCliBoxplot.vb + + + dlgCliBoxplot.vb + + + dlgCliData.vb + + + dlgCliData.vb + + + dlgClimaticBoxPlot.vb + + + dlgClimaticBoxPlot.vb + + + dlgClimaticCheckDataRain.vb + + + dlgClimaticCheckDataTemperature.vb + + + dlgClimaticCheckDataTemperature.vb + + + dlgClimaticLengthOfSeason.vb + + + dlgClimaticStationMaps.vb + + + dlgClimaticSummary.vb + + + dlgClimaticSummary.vb + + + dlgClimdexIndices.vb + + + dlgClimdexIndices.vb + + + dlgClimSoft.vb + + + dlgClimSoft.vb + + + dlgCliPlot.vb + + + dlgCliPlot.vb + + + dlgColourbyProperty.vb + + + dlgColourbyProperty.vb + + + dlgColumnMetadata.vb + + + dlgColumnMetadata.vb + + + dlgColumnStats.vb + + + dlgColumnStats.vb + + + dlgCombineText.vb + + + dlgCombineText.vb + + + dlgCompare.vb + + + dlgCompareColumns.vb + + + dlgCompareModels.vb + + + dlgCompareModels.vb + + + dlgCompareTreatmentLines.vb + + + dlgContrasts.vb + + + dlgContrasts.vb + + + dlgConversions.vb + + + dlgCopyDataFrame.vb + + + ResXFileCodeGenerator + dlgCopySheet.Designer.vb + + + ResXFileCodeGenerator + dlgCopySheet.sw-KE.Designer.vb + + + dlgCorruptionDescribe.vb + + + dlgCorruptionFile.vb + + + dlgCorruptionModel.vb + + + dlgCorruptionOrganise.vb + + + dlgCountinFactor.vb + + + dlgCountinFactor.vb + + + dlgCountryColouredMap.vb + + + dlgCountryColouredMap.vb + + + dlgCumulativeDistribution.vb + + + dlgCumulativeDistribution.vb + + + DlgDefineClimaticData.vb + + + DlgDefineClimaticData.vb + + + dlgDefineCorruption.vb + + + dlgDefineCorruption.vb + + + dlgDefineCorruptionOutputs.vb + + + dlgDefineCorruptionOutputs.vb + + + dlgDefineCRI.vb + + + dlgDefineCRI.vb + + + dlgDefineOptionsByContext.vb + + + dlgDefineRedFlags.vb + + + dlgDefineRedFlags.vb + + + dlgDisplayDailyData.vb + + + dlgDuplicates.vb + + + dlgEnter.vb + + + dlgEvapotranspiration.vb + + + dlgExportGraphAsImage.vb + + + dlgExportRObjects.vb + + + dlgExportRWorkspace.vb + + + dlgExportToCPT.vb + + + dlgExportToOpenRefine.vb + + + dlgExtremesClimatic.vb + + + dlgFitCorruptionModel.vb + + + dlgFlatFrequencyTable.vb + + + dlgFreezeColumns.vb + + + dlgFrequency.vb + + + dlgHelpVignettes.vb + + + dlgHypothesisTestsCalculator.vb + + + dlgImportFromCSPRO.vb + + + dlgImportFromODK.vb + + + dlgImportGriddedData.vb + + + dlgImportOpenRefine.vb + + + dlgImportShapeFiles.vb + + + dlgExportToCMSAF.vb + + + dlgInfill.vb + + + dlgMakeDate.vb + + + dlgMosaicPlot.vb + + + dlgVisualizeData.vb + + + sdgComment.vb + + + sdgMapOption.vb + + + dlgMerge.vb + + + dlgMergeAdditionalData.vb + + + dlgModelling.vb + + + dlgNewMarkovChains.vb + + + dlgOneVarCompareModels.vb + + + dlgOneVarFitModel.vb + + + dlgOneVarUseModel.vb + + + dlgOneWayFrequencies.vb + + + dlgOpenNetCDF.vb + + + dlgOptionsByContextBoxplot.vb + + + dlgOptionsByContextFItModel.vb + + + dlgParallelCoordinatePlot.vb + + + dlgPICSARainfall.vb + + + dlgPICSACrops.vb + + + dlgPICSATemperature.vb + + + dlgPlotRegion.vb + + + dlgRatingScales.vb + + + dlgRecodeNumericIntoQuantiles.vb + + + dlgRenameDataFrame.vb + + + dlgTidyDailyData.vb + + + dlgRowNamesOrNumbers.vb + + + dlgRugPlot.vb + + + dlgFindNonnumericValues.vb + + + dlgSpells.vb + + + dlgSPI.vb + + + dlgStandardiseCountryNames.vb + + + dlgStringDistance.vb + + + dlgStringHandling.vb + + + dlgSummaryTables.vb + + + dlgSunshine.vb + + + dlgTemperature.vb + + + dlgThreeVariableFrequencies.vb + + + dlgTransformClimatic.vb + + + dlgTwoVariableUseModel.vb + + + dlgTwoWayFrequencies.vb + + + dlgUseDate.vb + + + dlgVariableSets.vb + + + dlgDeleteObjects.vb + + + dlgDeleteObjects.vb + + + dlgDeleteMetadata.vb + + + dlgDeleteMetadata.vb + + + dlgDeleteModels.vb + + + dlgDeleteModels.vb + + + dlgDeleteRowsOrColums.vb + + + dlgDeleteRowsOrColums.vb + + + dlgDeleteDataFrames.vb + + + dlgDeleteDataFrames.vb + + + dlgCorruptionDescribe.vb + + + dlgDescribeTwoVarGraph.vb + + + dlgDescribeTwoVarGraph.vb + + + dlgDescribeTwoVariable.vb + + + dlgDescribeTwoVariable.vb + + + dlgDisplayDailyData.vb + + + dlgDuplicates.vb + + + dlgEnter.vb + + + dlgExportDataset.vb + + + dlgExportDataset.vb + + + dlgExportGraphAsImage.vb + + + dlgExportRObjects.vb + + + dlgExportRWorkspace.vb + + + dlgExportToCPT.vb + + + dlgExportToOpenRefine.vb + + + dlgCorruptionFile.vb + + + dlgExtremesClimatic.vb + + + dlgPlotRegion.vb + + + dlgClimaticCheckDataRain.vb + + + dlgVariableSets.vb + + + dlgViewAndRemoveKeys.vb + + + dlgViewAndRemoveLinks.vb + + + dlgViewGraph.vb + + + dlgViewLabelsAndLevels.vb + + + dlgFitCorruptionModel.vb + + + dlgFitModel.vb + + + dlgFitModel.vb + + + dlgFlatFrequencyTable.vb + + + dlgFourVariableModelling.vb + + + dlgFourVariableModelling.vb + + + dlgFreezeColumns.vb + + + dlgFrequency.vb + + + dlgFromLibrary.vb + + + dlgFromLibrary.vb + + + dlgGeneralForGraphics.vb + + + dlgGeneralForGraphics.vb + + + dlgHideDataframes.vb + + + dlgHideDataframes.vb + + + dlgHideShowColumns.vb + + + dlgHideShowColumns.vb + + + dlgImportFromCSPRO.vb + + + dlgImportFromODK.vb + + + dlgImportGriddedData.vb + + + dlgImportOpenRefine.vb + + + dlgInfill.vb + + + dlgInsertColumn.vb + + + dlgInsertColumn.vb + + + dlgJitter.vb + + + dlgJitter.vb + + + dlgFactorDataFrame.vb + + + dlgFactorDataFrame.vb + + + dlgMakeDate.vb + + + dlgMerge.vb + + + dlgMetadata.vb + + + dlgMetadata.vb + + + dlgCorruptionModel.vb + + + dlgNewMarkovChains.vb + + + dlgSummaryTables.vb + + + dlgOneVarCompareModels.vb + + + dlgOneVarFitModel.vb + + + dlgOneVariableGraph.vb + + + dlgOneVariableGraph.vb + + + dlgOneVarUseModel.vb + + + dlgOneWayANOVA.vb + + + dlgOneWayANOVA.vb + + + dlgOneWayFrequencies.vb + + + dlgOpenNetCDF.vb + + + dlgOpenSST.vb + + + dlgOpenSST.vb + + + dlgCorruptionOrganise.vb + + + dlgPICSARainfall.vb + + + dlgPermuteColumn.vb + + + dlgPermuteColumn.vb + + + dlgPICSACrops.vb + + + dlgPICSATemperature.vb + + + dlgPopulationPyramids.vb + + + dlgPopulationPyramids.vb + + + dlgPrincipalComponentAnalysis.vb + + + dlgPrincipalComponentAnalysis.vb + + + dlgPrintPreviewOptions.vb + + + dlgPrintPreviewOptions.vb + + + dlgRandomSubsets.vb + + + dlgRandomSubsets.vb + + + dlgRatingScales.vb + + + dlgRecodeNumeric.vb + + + dlgRecodeNumeric.vb + + + dlgRecodeNumericIntoQuantiles.vb + + + dlgRenameObjects.vb + + + dlgRenameObjects.vb + + + dlgRenameMetadata.vb + + + dlgRenameMetadata.vb + + + dlgReorderObjects.vb + + + dlgReorderObjects.vb + + + dlgReorderMetadata.vb + + + dlgReorderMetadata.vb + + + dlgReorderColumns.vb + + + dlgReorderColumns.vb + + + dlgReorderLevels.vb + + + dlgReorderLevels.vb + + + dlgReorderDataFrame.vb + + + dlgReorderDataFrame.vb + + + dlgRestrict.vb + + + dlgRestrict.vb + + + dlgRowNamesOrNumbers.vb + + + dlgRugPlot.vb + + + dlgScatterPlot.vb + + + dlgScatterPlot.vb + + + dlgDataFrameMetadata.vb + + + dlgDataFrameMetadata.vb + + + dlgSpells.vb + + + dlgSplitText.vb + + + dlgSplitText.vb + + + dlgStandardiseCountryNames.vb + + + dlgStringDistance.vb + + + dlgStringHandling.vb + + + dlgSummaryBarOrPieChart.vb + + + dlgSummaryBarOrPieChart.vb + + + dlgShowModel.vb + + + dlgShowModel.vb + + + dlgSunshine.vb + + + dlgTemperature.vb + + + dlgThemes.vb + + + dlgThemes.vb + + + dlgThreeVariableFrequencies.vb + + + dlgTransformClimatic.vb + + + dlgTransformText.vb + + + dlgTransformText.vb + + + dlgTransposeColumns.vb + + + dlgTransposeColumns.vb + + + dlgTwoSampleNonparametricTest.vb + + + dlgTwoSampleNonparametricTest.vb + + + dlgNon_ParametricTwoWayAnova.vb + + + dlgNon_ParametricTwoWayAnova.vb + + + dlgTwoVariableUseModel.vb + + + dlgTwoWayFrequencies.vb + + + dlgRemoveUnusedLevels.vb + + + dlgRemoveUnusedLevels.vb + + + dlgUseDate.vb + + + dlgUseGraph.vb + + + dlgUseGraph.vb + + + dlgViewAndRemoveKeys.vb + + + dlgViewAndRemoveLinks.vb + + + dlgViewLabelsAndLevels.vb + + + dlgViewObjects.vb + + + dlgViewObjects.vb + + + dlgViewGraph.vb + + + dlgWindrose.vb + + + dlgWindrose.vb + + + dlgCombineforGraphics.vb + + + dlgCombineforGraphics.vb + + + dlgColumnStructures.vb + + + dlgColumnStructures.vb + + + frmGraphDisplay.vb + + + frmGraphDisplay.vb + + + frmOutputWindow.vb + + + frmOutputWindow.vb + + + frmPackageIssues.vb + + + frmPackageIssues.vb + + + frmSetupLoading.vb + + + frmSetupLoading.vb + + + dlgRecodeFactor.vb + + + dlgRecodeFactor.vb + + + ImportFromDatabases.vb + + + ImportFromDatabases.vb + + + sdgAddLink.vb + + + sdgAddLink.vb + + + sdgAddNewDistribution.vb + + + sdgAddNewDistribution.vb + + + sdgCalculationsSummmary.vb + + + sdgCalculationsSummmary.vb + + + sdgCanonicalCorrelation.vb + + + sdgCanonicalCorrelation.vb + + + sdgClimdexIndices.vb + + + sdgClimdexIndices.vb + + + sdgCorrPlot.vb + + + sdgCorrPlot.vb + + + sdgCorruptionCalculatedColumns.vb + + + sdgCorruptionCalculatedColumns.vb + + + sdgCorruptionCountryLevelColumns.vb + + + sdgCorruptionCountryLevelColumns.vb + + + sdgCountryColouredMapOptions.vb + + + sdgCountryColouredMapOptions.vb + + + sdgCreateFilter.vb + + + sdgCreateFilter.vb + + + sdgDataOptions.vb + + + sdgDataOptions.vb + + + sdgDescribeTwoVarGraph.vb + + + sdgDescribeTwoVarGraph.vb + + + sdgDoyRange.vb + + + sdgFactorDataFrame.vb + + + sdgFactorDataFrame.vb + + + sdgFitCorruptionModelDisplay.vb + + + sdgFitCorruptionModelDisplay.vb + + + sdgFrequency.vb + + + sdgFrequency.vb + + + sdgImportFromClimSoft.vb + + + sdgImportFromClimSoft.vb + + + sdgInventoryPlot.vb + + + sdgInventoryPlot.vb + + + sdgMerge.vb + + + sdgMerge.vb + + + sdgOneVarCompareModels.vb + + + sdgOneVarCompareModels.vb + + + sdgOneVarFitModDisplay.vb + + + sdgOneVarFitModDisplay.vb + + + sdgOneVarFitModel.vb + + + sdgOneVarFitModel.vb + + + sdgOneVarGraph.vb + + + sdgOneVarGraph.vb + + + sdgOneVarUseModFit.vb + + + sdgOneVarUseModFit.vb + + + sdgOneWayFrequencies.vb + + + sdgOneWayFrequencies.vb + + + sdgOpenNetCDF.vb + + + sdgOpenNetCDF.vb + + + sdgParallelPlots.vb + + + sdgPICSARainfallGraph.vb + + + sdgPlotRegion.vb + + + sdgPlotRegion.vb + + + sdgProportionsPercentages.vb + + + sdgProportionsPercentages.vb + + + sdgSaveColumnPosition.vb + + + sdgSelectMonth.vb + + + sdgSummaries.vb + + + sdgSummaries.vb + + + sdgDescribeDisplay.vb + + + sdgDescribeDisplay.vb + + + sdgLayerOptions.vb + + + sdgLayerOptions.vb + + + sdgCombineGraphOptions.vb + + + sdgCombineGraphOptions.vb + + + sdgModelOptions.vb + + + sdgModelOptions.vb + + + sdgANOVAOptions.vb + + + sdgANOVAOptions.vb + Designer + + + sdgPrincipalComponentAnalysis.vb + + + sdgPrincipalComponentAnalysis.vb + + + sdgRestrict.vb + + + sdgRestrict.vb + + + dlgConvertColumns.vb + + + dlgConvertColumns.vb + + + dlgCorrelation.vb + + + dlgCorrelation.vb + + + dlgCountsTotals.vb + + + dlgCountsTotals.vb + + + dlgCPTtoTabularData.vb + + + dlgCPTtoTabularData.vb + + + dlgCreateClimateObject.vb + + + dlgCreateClimateObject.vb + + + dlgCumulativeExceedance.vb + + + dlgCumulativeExceedance.vb + + + dlgDayMonth.vb + + + dlgDayMonth.vb + + + dlgOneVariableSummarise.vb + + + dlgOneVariableSummarise.vb + + + dlgDotPlot.vb + + + dlgDotPlot.vb + + + dlgDuplicateColumns.vb + + + dlgDuplicateColumns.vb + + + dlgExamine.vb + + + dlgExamine.vb + + + dlgExpand.vb + + + dlgExpand.vb + + + dlgExportforPICSA.vb + + + dlgExportforPICSA.vb + + + dlgExtremeEvents.vb + + + dlgExtremeEvents.vb + + + dlgExtremes.vb + + + dlgExtremes.vb + + + dlgFind.vb + + + dlgFind.vb + + + dlgFormat.vb + + + dlgFormat.vb + + + dlgFreqTables.vb + + + dlgFreqTables.vb + + + dlgGammaDistr.vb + + + dlgGammaDistr.vb + + + dlgGeneralANOVA.vb + + + dlgGeneralANOVA.vb + + + dlgGeneralisedLinearModels.vb + + + dlgGeneralisedLinearModels.vb + + + dlgHistogram.vb + + + dlgHistogram.vb + + + dlgHistogramMethod.vb + + + dlgHistogramMethod.vb + + + dlgImportDataset.vb + + + dlgImportDataset.vb + + + dlgDummyVariables.vb + + + dlgDummyVariables.vb + + + dlgCombine.vb + + + dlgCombine.vb + + + dlgInventoryMethod.vb + + + dlgInventoryMethod.vb + + + dlgInventoryPlot.vb + + + dlgInventoryPlot.vb + + + dlgLabelsLevels.vb + + + dlgLabelsLevels.vb + + + dlgLockUnlock.vb + + + dlgLockUnlock.vb + + + dlgMissingData.vb + + + dlgMissingData.vb + + + dlgMissingDataTable.vb + + + dlgMissingDataTable.vb + + + dlgName.vb + + + dlgName.vb + + + dlgNon-ParametricOneWayANOVA.vb + + + dlgNon-ParametricOneWayANOVA.vb + Designer + + + dlgNon-ParametricOneSampleTests.vb + + + dlgNon-ParametricOneSampleTests.vb + + + dlgOneSample.vb + + + dlgOneSample.vb + + + dlgOptions.vb + + + dlgOptions.vb + + + dlgOutputforCPT.vb + + + dlgOutputforCPT.vb + + + dlgLinePlot.vb + + + dlgLinePlot.vb + + + dlgPolynomials.vb + + + dlgPolynomials.vb + + + dlgPrepare.vb + + + dlgPrepare.vb + + + dlgRandomSample.vb + + + dlgRandomSample.vb + + + dlgRank.vb + + + dlgRank.vb + + + dlgReferenceLevel.vb + + + dlgReferenceLevel.vb + + + dlgTwoVariableFitModel.vb + + + dlgTwoVariableFitModel.vb + Designer + + + dlgRegularSequence.vb + + + dlgRegularSequence.vb + + + dlgRemoveUnusedLabels.vb + + + dlgRemoveUnusedLabels.vb + + + dlgReplaceValues.vb + + + dlgReplaceValues.vb + + + dlgRowSummary.vb + + + dlgRowSummary.vb + + + dlgSaveAs.vb + + + dlgSaveAs.vb + + + dlgSeasonalSummary.vb + + + dlgSeasonalSummary.vb + + + dlgSeasonalSummaryRain.vb + + + dlgSeasonalSummaryRain.vb + + + dlgSelect.vb + + + dlgSelect.vb + + + dlgSelectAndStuck.vb + + + dlgSelectAndStuck.vb + + + dlgShiftDailyData.vb + + + dlgShiftDailyData.vb + + + dlgThreeVariablesModelling.vb + + + dlgThreeVariablesModelling.vb + + + dlgSite.vb + + + dlgSite.vb + + + dlgSort.vb + + + dlgSort.vb + + + dlgSpellLength.vb + + + dlgSpellLength.vb + + + dlgStack.vb + + + dlgStack.vb + + + dlgStackDailyData.vb + + + dlgStackDailyData.vb + + + dlgStartofRains.vb + + + dlgStartofRains.vb + + + dlgBoxPlot.vb + + + dlgStemAndLeaf.vb + + + dlgStemAndLeaf.vb + + + dlgSummary.vb + + + dlgSummary.vb + + + dlgTransform.vb + + + dlgTransform.vb + + + dlgUnstack.vb + + + dlgUnstack.vb + + + dlgView.vb + + + dlgView.vb + + + dlgEndOfRainsSeason.vb + + + dlgEndOfRainsSeason.vb + + + frmCommand.vb + + + frmCommand.vb + + + frmEditor.vb + + + frmEditor.vb + Designer + + + dlgNewDataFrame.vb + + + dlgNewDataFrame.vb + + + frmLog.vb + + + frmLog.vb + + + frmMain.vb + Designer + + + frmMain.vb + + + frmMetaData.vb + + + frmMetaData.vb + + + frmScript.vb + + + frmScript.vb + + + frmVariables.vb + + + frmVariables.vb + + + VbMyResourcesResXFileCodeGenerator + Resources.Designer.vb + My.Resources + Designer + + + Designer + + + sdgPlots.vb + + + sdgPlots.vb + + + sdgSimpleRegOptions.vb + + + sdgSimpleRegOptions.vb + + + sdgThemes.vb + + + sdgThemes.vb + + + sdgTwoWayFrequencies.vb + + + sdgTwoWayFrequencies.vb + + + sdgVariableTransformations.vb + + + sdgVariableTransformations.vb + + + sdgWindrose.vb + + + sdgWindrose.vb + + + dlgUseModel.vb + + + ucrAdditionalLayers.vb + + + ucrAdditionalLayers.vb + + + ucrAxes.vb + + + ucrAxes.vb + + + ucrButtons.vb + + + ucrButtons.vb + + + ucrButtonsSubdialogue.vb + + + ucrButtonsSubdialogue.vb + + + ucrCalculator.vb + + + ucrCalculator.vb + + + ucrCheck.vb + + + ucrCheck.vb + + + ucrColors.vb + + + ucrColors.vb + + + ucrColumnMetadata.vb + + + ucrColumnMetadata.vb + + + ucrCore.vb + + + ucrDataFrame.vb + + + ucrDataFrame.vb + + + ucrDataFrameLength.vb + + + ucrDataFrameLength.vb + + + ucrDataFrameMetadata.vb + + + ucrDataFrameMetadata.vb + + + ucrDataSelection.vb + + + ucrDataSelection.vb + + + ucrDataView.vb + + + ucrDataView.vb + + + ucrDateTimePicker.vb + + + ucrDayOfYear.vb + + + ucrDialogDisabled.vb + + + ucrDialogDisabled.vb + + + ucrDistributions.vb + + + ucrDistributions.vb + + + ucrDistributionsWithParameters.vb + + + ucrDistributionsWithParameters.vb + + + ucrElementLineControl.vb + + + ucrElementRectControl.vb + + + ucrElementRectControl.vb + + + ucrELementTextControl.vb + + + ucrFactor.vb + + + ucrFactor.vb + + + ucrFilter.vb + + + ucrFilter.vb + Designer + + + ucrGeomListWithAes.vb + + + ucrGeomListWithAes.vb + + + ucrGeom.vb + + + ucrGeom.vb + + + ucrGridUnit.vb + + + ucrGridUnit.vb + + + ucrInput.vb + + + ucrInput.vb + + + ucrInputComboBox.vb + + + ucrInputComboBox.vb + + + ucrInputConfidenceLimit.vb + + + ucrInputConfidenceLimit.vb + + + ucrInputTextBox.vb + + + ucrInputTextBox.vb + + + ucrLayerParameters.vb + + + ucrLayerParameters.vb + + + ucrLayerParamsControls.vb + + + ucrLayerParamsControls.vb + + + ucrLog.vb + + + ucrLog.vb + + + ucrMultipleInput.vb + + + ucrMultipleInput.vb + + + ucrNewColumnName.vb + + + ucrNewColumnName.vb + + + ucrNud.vb + + + ucrNud.vb + + + ucrOutputWindow.vb + + + ucrOutputWindow.vb + + + UcrPanel.vb + + + ucrRadio.vb + + + ucrRadio.vb + + + ucrReceiver.vb + + + ucrReceiverExpression.vb + + + ucrReceiverExpression.vb + + + ucrReceiverMetadataProperty.vb + + + ucrReceiverMetadataProperty.vb + + + ucrReceiverMultiple.vb + + + ucrReceiverMultiple.vb + + + ucrReceiverSingle.vb + + + ucrReceiverSingle.vb + + + ucrReorder.vb + + + ucrReorder.vb + + + ucrSave.vb + + + ucrSave.vb + + + ucrSaveGraph.vb + + + ucrSaveGraph.vb + + + ucrSaveModel.vb + + + ucrSaveModel.vb + + + ucrScript.vb + + + ucrScript.vb + + + ucrSelector.vb + + + ucrSelector.vb + + + ucrSelectorAddRemove.vb + + + ucrSelectorAddRemove.vb + + + ucrSelectorByDataFrame.vb + + + ucrSelectorByDataFrame.vb + + + ucrSelectorByDataFrameAddRemove.vb + + + ucrSelectorByDataFrameAddRemove.vb + + + ucrELementTextControl.vb + + + ucrElementLineControl.vb + + + ucrVariablename.vb + + + ucrVariablename.vb + + + ucrVariablesAsFactor.vb + + + ucrVariablesAsFactor.vb + + + UcrPanel.vb + + + + + PreserveNewest + + + + MyApplicationCodeGenerator + Application.Designer.vb + + + SettingsSingleFileGenerator + My + Settings.Designer.vb + + + Designer + + + + + + + + + + Designer + + + + + + + + + + + + + + + + + + + + + + PreserveNewest + + + + + + PreserveNewest + + + PreserveNewest + + + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4.5.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index bc188e12ed2..279d10a14b7 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -297,6 +297,27 @@ Partial Class ucrCalculator Me.cmdMedianHL = New System.Windows.Forms.Button() Me.cmdCircMedian = New System.Windows.Forms.Button() Me.cmdCircMean = New System.Windows.Forms.Button() + Me.grpFactor = New System.Windows.Forms.GroupBox() + Me.cmdShuffle = New System.Windows.Forms.Button() + Me.cmdShift = New System.Windows.Forms.Button() + Me.cmdReverse = New System.Windows.Forms.Button() + Me.cmdReorder = New System.Windows.Forms.Button() + Me.cmdRelevel = New System.Windows.Forms.Button() + Me.cmdRecode = New System.Windows.Forms.Button() + Me.cmdOther = New System.Windows.Forms.Button() + Me.cmdFmatch = New System.Windows.Forms.Button() + Me.cmdLump = New System.Windows.Forms.Button() + Me.cmdInseq = New System.Windows.Forms.Button() + Me.cmdInfreq = New System.Windows.Forms.Button() + Me.cmdInorder = New System.Windows.Forms.Button() + Me.cmdAdd_na = New System.Windows.Forms.Button() + Me.cmdExpand = New System.Windows.Forms.Button() + Me.cmdDrop = New System.Windows.Forms.Button() + Me.cmdCross = New System.Windows.Forms.Button() + Me.cmdCollapse = New System.Windows.Forms.Button() + Me.cmdConcat = New System.Windows.Forms.Button() + Me.cmdFactor = New System.Windows.Forms.Button() + Me.cmdAnon = New System.Windows.Forms.Button() Me.ucrInputCalOptions = New instat.ucrInputComboBox() Me.ucrSaveResultInto = New instat.ucrInputComboBox() Me.ucrInputTryMessage = New instat.ucrInputTextBox() @@ -312,6 +333,7 @@ Partial Class ucrCalculator Me.grpMaths.SuspendLayout() Me.grpWakefield.SuspendLayout() Me.grpCircular.SuspendLayout() + Me.grpFactor.SuspendLayout() Me.SuspendLayout() ' 'lblExpression @@ -2097,6 +2119,152 @@ Partial Class ucrCalculator Me.cmdCircMean.Name = "cmdCircMean" Me.cmdCircMean.UseVisualStyleBackColor = True ' + 'grpFactor + ' + Me.grpFactor.Controls.Add(Me.cmdShuffle) + Me.grpFactor.Controls.Add(Me.cmdShift) + Me.grpFactor.Controls.Add(Me.cmdReverse) + Me.grpFactor.Controls.Add(Me.cmdReorder) + Me.grpFactor.Controls.Add(Me.cmdRelevel) + Me.grpFactor.Controls.Add(Me.cmdRecode) + Me.grpFactor.Controls.Add(Me.cmdOther) + Me.grpFactor.Controls.Add(Me.cmdFmatch) + Me.grpFactor.Controls.Add(Me.cmdLump) + Me.grpFactor.Controls.Add(Me.cmdInseq) + Me.grpFactor.Controls.Add(Me.cmdInfreq) + Me.grpFactor.Controls.Add(Me.cmdInorder) + Me.grpFactor.Controls.Add(Me.cmdAdd_na) + Me.grpFactor.Controls.Add(Me.cmdExpand) + Me.grpFactor.Controls.Add(Me.cmdDrop) + Me.grpFactor.Controls.Add(Me.cmdCross) + Me.grpFactor.Controls.Add(Me.cmdCollapse) + Me.grpFactor.Controls.Add(Me.cmdConcat) + Me.grpFactor.Controls.Add(Me.cmdFactor) + Me.grpFactor.Controls.Add(Me.cmdAnon) + resources.ApplyResources(Me.grpFactor, "grpFactor") + Me.grpFactor.Name = "grpFactor" + Me.grpFactor.TabStop = False + ' + 'cmdShuffle + ' + resources.ApplyResources(Me.cmdShuffle, "cmdShuffle") + Me.cmdShuffle.Name = "cmdShuffle" + Me.cmdShuffle.UseVisualStyleBackColor = True + ' + 'cmdShift + ' + resources.ApplyResources(Me.cmdShift, "cmdShift") + Me.cmdShift.Name = "cmdShift" + Me.cmdShift.UseVisualStyleBackColor = True + ' + 'cmdReverse + ' + resources.ApplyResources(Me.cmdReverse, "cmdReverse") + Me.cmdReverse.Name = "cmdReverse" + Me.cmdReverse.UseVisualStyleBackColor = True + ' + 'cmdReorder + ' + resources.ApplyResources(Me.cmdReorder, "cmdReorder") + Me.cmdReorder.Name = "cmdReorder" + Me.cmdReorder.UseVisualStyleBackColor = True + ' + 'cmdRelevel + ' + resources.ApplyResources(Me.cmdRelevel, "cmdRelevel") + Me.cmdRelevel.Name = "cmdRelevel" + Me.cmdRelevel.UseVisualStyleBackColor = True + ' + 'cmdRecode + ' + resources.ApplyResources(Me.cmdRecode, "cmdRecode") + Me.cmdRecode.Name = "cmdRecode" + Me.cmdRecode.UseVisualStyleBackColor = True + ' + 'cmdOther + ' + resources.ApplyResources(Me.cmdOther, "cmdOther") + Me.cmdOther.Name = "cmdOther" + Me.cmdOther.UseVisualStyleBackColor = True + ' + 'cmdFmatch + ' + resources.ApplyResources(Me.cmdFmatch, "cmdFmatch") + Me.cmdFmatch.Name = "cmdFmatch" + Me.cmdFmatch.UseVisualStyleBackColor = True + ' + 'cmdLump + ' + resources.ApplyResources(Me.cmdLump, "cmdLump") + Me.cmdLump.Name = "cmdLump" + Me.cmdLump.UseVisualStyleBackColor = True + ' + 'cmdInseq + ' + resources.ApplyResources(Me.cmdInseq, "cmdInseq") + Me.cmdInseq.Name = "cmdInseq" + Me.cmdInseq.UseVisualStyleBackColor = True + ' + 'cmdInfreq + ' + resources.ApplyResources(Me.cmdInfreq, "cmdInfreq") + Me.cmdInfreq.Name = "cmdInfreq" + Me.cmdInfreq.UseVisualStyleBackColor = True + ' + 'cmdInorder + ' + resources.ApplyResources(Me.cmdInorder, "cmdInorder") + Me.cmdInorder.Name = "cmdInorder" + Me.cmdInorder.UseVisualStyleBackColor = True + ' + 'cmdAdd_na + ' + resources.ApplyResources(Me.cmdAdd_na, "cmdAdd_na") + Me.cmdAdd_na.Name = "cmdAdd_na" + Me.cmdAdd_na.UseVisualStyleBackColor = True + ' + 'cmdExpand + ' + resources.ApplyResources(Me.cmdExpand, "cmdExpand") + Me.cmdExpand.Name = "cmdExpand" + Me.cmdExpand.UseVisualStyleBackColor = True + ' + 'cmdDrop + ' + resources.ApplyResources(Me.cmdDrop, "cmdDrop") + Me.cmdDrop.Name = "cmdDrop" + Me.cmdDrop.UseVisualStyleBackColor = True + ' + 'cmdCross + ' + resources.ApplyResources(Me.cmdCross, "cmdCross") + Me.cmdCross.Name = "cmdCross" + Me.cmdCross.UseVisualStyleBackColor = True + ' + 'cmdCollapse + ' + resources.ApplyResources(Me.cmdCollapse, "cmdCollapse") + Me.cmdCollapse.Name = "cmdCollapse" + Me.cmdCollapse.UseVisualStyleBackColor = True + ' + 'cmdConcat + ' + resources.ApplyResources(Me.cmdConcat, "cmdConcat") + Me.cmdConcat.Name = "cmdConcat" + Me.cmdConcat.UseVisualStyleBackColor = True + ' + 'cmdFactor + ' + resources.ApplyResources(Me.cmdFactor, "cmdFactor") + Me.cmdFactor.Name = "cmdFactor" + Me.cmdFactor.UseVisualStyleBackColor = True + ' + 'cmdAnon + ' + resources.ApplyResources(Me.cmdAnon, "cmdAnon") + Me.cmdAnon.Name = "cmdAnon" + Me.cmdAnon.UseVisualStyleBackColor = True + ' 'ucrInputCalOptions ' Me.ucrInputCalOptions.AddQuotesIfUnrecognised = True @@ -2140,6 +2308,7 @@ Partial Class ucrCalculator ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.grpFactor) Me.Controls.Add(Me.grpCircular) Me.Controls.Add(Me.grpWakefield) Me.Controls.Add(Me.grpLogical) @@ -2171,6 +2340,7 @@ Partial Class ucrCalculator Me.grpMaths.ResumeLayout(False) Me.grpWakefield.ResumeLayout(False) Me.grpCircular.ResumeLayout(False) + Me.grpFactor.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -2439,4 +2609,25 @@ Partial Class ucrCalculator Friend WithEvents cmdCircRho As Button Friend WithEvents cmdCircQuantile As Button Friend WithEvents cmdCircular As Button + Friend WithEvents grpFactor As GroupBox + Friend WithEvents cmdShuffle As Button + Friend WithEvents cmdShift As Button + Friend WithEvents cmdReverse As Button + Friend WithEvents cmdReorder As Button + Friend WithEvents cmdRelevel As Button + Friend WithEvents cmdRecode As Button + Friend WithEvents cmdOther As Button + Friend WithEvents cmdFmatch As Button + Friend WithEvents cmdLump As Button + Friend WithEvents cmdInseq As Button + Friend WithEvents cmdInfreq As Button + Friend WithEvents cmdInorder As Button + Friend WithEvents cmdAdd_na As Button + Friend WithEvents cmdExpand As Button + Friend WithEvents cmdDrop As Button + Friend WithEvents cmdCross As Button + Friend WithEvents cmdCollapse As Button + Friend WithEvents cmdConcat As Button + Friend WithEvents cmdFactor As Button + Friend WithEvents cmdAnon As Button End Class diff --git a/instat/ucrCalculator.resx b/instat/ucrCalculator.resx index d55b03df15f..cc84db3bc4b 100644 --- a/instat/ucrCalculator.resx +++ b/instat/ucrCalculator.resx @@ -148,7 +148,7 @@ $this - 19 + 20 True @@ -181,7 +181,7 @@ $this - 14 + 15 NoControl @@ -211,7 +211,7 @@ $this - 16 + 17 NoControl @@ -241,7 +241,7 @@ $this - 9 + 10 True @@ -274,7 +274,7 @@ $this - 10 + 11 cmdClear @@ -532,7 +532,7 @@ $this - 12 + 13 NoControl @@ -1369,7 +1369,7 @@ $this - 8 + 9 NoControl @@ -2167,7 +2167,7 @@ $this - 6 + 7 NoControl @@ -3082,7 +3082,7 @@ $this - 3 + 4 NoControl @@ -4099,7 +4099,7 @@ $this - 7 + 8 Microsoft Sans Serif, 8.25pt @@ -4999,7 +4999,7 @@ $this - 2 + 3 NoControl @@ -6277,7 +6277,7 @@ $this - 5 + 6 Microsoft Sans Serif, 8.25pt @@ -7177,7 +7177,7 @@ $this - 4 + 5 NoControl @@ -9490,7 +9490,7 @@ $this - 1 + 2 Microsoft Sans Serif, 6.25pt @@ -9822,6 +9822,222 @@ 53 + + cmdCircular + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 0 + + + cmdCircQuantile + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 1 + + + cmdCircMax + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 2 + + + cmdA1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 3 + + + cmdAngVar + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 4 + + + cmdCircRho + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 5 + + + cmdCircQ3 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 6 + + + cmdCircQ1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 7 + + + cmdCircMin + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 8 + + + cmdAngDev + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 9 + + + cmdCircVar + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 10 + + + cmdCircSd + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 11 + + + cmdCircRange + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 12 + + + cmdMedianHL + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 13 + + + cmdCircMedian + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 14 + + + cmdCircMean + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpCircular + + + 15 + + + 571, 76 + + + 331, 189 + + + 192 + + + Circular + + + grpCircular + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 1 + NoControl @@ -10254,28 +10470,568 @@ 15 - - 571, 76 + + NoControl - - 331, 189 + + 243, 176 - - 192 + + 80, 40 - - Circular + + 210 - - grpCircular + + shuffle - + + cmdShuffle + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 0 + + + NoControl + + + 164, 176 + + + 80, 40 + + + 209 + + + shift + + + cmdShift + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 1 + + + NoControl + + + 85, 176 + + + 80, 40 + + + 208 + + + reverse + + + cmdReverse + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 2 + + + NoControl + + + 6, 176 + + + 80, 40 + + + 207 + + + reorder + + + cmdReorder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 3 + + + NoControl + + + 243, 137 + + + 80, 40 + + + 206 + + + relevel + + + cmdRelevel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 4 + + + NoControl + + + 164, 137 + + + 80, 40 + + + 205 + + + recode + + + cmdRecode + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 5 + + + NoControl + + + 85, 137 + + + 80, 40 + + + 204 + + + other + + + cmdOther + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 6 + + + NoControl + + + 6, 137 + + + 80, 40 + + + 203 + + + match + + + cmdFmatch + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 7 + + + NoControl + + + 243, 98 + + + 80, 40 + + + 202 + + + lump + + + cmdLump + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 8 + + + NoControl + + + 164, 98 + + + 80, 40 + + + 201 + + + inseq + + + cmdInseq + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 9 + + + NoControl + + + 85, 98 + + + 80, 40 + + + 200 + + + infreq + + + cmdInfreq + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 10 + + + NoControl + + + 6, 98 + + + 80, 40 + + + 199 + + + inorder + + + cmdInorder + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 11 + + + NoControl + + + 243, 59 + + + 80, 40 + + + 198 + + + add_na + + + cmdAdd_na + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 12 + + + NoControl + + + 164, 59 + + + 80, 40 + + + 197 + + + expand + + + cmdExpand + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 13 + + + NoControl + + + 85, 59 + + + 80, 40 + + + 196 + + + drop + + + cmdDrop + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 14 + + + NoControl + + + 6, 59 + + + 80, 40 + + + 195 + + + cross + + + cmdCross + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 15 + + + NoControl + + + 243, 20 + + + 80, 40 + + + 194 + + + collapse + + + cmdCollapse + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 16 + + + NoControl + + + 164, 20 + + + 80, 40 + + + 193 + + + concat + + + cmdConcat + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 17 + + + NoControl + + + 6, 20 + + + 80, 40 + + + 191 + + + factor + + + cmdFactor + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 18 + + + NoControl + + + 85, 20 + + + 80, 40 + + + 192 + + + anon + + + cmdAnon + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpFactor + + + 19 + + + 574, 74 + + + 330, 226 + + + 191 + + + Factor + + + grpFactor + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - + 0 @@ -10300,7 +11056,7 @@ $this - 11 + 12 157, 364 @@ -10324,7 +11080,7 @@ $this - 13 + 14 124, 316 @@ -10348,7 +11104,7 @@ $this - 15 + 16 0, 79 @@ -10372,7 +11128,7 @@ $this - 17 + 18 93, 7 @@ -10396,7 +11152,7 @@ $this - 18 + 19 True diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 2b90ccc2d64..ea093d14726 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -52,7 +52,7 @@ Public Class ucrCalculator End Sub Public Sub InitialiseControls() - ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Summary", "Strings (Character Columns)", "Probability", "Dates", "Transform", "Wakefield", "Circular"}) ' "Rows" is a temp. name + ucrInputCalOptions.SetItems({"Basic", "Maths", "Logical and Symbols", "Summary", "Strings (Character Columns)", "Factor", "Probability", "Dates", "Transform", "Wakefield", "Circular"}) ' "Rows" is a temp. name ucrInputCalOptions.SetDropDownStyleAsNonEditable() ucrReceiverForCalculation.Selector = ucrSelectorForCalculations cmdTry.Enabled = False @@ -63,9 +63,35 @@ Public Class ucrCalculator cmdAll.Enabled = False cmdIsTrue.Enabled = False cmdIsFalse.Enabled = False + cmdConcat.Enabled = False bControlsInitialised = True ttCalculator.SetToolTip(cmdRound, "round(x) to round to whole numbers, round(x,2) to round to 2 decimal places, round(x,-2) to round to the nearest 100") ttCalculator.SetToolTip(cmdSiginf, "signif(x,3) to round to 3 significant figures") + ttCalculator.SetToolTip(cmdPower, "power(^)or exponent and can also be given as **. For example 2^3 = 8") + ttCalculator.SetToolTip(cmdLesser, "less than(<). For example (2 < 3) is TRUE. (2 < 2) is FALSE, (2 < 1) is FALSE") + ttCalculator.SetToolTip(cmdLesserOrEqualsTo, "less than or equals(<=). For example (2 <= 3) is TRUE, (2 <=2) is TRUE, (2 <= 1) is FALSE") + ttCalculator.SetToolTip(cmdGreater, "greater than(>). For example (2 > 3) is FALSE, (2 > 2) is FALSE, (2 > 1) is TRUE") + ttCalculator.SetToolTip(cmdGreaterOrEqualsTo, "greater or equals to(>=). For example (2 >= 3) is FALSE, (2 >=2) is TRUE, (2 >= 1) is TRUE") + ttCalculator.SetToolTip(cmdEquivalent, "logical equals(==). For example (2 == 3) is FALSE, (2 == 2) is TRUE, (2 == 1) is FALSE") + ttCalculator.SetToolTip(cmdNotEqualsTo, "not equals(!= )(opposite of ==). For example (2 != 3) is TRUE, (2 != 2) is FALSE and (2 != 1) is TRUE)") + ttCalculator.SetToolTip(cmdOr, "logical OR(|). For example (2 < 3) | (2 < 1) is the same as (TRUE | FALSE) which is TRUE") + ttCalculator.SetToolTip(cmdAnd, " logical AND(&). For example (2 < 3) & (2 < 1) is the same as (TRUE & FALSE) which is FALSE") + ttCalculator.SetToolTip(cmdNot, "logical NOT(!). For example !(2 < 3) is FALSE, !(2 < 1) is TRUE") + ttCalculator.SetToolTip(cmdColon, "colon is from:to(:). For example 3:6 is 3, 4, 5, 6. 6:3 is 6, 5, 4, 3 (It is the seq function with a step-length of 1 or -1.)") + ttCalculator.SetToolTip(cmdModulas, "modulus operator(%%)gives the remainder after integer division. For example 7 %% 3 is 1, 12 %% 3 is 0") + ttCalculator.SetToolTip(cmdIn, "(%in%)is like the match function and returns a logical vector. For example (11:15 %in% c(11,13)) gives TRUE, FALSE, TRUE, FALSE, FALSE") + ttCalculator.SetToolTip(cmdmatch, "(see also %in%)gives the positions of the matching elements. For example match(11:15, c(11,13)) gives (1,NA, 2, NA, NA). match(11:15,c(11,13),nomatch=0) gives 1, 0, 2, 0, 0)") + ttCalculator.SetToolTip(cmdIntegerDivision, "div operator(%/%)is for integer division. For example (7 %/% 3) is 2, (13 %/% 3) is 4") + ttCalculator.SetToolTip(cmdwhen, "when is multiple ifelse, for example case_when(1:5>320,1:5>110) gives NA, 10, 10, 20, 20") + ttCalculator.SetToolTip(cmdIfelse, "is what it says, for example ifelse((1:5 > 3,20,10) gives 10, 10, 10, 20, 20") + ttCalculator.SetToolTip(cmdBetween, "between two values, for example between(1:5, 3,4) is FALSE, FALSE, TRUE, TRUE, FALSE") + ttCalculator.SetToolTip(cmdIsNa, "is.na detects missing values, for example is.na(c(1,3,NA, 5)) gives FALSE, FALSE, TRUE, FALSE") + ttCalculator.SetToolTip(cmdNotIsNa, "!is.na detects non-missing values, for example !is.na(c(1,3,NA, 5)) gives TRUE, TRUE, FALSE, TRUE") + ttCalculator.SetToolTip(cmdDuplicate, "duplicate detects non-unique values, for example duplicated(c(1:3,2,7)) gives FALSE, FALSE, FALSE, TRUE, FALSE") + ttCalculator.SetToolTip(cmdNear, "near(x,y)compares 2 variables. For example sqrt(5)^2 is almost, but isn't exactly 5, however near(sqrt(5)^2,5) is TRUE") + ttCalculator.SetToolTip(cmdWhich, "which gives the indices of a logical variable. For example which(11:15>13) gives 4, 5. Note the result is usually not the same length as the original variable.") + ttCalculator.SetToolTip(cmdAnyDup, "any Are any values TRUE in a logical variable. For example any(1:5 >3) gives TRUE") + ttCalculator.SetToolTip(cmdAll, "all Are all values TRUE in a logical variable. For example all(1:5 >3) gives FALSE") End Sub Public Sub Reset() @@ -183,6 +209,7 @@ Public Class ucrCalculator grpLogical.Visible = False grpBasic.Visible = True grpStrings.Visible = False + grpFactor.Visible = False grpProbabilty.Visible = False grpTransform.Visible = False grpDates.Visible = False @@ -197,6 +224,7 @@ Public Class ucrCalculator grpMaths.Visible = False grpBasic.Visible = True grpStrings.Visible = False + grpFactor.Visible = False iHelpCalcID = 127 Me.Size = New Size(iBasicWidth * 1.44, Me.Height) grpProbabilty.Visible = False @@ -212,6 +240,7 @@ Public Class ucrCalculator iHelpCalcID = 128 Me.Size = New Size(iBasicWidth * 1.51, Me.Height) grpStrings.Visible = False + grpFactor.Visible = False grpProbabilty.Visible = False grpTransform.Visible = False grpCircular.Visible = False @@ -219,6 +248,7 @@ Public Class ucrCalculator Case "Strings (Character Columns)" grpDates.Visible = False grpStrings.Visible = True + grpFactor.Visible = False grpSummary.Visible = False grpLogical.Visible = False grpMaths.Visible = False @@ -229,10 +259,25 @@ Public Class ucrCalculator grpWakefield.Visible = False iHelpCalcID = 129 Me.Size = New Size(iBasicWidth * 1.42, Me.Height) + Case "Factor" + grpFactor.Visible = True + grpDates.Visible = False + grpSummary.Visible = False + grpLogical.Visible = False + grpMaths.Visible = False + grpBasic.Visible = True + grpStrings.Visible = False + iHelpCalcID = 127 + Me.Size = New Size(iBasicWidth * 1.44, Me.Height) + grpProbabilty.Visible = False + grpTransform.Visible = False + grpCircular.Visible = False + grpWakefield.Visible = False Case "Probability" grpDates.Visible = False grpProbabilty.Visible = True grpStrings.Visible = False + grpFactor.Visible = False grpSummary.Visible = False grpLogical.Visible = False grpMaths.Visible = False @@ -246,6 +291,7 @@ Public Class ucrCalculator grpDates.Visible = True grpProbabilty.Visible = False grpStrings.Visible = False + grpFactor.Visible = False grpSummary.Visible = False grpLogical.Visible = False grpMaths.Visible = False @@ -263,6 +309,7 @@ Public Class ucrCalculator grpLogical.Visible = False grpMaths.Visible = False grpStrings.Visible = False + grpFactor.Visible = False grpTransform.Visible = True grpCircular.Visible = False grpWakefield.Visible = False @@ -275,6 +322,7 @@ Public Class ucrCalculator grpLogical.Visible = False grpMaths.Visible = False grpStrings.Visible = False + grpFactor.Visible = False grpTransform.Visible = False grpCircular.Visible = False grpWakefield.Visible = True @@ -287,6 +335,7 @@ Public Class ucrCalculator grpLogical.Visible = False grpMaths.Visible = False grpStrings.Visible = False + grpFactor.Visible = False grpTransform.Visible = False grpWakefield.Visible = False grpCircular.Visible = True @@ -301,6 +350,7 @@ Public Class ucrCalculator grpMaths.Visible = False grpTransform.Visible = False grpStrings.Visible = False + grpFactor.Visible = False grpCircular.Visible = False grpWakefield.Visible = False iHelpCalcID = 14 @@ -1893,4 +1943,164 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition("circular::circular(x =, modulo = ""2pi"", units = ""radians"")", 36) End If End Sub + + Private Sub cmdFactor_Click(sender As Object, e As EventArgs) Handles cmdFactor.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor(x = , ... )", 8) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::as_factor()", 1) + End If + End Sub + + Private Sub cmdAnon_Click(sender As Object, e As EventArgs) Handles cmdAnon.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon(x = , prefix = "" )", 15) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_anon()", 1) + End If + End Sub + + Private Sub cmdConcat_Click(sender As Object, e As EventArgs) Handles cmdConcat.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_c(...)", 1) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_c()", 1) + End If + End Sub + + Private Sub cmdCollapse_Click(sender As Object, e As EventArgs) Handles cmdCollapse.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse(.f = , ..., group_other = FALSE)", 28) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_collapse()", 1) + End If + End Sub + + Private Sub cmdCross_Click(sender As Object, e As EventArgs) Handles cmdCross.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross(.f = , ..., sep = "":"", keep_empty = FALSE)", 38) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_cross()", 1) + End If + End Sub + + Private Sub cmdDrop_Click(sender As Object, e As EventArgs) Handles cmdDrop.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop(f = , only)", 8) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_drop()", 1) + End If + End Sub + + Private Sub cmdExpand_Click(sender As Object, e As EventArgs) Handles cmdExpand.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand(f = , ...)", 7) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_expand()", 1) + End If + End Sub + + Private Sub cmdAdd_na_Click(sender As Object, e As EventArgs) Handles cmdAdd_na.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_explicit_na(f = , na_level = ""(Missing)"")", 26) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_explicit_na()", 1) + End If + End Sub + + Private Sub cmdInorder_Click(sender As Object, e As EventArgs) Handles cmdInorder.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder(f = , ordered = NA)", 16) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inorder()", 1) + End If + End Sub + + Private Sub cmdInfreq_Click(sender As Object, e As EventArgs) Handles cmdInfreq.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq(f = , ordered = NA)", 16) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_infreq()", 1) + End If + End Sub + + Private Sub cmdInseq_Click(sender As Object, e As EventArgs) Handles cmdInseq.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq(f = , ordered = NA)", 16) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_inseq()", 1) + End If + End Sub + + Private Sub cmdLump_Click(sender As Object, e As EventArgs) Handles cmdLump.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump(f = , n, prop, w = NULL, other_level = ""Other"", ties.method = c(""min"", ""average"", ""first"", ""last"", ""random"", ""max""))", 113) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_lump()", 1) + End If + End Sub + + Private Sub cmdFmatch_Click(sender As Object, e As EventArgs) Handles cmdFmatch.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match(f = , lvls)", 8) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_match()", 1) + End If + End Sub + + Private Sub cmdOther_Click(sender As Object, e As EventArgs) Handles cmdOther.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other(f = , keep = , drop = , other_level = ""Other"")", 43) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_other()", 1) + End If + End Sub + + Private Sub cmdRecode_Click(sender As Object, e As EventArgs) Handles cmdRecode.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode(.f = , ...)", 7) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_recode()", 1) + End If + End Sub + + Private Sub cmdRelevel_Click(sender As Object, e As EventArgs) Handles cmdRelevel.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel(.f = , ..., after = 0L)", 19) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_relevel()", 1) + End If + End Sub + + Private Sub cmdReorder_Click(sender As Object, e As EventArgs) Handles cmdReorder.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder(.f = , .x = , .fun = median, ..., .desc = FALSE)", 44) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_reorder()", 1) + End If + End Sub + + Private Sub cmdReverse_Click(sender As Object, e As EventArgs) Handles cmdReverse.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev(f = , )", 4) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_rev()", 1) + End If + End Sub + + Private Sub cmdShift_Click(sender As Object, e As EventArgs) Handles cmdShift.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift(f = , n = 1L)", 10) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shift()", 1) + End If + End Sub + + Private Sub cmdShuffle_Click(sender As Object, e As EventArgs) Handles cmdShuffle.Click + If chkShowArguments.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle(f = , )", 4) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("forcats::fct_shuffle()", 1) + End If + End Sub End Class