From 1c53c1df8acc545d47ee7b5f239859031194fe52 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 4 Sep 2019 15:34:16 +0300 Subject: [PATCH 1/7] Added selector to the new dlg --- instat/dlgCircular.Designer.vb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/instat/dlgCircular.Designer.vb b/instat/dlgCircular.Designer.vb index 03d4daf298b..70d58cfc300 100644 --- a/instat/dlgCircular.Designer.vb +++ b/instat/dlgCircular.Designer.vb @@ -23,6 +23,7 @@ Partial Class dlgCircular _ Private Sub InitializeComponent() Me.UcrButtons1 = New instat.ucrButtons() + Me.ucrToCircularSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.SuspendLayout() ' 'UcrButtons1 @@ -33,11 +34,23 @@ Partial Class dlgCircular Me.UcrButtons1.Size = New System.Drawing.Size(547, 64) Me.UcrButtons1.TabIndex = 0 ' + 'ucrToCircularSelector + ' + Me.ucrToCircularSelector.bDropUnusedFilterLevels = False + Me.ucrToCircularSelector.bShowHiddenColumns = False + Me.ucrToCircularSelector.bUseCurrentFilter = True + Me.ucrToCircularSelector.Location = New System.Drawing.Point(9, 9) + Me.ucrToCircularSelector.Margin = New System.Windows.Forms.Padding(0) + Me.ucrToCircularSelector.Name = "ucrToCircularSelector" + Me.ucrToCircularSelector.Size = New System.Drawing.Size(280, 222) + Me.ucrToCircularSelector.TabIndex = 1 + ' 'dlgCircular ' Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.ucrToCircularSelector) Me.Controls.Add(Me.UcrButtons1) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -50,4 +63,5 @@ Partial Class dlgCircular End Sub Friend WithEvents UcrButtons1 As ucrButtons + Friend WithEvents ucrToCircularSelector As ucrSelectorByDataFrameAddRemove End Class From f3f833475ec9c710104917b0741310b71afd0398 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 4 Sep 2019 15:35:33 +0300 Subject: [PATCH 2/7] Minor edit --- instat/dlgCircular.Designer.vb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/instat/dlgCircular.Designer.vb b/instat/dlgCircular.Designer.vb index 70d58cfc300..c3eed4cd7fe 100644 --- a/instat/dlgCircular.Designer.vb +++ b/instat/dlgCircular.Designer.vb @@ -22,17 +22,17 @@ Partial Class dlgCircular 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.UcrButtons1 = New instat.ucrButtons() + Me.ucrBase = New instat.ucrButtons() Me.ucrToCircularSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.SuspendLayout() ' - 'UcrButtons1 + 'ucrBase ' - Me.UcrButtons1.Location = New System.Drawing.Point(86, 373) - Me.UcrButtons1.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.UcrButtons1.Name = "UcrButtons1" - Me.UcrButtons1.Size = New System.Drawing.Size(547, 64) - Me.UcrButtons1.TabIndex = 0 + Me.ucrBase.Location = New System.Drawing.Point(86, 373) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(547, 64) + Me.ucrBase.TabIndex = 0 ' 'ucrToCircularSelector ' @@ -51,7 +51,7 @@ Partial Class dlgCircular Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) Me.Controls.Add(Me.ucrToCircularSelector) - Me.Controls.Add(Me.UcrButtons1) + Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -62,6 +62,6 @@ Partial Class dlgCircular End Sub - Friend WithEvents UcrButtons1 As ucrButtons + Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrToCircularSelector As ucrSelectorByDataFrameAddRemove End Class From 4e1409815ab0f78f2a2b62525ad125e7656baca1 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Wed, 4 Sep 2019 15:44:33 +0300 Subject: [PATCH 3/7] Added a receiver and a label --- instat/dlgCircular.Designer.vb | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/instat/dlgCircular.Designer.vb b/instat/dlgCircular.Designer.vb index c3eed4cd7fe..c6be7bf5438 100644 --- a/instat/dlgCircular.Designer.vb +++ b/instat/dlgCircular.Designer.vb @@ -24,11 +24,13 @@ Partial Class dlgCircular Private Sub InitializeComponent() Me.ucrBase = New instat.ucrButtons() Me.ucrToCircularSelector = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrToCircularReceiver = New instat.ucrReceiverSingle() + Me.lblToCircular = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(86, 373) + Me.ucrBase.Location = New System.Drawing.Point(25, 373) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(547, 64) @@ -45,11 +47,34 @@ Partial Class dlgCircular Me.ucrToCircularSelector.Size = New System.Drawing.Size(280, 222) Me.ucrToCircularSelector.TabIndex = 1 ' + 'ucrToCircularReceiver + ' + Me.ucrToCircularReceiver.frmParent = Me + Me.ucrToCircularReceiver.Location = New System.Drawing.Point(446, 119) + Me.ucrToCircularReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrToCircularReceiver.Name = "ucrToCircularReceiver" + Me.ucrToCircularReceiver.Selector = Nothing + Me.ucrToCircularReceiver.Size = New System.Drawing.Size(160, 25) + Me.ucrToCircularReceiver.strNcFilePath = "" + Me.ucrToCircularReceiver.TabIndex = 2 + Me.ucrToCircularReceiver.ucrSelector = Nothing + ' + 'lblToCircular + ' + Me.lblToCircular.AutoSize = True + Me.lblToCircular.Location = New System.Drawing.Point(504, 83) + Me.lblToCircular.Name = "lblToCircular" + Me.lblToCircular.Size = New System.Drawing.Size(75, 17) + Me.lblToCircular.TabIndex = 3 + Me.lblToCircular.Text = "To circular" + ' 'dlgCircular ' Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(800, 450) + Me.ClientSize = New System.Drawing.Size(636, 450) + Me.Controls.Add(Me.lblToCircular) + Me.Controls.Add(Me.ucrToCircularReceiver) Me.Controls.Add(Me.ucrToCircularSelector) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -59,9 +84,12 @@ Partial Class dlgCircular Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Circular" Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrToCircularSelector As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrToCircularReceiver As ucrReceiverSingle + Friend WithEvents lblToCircular As Label End Class From f62fa16a4953ebb8ddd53ac78e2ea3ea444b5b7a Mon Sep 17 00:00:00 2001 From: shadrack kibet Date: Sat, 14 Sep 2019 22:25:49 +0300 Subject: [PATCH 4/7] setting up circular functionality --- instat/dlgCircular.Designer.vb | 239 +++++++++++++++++++++++++++------ instat/dlgCircular.vb | 93 ++++++++++++- 2 files changed, 287 insertions(+), 45 deletions(-) diff --git a/instat/dlgCircular.Designer.vb b/instat/dlgCircular.Designer.vb index c6be7bf5438..8eaa85cecf0 100644 --- a/instat/dlgCircular.Designer.vb +++ b/instat/dlgCircular.Designer.vb @@ -22,74 +22,225 @@ Partial Class dlgCircular 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.ucrToCircularSelector = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrToCircularReceiver = New instat.ucrReceiverSingle() Me.lblToCircular = New System.Windows.Forms.Label() + Me.grpUnits = New System.Windows.Forms.GroupBox() + Me.rdoHours = New System.Windows.Forms.RadioButton() + Me.rdoDegrees = New System.Windows.Forms.RadioButton() + Me.rdoRadians = New System.Windows.Forms.RadioButton() + Me.ucrPnlUnits = New instat.UcrPanel() + Me.rdo2Pi = New System.Windows.Forms.RadioButton() + Me.rdoPi = New System.Windows.Forms.RadioButton() + Me.rdoAsis = New System.Windows.Forms.RadioButton() + Me.grpModulo = New System.Windows.Forms.GroupBox() + Me.ucrPnlModulo = New instat.UcrPanel() + Me.ucrSaveCircularColumn = New instat.ucrSave() + Me.ucrReceiverCircular = New instat.ucrReceiverSingle() + Me.ucrSelectorCircular = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.grpUnits.SuspendLayout() + Me.grpModulo.SuspendLayout() Me.SuspendLayout() ' - 'ucrBase - ' - Me.ucrBase.Location = New System.Drawing.Point(25, 373) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(547, 64) - Me.ucrBase.TabIndex = 0 - ' - 'ucrToCircularSelector - ' - Me.ucrToCircularSelector.bDropUnusedFilterLevels = False - Me.ucrToCircularSelector.bShowHiddenColumns = False - Me.ucrToCircularSelector.bUseCurrentFilter = True - Me.ucrToCircularSelector.Location = New System.Drawing.Point(9, 9) - Me.ucrToCircularSelector.Margin = New System.Windows.Forms.Padding(0) - Me.ucrToCircularSelector.Name = "ucrToCircularSelector" - Me.ucrToCircularSelector.Size = New System.Drawing.Size(280, 222) - Me.ucrToCircularSelector.TabIndex = 1 - ' - 'ucrToCircularReceiver - ' - Me.ucrToCircularReceiver.frmParent = Me - Me.ucrToCircularReceiver.Location = New System.Drawing.Point(446, 119) - Me.ucrToCircularReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrToCircularReceiver.Name = "ucrToCircularReceiver" - Me.ucrToCircularReceiver.Selector = Nothing - Me.ucrToCircularReceiver.Size = New System.Drawing.Size(160, 25) - Me.ucrToCircularReceiver.strNcFilePath = "" - Me.ucrToCircularReceiver.TabIndex = 2 - Me.ucrToCircularReceiver.ucrSelector = Nothing - ' 'lblToCircular ' Me.lblToCircular.AutoSize = True - Me.lblToCircular.Location = New System.Drawing.Point(504, 83) + Me.lblToCircular.Location = New System.Drawing.Point(259, 50) + Me.lblToCircular.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblToCircular.Name = "lblToCircular" - Me.lblToCircular.Size = New System.Drawing.Size(75, 17) + Me.lblToCircular.Size = New System.Drawing.Size(60, 13) Me.lblToCircular.TabIndex = 3 - Me.lblToCircular.Text = "To circular" + Me.lblToCircular.Text = "To circular:" + ' + 'grpUnits + ' + Me.grpUnits.Controls.Add(Me.rdoHours) + Me.grpUnits.Controls.Add(Me.rdoDegrees) + Me.grpUnits.Controls.Add(Me.rdoRadians) + Me.grpUnits.Controls.Add(Me.ucrPnlUnits) + Me.grpUnits.Location = New System.Drawing.Point(10, 212) + Me.grpUnits.Name = "grpUnits" + Me.grpUnits.Size = New System.Drawing.Size(105, 88) + Me.grpUnits.TabIndex = 4 + Me.grpUnits.TabStop = False + Me.grpUnits.Text = "Units" + ' + 'rdoHours + ' + Me.rdoHours.AutoSize = True + Me.rdoHours.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoHours.Location = New System.Drawing.Point(10, 66) + Me.rdoHours.Name = "rdoHours" + Me.rdoHours.Size = New System.Drawing.Size(53, 17) + Me.rdoHours.TabIndex = 3 + Me.rdoHours.TabStop = True + Me.rdoHours.Text = "Hours" + Me.rdoHours.UseVisualStyleBackColor = True + ' + 'rdoDegrees + ' + Me.rdoDegrees.AutoSize = True + Me.rdoDegrees.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoDegrees.Location = New System.Drawing.Point(10, 43) + Me.rdoDegrees.Name = "rdoDegrees" + Me.rdoDegrees.Size = New System.Drawing.Size(65, 17) + Me.rdoDegrees.TabIndex = 2 + Me.rdoDegrees.TabStop = True + Me.rdoDegrees.Text = "Degrees" + Me.rdoDegrees.UseVisualStyleBackColor = True + ' + 'rdoRadians + ' + Me.rdoRadians.AutoSize = True + Me.rdoRadians.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoRadians.Location = New System.Drawing.Point(10, 21) + Me.rdoRadians.Name = "rdoRadians" + Me.rdoRadians.Size = New System.Drawing.Size(64, 17) + Me.rdoRadians.TabIndex = 1 + Me.rdoRadians.TabStop = True + Me.rdoRadians.Text = "Radians" + Me.rdoRadians.UseVisualStyleBackColor = True + ' + 'ucrPnlUnits + ' + Me.ucrPnlUnits.Location = New System.Drawing.Point(3, 16) + Me.ucrPnlUnits.Name = "ucrPnlUnits" + Me.ucrPnlUnits.Size = New System.Drawing.Size(93, 67) + Me.ucrPnlUnits.TabIndex = 0 + ' + 'rdo2Pi + ' + Me.rdo2Pi.AutoSize = True + Me.rdo2Pi.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdo2Pi.Location = New System.Drawing.Point(15, 62) + Me.rdo2Pi.Name = "rdo2Pi" + Me.rdo2Pi.Size = New System.Drawing.Size(40, 17) + Me.rdo2Pi.TabIndex = 10 + Me.rdo2Pi.TabStop = True + Me.rdo2Pi.Text = "2Pi" + Me.rdo2Pi.UseVisualStyleBackColor = True + ' + 'rdoPi + ' + Me.rdoPi.AutoSize = True + Me.rdoPi.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoPi.Location = New System.Drawing.Point(15, 39) + Me.rdoPi.Name = "rdoPi" + Me.rdoPi.Size = New System.Drawing.Size(34, 17) + Me.rdoPi.TabIndex = 9 + Me.rdoPi.TabStop = True + Me.rdoPi.Text = "Pi" + Me.rdoPi.UseVisualStyleBackColor = True + ' + 'rdoAsis + ' + Me.rdoAsis.AutoSize = True + Me.rdoAsis.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoAsis.Location = New System.Drawing.Point(15, 17) + Me.rdoAsis.Name = "rdoAsis" + Me.rdoAsis.Size = New System.Drawing.Size(44, 17) + Me.rdoAsis.TabIndex = 8 + Me.rdoAsis.TabStop = True + Me.rdoAsis.Text = "Asis" + Me.rdoAsis.UseVisualStyleBackColor = True + ' + 'grpModulo + ' + Me.grpModulo.Controls.Add(Me.rdo2Pi) + Me.grpModulo.Controls.Add(Me.rdoPi) + Me.grpModulo.Controls.Add(Me.rdoAsis) + Me.grpModulo.Controls.Add(Me.ucrPnlModulo) + Me.grpModulo.Location = New System.Drawing.Point(161, 212) + Me.grpModulo.Name = "grpModulo" + Me.grpModulo.Size = New System.Drawing.Size(105, 88) + Me.grpModulo.TabIndex = 12 + Me.grpModulo.TabStop = False + Me.grpModulo.Text = "Modulo" + ' + 'ucrPnlModulo + ' + Me.ucrPnlModulo.Location = New System.Drawing.Point(10, 11) + Me.ucrPnlModulo.Name = "ucrPnlModulo" + Me.ucrPnlModulo.Size = New System.Drawing.Size(93, 67) + Me.ucrPnlModulo.TabIndex = 11 + ' + 'ucrSaveCircularColumn + ' + Me.ucrSaveCircularColumn.Location = New System.Drawing.Point(10, 314) + Me.ucrSaveCircularColumn.Name = "ucrSaveCircularColumn" + Me.ucrSaveCircularColumn.Size = New System.Drawing.Size(243, 24) + Me.ucrSaveCircularColumn.TabIndex = 13 + ' + 'ucrReceiverCircular + ' + Me.ucrReceiverCircular.frmParent = Me + Me.ucrReceiverCircular.Location = New System.Drawing.Point(262, 66) + Me.ucrReceiverCircular.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverCircular.Name = "ucrReceiverCircular" + Me.ucrReceiverCircular.Selector = Nothing + Me.ucrReceiverCircular.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverCircular.strNcFilePath = "" + Me.ucrReceiverCircular.TabIndex = 2 + Me.ucrReceiverCircular.ucrSelector = Nothing + ' + 'ucrSelectorCircular + ' + Me.ucrSelectorCircular.bDropUnusedFilterLevels = False + Me.ucrSelectorCircular.bShowHiddenColumns = False + Me.ucrSelectorCircular.bUseCurrentFilter = True + Me.ucrSelectorCircular.Location = New System.Drawing.Point(10, 27) + Me.ucrSelectorCircular.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCircular.Name = "ucrSelectorCircular" + Me.ucrSelectorCircular.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorCircular.TabIndex = 1 + ' + 'ucrBase + ' + Me.ucrBase.Location = New System.Drawing.Point(10, 341) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(403, 52) + Me.ucrBase.TabIndex = 0 ' 'dlgCircular ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(636, 450) + Me.ClientSize = New System.Drawing.Size(419, 399) + Me.Controls.Add(Me.ucrSaveCircularColumn) + Me.Controls.Add(Me.grpModulo) + Me.Controls.Add(Me.grpUnits) Me.Controls.Add(Me.lblToCircular) - Me.Controls.Add(Me.ucrToCircularReceiver) - Me.Controls.Add(Me.ucrToCircularSelector) + Me.Controls.Add(Me.ucrReceiverCircular) + Me.Controls.Add(Me.ucrSelectorCircular) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgCircular" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Circular" + Me.Text = "Convert to Circular" + Me.grpUnits.ResumeLayout(False) + Me.grpUnits.PerformLayout() + Me.grpModulo.ResumeLayout(False) + Me.grpModulo.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrToCircularSelector As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrToCircularReceiver As ucrReceiverSingle + Friend WithEvents ucrSelectorCircular As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverCircular As ucrReceiverSingle Friend WithEvents lblToCircular As Label + Friend WithEvents grpUnits As GroupBox + Friend WithEvents rdoHours As RadioButton + Friend WithEvents rdoDegrees As RadioButton + Friend WithEvents rdoRadians As RadioButton + Friend WithEvents ucrPnlUnits As UcrPanel + Friend WithEvents rdo2Pi As RadioButton + Friend WithEvents rdoPi As RadioButton + Friend WithEvents rdoAsis As RadioButton + Friend WithEvents ucrPnlModulo As UcrPanel + Friend WithEvents grpModulo As GroupBox + Friend WithEvents ucrSaveCircularColumn As ucrSave End Class diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb index 68f1b5b7095..b783dcd917a 100644 --- a/instat/dlgCircular.vb +++ b/instat/dlgCircular.vb @@ -1,3 +1,94 @@ -Public Class dlgCircular +' R- Instat +' Copyright (C) 2015-2017 +' +' This program is free software: you can redistribute it and/or modify +' it under the terms of the GNU General Public License as published by +' the Free Software Foundation, either version 3 of the License, or +' (at your option) any later version. +' +' This program is distributed in the hope that it will be useful, +' but WITHOUT ANY WARRANTY; without even the implied warranty of +' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +' GNU General Public License for more details. +' +' You should have received a copy of the GNU General Public License +' along with this program. If not, see . +Imports instat.Translations +Public Class dlgCircular + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsCircularFunction As New RFunction + Private Sub dlgCircular_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + If bReset Then + setDefaults() + End If + setRcodeforControls(bReset) + bReset = False + autoTranslate(Me) + End Sub + Private Sub InitialiseDialog() + ucrReceiverCircular.Selector = ucrSelectorCircular + ucrReceiverCircular.SetMeAsReceiver() + + ucrReceiverCircular.SetParameter(New RParameter("x", 0)) + ucrReceiverCircular.SetParameterIsRFunction() + + ucrPnlModulo.SetParameter(New RParameter("modulo", 1)) + ucrPnlModulo.AddRadioButton(rdoAsis, Chr(34) & "asis" & Chr(34)) + ucrPnlModulo.AddRadioButton(rdo2Pi, Chr(34) & "2pi" & Chr(34)) + ucrPnlModulo.AddRadioButton(rdoPi, Chr(34) & "pi" & Chr(34)) + + ucrPnlUnits.SetParameter(New RParameter("units", 2)) + ucrPnlUnits.AddRadioButton(rdoDegrees, Chr(34) & "degrees" & Chr(34)) + ucrPnlUnits.AddRadioButton(rdoHours, Chr(34) & "hours" & Chr(34)) + ucrPnlUnits.AddRadioButton(rdoRadians, Chr(34) & "radians" & Chr(34)) + + ucrSaveCircularColumn.SetPrefix("Circ") + ucrSaveCircularColumn.SetSaveTypeAsColumn() + ucrSaveCircularColumn.SetDataFrameSelector(ucrSelectorCircular.ucrAvailableDataFrames) + ucrSaveCircularColumn.SetLabelText("New Column Name:") + ucrSaveCircularColumn.SetIsComboBox() + End Sub + + Private Sub setDefaults() + clsCircularFunction = New RFunction + + ucrSelectorCircular.Reset() + ucrSaveCircularColumn.Reset() + clsCircularFunction.SetPackageName("circular") + clsCircularFunction.SetRCommand("circular") + + clsCircularFunction.AddParameter("units", Chr(34) & "radians" & Chr(34), iPosition:=2) + clsCircularFunction.AddParameter("modulo", Chr(34) & "2pi" & Chr(34), iPosition:=1) + + clsCircularFunction.SetAssignTo(ucrSaveCircularColumn.GetText, strTempDataframe:=ucrSelectorCircular.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveCircularColumn.GetText) + ucrBase.clsRsyntax.SetBaseRFunction(clsCircularFunction) + End Sub + + Private Sub setRcodeforControls(breset As Boolean) + SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, breset) + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + setDefaults() + setRcodeforControls(True) + TestOkEnabled() + End Sub + + Private Sub TestOkEnabled() + If ucrReceiverCircular.IsEmpty OrElse Not ucrSaveCircularColumn.IsComplete Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + End Sub + + Private Sub ucrReceiverCircular_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverCircular.ControlContentsChanged, ucrSaveCircularColumn.ControlContentsChanged + TestOkEnabled() + End Sub End Class \ No newline at end of file From 64a6f3fb133b110d3dab1a310111274fab0c84e6 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Mon, 16 Sep 2019 15:20:47 +0300 Subject: [PATCH 5/7] Added a new circular dialog --- instat/dlgCircular.Designer.vb | 109 ++-- instat/frmMain.Designer.vb | 50 +- instat/frmMain.resx | 943 ++++++++++++++++----------------- 3 files changed, 556 insertions(+), 546 deletions(-) diff --git a/instat/dlgCircular.Designer.vb b/instat/dlgCircular.Designer.vb index 8eaa85cecf0..4fdf11d80c0 100644 --- a/instat/dlgCircular.Designer.vb +++ b/instat/dlgCircular.Designer.vb @@ -44,11 +44,10 @@ Partial Class dlgCircular 'lblToCircular ' Me.lblToCircular.AutoSize = True - Me.lblToCircular.Location = New System.Drawing.Point(259, 50) - Me.lblToCircular.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblToCircular.Location = New System.Drawing.Point(345, 62) Me.lblToCircular.Name = "lblToCircular" - Me.lblToCircular.Size = New System.Drawing.Size(60, 13) - Me.lblToCircular.TabIndex = 3 + Me.lblToCircular.Size = New System.Drawing.Size(79, 17) + Me.lblToCircular.TabIndex = 2 Me.lblToCircular.Text = "To circular:" ' 'grpUnits @@ -57,9 +56,11 @@ Partial Class dlgCircular Me.grpUnits.Controls.Add(Me.rdoDegrees) Me.grpUnits.Controls.Add(Me.rdoRadians) Me.grpUnits.Controls.Add(Me.ucrPnlUnits) - Me.grpUnits.Location = New System.Drawing.Point(10, 212) + Me.grpUnits.Location = New System.Drawing.Point(13, 261) + Me.grpUnits.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpUnits.Name = "grpUnits" - Me.grpUnits.Size = New System.Drawing.Size(105, 88) + Me.grpUnits.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpUnits.Size = New System.Drawing.Size(140, 108) Me.grpUnits.TabIndex = 4 Me.grpUnits.TabStop = False Me.grpUnits.Text = "Units" @@ -68,79 +69,86 @@ Partial Class dlgCircular ' Me.rdoHours.AutoSize = True Me.rdoHours.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoHours.Location = New System.Drawing.Point(10, 66) + Me.rdoHours.Location = New System.Drawing.Point(13, 81) + Me.rdoHours.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoHours.Name = "rdoHours" - Me.rdoHours.Size = New System.Drawing.Size(53, 17) + Me.rdoHours.Size = New System.Drawing.Size(65, 21) Me.rdoHours.TabIndex = 3 Me.rdoHours.TabStop = True - Me.rdoHours.Text = "Hours" + Me.rdoHours.Text = "hours" Me.rdoHours.UseVisualStyleBackColor = True ' 'rdoDegrees ' Me.rdoDegrees.AutoSize = True Me.rdoDegrees.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoDegrees.Location = New System.Drawing.Point(10, 43) + Me.rdoDegrees.Location = New System.Drawing.Point(13, 53) + Me.rdoDegrees.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDegrees.Name = "rdoDegrees" - Me.rdoDegrees.Size = New System.Drawing.Size(65, 17) + Me.rdoDegrees.Size = New System.Drawing.Size(81, 21) Me.rdoDegrees.TabIndex = 2 Me.rdoDegrees.TabStop = True - Me.rdoDegrees.Text = "Degrees" + Me.rdoDegrees.Text = "degrees" Me.rdoDegrees.UseVisualStyleBackColor = True ' 'rdoRadians ' Me.rdoRadians.AutoSize = True Me.rdoRadians.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRadians.Location = New System.Drawing.Point(10, 21) + Me.rdoRadians.Location = New System.Drawing.Point(13, 26) + Me.rdoRadians.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoRadians.Name = "rdoRadians" - Me.rdoRadians.Size = New System.Drawing.Size(64, 17) + Me.rdoRadians.Size = New System.Drawing.Size(76, 21) Me.rdoRadians.TabIndex = 1 Me.rdoRadians.TabStop = True - Me.rdoRadians.Text = "Radians" + Me.rdoRadians.Text = "radians" Me.rdoRadians.UseVisualStyleBackColor = True ' 'ucrPnlUnits ' - Me.ucrPnlUnits.Location = New System.Drawing.Point(3, 16) + Me.ucrPnlUnits.Location = New System.Drawing.Point(4, 20) + Me.ucrPnlUnits.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrPnlUnits.Name = "ucrPnlUnits" - Me.ucrPnlUnits.Size = New System.Drawing.Size(93, 67) + Me.ucrPnlUnits.Size = New System.Drawing.Size(124, 82) Me.ucrPnlUnits.TabIndex = 0 ' 'rdo2Pi ' Me.rdo2Pi.AutoSize = True Me.rdo2Pi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdo2Pi.Location = New System.Drawing.Point(15, 62) + Me.rdo2Pi.Location = New System.Drawing.Point(20, 76) + Me.rdo2Pi.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdo2Pi.Name = "rdo2Pi" - Me.rdo2Pi.Size = New System.Drawing.Size(40, 17) - Me.rdo2Pi.TabIndex = 10 + Me.rdo2Pi.Size = New System.Drawing.Size(48, 21) + Me.rdo2Pi.TabIndex = 3 Me.rdo2Pi.TabStop = True - Me.rdo2Pi.Text = "2Pi" + Me.rdo2Pi.Text = "2pi" Me.rdo2Pi.UseVisualStyleBackColor = True ' 'rdoPi ' Me.rdoPi.AutoSize = True Me.rdoPi.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPi.Location = New System.Drawing.Point(15, 39) + Me.rdoPi.Location = New System.Drawing.Point(20, 48) + Me.rdoPi.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoPi.Name = "rdoPi" - Me.rdoPi.Size = New System.Drawing.Size(34, 17) - Me.rdoPi.TabIndex = 9 + Me.rdoPi.Size = New System.Drawing.Size(40, 21) + Me.rdoPi.TabIndex = 2 Me.rdoPi.TabStop = True - Me.rdoPi.Text = "Pi" + Me.rdoPi.Text = "pi" Me.rdoPi.UseVisualStyleBackColor = True ' 'rdoAsis ' Me.rdoAsis.AutoSize = True Me.rdoAsis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoAsis.Location = New System.Drawing.Point(15, 17) + Me.rdoAsis.Location = New System.Drawing.Point(20, 21) + Me.rdoAsis.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoAsis.Name = "rdoAsis" - Me.rdoAsis.Size = New System.Drawing.Size(44, 17) - Me.rdoAsis.TabIndex = 8 + Me.rdoAsis.Size = New System.Drawing.Size(54, 21) + Me.rdoAsis.TabIndex = 1 Me.rdoAsis.TabStop = True - Me.rdoAsis.Text = "Asis" + Me.rdoAsis.Text = "asis" Me.rdoAsis.UseVisualStyleBackColor = True ' 'grpModulo @@ -149,37 +157,41 @@ Partial Class dlgCircular Me.grpModulo.Controls.Add(Me.rdoPi) Me.grpModulo.Controls.Add(Me.rdoAsis) Me.grpModulo.Controls.Add(Me.ucrPnlModulo) - Me.grpModulo.Location = New System.Drawing.Point(161, 212) + Me.grpModulo.Location = New System.Drawing.Point(215, 261) + Me.grpModulo.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpModulo.Name = "grpModulo" - Me.grpModulo.Size = New System.Drawing.Size(105, 88) - Me.grpModulo.TabIndex = 12 + Me.grpModulo.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpModulo.Size = New System.Drawing.Size(140, 108) + Me.grpModulo.TabIndex = 5 Me.grpModulo.TabStop = False Me.grpModulo.Text = "Modulo" ' 'ucrPnlModulo ' - Me.ucrPnlModulo.Location = New System.Drawing.Point(10, 11) + Me.ucrPnlModulo.Location = New System.Drawing.Point(13, 14) + Me.ucrPnlModulo.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrPnlModulo.Name = "ucrPnlModulo" - Me.ucrPnlModulo.Size = New System.Drawing.Size(93, 67) - Me.ucrPnlModulo.TabIndex = 11 + Me.ucrPnlModulo.Size = New System.Drawing.Size(124, 82) + Me.ucrPnlModulo.TabIndex = 3 ' 'ucrSaveCircularColumn ' - Me.ucrSaveCircularColumn.Location = New System.Drawing.Point(10, 314) + Me.ucrSaveCircularColumn.Location = New System.Drawing.Point(13, 386) + Me.ucrSaveCircularColumn.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrSaveCircularColumn.Name = "ucrSaveCircularColumn" - Me.ucrSaveCircularColumn.Size = New System.Drawing.Size(243, 24) - Me.ucrSaveCircularColumn.TabIndex = 13 + Me.ucrSaveCircularColumn.Size = New System.Drawing.Size(324, 30) + Me.ucrSaveCircularColumn.TabIndex = 6 ' 'ucrReceiverCircular ' Me.ucrReceiverCircular.frmParent = Me - Me.ucrReceiverCircular.Location = New System.Drawing.Point(262, 66) + Me.ucrReceiverCircular.Location = New System.Drawing.Point(349, 81) Me.ucrReceiverCircular.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCircular.Name = "ucrReceiverCircular" Me.ucrReceiverCircular.Selector = Nothing - Me.ucrReceiverCircular.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverCircular.Size = New System.Drawing.Size(160, 25) Me.ucrReceiverCircular.strNcFilePath = "" - Me.ucrReceiverCircular.TabIndex = 2 + Me.ucrReceiverCircular.TabIndex = 3 Me.ucrReceiverCircular.ucrSelector = Nothing ' 'ucrSelectorCircular @@ -187,24 +199,25 @@ Partial Class dlgCircular Me.ucrSelectorCircular.bDropUnusedFilterLevels = False Me.ucrSelectorCircular.bShowHiddenColumns = False Me.ucrSelectorCircular.bUseCurrentFilter = True - Me.ucrSelectorCircular.Location = New System.Drawing.Point(10, 27) + Me.ucrSelectorCircular.Location = New System.Drawing.Point(13, 33) Me.ucrSelectorCircular.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCircular.Name = "ucrSelectorCircular" - Me.ucrSelectorCircular.Size = New System.Drawing.Size(210, 180) + Me.ucrSelectorCircular.Size = New System.Drawing.Size(280, 222) Me.ucrSelectorCircular.TabIndex = 1 ' 'ucrBase ' - Me.ucrBase.Location = New System.Drawing.Point(10, 341) + Me.ucrBase.Location = New System.Drawing.Point(13, 420) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(5, 5, 5, 5) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(403, 52) + Me.ucrBase.Size = New System.Drawing.Size(537, 64) Me.ucrBase.TabIndex = 0 ' 'dlgCircular ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(8.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(419, 399) + Me.ClientSize = New System.Drawing.Size(559, 491) Me.Controls.Add(Me.ucrSaveCircularColumn) Me.Controls.Add(Me.grpModulo) Me.Controls.Add(Me.grpUnits) @@ -213,7 +226,7 @@ Partial Class dlgCircular Me.Controls.Add(Me.ucrSelectorCircular) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(2) + Me.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgCircular" diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 57f0be05198..d19abad4bc2 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -462,6 +462,10 @@ Partial Class frmMain Me.mnuPrepareColumnDateUseDate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnDateMakeTime = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnDateUseTime = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuPrepareColumnDefine = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuPrepareColumnDefineConvertColumns = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator55 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuPrepareColumnDefineCircular = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnReshape = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnReshapeColumnSummaries = New System.Windows.Forms.ToolStripMenuItem() Me.mnuPrepareColumnReshapeGeneralSummaries = New System.Windows.Forms.ToolStripMenuItem() @@ -580,10 +584,6 @@ Partial Class frmMain Me.splDataOutput = New System.Windows.Forms.SplitContainer() Me.ucrDataViewer = New instat.ucrDataView() Me.ucrOutput = New instat.ucrOutputWindow() - Me.mnuPrepareColumnDefine = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuPrepareColumnDefineConvertColumns = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator55 = New System.Windows.Forms.ToolStripSeparator() - Me.mnuPrepareColumnDefineCircular = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -3021,6 +3021,27 @@ Partial Class frmMain resources.ApplyResources(Me.mnuPrepareColumnDateUseTime, "mnuPrepareColumnDateUseTime") Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" ' + 'mnuPrepareColumnDefine + ' + Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) + Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" + resources.ApplyResources(Me.mnuPrepareColumnDefine, "mnuPrepareColumnDefine") + ' + 'mnuPrepareColumnDefineConvertColumns + ' + Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" + resources.ApplyResources(Me.mnuPrepareColumnDefineConvertColumns, "mnuPrepareColumnDefineConvertColumns") + ' + 'ToolStripSeparator55 + ' + Me.ToolStripSeparator55.Name = "ToolStripSeparator55" + resources.ApplyResources(Me.ToolStripSeparator55, "ToolStripSeparator55") + ' + 'mnuPrepareColumnDefineCircular + ' + Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" + resources.ApplyResources(Me.mnuPrepareColumnDefineCircular, "mnuPrepareColumnDefineCircular") + ' 'mnuPrepareColumnReshape ' Me.mnuPrepareColumnReshape.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnReshapeColumnSummaries, Me.mnuPrepareColumnReshapeGeneralSummaries, Me.ToolStripSeparator10, Me.mnuPrepareColumnReshapeStack, Me.mnuPrepareColumnReshapeUnstack, Me.mnuPrepareColumnReshapeMerge, Me.ToolStripSeparator11, Me.mnuPrepareAppendDataFrame, Me.mnuPrepareColumnReshapeSubset, Me.mnuPrepareColumnReshapeRandomSubset, Me.mnuPrepareColumnReshapeTranspose}) @@ -3722,27 +3743,6 @@ Partial Class frmMain resources.ApplyResources(Me.ucrOutput, "ucrOutput") Me.ucrOutput.Name = "ucrOutput" ' - 'mnuPrepareColumnDefine - ' - Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) - Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - resources.ApplyResources(Me.mnuPrepareColumnDefine, "mnuPrepareColumnDefine") - ' - 'mnuPrepareColumnDefineConvertColumns - ' - Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - resources.ApplyResources(Me.mnuPrepareColumnDefineConvertColumns, "mnuPrepareColumnDefineConvertColumns") - ' - 'ToolStripSeparator55 - ' - Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - resources.ApplyResources(Me.ToolStripSeparator55, "ToolStripSeparator55") - ' - 'mnuPrepareColumnDefineCircular - ' - resources.ApplyResources(Me.mnuPrepareColumnDefineCircular, "mnuPrepareColumnDefineCircular") - Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - ' 'frmMain ' resources.ApplyResources(Me, "$this") diff --git a/instat/frmMain.resx b/instat/frmMain.resx index 1a79878e5a4..a6085084a3d 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -118,18 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 79, 24 - - - Describe - - - 203, 26 - - - One Variable - 172, 26 @@ -157,11 +145,11 @@ Rating Data... - + 203, 26 - - Two Variables + + One Variable 171, 26 @@ -184,11 +172,11 @@ Frequencies... - + 203, 26 - - Three Variables + + Two Variables @@ -218,11 +206,11 @@ Frequencies - + 203, 26 - - Specific + + Three Variables 249, 26 @@ -311,11 +299,11 @@ Mosaic Plot... - + 203, 26 - - General + + Specific 221, 26 @@ -347,14 +335,14 @@ Use Summaries... - - 200, 6 - - + 203, 26 - - Multivariate + + General + + + 200, 6 242, 26 @@ -374,6 +362,12 @@ Canonical Correlations... + + 203, 26 + + + Multivariate + 200, 6 @@ -404,17 +398,11 @@ View Graph... - - 64, 24 - - - Model - - - 244, 26 + + 79, 24 - - Probability Distributions + + Describe 294, 26 @@ -437,14 +425,14 @@ Random Samples (Use Model)... - - 241, 6 - - + 244, 26 - - One Variable + + Probability Distributions + + + 241, 6 207, 26 @@ -464,11 +452,11 @@ Use Model... - + 244, 26 - - Two Variables + + One Variable 189, 26 @@ -491,11 +479,11 @@ Use Model... - + 244, 26 - - Three Variables + + Two Variables 189, 26 @@ -521,11 +509,11 @@ Use Model... - + 244, 26 - - Four Variables + + Three Variables 189, 26 @@ -551,11 +539,11 @@ Use Model... - + 244, 26 - - General + + Four Variables 189, 26 @@ -581,6 +569,12 @@ Use Model... + + 244, 26 + + + General + 241, 6 @@ -602,15 +596,6 @@ Use Model... - - False - - - 244, 26 - - - Other (One Variable) - 196, 26 @@ -644,14 +629,14 @@ Goodness of Fit... - + False - + 244, 26 - - Other (Two Variables) + + Other (One Variable) False @@ -698,14 +683,14 @@ Non Parameteric One Way ANOVA... - + False - + 244, 26 - - Other (Three Variable) + + Other (Two Variables) False @@ -728,14 +713,14 @@ Chi-square Test... - + False - + 244, 26 - - Other (General) + + Other (Three Variable) False @@ -764,6 +749,21 @@ Log Linear... + + False + + + 244, 26 + + + Other (General) + + + 64, 24 + + + Model + False @@ -788,15 +788,6 @@ False - - 259, 26 - - - Evaporation - - - False - False @@ -815,13 +806,13 @@ Penman... - + 259, 26 - - Crop + + Evaporation - + False @@ -842,6 +833,15 @@ Water Satisfaction Index... + + 259, 26 + + + Crop + + + False + False @@ -854,12 +854,6 @@ False - - 53, 24 - - - View - 252, 26 @@ -926,11 +920,11 @@ Reset to Default Layout - + 53, 24 - - Help + + View 265, 26 @@ -992,12 +986,6 @@ 262, 6 - - 265, 26 - - - Guides - 199, 26 @@ -1019,6 +1007,12 @@ More... + + 265, 26 + + + Guides + False @@ -1040,6 +1034,12 @@ Acknowlegments + + 53, 24 + + + Help + 538, 56 @@ -1049,18 +1049,6 @@ 638, 56 - - 75, 24 - - - Climatic - - - 259, 26 - - - File - 256, 26 @@ -1109,14 +1097,14 @@ Export to CPT... - - 256, 6 - - + 259, 26 - - Tidy and Examine + + File + + + 256, 6 255, 26 @@ -1190,11 +1178,11 @@ One Variable Frequencies - + 259, 26 - - Dates + + Tidy and Examine 195, 26 @@ -1238,17 +1226,17 @@ Use Time... - + 259, 26 - - Define Climatic Data... + + Dates - + 259, 26 - - Check Data + + Define Climatic Data... 207, 26 @@ -1280,11 +1268,11 @@ QC Rainfall... - + 259, 26 - - Prepare + + Check Data 224, 26 @@ -1451,14 +1439,14 @@ False - - 256, 6 - - + 259, 26 - - Describe + + Prepare + + + 256, 6 False @@ -1478,18 +1466,18 @@ Temperature... - - 241, 26 - - - Wind Speed/Direction... - 164, 26 Wind Rose... + + 241, 26 + + + Wind Speed/Direction... + False @@ -1514,11 +1502,11 @@ 238, 6 - + 259, 26 - - PICSA + + Describe 295, 26 @@ -1547,11 +1535,11 @@ Crops... - + 259, 26 - - CM SAF + + PICSA 280, 26 @@ -1565,17 +1553,17 @@ Export to CM SAF R Toolbox... - + 259, 26 - - Mapping... + + CM SAF - + 259, 26 - - Model + + Mapping... 214, 26 @@ -1598,14 +1586,14 @@ Markov Modelling... - - 256, 6 - - + 259, 26 - - Seasonal Forecast Support + + Model + + + 256, 6 295, 26 @@ -1646,20 +1634,11 @@ Cumulative/Exceedance Graph... - + 259, 26 - - Climate Methods - - - False - - - 239, 26 - - - Data Manipulation + + Seasonal Forecast Support False @@ -1796,11 +1775,11 @@ Output for CDT... - + 239, 26 - - Graphics + + Data Manipulation False @@ -1919,6 +1898,12 @@ Three Summaries... + + 239, 26 + + + Graphics + False @@ -1928,12 +1913,6 @@ Model... - - 239, 26 - - - Additional - False @@ -1979,6 +1958,12 @@ Water Balance... + + 239, 26 + + + Additional + False @@ -1988,6 +1973,21 @@ Create Climate Object... + + 259, 26 + + + Climate Methods + + + False + + + 75, 24 + + + Climatic + Ctrl+S @@ -1998,12 +1998,6 @@ Save... - - 281, 26 - - - Save As - 253, 26 @@ -2028,6 +2022,12 @@ Save Script Window As... + + 281, 26 + + + Save As + False @@ -2058,12 +2058,6 @@ Exit - - 47, 24 - - - Edit - False @@ -2148,12 +2142,24 @@ Select All + + 47, 24 + + + Edit + 775, 56 946, 56 + + 151, 20 + + + No worksheet loaded + 0, 568 @@ -2181,42 +2187,9 @@ 1 - - 151, 20 - - - No worksheet loaded - 17, 95 - - 0, 28 - - - No - - - 1112, 37 - - - 7 - - - Tool - - - Tool_strip - - - System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 2 - Magenta @@ -2280,15 +2253,6 @@ Edit Last Dialog - - Magenta - - - 44, 34 - - - Last 10 Dialogs - 63, 6 @@ -2301,6 +2265,15 @@ False + + Magenta + + + 44, 34 + + + Last 10 Dialogs + Magenta @@ -2370,164 +2343,38 @@ He&lp - - 122, 95 - - - On - - - 44, 24 - - - File - - - 216, 26 - - - Data Frame - - - 216, 26 - - - Check Data - - - 213, 6 - - - 216, 26 - - - Column: Calculate - - - 216, 26 - - - Column: Generate - - - 216, 26 - - - Column: Factor - - - 216, 26 - - - Column: Text - - - 216, 26 - - - Column: Date - - - 216, 26 - - - Convert Columns... - - - 213, 6 - - - False - - - 216, 26 - - - Circular... - - - 216, 26 - - - Column: Define - - - 216, 26 - - - Column: Reshape - - - 213, 6 - - - 216, 26 - - - Keys and Links - - - 216, 26 - - - Data Object - - - 216, 26 - - - R Objects - - - 72, 24 - - - Prepare - - - 105, 24 - - - Procurement - - - 148, 24 - - - Options by Context - - - 56, 24 - - - Tools - - - 0, 0 + + 0, 28 - - 8, 2, 0, 2 + + No - - 1112, 28 + + 1112, 37 - - 6 + + 7 - - Menu_strip + + Tool - - mnuBar + + Tool_strip - - System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + $this - - 3 + + 2 + + + 122, 95 + + + On Ctrl+N @@ -2601,12 +2448,6 @@ 278, 6 - - 281, 26 - - - Export - 246, 26 @@ -2631,6 +2472,12 @@ Export Graph As Image... + + 281, 26 + + + Export + 281, 26 @@ -2640,6 +2487,12 @@ 278, 6 + + 44, 24 + + + File + 239, 26 @@ -2751,6 +2604,12 @@ Colour by Property... + + 216, 26 + + + Data Frame + 299, 26 @@ -2838,6 +2697,15 @@ Anonymise ID Column... + + 216, 26 + + + Check Data + + + 213, 6 + 221, 26 @@ -2892,6 +2760,12 @@ Row Summary... + + 216, 26 + + + Column: Calculate + 212, 26 @@ -2925,6 +2799,12 @@ Permute Columns... + + 216, 26 + + + Column: Generate + 214, 26 @@ -3006,26 +2886,32 @@ Factor Data Frame... - + 216, 26 + + Column: Factor + + + 180, 26 + Find/Replace... - 216, 26 + 180, 26 Transform... - 216, 26 + 180, 26 Split... - 216, 26 + 180, 26 Combine... @@ -3034,17 +2920,23 @@ False - 216, 26 + 180, 26 Match... - 216, 26 + 180, 26 Distance... + + 216, 26 + + + Column: Text + 195, 26 @@ -3087,6 +2979,33 @@ Use Time... + + 216, 26 + + + Column: Date + + + 216, 26 + + + Convert Columns... + + + 213, 6 + + + 216, 26 + + + Circular... + + + 216, 26 + + + Column: Define + 233, 26 @@ -3147,6 +3066,15 @@ Transpose... + + 216, 26 + + + Column: Reshape + + + 213, 6 + 248, 26 @@ -3177,6 +3105,12 @@ Add Comment... + + 216, 26 + + + Keys and Links + False @@ -3255,6 +3189,12 @@ Delete Metadata... + + 216, 26 + + + Data Object + 147, 26 @@ -3279,6 +3219,18 @@ Delete... + + 216, 26 + + + R Objects + + + 72, 24 + + + Prepare + 263, 26 @@ -3291,12 +3243,6 @@ Define Procurement Data... - - 263, 26 - - - Prepare - 437, 26 @@ -3351,11 +3297,11 @@ Merge Additional Data... - + 263, 26 - - Describe + + Prepare 255, 26 @@ -3372,12 +3318,6 @@ 252, 6 - - 255, 26 - - - Categorical - 393, 26 @@ -3405,11 +3345,11 @@ Mosaic Plot... - + 255, 26 - - Numeric + + Categorical 314, 26 @@ -3432,11 +3372,17 @@ Correlations (Red Flags or others)... - + + 255, 26 + + + Numeric + + 263, 26 - - Mapping + + Describe 224, 26 @@ -3444,11 +3390,11 @@ Map Country Values... - + 263, 26 - - Model + + Mapping 356, 26 @@ -3462,6 +3408,12 @@ Fit Model... + + 263, 26 + + + Model + 260, 6 @@ -3471,12 +3423,6 @@ Define Red Flag Variables... - - 263, 26 - - - Corruption Risk Index - 335, 26 @@ -3489,11 +3435,17 @@ Summarise CRI by Country (or other)... - - 304, 26 + + 263, 26 - - Check Data + + Corruption Risk Index + + + 105, 24 + + + Procurement 260, 26 @@ -3528,17 +3480,17 @@ One Variable Frequencies... - + 304, 26 - - Define Options by Context Data... + + Check Data - + 304, 26 - - Prepare + + Define Options by Context Data... 344, 26 @@ -3567,11 +3519,11 @@ Unstack... - + 304, 26 - - Describe + + Prepare 269, 26 @@ -3594,11 +3546,11 @@ Boxplot... - + 304, 26 - - Model + + Describe 211, 26 @@ -3612,6 +3564,18 @@ General Fit Model... + + 304, 26 + + + Model + + + 148, 24 + + + Options by Context + False @@ -3672,6 +3636,39 @@ Options... + + 56, 24 + + + Tools + + + 0, 0 + + + 8, 2, 0, 2 + + + 1112, 28 + + + 6 + + + Menu_strip + + + mnuBar + + + System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 126, 22 @@ -8394,6 +8391,30 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + mnuPrepareColumnDefine + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareColumnDefineConvertColumns + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripSeparator55 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + mnuPrepareColumnDefineCircular + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + mnuPrepareColumnReshape @@ -9036,30 +9057,6 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - mnuPrepareColumnDefine - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuPrepareColumnDefineConvertColumns - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ToolStripSeparator55 - - - System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - mnuPrepareColumnDefineCircular - - - System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - frmMain From 2ec183b92a2e863af3f43ded22fcbdd2bea7e432 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Fri, 20 Sep 2019 15:00:08 +0300 Subject: [PATCH 6/7] Minor edit --- instat/dlgCircular.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb index b783dcd917a..9bee0bff24c 100644 --- a/instat/dlgCircular.vb +++ b/instat/dlgCircular.vb @@ -48,14 +48,14 @@ Public Class dlgCircular ucrPnlUnits.AddRadioButton(rdoHours, Chr(34) & "hours" & Chr(34)) ucrPnlUnits.AddRadioButton(rdoRadians, Chr(34) & "radians" & Chr(34)) - ucrSaveCircularColumn.SetPrefix("Circ") + ucrSaveCircularColumn.SetPrefix("circ") ucrSaveCircularColumn.SetSaveTypeAsColumn() ucrSaveCircularColumn.SetDataFrameSelector(ucrSelectorCircular.ucrAvailableDataFrames) ucrSaveCircularColumn.SetLabelText("New Column Name:") ucrSaveCircularColumn.SetIsComboBox() End Sub - Private Sub setDefaults() + Private Sub SetDefaults() clsCircularFunction = New RFunction ucrSelectorCircular.Reset() @@ -70,7 +70,7 @@ Public Class dlgCircular ucrBase.clsRsyntax.SetBaseRFunction(clsCircularFunction) End Sub - Private Sub setRcodeforControls(breset As Boolean) + Private Sub SetRcodeforControls(breset As Boolean) SetRCode(Me, ucrBase.clsRsyntax.clsBaseFunction, breset) End Sub From 4921c986ddfcaf9ea2fb470663ecdb9aef30e0d2 Mon Sep 17 00:00:00 2001 From: Wycklife Bonyo Date: Fri, 20 Sep 2019 19:05:39 +0300 Subject: [PATCH 7/7] Minor edit --- instat/dlgCircular.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/dlgCircular.vb b/instat/dlgCircular.vb index 9bee0bff24c..2e11543dc3e 100644 --- a/instat/dlgCircular.vb +++ b/instat/dlgCircular.vb @@ -24,9 +24,9 @@ Public Class dlgCircular bFirstLoad = False End If If bReset Then - setDefaults() + SetDefaults() End If - setRcodeforControls(bReset) + SetRcodeforControls(bReset) bReset = False autoTranslate(Me) End Sub @@ -75,8 +75,8 @@ Public Class dlgCircular End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset - setDefaults() - setRcodeforControls(True) + SetDefaults() + SetRcodeforControls(True) TestOkEnabled() End Sub