From 0fb538af3f037b3a71351a4ba5c56f9a2e67cd34 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 24 Nov 2023 02:27:22 +0300 Subject: [PATCH 001/273] gt tables changes --- instat/dlgSummaryTables.vb | 51 ++- instat/instat.vbproj | 18 + instat/sdgPlots.vb | 2 +- instat/sdgTableOptions.Designer.vb | 390 +++++++++++++++++++ instat/sdgTableOptions.resx | 129 ++++++ instat/sdgTableOptions.vb | 200 ++++++++++ instat/sdgTableTextFormatOptions.Designer.vb | 259 ++++++++++++ instat/sdgTableTextFormatOptions.resx | 120 ++++++ instat/sdgTableTextFormatOptions.vb | 5 + 9 files changed, 1155 insertions(+), 19 deletions(-) create mode 100644 instat/sdgTableOptions.Designer.vb create mode 100644 instat/sdgTableOptions.resx create mode 100644 instat/sdgTableOptions.vb create mode 100644 instat/sdgTableTextFormatOptions.Designer.vb create mode 100644 instat/sdgTableTextFormatOptions.resx create mode 100644 instat/sdgTableTextFormatOptions.vb diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index 6224d2dbdc4..e08f3e49cf0 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -242,6 +242,8 @@ Public Class dlgSummaryTables clsThemesTabOptionsFunction.SetRCommand("tab_options") clsgtExtraThemesFunction.SetPackageName("gtExtras") + + ' Gt function clsGtFunction.SetPackageName("gt") clsGtFunction.SetRCommand("gt") @@ -274,7 +276,7 @@ Public Class dlgSummaryTables clsFrequencyOperator.SetOperation("%>%") clsFrequencyOperator.bBrackets = False clsFrequencyOperator.AddParameter("tableFun", clsRFunctionParameter:=clsFrequencyDefaultFunction, iPosition:=0) - clsFrequencyOperator.AddParameter("gttbl", clsRFunctionParameter:=clsGtFunction, iPosition:=2) + clsFrequencyOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2) clsSummariesList.SetRCommand("c") clsSummariesList.AddParameter("summary_mean", Chr(34) & "summary_mean" & Chr(34), bIncludeArgumentName:=False) ' TODO decide which default(s) to use? @@ -396,26 +398,39 @@ Public Class dlgSummaryTables End Sub Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click - If rdoSummaryTable.Checked Then - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, - clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, - clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, - clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, - clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, - clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) + 'If rdoSummaryTable.Checked Then + ' sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + ' clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, + ' clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, + ' clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, + ' clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + ' clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, + ' clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) + 'Else + ' sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, + ' clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, + ' clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, + ' clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, + ' clsNewMutableOperator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, + ' clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, + ' clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) + 'End If + + 'sdgFormatSummaryTables.ShowDialog() + 'bResetFormatSubdialog = False + + Dim clsROperator As ROperator + If rdoFrequencyTable.Checked Then + clsROperator = clsFrequencyOperator + ElseIf rdoSummaryTable.Checked Then + clsROperator = clsSummaryOperator Else - sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, - clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, - clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, - clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - clsNewMutableOperator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, - clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, - clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) + Exit Sub End If - sdgFormatSummaryTables.ShowDialog() - bResetFormatSubdialog = False + sdgTableOptions.Setup(clsROperator) + sdgTableOptions.ShowDialog(Me) + End Sub Private Sub ucrChkWeights_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkWeight.ControlValueChanged diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 4c289e05e77..599f6363af5 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -289,6 +289,18 @@ Form + + sdgTableTextFormatOptions.vb + + + Form + + + sdgTableOptions.vb + + + Form + frmMaximiseOutput.vb @@ -3116,6 +3128,12 @@ sdgSummaryThemes.vb + + sdgTableTextFormatOptions.vb + + + sdgTableOptions.vb + frmMaximiseOutput.vb Designer diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 53975f24814..39968ba0161 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -746,7 +746,7 @@ Public Class sdgPlots ucrChkFreeScalesY.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) End If ucrNudNumberofRows.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) - ucrChkLabeler.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) + ucrChkLabeler.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkDrop.SetRCode(clsFacetFunction, bReset, bCloneIfNeeded:=True) ucrChkIncludeFacets.SetRCode(clsBaseOperator, bReset, bCloneIfNeeded:=True) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb new file mode 100644 index 00000000000..3013a16ea22 --- /dev/null +++ b/instat/sdgTableOptions.Designer.vb @@ -0,0 +1,390 @@ + _ +Partial Class sdgTableOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.tbpFormatOptions = New System.Windows.Forms.TabControl() + Me.tbpHeader = New System.Windows.Forms.TabPage() + Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() + Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() + Me.lblHeaderSubtitle = New System.Windows.Forms.Label() + Me.lblHeaderTitle = New System.Windows.Forms.Label() + Me.tbpFooters = New System.Windows.Forms.TabPage() + Me.tbpSourceNotes = New System.Windows.Forms.TabPage() + Me.tbpColumns = New System.Windows.Forms.TabPage() + Me.tbpRows = New System.Windows.Forms.TabPage() + Me.tbpCells = New System.Windows.Forms.TabPage() + Me.tbpThemes = New System.Windows.Forms.TabPage() + Me.cmdManualTheme = New System.Windows.Forms.Button() + Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() + Me.rdoManualTheme = New System.Windows.Forms.RadioButton() + Me.lblFooterNotes = New System.Windows.Forms.Label() + Me.reoGridSourceNotes = New unvell.ReoGrid.ReoGridControl() + Me.lblSourceNotes = New System.Windows.Forms.Label() + Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() + Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() + Me.ucrInputSelectThemes = New instat.ucrInputComboBox() + Me.ucrPnlThemesPanel = New instat.UcrPanel() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() + Me.colNote = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colColName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colRows = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.tbpFormatOptions.SuspendLayout() + Me.tbpHeader.SuspendLayout() + Me.tbpFooters.SuspendLayout() + Me.tbpSourceNotes.SuspendLayout() + Me.tbpThemes.SuspendLayout() + CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'tbpFormatOptions + ' + Me.tbpFormatOptions.Controls.Add(Me.tbpHeader) + Me.tbpFormatOptions.Controls.Add(Me.tbpFooters) + Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) + Me.tbpFormatOptions.Controls.Add(Me.tbpColumns) + Me.tbpFormatOptions.Controls.Add(Me.tbpRows) + Me.tbpFormatOptions.Controls.Add(Me.tbpCells) + Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) + Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) + Me.tbpFormatOptions.Name = "tbpFormatOptions" + Me.tbpFormatOptions.SelectedIndex = 0 + Me.tbpFormatOptions.Size = New System.Drawing.Size(588, 287) + Me.tbpFormatOptions.TabIndex = 5 + ' + 'tbpHeader + ' + Me.tbpHeader.Controls.Add(Me.btnHeaderSubTitleFormat) + Me.tbpHeader.Controls.Add(Me.btnHeaderTitleFormat) + Me.tbpHeader.Controls.Add(Me.ucrInputHeaderSubtitle) + Me.tbpHeader.Controls.Add(Me.ucrInputHeaderTitle) + Me.tbpHeader.Controls.Add(Me.lblHeaderSubtitle) + Me.tbpHeader.Controls.Add(Me.lblHeaderTitle) + Me.tbpHeader.Location = New System.Drawing.Point(4, 22) + Me.tbpHeader.Name = "tbpHeader" + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) + Me.tbpHeader.Size = New System.Drawing.Size(580, 261) + Me.tbpHeader.TabIndex = 0 + Me.tbpHeader.Text = "Header" + Me.tbpHeader.UseVisualStyleBackColor = True + ' + 'btnHeaderSubTitleFormat + ' + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(219, 47) + Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderSubTitleFormat.TabIndex = 13 + Me.btnHeaderSubTitleFormat.Text = "Format" + Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True + ' + 'btnHeaderTitleFormat + ' + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(219, 17) + Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderTitleFormat.TabIndex = 12 + Me.btnHeaderTitleFormat.Text = "Format" + Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True + ' + 'lblHeaderSubtitle + ' + Me.lblHeaderSubtitle.AutoSize = True + Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(16, 52) + Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) + Me.lblHeaderSubtitle.TabIndex = 9 + Me.lblHeaderSubtitle.Text = "Subtitle:" + ' + 'lblHeaderTitle + ' + Me.lblHeaderTitle.AutoSize = True + Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHeaderTitle.Location = New System.Drawing.Point(16, 17) + Me.lblHeaderTitle.Name = "lblHeaderTitle" + Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) + Me.lblHeaderTitle.TabIndex = 8 + Me.lblHeaderTitle.Text = "Title:" + ' + 'tbpFooters + ' + Me.tbpFooters.Controls.Add(Me.dataGridFooterNotes) + Me.tbpFooters.Controls.Add(Me.lblFooterNotes) + Me.tbpFooters.Location = New System.Drawing.Point(4, 22) + Me.tbpFooters.Name = "tbpFooters" + Me.tbpFooters.Size = New System.Drawing.Size(580, 261) + Me.tbpFooters.TabIndex = 3 + Me.tbpFooters.Text = "Footers" + Me.tbpFooters.UseVisualStyleBackColor = True + ' + 'tbpSourceNotes + ' + Me.tbpSourceNotes.Controls.Add(Me.reoGridSourceNotes) + Me.tbpSourceNotes.Controls.Add(Me.lblSourceNotes) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) + Me.tbpSourceNotes.Name = "tbpSourceNotes" + Me.tbpSourceNotes.Size = New System.Drawing.Size(580, 261) + Me.tbpSourceNotes.TabIndex = 4 + Me.tbpSourceNotes.Text = "Source Notes" + Me.tbpSourceNotes.UseVisualStyleBackColor = True + ' + 'tbpColumns + ' + Me.tbpColumns.Location = New System.Drawing.Point(4, 22) + Me.tbpColumns.Name = "tbpColumns" + Me.tbpColumns.Size = New System.Drawing.Size(580, 261) + Me.tbpColumns.TabIndex = 5 + Me.tbpColumns.Text = "Columns" + Me.tbpColumns.UseVisualStyleBackColor = True + ' + 'tbpRows + ' + Me.tbpRows.Location = New System.Drawing.Point(4, 22) + Me.tbpRows.Name = "tbpRows" + Me.tbpRows.Size = New System.Drawing.Size(580, 261) + Me.tbpRows.TabIndex = 7 + Me.tbpRows.Text = "Rows" + Me.tbpRows.UseVisualStyleBackColor = True + ' + 'tbpCells + ' + Me.tbpCells.Location = New System.Drawing.Point(4, 22) + Me.tbpCells.Name = "tbpCells" + Me.tbpCells.Size = New System.Drawing.Size(580, 261) + Me.tbpCells.TabIndex = 8 + Me.tbpCells.Text = "Cells" + Me.tbpCells.UseVisualStyleBackColor = True + ' + 'tbpThemes + ' + Me.tbpThemes.Controls.Add(Me.ucrInputSelectThemes) + Me.tbpThemes.Controls.Add(Me.cmdManualTheme) + Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) + Me.tbpThemes.Controls.Add(Me.rdoManualTheme) + Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) + Me.tbpThemes.Location = New System.Drawing.Point(4, 22) + Me.tbpThemes.Name = "tbpThemes" + Me.tbpThemes.Size = New System.Drawing.Size(580, 261) + Me.tbpThemes.TabIndex = 6 + Me.tbpThemes.Text = "Themes" + Me.tbpThemes.UseVisualStyleBackColor = True + ' + 'cmdManualTheme + ' + Me.cmdManualTheme.Location = New System.Drawing.Point(157, 59) + Me.cmdManualTheme.Name = "cmdManualTheme" + Me.cmdManualTheme.Size = New System.Drawing.Size(168, 21) + Me.cmdManualTheme.TabIndex = 2 + Me.cmdManualTheme.Text = "Themes Sub Dialog" + Me.cmdManualTheme.UseVisualStyleBackColor = True + ' + 'rdoSelectTheme + ' + Me.rdoSelectTheme.AutoSize = True + Me.rdoSelectTheme.Checked = True + Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) + Me.rdoSelectTheme.Name = "rdoSelectTheme" + Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) + Me.rdoSelectTheme.TabIndex = 0 + Me.rdoSelectTheme.TabStop = True + Me.rdoSelectTheme.Text = "Select Theme" + Me.rdoSelectTheme.UseVisualStyleBackColor = True + ' + 'rdoManualTheme + ' + Me.rdoManualTheme.AutoSize = True + Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) + Me.rdoManualTheme.Name = "rdoManualTheme" + Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) + Me.rdoManualTheme.TabIndex = 1 + Me.rdoManualTheme.Text = "Manual Theme" + Me.rdoManualTheme.UseVisualStyleBackColor = True + ' + 'lblFooterNotes + ' + Me.lblFooterNotes.AutoSize = True + Me.lblFooterNotes.Location = New System.Drawing.Point(10, 6) + Me.lblFooterNotes.Name = "lblFooterNotes" + Me.lblFooterNotes.Size = New System.Drawing.Size(74, 13) + Me.lblFooterNotes.TabIndex = 4 + Me.lblFooterNotes.Text = "Footers notes:" + ' + 'reoGridSourceNotes + ' + Me.reoGridSourceNotes.BackColor = System.Drawing.Color.White + Me.reoGridSourceNotes.ColumnHeaderContextMenuStrip = Nothing + Me.reoGridSourceNotes.LeadHeaderContextMenuStrip = Nothing + Me.reoGridSourceNotes.Location = New System.Drawing.Point(5, 22) + Me.reoGridSourceNotes.Name = "reoGridSourceNotes" + Me.reoGridSourceNotes.RowHeaderContextMenuStrip = Nothing + Me.reoGridSourceNotes.Script = Nothing + Me.reoGridSourceNotes.SheetTabContextMenuStrip = Nothing + Me.reoGridSourceNotes.SheetTabNewButtonVisible = True + Me.reoGridSourceNotes.SheetTabVisible = True + Me.reoGridSourceNotes.SheetTabWidth = 154 + Me.reoGridSourceNotes.ShowScrollEndSpacing = True + Me.reoGridSourceNotes.Size = New System.Drawing.Size(445, 172) + Me.reoGridSourceNotes.TabIndex = 9 + Me.reoGridSourceNotes.Text = "Variables" + ' + 'lblSourceNotes + ' + Me.lblSourceNotes.AutoSize = True + Me.lblSourceNotes.Location = New System.Drawing.Point(7, 6) + Me.lblSourceNotes.Name = "lblSourceNotes" + Me.lblSourceNotes.Size = New System.Drawing.Size(73, 13) + Me.lblSourceNotes.TabIndex = 8 + Me.lblSourceNotes.Text = "Source notes:" + ' + 'ucrInputHeaderSubtitle + ' + Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderSubtitle.AutoSize = True + Me.ucrInputHeaderSubtitle.IsMultiline = False + Me.ucrInputHeaderSubtitle.IsReadOnly = False + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(70, 47) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderSubtitle.TabIndex = 11 + ' + 'ucrInputHeaderTitle + ' + Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderTitle.AutoSize = True + Me.ucrInputHeaderTitle.IsMultiline = False + Me.ucrInputHeaderTitle.IsReadOnly = False + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(70, 17) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderTitle.TabIndex = 10 + ' + 'ucrInputSelectThemes + ' + Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 + Me.ucrInputSelectThemes.IsReadOnly = False + Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" + Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) + Me.ucrInputSelectThemes.TabIndex = 3 + ' + 'ucrPnlThemesPanel + ' + Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) + Me.ucrPnlThemesPanel.TabIndex = 4 + ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(172, 299) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 4 + ' + 'dataGridFooterNotes + ' + Me.dataGridFooterNotes.AllowUserToAddRows = False + Me.dataGridFooterNotes.AllowUserToDeleteRows = False + Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colNote, Me.colColName, Me.colRows}) + Me.dataGridFooterNotes.Location = New System.Drawing.Point(13, 22) + Me.dataGridFooterNotes.Name = "dataGridFooterNotes" + Me.dataGridFooterNotes.Size = New System.Drawing.Size(424, 150) + Me.dataGridFooterNotes.TabIndex = 5 + ' + 'colNote + ' + Me.colNote.HeaderText = "Note" + Me.colNote.Name = "colNote" + ' + 'colColName + ' + Me.colColName.HeaderText = "Column" + Me.colColName.Name = "colColName" + ' + 'colRows + ' + Me.colRows.HeaderText = "Rows" + Me.colRows.Name = "colRows" + ' + 'sdgTableOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(598, 332) + Me.Controls.Add(Me.tbpFormatOptions) + Me.Controls.Add(Me.ucrBaseSubdialog) + Me.Name = "sdgTableOptions" + Me.Text = "Table Options" + Me.tbpFormatOptions.ResumeLayout(False) + Me.tbpHeader.ResumeLayout(False) + Me.tbpHeader.PerformLayout() + Me.tbpFooters.ResumeLayout(False) + Me.tbpFooters.PerformLayout() + Me.tbpSourceNotes.ResumeLayout(False) + Me.tbpSourceNotes.PerformLayout() + Me.tbpThemes.ResumeLayout(False) + Me.tbpThemes.PerformLayout() + CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue + Friend WithEvents tbpFormatOptions As TabControl + Friend WithEvents tbpHeader As TabPage + Friend WithEvents tbpFooters As TabPage + Friend WithEvents tbpSourceNotes As TabPage + Friend WithEvents tbpColumns As TabPage + Friend WithEvents tbpThemes As TabPage + Friend WithEvents ucrInputSelectThemes As ucrInputComboBox + Friend WithEvents cmdManualTheme As Button + Friend WithEvents rdoSelectTheme As RadioButton + Friend WithEvents rdoManualTheme As RadioButton + Friend WithEvents ucrPnlThemesPanel As UcrPanel + Friend WithEvents ucrInputHeaderSubtitle As ucrInputTextBox + Friend WithEvents ucrInputHeaderTitle As ucrInputTextBox + Friend WithEvents lblHeaderSubtitle As Label + Friend WithEvents lblHeaderTitle As Label + Friend WithEvents tbpRows As TabPage + Friend WithEvents tbpCells As TabPage + Friend WithEvents btnHeaderSubTitleFormat As Button + Friend WithEvents btnHeaderTitleFormat As Button + Friend WithEvents lblFooterNotes As Label + Friend WithEvents reoGridSourceNotes As unvell.ReoGrid.ReoGridControl + Friend WithEvents lblSourceNotes As Label + Friend WithEvents dataGridFooterNotes As DataGridView + Friend WithEvents colNote As DataGridViewTextBoxColumn + Friend WithEvents colColName As DataGridViewTextBoxColumn + Friend WithEvents colRows As DataGridViewTextBoxColumn +End Class diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx new file mode 100644 index 00000000000..fa6d3e861b5 --- /dev/null +++ b/instat/sdgTableOptions.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb new file mode 100644 index 00000000000..b9104d9e54a --- /dev/null +++ b/instat/sdgTableOptions.vb @@ -0,0 +1,200 @@ +' 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 sdgTableOptions + + Dim clsOperator As ROperator + + Private Sub sdgTableOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub + + + ''' + ''' An R operateor that has a parameter named "gt" set up. + ''' The parameter should be an R Function that generates script "gt:gt()" as part of the last script statement. + ''' + ''' + Public Sub Setup(clsNewOperator As ROperator) + Me.clsOperator = clsNewOperator + + If Not clsNewOperator.ContainsParameter("gt") Then + MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog") + Me.Close() + Exit Sub + End If + + SetHeaderControlsContents(clsOperator) + SetFootersControlsContents(clsOperator) + + End Sub + + Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn + SetHeaderRFunctions(clsOperator) + SetFootersRFunctions(clsOperator) + End Sub + + '----------------------------------------- + ' Header controls + Private Sub SetHeaderControlsContents(clsOperator As ROperator) + + ucrInputHeaderTitle.SetName("") + ucrInputHeaderSubtitle.SetName("") + + If Not clsOperator.ContainsParameter("tab_header") Then + Exit Sub + End If + + Dim clsParam As RParameter = clsOperator.GetParameter("tab_header") + If clsParam.clsArgumentCodeStructure.ContainsParameter("title") Then + ucrInputHeaderTitle.SetName(GetStringValue(clsParam.clsArgumentCodeStructure.GetParameter("title").strArgumentValue, False)) + End If + + If clsParam.clsArgumentCodeStructure.ContainsParameter("subtitle") Then + ucrInputHeaderSubtitle.SetName(GetStringValue(clsParam.clsArgumentCodeStructure.GetParameter("subtitle").strArgumentValue, False)) + End If + End Sub + + Private Sub SetHeaderRFunctions(clsOperator As ROperator) + If ucrInputHeaderTitle.IsEmpty() AndAlso ucrInputHeaderSubtitle.IsEmpty() Then + clsOperator.RemoveParameterByName("tab_header") + Exit Sub + End If + + Dim clsHeaderRFunction As New RFunction + + If clsOperator.ContainsParameter("tab_header") Then + clsHeaderRFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure + Else + clsHeaderRFunction.SetPackageName("gt") + clsHeaderRFunction.SetRCommand("tab_header") + clsOperator.AddParameter("tab_header", clsRFunctionParameter:=clsHeaderRFunction, bIncludeArgumentName:=False) + End If + + If Not ucrInputHeaderTitle.IsEmpty() Then + clsHeaderRFunction.AddParameter("title", GetStringValue(ucrInputHeaderTitle.GetText(), True)) + End If + + If Not ucrInputHeaderSubtitle.IsEmpty() Then + clsHeaderRFunction.AddParameter("subtitle", GetStringValue(ucrInputHeaderSubtitle.GetText(), True)) + End If + End Sub + '----------------------------------------- + + '----------------------------------------- + ' Footer controls + + Private Sub SetFootersControlsContents(clsOperator As ROperator) + dataGridFooterNotes.Rows.Clear() + + For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters + If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFooterNotes) + + Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure + For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters + If clsFootNoteRParam.strArgumentName = "footnote" Then + ' Set the foot note text + row.Cells(0).Value = GetStringValue(clsFootNoteRParam.strArgumentValue, False) + ElseIf clsFootNoteRParam.strArgumentName = "locations" Then + ' todo go through the location function + Dim clsFooterLocationRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure + + + End If + Next + + ' Add the tab_footnote() function parameters as a row + dataGridFooterNotes.Rows.Add(row) + + End If + Next + + ' Always add a place holder row for new foot note + dataGridFooterNotes.Rows.Add() + + End Sub + + Private Sub SetFootersRFunctions(clsOperator As ROperator) + + If dataGridFooterNotes.Rows.Count = 0 Then + Exit Sub + End If + + ' Remove all the previous footer parameters first + Dim lstParams As New List(Of RParameter) + For Each clsRParam As RParameter In clsOperator.clsParameters + If clsRParam.strArgumentName.Contains("tab_footnote") Then + lstParams.Add(clsRParam) + End If + Next + For Each clsRParam As RParameter In lstParams + clsOperator.RemoveParameter(clsRParam) + Next + + ' Then add the new footer parameters + For index As Integer = 0 To dataGridFooterNotes.Rows.Count - 1 + + Dim row As DataGridViewRow = dataGridFooterNotes.Rows.Item(index) + + If String.IsNullOrEmpty(row.Cells(0).Value) Then + Continue For + End If + Dim clsFooterRFunction As New RFunction + clsFooterRFunction.SetPackageName("gt") + clsFooterRFunction.SetRCommand("tab_footnote") + clsFooterRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=GetStringValue(row.Cells(0).Value, True))) + + clsOperator.AddParameter("tab_footnote" & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) + + Next + + End Sub + + + Private Sub sdgTableOptions_KeyPress(sender As Object, e As KeyPressEventArgs) Handles Me.KeyPress + + End Sub + + Private Sub sdgTableOptions_Leave(sender As Object, e As EventArgs) Handles Me.Leave + + End Sub + + Private Sub dataGridFooterNotes_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellValueChanged + + End Sub + + Private Sub dataGridFooterNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellEndEdit + AddNewEmptyRowAfterUserInput() + End Sub + + Private Sub AddNewEmptyRowAfterUserInput() + If dataGridFooterNotes.Rows.Count > 0 AndAlso Not String.IsNullOrEmpty(dataGridFooterNotes.Rows.Item(dataGridFooterNotes.Rows.Count - 1).Cells(0).Value) Then + dataGridFooterNotes.Rows.Add() + End If + End Sub + '----------------------------------------- + + '----------------------------------------- + Private Function GetStringValue(str As String, bwithQuotes As Boolean) As String + Return If(bwithQuotes, """" & str & """", str.Replace("""", "")) + End Function + + +End Class \ No newline at end of file diff --git a/instat/sdgTableTextFormatOptions.Designer.vb b/instat/sdgTableTextFormatOptions.Designer.vb new file mode 100644 index 00000000000..f14cc2c1f55 --- /dev/null +++ b/instat/sdgTableTextFormatOptions.Designer.vb @@ -0,0 +1,259 @@ + _ +Partial Class sdgTableTextFormatOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.ucrCboFontType = New instat.ucrInputComboBox() + Me.lblFontType = New System.Windows.Forms.Label() + Me.lblFontStyle = New System.Windows.Forms.Label() + Me.ucrCboFontStyle = New instat.ucrInputComboBox() + Me.lblFontSize = New System.Windows.Forms.Label() + Me.ucrFontSize = New instat.ucrInputComboBox() + Me.lblUnderlineColor = New System.Windows.Forms.Label() + Me.ucrUnderLineColor = New instat.ucrInputComboBox() + Me.lblUnderlineStyle = New System.Windows.Forms.Label() + Me.ucrUnderlineStyle = New instat.ucrInputComboBox() + Me.lblFontColor = New System.Windows.Forms.Label() + Me.ucrFontColor = New instat.ucrInputComboBox() + Me.lblAlignVertical = New System.Windows.Forms.Label() + Me.ucrAlignVertical = New instat.ucrInputComboBox() + Me.lblAlignHorizontal = New System.Windows.Forms.Label() + Me.ucrAlignHorizontal = New instat.ucrInputComboBox() + Me.SuspendLayout() + ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(110, 185) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 4 + ' + 'ucrCboFontType + ' + Me.ucrCboFontType.AddQuotesIfUnrecognised = True + Me.ucrCboFontType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontType.GetSetSelectedIndex = -1 + Me.ucrCboFontType.IsReadOnly = False + Me.ucrCboFontType.Location = New System.Drawing.Point(10, 24) + Me.ucrCboFontType.Name = "ucrCboFontType" + Me.ucrCboFontType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontType.TabIndex = 5 + ' + 'lblFontType + ' + Me.lblFontType.AutoSize = True + Me.lblFontType.Location = New System.Drawing.Point(7, 8) + Me.lblFontType.Name = "lblFontType" + Me.lblFontType.Size = New System.Drawing.Size(54, 13) + Me.lblFontType.TabIndex = 6 + Me.lblFontType.Text = "Font type:" + ' + 'lblFontStyle + ' + Me.lblFontStyle.AutoSize = True + Me.lblFontStyle.Location = New System.Drawing.Point(160, 9) + Me.lblFontStyle.Name = "lblFontStyle" + Me.lblFontStyle.Size = New System.Drawing.Size(55, 13) + Me.lblFontStyle.TabIndex = 8 + Me.lblFontStyle.Text = "Font style:" + ' + 'ucrCboFontStyle + ' + Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True + Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontStyle.GetSetSelectedIndex = -1 + Me.ucrCboFontStyle.IsReadOnly = False + Me.ucrCboFontStyle.Location = New System.Drawing.Point(163, 25) + Me.ucrCboFontStyle.Name = "ucrCboFontStyle" + Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontStyle.TabIndex = 7 + ' + 'lblFontSize + ' + Me.lblFontSize.AutoSize = True + Me.lblFontSize.Location = New System.Drawing.Point(314, 9) + Me.lblFontSize.Name = "lblFontSize" + Me.lblFontSize.Size = New System.Drawing.Size(52, 13) + Me.lblFontSize.TabIndex = 10 + Me.lblFontSize.Text = "Font size:" + ' + 'ucrFontSize + ' + Me.ucrFontSize.AddQuotesIfUnrecognised = True + Me.ucrFontSize.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFontSize.GetSetSelectedIndex = -1 + Me.ucrFontSize.IsReadOnly = False + Me.ucrFontSize.Location = New System.Drawing.Point(317, 25) + Me.ucrFontSize.Name = "ucrFontSize" + Me.ucrFontSize.Size = New System.Drawing.Size(137, 21) + Me.ucrFontSize.TabIndex = 9 + ' + 'lblUnderlineColor + ' + Me.lblUnderlineColor.AutoSize = True + Me.lblUnderlineColor.Location = New System.Drawing.Point(314, 63) + Me.lblUnderlineColor.Name = "lblUnderlineColor" + Me.lblUnderlineColor.Size = New System.Drawing.Size(81, 13) + Me.lblUnderlineColor.TabIndex = 16 + Me.lblUnderlineColor.Text = "Underline color:" + ' + 'ucrUnderLineColor + ' + Me.ucrUnderLineColor.AddQuotesIfUnrecognised = True + Me.ucrUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrUnderLineColor.GetSetSelectedIndex = -1 + Me.ucrUnderLineColor.IsReadOnly = False + Me.ucrUnderLineColor.Location = New System.Drawing.Point(317, 79) + Me.ucrUnderLineColor.Name = "ucrUnderLineColor" + Me.ucrUnderLineColor.Size = New System.Drawing.Size(137, 21) + Me.ucrUnderLineColor.TabIndex = 15 + ' + 'lblUnderlineStyle + ' + Me.lblUnderlineStyle.AutoSize = True + Me.lblUnderlineStyle.Location = New System.Drawing.Point(160, 63) + Me.lblUnderlineStyle.Name = "lblUnderlineStyle" + Me.lblUnderlineStyle.Size = New System.Drawing.Size(79, 13) + Me.lblUnderlineStyle.TabIndex = 14 + Me.lblUnderlineStyle.Text = "Underline style:" + ' + 'ucrUnderlineStyle + ' + Me.ucrUnderlineStyle.AddQuotesIfUnrecognised = True + Me.ucrUnderlineStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrUnderlineStyle.GetSetSelectedIndex = -1 + Me.ucrUnderlineStyle.IsReadOnly = False + Me.ucrUnderlineStyle.Location = New System.Drawing.Point(163, 79) + Me.ucrUnderlineStyle.Name = "ucrUnderlineStyle" + Me.ucrUnderlineStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrUnderlineStyle.TabIndex = 13 + ' + 'lblFontColor + ' + Me.lblFontColor.AutoSize = True + Me.lblFontColor.Location = New System.Drawing.Point(7, 62) + Me.lblFontColor.Name = "lblFontColor" + Me.lblFontColor.Size = New System.Drawing.Size(57, 13) + Me.lblFontColor.TabIndex = 12 + Me.lblFontColor.Text = "Font color:" + ' + 'ucrFontColor + ' + Me.ucrFontColor.AddQuotesIfUnrecognised = True + Me.ucrFontColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFontColor.GetSetSelectedIndex = -1 + Me.ucrFontColor.IsReadOnly = False + Me.ucrFontColor.Location = New System.Drawing.Point(10, 78) + Me.ucrFontColor.Name = "ucrFontColor" + Me.ucrFontColor.Size = New System.Drawing.Size(137, 21) + Me.ucrFontColor.TabIndex = 11 + ' + 'lblAlignVertical + ' + Me.lblAlignVertical.AutoSize = True + Me.lblAlignVertical.Location = New System.Drawing.Point(160, 119) + Me.lblAlignVertical.Name = "lblAlignVertical" + Me.lblAlignVertical.Size = New System.Drawing.Size(70, 13) + Me.lblAlignVertical.TabIndex = 20 + Me.lblAlignVertical.Text = "Vertical align:" + ' + 'ucrAlignVertical + ' + Me.ucrAlignVertical.AddQuotesIfUnrecognised = True + Me.ucrAlignVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrAlignVertical.GetSetSelectedIndex = -1 + Me.ucrAlignVertical.IsReadOnly = False + Me.ucrAlignVertical.Location = New System.Drawing.Point(163, 135) + Me.ucrAlignVertical.Name = "ucrAlignVertical" + Me.ucrAlignVertical.Size = New System.Drawing.Size(137, 21) + Me.ucrAlignVertical.TabIndex = 19 + ' + 'lblAlignHorizontal + ' + Me.lblAlignHorizontal.AutoSize = True + Me.lblAlignHorizontal.Location = New System.Drawing.Point(7, 118) + Me.lblAlignHorizontal.Name = "lblAlignHorizontal" + Me.lblAlignHorizontal.Size = New System.Drawing.Size(82, 13) + Me.lblAlignHorizontal.TabIndex = 18 + Me.lblAlignHorizontal.Text = "Horizontal align:" + ' + 'ucrAlignHorizontal + ' + Me.ucrAlignHorizontal.AddQuotesIfUnrecognised = True + Me.ucrAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrAlignHorizontal.GetSetSelectedIndex = -1 + Me.ucrAlignHorizontal.IsReadOnly = False + Me.ucrAlignHorizontal.Location = New System.Drawing.Point(10, 134) + Me.ucrAlignHorizontal.Name = "ucrAlignHorizontal" + Me.ucrAlignHorizontal.Size = New System.Drawing.Size(137, 21) + Me.ucrAlignHorizontal.TabIndex = 17 + ' + 'sdgTableTextFormatOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(470, 222) + Me.Controls.Add(Me.lblAlignVertical) + Me.Controls.Add(Me.ucrAlignVertical) + Me.Controls.Add(Me.lblAlignHorizontal) + Me.Controls.Add(Me.ucrAlignHorizontal) + Me.Controls.Add(Me.lblUnderlineColor) + Me.Controls.Add(Me.ucrUnderLineColor) + Me.Controls.Add(Me.lblUnderlineStyle) + Me.Controls.Add(Me.ucrUnderlineStyle) + Me.Controls.Add(Me.lblFontColor) + Me.Controls.Add(Me.ucrFontColor) + Me.Controls.Add(Me.lblFontSize) + Me.Controls.Add(Me.ucrFontSize) + Me.Controls.Add(Me.lblFontStyle) + Me.Controls.Add(Me.ucrCboFontStyle) + Me.Controls.Add(Me.lblFontType) + Me.Controls.Add(Me.ucrCboFontType) + Me.Controls.Add(Me.ucrBaseSubdialog) + Me.Name = "sdgTableTextFormatOptions" + Me.Text = "Text Format" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue + Friend WithEvents ucrCboFontType As ucrInputComboBox + Friend WithEvents lblFontType As Label + Friend WithEvents lblFontStyle As Label + Friend WithEvents ucrCboFontStyle As ucrInputComboBox + Friend WithEvents lblFontSize As Label + Friend WithEvents ucrFontSize As ucrInputComboBox + Friend WithEvents lblUnderlineColor As Label + Friend WithEvents ucrUnderLineColor As ucrInputComboBox + Friend WithEvents lblUnderlineStyle As Label + Friend WithEvents ucrUnderlineStyle As ucrInputComboBox + Friend WithEvents lblFontColor As Label + Friend WithEvents ucrFontColor As ucrInputComboBox + Friend WithEvents lblAlignVertical As Label + Friend WithEvents ucrAlignVertical As ucrInputComboBox + Friend WithEvents lblAlignHorizontal As Label + Friend WithEvents ucrAlignHorizontal As ucrInputComboBox +End Class diff --git a/instat/sdgTableTextFormatOptions.resx b/instat/sdgTableTextFormatOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgTableTextFormatOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgTableTextFormatOptions.vb b/instat/sdgTableTextFormatOptions.vb new file mode 100644 index 00000000000..7386b668278 --- /dev/null +++ b/instat/sdgTableTextFormatOptions.vb @@ -0,0 +1,5 @@ +Public Class sdgTableTextFormatOptions + Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class \ No newline at end of file From cf2a1b43eaddb27fa411305fd835d537ece1bf71 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 24 Nov 2023 03:42:53 +0300 Subject: [PATCH 002/273] more initial implementation --- instat/sdgTableOptions.Designer.vb | 306 ++++++++++++++++------------- instat/sdgTableOptions.resx | 6 + instat/sdgTableOptions.vb | 23 ++- 3 files changed, 194 insertions(+), 141 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index 3013a16ea22..503f22ec532 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -26,35 +26,37 @@ Partial Class sdgTableOptions Me.tbpHeader = New System.Windows.Forms.TabPage() Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() + Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() + Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.tbpFooters = New System.Windows.Forms.TabPage() + Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() + Me.lblFooterNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() + Me.dataGridViewSourceNotes = New System.Windows.Forms.DataGridView() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblSourceNotes = New System.Windows.Forms.Label() Me.tbpColumns = New System.Windows.Forms.TabPage() Me.tbpRows = New System.Windows.Forms.TabPage() Me.tbpCells = New System.Windows.Forms.TabPage() Me.tbpThemes = New System.Windows.Forms.TabPage() + Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.cmdManualTheme = New System.Windows.Forms.Button() Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() - Me.lblFooterNotes = New System.Windows.Forms.Label() - Me.reoGridSourceNotes = New unvell.ReoGrid.ReoGridControl() - Me.lblSourceNotes = New System.Windows.Forms.Label() - Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() - Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() - Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() Me.colNote = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colColName = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colRows = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() + CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() + CType(Me.dataGridViewSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpThemes.SuspendLayout() - CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'tbpFormatOptions @@ -66,10 +68,11 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Controls.Add(Me.tbpRows) Me.tbpFormatOptions.Controls.Add(Me.tbpCells) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) - Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) + Me.tbpFormatOptions.Location = New System.Drawing.Point(4, 8) + Me.tbpFormatOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(588, 287) + Me.tbpFormatOptions.Size = New System.Drawing.Size(882, 442) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -80,39 +83,67 @@ Partial Class sdgTableOptions Me.tbpHeader.Controls.Add(Me.ucrInputHeaderTitle) Me.tbpHeader.Controls.Add(Me.lblHeaderSubtitle) Me.tbpHeader.Controls.Add(Me.lblHeaderTitle) - Me.tbpHeader.Location = New System.Drawing.Point(4, 22) + Me.tbpHeader.Location = New System.Drawing.Point(4, 29) + Me.tbpHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpHeader.Name = "tbpHeader" - Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(580, 261) + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpHeader.Size = New System.Drawing.Size(874, 409) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' 'btnHeaderSubTitleFormat ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(219, 47) + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(328, 72) + Me.btnHeaderSubTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(112, 35) Me.btnHeaderSubTitleFormat.TabIndex = 13 Me.btnHeaderSubTitleFormat.Text = "Format" Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True ' 'btnHeaderTitleFormat ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(219, 17) + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(328, 26) + Me.btnHeaderTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(112, 35) Me.btnHeaderTitleFormat.TabIndex = 12 Me.btnHeaderTitleFormat.Text = "Format" Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True ' + 'ucrInputHeaderSubtitle + ' + Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderSubtitle.AutoSize = True + Me.ucrInputHeaderSubtitle.IsMultiline = False + Me.ucrInputHeaderSubtitle.IsReadOnly = False + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(101, 75) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(206, 32) + Me.ucrInputHeaderSubtitle.TabIndex = 11 + ' + 'ucrInputHeaderTitle + ' + Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderTitle.AutoSize = True + Me.ucrInputHeaderTitle.IsMultiline = False + Me.ucrInputHeaderTitle.IsReadOnly = False + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(101, 29) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(206, 32) + Me.ucrInputHeaderTitle.TabIndex = 10 + ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(16, 52) + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(20, 83) + Me.lblHeaderSubtitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(67, 20) Me.lblHeaderSubtitle.TabIndex = 9 Me.lblHeaderSubtitle.Text = "Subtitle:" ' @@ -120,9 +151,10 @@ Partial Class sdgTableOptions ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(16, 17) + Me.lblHeaderTitle.Location = New System.Drawing.Point(20, 29) + Me.lblHeaderTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) + Me.lblHeaderTitle.Size = New System.Drawing.Size(42, 20) Me.lblHeaderTitle.TabIndex = 8 Me.lblHeaderTitle.Text = "Title:" ' @@ -130,47 +162,105 @@ Partial Class sdgTableOptions ' Me.tbpFooters.Controls.Add(Me.dataGridFooterNotes) Me.tbpFooters.Controls.Add(Me.lblFooterNotes) - Me.tbpFooters.Location = New System.Drawing.Point(4, 22) + Me.tbpFooters.Location = New System.Drawing.Point(4, 29) + Me.tbpFooters.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(580, 261) + Me.tbpFooters.Size = New System.Drawing.Size(874, 409) Me.tbpFooters.TabIndex = 3 Me.tbpFooters.Text = "Footers" Me.tbpFooters.UseVisualStyleBackColor = True ' + 'dataGridFooterNotes + ' + Me.dataGridFooterNotes.AllowUserToAddRows = False + Me.dataGridFooterNotes.AllowUserToDeleteRows = False + Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colNote, Me.colColName, Me.colRows}) + Me.dataGridFooterNotes.Location = New System.Drawing.Point(20, 34) + Me.dataGridFooterNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dataGridFooterNotes.Name = "dataGridFooterNotes" + Me.dataGridFooterNotes.RowHeadersWidth = 62 + Me.dataGridFooterNotes.Size = New System.Drawing.Size(665, 231) + Me.dataGridFooterNotes.TabIndex = 5 + ' + 'lblFooterNotes + ' + Me.lblFooterNotes.AutoSize = True + Me.lblFooterNotes.Location = New System.Drawing.Point(15, 9) + Me.lblFooterNotes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFooterNotes.Name = "lblFooterNotes" + Me.lblFooterNotes.Size = New System.Drawing.Size(112, 20) + Me.lblFooterNotes.TabIndex = 4 + Me.lblFooterNotes.Text = "Footers notes:" + ' 'tbpSourceNotes ' - Me.tbpSourceNotes.Controls.Add(Me.reoGridSourceNotes) + Me.tbpSourceNotes.Controls.Add(Me.dataGridViewSourceNotes) Me.tbpSourceNotes.Controls.Add(Me.lblSourceNotes) - Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 29) + Me.tbpSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(580, 261) + Me.tbpSourceNotes.Size = New System.Drawing.Size(874, 409) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' + 'dataGridViewSourceNotes + ' + Me.dataGridViewSourceNotes.AllowUserToAddRows = False + Me.dataGridViewSourceNotes.AllowUserToDeleteRows = False + Me.dataGridViewSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridViewSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1}) + Me.dataGridViewSourceNotes.Location = New System.Drawing.Point(12, 37) + Me.dataGridViewSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dataGridViewSourceNotes.Name = "dataGridViewSourceNotes" + Me.dataGridViewSourceNotes.RowHeadersWidth = 62 + Me.dataGridViewSourceNotes.Size = New System.Drawing.Size(519, 231) + Me.dataGridViewSourceNotes.TabIndex = 7 + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.DataGridViewTextBoxColumn1.HeaderText = "Source Text" + Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + ' + 'lblSourceNotes + ' + Me.lblSourceNotes.AutoSize = True + Me.lblSourceNotes.Location = New System.Drawing.Point(7, 12) + Me.lblSourceNotes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSourceNotes.Name = "lblSourceNotes" + Me.lblSourceNotes.Size = New System.Drawing.Size(112, 20) + Me.lblSourceNotes.TabIndex = 6 + Me.lblSourceNotes.Text = "Footers notes:" + ' 'tbpColumns ' - Me.tbpColumns.Location = New System.Drawing.Point(4, 22) + Me.tbpColumns.Location = New System.Drawing.Point(4, 29) + Me.tbpColumns.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(580, 261) + Me.tbpColumns.Size = New System.Drawing.Size(874, 409) Me.tbpColumns.TabIndex = 5 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True ' 'tbpRows ' - Me.tbpRows.Location = New System.Drawing.Point(4, 22) + Me.tbpRows.Location = New System.Drawing.Point(4, 29) + Me.tbpRows.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(580, 261) + Me.tbpRows.Size = New System.Drawing.Size(874, 409) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True ' 'tbpCells ' - Me.tbpCells.Location = New System.Drawing.Point(4, 22) + Me.tbpCells.Location = New System.Drawing.Point(4, 29) + Me.tbpCells.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(580, 261) + Me.tbpCells.Size = New System.Drawing.Size(874, 409) Me.tbpCells.TabIndex = 8 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True @@ -182,18 +272,32 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) - Me.tbpThemes.Location = New System.Drawing.Point(4, 22) + Me.tbpThemes.Location = New System.Drawing.Point(4, 29) + Me.tbpThemes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(580, 261) + Me.tbpThemes.Size = New System.Drawing.Size(874, 409) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True ' + 'ucrInputSelectThemes + ' + Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 + Me.ucrInputSelectThemes.IsReadOnly = False + Me.ucrInputSelectThemes.Location = New System.Drawing.Point(236, 45) + Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" + Me.ucrInputSelectThemes.Size = New System.Drawing.Size(252, 32) + Me.ucrInputSelectThemes.TabIndex = 3 + ' 'cmdManualTheme ' - Me.cmdManualTheme.Location = New System.Drawing.Point(157, 59) + Me.cmdManualTheme.Location = New System.Drawing.Point(236, 91) + Me.cmdManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cmdManualTheme.Name = "cmdManualTheme" - Me.cmdManualTheme.Size = New System.Drawing.Size(168, 21) + Me.cmdManualTheme.Size = New System.Drawing.Size(252, 32) Me.cmdManualTheme.TabIndex = 2 Me.cmdManualTheme.Text = "Themes Sub Dialog" Me.cmdManualTheme.UseVisualStyleBackColor = True @@ -202,9 +306,10 @@ Partial Class sdgTableOptions ' Me.rdoSelectTheme.AutoSize = True Me.rdoSelectTheme.Checked = True - Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) + Me.rdoSelectTheme.Location = New System.Drawing.Point(33, 48) + Me.rdoSelectTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoSelectTheme.Name = "rdoSelectTheme" - Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) + Me.rdoSelectTheme.Size = New System.Drawing.Size(132, 24) Me.rdoSelectTheme.TabIndex = 0 Me.rdoSelectTheme.TabStop = True Me.rdoSelectTheme.Text = "Select Theme" @@ -213,136 +318,61 @@ Partial Class sdgTableOptions 'rdoManualTheme ' Me.rdoManualTheme.AutoSize = True - Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) + Me.rdoManualTheme.Location = New System.Drawing.Point(33, 94) + Me.rdoManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoManualTheme.Name = "rdoManualTheme" - Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) + Me.rdoManualTheme.Size = New System.Drawing.Size(139, 24) Me.rdoManualTheme.TabIndex = 1 Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True ' - 'lblFooterNotes - ' - Me.lblFooterNotes.AutoSize = True - Me.lblFooterNotes.Location = New System.Drawing.Point(10, 6) - Me.lblFooterNotes.Name = "lblFooterNotes" - Me.lblFooterNotes.Size = New System.Drawing.Size(74, 13) - Me.lblFooterNotes.TabIndex = 4 - Me.lblFooterNotes.Text = "Footers notes:" - ' - 'reoGridSourceNotes - ' - Me.reoGridSourceNotes.BackColor = System.Drawing.Color.White - Me.reoGridSourceNotes.ColumnHeaderContextMenuStrip = Nothing - Me.reoGridSourceNotes.LeadHeaderContextMenuStrip = Nothing - Me.reoGridSourceNotes.Location = New System.Drawing.Point(5, 22) - Me.reoGridSourceNotes.Name = "reoGridSourceNotes" - Me.reoGridSourceNotes.RowHeaderContextMenuStrip = Nothing - Me.reoGridSourceNotes.Script = Nothing - Me.reoGridSourceNotes.SheetTabContextMenuStrip = Nothing - Me.reoGridSourceNotes.SheetTabNewButtonVisible = True - Me.reoGridSourceNotes.SheetTabVisible = True - Me.reoGridSourceNotes.SheetTabWidth = 154 - Me.reoGridSourceNotes.ShowScrollEndSpacing = True - Me.reoGridSourceNotes.Size = New System.Drawing.Size(445, 172) - Me.reoGridSourceNotes.TabIndex = 9 - Me.reoGridSourceNotes.Text = "Variables" - ' - 'lblSourceNotes - ' - Me.lblSourceNotes.AutoSize = True - Me.lblSourceNotes.Location = New System.Drawing.Point(7, 6) - Me.lblSourceNotes.Name = "lblSourceNotes" - Me.lblSourceNotes.Size = New System.Drawing.Size(73, 13) - Me.lblSourceNotes.TabIndex = 8 - Me.lblSourceNotes.Text = "Source notes:" - ' - 'ucrInputHeaderSubtitle - ' - Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderSubtitle.AutoSize = True - Me.ucrInputHeaderSubtitle.IsMultiline = False - Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(70, 47) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderSubtitle.TabIndex = 11 - ' - 'ucrInputHeaderTitle - ' - Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderTitle.AutoSize = True - Me.ucrInputHeaderTitle.IsMultiline = False - Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(70, 17) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderTitle.TabIndex = 10 - ' - 'ucrInputSelectThemes - ' - Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True - Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 - Me.ucrInputSelectThemes.IsReadOnly = False - Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" - Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) - Me.ucrInputSelectThemes.TabIndex = 3 - ' 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) - Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(18, 25) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" - Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(524, 108) Me.ucrPnlThemesPanel.TabIndex = 4 ' 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(172, 299) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(258, 460) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(6) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(336, 45) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'dataGridFooterNotes - ' - Me.dataGridFooterNotes.AllowUserToAddRows = False - Me.dataGridFooterNotes.AllowUserToDeleteRows = False - Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colNote, Me.colColName, Me.colRows}) - Me.dataGridFooterNotes.Location = New System.Drawing.Point(13, 22) - Me.dataGridFooterNotes.Name = "dataGridFooterNotes" - Me.dataGridFooterNotes.Size = New System.Drawing.Size(424, 150) - Me.dataGridFooterNotes.TabIndex = 5 - ' 'colNote ' - Me.colNote.HeaderText = "Note" + Me.colNote.HeaderText = "Note Text" + Me.colNote.MinimumWidth = 8 Me.colNote.Name = "colNote" + Me.colNote.Width = 272 ' 'colColName ' - Me.colColName.HeaderText = "Column" + Me.colColName.HeaderText = "Column Expression(s)" + Me.colColName.MinimumWidth = 8 Me.colColName.Name = "colColName" + Me.colColName.Width = 134 ' 'colRows ' - Me.colRows.HeaderText = "Rows" + Me.colRows.HeaderText = "Row Expression(s)" + Me.colRows.MinimumWidth = 8 Me.colRows.Name = "colRows" + Me.colRows.Width = 162 ' 'sdgTableOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(598, 332) + Me.ClientSize = New System.Drawing.Size(897, 511) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgTableOptions" Me.Text = "Table Options" Me.tbpFormatOptions.ResumeLayout(False) @@ -350,11 +380,12 @@ Partial Class sdgTableOptions Me.tbpHeader.PerformLayout() Me.tbpFooters.ResumeLayout(False) Me.tbpFooters.PerformLayout() + CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpSourceNotes.ResumeLayout(False) Me.tbpSourceNotes.PerformLayout() + CType(Me.dataGridViewSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpThemes.ResumeLayout(False) Me.tbpThemes.PerformLayout() - CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -381,9 +412,10 @@ Partial Class sdgTableOptions Friend WithEvents btnHeaderSubTitleFormat As Button Friend WithEvents btnHeaderTitleFormat As Button Friend WithEvents lblFooterNotes As Label - Friend WithEvents reoGridSourceNotes As unvell.ReoGrid.ReoGridControl - Friend WithEvents lblSourceNotes As Label Friend WithEvents dataGridFooterNotes As DataGridView + Friend WithEvents dataGridViewSourceNotes As DataGridView + Friend WithEvents lblSourceNotes As Label + Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn Friend WithEvents colNote As DataGridViewTextBoxColumn Friend WithEvents colColName As DataGridViewTextBoxColumn Friend WithEvents colRows As DataGridViewTextBoxColumn diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index fa6d3e861b5..0103ff2d1a7 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -126,4 +126,10 @@ True + + True + + + True + \ No newline at end of file diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index b9104d9e54a..8ba552f43d6 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class sdgTableOptions - Dim clsOperator As ROperator + Private clsOperator As ROperator Private Sub sdgTableOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -30,7 +30,7 @@ Public Class sdgTableOptions ''' ''' Public Sub Setup(clsNewOperator As ROperator) - Me.clsOperator = clsNewOperator + clsOperator = clsNewOperator If Not clsNewOperator.ContainsParameter("gt") Then MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog") @@ -114,8 +114,14 @@ Public Class sdgTableOptions row.Cells(0).Value = GetStringValue(clsFootNoteRParam.strArgumentValue, False) ElseIf clsFootNoteRParam.strArgumentName = "locations" Then ' todo go through the location function - Dim clsFooterLocationRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure - + Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure + For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters + If clsFootNoteLocationRParam.strArgumentName = "columns" Then + row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then + row.Cells(2).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + End If + Next End If Next @@ -161,6 +167,15 @@ Public Class sdgTableOptions clsFooterRFunction.SetRCommand("tab_footnote") clsFooterRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=GetStringValue(row.Cells(0).Value, True))) + If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then + Dim clsFooterLocationNoteRFunction As New RFunction + 'clsFooterLocationNoteRFunction.SetPackageName("gt") + clsFooterLocationNoteRFunction.SetRCommand("cells_body") + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=GetStringValue(row.Cells(1).Value, True))) + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=GetStringValue(row.Cells(2).Value, True))) + clsFooterRFunction.AddParameter(New RParameter(strParameterName:="locations", clsFooterLocationNoteRFunction)) + End If + clsOperator.AddParameter("tab_footnote" & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) Next From 6520a3cdb9d6ad4c956d0ce92f6c6c714545aad8 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 20 Feb 2024 18:45:43 +0300 Subject: [PATCH 003/273] Added formating options --- instat/instat.vbproj | 10 +- instat/sdgTableOptions.Designer.vb | 205 ++++------ instat/sdgTableOptions.resx | 3 - instat/sdgTableOptions.vb | 137 ++++--- instat/sdgTableOptionsTextFormat.Designer.vb | 372 ++++++++++++++++++ ...ns.resx => sdgTableOptionsTextFormat.resx} | 0 instat/sdgTableOptionsTextFormat.vb | 136 +++++++ instat/sdgTableTextFormatOptions.Designer.vb | 259 ------------ instat/sdgTableTextFormatOptions.vb | 5 - instat/ucrColors.vb | 2 +- 10 files changed, 682 insertions(+), 447 deletions(-) create mode 100644 instat/sdgTableOptionsTextFormat.Designer.vb rename instat/{sdgTableTextFormatOptions.resx => sdgTableOptionsTextFormat.resx} (100%) create mode 100644 instat/sdgTableOptionsTextFormat.vb delete mode 100644 instat/sdgTableTextFormatOptions.Designer.vb delete mode 100644 instat/sdgTableTextFormatOptions.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index c616958d00a..0feb3134818 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -337,10 +337,10 @@ Form - - sdgTableTextFormatOptions.vb + + sdgTableOptionsTextFormat.vb - + Form @@ -3200,8 +3200,8 @@ sdgSummaryThemes.vb - - sdgTableTextFormatOptions.vb + + sdgTableOptionsTextFormat.vb sdgTableOptions.vb diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index 503f22ec532..dca99895764 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -32,14 +32,14 @@ Partial Class sdgTableOptions Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() + Me.colNote = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colColName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colRows = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblFooterNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.dataGridViewSourceNotes = New System.Windows.Forms.DataGridView() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblSourceNotes = New System.Windows.Forms.Label() - Me.tbpColumns = New System.Windows.Forms.TabPage() - Me.tbpRows = New System.Windows.Forms.TabPage() - Me.tbpCells = New System.Windows.Forms.TabPage() Me.tbpThemes = New System.Windows.Forms.TabPage() Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.cmdManualTheme = New System.Windows.Forms.Button() @@ -47,9 +47,6 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.colNote = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colColName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colRows = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() @@ -64,15 +61,11 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Controls.Add(Me.tbpHeader) Me.tbpFormatOptions.Controls.Add(Me.tbpFooters) Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) - Me.tbpFormatOptions.Controls.Add(Me.tbpColumns) - Me.tbpFormatOptions.Controls.Add(Me.tbpRows) - Me.tbpFormatOptions.Controls.Add(Me.tbpCells) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) - Me.tbpFormatOptions.Location = New System.Drawing.Point(4, 8) - Me.tbpFormatOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(882, 442) + Me.tbpFormatOptions.Size = New System.Drawing.Size(588, 287) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -83,31 +76,28 @@ Partial Class sdgTableOptions Me.tbpHeader.Controls.Add(Me.ucrInputHeaderTitle) Me.tbpHeader.Controls.Add(Me.lblHeaderSubtitle) Me.tbpHeader.Controls.Add(Me.lblHeaderTitle) - Me.tbpHeader.Location = New System.Drawing.Point(4, 29) - Me.tbpHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" - Me.tbpHeader.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpHeader.Size = New System.Drawing.Size(874, 409) + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) + Me.tbpHeader.Size = New System.Drawing.Size(580, 261) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' 'btnHeaderSubTitleFormat ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(328, 72) - Me.btnHeaderSubTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(219, 47) Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(112, 35) + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) Me.btnHeaderSubTitleFormat.TabIndex = 13 Me.btnHeaderSubTitleFormat.Text = "Format" Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True ' 'btnHeaderTitleFormat ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(328, 26) - Me.btnHeaderTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(219, 17) Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(112, 35) + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(75, 23) Me.btnHeaderTitleFormat.TabIndex = 12 Me.btnHeaderTitleFormat.Text = "Format" Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True @@ -118,10 +108,10 @@ Partial Class sdgTableOptions Me.ucrInputHeaderSubtitle.AutoSize = True Me.ucrInputHeaderSubtitle.IsMultiline = False Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(101, 75) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(67, 49) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(206, 32) + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) Me.ucrInputHeaderSubtitle.TabIndex = 11 ' 'ucrInputHeaderTitle @@ -130,20 +120,19 @@ Partial Class sdgTableOptions Me.ucrInputHeaderTitle.AutoSize = True Me.ucrInputHeaderTitle.IsMultiline = False Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(101, 29) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(67, 19) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(206, 32) + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) Me.ucrInputHeaderTitle.TabIndex = 10 ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(20, 83) - Me.lblHeaderSubtitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(13, 54) Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(67, 20) + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) Me.lblHeaderSubtitle.TabIndex = 9 Me.lblHeaderSubtitle.Text = "Subtitle:" ' @@ -151,10 +140,9 @@ Partial Class sdgTableOptions ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(20, 29) - Me.lblHeaderTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHeaderTitle.Location = New System.Drawing.Point(13, 19) Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(42, 20) + Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) Me.lblHeaderTitle.TabIndex = 8 Me.lblHeaderTitle.Text = "Title:" ' @@ -162,10 +150,9 @@ Partial Class sdgTableOptions ' Me.tbpFooters.Controls.Add(Me.dataGridFooterNotes) Me.tbpFooters.Controls.Add(Me.lblFooterNotes) - Me.tbpFooters.Location = New System.Drawing.Point(4, 29) - Me.tbpFooters.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpFooters.Location = New System.Drawing.Point(4, 22) Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(874, 409) + Me.tbpFooters.Size = New System.Drawing.Size(580, 261) Me.tbpFooters.TabIndex = 3 Me.tbpFooters.Text = "Footers" Me.tbpFooters.UseVisualStyleBackColor = True @@ -176,20 +163,39 @@ Partial Class sdgTableOptions Me.dataGridFooterNotes.AllowUserToDeleteRows = False Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colNote, Me.colColName, Me.colRows}) - Me.dataGridFooterNotes.Location = New System.Drawing.Point(20, 34) - Me.dataGridFooterNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dataGridFooterNotes.Location = New System.Drawing.Point(7, 22) Me.dataGridFooterNotes.Name = "dataGridFooterNotes" Me.dataGridFooterNotes.RowHeadersWidth = 62 - Me.dataGridFooterNotes.Size = New System.Drawing.Size(665, 231) + Me.dataGridFooterNotes.Size = New System.Drawing.Size(564, 150) Me.dataGridFooterNotes.TabIndex = 5 ' + 'colNote + ' + Me.colNote.HeaderText = "Note Text" + Me.colNote.MinimumWidth = 8 + Me.colNote.Name = "colNote" + Me.colNote.Width = 220 + ' + 'colColName + ' + Me.colColName.HeaderText = "Column Expression(s)" + Me.colColName.MinimumWidth = 8 + Me.colColName.Name = "colColName" + Me.colColName.Width = 140 + ' + 'colRows + ' + Me.colRows.HeaderText = "Row Expression(s)" + Me.colRows.MinimumWidth = 8 + Me.colRows.Name = "colRows" + Me.colRows.Width = 140 + ' 'lblFooterNotes ' Me.lblFooterNotes.AutoSize = True - Me.lblFooterNotes.Location = New System.Drawing.Point(15, 9) - Me.lblFooterNotes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFooterNotes.Location = New System.Drawing.Point(10, 6) Me.lblFooterNotes.Name = "lblFooterNotes" - Me.lblFooterNotes.Size = New System.Drawing.Size(112, 20) + Me.lblFooterNotes.Size = New System.Drawing.Size(74, 13) Me.lblFooterNotes.TabIndex = 4 Me.lblFooterNotes.Text = "Footers notes:" ' @@ -197,10 +203,9 @@ Partial Class sdgTableOptions ' Me.tbpSourceNotes.Controls.Add(Me.dataGridViewSourceNotes) Me.tbpSourceNotes.Controls.Add(Me.lblSourceNotes) - Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 29) - Me.tbpSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(874, 409) + Me.tbpSourceNotes.Size = New System.Drawing.Size(580, 261) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -211,11 +216,10 @@ Partial Class sdgTableOptions Me.dataGridViewSourceNotes.AllowUserToDeleteRows = False Me.dataGridViewSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridViewSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1}) - Me.dataGridViewSourceNotes.Location = New System.Drawing.Point(12, 37) - Me.dataGridViewSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dataGridViewSourceNotes.Location = New System.Drawing.Point(7, 24) Me.dataGridViewSourceNotes.Name = "dataGridViewSourceNotes" Me.dataGridViewSourceNotes.RowHeadersWidth = 62 - Me.dataGridViewSourceNotes.Size = New System.Drawing.Size(519, 231) + Me.dataGridViewSourceNotes.Size = New System.Drawing.Size(569, 150) Me.dataGridViewSourceNotes.TabIndex = 7 ' 'DataGridViewTextBoxColumn1 @@ -228,43 +232,12 @@ Partial Class sdgTableOptions 'lblSourceNotes ' Me.lblSourceNotes.AutoSize = True - Me.lblSourceNotes.Location = New System.Drawing.Point(7, 12) - Me.lblSourceNotes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSourceNotes.Location = New System.Drawing.Point(5, 8) Me.lblSourceNotes.Name = "lblSourceNotes" - Me.lblSourceNotes.Size = New System.Drawing.Size(112, 20) + Me.lblSourceNotes.Size = New System.Drawing.Size(74, 13) Me.lblSourceNotes.TabIndex = 6 Me.lblSourceNotes.Text = "Footers notes:" ' - 'tbpColumns - ' - Me.tbpColumns.Location = New System.Drawing.Point(4, 29) - Me.tbpColumns.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(874, 409) - Me.tbpColumns.TabIndex = 5 - Me.tbpColumns.Text = "Columns" - Me.tbpColumns.UseVisualStyleBackColor = True - ' - 'tbpRows - ' - Me.tbpRows.Location = New System.Drawing.Point(4, 29) - Me.tbpRows.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(874, 409) - Me.tbpRows.TabIndex = 7 - Me.tbpRows.Text = "Rows" - Me.tbpRows.UseVisualStyleBackColor = True - ' - 'tbpCells - ' - Me.tbpCells.Location = New System.Drawing.Point(4, 29) - Me.tbpCells.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(874, 409) - Me.tbpCells.TabIndex = 8 - Me.tbpCells.Text = "Cells" - Me.tbpCells.UseVisualStyleBackColor = True - ' 'tbpThemes ' Me.tbpThemes.Controls.Add(Me.ucrInputSelectThemes) @@ -272,10 +245,9 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) - Me.tbpThemes.Location = New System.Drawing.Point(4, 29) - Me.tbpThemes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(874, 409) + Me.tbpThemes.Size = New System.Drawing.Size(580, 261) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -286,18 +258,17 @@ Partial Class sdgTableOptions Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 Me.ucrInputSelectThemes.IsReadOnly = False - Me.ucrInputSelectThemes.Location = New System.Drawing.Point(236, 45) - Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" - Me.ucrInputSelectThemes.Size = New System.Drawing.Size(252, 32) + Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) Me.ucrInputSelectThemes.TabIndex = 3 ' 'cmdManualTheme ' - Me.cmdManualTheme.Location = New System.Drawing.Point(236, 91) - Me.cmdManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.cmdManualTheme.Location = New System.Drawing.Point(157, 59) Me.cmdManualTheme.Name = "cmdManualTheme" - Me.cmdManualTheme.Size = New System.Drawing.Size(252, 32) + Me.cmdManualTheme.Size = New System.Drawing.Size(168, 21) Me.cmdManualTheme.TabIndex = 2 Me.cmdManualTheme.Text = "Themes Sub Dialog" Me.cmdManualTheme.UseVisualStyleBackColor = True @@ -306,10 +277,9 @@ Partial Class sdgTableOptions ' Me.rdoSelectTheme.AutoSize = True Me.rdoSelectTheme.Checked = True - Me.rdoSelectTheme.Location = New System.Drawing.Point(33, 48) - Me.rdoSelectTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) Me.rdoSelectTheme.Name = "rdoSelectTheme" - Me.rdoSelectTheme.Size = New System.Drawing.Size(132, 24) + Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) Me.rdoSelectTheme.TabIndex = 0 Me.rdoSelectTheme.TabStop = True Me.rdoSelectTheme.Text = "Select Theme" @@ -318,10 +288,9 @@ Partial Class sdgTableOptions 'rdoManualTheme ' Me.rdoManualTheme.AutoSize = True - Me.rdoManualTheme.Location = New System.Drawing.Point(33, 94) - Me.rdoManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) Me.rdoManualTheme.Name = "rdoManualTheme" - Me.rdoManualTheme.Size = New System.Drawing.Size(139, 24) + Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) Me.rdoManualTheme.TabIndex = 1 Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True @@ -329,50 +298,29 @@ Partial Class sdgTableOptions 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(18, 25) - Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" - Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(524, 108) + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) Me.ucrPnlThemesPanel.TabIndex = 4 ' 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(258, 460) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(172, 299) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(336, 45) + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'colNote - ' - Me.colNote.HeaderText = "Note Text" - Me.colNote.MinimumWidth = 8 - Me.colNote.Name = "colNote" - Me.colNote.Width = 272 - ' - 'colColName - ' - Me.colColName.HeaderText = "Column Expression(s)" - Me.colColName.MinimumWidth = 8 - Me.colColName.Name = "colColName" - Me.colColName.Width = 134 - ' - 'colRows - ' - Me.colRows.HeaderText = "Row Expression(s)" - Me.colRows.MinimumWidth = 8 - Me.colRows.Name = "colRows" - Me.colRows.Width = 162 - ' 'sdgTableOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(897, 511) + Me.ClientSize = New System.Drawing.Size(598, 332) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgTableOptions" Me.Text = "Table Options" Me.tbpFormatOptions.ResumeLayout(False) @@ -396,7 +344,6 @@ Partial Class sdgTableOptions Friend WithEvents tbpHeader As TabPage Friend WithEvents tbpFooters As TabPage Friend WithEvents tbpSourceNotes As TabPage - Friend WithEvents tbpColumns As TabPage Friend WithEvents tbpThemes As TabPage Friend WithEvents ucrInputSelectThemes As ucrInputComboBox Friend WithEvents cmdManualTheme As Button @@ -407,8 +354,6 @@ Partial Class sdgTableOptions Friend WithEvents ucrInputHeaderTitle As ucrInputTextBox Friend WithEvents lblHeaderSubtitle As Label Friend WithEvents lblHeaderTitle As Label - Friend WithEvents tbpRows As TabPage - Friend WithEvents tbpCells As TabPage Friend WithEvents btnHeaderSubTitleFormat As Button Friend WithEvents btnHeaderTitleFormat As Button Friend WithEvents lblFooterNotes As Label diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index 0103ff2d1a7..762d67102e5 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -129,7 +129,4 @@ True - - True - \ No newline at end of file diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index 8ba552f43d6..aa511dbc212 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -18,11 +18,20 @@ Imports instat.Translations Public Class sdgTableOptions Private clsOperator As ROperator + Private clsTitleRFunction As RFunction + Private clsSubtitleRFunction As RFunction Private Sub sdgTableOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub + Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn + + SetHeaderOptionsInOperatorOnReturn(clsOperator) + + SetFootersRFunctions(clsOperator) + End Sub + ''' ''' An R operateor that has a parameter named "gt" set up. @@ -38,65 +47,114 @@ Public Class sdgTableOptions Exit Sub End If - SetHeaderControlsContents(clsOperator) + + + SetupHeaderRFunctionsInOperatorOnNew(clsOperator) + SetFootersControlsContents(clsOperator) - End Sub - Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn - SetHeaderRFunctions(clsOperator) - SetFootersRFunctions(clsOperator) End Sub '----------------------------------------- - ' Header controls - Private Sub SetHeaderControlsContents(clsOperator As ROperator) + ' HEADER CONTROLS - ucrInputHeaderTitle.SetName("") - ucrInputHeaderSubtitle.SetName("") + Private Sub SetupHeaderRFunctionsInOperatorOnNew(clsOperator As ROperator) - If Not clsOperator.ContainsParameter("tab_header") Then - Exit Sub - End If + ' Use existing header function it's in the operator, + ' if it's not in the operator create one and add it to the operator. + Dim clsHeaderRFunction As RFunction + If clsOperator.ContainsParameter("tab_header") Then + clsHeaderRFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure + clsTitleRFunction = clsHeaderRFunction.GetParameter("title").clsArgumentCodeStructure + clsSubtitleRFunction = clsHeaderRFunction.GetParameter("subtitle").clsArgumentCodeStructure + Else + ' create new header function + clsHeaderRFunction = New RFunction + clsHeaderRFunction.SetPackageName("gt") + clsHeaderRFunction.SetRCommand("tab_header") - Dim clsParam As RParameter = clsOperator.GetParameter("tab_header") - If clsParam.clsArgumentCodeStructure.ContainsParameter("title") Then - ucrInputHeaderTitle.SetName(GetStringValue(clsParam.clsArgumentCodeStructure.GetParameter("title").strArgumentValue, False)) + ' create new title function and add it to into the header function + clsTitleRFunction = GetNewHtmlDivRFunction() + clsTitleRFunction.AddParameter(strParameterValue:=Chr(34) & "" & Chr(34), iPosition:=0) + clsTitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewStyleRFunction(), iPosition:=1) + ' add the title function as the paramter value of header function + clsHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsTitleRFunction) + + 'create new sub title function and add it to into the header function + clsSubtitleRFunction = GetNewHtmlDivRFunction() + clsSubtitleRFunction.AddParameter(strParameterValue:=Chr(34) & "" & Chr(34), iPosition:=0) + clsSubtitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewStyleRFunction(), iPosition:=1) + ' add the subtitle function as the paramter value of header function + clsHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsSubtitleRFunction) + + ' add the header function into the operator + clsOperator.AddParameter("tab_header", clsRFunctionParameter:=clsHeaderRFunction, bIncludeArgumentName:=False) End If - If clsParam.clsArgumentCodeStructure.ContainsParameter("subtitle") Then - ucrInputHeaderSubtitle.SetName(GetStringValue(clsParam.clsArgumentCodeStructure.GetParameter("subtitle").strArgumentValue, False)) - End If + ' set the header controls values + ucrInputHeaderTitle.SetName(GetStringValue(clsTitleRFunction.clsParameters(0).strArgumentValue, False)) + ucrInputHeaderTitle.SetName(GetStringValue(clsSubtitleRFunction.clsParameters(0).strArgumentValue, False)) End Sub - Private Sub SetHeaderRFunctions(clsOperator As ROperator) + Private Sub SetHeaderOptionsInOperatorOnReturn(clsOperator As ROperator) + 'Remove any header additions if both title and sub title are empty + If ucrInputHeaderTitle.IsEmpty() AndAlso ucrInputHeaderSubtitle.IsEmpty() Then clsOperator.RemoveParameterByName("tab_header") Exit Sub End If + Dim clsHeaderRFunction As RFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure - Dim clsHeaderRFunction As New RFunction - - If clsOperator.ContainsParameter("tab_header") Then - clsHeaderRFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure + If ucrInputHeaderTitle.IsEmpty() Then + clsHeaderRFunction.RemoveParameterByName("title") Else - clsHeaderRFunction.SetPackageName("gt") - clsHeaderRFunction.SetRCommand("tab_header") - clsOperator.AddParameter("tab_header", clsRFunctionParameter:=clsHeaderRFunction, bIncludeArgumentName:=False) + clsTitleRFunction.AddParameter(strParameterValue:=GetStringValue(ucrInputHeaderTitle.GetText(), True), iPosition:=0) End If - If Not ucrInputHeaderTitle.IsEmpty() Then - clsHeaderRFunction.AddParameter("title", GetStringValue(ucrInputHeaderTitle.GetText(), True)) + If ucrInputHeaderSubtitle.IsEmpty() Then + clsHeaderRFunction.RemoveParameterByName("subtitle") + Else + clsSubtitleRFunction.AddParameter(strParameterValue:=GetStringValue(ucrInputHeaderSubtitle.GetText(), True), iPosition:=0) End If - If Not ucrInputHeaderSubtitle.IsEmpty() Then - clsHeaderRFunction.AddParameter("subtitle", GetStringValue(ucrInputHeaderSubtitle.GetText(), True)) - End If + End Sub + + Private Function GetNewHtmlDivRFunction() As RFunction + Dim clsHtmlDivRFunction As New RFunction + clsHtmlDivRFunction.SetPackageName("htmltools") + clsHtmlDivRFunction.SetRCommand("tags$div") + Return clsHtmlDivRFunction + End Function + + Private Function GetNewStyleRFunction() As RFunction + Dim clsStyleRFunction As New RFunction + clsStyleRFunction.SetPackageName("htmltools") + clsStyleRFunction.SetRCommand("css") + Return clsStyleRFunction + End Function + + Private Sub ucrInputHeaderTitle_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitle.ControlContentsChanged + btnHeaderTitleFormat.Enabled = Not ucrInputHeaderTitle.IsEmpty + End Sub + + Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click + sdgTableOptionsTextFormat.Setup(clsTitleRFunction.GetParameter("style").clsArgumentCodeStructure) + sdgTableOptionsTextFormat.Show(Me) + End Sub + + Private Sub ucrInputHeaderSubtitle_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderSubtitle.ControlContentsChanged + btnHeaderSubTitleFormat.Enabled = Not ucrInputHeaderSubtitle.IsEmpty + End Sub + + Private Sub btnHeaderSubTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click + sdgTableOptionsTextFormat.Setup(clsSubtitleRFunction.GetParameter("style").clsArgumentCodeStructure) + sdgTableOptionsTextFormat.Show(Me) End Sub '----------------------------------------- '----------------------------------------- - ' Footer controls + ' FOOTER CONTROLS Private Sub SetFootersControlsContents(clsOperator As ROperator) dataGridFooterNotes.Rows.Clear() @@ -183,18 +241,6 @@ Public Class sdgTableOptions End Sub - Private Sub sdgTableOptions_KeyPress(sender As Object, e As KeyPressEventArgs) Handles Me.KeyPress - - End Sub - - Private Sub sdgTableOptions_Leave(sender As Object, e As EventArgs) Handles Me.Leave - - End Sub - - Private Sub dataGridFooterNotes_CellValueChanged(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellValueChanged - - End Sub - Private Sub dataGridFooterNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellEndEdit AddNewEmptyRowAfterUserInput() End Sub @@ -208,6 +254,9 @@ Public Class sdgTableOptions '----------------------------------------- Private Function GetStringValue(str As String, bwithQuotes As Boolean) As String + If String.IsNullOrEmpty(str) Then + str = "" + End If Return If(bwithQuotes, """" & str & """", str.Replace("""", "")) End Function diff --git a/instat/sdgTableOptionsTextFormat.Designer.vb b/instat/sdgTableOptionsTextFormat.Designer.vb new file mode 100644 index 00000000000..4b3f7a130eb --- /dev/null +++ b/instat/sdgTableOptionsTextFormat.Designer.vb @@ -0,0 +1,372 @@ + _ +Partial Class sdgTableOptionsTextFormat + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblFontFamily = New System.Windows.Forms.Label() + Me.lblFontStyle = New System.Windows.Forms.Label() + Me.lblFontSize = New System.Windows.Forms.Label() + Me.lblUnderlineColor = New System.Windows.Forms.Label() + Me.lblUnderlineStyle = New System.Windows.Forms.Label() + Me.lblAlignHorizontal = New System.Windows.Forms.Label() + Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.ucrCboFontStyle = New instat.ucrInputComboBox() + Me.ucrCboFontFamily = New instat.ucrInputComboBox() + Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.ucrCboUnderlineStyle = New instat.ucrInputComboBox() + Me.GroupBox3 = New System.Windows.Forms.GroupBox() + Me.ucrCboAlignHorizontal = New instat.ucrInputComboBox() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.ucrCboFontWeight = New instat.ucrInputComboBox() + Me.lblFontWeight = New System.Windows.Forms.Label() + Me.ucrTxtFontSize = New instat.ucrInputTextBox() + Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + Me.ucrCboColorText = New instat.ucrColors() + Me.ucrCboColorBackground = New instat.ucrColors() + Me.ucrCboUnderLineColor = New instat.ucrColors() + Me.lblUnderlineType = New System.Windows.Forms.Label() + Me.ucrCboUnderlineType = New instat.ucrInputComboBox() + Me.GroupBox1.SuspendLayout() + Me.GroupBox2.SuspendLayout() + Me.GroupBox3.SuspendLayout() + Me.GroupBox4.SuspendLayout() + Me.SuspendLayout() + ' + 'lblFontFamily + ' + Me.lblFontFamily.AutoSize = True + Me.lblFontFamily.Location = New System.Drawing.Point(6, 19) + Me.lblFontFamily.Name = "lblFontFamily" + Me.lblFontFamily.Size = New System.Drawing.Size(69, 13) + Me.lblFontFamily.TabIndex = 6 + Me.lblFontFamily.Text = "Type (family):" + ' + 'lblFontStyle + ' + Me.lblFontStyle.AutoSize = True + Me.lblFontStyle.Location = New System.Drawing.Point(151, 19) + Me.lblFontStyle.Name = "lblFontStyle" + Me.lblFontStyle.Size = New System.Drawing.Size(33, 13) + Me.lblFontStyle.TabIndex = 8 + Me.lblFontStyle.Text = "Style:" + ' + 'lblFontSize + ' + Me.lblFontSize.AutoSize = True + Me.lblFontSize.Location = New System.Drawing.Point(444, 19) + Me.lblFontSize.Name = "lblFontSize" + Me.lblFontSize.Size = New System.Drawing.Size(30, 13) + Me.lblFontSize.TabIndex = 10 + Me.lblFontSize.Text = "Size:" + ' + 'lblUnderlineColor + ' + Me.lblUnderlineColor.AutoSize = True + Me.lblUnderlineColor.Location = New System.Drawing.Point(300, 16) + Me.lblUnderlineColor.Name = "lblUnderlineColor" + Me.lblUnderlineColor.Size = New System.Drawing.Size(34, 13) + Me.lblUnderlineColor.TabIndex = 16 + Me.lblUnderlineColor.Text = "Color:" + ' + 'lblUnderlineStyle + ' + Me.lblUnderlineStyle.AutoSize = True + Me.lblUnderlineStyle.Location = New System.Drawing.Point(151, 16) + Me.lblUnderlineStyle.Name = "lblUnderlineStyle" + Me.lblUnderlineStyle.Size = New System.Drawing.Size(33, 13) + Me.lblUnderlineStyle.TabIndex = 14 + Me.lblUnderlineStyle.Text = "Style:" + ' + 'lblAlignHorizontal + ' + Me.lblAlignHorizontal.AutoSize = True + Me.lblAlignHorizontal.Location = New System.Drawing.Point(6, 20) + Me.lblAlignHorizontal.Name = "lblAlignHorizontal" + Me.lblAlignHorizontal.Size = New System.Drawing.Size(57, 13) + Me.lblAlignHorizontal.TabIndex = 18 + Me.lblAlignHorizontal.Text = "Horizontal:" + ' + 'GroupBox1 + ' + Me.GroupBox1.Controls.Add(Me.ucrTxtFontSize) + Me.GroupBox1.Controls.Add(Me.ucrCboFontWeight) + Me.GroupBox1.Controls.Add(Me.lblFontWeight) + Me.GroupBox1.Controls.Add(Me.lblFontFamily) + Me.GroupBox1.Controls.Add(Me.ucrCboFontStyle) + Me.GroupBox1.Controls.Add(Me.ucrCboFontFamily) + Me.GroupBox1.Controls.Add(Me.lblFontStyle) + Me.GroupBox1.Controls.Add(Me.lblFontSize) + Me.GroupBox1.Location = New System.Drawing.Point(7, 7) + Me.GroupBox1.Name = "GroupBox1" + Me.GroupBox1.Size = New System.Drawing.Size(594, 68) + Me.GroupBox1.TabIndex = 21 + Me.GroupBox1.TabStop = False + Me.GroupBox1.Text = "Font" + ' + 'ucrCboFontStyle + ' + Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True + Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontStyle.GetSetSelectedIndex = -1 + Me.ucrCboFontStyle.IsReadOnly = False + Me.ucrCboFontStyle.Location = New System.Drawing.Point(154, 35) + Me.ucrCboFontStyle.Name = "ucrCboFontStyle" + Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontStyle.TabIndex = 7 + ' + 'ucrCboFontFamily + ' + Me.ucrCboFontFamily.AddQuotesIfUnrecognised = True + Me.ucrCboFontFamily.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontFamily.GetSetSelectedIndex = -1 + Me.ucrCboFontFamily.IsReadOnly = False + Me.ucrCboFontFamily.Location = New System.Drawing.Point(9, 35) + Me.ucrCboFontFamily.Name = "ucrCboFontFamily" + Me.ucrCboFontFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontFamily.TabIndex = 5 + ' + 'GroupBox2 + ' + Me.GroupBox2.Controls.Add(Me.lblUnderlineType) + Me.GroupBox2.Controls.Add(Me.ucrCboUnderlineType) + Me.GroupBox2.Controls.Add(Me.ucrCboUnderLineColor) + Me.GroupBox2.Controls.Add(Me.lblUnderlineStyle) + Me.GroupBox2.Controls.Add(Me.ucrCboUnderlineStyle) + Me.GroupBox2.Controls.Add(Me.lblUnderlineColor) + Me.GroupBox2.Location = New System.Drawing.Point(7, 168) + Me.GroupBox2.Name = "GroupBox2" + Me.GroupBox2.Size = New System.Drawing.Size(594, 68) + Me.GroupBox2.TabIndex = 22 + Me.GroupBox2.TabStop = False + Me.GroupBox2.Text = "Underline" + ' + 'ucrCboUnderlineStyle + ' + Me.ucrCboUnderlineStyle.AddQuotesIfUnrecognised = True + Me.ucrCboUnderlineStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderlineStyle.GetSetSelectedIndex = -1 + Me.ucrCboUnderlineStyle.IsReadOnly = False + Me.ucrCboUnderlineStyle.Location = New System.Drawing.Point(154, 32) + Me.ucrCboUnderlineStyle.Name = "ucrCboUnderlineStyle" + Me.ucrCboUnderlineStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderlineStyle.TabIndex = 13 + ' + 'GroupBox3 + ' + Me.GroupBox3.Controls.Add(Me.lblAlignHorizontal) + Me.GroupBox3.Controls.Add(Me.ucrCboAlignHorizontal) + Me.GroupBox3.Location = New System.Drawing.Point(7, 250) + Me.GroupBox3.Name = "GroupBox3" + Me.GroupBox3.Size = New System.Drawing.Size(594, 65) + Me.GroupBox3.TabIndex = 23 + Me.GroupBox3.TabStop = False + Me.GroupBox3.Text = "Alignment" + ' + 'ucrCboAlignHorizontal + ' + Me.ucrCboAlignHorizontal.AddQuotesIfUnrecognised = True + Me.ucrCboAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboAlignHorizontal.GetSetSelectedIndex = -1 + Me.ucrCboAlignHorizontal.IsReadOnly = False + Me.ucrCboAlignHorizontal.Location = New System.Drawing.Point(9, 36) + Me.ucrCboAlignHorizontal.Name = "ucrCboAlignHorizontal" + Me.ucrCboAlignHorizontal.Size = New System.Drawing.Size(137, 21) + Me.ucrCboAlignHorizontal.TabIndex = 17 + ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(220, 338) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 4 + ' + 'ucrCboFontWeight + ' + Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True + Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontWeight.GetSetSelectedIndex = -1 + Me.ucrCboFontWeight.IsReadOnly = False + Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) + Me.ucrCboFontWeight.Name = "ucrCboFontWeight" + Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontWeight.TabIndex = 13 + ' + 'lblFontWeight + ' + Me.lblFontWeight.AutoSize = True + Me.lblFontWeight.Location = New System.Drawing.Point(297, 19) + Me.lblFontWeight.Name = "lblFontWeight" + Me.lblFontWeight.Size = New System.Drawing.Size(44, 13) + Me.lblFontWeight.TabIndex = 14 + Me.lblFontWeight.Text = "Weight:" + ' + 'ucrTxtFontSize + ' + Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True + Me.ucrTxtFontSize.AutoSize = True + Me.ucrTxtFontSize.IsMultiline = False + Me.ucrTxtFontSize.IsReadOnly = False + Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) + Me.ucrTxtFontSize.Name = "ucrTxtFontSize" + Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) + Me.ucrTxtFontSize.TabIndex = 15 + ' + 'GroupBox4 + ' + Me.GroupBox4.Controls.Add(Me.ucrCboColorBackground) + Me.GroupBox4.Controls.Add(Me.ucrCboColorText) + Me.GroupBox4.Controls.Add(Me.Label1) + Me.GroupBox4.Controls.Add(Me.Label2) + Me.GroupBox4.Location = New System.Drawing.Point(7, 85) + Me.GroupBox4.Name = "GroupBox4" + Me.GroupBox4.Size = New System.Drawing.Size(594, 68) + Me.GroupBox4.TabIndex = 24 + Me.GroupBox4.TabStop = False + Me.GroupBox4.Text = "Colour" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(6, 21) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(31, 13) + Me.Label1.TabIndex = 14 + Me.Label1.Text = "Text:" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(155, 21) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(68, 13) + Me.Label2.TabIndex = 16 + Me.Label2.Text = "Background:" + ' + 'ucrCboColorText + ' + Me.ucrCboColorText.AddQuotesIfUnrecognised = True + Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorText.GetSetSelectedIndex = -1 + Me.ucrCboColorText.IsReadOnly = False + Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) + Me.ucrCboColorText.Name = "ucrCboColorText" + Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorText.TabIndex = 17 + ' + 'ucrCboColorBackground + ' + Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True + Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorBackground.GetSetSelectedIndex = -1 + Me.ucrCboColorBackground.IsReadOnly = False + Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) + Me.ucrCboColorBackground.Name = "ucrCboColorBackground" + Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorBackground.TabIndex = 18 + ' + 'ucrCboUnderLineColor + ' + Me.ucrCboUnderLineColor.AddQuotesIfUnrecognised = True + Me.ucrCboUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderLineColor.GetSetSelectedIndex = -1 + Me.ucrCboUnderLineColor.IsReadOnly = False + Me.ucrCboUnderLineColor.Location = New System.Drawing.Point(302, 32) + Me.ucrCboUnderLineColor.Name = "ucrCboUnderLineColor" + Me.ucrCboUnderLineColor.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderLineColor.TabIndex = 19 + ' + 'lblUnderlineType + ' + Me.lblUnderlineType.AutoSize = True + Me.lblUnderlineType.Location = New System.Drawing.Point(6, 16) + Me.lblUnderlineType.Name = "lblUnderlineType" + Me.lblUnderlineType.Size = New System.Drawing.Size(34, 13) + Me.lblUnderlineType.TabIndex = 21 + Me.lblUnderlineType.Text = "Type:" + ' + 'ucrCboUnderlineType + ' + Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True + Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 + Me.ucrCboUnderlineType.IsReadOnly = False + Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 32) + Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" + Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderlineType.TabIndex = 20 + ' + 'sdgTableOptionsTextFormat + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(608, 372) + Me.Controls.Add(Me.GroupBox4) + Me.Controls.Add(Me.GroupBox3) + Me.Controls.Add(Me.GroupBox2) + Me.Controls.Add(Me.GroupBox1) + Me.Controls.Add(Me.ucrBaseSubdialog) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgTableOptionsTextFormat" + Me.Text = "Text Format" + Me.GroupBox1.ResumeLayout(False) + Me.GroupBox1.PerformLayout() + Me.GroupBox2.ResumeLayout(False) + Me.GroupBox2.PerformLayout() + Me.GroupBox3.ResumeLayout(False) + Me.GroupBox3.PerformLayout() + Me.GroupBox4.ResumeLayout(False) + Me.GroupBox4.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue + Friend WithEvents ucrCboFontFamily As ucrInputComboBox + Friend WithEvents lblFontFamily As Label + Friend WithEvents lblFontStyle As Label + Friend WithEvents ucrCboFontStyle As ucrInputComboBox + Friend WithEvents lblFontSize As Label + Friend WithEvents lblUnderlineColor As Label + Friend WithEvents lblUnderlineStyle As Label + Friend WithEvents ucrCboUnderlineStyle As ucrInputComboBox + Friend WithEvents lblAlignHorizontal As Label + Friend WithEvents ucrCboAlignHorizontal As ucrInputComboBox + Friend WithEvents GroupBox1 As GroupBox + Friend WithEvents GroupBox2 As GroupBox + Friend WithEvents GroupBox3 As GroupBox + Friend WithEvents ucrCboFontWeight As ucrInputComboBox + Friend WithEvents lblFontWeight As Label + Friend WithEvents ucrTxtFontSize As ucrInputTextBox + Friend WithEvents GroupBox4 As GroupBox + Friend WithEvents ucrCboColorText As ucrColors + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label + Friend WithEvents ucrCboColorBackground As ucrColors + Friend WithEvents ucrCboUnderLineColor As ucrColors + Friend WithEvents lblUnderlineType As Label + Friend WithEvents ucrCboUnderlineType As ucrInputComboBox +End Class diff --git a/instat/sdgTableTextFormatOptions.resx b/instat/sdgTableOptionsTextFormat.resx similarity index 100% rename from instat/sdgTableTextFormatOptions.resx rename to instat/sdgTableOptionsTextFormat.resx diff --git a/instat/sdgTableOptionsTextFormat.vb b/instat/sdgTableOptionsTextFormat.vb new file mode 100644 index 00000000000..2ecfb9e164c --- /dev/null +++ b/instat/sdgTableOptionsTextFormat.vb @@ -0,0 +1,136 @@ +Imports instat.Translations +Public Class sdgTableOptionsTextFormat + + Private clsParameter As RParameter + + Private bDialogInitised As Boolean = False + + + Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + + Dim dctFontFamily As New Dictionary(Of String, String) + dctFontFamily.Add("None", "NULL") + dctFontFamily.Add("Arial (sans-serif)", Chr(34) & "Arial, sans-serif" & Chr(34)) + dctFontFamily.Add("Verdana (sans-serif)", Chr(34) & "Verdana, sans-serif" & Chr(34)) + dctFontFamily.Add("Tahoma", Chr(34) & "Tahoma, sans-serif" & Chr(34)) + dctFontFamily.Add("Trebuchet MS", Chr(34) & "'Trebuchet MS', sans-serif" & Chr(34)) + dctFontFamily.Add("Times New Roman (serif)", Chr(34) & "'Times New Roman', serif" & Chr(34)) + dctFontFamily.Add("Georgia (serif)", Chr(34) & "Georgia, serif" & Chr(34)) + dctFontFamily.Add("Garamond (serif)", Chr(34) & "Garamond, serif" & Chr(34)) + ucrCboFontFamily.SetDropDownStyleAsNonEditable() + ucrCboFontFamily.SetParameter(New RParameter("font.family")) + ucrCboFontFamily.SetItems(dctFontFamily) + ucrCboFontFamily.SetRDefault("NULL") + + Dim dctFontStyle As New Dictionary(Of String, String) + dctFontStyle.Add("None", "NULL") + dctFontStyle.Add("Normal", Chr(34) & "normal" & Chr(34)) + dctFontStyle.Add("Italic", Chr(34) & "italic" & Chr(34)) + dctFontStyle.Add("Oblique", Chr(34) & "oblique" & Chr(34)) + + ucrCboFontStyle.SetDropDownStyleAsNonEditable() + ucrCboFontStyle.SetParameter(New RParameter("font.style")) + ucrCboFontStyle.SetItems(dctFontStyle) + ucrCboFontStyle.SetRDefault("NULL") + + + Dim dctFontWeight As New Dictionary(Of String, String) + dctFontWeight.Add("None", "NULL") + dctFontWeight.Add("Normal", Chr(34) & "normal" & Chr(34)) + dctFontWeight.Add("Lighter", Chr(34) & "lighter" & Chr(34)) + dctFontWeight.Add("Bold", Chr(34) & "bold" & Chr(34)) + + ucrCboFontWeight.SetDropDownStyleAsNonEditable() + ucrCboFontWeight.SetParameter(New RParameter("font.weight")) + ucrCboFontWeight.SetItems(dctFontWeight) + ucrCboFontWeight.SetRDefault("NULL") + + ucrTxtFontSize.SetParameter(New RParameter("font.size")) + ucrTxtFontSize.SetRDefault(Chr(34) & "" & Chr(34)) + + ucrCboColorText.SetDropDownStyleAsNonEditable() + ucrCboColorText.SetParameter(New RParameter("color")) + ucrCboColorText.SetColours() + ucrCboColorText.SetRDefault("NULL") + + ucrCboColorBackground.SetDropDownStyleAsNonEditable() + ucrCboColorBackground.SetParameter(New RParameter("background.color")) + ucrCboColorBackground.SetColours() + ucrCboColorBackground.SetRDefault("NULL") + + Dim dctUnderlineType As New Dictionary(Of String, String) + dctUnderlineType.Add("None", "NULL") + dctUnderlineType.Add("Underline", Chr(34) & "underline" & Chr(34)) + dctUnderlineType.Add("Overline", Chr(34) & "overline" & Chr(34)) + dctUnderlineType.Add("Underline Overline", Chr(34) & "underline overline" & Chr(34)) + dctUnderlineType.Add("Line-through", Chr(34) & "line-through" & Chr(34)) + ucrCboUnderlineType.SetDropDownStyleAsNonEditable() + ucrCboUnderlineType.SetParameter(New RParameter("text.decoration.line")) + ucrCboUnderlineType.SetItems(dctUnderlineType) + ucrCboUnderlineType.SetRDefault("NULL") + + Dim dctUnderlineStyle As New Dictionary(Of String, String) + dctUnderlineStyle.Add("None", "NULL") + dctUnderlineStyle.Add("Solid", Chr(34) & "solid" & Chr(34)) + dctUnderlineStyle.Add("Double", Chr(34) & "double" & Chr(34)) + dctUnderlineStyle.Add("Dotted", Chr(34) & "dotted" & Chr(34)) + dctUnderlineStyle.Add("Dashed", Chr(34) & "dashed" & Chr(34)) + dctUnderlineStyle.Add("Wavy", Chr(34) & "wavy" & Chr(34)) + ucrCboUnderlineStyle.SetDropDownStyleAsNonEditable() + ucrCboUnderlineStyle.SetParameter(New RParameter("text.decoration.style")) + ucrCboUnderlineStyle.SetItems(dctUnderlineStyle) + ucrCboUnderlineStyle.SetRDefault("NULL") + + ucrCboUnderLineColor.SetDropDownStyleAsNonEditable() + ucrCboUnderLineColor.SetParameter(New RParameter("text.decoration.color")) + ucrCboUnderLineColor.SetColours() + ucrCboUnderLineColor.SetRDefault("NULL") + + + Dim dctAlign As New Dictionary(Of String, String) + dctAlign.Add("None", "NULL") + dctAlign.Add("Center", Chr(34) & "center" & Chr(34)) + dctAlign.Add("Left", Chr(34) & "left" & Chr(34)) + dctAlign.Add("Right", Chr(34) & "right" & Chr(34)) + dctAlign.Add("Justify", Chr(34) & "justify" & Chr(34)) + ucrCboAlignHorizontal.SetDropDownStyleAsNonEditable() + ucrCboAlignHorizontal.SetParameter(New RParameter("text.align")) + ucrCboAlignHorizontal.SetItems(dctAlign) + ucrCboAlignHorizontal.SetRDefault("NULL") + + End Sub + + Public Sub Setup(clsNewStyleRFunction As RFunction) + + If Not bDialogInitised Then + InitialiseDialog() + bDialogInitised = True + End If + + ucrCboFontFamily.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboFontStyle.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboFontWeight.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrTxtFontSize.SetRCode(clsNewStyleRFunction, bReset:=True) + + ucrCboColorText.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboColorBackground.SetRCode(clsNewStyleRFunction, bReset:=True) + + ucrCboUnderlineType.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboUnderlineStyle.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=True) + + ucrCboAlignHorizontal.SetRCode(clsNewStyleRFunction, bReset:=True) + + + + End Sub + + + + + +End Class \ No newline at end of file diff --git a/instat/sdgTableTextFormatOptions.Designer.vb b/instat/sdgTableTextFormatOptions.Designer.vb deleted file mode 100644 index f14cc2c1f55..00000000000 --- a/instat/sdgTableTextFormatOptions.Designer.vb +++ /dev/null @@ -1,259 +0,0 @@ - _ -Partial Class sdgTableTextFormatOptions - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.ucrCboFontType = New instat.ucrInputComboBox() - Me.lblFontType = New System.Windows.Forms.Label() - Me.lblFontStyle = New System.Windows.Forms.Label() - Me.ucrCboFontStyle = New instat.ucrInputComboBox() - Me.lblFontSize = New System.Windows.Forms.Label() - Me.ucrFontSize = New instat.ucrInputComboBox() - Me.lblUnderlineColor = New System.Windows.Forms.Label() - Me.ucrUnderLineColor = New instat.ucrInputComboBox() - Me.lblUnderlineStyle = New System.Windows.Forms.Label() - Me.ucrUnderlineStyle = New instat.ucrInputComboBox() - Me.lblFontColor = New System.Windows.Forms.Label() - Me.ucrFontColor = New instat.ucrInputComboBox() - Me.lblAlignVertical = New System.Windows.Forms.Label() - Me.ucrAlignVertical = New instat.ucrInputComboBox() - Me.lblAlignHorizontal = New System.Windows.Forms.Label() - Me.ucrAlignHorizontal = New instat.ucrInputComboBox() - Me.SuspendLayout() - ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(110, 185) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) - Me.ucrBaseSubdialog.TabIndex = 4 - ' - 'ucrCboFontType - ' - Me.ucrCboFontType.AddQuotesIfUnrecognised = True - Me.ucrCboFontType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontType.GetSetSelectedIndex = -1 - Me.ucrCboFontType.IsReadOnly = False - Me.ucrCboFontType.Location = New System.Drawing.Point(10, 24) - Me.ucrCboFontType.Name = "ucrCboFontType" - Me.ucrCboFontType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontType.TabIndex = 5 - ' - 'lblFontType - ' - Me.lblFontType.AutoSize = True - Me.lblFontType.Location = New System.Drawing.Point(7, 8) - Me.lblFontType.Name = "lblFontType" - Me.lblFontType.Size = New System.Drawing.Size(54, 13) - Me.lblFontType.TabIndex = 6 - Me.lblFontType.Text = "Font type:" - ' - 'lblFontStyle - ' - Me.lblFontStyle.AutoSize = True - Me.lblFontStyle.Location = New System.Drawing.Point(160, 9) - Me.lblFontStyle.Name = "lblFontStyle" - Me.lblFontStyle.Size = New System.Drawing.Size(55, 13) - Me.lblFontStyle.TabIndex = 8 - Me.lblFontStyle.Text = "Font style:" - ' - 'ucrCboFontStyle - ' - Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True - Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontStyle.GetSetSelectedIndex = -1 - Me.ucrCboFontStyle.IsReadOnly = False - Me.ucrCboFontStyle.Location = New System.Drawing.Point(163, 25) - Me.ucrCboFontStyle.Name = "ucrCboFontStyle" - Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontStyle.TabIndex = 7 - ' - 'lblFontSize - ' - Me.lblFontSize.AutoSize = True - Me.lblFontSize.Location = New System.Drawing.Point(314, 9) - Me.lblFontSize.Name = "lblFontSize" - Me.lblFontSize.Size = New System.Drawing.Size(52, 13) - Me.lblFontSize.TabIndex = 10 - Me.lblFontSize.Text = "Font size:" - ' - 'ucrFontSize - ' - Me.ucrFontSize.AddQuotesIfUnrecognised = True - Me.ucrFontSize.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFontSize.GetSetSelectedIndex = -1 - Me.ucrFontSize.IsReadOnly = False - Me.ucrFontSize.Location = New System.Drawing.Point(317, 25) - Me.ucrFontSize.Name = "ucrFontSize" - Me.ucrFontSize.Size = New System.Drawing.Size(137, 21) - Me.ucrFontSize.TabIndex = 9 - ' - 'lblUnderlineColor - ' - Me.lblUnderlineColor.AutoSize = True - Me.lblUnderlineColor.Location = New System.Drawing.Point(314, 63) - Me.lblUnderlineColor.Name = "lblUnderlineColor" - Me.lblUnderlineColor.Size = New System.Drawing.Size(81, 13) - Me.lblUnderlineColor.TabIndex = 16 - Me.lblUnderlineColor.Text = "Underline color:" - ' - 'ucrUnderLineColor - ' - Me.ucrUnderLineColor.AddQuotesIfUnrecognised = True - Me.ucrUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrUnderLineColor.GetSetSelectedIndex = -1 - Me.ucrUnderLineColor.IsReadOnly = False - Me.ucrUnderLineColor.Location = New System.Drawing.Point(317, 79) - Me.ucrUnderLineColor.Name = "ucrUnderLineColor" - Me.ucrUnderLineColor.Size = New System.Drawing.Size(137, 21) - Me.ucrUnderLineColor.TabIndex = 15 - ' - 'lblUnderlineStyle - ' - Me.lblUnderlineStyle.AutoSize = True - Me.lblUnderlineStyle.Location = New System.Drawing.Point(160, 63) - Me.lblUnderlineStyle.Name = "lblUnderlineStyle" - Me.lblUnderlineStyle.Size = New System.Drawing.Size(79, 13) - Me.lblUnderlineStyle.TabIndex = 14 - Me.lblUnderlineStyle.Text = "Underline style:" - ' - 'ucrUnderlineStyle - ' - Me.ucrUnderlineStyle.AddQuotesIfUnrecognised = True - Me.ucrUnderlineStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrUnderlineStyle.GetSetSelectedIndex = -1 - Me.ucrUnderlineStyle.IsReadOnly = False - Me.ucrUnderlineStyle.Location = New System.Drawing.Point(163, 79) - Me.ucrUnderlineStyle.Name = "ucrUnderlineStyle" - Me.ucrUnderlineStyle.Size = New System.Drawing.Size(137, 21) - Me.ucrUnderlineStyle.TabIndex = 13 - ' - 'lblFontColor - ' - Me.lblFontColor.AutoSize = True - Me.lblFontColor.Location = New System.Drawing.Point(7, 62) - Me.lblFontColor.Name = "lblFontColor" - Me.lblFontColor.Size = New System.Drawing.Size(57, 13) - Me.lblFontColor.TabIndex = 12 - Me.lblFontColor.Text = "Font color:" - ' - 'ucrFontColor - ' - Me.ucrFontColor.AddQuotesIfUnrecognised = True - Me.ucrFontColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFontColor.GetSetSelectedIndex = -1 - Me.ucrFontColor.IsReadOnly = False - Me.ucrFontColor.Location = New System.Drawing.Point(10, 78) - Me.ucrFontColor.Name = "ucrFontColor" - Me.ucrFontColor.Size = New System.Drawing.Size(137, 21) - Me.ucrFontColor.TabIndex = 11 - ' - 'lblAlignVertical - ' - Me.lblAlignVertical.AutoSize = True - Me.lblAlignVertical.Location = New System.Drawing.Point(160, 119) - Me.lblAlignVertical.Name = "lblAlignVertical" - Me.lblAlignVertical.Size = New System.Drawing.Size(70, 13) - Me.lblAlignVertical.TabIndex = 20 - Me.lblAlignVertical.Text = "Vertical align:" - ' - 'ucrAlignVertical - ' - Me.ucrAlignVertical.AddQuotesIfUnrecognised = True - Me.ucrAlignVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrAlignVertical.GetSetSelectedIndex = -1 - Me.ucrAlignVertical.IsReadOnly = False - Me.ucrAlignVertical.Location = New System.Drawing.Point(163, 135) - Me.ucrAlignVertical.Name = "ucrAlignVertical" - Me.ucrAlignVertical.Size = New System.Drawing.Size(137, 21) - Me.ucrAlignVertical.TabIndex = 19 - ' - 'lblAlignHorizontal - ' - Me.lblAlignHorizontal.AutoSize = True - Me.lblAlignHorizontal.Location = New System.Drawing.Point(7, 118) - Me.lblAlignHorizontal.Name = "lblAlignHorizontal" - Me.lblAlignHorizontal.Size = New System.Drawing.Size(82, 13) - Me.lblAlignHorizontal.TabIndex = 18 - Me.lblAlignHorizontal.Text = "Horizontal align:" - ' - 'ucrAlignHorizontal - ' - Me.ucrAlignHorizontal.AddQuotesIfUnrecognised = True - Me.ucrAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrAlignHorizontal.GetSetSelectedIndex = -1 - Me.ucrAlignHorizontal.IsReadOnly = False - Me.ucrAlignHorizontal.Location = New System.Drawing.Point(10, 134) - Me.ucrAlignHorizontal.Name = "ucrAlignHorizontal" - Me.ucrAlignHorizontal.Size = New System.Drawing.Size(137, 21) - Me.ucrAlignHorizontal.TabIndex = 17 - ' - 'sdgTableTextFormatOptions - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(470, 222) - Me.Controls.Add(Me.lblAlignVertical) - Me.Controls.Add(Me.ucrAlignVertical) - Me.Controls.Add(Me.lblAlignHorizontal) - Me.Controls.Add(Me.ucrAlignHorizontal) - Me.Controls.Add(Me.lblUnderlineColor) - Me.Controls.Add(Me.ucrUnderLineColor) - Me.Controls.Add(Me.lblUnderlineStyle) - Me.Controls.Add(Me.ucrUnderlineStyle) - Me.Controls.Add(Me.lblFontColor) - Me.Controls.Add(Me.ucrFontColor) - Me.Controls.Add(Me.lblFontSize) - Me.Controls.Add(Me.ucrFontSize) - Me.Controls.Add(Me.lblFontStyle) - Me.Controls.Add(Me.ucrCboFontStyle) - Me.Controls.Add(Me.lblFontType) - Me.Controls.Add(Me.ucrCboFontType) - Me.Controls.Add(Me.ucrBaseSubdialog) - Me.Name = "sdgTableTextFormatOptions" - Me.Text = "Text Format" - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue - Friend WithEvents ucrCboFontType As ucrInputComboBox - Friend WithEvents lblFontType As Label - Friend WithEvents lblFontStyle As Label - Friend WithEvents ucrCboFontStyle As ucrInputComboBox - Friend WithEvents lblFontSize As Label - Friend WithEvents ucrFontSize As ucrInputComboBox - Friend WithEvents lblUnderlineColor As Label - Friend WithEvents ucrUnderLineColor As ucrInputComboBox - Friend WithEvents lblUnderlineStyle As Label - Friend WithEvents ucrUnderlineStyle As ucrInputComboBox - Friend WithEvents lblFontColor As Label - Friend WithEvents ucrFontColor As ucrInputComboBox - Friend WithEvents lblAlignVertical As Label - Friend WithEvents ucrAlignVertical As ucrInputComboBox - Friend WithEvents lblAlignHorizontal As Label - Friend WithEvents ucrAlignHorizontal As ucrInputComboBox -End Class diff --git a/instat/sdgTableTextFormatOptions.vb b/instat/sdgTableTextFormatOptions.vb deleted file mode 100644 index 7386b668278..00000000000 --- a/instat/sdgTableTextFormatOptions.vb +++ /dev/null @@ -1,5 +0,0 @@ -Public Class sdgTableTextFormatOptions - Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load - - End Sub -End Class \ No newline at end of file diff --git a/instat/ucrColors.vb b/instat/ucrColors.vb index faa479b290f..fe3ddac174d 100644 --- a/instat/ucrColors.vb +++ b/instat/ucrColors.vb @@ -27,7 +27,7 @@ Public Class ucrColors ' Add any initialization after the InitializeComponent() call. If dctColours.Count = 0 Then - dctColours.Add("NULL", "NULL") + dctColours.Add("None", "NULL") dctColours.Add(strPickColour, strPickColour) dctColours.Add("Black", Chr(34) & "black" & Chr(34)) dctColours.Add("White", Chr(34) & "white" & Chr(34)) From bb8f443b95572413ef39f918a4220673aab513e5 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 20 Feb 2024 18:46:03 +0300 Subject: [PATCH 004/273] Removed white spaces --- instat/sdgTableOptionsTextFormat.vb | 7 ------- 1 file changed, 7 deletions(-) diff --git a/instat/sdgTableOptionsTextFormat.vb b/instat/sdgTableOptionsTextFormat.vb index 2ecfb9e164c..73aa31f039a 100644 --- a/instat/sdgTableOptionsTextFormat.vb +++ b/instat/sdgTableOptionsTextFormat.vb @@ -124,13 +124,6 @@ Public Class sdgTableOptionsTextFormat ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=True) ucrCboAlignHorizontal.SetRCode(clsNewStyleRFunction, bReset:=True) - - - End Sub - - - - End Class \ No newline at end of file From 6979c5edf893a7df12c4cdc3e552c9253a4b97f7 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 20 Feb 2024 23:48:12 +0300 Subject: [PATCH 005/273] Added source notes feature --- instat/sdgTableOptions.Designer.vb | 223 ++++++++++--------- instat/sdgTableOptions.resx | 12 +- instat/sdgTableOptions.vb | 159 ++++++++++--- instat/sdgTableOptionsTextFormat.Designer.vb | 185 +++++++-------- 4 files changed, 352 insertions(+), 227 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index dca99895764..48c69b5a8d8 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -26,33 +26,35 @@ Partial Class sdgTableOptions Me.tbpHeader = New System.Windows.Forms.TabPage() Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() - Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() - Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() - Me.colNote = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colColName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colRows = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblFooterNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() - Me.dataGridViewSourceNotes = New System.Windows.Forms.DataGridView() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() Me.lblSourceNotes = New System.Windows.Forms.Label() Me.tbpThemes = New System.Windows.Forms.TabPage() - Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.cmdManualTheme = New System.Windows.Forms.Button() Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() + Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() + Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() + Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colSourceNoteFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() - CType(Me.dataGridViewSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpThemes.SuspendLayout() Me.SuspendLayout() ' @@ -65,7 +67,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(588, 287) + Me.tbpFormatOptions.Size = New System.Drawing.Size(650, 262) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -79,7 +81,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(580, 261) + Me.tbpHeader.Size = New System.Drawing.Size(642, 236) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -102,30 +104,6 @@ Partial Class sdgTableOptions Me.btnHeaderTitleFormat.Text = "Format" Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True ' - 'ucrInputHeaderSubtitle - ' - Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderSubtitle.AutoSize = True - Me.ucrInputHeaderSubtitle.IsMultiline = False - Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(67, 49) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderSubtitle.TabIndex = 11 - ' - 'ucrInputHeaderTitle - ' - Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderTitle.AutoSize = True - Me.ucrInputHeaderTitle.IsMultiline = False - Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(67, 19) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderTitle.TabIndex = 10 - ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True @@ -152,7 +130,7 @@ Partial Class sdgTableOptions Me.tbpFooters.Controls.Add(Me.lblFooterNotes) Me.tbpFooters.Location = New System.Drawing.Point(4, 22) Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(580, 261) + Me.tbpFooters.Size = New System.Drawing.Size(642, 236) Me.tbpFooters.TabIndex = 3 Me.tbpFooters.Text = "Footers" Me.tbpFooters.UseVisualStyleBackColor = True @@ -162,34 +140,13 @@ Partial Class sdgTableOptions Me.dataGridFooterNotes.AllowUserToAddRows = False Me.dataGridFooterNotes.AllowUserToDeleteRows = False Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colNote, Me.colColName, Me.colRows}) + Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColName, Me.colFooterRowExpression, Me.colFooterFormat}) Me.dataGridFooterNotes.Location = New System.Drawing.Point(7, 22) Me.dataGridFooterNotes.Name = "dataGridFooterNotes" Me.dataGridFooterNotes.RowHeadersWidth = 62 - Me.dataGridFooterNotes.Size = New System.Drawing.Size(564, 150) + Me.dataGridFooterNotes.Size = New System.Drawing.Size(630, 193) Me.dataGridFooterNotes.TabIndex = 5 ' - 'colNote - ' - Me.colNote.HeaderText = "Note Text" - Me.colNote.MinimumWidth = 8 - Me.colNote.Name = "colNote" - Me.colNote.Width = 220 - ' - 'colColName - ' - Me.colColName.HeaderText = "Column Expression(s)" - Me.colColName.MinimumWidth = 8 - Me.colColName.Name = "colColName" - Me.colColName.Width = 140 - ' - 'colRows - ' - Me.colRows.HeaderText = "Row Expression(s)" - Me.colRows.MinimumWidth = 8 - Me.colRows.Name = "colRows" - Me.colRows.Width = 140 - ' 'lblFooterNotes ' Me.lblFooterNotes.AutoSize = True @@ -201,42 +158,35 @@ Partial Class sdgTableOptions ' 'tbpSourceNotes ' - Me.tbpSourceNotes.Controls.Add(Me.dataGridViewSourceNotes) + Me.tbpSourceNotes.Controls.Add(Me.dataGridSourceNotes) Me.tbpSourceNotes.Controls.Add(Me.lblSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(580, 261) + Me.tbpSourceNotes.Size = New System.Drawing.Size(642, 236) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' - 'dataGridViewSourceNotes + 'dataGridSourceNotes ' - Me.dataGridViewSourceNotes.AllowUserToAddRows = False - Me.dataGridViewSourceNotes.AllowUserToDeleteRows = False - Me.dataGridViewSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridViewSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1}) - Me.dataGridViewSourceNotes.Location = New System.Drawing.Point(7, 24) - Me.dataGridViewSourceNotes.Name = "dataGridViewSourceNotes" - Me.dataGridViewSourceNotes.RowHeadersWidth = 62 - Me.dataGridViewSourceNotes.Size = New System.Drawing.Size(569, 150) - Me.dataGridViewSourceNotes.TabIndex = 7 - ' - 'DataGridViewTextBoxColumn1 - ' - Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn1.HeaderText = "Source Text" - Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + Me.dataGridSourceNotes.AllowUserToAddRows = False + Me.dataGridSourceNotes.AllowUserToDeleteRows = False + Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colSourceNoteFormat}) + Me.dataGridSourceNotes.Location = New System.Drawing.Point(7, 24) + Me.dataGridSourceNotes.Name = "dataGridSourceNotes" + Me.dataGridSourceNotes.RowHeadersWidth = 62 + Me.dataGridSourceNotes.Size = New System.Drawing.Size(630, 193) + Me.dataGridSourceNotes.TabIndex = 7 ' 'lblSourceNotes ' Me.lblSourceNotes.AutoSize = True Me.lblSourceNotes.Location = New System.Drawing.Point(5, 8) Me.lblSourceNotes.Name = "lblSourceNotes" - Me.lblSourceNotes.Size = New System.Drawing.Size(74, 13) + Me.lblSourceNotes.Size = New System.Drawing.Size(73, 13) Me.lblSourceNotes.TabIndex = 6 - Me.lblSourceNotes.Text = "Footers notes:" + Me.lblSourceNotes.Text = "Source notes:" ' 'tbpThemes ' @@ -247,23 +197,11 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(580, 261) + Me.tbpThemes.Size = New System.Drawing.Size(642, 236) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True ' - 'ucrInputSelectThemes - ' - Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True - Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 - Me.ucrInputSelectThemes.IsReadOnly = False - Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" - Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) - Me.ucrInputSelectThemes.TabIndex = 3 - ' 'cmdManualTheme ' Me.cmdManualTheme.Location = New System.Drawing.Point(157, 59) @@ -295,6 +233,42 @@ Partial Class sdgTableOptions Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True ' + 'ucrInputHeaderSubtitle + ' + Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderSubtitle.AutoSize = True + Me.ucrInputHeaderSubtitle.IsMultiline = False + Me.ucrInputHeaderSubtitle.IsReadOnly = False + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(67, 49) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderSubtitle.TabIndex = 11 + ' + 'ucrInputHeaderTitle + ' + Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderTitle.AutoSize = True + Me.ucrInputHeaderTitle.IsMultiline = False + Me.ucrInputHeaderTitle.IsReadOnly = False + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(67, 19) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderTitle.TabIndex = 10 + ' + 'ucrInputSelectThemes + ' + Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 + Me.ucrInputSelectThemes.IsReadOnly = False + Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" + Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) + Me.ucrInputSelectThemes.TabIndex = 3 + ' 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -307,21 +281,68 @@ Partial Class sdgTableOptions 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(172, 299) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 274) Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColName + ' + Me.colFooterColName.HeaderText = "Column Expression(s)" + Me.colFooterColName.MinimumWidth = 8 + Me.colFooterColName.Name = "colFooterColName" + Me.colFooterColName.Width = 140 + ' + 'colFooterRowExpression + ' + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 + ' + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.DataGridViewTextBoxColumn1.HeaderText = "Note Text" + Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + ' + 'colSourceNoteFormat + ' + Me.colSourceNoteFormat.HeaderText = "" + Me.colSourceNoteFormat.Name = "colSourceNoteFormat" + Me.colSourceNoteFormat.ReadOnly = True + Me.colSourceNoteFormat.Text = "Format" + Me.colSourceNoteFormat.UseColumnTextForButtonValue = True + Me.colSourceNoteFormat.Width = 55 + ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(598, 332) + Me.ClientSize = New System.Drawing.Size(656, 306) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgTableOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Table Options" Me.tbpFormatOptions.ResumeLayout(False) Me.tbpHeader.ResumeLayout(False) @@ -331,7 +352,7 @@ Partial Class sdgTableOptions CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpSourceNotes.ResumeLayout(False) Me.tbpSourceNotes.PerformLayout() - CType(Me.dataGridViewSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpThemes.ResumeLayout(False) Me.tbpThemes.PerformLayout() Me.ResumeLayout(False) @@ -358,10 +379,12 @@ Partial Class sdgTableOptions Friend WithEvents btnHeaderTitleFormat As Button Friend WithEvents lblFooterNotes As Label Friend WithEvents dataGridFooterNotes As DataGridView - Friend WithEvents dataGridViewSourceNotes As DataGridView + Friend WithEvents dataGridSourceNotes As DataGridView Friend WithEvents lblSourceNotes As Label + Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn + Friend WithEvents colFooterColName As DataGridViewTextBoxColumn + Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterFormat As DataGridViewButtonColumn Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn - Friend WithEvents colNote As DataGridViewTextBoxColumn - Friend WithEvents colColName As DataGridViewTextBoxColumn - Friend WithEvents colRows As DataGridViewTextBoxColumn + Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn End Class diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index 762d67102e5..49a1b0eca6b 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -117,16 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + + True + + True True + + True + \ No newline at end of file diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index aa511dbc212..842e17beded 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -14,7 +14,10 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . +Imports System.Reflection Imports instat.Translations +Imports unvell.ReoGrid.IO.OpenXML.Schema + Public Class sdgTableOptions Private clsOperator As ROperator @@ -26,10 +29,9 @@ Public Class sdgTableOptions End Sub Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn - SetHeaderOptionsInOperatorOnReturn(clsOperator) - - SetFootersRFunctions(clsOperator) + SetGridOptionsInOperatorOnReturn(dataGridFooterNotes, "tab_footnote", clsOperator) + SetGridOptionsInOperatorOnReturn(dataGridSourceNotes, "tab_source_note", clsOperator) End Sub @@ -50,9 +52,8 @@ Public Class sdgTableOptions SetupHeaderRFunctionsInOperatorOnNew(clsOperator) - - SetFootersControlsContents(clsOperator) - + SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) + SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator) End Sub @@ -94,7 +95,7 @@ Public Class sdgTableOptions ' set the header controls values ucrInputHeaderTitle.SetName(GetStringValue(clsTitleRFunction.clsParameters(0).strArgumentValue, False)) - ucrInputHeaderTitle.SetName(GetStringValue(clsSubtitleRFunction.clsParameters(0).strArgumentValue, False)) + ucrInputHeaderSubtitle.SetName(GetStringValue(clsSubtitleRFunction.clsParameters(0).strArgumentValue, False)) End Sub Private Sub SetHeaderOptionsInOperatorOnReturn(clsOperator As ROperator) @@ -156,7 +157,7 @@ Public Class sdgTableOptions '----------------------------------------- ' FOOTER CONTROLS - Private Sub SetFootersControlsContents(clsOperator As ROperator) + Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) dataGridFooterNotes.Rows.Clear() For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters @@ -169,7 +170,7 @@ Public Class sdgTableOptions For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters If clsFootNoteRParam.strArgumentName = "footnote" Then ' Set the foot note text - row.Cells(0).Value = GetStringValue(clsFootNoteRParam.strArgumentValue, False) + row.Cells(0).Value = GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) ElseIf clsFootNoteRParam.strArgumentName = "locations" Then ' todo go through the location function Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure @@ -184,7 +185,8 @@ Public Class sdgTableOptions End If Next - ' Add the tab_footnote() function parameters as a row + ' Tag and add the tab_footnote() function contents as a row + row.Tag = clsFooterRFunction dataGridFooterNotes.Rows.Add(row) End If @@ -195,7 +197,36 @@ Public Class sdgTableOptions End Sub - Private Sub SetFootersRFunctions(clsOperator As ROperator) + Private Sub SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) + dataGridSourceNotes.Rows.Clear() + + For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters + If clsFootNoteFunctRParam.strArgumentName.Contains("tab_source_note") Then + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridSourceNotes) + + Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure + For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters + If clsFootNoteRParam.strArgumentName = "source_note" Then + ' Set the foot note text + row.Cells(0).Value = GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + End If + Next + + ' Tag and add the tab_footnote() function contents as a row + row.Tag = clsFooterRFunction + dataGridSourceNotes.Rows.Add(row) + + End If + Next + + ' Always add a place holder row for new foot note + dataGridSourceNotes.Rows.Add() + + End Sub + + Private Sub SetGridOptionsInOperatorOnReturn(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) If dataGridFooterNotes.Rows.Count = 0 Then Exit Sub @@ -204,7 +235,7 @@ Public Class sdgTableOptions ' Remove all the previous footer parameters first Dim lstParams As New List(Of RParameter) For Each clsRParam As RParameter In clsOperator.clsParameters - If clsRParam.strArgumentName.Contains("tab_footnote") Then + If clsRParam.strArgumentName.Contains(strParameterName) Then lstParams.Add(clsRParam) End If Next @@ -213,43 +244,107 @@ Public Class sdgTableOptions Next ' Then add the new footer parameters - For index As Integer = 0 To dataGridFooterNotes.Rows.Count - 1 + For index As Integer = 0 To dataGrid.Rows.Count - 1 + Dim clsFooterRFunction As RFunction = dataGrid.Rows.Item(index).Tag + If clsFooterRFunction IsNot Nothing Then + clsOperator.AddParameter(strParameterName & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) + End If + Next - Dim row As DataGridViewRow = dataGridFooterNotes.Rows.Item(index) + End Sub - If String.IsNullOrEmpty(row.Cells(0).Value) Then - Continue For - End If - Dim clsFooterRFunction As New RFunction - clsFooterRFunction.SetPackageName("gt") - clsFooterRFunction.SetRCommand("tab_footnote") - clsFooterRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=GetStringValue(row.Cells(0).Value, True))) + Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellEndEdit, dataGridSourceNotes.CellEndEdit + Dim dataGrid As DataGridView = sender + Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) + Dim strNoteTextValue As String = row.Cells(0).Value + + ' If no foot note typed by user then just exit the sub + If String.IsNullOrEmpty(strNoteTextValue) Then + Exit Sub + End If + + Dim clsNoteRFunction As RFunction = Nothing + + If dataGrid Is dataGridFooterNotes Then + clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) + + ' Add column and row expressions as paramters if user has typed them If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then Dim clsFooterLocationNoteRFunction As New RFunction - 'clsFooterLocationNoteRFunction.SetPackageName("gt") clsFooterLocationNoteRFunction.SetRCommand("cells_body") clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=GetStringValue(row.Cells(1).Value, True))) clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=GetStringValue(row.Cells(2).Value, True))) - clsFooterRFunction.AddParameter(New RParameter(strParameterName:="locations", clsFooterLocationNoteRFunction)) + clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) End If + ElseIf dataGrid Is dataGridSourceNotes Then + clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_source_note", "source_note", strNoteTextValue) + End If - clsOperator.AddParameter("tab_footnote" & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) - - Next + ' Overwrite the tag with the new foot function + row.Tag = clsNoteRFunction + ' If last row then add new empty row + If e.RowIndex = dataGrid.Rows.Count - 1 Then + dataGrid.Rows.Add() + End If End Sub + Private Function SetupAndGetNewNoteRFunction(clsPossibleNoteRFunction As RFunction, strNoteRCommand As String, strRNoteTextParameterName As String, strNoteTextValue As String) As RFunction + Dim clsNewNoteRFunction As RFunction = clsPossibleNoteRFunction + ' Get the prevous style parameter to retain any format options previously done + Dim clsStyleParam As RParameter + If clsNewNoteRFunction IsNot Nothing Then + clsStyleParam = clsNewNoteRFunction.GetParameter(strRNoteTextParameterName).clsArgumentCodeStructure.GetParameter("style") + Else + clsStyleParam = New RParameter(strParameterName:="style", strParamValue:=GetNewStyleRFunction(), iNewPosition:=1) + End If - Private Sub dataGridFooterNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellEndEdit - AddNewEmptyRowAfterUserInput() - End Sub - Private Sub AddNewEmptyRowAfterUserInput() - If dataGridFooterNotes.Rows.Count > 0 AndAlso Not String.IsNullOrEmpty(dataGridFooterNotes.Rows.Item(dataGridFooterNotes.Rows.Count - 1).Cells(0).Value) Then - dataGridFooterNotes.Rows.Add() + ' Recreate the footer function + clsNewNoteRFunction = New RFunction + clsNewNoteRFunction.SetPackageName("gt") + clsNewNoteRFunction.SetRCommand(strNoteRCommand) + + Dim clsNoteTextRFunction As RFunction = GetNewHtmlDivRFunction() + clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) + clsNoteTextRFunction.AddParameter(clsStyleParam) ' Add the style parameter for formating + + ' Add the foot note text parameter to the footer R function + clsNewNoteRFunction.AddParameter(New RParameter(strParameterName:=strRNoteTextParameterName, strParamValue:=clsNoteTextRFunction, iNewPosition:=0)) + Return clsNewNoteRFunction + End Function + + + Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellClick, dataGridSourceNotes.CellClick + + Dim dataGrid As DataGridView = sender + Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag + Dim strParameterName As String = Nothing + + If dataGrid Is dataGridFooterNotes Then + strParameterName = "footnote" + + If e.ColumnIndex <> 3 Then + Exit Sub + End If + + ElseIf dataGrid Is dataGridSourceNotes Then + strParameterName = "source_note" + If e.ColumnIndex <> 1 Then + Exit Sub + End If + + End If + + If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then + sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) + sdgTableOptionsTextFormat.Show(Me) End If + End Sub + + '----------------------------------------- '----------------------------------------- diff --git a/instat/sdgTableOptionsTextFormat.Designer.vb b/instat/sdgTableOptionsTextFormat.Designer.vb index 4b3f7a130eb..6d6df63eaff 100644 --- a/instat/sdgTableOptionsTextFormat.Designer.vb +++ b/instat/sdgTableOptionsTextFormat.Designer.vb @@ -29,24 +29,24 @@ Partial Class sdgTableOptionsTextFormat Me.lblUnderlineStyle = New System.Windows.Forms.Label() Me.lblAlignHorizontal = New System.Windows.Forms.Label() Me.GroupBox1 = New System.Windows.Forms.GroupBox() + Me.ucrTxtFontSize = New instat.ucrInputTextBox() + Me.ucrCboFontWeight = New instat.ucrInputComboBox() + Me.lblFontWeight = New System.Windows.Forms.Label() Me.ucrCboFontStyle = New instat.ucrInputComboBox() Me.ucrCboFontFamily = New instat.ucrInputComboBox() Me.GroupBox2 = New System.Windows.Forms.GroupBox() + Me.lblUnderlineType = New System.Windows.Forms.Label() + Me.ucrCboUnderlineType = New instat.ucrInputComboBox() + Me.ucrCboUnderLineColor = New instat.ucrColors() Me.ucrCboUnderlineStyle = New instat.ucrInputComboBox() Me.GroupBox3 = New System.Windows.Forms.GroupBox() Me.ucrCboAlignHorizontal = New instat.ucrInputComboBox() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.ucrCboFontWeight = New instat.ucrInputComboBox() - Me.lblFontWeight = New System.Windows.Forms.Label() - Me.ucrTxtFontSize = New instat.ucrInputTextBox() Me.GroupBox4 = New System.Windows.Forms.GroupBox() + Me.ucrCboColorBackground = New instat.ucrColors() + Me.ucrCboColorText = New instat.ucrColors() Me.Label1 = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() - Me.ucrCboColorText = New instat.ucrColors() - Me.ucrCboColorBackground = New instat.ucrColors() - Me.ucrCboUnderLineColor = New instat.ucrColors() - Me.lblUnderlineType = New System.Windows.Forms.Label() - Me.ucrCboUnderlineType = New instat.ucrInputComboBox() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() @@ -124,6 +124,37 @@ Partial Class sdgTableOptionsTextFormat Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Font" ' + 'ucrTxtFontSize + ' + Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True + Me.ucrTxtFontSize.AutoSize = True + Me.ucrTxtFontSize.IsMultiline = False + Me.ucrTxtFontSize.IsReadOnly = False + Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) + Me.ucrTxtFontSize.Name = "ucrTxtFontSize" + Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) + Me.ucrTxtFontSize.TabIndex = 15 + ' + 'ucrCboFontWeight + ' + Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True + Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontWeight.GetSetSelectedIndex = -1 + Me.ucrCboFontWeight.IsReadOnly = False + Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) + Me.ucrCboFontWeight.Name = "ucrCboFontWeight" + Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontWeight.TabIndex = 13 + ' + 'lblFontWeight + ' + Me.lblFontWeight.AutoSize = True + Me.lblFontWeight.Location = New System.Drawing.Point(297, 19) + Me.lblFontWeight.Name = "lblFontWeight" + Me.lblFontWeight.Size = New System.Drawing.Size(44, 13) + Me.lblFontWeight.TabIndex = 14 + Me.lblFontWeight.Text = "Weight:" + ' 'ucrCboFontStyle ' Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True @@ -161,6 +192,37 @@ Partial Class sdgTableOptionsTextFormat Me.GroupBox2.TabStop = False Me.GroupBox2.Text = "Underline" ' + 'lblUnderlineType + ' + Me.lblUnderlineType.AutoSize = True + Me.lblUnderlineType.Location = New System.Drawing.Point(6, 16) + Me.lblUnderlineType.Name = "lblUnderlineType" + Me.lblUnderlineType.Size = New System.Drawing.Size(34, 13) + Me.lblUnderlineType.TabIndex = 21 + Me.lblUnderlineType.Text = "Type:" + ' + 'ucrCboUnderlineType + ' + Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True + Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 + Me.ucrCboUnderlineType.IsReadOnly = False + Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 32) + Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" + Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderlineType.TabIndex = 20 + ' + 'ucrCboUnderLineColor + ' + Me.ucrCboUnderLineColor.AddQuotesIfUnrecognised = True + Me.ucrCboUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderLineColor.GetSetSelectedIndex = -1 + Me.ucrCboUnderLineColor.IsReadOnly = False + Me.ucrCboUnderLineColor.Location = New System.Drawing.Point(302, 32) + Me.ucrCboUnderLineColor.Name = "ucrCboUnderLineColor" + Me.ucrCboUnderLineColor.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderLineColor.TabIndex = 19 + ' 'ucrCboUnderlineStyle ' Me.ucrCboUnderlineStyle.AddQuotesIfUnrecognised = True @@ -203,37 +265,6 @@ Partial Class sdgTableOptionsTextFormat Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'ucrCboFontWeight - ' - Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True - Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontWeight.GetSetSelectedIndex = -1 - Me.ucrCboFontWeight.IsReadOnly = False - Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) - Me.ucrCboFontWeight.Name = "ucrCboFontWeight" - Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontWeight.TabIndex = 13 - ' - 'lblFontWeight - ' - Me.lblFontWeight.AutoSize = True - Me.lblFontWeight.Location = New System.Drawing.Point(297, 19) - Me.lblFontWeight.Name = "lblFontWeight" - Me.lblFontWeight.Size = New System.Drawing.Size(44, 13) - Me.lblFontWeight.TabIndex = 14 - Me.lblFontWeight.Text = "Weight:" - ' - 'ucrTxtFontSize - ' - Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True - Me.ucrTxtFontSize.AutoSize = True - Me.ucrTxtFontSize.IsMultiline = False - Me.ucrTxtFontSize.IsReadOnly = False - Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) - Me.ucrTxtFontSize.Name = "ucrTxtFontSize" - Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) - Me.ucrTxtFontSize.TabIndex = 15 - ' 'GroupBox4 ' Me.GroupBox4.Controls.Add(Me.ucrCboColorBackground) @@ -247,6 +278,28 @@ Partial Class sdgTableOptionsTextFormat Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Colour" ' + 'ucrCboColorBackground + ' + Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True + Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorBackground.GetSetSelectedIndex = -1 + Me.ucrCboColorBackground.IsReadOnly = False + Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) + Me.ucrCboColorBackground.Name = "ucrCboColorBackground" + Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorBackground.TabIndex = 18 + ' + 'ucrCboColorText + ' + Me.ucrCboColorText.AddQuotesIfUnrecognised = True + Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorText.GetSetSelectedIndex = -1 + Me.ucrCboColorText.IsReadOnly = False + Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) + Me.ucrCboColorText.Name = "ucrCboColorText" + Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorText.TabIndex = 17 + ' 'Label1 ' Me.Label1.AutoSize = True @@ -265,59 +318,6 @@ Partial Class sdgTableOptionsTextFormat Me.Label2.TabIndex = 16 Me.Label2.Text = "Background:" ' - 'ucrCboColorText - ' - Me.ucrCboColorText.AddQuotesIfUnrecognised = True - Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboColorText.GetSetSelectedIndex = -1 - Me.ucrCboColorText.IsReadOnly = False - Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) - Me.ucrCboColorText.Name = "ucrCboColorText" - Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) - Me.ucrCboColorText.TabIndex = 17 - ' - 'ucrCboColorBackground - ' - Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True - Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboColorBackground.GetSetSelectedIndex = -1 - Me.ucrCboColorBackground.IsReadOnly = False - Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) - Me.ucrCboColorBackground.Name = "ucrCboColorBackground" - Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) - Me.ucrCboColorBackground.TabIndex = 18 - ' - 'ucrCboUnderLineColor - ' - Me.ucrCboUnderLineColor.AddQuotesIfUnrecognised = True - Me.ucrCboUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderLineColor.GetSetSelectedIndex = -1 - Me.ucrCboUnderLineColor.IsReadOnly = False - Me.ucrCboUnderLineColor.Location = New System.Drawing.Point(302, 32) - Me.ucrCboUnderLineColor.Name = "ucrCboUnderLineColor" - Me.ucrCboUnderLineColor.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderLineColor.TabIndex = 19 - ' - 'lblUnderlineType - ' - Me.lblUnderlineType.AutoSize = True - Me.lblUnderlineType.Location = New System.Drawing.Point(6, 16) - Me.lblUnderlineType.Name = "lblUnderlineType" - Me.lblUnderlineType.Size = New System.Drawing.Size(34, 13) - Me.lblUnderlineType.TabIndex = 21 - Me.lblUnderlineType.Text = "Type:" - ' - 'ucrCboUnderlineType - ' - Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True - Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 - Me.ucrCboUnderlineType.IsReadOnly = False - Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 32) - Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" - Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderlineType.TabIndex = 20 - ' 'sdgTableOptionsTextFormat ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -330,6 +330,7 @@ Partial Class sdgTableOptionsTextFormat Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgTableOptionsTextFormat" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Text Format" Me.GroupBox1.ResumeLayout(False) Me.GroupBox1.PerformLayout() From 33e7740a909764bca8d25df79459fded5d9c07d0 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 21 Feb 2024 01:52:39 +0300 Subject: [PATCH 006/273] Restored themes functionality --- instat/sdgTableOptions.Designer.vb | 206 ++++++++++++++--------------- instat/sdgTableOptions.vb | 106 ++++++++++++++- 2 files changed, 208 insertions(+), 104 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index 48c69b5a8d8..260aca367ac 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -26,29 +26,29 @@ Partial Class sdgTableOptions Me.tbpHeader = New System.Windows.Forms.TabPage() Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() + Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() + Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColName = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblFooterNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colSourceNoteFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblSourceNotes = New System.Windows.Forms.Label() Me.tbpThemes = New System.Windows.Forms.TabPage() - Me.cmdManualTheme = New System.Windows.Forms.Button() + Me.ucrCboSelectThemes = New instat.ucrInputComboBox() + Me.btnManualTheme = New System.Windows.Forms.Button() Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() - Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() - Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() - Me.ucrInputSelectThemes = New instat.ucrInputComboBox() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colSourceNoteFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() @@ -104,6 +104,30 @@ Partial Class sdgTableOptions Me.btnHeaderTitleFormat.Text = "Format" Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True ' + 'ucrInputHeaderSubtitle + ' + Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderSubtitle.AutoSize = True + Me.ucrInputHeaderSubtitle.IsMultiline = False + Me.ucrInputHeaderSubtitle.IsReadOnly = False + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(67, 49) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderSubtitle.TabIndex = 11 + ' + 'ucrInputHeaderTitle + ' + Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderTitle.AutoSize = True + Me.ucrInputHeaderTitle.IsMultiline = False + Me.ucrInputHeaderTitle.IsReadOnly = False + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(67, 19) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderTitle.TabIndex = 10 + ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True @@ -147,6 +171,36 @@ Partial Class sdgTableOptions Me.dataGridFooterNotes.Size = New System.Drawing.Size(630, 193) Me.dataGridFooterNotes.TabIndex = 5 ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColName + ' + Me.colFooterColName.HeaderText = "Column Expression(s)" + Me.colFooterColName.MinimumWidth = 8 + Me.colFooterColName.Name = "colFooterColName" + Me.colFooterColName.Width = 140 + ' + 'colFooterRowExpression + ' + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 + ' + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' 'lblFooterNotes ' Me.lblFooterNotes.AutoSize = True @@ -179,6 +233,22 @@ Partial Class sdgTableOptions Me.dataGridSourceNotes.Size = New System.Drawing.Size(630, 193) Me.dataGridSourceNotes.TabIndex = 7 ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.DataGridViewTextBoxColumn1.HeaderText = "Note Text" + Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + ' + 'colSourceNoteFormat + ' + Me.colSourceNoteFormat.HeaderText = "" + Me.colSourceNoteFormat.Name = "colSourceNoteFormat" + Me.colSourceNoteFormat.ReadOnly = True + Me.colSourceNoteFormat.Text = "Format" + Me.colSourceNoteFormat.UseColumnTextForButtonValue = True + Me.colSourceNoteFormat.Width = 55 + ' 'lblSourceNotes ' Me.lblSourceNotes.AutoSize = True @@ -190,8 +260,8 @@ Partial Class sdgTableOptions ' 'tbpThemes ' - Me.tbpThemes.Controls.Add(Me.ucrInputSelectThemes) - Me.tbpThemes.Controls.Add(Me.cmdManualTheme) + Me.tbpThemes.Controls.Add(Me.ucrCboSelectThemes) + Me.tbpThemes.Controls.Add(Me.btnManualTheme) Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) @@ -202,14 +272,26 @@ Partial Class sdgTableOptions Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True ' - 'cmdManualTheme + 'ucrCboSelectThemes + ' + Me.ucrCboSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 + Me.ucrCboSelectThemes.IsReadOnly = False + Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" + Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) + Me.ucrCboSelectThemes.TabIndex = 3 + ' + 'btnManualTheme ' - Me.cmdManualTheme.Location = New System.Drawing.Point(157, 59) - Me.cmdManualTheme.Name = "cmdManualTheme" - Me.cmdManualTheme.Size = New System.Drawing.Size(168, 21) - Me.cmdManualTheme.TabIndex = 2 - Me.cmdManualTheme.Text = "Themes Sub Dialog" - Me.cmdManualTheme.UseVisualStyleBackColor = True + Me.btnManualTheme.Location = New System.Drawing.Point(157, 59) + Me.btnManualTheme.Name = "btnManualTheme" + Me.btnManualTheme.Size = New System.Drawing.Size(168, 21) + Me.btnManualTheme.TabIndex = 2 + Me.btnManualTheme.Text = "Custom Theme" + Me.btnManualTheme.UseVisualStyleBackColor = True ' 'rdoSelectTheme ' @@ -233,42 +315,6 @@ Partial Class sdgTableOptions Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True ' - 'ucrInputHeaderSubtitle - ' - Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderSubtitle.AutoSize = True - Me.ucrInputHeaderSubtitle.IsMultiline = False - Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(67, 49) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderSubtitle.TabIndex = 11 - ' - 'ucrInputHeaderTitle - ' - Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderTitle.AutoSize = True - Me.ucrInputHeaderTitle.IsMultiline = False - Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(67, 19) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderTitle.TabIndex = 10 - ' - 'ucrInputSelectThemes - ' - Me.ucrInputSelectThemes.AddQuotesIfUnrecognised = True - Me.ucrInputSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSelectThemes.GetSetSelectedIndex = -1 - Me.ucrInputSelectThemes.IsReadOnly = False - Me.ucrInputSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrInputSelectThemes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSelectThemes.Name = "ucrInputSelectThemes" - Me.ucrInputSelectThemes.Size = New System.Drawing.Size(168, 21) - Me.ucrInputSelectThemes.TabIndex = 3 - ' 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -287,52 +333,6 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'colFooterNoteText - ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 - ' - 'colFooterColName - ' - Me.colFooterColName.HeaderText = "Column Expression(s)" - Me.colFooterColName.MinimumWidth = 8 - Me.colFooterColName.Name = "colFooterColName" - Me.colFooterColName.Width = 140 - ' - 'colFooterRowExpression - ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 - ' - 'colFooterFormat - ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 - ' - 'DataGridViewTextBoxColumn1 - ' - Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn1.HeaderText = "Note Text" - Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" - ' - 'colSourceNoteFormat - ' - Me.colSourceNoteFormat.HeaderText = "" - Me.colSourceNoteFormat.Name = "colSourceNoteFormat" - Me.colSourceNoteFormat.ReadOnly = True - Me.colSourceNoteFormat.Text = "Format" - Me.colSourceNoteFormat.UseColumnTextForButtonValue = True - Me.colSourceNoteFormat.Width = 55 - ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -366,8 +366,8 @@ Partial Class sdgTableOptions Friend WithEvents tbpFooters As TabPage Friend WithEvents tbpSourceNotes As TabPage Friend WithEvents tbpThemes As TabPage - Friend WithEvents ucrInputSelectThemes As ucrInputComboBox - Friend WithEvents cmdManualTheme As Button + Friend WithEvents ucrCboSelectThemes As ucrInputComboBox + Friend WithEvents btnManualTheme As Button Friend WithEvents rdoSelectTheme As RadioButton Friend WithEvents rdoManualTheme As RadioButton Friend WithEvents ucrPnlThemesPanel As UcrPanel diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index 842e17beded..2eaae7951f7 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -23,6 +23,8 @@ Public Class sdgTableOptions Private clsOperator As ROperator Private clsTitleRFunction As RFunction Private clsSubtitleRFunction As RFunction + Private clsThemeRFunction As RFunction + Private bDialogInitialised As Boolean = False Private Sub sdgTableOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -32,8 +34,18 @@ Public Class sdgTableOptions SetHeaderOptionsInOperatorOnReturn(clsOperator) SetGridOptionsInOperatorOnReturn(dataGridFooterNotes, "tab_footnote", clsOperator) SetGridOptionsInOperatorOnReturn(dataGridSourceNotes, "tab_source_note", clsOperator) + SetThemesInOperatorOnReturn(clsOperator) End Sub + Private Sub initialiseDialog() + ucrPnlThemesPanel.AddRadioButton(rdoSelectTheme) + ucrPnlThemesPanel.AddRadioButton(rdoManualTheme) + + ucrCboSelectThemes.SetItems({"None", "Dark Theme", "538 Theme", "Dot Matrix Theme", "Espn Theme", "Excel Theme", "Guardian Theme", "NY Times Theme", "PFF Theme"}) + ucrCboSelectThemes.SetDropDownStyleAsNonEditable() + End Sub + + ''' ''' An R operateor that has a parameter named "gt" set up. @@ -41,6 +53,12 @@ Public Class sdgTableOptions ''' ''' Public Sub Setup(clsNewOperator As ROperator) + + If Not bDialogInitialised Then + initialiseDialog() + bDialogInitialised = True + End If + clsOperator = clsNewOperator If Not clsNewOperator.ContainsParameter("gt") Then @@ -54,6 +72,8 @@ Public Class sdgTableOptions SetupHeaderRFunctionsInOperatorOnNew(clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator) + SetupThemeRFunctionsInOperatorOnNew(clsOperator) + End Sub @@ -253,7 +273,6 @@ Public Class sdgTableOptions End Sub - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellEndEdit, dataGridSourceNotes.CellEndEdit Dim dataGrid As DataGridView = sender Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) @@ -347,6 +366,91 @@ Public Class sdgTableOptions '----------------------------------------- + '----------------------------------------- + ' Themes + + Private Sub SetupThemeRFunctionsInOperatorOnNew(clsOperator As ROperator) + clsThemeRFunction = New RFunction + + If Not clsOperator.ContainsParameter("theme_format") Then + Exit Sub + End If + + clsThemeRFunction = clsOperator.GetParameter("theme_format").clsArgumentCodeStructure + + If clsThemeRFunction.strRCommand = "tab_options" Then + rdoManualTheme.Checked = True + Else + rdoSelectTheme.Checked = True + End If + + + End Sub + + Private Sub SetThemesInOperatorOnReturn(clsOperator As ROperator) + ' Set the themes parameter if there was a theme selected + If clsThemeRFunction IsNot Nothing AndAlso Not String.IsNullOrEmpty(clsThemeRFunction.strRCommand) Then + clsOperator.AddParameter("theme_format", clsRFunctionParameter:=clsThemeRFunction) + Else + clsOperator.RemoveParameterByName("theme_format") + End If + End Sub + + Private Sub ucrPnlThemes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlThemesPanel.ControlValueChanged + ucrCboSelectThemes.Visible = False + btnManualTheme.Visible = False + + 'clsThemeRFunction = New RFunction + + If rdoSelectTheme.Checked Then + ucrCboSelectThemes.Visible = True + clsThemeRFunction.SetPackageName("gtExtras") + clsThemeRFunction.ClearParameters() + ElseIf rdoManualTheme.Checked Then + btnManualTheme.Visible = True + clsThemeRFunction.SetPackageName("gt") + clsThemeRFunction.SetRCommand("tab_options") + End If + + End Sub + + Private Sub ucrCboSelectThemes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCboSelectThemes.ControlValueChanged + + If clsThemeRFunction Is Nothing Then + Exit Sub + End If + + Dim strCommand As String = "" + Select Case ucrCboSelectThemes.GetText + Case "Dark Theme" + strCommand = "gt_theme_dark" + Case "538 Theme" + strCommand = "gt_theme_538" + Case "Dot Matrix Theme" + strCommand = "gt_theme_dot_matrix" + Case "Espn Theme" + strCommand = "gt_theme_espn" + Case "Excel Theme" + strCommand = "gt_theme_excel" + Case "Guardian Theme" + strCommand = "gt_theme_guardian" + Case "NY Times Theme" + strCommand = "gt_theme_nytimes" + Case "PFF Theme" + strCommand = "gt_theme_pff" + End Select + + clsThemeRFunction.SetRCommand(strCommand) + End Sub + + + + Private Sub btnManualTheme_Click(sender As Object, e As EventArgs) Handles btnManualTheme.Click + sdgSummaryThemes.SetRCode(bReset:=True, clsNewThemesTabOption:=clsThemeRFunction) + sdgSummaryThemes.ShowDialog(Me) + End Sub + '----------------------------------------- + '----------------------------------------- Private Function GetStringValue(str As String, bwithQuotes As Boolean) As String If String.IsNullOrEmpty(str) Then From e918eb24fc34fc45907de93aff25eb082630de77 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 21 Feb 2024 02:19:59 +0300 Subject: [PATCH 007/273] removed title and subtitle bug --- instat/dlgSummaryTables.vb | 32 ++++++++++++++++++++++---------- instat/sdgTableOptions.vb | 29 ++++++++++++++++++----------- 2 files changed, 40 insertions(+), 21 deletions(-) diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index e08f3e49cf0..5723ec39ce4 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -227,16 +227,17 @@ Public Class dlgSummaryTables clsDummyFunction.AddParameter("rdo_checked", "rdoFrequency", iPosition:=1) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=2) - clsSummaryOperator.SetOperation("%>%") - clsSummaryOperator.bBrackets = False + clsConcFunction.SetRCommand("c") + + clsPipeOperator.SetOperation("%>%") clsPipeOperator.bBrackets = False - clsJoiningPipeOperator.SetOperation("%>%") - clsJoiningPipeOperator.AddParameter("mutable", clsROperatorParameter:=clsSummaryOperator, iPosition:=0) + + clsThemesTabOptionsFunction.SetPackageName("gt") clsThemesTabOptionsFunction.SetRCommand("tab_options") @@ -270,13 +271,7 @@ Public Class dlgSummaryTables clsPivotWiderFunction.SetRCommand("pivot_wider") clsPivotWiderFunction.AddParameter("values_from", "value", iPosition:=1) - clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryDefaultFunction, iPosition:=0) - clsSummaryOperator.AddParameter("gttbl", clsRFunctionParameter:=clsGtFunction, iPosition:=2) - clsFrequencyOperator.SetOperation("%>%") - clsFrequencyOperator.bBrackets = False - clsFrequencyOperator.AddParameter("tableFun", clsRFunctionParameter:=clsFrequencyDefaultFunction, iPosition:=0) - clsFrequencyOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2) clsSummariesList.SetRCommand("c") clsSummariesList.AddParameter("summary_mean", Chr(34) & "summary_mean" & Chr(34), bIncludeArgumentName:=False) ' TODO decide which default(s) to use? @@ -322,6 +317,20 @@ Public Class dlgSummaryTables clsSecondFootnoteCellBodyFunction.SetPackageName("gt") clsSecondFootnoteCellBodyFunction.SetRCommand("cells_body") + + clsSummaryOperator.SetOperation("%>%") + clsSummaryOperator.bBrackets = False + clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryDefaultFunction, iPosition:=0) + clsSummaryOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2) + + clsFrequencyOperator.SetOperation("%>%") + clsFrequencyOperator.bBrackets = False + clsFrequencyOperator.AddParameter("tableFun", clsRFunctionParameter:=clsFrequencyDefaultFunction, iPosition:=0) + clsFrequencyOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2) + + clsJoiningPipeOperator.SetOperation("%>%") + clsJoiningPipeOperator.AddParameter("mutable", clsROperatorParameter:=clsSummaryOperator, iPosition:=0) + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -419,6 +428,9 @@ Public Class dlgSummaryTables 'sdgFormatSummaryTables.ShowDialog() 'bResetFormatSubdialog = False + + + Dim clsROperator As ROperator If rdoFrequencyTable.Checked Then clsROperator = clsFrequencyOperator diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index 2eaae7951f7..72c90d41ae0 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -67,14 +67,11 @@ Public Class sdgTableOptions Exit Sub End If - - SetupHeaderRFunctionsInOperatorOnNew(clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) - End Sub '----------------------------------------- @@ -85,32 +82,42 @@ Public Class sdgTableOptions ' Use existing header function it's in the operator, ' if it's not in the operator create one and add it to the operator. Dim clsHeaderRFunction As RFunction + If clsOperator.ContainsParameter("tab_header") Then clsHeaderRFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure - clsTitleRFunction = clsHeaderRFunction.GetParameter("title").clsArgumentCodeStructure - clsSubtitleRFunction = clsHeaderRFunction.GetParameter("subtitle").clsArgumentCodeStructure Else - ' create new header function + ' Create new header function clsHeaderRFunction = New RFunction clsHeaderRFunction.SetPackageName("gt") clsHeaderRFunction.SetRCommand("tab_header") + ' add the header function into the operator + clsOperator.AddParameter("tab_header", clsRFunctionParameter:=clsHeaderRFunction, bIncludeArgumentName:=False) + End If + If clsHeaderRFunction.ContainsParameter("title") Then + clsTitleRFunction = clsHeaderRFunction.GetParameter("title").clsArgumentCodeStructure + Else ' create new title function and add it to into the header function clsTitleRFunction = GetNewHtmlDivRFunction() clsTitleRFunction.AddParameter(strParameterValue:=Chr(34) & "" & Chr(34), iPosition:=0) clsTitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewStyleRFunction(), iPosition:=1) - ' add the title function as the paramter value of header function + + ' Add the title function as the paramter value of header function clsHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsTitleRFunction) - 'create new sub title function and add it to into the header function + End If + + If clsHeaderRFunction.ContainsParameter("subtitle") Then + clsSubtitleRFunction = clsHeaderRFunction.GetParameter("subtitle").clsArgumentCodeStructure + Else + ' Create new sub title function and add it to into the header function clsSubtitleRFunction = GetNewHtmlDivRFunction() clsSubtitleRFunction.AddParameter(strParameterValue:=Chr(34) & "" & Chr(34), iPosition:=0) clsSubtitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewStyleRFunction(), iPosition:=1) - ' add the subtitle function as the paramter value of header function + + ' Add the subtitle function as the paramter value of header function clsHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsSubtitleRFunction) - ' add the header function into the operator - clsOperator.AddParameter("tab_header", clsRFunctionParameter:=clsHeaderRFunction, bIncludeArgumentName:=False) End If ' set the header controls values From 8f1f28081d6c25560a07b54f10100cbbfabe0f5b Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 21 Feb 2024 02:39:39 +0300 Subject: [PATCH 008/273] Refactored summary table dialog --- instat/dlgSummaryTables.vb | 143 +++++-------------------------------- 1 file changed, 16 insertions(+), 127 deletions(-) diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index 5723ec39ce4..78570aa0692 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -22,18 +22,14 @@ Public Class dlgSummaryTables Private clsSummariesList As New RFunction Private bResetSubdialog As Boolean = False Private bResetFormatSubdialog As Boolean = False - Private clsSummaryDefaultFunction, clsFrequencyDefaultFunction, clsConcFunction As New RFunction + Private clsSummaryDefaultFunction, clsFrequencyDefaultFunction As New RFunction Private bRCodeSet As Boolean = True - Private clsStubHeadFunction, clsPivotWiderFunction As New RFunction + Private clsPivotWiderFunction As New RFunction Private iUcrBaseXLocation, iDialogueXsize As Integer - Private clsTableTitleFunction, clsTabFootnoteTitleFunction, clsTableSourcenoteFunction, clsFootnoteTitleLocationFunction, clsFootnoteSubtitleLocationFunction, - clsTabFootnoteSubtitleFunction, clsFootnoteCellFunction, clsFootnoteCellBodyFunction, - clsSecondFootnoteCellFunction, clsSecondFootnoteCellBodyFunction, clsTabStyleFunction, clsDummyFunction, - clsTabStyleCellTextFunction, clsTabStylePxFunction, clsTabStyleCellTitleFunction, clsThemesTabOptionsFunction, - clsgtExtraThemesFunction, clsGtFunction As New RFunction + Private clsDummyFunction As New RFunction - Private clsSummaryOperator, clsFrequencyOperator, clsPipeOperator, clsJoiningPipeOperator As New ROperator + Private clsSummaryOperator, clsFrequencyOperator, clsJoiningPipeOperator As New ROperator Private Sub dlgNewSummaryTables_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -192,31 +188,13 @@ Public Class dlgSummaryTables clsSummaryDefaultFunction = New RFunction clsFrequencyDefaultFunction = New RFunction clsSummariesList = New RFunction - clsConcFunction = New RFunction - clsTableTitleFunction = New RFunction - clsTabFootnoteTitleFunction = New RFunction - clsTableSourcenoteFunction = New RFunction - clsFootnoteTitleLocationFunction = New RFunction - clsFootnoteSubtitleLocationFunction = New RFunction - clsSummaryOperator = New ROperator - clsPipeOperator = New ROperator - clsTabFootnoteSubtitleFunction = New RFunction - clsFootnoteCellBodyFunction = New RFunction - clsSecondFootnoteCellBodyFunction = New RFunction - clsFootnoteCellFunction = New RFunction - clsSecondFootnoteCellFunction = New RFunction - clsTabStyleFunction = New RFunction - clsTabStyleCellTextFunction = New RFunction - clsTabStylePxFunction = New RFunction - clsTabStyleCellTitleFunction = New RFunction - clsJoiningPipeOperator = New ROperator - clsFrequencyOperator = New ROperator clsDummyFunction = New RFunction - clsThemesTabOptionsFunction = New RFunction - clsgtExtraThemesFunction = New RFunction - clsGtFunction = New RFunction clsPivotWiderFunction = New RFunction + clsJoiningPipeOperator = New ROperator + clsSummaryOperator = New ROperator + clsFrequencyOperator = New ROperator + ucrReceiverFactors.SetMeAsReceiver() ucrSelectorSummaryTables.Reset() ucrSaveTable.Reset() @@ -227,52 +205,9 @@ Public Class dlgSummaryTables clsDummyFunction.AddParameter("rdo_checked", "rdoFrequency", iPosition:=1) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=2) - - - clsConcFunction.SetRCommand("c") - - - - clsPipeOperator.SetOperation("%>%") - clsPipeOperator.bBrackets = False - - - - - clsThemesTabOptionsFunction.SetPackageName("gt") - clsThemesTabOptionsFunction.SetRCommand("tab_options") - - clsgtExtraThemesFunction.SetPackageName("gtExtras") - - ' Gt function - clsGtFunction.SetPackageName("gt") - clsGtFunction.SetRCommand("gt") - - clsStubHeadFunction.SetPackageName("gt") - clsStubHeadFunction.SetRCommand("tab_stubhead") - - clsTabStyleFunction.SetRCommand("tab_style") - clsTabStyleFunction.SetPackageName("gt") - clsTabStyleFunction.AddParameter("style", clsRFunctionParameter:=clsTabStyleCellTextFunction, iPosition:=0) - clsTabStyleFunction.AddParameter("location", clsRFunctionParameter:=clsTabStyleCellTitleFunction, iPosition:=1) - - clsTabStyleCellTitleFunction.SetPackageName("gt") - clsTabStyleCellTitleFunction.SetRCommand("cells_title") - clsTabStyleCellTitleFunction.AddParameter("groups", Chr(34) & "title" & Chr(34), iPosition:=0) - - clsTabStyleCellTextFunction.SetPackageName("gt") - clsTabStyleCellTextFunction.SetRCommand("cell_text") - clsTabStyleCellTextFunction.AddParameter("size", clsRFunctionParameter:=clsTabStylePxFunction, iPosition:=0) - - clsTabStylePxFunction.SetPackageName("gt") - clsTabStylePxFunction.SetRCommand("px") - clsTabStylePxFunction.AddParameter("size", "18", bIncludeArgumentName:=False, iPosition:=0) - clsPivotWiderFunction.SetRCommand("pivot_wider") clsPivotWiderFunction.AddParameter("values_from", "value", iPosition:=1) - - clsSummariesList.SetRCommand("c") clsSummariesList.AddParameter("summary_mean", Chr(34) & "summary_mean" & Chr(34), bIncludeArgumentName:=False) ' TODO decide which default(s) to use? @@ -287,46 +222,21 @@ Public Class dlgSummaryTables clsFrequencyDefaultFunction.AddParameter("summaries", "count_label", iPosition:=11) clsFrequencyDefaultFunction.SetAssignToObject("frequency_table") - clsTableTitleFunction.SetPackageName("gt") - clsTableTitleFunction.SetRCommand("tab_header") - - clsTabFootnoteTitleFunction.SetPackageName("gt") - clsTabFootnoteTitleFunction.SetRCommand("tab_footnote") - - clsTabFootnoteSubtitleFunction.SetPackageName("gt") - clsTabFootnoteSubtitleFunction.SetRCommand("tab_footnote") - - clsFootnoteCellFunction.SetPackageName("gt") - clsFootnoteCellFunction.SetRCommand("tab_footnote") - - clsSecondFootnoteCellFunction.SetPackageName("gt") - clsSecondFootnoteCellFunction.SetRCommand("tab_footnote") - - clsFootnoteTitleLocationFunction.SetPackageName("gt") - clsFootnoteTitleLocationFunction.SetRCommand("cells_title") - - clsFootnoteSubtitleLocationFunction.SetPackageName("gt") - clsFootnoteSubtitleLocationFunction.SetRCommand("cells_title") - - clsTableSourcenoteFunction.SetPackageName("gt") - clsTableSourcenoteFunction.SetRCommand("tab_source_note") - - clsFootnoteCellBodyFunction.SetPackageName("gt") - clsFootnoteCellBodyFunction.SetRCommand("cells_body") - - clsSecondFootnoteCellBodyFunction.SetPackageName("gt") - clsSecondFootnoteCellBodyFunction.SetRCommand("cells_body") + ' Gt function + Dim clsGtFunction As New RFunction + clsGtFunction.SetPackageName("gt") + clsGtFunction.SetRCommand("gt") clsSummaryOperator.SetOperation("%>%") clsSummaryOperator.bBrackets = False clsSummaryOperator.AddParameter("tableFun", clsRFunctionParameter:=clsSummaryDefaultFunction, iPosition:=0) - clsSummaryOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2) + clsSummaryOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction.Clone, iPosition:=2) clsFrequencyOperator.SetOperation("%>%") clsFrequencyOperator.bBrackets = False clsFrequencyOperator.AddParameter("tableFun", clsRFunctionParameter:=clsFrequencyDefaultFunction, iPosition:=0) - clsFrequencyOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction, iPosition:=2) + clsFrequencyOperator.AddParameter("gt", clsRFunctionParameter:=clsGtFunction.Clone, iPosition:=2) clsJoiningPipeOperator.SetOperation("%>%") clsJoiningPipeOperator.AddParameter("mutable", clsROperatorParameter:=clsSummaryOperator, iPosition:=0) @@ -397,6 +307,8 @@ Public Class dlgSummaryTables End Sub Private Sub cmdSummaries_Click(sender As Object, e As EventArgs) Handles cmdSummaries.Click + Dim clsConcFunction As New RFunction + clsConcFunction.SetRCommand("c") sdgSummaries.SetRFunction(clsSummariesList, clsSummaryDefaultFunction, clsConcFunction, ucrSelectorSummaryTables, bResetSubdialog) bResetSubdialog = False sdgSummaries.bEnable2VariableTab = False @@ -407,29 +319,6 @@ Public Class dlgSummaryTables End Sub Private Sub cmdFormatTable_Click(sender As Object, e As EventArgs) Handles cmdFormatTable.Click - 'If rdoSummaryTable.Checked Then - ' sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, - ' clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, - ' clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, - ' clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - ' clsNewMutableOperator:=clsSummaryOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, - ' clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, - ' clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) - 'Else - ' sdgFormatSummaryTables.SetRCode(clsNewTableTitleFunction:=clsTableTitleFunction, clsNewTabFootnoteTitleFunction:=clsTabFootnoteTitleFunction, clsNewTableSourcenoteFunction:=clsTableSourcenoteFunction, clsNewDummyFunction:=clsDummyFunction, - ' clsNewFootnoteCellFunction:=clsFootnoteCellFunction, clsNewSecondFootnoteCellBodyFunction:=clsSecondFootnoteCellBodyFunction, - ' clsNewPipeOperator:=clsPipeOperator, clsNewFootnoteTitleLocationFunction:=clsFootnoteTitleLocationFunction, clsNewFootnoteCellBodyFunction:=clsFootnoteCellBodyFunction, - ' clsNewFootnoteSubtitleLocationFunction:=clsFootnoteSubtitleLocationFunction, clsNewTabFootnoteSubtitleFunction:=clsTabFootnoteSubtitleFunction, clsNewJoiningOperator:=clsJoiningPipeOperator, - ' clsNewMutableOperator:=clsFrequencyOperator, clsNewSecondFootnoteCellFunction:=clsSecondFootnoteCellFunction, - ' clsNewTabStyleCellTextFunction:=clsTabStyleCellTextFunction, clsNewTabStyleFunction:=clsTabStyleFunction, clsNewTabStylePxFunction:=clsTabStylePxFunction, clsNewThemesTabOptionFunction:=clsThemesTabOptionsFunction, - ' clsNewgtExtraThemesFunction:=clsgtExtraThemesFunction, bReset:=bResetFormatSubdialog) - 'End If - - 'sdgFormatSummaryTables.ShowDialog() - 'bResetFormatSubdialog = False - - - Dim clsROperator As ROperator If rdoFrequencyTable.Checked Then From 2b2d92563e1172c6625ad3d4208c41a55c743b1e Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 22 Feb 2024 11:06:04 +0300 Subject: [PATCH 009/273] fixes themes bugs and improves code --- instat/sdgTableOptions.Designer.vb | 76 +++++++++++++++--------------- instat/sdgTableOptions.resx | 2 +- instat/sdgTableOptions.vb | 15 +++--- 3 files changed, 47 insertions(+), 46 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index 260aca367ac..d3446e58ef9 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -32,10 +32,6 @@ Partial Class sdgTableOptions Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColName = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblFooterNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() @@ -49,6 +45,10 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() @@ -164,43 +164,13 @@ Partial Class sdgTableOptions Me.dataGridFooterNotes.AllowUserToAddRows = False Me.dataGridFooterNotes.AllowUserToDeleteRows = False Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColName, Me.colFooterRowExpression, Me.colFooterFormat}) + Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) Me.dataGridFooterNotes.Location = New System.Drawing.Point(7, 22) Me.dataGridFooterNotes.Name = "dataGridFooterNotes" Me.dataGridFooterNotes.RowHeadersWidth = 62 Me.dataGridFooterNotes.Size = New System.Drawing.Size(630, 193) Me.dataGridFooterNotes.TabIndex = 5 ' - 'colFooterNoteText - ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 - ' - 'colFooterColName - ' - Me.colFooterColName.HeaderText = "Column Expression(s)" - Me.colFooterColName.MinimumWidth = 8 - Me.colFooterColName.Name = "colFooterColName" - Me.colFooterColName.Width = 140 - ' - 'colFooterRowExpression - ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 - ' - 'colFooterFormat - ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 - ' 'lblFooterNotes ' Me.lblFooterNotes.AutoSize = True @@ -333,6 +303,36 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColExpression + ' + Me.colFooterColExpression.HeaderText = "Column Expression" + Me.colFooterColExpression.MinimumWidth = 8 + Me.colFooterColExpression.Name = "colFooterColExpression" + Me.colFooterColExpression.Width = 140 + ' + 'colFooterRowExpression + ' + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 + ' + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -381,10 +381,10 @@ Partial Class sdgTableOptions Friend WithEvents dataGridFooterNotes As DataGridView Friend WithEvents dataGridSourceNotes As DataGridView Friend WithEvents lblSourceNotes As Label + Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn + Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn - Friend WithEvents colFooterColName As DataGridViewTextBoxColumn + Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterFormat As DataGridViewButtonColumn - Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn - Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn End Class diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index 49a1b0eca6b..35950423a91 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -120,7 +120,7 @@ True - + True diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index 72c90d41ae0..a15e5bbe092 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -298,9 +298,10 @@ Public Class sdgTableOptions ' Add column and row expressions as paramters if user has typed them If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then Dim clsFooterLocationNoteRFunction As New RFunction + clsFooterLocationNoteRFunction.SetPackageName("gt") clsFooterLocationNoteRFunction.SetRCommand("cells_body") - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=GetStringValue(row.Cells(1).Value, True))) - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=GetStringValue(row.Cells(2).Value, True))) + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=GetStringValue(row.Cells(1).Value, False))) + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=GetStringValue(row.Cells(2).Value, False))) clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) End If ElseIf dataGrid Is dataGridSourceNotes Then @@ -379,6 +380,10 @@ Public Class sdgTableOptions Private Sub SetupThemeRFunctionsInOperatorOnNew(clsOperator As ROperator) clsThemeRFunction = New RFunction + ' Uncheck then the select radio button to orces the panel to raise it ControlValueChanged event + rdoSelectTheme.Checked = False + rdoSelectTheme.Checked = True + If Not clsOperator.ContainsParameter("theme_format") Then Exit Sub End If @@ -389,9 +394,9 @@ Public Class sdgTableOptions rdoManualTheme.Checked = True Else rdoSelectTheme.Checked = True + ucrCboSelectThemes.SetName(clsThemeRFunction.strRCommand) End If - End Sub Private Sub SetThemesInOperatorOnReturn(clsOperator As ROperator) @@ -407,8 +412,6 @@ Public Class sdgTableOptions ucrCboSelectThemes.Visible = False btnManualTheme.Visible = False - 'clsThemeRFunction = New RFunction - If rdoSelectTheme.Checked Then ucrCboSelectThemes.Visible = True clsThemeRFunction.SetPackageName("gtExtras") @@ -450,8 +453,6 @@ Public Class sdgTableOptions clsThemeRFunction.SetRCommand(strCommand) End Sub - - Private Sub btnManualTheme_Click(sender As Object, e As EventArgs) Handles btnManualTheme.Click sdgSummaryThemes.SetRCode(bReset:=True, clsNewThemesTabOption:=clsThemeRFunction) sdgSummaryThemes.ShowDialog(Me) From 9ffcbf87b3306d1a2cf0d6ee8a3c5d71e22ba84a Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Tue, 5 Mar 2024 16:04:36 +0300 Subject: [PATCH 010/273] Changes to the code --- instat/dlgRPackages.Designer.vb | 112 +++++++++++++++++++++++++++----- instat/dlgRPackages.vb | 75 +++++++++++++++++++-- 2 files changed, 166 insertions(+), 21 deletions(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index c8fd71c7a55..07c15f680e7 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -24,15 +24,20 @@ Partial Class dlgInstallRPackage Private Sub InitializeComponent() Me.cmdCheck = New System.Windows.Forms.Button() Me.lblRPackage = New System.Windows.Forms.Label() - Me.ucrInputMessage = New instat.ucrInputTextBox() + Me.rdoCRAN = New System.Windows.Forms.RadioButton() + Me.rdoRPackage = New System.Windows.Forms.RadioButton() + Me.lblRepository = New System.Windows.Forms.Label() Me.ucrBase = New instat.ucrButtons() Me.ucrInputTextBoxRPackage = New instat.ucrInputTextBox() + Me.ucrPnlRPackages = New instat.UcrPanel() + Me.ucrInputMessage = New instat.ucrInputTextBox() + Me.ucrInputRepositoryName = New instat.ucrInputTextBox() Me.SuspendLayout() ' 'cmdCheck ' Me.cmdCheck.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCheck.Location = New System.Drawing.Point(14, 81) + Me.cmdCheck.Location = New System.Drawing.Point(14, 94) Me.cmdCheck.Name = "cmdCheck" Me.cmdCheck.Size = New System.Drawing.Size(75, 22) Me.cmdCheck.TabIndex = 16 @@ -43,22 +48,59 @@ Partial Class dlgInstallRPackage ' Me.lblRPackage.AutoSize = True Me.lblRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRPackage.Location = New System.Drawing.Point(11, 33) + Me.lblRPackage.Location = New System.Drawing.Point(21, 44) Me.lblRPackage.Name = "lblRPackage" Me.lblRPackage.Size = New System.Drawing.Size(64, 13) Me.lblRPackage.TabIndex = 1 Me.lblRPackage.Text = "R Package:" ' - 'ucrInputMessage + 'rdoCRAN ' - Me.ucrInputMessage.AddQuotesIfUnrecognised = True - Me.ucrInputMessage.AutoSize = True - Me.ucrInputMessage.IsMultiline = False - Me.ucrInputMessage.IsReadOnly = True - Me.ucrInputMessage.Location = New System.Drawing.Point(95, 81) - Me.ucrInputMessage.Name = "ucrInputMessage" - Me.ucrInputMessage.Size = New System.Drawing.Size(337, 22) - Me.ucrInputMessage.TabIndex = 17 + Me.rdoCRAN.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoCRAN.BackColor = System.Drawing.SystemColors.Control + Me.rdoCRAN.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCRAN.FlatAppearance.BorderSize = 2 + Me.rdoCRAN.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCRAN.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoCRAN.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoCRAN.Location = New System.Drawing.Point(104, 3) + Me.rdoCRAN.Name = "rdoCRAN" + Me.rdoCRAN.Size = New System.Drawing.Size(91, 28) + Me.rdoCRAN.TabIndex = 21 + Me.rdoCRAN.TabStop = True + Me.rdoCRAN.Tag = "Frequency" + Me.rdoCRAN.Text = "CRAN" + Me.rdoCRAN.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoCRAN.UseVisualStyleBackColor = False + ' + 'rdoRPackage + ' + Me.rdoRPackage.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoRPackage.BackColor = System.Drawing.SystemColors.Control + Me.rdoRPackage.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRPackage.FlatAppearance.BorderSize = 2 + Me.rdoRPackage.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRPackage.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoRPackage.Location = New System.Drawing.Point(192, 3) + Me.rdoRPackage.Name = "rdoRPackage" + Me.rdoRPackage.Size = New System.Drawing.Size(91, 28) + Me.rdoRPackage.TabIndex = 22 + Me.rdoRPackage.TabStop = True + Me.rdoRPackage.Tag = "Frequency" + Me.rdoRPackage.Text = "R Package " + Me.rdoRPackage.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRPackage.UseVisualStyleBackColor = False + ' + 'lblRepository + ' + Me.lblRepository.AutoSize = True + Me.lblRepository.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRepository.Location = New System.Drawing.Point(3, 98) + Me.lblRepository.Name = "lblRepository" + Me.lblRepository.Size = New System.Drawing.Size(91, 13) + Me.lblRepository.TabIndex = 24 + Me.lblRepository.Text = "Repository Name:" ' 'ucrBase ' @@ -75,22 +117,57 @@ Partial Class dlgInstallRPackage Me.ucrInputTextBoxRPackage.AutoSize = True Me.ucrInputTextBoxRPackage.IsMultiline = False Me.ucrInputTextBoxRPackage.IsReadOnly = False - Me.ucrInputTextBoxRPackage.Location = New System.Drawing.Point(75, 31) + Me.ucrInputTextBoxRPackage.Location = New System.Drawing.Point(95, 42) Me.ucrInputTextBoxRPackage.Name = "ucrInputTextBoxRPackage" Me.ucrInputTextBoxRPackage.Size = New System.Drawing.Size(197, 22) Me.ucrInputTextBoxRPackage.TabIndex = 0 ' + 'ucrPnlRPackages + ' + Me.ucrPnlRPackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRPackages.Location = New System.Drawing.Point(83, 2) + Me.ucrPnlRPackages.Name = "ucrPnlRPackages" + Me.ucrPnlRPackages.Size = New System.Drawing.Size(226, 34) + Me.ucrPnlRPackages.TabIndex = 20 + ' + 'ucrInputMessage + ' + Me.ucrInputMessage.AddQuotesIfUnrecognised = True + Me.ucrInputMessage.AutoSize = True + Me.ucrInputMessage.IsMultiline = False + Me.ucrInputMessage.IsReadOnly = True + Me.ucrInputMessage.Location = New System.Drawing.Point(95, 94) + Me.ucrInputMessage.Name = "ucrInputMessage" + Me.ucrInputMessage.Size = New System.Drawing.Size(337, 22) + Me.ucrInputMessage.TabIndex = 17 + ' + 'ucrInputRepositoryName + ' + Me.ucrInputRepositoryName.AddQuotesIfUnrecognised = True + Me.ucrInputRepositoryName.AutoSize = True + Me.ucrInputRepositoryName.IsMultiline = False + Me.ucrInputRepositoryName.IsReadOnly = False + Me.ucrInputRepositoryName.Location = New System.Drawing.Point(93, 95) + Me.ucrInputRepositoryName.Name = "ucrInputRepositoryName" + Me.ucrInputRepositoryName.Size = New System.Drawing.Size(197, 22) + Me.ucrInputRepositoryName.TabIndex = 23 + ' 'dlgInstallRPackage ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(448, 194) - Me.Controls.Add(Me.ucrInputMessage) - Me.Controls.Add(Me.cmdCheck) + Me.Controls.Add(Me.rdoRPackage) + Me.Controls.Add(Me.rdoCRAN) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.lblRPackage) Me.Controls.Add(Me.ucrInputTextBoxRPackage) + Me.Controls.Add(Me.ucrPnlRPackages) + Me.Controls.Add(Me.cmdCheck) + Me.Controls.Add(Me.ucrInputMessage) + Me.Controls.Add(Me.ucrInputRepositoryName) + Me.Controls.Add(Me.lblRepository) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -106,4 +183,9 @@ Partial Class dlgInstallRPackage Friend WithEvents ucrInputMessage As ucrInputTextBox Friend WithEvents cmdCheck As Button Friend WithEvents lblRPackage As Label + Friend WithEvents ucrPnlRPackages As UcrPanel + Friend WithEvents rdoCRAN As RadioButton + Friend WithEvents rdoRPackage As RadioButton + Friend WithEvents lblRepository As Label + Friend WithEvents ucrInputRepositoryName As ucrInputTextBox End Class diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 3ef639aaa9a..7df24cbd773 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -4,8 +4,11 @@ Public Class dlgInstallRPackage Private bReset As Boolean = True Private bFirstLoad As Boolean = True Private clsInstallPackage As New RFunction + Private clsRepositoryFunction As New RFunction Private clsBeforeOptionsFunc As New RFunction Private clsAfterOptionsFunc As New RFunction + Private clsPasteFunction As New RFunction + Private clsDummyFunction As New RFunction Private Sub dlgRPackages_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -24,6 +27,19 @@ Public Class dlgInstallRPackage ucrBase.iHelpTopicID = 592 ucrBase.clsRsyntax.iCallType = 2 ucrInputTextBoxRPackage.SetParameter(New RParameter("pkgs", 1)) + ucrPnlRPackages.AddRadioButton(rdoCRAN) + ucrPnlRPackages.AddRadioButton(rdoRPackage) + + ucrInputRepositoryName.SetLinkedDisplayControl(lblRepository) + + ucrPnlRPackages.AddParameterValuesCondition(rdoCRAN, "checked", "cran") + ucrPnlRPackages.AddParameterValuesCondition(rdoRPackage, "checked", "rpackage") + + ucrInputMessage.SetLinkedDisplayControl(cmdCheck) + + ucrPnlRPackages.AddToLinkedControls(ucrInputRepositoryName, {rdoRPackage}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRPackages.AddToLinkedControls(ucrInputMessage, {rdoCRAN}, bNewLinkedHideIfParameterMissing:=True) + CheckEnable() End Sub @@ -31,6 +47,10 @@ Public Class dlgInstallRPackage clsInstallPackage = New RFunction clsBeforeOptionsFunc = New RFunction clsAfterOptionsFunc = New RFunction + clsRepositoryFunction = New RFunction + clsDummyFunction = New RFunction + + clsDummyFunction.AddParameter("checked", "cran", iPosition:=1) clsInstallPackage.SetRCommand("install.packages") clsInstallPackage.AddParameter("repos", Chr(34) & "https://cran.rstudio.com/" & Chr(34), iPosition:=1) @@ -38,24 +58,30 @@ Public Class dlgInstallRPackage clsBeforeOptionsFunc.SetRCommand("options") clsBeforeOptionsFunc.AddParameter(strParameterName:="warn", strParameterValue:="2") + clsPasteFunction.SetRCommand("paste0") + + clsRepositoryFunction.SetRCommand("install_github") + clsRepositoryFunction.SetPackageName("devtools") clsAfterOptionsFunc.SetRCommand("options") clsAfterOptionsFunc.AddParameter(strParameterName:="warn", strParameterValue:="0") - ucrBase.clsRsyntax.AddToBeforeCodes(clsBeforeOptionsFunc) - ucrBase.clsRsyntax.AddToAfterCodes(clsAfterOptionsFunc) ucrBase.clsRsyntax.SetBaseRFunction(clsInstallPackage) End Sub Private Sub SetRCodeForControls(bReset As Boolean) ucrInputTextBoxRPackage.SetRCode(clsInstallPackage, bReset) + If bReset Then + ucrPnlRPackages.SetRCode(clsDummyFunction, bReset) + ucrInputRepositoryName.SetRCode(clsRepositoryFunction, bReset) + End If End Sub Private Sub TestOkEnabled() - If ucrInputTextBoxRPackage.IsEmpty Then - ucrBase.OKEnabled(False) - Else - ucrBase.OKEnabled(True) + If rdoCRAN.Checked Then + ucrBase.OKEnabled(Not ucrInputTextBoxRPackage.IsEmpty) + ElseIf rdoRPackage.Checked Then + ucrBase.OKEnabled(Not ucrInputRepositoryName.IsEmpty AndAlso Not ucrInputTextBoxRPackage.IsEmpty) End If End Sub @@ -64,6 +90,7 @@ Public Class dlgInstallRPackage ucrInputMessage.txtInput.BackColor = Color.White CheckEnable() TestOkEnabled() + GithubOption() End Sub Private Sub Check() @@ -127,4 +154,40 @@ Public Class dlgInstallRPackage Private Sub cmdCheck_Click(sender As Object, e As EventArgs) Handles cmdCheck.Click check() End Sub + + Private Sub ucrPnlRPackages_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRPackages.ControlValueChanged + If rdoCRAN.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsInstallPackage) + ucrBase.clsRsyntax.AddToBeforeCodes(clsBeforeOptionsFunc) + ucrBase.clsRsyntax.AddToAfterCodes(clsAfterOptionsFunc) + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsRepositoryFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsBeforeOptionsFunc) + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsAfterOptionsFunc) + End If + ucrInputTextBoxRPackage.txtInput.Clear() + End Sub + + Private Sub ucrInputRepositoryName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRepositoryName.ControlContentsChanged + TestOkEnabled() + GithubOption() + End Sub + + Private Sub GithubOption() + If Not (ucrInputTextBoxRPackage.IsEmpty AndAlso ucrInputRepositoryName.IsEmpty) Then + clsPasteFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputTextBoxRPackage.GetText & Chr(34), bIncludeArgumentName:=False) + + clsRepositoryFunction.AddParameter("package", clsRFunctionParameter:=clsPasteFunction, iPosition:=0, bIncludeArgumentName:=False) + + Else + clsPasteFunction.RemoveParameterByName("paste") + clsRepositoryFunction.RemoveParameterByName("package") + End If + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOkEnabled() + End Sub End Class \ No newline at end of file From ddc0a9d81d40071eccafacdd9aef7c19ab0e69c8 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Wed, 13 Mar 2024 11:58:00 +0300 Subject: [PATCH 011/273] changes made --- instat/dlgRPackages.Designer.vb | 8 +++--- instat/dlgRPackages.vb | 48 +++++++++++++++++++++++---------- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index 07c15f680e7..ee594161aaf 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -96,7 +96,7 @@ Partial Class dlgInstallRPackage ' Me.lblRepository.AutoSize = True Me.lblRepository.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRepository.Location = New System.Drawing.Point(3, 98) + Me.lblRepository.Location = New System.Drawing.Point(3, 72) Me.lblRepository.Name = "lblRepository" Me.lblRepository.Size = New System.Drawing.Size(91, 13) Me.lblRepository.TabIndex = 24 @@ -147,7 +147,7 @@ Partial Class dlgInstallRPackage Me.ucrInputRepositoryName.AutoSize = True Me.ucrInputRepositoryName.IsMultiline = False Me.ucrInputRepositoryName.IsReadOnly = False - Me.ucrInputRepositoryName.Location = New System.Drawing.Point(93, 95) + Me.ucrInputRepositoryName.Location = New System.Drawing.Point(93, 69) Me.ucrInputRepositoryName.Name = "ucrInputRepositoryName" Me.ucrInputRepositoryName.Size = New System.Drawing.Size(197, 22) Me.ucrInputRepositoryName.TabIndex = 23 @@ -164,10 +164,10 @@ Partial Class dlgInstallRPackage Me.Controls.Add(Me.lblRPackage) Me.Controls.Add(Me.ucrInputTextBoxRPackage) Me.Controls.Add(Me.ucrPnlRPackages) - Me.Controls.Add(Me.cmdCheck) - Me.Controls.Add(Me.ucrInputMessage) Me.Controls.Add(Me.ucrInputRepositoryName) Me.Controls.Add(Me.lblRepository) + Me.Controls.Add(Me.cmdCheck) + Me.Controls.Add(Me.ucrInputMessage) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 7df24cbd773..ee30fb93900 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -98,8 +98,13 @@ Public Class dlgInstallRPackage Dim expOutput As SymbolicExpression Dim chrOutput As CharacterVector - clsPackageCheck.SetRCommand("package_check") - clsPackageCheck.AddParameter("package", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) + If rdoCRAN.Checked Then + clsPackageCheck.SetRCommand("package_check") + clsPackageCheck.AddParameter("package", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) + ElseIf rdoRPackage.Checked Then + clsPackageCheck.SetRCommand("check_github_repo") + clsPackageCheck.AddParameter("repo", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) + End If expOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsPackageCheck.ToScript(), bSilent:=True) @@ -116,22 +121,37 @@ Public Class dlgInstallRPackage Select Case chrOutput(0) Case "1" - If chrOutput.Count = 4 Then - If chrOutput(1) = "0" Then - ucrInputMessage.SetText("Package is installed and up to date.") - ucrInputMessage.txtInput.BackColor = Color.Yellow - ElseIf chrOutput(1) = "-1" Then - ucrInputMessage.SetText("Package is installed. Newer version available: " & chrOutput(3) & " (current: " & chrOutput(2) & ").") + If rdoCRAN.Checked Then + If chrOutput.Count = 4 Then + If chrOutput(1) = "0" Then + ucrInputMessage.SetText("Package is installed and up to date.") + ucrInputMessage.txtInput.BackColor = Color.Yellow + ElseIf chrOutput(1) = "-1" Then + ucrInputMessage.SetText("Package is installed. Newer version available: " & chrOutput(3) & " (current: " & chrOutput(2) & ").") + End If + Else + ucrInputMessage.SetText("Package is installed. No version information available.") End If - Else - ucrInputMessage.SetText("Package is installed. No version information available.") + ElseIf rdoRPackage.Checked Then + ucrInputMessage.SetText("Package exists in the repo and is ready for installation") + ucrInputMessage.txtInput.BackColor = Color.LightGreen End If Case "2" - ucrInputMessage.SetText("Package exists and not currently installed.") - ucrInputMessage.txtInput.BackColor = Color.LightGreen + If rdoCRAN.Checked Then + ucrInputMessage.SetText("Package exists and not currently installed.") + ucrInputMessage.txtInput.BackColor = Color.LightGreen + ElseIf rdoRPackage.Checked Then + ucrInputMessage.SetText("Package exists in the repo but is not in the R language") + ucrInputMessage.txtInput.BackColor = Color.LightGreen + End If Case "3" - ucrInputMessage.SetText("Package is installed but not a current CRAN package") - ucrInputMessage.txtInput.BackColor = Color.LightBlue + If rdoCRAN.Checked Then + ucrInputMessage.SetText("Package is installed but not a current CRAN package") + ucrInputMessage.txtInput.BackColor = Color.LightBlue + ElseIf rdoRPackage.Checked Then + ucrInputMessage.SetText("Not a package in the given repo. Perhaps spelled wrongly?") + ucrInputMessage.txtInput.BackColor = Color.LightCoral + End If Case "4" ucrInputMessage.SetText("Not a current CRAN package. Perhaps spelled wrongly, or archived?") ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue From 11056d8d1a24b9fe372f413ce294eaccc567ec00 Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Thu, 14 Mar 2024 18:10:02 +0300 Subject: [PATCH 012/273] changes --- instat/dlgRPackages.vb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index ee30fb93900..70db1f165a1 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -195,13 +195,9 @@ Public Class dlgInstallRPackage Private Sub GithubOption() If Not (ucrInputTextBoxRPackage.IsEmpty AndAlso ucrInputRepositoryName.IsEmpty) Then - clsPasteFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputTextBoxRPackage.GetText & Chr(34), bIncludeArgumentName:=False) - - clsRepositoryFunction.AddParameter("package", clsRFunctionParameter:=clsPasteFunction, iPosition:=0, bIncludeArgumentName:=False) - + clsRepositoryFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputTextBoxRPackage.GetText & Chr(34), bIncludeArgumentName:=False) Else - clsPasteFunction.RemoveParameterByName("paste") - clsRepositoryFunction.RemoveParameterByName("package") + clsRepositoryFunction.RemoveParameterByName("paste") End If End Sub From 126e73ae1eefcd268c818414030c993f8c500aea Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Fri, 15 Mar 2024 14:24:40 +0300 Subject: [PATCH 013/273] Changes to the code --- instat/dlgRPackages.vb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 70db1f165a1..63ce0a8397a 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -7,7 +7,6 @@ Public Class dlgInstallRPackage Private clsRepositoryFunction As New RFunction Private clsBeforeOptionsFunc As New RFunction Private clsAfterOptionsFunc As New RFunction - Private clsPasteFunction As New RFunction Private clsDummyFunction As New RFunction Private Sub dlgRPackages_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -38,7 +37,6 @@ Public Class dlgInstallRPackage ucrInputMessage.SetLinkedDisplayControl(cmdCheck) ucrPnlRPackages.AddToLinkedControls(ucrInputRepositoryName, {rdoRPackage}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlRPackages.AddToLinkedControls(ucrInputMessage, {rdoCRAN}, bNewLinkedHideIfParameterMissing:=True) CheckEnable() End Sub @@ -58,8 +56,6 @@ Public Class dlgInstallRPackage clsBeforeOptionsFunc.SetRCommand("options") clsBeforeOptionsFunc.AddParameter(strParameterName:="warn", strParameterValue:="2") - clsPasteFunction.SetRCommand("paste0") - clsRepositoryFunction.SetRCommand("install_github") clsRepositoryFunction.SetPackageName("devtools") @@ -104,6 +100,7 @@ Public Class dlgInstallRPackage ElseIf rdoRPackage.Checked Then clsPackageCheck.SetRCommand("check_github_repo") clsPackageCheck.AddParameter("repo", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) + clsPackageCheck.AddParameter("owner", Chr(34) & ucrInputRepositoryName.GetText() & Chr(34)) End If expOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsPackageCheck.ToScript(), bSilent:=True) From 785a5c07a7e4084753d9590820f16a45cb3fcdce Mon Sep 17 00:00:00 2001 From: Barbra2020 Date: Tue, 19 Mar 2024 11:10:33 +0300 Subject: [PATCH 014/273] tab order --- instat/dlgRPackages.Designer.vb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index ee594161aaf..45cad1a8e16 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -40,7 +40,7 @@ Partial Class dlgInstallRPackage Me.cmdCheck.Location = New System.Drawing.Point(14, 94) Me.cmdCheck.Name = "cmdCheck" Me.cmdCheck.Size = New System.Drawing.Size(75, 22) - Me.cmdCheck.TabIndex = 16 + Me.cmdCheck.TabIndex = 7 Me.cmdCheck.Text = "Check" Me.cmdCheck.UseVisualStyleBackColor = True ' @@ -51,7 +51,7 @@ Partial Class dlgInstallRPackage Me.lblRPackage.Location = New System.Drawing.Point(21, 44) Me.lblRPackage.Name = "lblRPackage" Me.lblRPackage.Size = New System.Drawing.Size(64, 13) - Me.lblRPackage.TabIndex = 1 + Me.lblRPackage.TabIndex = 3 Me.lblRPackage.Text = "R Package:" ' 'rdoCRAN @@ -66,7 +66,7 @@ Partial Class dlgInstallRPackage Me.rdoCRAN.Location = New System.Drawing.Point(104, 3) Me.rdoCRAN.Name = "rdoCRAN" Me.rdoCRAN.Size = New System.Drawing.Size(91, 28) - Me.rdoCRAN.TabIndex = 21 + Me.rdoCRAN.TabIndex = 1 Me.rdoCRAN.TabStop = True Me.rdoCRAN.Tag = "Frequency" Me.rdoCRAN.Text = "CRAN" @@ -85,7 +85,7 @@ Partial Class dlgInstallRPackage Me.rdoRPackage.Location = New System.Drawing.Point(192, 3) Me.rdoRPackage.Name = "rdoRPackage" Me.rdoRPackage.Size = New System.Drawing.Size(91, 28) - Me.rdoRPackage.TabIndex = 22 + Me.rdoRPackage.TabIndex = 2 Me.rdoRPackage.TabStop = True Me.rdoRPackage.Tag = "Frequency" Me.rdoRPackage.Text = "R Package " @@ -99,7 +99,7 @@ Partial Class dlgInstallRPackage Me.lblRepository.Location = New System.Drawing.Point(3, 72) Me.lblRepository.Name = "lblRepository" Me.lblRepository.Size = New System.Drawing.Size(91, 13) - Me.lblRepository.TabIndex = 24 + Me.lblRepository.TabIndex = 5 Me.lblRepository.Text = "Repository Name:" ' 'ucrBase @@ -109,7 +109,7 @@ Partial Class dlgInstallRPackage Me.ucrBase.Location = New System.Drawing.Point(24, 130) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 15 + Me.ucrBase.TabIndex = 9 ' 'ucrInputTextBoxRPackage ' @@ -120,7 +120,7 @@ Partial Class dlgInstallRPackage Me.ucrInputTextBoxRPackage.Location = New System.Drawing.Point(95, 42) Me.ucrInputTextBoxRPackage.Name = "ucrInputTextBoxRPackage" Me.ucrInputTextBoxRPackage.Size = New System.Drawing.Size(197, 22) - Me.ucrInputTextBoxRPackage.TabIndex = 0 + Me.ucrInputTextBoxRPackage.TabIndex = 4 ' 'ucrPnlRPackages ' @@ -128,7 +128,7 @@ Partial Class dlgInstallRPackage Me.ucrPnlRPackages.Location = New System.Drawing.Point(83, 2) Me.ucrPnlRPackages.Name = "ucrPnlRPackages" Me.ucrPnlRPackages.Size = New System.Drawing.Size(226, 34) - Me.ucrPnlRPackages.TabIndex = 20 + Me.ucrPnlRPackages.TabIndex = 0 ' 'ucrInputMessage ' @@ -139,7 +139,7 @@ Partial Class dlgInstallRPackage Me.ucrInputMessage.Location = New System.Drawing.Point(95, 94) Me.ucrInputMessage.Name = "ucrInputMessage" Me.ucrInputMessage.Size = New System.Drawing.Size(337, 22) - Me.ucrInputMessage.TabIndex = 17 + Me.ucrInputMessage.TabIndex = 8 ' 'ucrInputRepositoryName ' @@ -150,7 +150,7 @@ Partial Class dlgInstallRPackage Me.ucrInputRepositoryName.Location = New System.Drawing.Point(93, 69) Me.ucrInputRepositoryName.Name = "ucrInputRepositoryName" Me.ucrInputRepositoryName.Size = New System.Drawing.Size(197, 22) - Me.ucrInputRepositoryName.TabIndex = 23 + Me.ucrInputRepositoryName.TabIndex = 6 ' 'dlgInstallRPackage ' From bc841b748ce318504a2ea2e0aa66949aa6a641a3 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 5 Apr 2024 13:59:20 +0300 Subject: [PATCH 015/273] Added header footers and disable alignement format --- instat/sdgTableOptions.Designer.vb | 193 ++++++++++++------- instat/sdgTableOptions.resx | 9 + instat/sdgTableOptions.vb | 157 +++++++++++---- instat/sdgTableOptionsTextFormat.Designer.vb | 1 + 4 files changed, 252 insertions(+), 108 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index d3446e58ef9..814132d49fc 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -31,8 +31,17 @@ Partial Class sdgTableOptions Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.tbpFooters = New System.Windows.Forms.TabPage() - Me.dataGridFooterNotes = New System.Windows.Forms.DataGridView() - Me.lblFooterNotes = New System.Windows.Forms.Label() + Me.dataGridHeaderFooterNotes = New System.Windows.Forms.DataGridView() + Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.DataGridViewButtonColumn1 = New System.Windows.Forms.DataGridViewButtonColumn() + Me.lblHeaderFooterNotes = New System.Windows.Forms.Label() + Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.lblFooterCellNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -45,14 +54,11 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() - CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpThemes.SuspendLayout() @@ -67,7 +73,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(650, 262) + Me.tbpFormatOptions.Size = New System.Drawing.Size(650, 259) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -81,7 +87,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(642, 236) + Me.tbpHeader.Size = New System.Drawing.Size(642, 233) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -150,35 +156,114 @@ Partial Class sdgTableOptions ' 'tbpFooters ' - Me.tbpFooters.Controls.Add(Me.dataGridFooterNotes) - Me.tbpFooters.Controls.Add(Me.lblFooterNotes) + Me.tbpFooters.Controls.Add(Me.dataGridHeaderFooterNotes) + Me.tbpFooters.Controls.Add(Me.lblHeaderFooterNotes) + Me.tbpFooters.Controls.Add(Me.dataGridCellFooterNotes) + Me.tbpFooters.Controls.Add(Me.lblFooterCellNotes) Me.tbpFooters.Location = New System.Drawing.Point(4, 22) Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(642, 236) + Me.tbpFooters.Size = New System.Drawing.Size(642, 233) Me.tbpFooters.TabIndex = 3 Me.tbpFooters.Text = "Footers" Me.tbpFooters.UseVisualStyleBackColor = True ' - 'dataGridFooterNotes + 'dataGridHeaderFooterNotes + ' + Me.dataGridHeaderFooterNotes.AllowUserToAddRows = False + Me.dataGridHeaderFooterNotes.AllowUserToDeleteRows = False + Me.dataGridHeaderFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridHeaderFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewButtonColumn1}) + Me.dataGridHeaderFooterNotes.Location = New System.Drawing.Point(6, 24) + Me.dataGridHeaderFooterNotes.Name = "dataGridHeaderFooterNotes" + Me.dataGridHeaderFooterNotes.RowHeadersWidth = 62 + Me.dataGridHeaderFooterNotes.Size = New System.Drawing.Size(630, 84) + Me.dataGridHeaderFooterNotes.TabIndex = 7 + ' + 'DataGridViewTextBoxColumn2 + ' + Me.DataGridViewTextBoxColumn2.HeaderText = "Note Text" + Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" + Me.DataGridViewTextBoxColumn2.Width = 220 + ' + 'DataGridViewTextBoxColumn3 + ' + Me.DataGridViewTextBoxColumn3.HeaderText = "Header" + Me.DataGridViewTextBoxColumn3.Items.AddRange(New Object() {"title", "subtitle"}) + Me.DataGridViewTextBoxColumn3.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" + Me.DataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.DataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic + Me.DataGridViewTextBoxColumn3.Width = 140 + ' + 'DataGridViewButtonColumn1 + ' + Me.DataGridViewButtonColumn1.HeaderText = "" + Me.DataGridViewButtonColumn1.Name = "DataGridViewButtonColumn1" + Me.DataGridViewButtonColumn1.ReadOnly = True + Me.DataGridViewButtonColumn1.Text = "Format" + Me.DataGridViewButtonColumn1.UseColumnTextForButtonValue = True + Me.DataGridViewButtonColumn1.Width = 60 + ' + 'lblHeaderFooterNotes + ' + Me.lblHeaderFooterNotes.AutoSize = True + Me.lblHeaderFooterNotes.Location = New System.Drawing.Point(9, 8) + Me.lblHeaderFooterNotes.Name = "lblHeaderFooterNotes" + Me.lblHeaderFooterNotes.Size = New System.Drawing.Size(109, 13) + Me.lblHeaderFooterNotes.TabIndex = 6 + Me.lblHeaderFooterNotes.Text = "Header footers notes:" + ' + 'dataGridCellFooterNotes + ' + Me.dataGridCellFooterNotes.AllowUserToAddRows = False + Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False + Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) + Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(7, 139) + Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" + Me.dataGridCellFooterNotes.RowHeadersWidth = 62 + Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 84) + Me.dataGridCellFooterNotes.TabIndex = 5 + ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColExpression + ' + Me.colFooterColExpression.HeaderText = "Column Expression" + Me.colFooterColExpression.MinimumWidth = 8 + Me.colFooterColExpression.Name = "colFooterColExpression" + Me.colFooterColExpression.Width = 140 ' - Me.dataGridFooterNotes.AllowUserToAddRows = False - Me.dataGridFooterNotes.AllowUserToDeleteRows = False - Me.dataGridFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridFooterNotes.Location = New System.Drawing.Point(7, 22) - Me.dataGridFooterNotes.Name = "dataGridFooterNotes" - Me.dataGridFooterNotes.RowHeadersWidth = 62 - Me.dataGridFooterNotes.Size = New System.Drawing.Size(630, 193) - Me.dataGridFooterNotes.TabIndex = 5 + 'colFooterRowExpression ' - 'lblFooterNotes + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 ' - Me.lblFooterNotes.AutoSize = True - Me.lblFooterNotes.Location = New System.Drawing.Point(10, 6) - Me.lblFooterNotes.Name = "lblFooterNotes" - Me.lblFooterNotes.Size = New System.Drawing.Size(74, 13) - Me.lblFooterNotes.TabIndex = 4 - Me.lblFooterNotes.Text = "Footers notes:" + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' + 'lblFooterCellNotes + ' + Me.lblFooterCellNotes.AutoSize = True + Me.lblFooterCellNotes.Location = New System.Drawing.Point(10, 121) + Me.lblFooterCellNotes.Name = "lblFooterCellNotes" + Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) + Me.lblFooterCellNotes.TabIndex = 4 + Me.lblFooterCellNotes.Text = "Cell footers notes:" ' 'tbpSourceNotes ' @@ -186,7 +271,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Controls.Add(Me.lblSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(642, 236) + Me.tbpSourceNotes.Size = New System.Drawing.Size(642, 233) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -237,7 +322,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(642, 236) + Me.tbpThemes.Size = New System.Drawing.Size(642, 233) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -297,47 +382,17 @@ Partial Class sdgTableOptions 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 274) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 273) Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'colFooterNoteText - ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 - ' - 'colFooterColExpression - ' - Me.colFooterColExpression.HeaderText = "Column Expression" - Me.colFooterColExpression.MinimumWidth = 8 - Me.colFooterColExpression.Name = "colFooterColExpression" - Me.colFooterColExpression.Width = 140 - ' - 'colFooterRowExpression - ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 - ' - 'colFooterFormat - ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 - ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(656, 306) + Me.ClientSize = New System.Drawing.Size(656, 309) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -349,7 +404,8 @@ Partial Class sdgTableOptions Me.tbpHeader.PerformLayout() Me.tbpFooters.ResumeLayout(False) Me.tbpFooters.PerformLayout() - CType(Me.dataGridFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpSourceNotes.ResumeLayout(False) Me.tbpSourceNotes.PerformLayout() CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() @@ -377,8 +433,8 @@ Partial Class sdgTableOptions Friend WithEvents lblHeaderTitle As Label Friend WithEvents btnHeaderSubTitleFormat As Button Friend WithEvents btnHeaderTitleFormat As Button - Friend WithEvents lblFooterNotes As Label - Friend WithEvents dataGridFooterNotes As DataGridView + Friend WithEvents lblFooterCellNotes As Label + Friend WithEvents dataGridCellFooterNotes As DataGridView Friend WithEvents dataGridSourceNotes As DataGridView Friend WithEvents lblSourceNotes As Label Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn @@ -387,4 +443,9 @@ Partial Class sdgTableOptions Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterFormat As DataGridViewButtonColumn + Friend WithEvents dataGridHeaderFooterNotes As DataGridView + Friend WithEvents lblHeaderFooterNotes As Label + Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn + Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewComboBoxColumn + Friend WithEvents DataGridViewButtonColumn1 As DataGridViewButtonColumn End Class diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index 35950423a91..3a51d070a74 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -117,6 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + True diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index a15e5bbe092..829f72913bb 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -15,6 +15,7 @@ ' along with this program. If not, see . Imports System.Reflection +Imports System.Windows.Documents Imports instat.Translations Imports unvell.ReoGrid.IO.OpenXML.Schema @@ -32,11 +33,47 @@ Public Class sdgTableOptions Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn SetHeaderOptionsInOperatorOnReturn(clsOperator) - SetGridOptionsInOperatorOnReturn(dataGridFooterNotes, "tab_footnote", clsOperator) + RemoveParameterFromOperatorOnReturn("tab_footnote", clsOperator) + SetGridOptionsInOperatorOnReturn(dataGridHeaderFooterNotes, "tab_footnote", clsOperator) + SetGridOptionsInOperatorOnReturn(dataGridCellFooterNotes, "tab_footnote", clsOperator) SetGridOptionsInOperatorOnReturn(dataGridSourceNotes, "tab_source_note", clsOperator) SetThemesInOperatorOnReturn(clsOperator) End Sub + Private Sub SetGridOptionsInOperatorOnReturn(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) + + If dataGrid.Rows.Count = 0 Then + Exit Sub + End If + + ' Then add the new footer parameters + For index As Integer = 0 To dataGrid.Rows.Count - 1 + Dim clsFooterRFunction As RFunction = dataGrid.Rows.Item(index).Tag + If clsFooterRFunction IsNot Nothing Then + clsOperator.AddParameter(strParameterName & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) + End If + Next + + End Sub + + Private Sub RemoveParameterFromOperatorOnReturn(strParameterName As String, clsOperator As ROperator) + + ' Remove all the previous footer parameters first + Dim lstParams As New List(Of RParameter) + For Each clsRParam As RParameter In clsOperator.clsParameters + If clsRParam.strArgumentName.Contains(strParameterName) Then + lstParams.Add(clsRParam) + End If + Next + For Each clsRParam As RParameter In lstParams + clsOperator.RemoveParameter(clsRParam) + Next + + + End Sub + + + Private Sub initialiseDialog() ucrPnlThemesPanel.AddRadioButton(rdoSelectTheme) ucrPnlThemesPanel.AddRadioButton(rdoManualTheme) @@ -151,7 +188,7 @@ Public Class sdgTableOptions Private Function GetNewHtmlDivRFunction() As RFunction Dim clsHtmlDivRFunction As New RFunction clsHtmlDivRFunction.SetPackageName("htmltools") - clsHtmlDivRFunction.SetRCommand("tags$div") + clsHtmlDivRFunction.SetRCommand("tags$span") Return clsHtmlDivRFunction End Function @@ -185,36 +222,54 @@ Public Class sdgTableOptions ' FOOTER CONTROLS Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) + SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) + SetFooterGridContents(clsOperator, dataGridCellFooterNotes) + End Sub + + Private Sub SetFooterGridContents(clsOperator As ROperator, dataGridFooterNotes As DataGridView) dataGridFooterNotes.Rows.Clear() For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then - ' Create a new row that represents the tab_footnote() parameters + ' Create a new row that represents the tab_footnote() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridFooterNotes) Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure + For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters + If clsFootNoteRParam.strArgumentName = "footnote" Then ' Set the foot note text row.Cells(0).Value = GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) ElseIf clsFootNoteRParam.strArgumentName = "locations" Then ' todo go through the location function Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters - If clsFootNoteLocationRParam.strArgumentName = "columns" Then - row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then - row.Cells(2).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + + If clsFooterLocationNoteRFunction.strRCommand = "cells_title" AndAlso dataGridFooterNotes Is dataGridHeaderFooterNotes Then + If clsFooterLocationNoteRFunction.clsParameters.Count > 0 Then + row.Cells(1).Value = GetStringValue(clsFooterLocationNoteRFunction.clsParameters(0).strArgumentValue, False) End If - Next + ElseIf clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridFooterNotes Then + For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters + If clsFootNoteLocationRParam.strArgumentName = "columns" Then + row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then + row.Cells(2).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + End If + Next + End If + End If + ' Tag and add the tab_footnote() function contents as a row + ' Check if second cell has a value + If row.Cells(1).Value IsNot Nothing Then + row.Tag = clsFooterRFunction + dataGridFooterNotes.Rows.Add(row) End If - Next - ' Tag and add the tab_footnote() function contents as a row - row.Tag = clsFooterRFunction - dataGridFooterNotes.Rows.Add(row) + + Next End If Next @@ -224,6 +279,8 @@ Public Class sdgTableOptions End Sub + + Private Sub SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) dataGridSourceNotes.Rows.Clear() @@ -253,34 +310,32 @@ Public Class sdgTableOptions End Sub - Private Sub SetGridOptionsInOperatorOnReturn(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) - If dataGridFooterNotes.Rows.Count = 0 Then - Exit Sub - End If - - ' Remove all the previous footer parameters first - Dim lstParams As New List(Of RParameter) - For Each clsRParam As RParameter In clsOperator.clsParameters - If clsRParam.strArgumentName.Contains(strParameterName) Then - lstParams.Add(clsRParam) - End If - Next - For Each clsRParam As RParameter In lstParams - clsOperator.RemoveParameter(clsRParam) - Next + Private Sub dataGridCellFooterNotes_EditingControlShowing(sender As Object, e As DataGridViewEditingControlShowingEventArgs) Handles dataGridCellFooterNotes.EditingControlShowing + ' Check if the current column is the DataGridViewComboBoxColumn + If dataGridCellFooterNotes.CurrentCell.ColumnIndex = 1 Then + Dim comboBox As ComboBox = CType(e.Control, ComboBox) + If comboBox IsNot Nothing Then + comboBox.DropDownStyle = ComboBoxStyle.DropDown + ' Remove any existing handler to avoid multiple assignments + RemoveHandler comboBox.SelectedIndexChanged, AddressOf ComboBox_SelectedIndexChanged - ' Then add the new footer parameters - For index As Integer = 0 To dataGrid.Rows.Count - 1 - Dim clsFooterRFunction As RFunction = dataGrid.Rows.Item(index).Tag - If clsFooterRFunction IsNot Nothing Then - clsOperator.AddParameter(strParameterName & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) + ' Add the new event handler + AddHandler comboBox.SelectedIndexChanged, AddressOf ComboBox_SelectedIndexChanged End If - Next + End If + End Sub + Private Sub ComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) + Dim comboBox As ComboBox = CType(sender, ComboBox) + If comboBox IsNot Nothing Then + ' Now you can access the selected item + Dim selectedItem As String = comboBox.SelectedItem.ToString() + MessageBox.Show("Selected Item: " & selectedItem) + End If End Sub - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellEndEdit, dataGridSourceNotes.CellEndEdit + Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridHeaderFooterNotes.CellEndEdit, dataGridCellFooterNotes.CellEndEdit, dataGridSourceNotes.CellEndEdit Dim dataGrid As DataGridView = sender Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) Dim strNoteTextValue As String = row.Cells(0).Value @@ -292,7 +347,19 @@ Public Class sdgTableOptions Dim clsNoteRFunction As RFunction = Nothing - If dataGrid Is dataGridFooterNotes Then + If dataGrid Is dataGridHeaderFooterNotes Then + clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) + ' Add column and row expressions as paramters if user has typed them + If Not String.IsNullOrEmpty(row.Cells(1).Value) Then + Dim clsFooterLocationNoteRFunction As New RFunction + clsFooterLocationNoteRFunction.SetPackageName("gt") + clsFooterLocationNoteRFunction.SetRCommand("cells_title") + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=GetStringValue(row.Cells(1).Value, True))) + clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) + End If + + ElseIf dataGrid Is dataGridCellFooterNotes Then + clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) ' Add column and row expressions as paramters if user has typed them @@ -304,6 +371,7 @@ Public Class sdgTableOptions clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=GetStringValue(row.Cells(2).Value, False))) clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) End If + ElseIf dataGrid Is dataGridSourceNotes Then clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_source_note", "source_note", strNoteTextValue) End If @@ -342,27 +410,31 @@ Public Class sdgTableOptions Return clsNewNoteRFunction End Function - - Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridFooterNotes.CellClick, dataGridSourceNotes.CellClick + Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridHeaderFooterNotes.CellClick, dataGridCellFooterNotes.CellClick, dataGridSourceNotes.CellClick Dim dataGrid As DataGridView = sender Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag Dim strParameterName As String = Nothing - If dataGrid Is dataGridFooterNotes Then + '--------------------------- + ' Ignore clicks that are not from button cells. + If dataGrid Is dataGridHeaderFooterNotes Then + strParameterName = "footnote" + If e.ColumnIndex <> 2 Then + Exit Sub + End If + ElseIf dataGrid Is dataGridCellFooterNotes Then strParameterName = "footnote" - If e.ColumnIndex <> 3 Then Exit Sub End If - ElseIf dataGrid Is dataGridSourceNotes Then strParameterName = "source_note" If e.ColumnIndex <> 1 Then Exit Sub End If - End If + '--------------------------- If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) @@ -372,6 +444,7 @@ Public Class sdgTableOptions End Sub + '----------------------------------------- '----------------------------------------- diff --git a/instat/sdgTableOptionsTextFormat.Designer.vb b/instat/sdgTableOptionsTextFormat.Designer.vb index 6d6df63eaff..c59cececd1c 100644 --- a/instat/sdgTableOptionsTextFormat.Designer.vb +++ b/instat/sdgTableOptionsTextFormat.Designer.vb @@ -238,6 +238,7 @@ Partial Class sdgTableOptionsTextFormat ' Me.GroupBox3.Controls.Add(Me.lblAlignHorizontal) Me.GroupBox3.Controls.Add(Me.ucrCboAlignHorizontal) + Me.GroupBox3.Enabled = False Me.GroupBox3.Location = New System.Drawing.Point(7, 250) Me.GroupBox3.Name = "GroupBox3" Me.GroupBox3.Size = New System.Drawing.Size(594, 65) From a772b49e6fe0f4ffcc844277f93db7fb54efc517 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 8 Apr 2024 10:47:48 +0300 Subject: [PATCH 016/273] made changes to xelss expression footers --- instat/sdgTableOptions.Designer.vb | 77 +++++++++++++++--------------- instat/sdgTableOptions.resx | 15 ++++++ instat/sdgTableOptions.vb | 27 +---------- 3 files changed, 55 insertions(+), 64 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index 814132d49fc..43a8c8f3354 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -37,10 +37,6 @@ Partial Class sdgTableOptions Me.DataGridViewButtonColumn1 = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblHeaderFooterNotes = New System.Windows.Forms.Label() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblFooterCellNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() @@ -54,6 +50,10 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() @@ -226,36 +226,6 @@ Partial Class sdgTableOptions Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 84) Me.dataGridCellFooterNotes.TabIndex = 5 ' - 'colFooterNoteText - ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 - ' - 'colFooterColExpression - ' - Me.colFooterColExpression.HeaderText = "Column Expression" - Me.colFooterColExpression.MinimumWidth = 8 - Me.colFooterColExpression.Name = "colFooterColExpression" - Me.colFooterColExpression.Width = 140 - ' - 'colFooterRowExpression - ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 - ' - 'colFooterFormat - ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 - ' 'lblFooterCellNotes ' Me.lblFooterCellNotes.AutoSize = True @@ -388,6 +358,37 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColExpression + ' + Me.colFooterColExpression.HeaderText = "Column Expression" + Me.colFooterColExpression.MinimumWidth = 8 + Me.colFooterColExpression.Name = "colFooterColExpression" + Me.colFooterColExpression.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.colFooterColExpression.Width = 140 + ' + 'colFooterRowExpression + ' + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 + ' + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -439,13 +440,13 @@ Partial Class sdgTableOptions Friend WithEvents lblSourceNotes As Label Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn - Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn - Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterFormat As DataGridViewButtonColumn Friend WithEvents dataGridHeaderFooterNotes As DataGridView Friend WithEvents lblHeaderFooterNotes As Label Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewComboBoxColumn Friend WithEvents DataGridViewButtonColumn1 As DataGridViewButtonColumn + Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn + Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterFormat As DataGridViewButtonColumn End Class diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index 3a51d070a74..077c4b358ed 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -138,6 +138,21 @@ True + + True + + + True + + + True + + + True + + + True + True diff --git a/instat/sdgTableOptions.vb b/instat/sdgTableOptions.vb index 829f72913bb..5844c4be23e 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/sdgTableOptions.vb @@ -250,7 +250,7 @@ Public Class sdgTableOptions If clsFooterLocationNoteRFunction.clsParameters.Count > 0 Then row.Cells(1).Value = GetStringValue(clsFooterLocationNoteRFunction.clsParameters(0).strArgumentValue, False) End If - ElseIf clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridFooterNotes Then + ElseIf clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters If clsFootNoteLocationRParam.strArgumentName = "columns" Then row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) @@ -310,31 +310,6 @@ Public Class sdgTableOptions End Sub - - Private Sub dataGridCellFooterNotes_EditingControlShowing(sender As Object, e As DataGridViewEditingControlShowingEventArgs) Handles dataGridCellFooterNotes.EditingControlShowing - ' Check if the current column is the DataGridViewComboBoxColumn - If dataGridCellFooterNotes.CurrentCell.ColumnIndex = 1 Then - Dim comboBox As ComboBox = CType(e.Control, ComboBox) - If comboBox IsNot Nothing Then - comboBox.DropDownStyle = ComboBoxStyle.DropDown - ' Remove any existing handler to avoid multiple assignments - RemoveHandler comboBox.SelectedIndexChanged, AddressOf ComboBox_SelectedIndexChanged - - ' Add the new event handler - AddHandler comboBox.SelectedIndexChanged, AddressOf ComboBox_SelectedIndexChanged - End If - End If - End Sub - - Private Sub ComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) - Dim comboBox As ComboBox = CType(sender, ComboBox) - If comboBox IsNot Nothing Then - ' Now you can access the selected item - Dim selectedItem As String = comboBox.SelectedItem.ToString() - MessageBox.Show("Selected Item: " & selectedItem) - End If - End Sub - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridHeaderFooterNotes.CellEndEdit, dataGridCellFooterNotes.CellEndEdit, dataGridSourceNotes.CellEndEdit Dim dataGrid As DataGridView = sender Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) From 5f5b4256878d53819e8a63849429fe2e20f489d7 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 8 Apr 2024 11:41:02 +0300 Subject: [PATCH 017/273] made changes to labelling --- instat/sdgTableOptions.Designer.vb | 72 +++++++++++++++--------------- instat/sdgTableOptions.resx | 15 ------- 2 files changed, 36 insertions(+), 51 deletions(-) diff --git a/instat/sdgTableOptions.Designer.vb b/instat/sdgTableOptions.Designer.vb index 43a8c8f3354..3846bed11ad 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/sdgTableOptions.Designer.vb @@ -37,6 +37,10 @@ Partial Class sdgTableOptions Me.DataGridViewButtonColumn1 = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblHeaderFooterNotes = New System.Windows.Forms.Label() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblFooterCellNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() @@ -50,10 +54,6 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpFooters.SuspendLayout() @@ -89,7 +89,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) Me.tbpHeader.Size = New System.Drawing.Size(642, 233) Me.tbpHeader.TabIndex = 0 - Me.tbpHeader.Text = "Header" + Me.tbpHeader.Text = "Headers" Me.tbpHeader.UseVisualStyleBackColor = True ' 'btnHeaderSubTitleFormat @@ -226,6 +226,37 @@ Partial Class sdgTableOptions Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 84) Me.dataGridCellFooterNotes.TabIndex = 5 ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColExpression + ' + Me.colFooterColExpression.HeaderText = "Column Expression" + Me.colFooterColExpression.MinimumWidth = 8 + Me.colFooterColExpression.Name = "colFooterColExpression" + Me.colFooterColExpression.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.colFooterColExpression.Width = 140 + ' + 'colFooterRowExpression + ' + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 + ' + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' 'lblFooterCellNotes ' Me.lblFooterCellNotes.AutoSize = True @@ -358,37 +389,6 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'colFooterNoteText - ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 - ' - 'colFooterColExpression - ' - Me.colFooterColExpression.HeaderText = "Column Expression" - Me.colFooterColExpression.MinimumWidth = 8 - Me.colFooterColExpression.Name = "colFooterColExpression" - Me.colFooterColExpression.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.colFooterColExpression.Width = 140 - ' - 'colFooterRowExpression - ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 - ' - 'colFooterFormat - ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 - ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) diff --git a/instat/sdgTableOptions.resx b/instat/sdgTableOptions.resx index 077c4b358ed..3a51d070a74 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/sdgTableOptions.resx @@ -138,21 +138,6 @@ True - - True - - - True - - - True - - - True - - - True - True From c95a90e58db6953056ae194456a445b1e8bb98cf Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 9 Apr 2024 13:50:11 +0100 Subject: [PATCH 018/273] Change made --- instat/dlgClimograph.Designer.vb | 119 +++++++++++++++++++++++++++++-- instat/dlgClimograph.vb | 2 + 2 files changed, 117 insertions(+), 4 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index 241a4a22a6c..ca01d27d6e8 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -41,6 +41,14 @@ Partial Class dlgClimograph Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.lblMonth = New System.Windows.Forms.Label() Me.ucrSelectorClimograph = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverYvariables = New instat.ucrReceiverMultiple() + Me.lblYVariables = New System.Windows.Forms.Label() + Me.ucrChkPoints = New instat.ucrCheck() + Me.ucrChkLines = New instat.ucrCheck() + Me.UcrReceiverMultiple1 = New instat.ucrReceiverMultiple() + Me.UcrReceiverMultiple2 = New instat.ucrReceiverMultiple() + Me.ucrReceiverXVariable = New instat.ucrReceiverSingle() + Me.lblXVariable = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'ucrReceiverAbsolute @@ -170,7 +178,6 @@ Partial Class dlgClimograph ' Me.rdoClimograph.Appearance = System.Windows.Forms.Appearance.Button Me.rdoClimograph.BackColor = System.Drawing.SystemColors.Control - Me.rdoClimograph.Enabled = False Me.rdoClimograph.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption Me.rdoClimograph.FlatAppearance.BorderSize = 2 Me.rdoClimograph.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption @@ -217,7 +224,7 @@ Partial Class dlgClimograph ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 332) + Me.ucrBase.Location = New System.Drawing.Point(12, 480) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 75 @@ -225,7 +232,7 @@ Partial Class dlgClimograph 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(12, 305) + Me.ucrSave.Location = New System.Drawing.Point(12, 453) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -265,11 +272,107 @@ Partial Class dlgClimograph Me.ucrSelectorClimograph.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorClimograph.TabIndex = 59 ' + 'ucrReceiverYvariables + ' + Me.ucrReceiverYvariables.AutoSize = True + Me.ucrReceiverYvariables.frmParent = Me + Me.ucrReceiverYvariables.Location = New System.Drawing.Point(267, 109) + Me.ucrReceiverYvariables.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverYvariables.Name = "ucrReceiverYvariables" + Me.ucrReceiverYvariables.Selector = Nothing + Me.ucrReceiverYvariables.Size = New System.Drawing.Size(120, 84) + Me.ucrReceiverYvariables.strNcFilePath = "" + Me.ucrReceiverYvariables.TabIndex = 78 + Me.ucrReceiverYvariables.ucrSelector = Nothing + ' + 'lblYVariables + ' + Me.lblYVariables.AutoSize = True + Me.lblYVariables.Location = New System.Drawing.Point(267, 93) + Me.lblYVariables.Name = "lblYVariables" + Me.lblYVariables.Size = New System.Drawing.Size(69, 13) + Me.lblYVariables.TabIndex = 79 + Me.lblYVariables.Text = "Y Variable(s):" + ' + 'ucrChkPoints + ' + Me.ucrChkPoints.AutoSize = True + Me.ucrChkPoints.Checked = False + Me.ucrChkPoints.Location = New System.Drawing.Point(270, 242) + Me.ucrChkPoints.Name = "ucrChkPoints" + Me.ucrChkPoints.Size = New System.Drawing.Size(100, 23) + Me.ucrChkPoints.TabIndex = 80 + ' + 'ucrChkLines + ' + Me.ucrChkLines.AutoSize = True + Me.ucrChkLines.Checked = False + Me.ucrChkLines.Location = New System.Drawing.Point(270, 349) + Me.ucrChkLines.Name = "ucrChkLines" + Me.ucrChkLines.Size = New System.Drawing.Size(100, 23) + Me.ucrChkLines.TabIndex = 81 + ' + 'UcrReceiverMultiple1 + ' + Me.UcrReceiverMultiple1.AutoSize = True + Me.UcrReceiverMultiple1.frmParent = Me + Me.UcrReceiverMultiple1.Location = New System.Drawing.Point(270, 262) + Me.UcrReceiverMultiple1.Margin = New System.Windows.Forms.Padding(0) + Me.UcrReceiverMultiple1.Name = "UcrReceiverMultiple1" + Me.UcrReceiverMultiple1.Selector = Nothing + Me.UcrReceiverMultiple1.Size = New System.Drawing.Size(120, 84) + Me.UcrReceiverMultiple1.strNcFilePath = "" + Me.UcrReceiverMultiple1.TabIndex = 82 + Me.UcrReceiverMultiple1.ucrSelector = Nothing + ' + 'UcrReceiverMultiple2 + ' + Me.UcrReceiverMultiple2.AutoSize = True + Me.UcrReceiverMultiple2.frmParent = Me + Me.UcrReceiverMultiple2.Location = New System.Drawing.Point(270, 369) + Me.UcrReceiverMultiple2.Margin = New System.Windows.Forms.Padding(0) + Me.UcrReceiverMultiple2.Name = "UcrReceiverMultiple2" + Me.UcrReceiverMultiple2.Selector = Nothing + Me.UcrReceiverMultiple2.Size = New System.Drawing.Size(120, 84) + Me.UcrReceiverMultiple2.strNcFilePath = "" + Me.UcrReceiverMultiple2.TabIndex = 83 + Me.UcrReceiverMultiple2.ucrSelector = Nothing + ' + 'ucrReceiverXVariable + ' + Me.ucrReceiverXVariable.AutoSize = True + Me.ucrReceiverXVariable.frmParent = Me + Me.ucrReceiverXVariable.Location = New System.Drawing.Point(264, 216) + Me.ucrReceiverXVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverXVariable.Name = "ucrReceiverXVariable" + Me.ucrReceiverXVariable.Selector = Nothing + Me.ucrReceiverXVariable.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverXVariable.strNcFilePath = "" + Me.ucrReceiverXVariable.TabIndex = 85 + Me.ucrReceiverXVariable.ucrSelector = Nothing + ' + 'lblXVariable + ' + Me.lblXVariable.AutoSize = True + Me.lblXVariable.Location = New System.Drawing.Point(264, 200) + Me.lblXVariable.Name = "lblXVariable" + Me.lblXVariable.Size = New System.Drawing.Size(58, 13) + Me.lblXVariable.TabIndex = 84 + Me.lblXVariable.Text = "X Variable:" + ' 'dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(477, 388) + Me.ClientSize = New System.Drawing.Size(477, 539) + Me.Controls.Add(Me.ucrReceiverXVariable) + Me.Controls.Add(Me.lblXVariable) + Me.Controls.Add(Me.UcrReceiverMultiple2) + Me.Controls.Add(Me.UcrReceiverMultiple1) + Me.Controls.Add(Me.ucrChkLines) + Me.Controls.Add(Me.ucrChkPoints) + Me.Controls.Add(Me.lblYVariables) + Me.Controls.Add(Me.ucrReceiverYvariables) Me.Controls.Add(Me.ucrReceiverAbsolute) Me.Controls.Add(Me.lblAbsolute) Me.Controls.Add(Me.ucrInputStation) @@ -319,4 +422,12 @@ Partial Class dlgClimograph Friend WithEvents ucrReceiverMonth As ucrReceiverSingle Friend WithEvents lblMonth As Label Friend WithEvents ucrSelectorClimograph As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverXVariable As ucrReceiverSingle + Friend WithEvents lblXVariable As Label + Friend WithEvents UcrReceiverMultiple2 As ucrReceiverMultiple + Friend WithEvents UcrReceiverMultiple1 As ucrReceiverMultiple + Friend WithEvents ucrChkLines As ucrCheck + Friend WithEvents ucrChkPoints As ucrCheck + Friend WithEvents lblYVariables As Label + Friend WithEvents ucrReceiverYvariables As ucrReceiverMultiple End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 5852c08272f..edfd1ce89ad 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -108,6 +108,8 @@ Public Class dlgClimograph ucrReceiverAbsolute.strSelectorHeading = "Variables" ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) + ucrPnlClimograph. + ucrSave.SetPrefix("wl_graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() From 528f56afe8463198f2ce1f32b825929a261adf4d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 6 May 2024 14:10:08 +0100 Subject: [PATCH 019/273] change made --- instat/dlgClimograph.Designer.vb | 280 ++++++++++++++---------- instat/dlgClimograph.vb | 363 ++++++++++++++++++++++++++++++- 2 files changed, 515 insertions(+), 128 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index ca01d27d6e8..c0deee5015a 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -41,14 +41,17 @@ Partial Class dlgClimograph Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.lblMonth = New System.Windows.Forms.Label() Me.ucrSelectorClimograph = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverYvariables = New instat.ucrReceiverMultiple() - Me.lblYVariables = New System.Windows.Forms.Label() - Me.ucrChkPoints = New instat.ucrCheck() - Me.ucrChkLines = New instat.ucrCheck() - Me.UcrReceiverMultiple1 = New instat.ucrReceiverMultiple() - Me.UcrReceiverMultiple2 = New instat.ucrReceiverMultiple() - Me.ucrReceiverXVariable = New instat.ucrReceiverSingle() - Me.lblXVariable = New System.Windows.Forms.Label() + Me.ucrInputFacet = New instat.ucrInputComboBox() + Me.ucrReceiverFacet = New instat.ucrReceiverSingle() + Me.lblFacet = New System.Windows.Forms.Label() + Me.ucrReceiverRainC = New instat.ucrReceiverSingle() + Me.lblRainC = New System.Windows.Forms.Label() + Me.ucrReceiverElement1 = New instat.ucrReceiverSingle() + Me.lblElement1 = New System.Windows.Forms.Label() + Me.ucrReceiverElement2 = New instat.ucrReceiverSingle() + Me.lblElement2 = New System.Windows.Forms.Label() + Me.ucrReceiverMonthC = New instat.ucrReceiverSingle() + Me.lblMonthC = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'ucrReceiverAbsolute @@ -183,13 +186,13 @@ Partial Class dlgClimograph Me.rdoClimograph.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoClimograph.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoClimograph.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoClimograph.Location = New System.Drawing.Point(195, 13) + Me.rdoClimograph.Location = New System.Drawing.Point(149, 10) Me.rdoClimograph.Name = "rdoClimograph" - Me.rdoClimograph.Size = New System.Drawing.Size(119, 28) + Me.rdoClimograph.Size = New System.Drawing.Size(79, 28) Me.rdoClimograph.TabIndex = 62 Me.rdoClimograph.TabStop = True Me.rdoClimograph.Tag = "" - Me.rdoClimograph.Text = "Ordinary Climograph" + Me.rdoClimograph.Text = "Climograph" Me.rdoClimograph.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoClimograph.UseVisualStyleBackColor = False ' @@ -202,7 +205,7 @@ Partial Class dlgClimograph Me.rdoWalterLieth.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoWalterLieth.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoWalterLieth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoWalterLieth.Location = New System.Drawing.Point(117, 13) + Me.rdoWalterLieth.Location = New System.Drawing.Point(227, 10) Me.rdoWalterLieth.Name = "rdoWalterLieth" Me.rdoWalterLieth.Size = New System.Drawing.Size(80, 28) Me.rdoWalterLieth.TabIndex = 61 @@ -224,7 +227,7 @@ Partial Class dlgClimograph ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 480) + Me.ucrBase.Location = New System.Drawing.Point(12, 344) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 75 @@ -232,7 +235,7 @@ Partial Class dlgClimograph 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(12, 453) + Me.ucrSave.Location = New System.Drawing.Point(12, 317) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -272,107 +275,145 @@ Partial Class dlgClimograph Me.ucrSelectorClimograph.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorClimograph.TabIndex = 59 ' - 'ucrReceiverYvariables - ' - Me.ucrReceiverYvariables.AutoSize = True - Me.ucrReceiverYvariables.frmParent = Me - Me.ucrReceiverYvariables.Location = New System.Drawing.Point(267, 109) - Me.ucrReceiverYvariables.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYvariables.Name = "ucrReceiverYvariables" - Me.ucrReceiverYvariables.Selector = Nothing - Me.ucrReceiverYvariables.Size = New System.Drawing.Size(120, 84) - Me.ucrReceiverYvariables.strNcFilePath = "" - Me.ucrReceiverYvariables.TabIndex = 78 - Me.ucrReceiverYvariables.ucrSelector = Nothing - ' - 'lblYVariables - ' - Me.lblYVariables.AutoSize = True - Me.lblYVariables.Location = New System.Drawing.Point(267, 93) - Me.lblYVariables.Name = "lblYVariables" - Me.lblYVariables.Size = New System.Drawing.Size(69, 13) - Me.lblYVariables.TabIndex = 79 - Me.lblYVariables.Text = "Y Variable(s):" - ' - 'ucrChkPoints - ' - Me.ucrChkPoints.AutoSize = True - Me.ucrChkPoints.Checked = False - Me.ucrChkPoints.Location = New System.Drawing.Point(270, 242) - Me.ucrChkPoints.Name = "ucrChkPoints" - Me.ucrChkPoints.Size = New System.Drawing.Size(100, 23) - Me.ucrChkPoints.TabIndex = 80 - ' - 'ucrChkLines - ' - Me.ucrChkLines.AutoSize = True - Me.ucrChkLines.Checked = False - Me.ucrChkLines.Location = New System.Drawing.Point(270, 349) - Me.ucrChkLines.Name = "ucrChkLines" - Me.ucrChkLines.Size = New System.Drawing.Size(100, 23) - Me.ucrChkLines.TabIndex = 81 - ' - 'UcrReceiverMultiple1 - ' - Me.UcrReceiverMultiple1.AutoSize = True - Me.UcrReceiverMultiple1.frmParent = Me - Me.UcrReceiverMultiple1.Location = New System.Drawing.Point(270, 262) - Me.UcrReceiverMultiple1.Margin = New System.Windows.Forms.Padding(0) - Me.UcrReceiverMultiple1.Name = "UcrReceiverMultiple1" - Me.UcrReceiverMultiple1.Selector = Nothing - Me.UcrReceiverMultiple1.Size = New System.Drawing.Size(120, 84) - Me.UcrReceiverMultiple1.strNcFilePath = "" - Me.UcrReceiverMultiple1.TabIndex = 82 - Me.UcrReceiverMultiple1.ucrSelector = Nothing - ' - 'UcrReceiverMultiple2 - ' - Me.UcrReceiverMultiple2.AutoSize = True - Me.UcrReceiverMultiple2.frmParent = Me - Me.UcrReceiverMultiple2.Location = New System.Drawing.Point(270, 369) - Me.UcrReceiverMultiple2.Margin = New System.Windows.Forms.Padding(0) - Me.UcrReceiverMultiple2.Name = "UcrReceiverMultiple2" - Me.UcrReceiverMultiple2.Selector = Nothing - Me.UcrReceiverMultiple2.Size = New System.Drawing.Size(120, 84) - Me.UcrReceiverMultiple2.strNcFilePath = "" - Me.UcrReceiverMultiple2.TabIndex = 83 - Me.UcrReceiverMultiple2.ucrSelector = Nothing - ' - 'ucrReceiverXVariable - ' - Me.ucrReceiverXVariable.AutoSize = True - Me.ucrReceiverXVariable.frmParent = Me - Me.ucrReceiverXVariable.Location = New System.Drawing.Point(264, 216) - Me.ucrReceiverXVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverXVariable.Name = "ucrReceiverXVariable" - Me.ucrReceiverXVariable.Selector = Nothing - Me.ucrReceiverXVariable.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverXVariable.strNcFilePath = "" - Me.ucrReceiverXVariable.TabIndex = 85 - Me.ucrReceiverXVariable.ucrSelector = Nothing - ' - 'lblXVariable - ' - Me.lblXVariable.AutoSize = True - Me.lblXVariable.Location = New System.Drawing.Point(264, 200) - Me.lblXVariable.Name = "lblXVariable" - Me.lblXVariable.Size = New System.Drawing.Size(58, 13) - Me.lblXVariable.TabIndex = 84 - Me.lblXVariable.Text = "X Variable:" + 'ucrInputFacet + ' + Me.ucrInputFacet.AddQuotesIfUnrecognised = True + Me.ucrInputFacet.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputFacet.GetSetSelectedIndex = -1 + Me.ucrInputFacet.IsReadOnly = False + Me.ucrInputFacet.Location = New System.Drawing.Point(379, 68) + Me.ucrInputFacet.Name = "ucrInputFacet" + Me.ucrInputFacet.Size = New System.Drawing.Size(86, 21) + Me.ucrInputFacet.TabIndex = 86 + ' + 'ucrReceiverFacet + ' + Me.ucrReceiverFacet.AutoSize = True + Me.ucrReceiverFacet.frmParent = Me + Me.ucrReceiverFacet.Location = New System.Drawing.Point(267, 68) + Me.ucrReceiverFacet.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverFacet.Name = "ucrReceiverFacet" + Me.ucrReceiverFacet.Selector = Nothing + Me.ucrReceiverFacet.Size = New System.Drawing.Size(109, 26) + Me.ucrReceiverFacet.strNcFilePath = "" + Me.ucrReceiverFacet.TabIndex = 85 + Me.ucrReceiverFacet.ucrSelector = Nothing + ' + 'lblFacet + ' + Me.lblFacet.AutoSize = True + Me.lblFacet.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacet.Location = New System.Drawing.Point(267, 53) + Me.lblFacet.Name = "lblFacet" + Me.lblFacet.Size = New System.Drawing.Size(52, 13) + Me.lblFacet.TabIndex = 84 + Me.lblFacet.Tag = "" + Me.lblFacet.Text = "Facet By:" + ' + 'ucrReceiverRainC + ' + Me.ucrReceiverRainC.AutoSize = True + Me.ucrReceiverRainC.frmParent = Me + Me.ucrReceiverRainC.Location = New System.Drawing.Point(267, 150) + Me.ucrReceiverRainC.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainC.Name = "ucrReceiverRainC" + Me.ucrReceiverRainC.Selector = Nothing + Me.ucrReceiverRainC.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRainC.strNcFilePath = "" + Me.ucrReceiverRainC.TabIndex = 90 + Me.ucrReceiverRainC.ucrSelector = Nothing + ' + 'lblRainC + ' + Me.lblRainC.AutoSize = True + Me.lblRainC.Location = New System.Drawing.Point(267, 134) + Me.lblRainC.Name = "lblRainC" + Me.lblRainC.Size = New System.Drawing.Size(48, 13) + Me.lblRainC.TabIndex = 89 + Me.lblRainC.Text = "RainFall:" + ' + 'ucrReceiverElement1 + ' + Me.ucrReceiverElement1.AutoSize = True + Me.ucrReceiverElement1.frmParent = Me + Me.ucrReceiverElement1.Location = New System.Drawing.Point(267, 193) + Me.ucrReceiverElement1.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElement1.Name = "ucrReceiverElement1" + Me.ucrReceiverElement1.Selector = Nothing + Me.ucrReceiverElement1.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverElement1.strNcFilePath = "" + Me.ucrReceiverElement1.TabIndex = 92 + Me.ucrReceiverElement1.ucrSelector = Nothing + ' + 'lblElement1 + ' + Me.lblElement1.AutoSize = True + Me.lblElement1.Location = New System.Drawing.Point(267, 177) + Me.lblElement1.Name = "lblElement1" + Me.lblElement1.Size = New System.Drawing.Size(90, 13) + Me.lblElement1.TabIndex = 91 + Me.lblElement1.Text = "Element1 (TMax):" + ' + 'ucrReceiverElement2 + ' + Me.ucrReceiverElement2.AutoSize = True + Me.ucrReceiverElement2.frmParent = Me + Me.ucrReceiverElement2.Location = New System.Drawing.Point(267, 234) + Me.ucrReceiverElement2.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElement2.Name = "ucrReceiverElement2" + Me.ucrReceiverElement2.Selector = Nothing + Me.ucrReceiverElement2.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverElement2.strNcFilePath = "" + Me.ucrReceiverElement2.TabIndex = 94 + Me.ucrReceiverElement2.ucrSelector = Nothing + ' + 'lblElement2 + ' + Me.lblElement2.AutoSize = True + Me.lblElement2.Location = New System.Drawing.Point(267, 218) + Me.lblElement2.Name = "lblElement2" + Me.lblElement2.Size = New System.Drawing.Size(87, 13) + Me.lblElement2.TabIndex = 93 + Me.lblElement2.Text = "Element2 (TMin):" + ' + 'ucrReceiverMonthC + ' + Me.ucrReceiverMonthC.AutoSize = True + Me.ucrReceiverMonthC.frmParent = Me + Me.ucrReceiverMonthC.Location = New System.Drawing.Point(267, 109) + Me.ucrReceiverMonthC.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthC.Name = "ucrReceiverMonthC" + Me.ucrReceiverMonthC.Selector = Nothing + Me.ucrReceiverMonthC.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMonthC.strNcFilePath = "" + Me.ucrReceiverMonthC.TabIndex = 88 + Me.ucrReceiverMonthC.ucrSelector = Nothing + ' + 'lblMonthC + ' + Me.lblMonthC.AutoSize = True + Me.lblMonthC.Location = New System.Drawing.Point(267, 93) + Me.lblMonthC.Name = "lblMonthC" + Me.lblMonthC.Size = New System.Drawing.Size(40, 13) + Me.lblMonthC.TabIndex = 87 + Me.lblMonthC.Text = "Month:" ' 'dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(477, 539) - Me.Controls.Add(Me.ucrReceiverXVariable) - Me.Controls.Add(Me.lblXVariable) - Me.Controls.Add(Me.UcrReceiverMultiple2) - Me.Controls.Add(Me.UcrReceiverMultiple1) - Me.Controls.Add(Me.ucrChkLines) - Me.Controls.Add(Me.ucrChkPoints) - Me.Controls.Add(Me.lblYVariables) - Me.Controls.Add(Me.ucrReceiverYvariables) + Me.ClientSize = New System.Drawing.Size(477, 411) + Me.Controls.Add(Me.ucrInputFacet) + Me.Controls.Add(Me.ucrReceiverFacet) + Me.Controls.Add(Me.lblFacet) + Me.Controls.Add(Me.ucrReceiverRainC) + Me.Controls.Add(Me.lblRainC) + Me.Controls.Add(Me.ucrReceiverElement1) + Me.Controls.Add(Me.lblElement1) + Me.Controls.Add(Me.ucrReceiverElement2) + Me.Controls.Add(Me.lblElement2) + Me.Controls.Add(Me.ucrReceiverMonthC) + Me.Controls.Add(Me.lblMonthC) Me.Controls.Add(Me.ucrReceiverAbsolute) Me.Controls.Add(Me.lblAbsolute) Me.Controls.Add(Me.ucrInputStation) @@ -422,12 +463,15 @@ Partial Class dlgClimograph Friend WithEvents ucrReceiverMonth As ucrReceiverSingle Friend WithEvents lblMonth As Label Friend WithEvents ucrSelectorClimograph As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrReceiverXVariable As ucrReceiverSingle - Friend WithEvents lblXVariable As Label - Friend WithEvents UcrReceiverMultiple2 As ucrReceiverMultiple - Friend WithEvents UcrReceiverMultiple1 As ucrReceiverMultiple - Friend WithEvents ucrChkLines As ucrCheck - Friend WithEvents ucrChkPoints As ucrCheck - Friend WithEvents lblYVariables As Label - Friend WithEvents ucrReceiverYvariables As ucrReceiverMultiple + Friend WithEvents ucrInputFacet As ucrInputComboBox + Friend WithEvents ucrReceiverFacet As ucrReceiverSingle + Friend WithEvents lblFacet As Label + Friend WithEvents ucrReceiverRainC As ucrReceiverSingle + Friend WithEvents lblRainC As Label + Friend WithEvents ucrReceiverElement1 As ucrReceiverSingle + Friend WithEvents lblElement1 As Label + Friend WithEvents ucrReceiverElement2 As ucrReceiverSingle + Friend WithEvents lblElement2 As Label + Friend WithEvents ucrReceiverMonthC As ucrReceiverSingle + Friend WithEvents lblMonthC As Label End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index edfd1ce89ad..1b0ea86ed46 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -25,14 +25,34 @@ Public Class dlgClimograph Private ReadOnly strFacetRow As String = "Facet Row" Private ReadOnly strFacetCol As String = "Facet Column" Private ReadOnly strNone As String = "None" + Private ReadOnly strFacetWrap1 As String = "Facet Wrap" + Private ReadOnly strFacetRow1 As String = "Facet Row" + Private ReadOnly strFacetCol1 As String = "Facet Column" + Private ReadOnly strNone1 As String = "None" Private clsFacetFunction As New RFunction Private clsGroupByFunction As New RFunction + Private clsGeomBarFunction As New RFunction + Private clsGeomLineFunction As New RFunction + Private clsGeomLineFunction1 As New RFunction + Private clsRggplotFunction As New RFunction + Private clsBarAesFunction As New RFunction + Private clsAesLineFunction As New RFunction + Private clsAesLine1Function As New RFunction + Private clsFacetFunction1 As New RFunction + Private clsGroupByFunction1 As New RFunction + Private clsFacetVariablesOperator As New ROperator + Private clsFacetRowOp1 As New ROperator + Private clsFacetColOp1 As New ROperator + Private clsPipeOperator1 As New ROperator Private clsFacetOperator As New ROperator Private clsFacetRowOp As New ROperator Private clsFacetColOp As New ROperator Private clsPipeOperator As New ROperator Private bUpdateComboOptions As Boolean = True Private bUpdatingParameters As Boolean = False + Private bUpdateComboOptions1 As Boolean = True + Private bUpdatingParameters1 As Boolean = False + Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -51,7 +71,7 @@ Public Class dlgClimograph Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 432 - ucrSelectorClimograph.SetParameter(New RParameter("data", 0)) + ucrSelectorClimograph.SetParameter(New RParameter("data", 0, bNewIncludeArgumentName:=False)) ucrSelectorClimograph.SetParameterIsrfunction() ucrPnlClimograph.AddRadioButton(rdoClimograph) @@ -67,6 +87,15 @@ Public Class dlgClimograph ucrReceiverMonth.strSelectorHeading = "Month Variables" ucrReceiverMonth.SetLinkedDisplayControl(lblMonth) + ucrReceiverMonthC.SetParameter(New RParameter("x", 2)) + ucrReceiverMonthC.SetParameterIsString() + ucrReceiverMonthC.Selector = ucrSelectorClimograph + ucrReceiverMonthC.bWithQuotes = False + ucrReceiverMonthC.SetClimaticType("month") + ucrReceiverMonthC.bAutoFill = True + ucrReceiverMonthC.strSelectorHeading = "Month Variables" + ucrReceiverMonthC.SetLinkedDisplayControl(lblMonthC) + ucrReceiverRain.SetParameter(New RParameter("p_mes", 3)) ucrReceiverRain.SetParameterIsString() ucrReceiverRain.Selector = ucrSelectorClimograph @@ -75,6 +104,15 @@ Public Class dlgClimograph ucrReceiverRain.strSelectorHeading = "Rain Variables" ucrReceiverRain.SetLinkedDisplayControl(lblRain) + ucrReceiverRainC.SetParameter(New RParameter("y", 1)) + ucrReceiverRainC.SetParameterIsString() + ucrReceiverRainC.Selector = ucrSelectorClimograph + ucrReceiverRainC.bWithQuotes = False + ucrReceiverRainC.SetClimaticType("rain") + ucrReceiverRainC.bAutoFill = True + ucrReceiverRainC.strSelectorHeading = "Rain Variables" + ucrReceiverRainC.SetLinkedDisplayControl(lblRainC) + ucrReceiverMaxtem.SetParameter(New RParameter("tm_max", 4)) ucrReceiverMaxtem.SetParameterIsString() ucrReceiverMaxtem.Selector = ucrSelectorClimograph @@ -91,6 +129,24 @@ Public Class dlgClimograph ucrReceiverMintemp.strSelectorHeading = "Variables" ucrReceiverMintemp.SetLinkedDisplayControl(lblMintem) + ucrReceiverElement1.SetParameter(New RParameter("y", 4)) + ucrReceiverElement1.SetParameterIsString() + ucrReceiverElement1.Selector = ucrSelectorClimograph + ucrReceiverElement1.bWithQuotes = False + ucrReceiverElement1.SetClimaticType("temp_max") + ucrReceiverElement1.bAutoFill = True + ucrReceiverElement1.strSelectorHeading = "Variables" + ucrReceiverElement1.SetLinkedDisplayControl(lblElement1) + + ucrReceiverElement2.SetParameter(New RParameter("y", 5)) + ucrReceiverElement2.SetParameterIsString() + ucrReceiverElement2.Selector = ucrSelectorClimograph + ucrReceiverElement2.bWithQuotes = False + ucrReceiverElement2.SetClimaticType("temp_min") + ucrReceiverElement2.bAutoFill = True + ucrReceiverElement2.strSelectorHeading = "Variables" + ucrReceiverElement2.SetLinkedDisplayControl(lblElement2) + ucr1stFactorReceiver.SetParameter(New RParameter("station")) ucr1stFactorReceiver.Selector = ucrSelectorClimograph ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) @@ -102,13 +158,25 @@ Public Class dlgClimograph ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() + ucrReceiverFacet.SetParameter(New RParameter("year")) + ucrReceiverFacet.Selector = ucrSelectorClimograph + ucrReceiverFacet.SetClimaticType("year") + ucrReceiverFacet.bAutoFill = True + ucrReceiverFacet.bWithQuotes = False + ucrReceiverFacet.SetParameterIsString() + ucrReceiverFacet.SetValuesToIgnore({"."}) + + ucrInputFacet.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) + ucrInputFacet.SetDropDownStyleAsNonEditable() + ucrReceiverAbsolute.SetParameter(New RParameter("ta_min", 6)) ucrReceiverAbsolute.SetParameterIsString() ucrReceiverAbsolute.Selector = ucrSelectorClimograph ucrReceiverAbsolute.strSelectorHeading = "Variables" ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) - ucrPnlClimograph. + ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSave.SetPrefix("wl_graph") ucrSave.SetIsComboBox() @@ -130,15 +198,47 @@ Public Class dlgClimograph clsFacetRowOp = New ROperator clsFacetColOp = New ROperator + clsGeomBarFunction = New RFunction + clsGeomLineFunction = New RFunction + clsGeomLineFunction1 = New RFunction + clsAesLineFunction = New RFunction + clsAesLine1Function = New RFunction + clsRggplotFunction = New RFunction + clsBarAesFunction = New RFunction + clsFacetFunction1 = New RFunction + clsFacetVariablesOperator = New ROperator + clsFacetRowOp1 = New ROperator + clsFacetColOp1 = New ROperator + clsPipeOperator1 = New ROperator + clsGroupByFunction1 = New RFunction + ucrSelectorClimograph.Reset() + ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) ucrSave.Reset() ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True - ucrReceiverMonth.SetMeAsReceiver() + ucrInputFacet.SetName(strFacetWrap) + ucrInputFacet.bUpdateRCodeFromControl = True - clsDummyFunction.AddParameter("checked", "WalterLieth", iPosition:=0) + clsDummyFunction.AddParameter("checked", "Climograph", iPosition:=0) + + clsFacetFunction1.SetPackageName("ggplot2") + clsFacetRowOp1.SetOperation("+") + clsFacetRowOp1.bBrackets = False + clsFacetColOp1.SetOperation("+") + clsFacetColOp1.bBrackets = False + clsFacetVariablesOperator.SetOperation("~") + clsFacetVariablesOperator.bForceIncludeOperation = True + clsFacetVariablesOperator.bBrackets = False + clsFacetFunction1.AddParameter("facets", clsROperatorParameter:=clsFacetVariablesOperator, iPosition:=0) + + clsPipeOperator1.SetOperation("%>%") + SetPipeAssignTo1() + + clsGroupByFunction1.SetPackageName("dplyr") + clsGroupByFunction1.SetRCommand("group_by") clsPipeOperator.SetOperation("%>%") SetPipeAssignTo() @@ -158,15 +258,44 @@ Public Class dlgClimograph clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") + clsRggplotFunction.SetPackageName("ggplot2") + clsRggplotFunction.SetRCommand("ggplot") + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) + + clsBarAesFunction.SetRCommand("aes") + clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) + + clsGeomBarFunction.SetRCommand("geom_bar") + clsGeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=0) + clsGeomBarFunction.AddParameter("alpha", "0.5", iPosition:=1) + + clsAesLineFunction.SetRCommand("aes") + clsAesLineFunction.AddParameter("group", "1", iPosition:=1) + + clsAesLine1Function.SetRCommand("aes") + clsAesLine1Function.AddParameter("group", "1", iPosition:=1) + + clsGeomLineFunction.SetRCommand("geom_line") + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + + clsGeomLineFunction1.SetRCommand("geom_line") + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.SetOperation("+") - clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub Private Sub SetRCodeForControls(bReset) - ucrSelectorClimograph.SetRCode(clsGgwalterliethFunction, bReset) - ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) + ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + + ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) + ucrReceiverRainC.SetRCode(clsBarAesFunction, bReset) + ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) + ucrReceiverElement2.SetRCode(clsAesLine1Function, bReset) + ucrReceiverElement1.SetRCode(clsAesLineFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverRain.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverMintemp.SetRCode(clsGgwalterliethFunction, bReset) @@ -174,18 +303,36 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetRCode(clsGgwalterliethFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) If bReset Then - AutoFacetStation() + ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) End If End Sub Private Sub TestOKEnabled() - If rdoWalterLieth.Checked AndAlso ((Not ucrReceiverAbsolute.IsEmpty AndAlso Not ucrReceiverMaxtem.IsEmpty AndAlso Not ucrReceiverMintemp.IsEmpty AndAlso Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverRain.IsEmpty) OrElse Not ucrSave.IsComplete) Then + If rdoClimograph.Checked AndAlso ((Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty AndAlso Not ucrReceiverMonthC.IsEmpty AndAlso Not ucrReceiverRainC.IsEmpty) OrElse Not ucrSave.IsComplete) Then + ucrBase.OKEnabled(True) + ElseIf rdoWalterLieth.Checked AndAlso ((Not ucrReceiverAbsolute.IsEmpty AndAlso Not ucrReceiverMaxtem.IsEmpty AndAlso Not ucrReceiverMintemp.IsEmpty AndAlso Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverRain.IsEmpty) OrElse Not ucrSave.IsComplete) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If End Sub + Private Sub ucrPnlClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlValueChanged + If rdoClimograph.Checked Then + clsBaseOperator.RemoveParameterByName("ggwalter_lieth") + ucrReceiverMonthC.SetMeAsReceiver() + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + Else + clsBaseOperator.RemoveParameterByName("ggplot") + clsBaseOperator.RemoveParameterByName("geom_bar") + ucrReceiverMonth.SetMeAsReceiver() + clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) + End If + AutoFacetYear() + AddGeomLine() + End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -193,6 +340,161 @@ Public Class dlgClimograph TestOKEnabled() End Sub + Private Sub AutoFacetYear() + Dim currentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver + + If currentReceiver IsNot Nothing Then + ucrReceiverFacet.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"year_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy1() + End If + End Sub + + Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputFacet.ControlValueChanged + If Not bUpdateComboOptions1 Then + Exit Sub + End If + Dim strChangedText As String = ucrChangedControl.GetText() + If strChangedText <> strNone Then + If Not strChangedText = strFacetCol1 AndAlso Not strChangedText = strFacetRow1 AndAlso + Not ucrInputFacet.Equals(ucrChangedControl) AndAlso ucrInputFacet.GetText() = strChangedText Then + bUpdateComboOptions1 = False + ucrInputFacet.SetName(strNone1) + bUpdateComboOptions1 = True + End If + If (strChangedText = strFacetWrap1 AndAlso ucrInputFacet.GetText = strFacetRow1) OrElse (strChangedText = strFacetRow1 AndAlso + ucrInputFacet.GetText = strFacetWrap1) OrElse (strChangedText = strFacetWrap1 AndAlso + ucrInputFacet.GetText = strFacetCol1) OrElse (strChangedText = strFacetCol1 AndAlso ucrInputFacet.GetText = strFacetWrap1) Then + ucrInputFacet.SetName(strNone1) + End If + End If + UpdateParameters1() + AddRemoveFacets1() + AddRemoveGroupBy1() + End Sub + + Private Sub UpdateParameters1() + clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputFacet.Name) + clsFacetColOp1.RemoveParameterByName("col" & ucrInputFacet.Name) + clsFacetRowOp1.RemoveParameterByName("row" & ucrInputFacet.Name) + + clsBaseOperator.RemoveParameterByName("facets") + bUpdatingParameters1 = True + ucrReceiverFacet.SetRCode(Nothing) + Select Case ucrInputFacet.GetText() + Case strFacetWrap1 + ucrReceiverFacet.ChangeParameterName("wrap") + ucrReceiverFacet.SetRCode(clsFacetVariablesOperator) + Case strFacetCol1 + ucrReceiverFacet.ChangeParameterName("col" & ucrInputFacet.Name) + ucrReceiverFacet.SetRCode(clsFacetColOp1) + Case strFacetRow1 + ucrReceiverFacet.ChangeParameterName("row" & ucrInputFacet.Name) + ucrReceiverFacet.SetRCode(clsFacetRowOp1) + End Select + bUpdatingParameters1 = False + End Sub + + Private Sub AddRemoveFacets1() + Dim bWrap As Boolean = False + Dim bCol As Boolean = False + Dim bRow As Boolean = False + + If bUpdatingParameters1 Then + Exit Sub + End If + + clsBaseOperator.RemoveParameterByName("facets") + If Not ucrReceiverFacet.IsEmpty Then + Select Case ucrInputFacet.GetText() + Case strFacetWrap1 + bWrap = True + Case strFacetCol1 + bCol = True + Case strFacetRow1 + bRow = True + End Select + End If + + If bWrap OrElse bRow OrElse bCol Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction1) + End If + If bWrap Then + clsFacetFunction1.SetRCommand("facet_wrap") + End If + If bRow OrElse bCol Then + clsFacetFunction1.SetRCommand("facet_grid") + End If + If bRow Then + clsFacetVariablesOperator.AddParameter("left", clsROperatorParameter:=clsFacetRowOp1, iPosition:=0) + ElseIf bCol AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("left", ".", iPosition:=0) + Else + clsFacetVariablesOperator.RemoveParameterByName("left") + End If + If bCol Then + clsFacetVariablesOperator.AddParameter("right", clsROperatorParameter:=clsFacetColOp1, iPosition:=1) + ElseIf bRow AndAlso bWrap = False Then + clsFacetVariablesOperator.AddParameter("right", ".", iPosition:=1) + Else + clsFacetVariablesOperator.RemoveParameterByName("right") + End If + End Sub + + Private Sub ucrReceiverFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacet.ControlValueChanged + If Not ucrReceiverFacet.IsEmpty Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction1) + Else + clsBaseOperator.RemoveParameterByName("facets") + End If + AddRemoveFacets1() + AddRemoveGroupBy1() + End Sub + + Private Sub GetParameterValue1(clsOperator As ROperator) + Dim i As Integer = 0 + For Each clsTempParam As RParameter In clsOperator.clsParameters + If clsTempParam.strArgumentValue <> "" AndAlso clsTempParam.strArgumentValue <> "." Then + clsGroupByFunction1.AddParameter(i, clsTempParam.strArgumentValue, bIncludeArgumentName:=False, iPosition:=i) + i = i + 1 + End If + Next + End Sub + + Private Sub AddRemoveGroupBy1() + If clsPipeOperator1.ContainsParameter("mutate") Then + clsGroupByFunction1.ClearParameters() + If clsBaseOperator.ContainsParameter("facets") Then + Select Case ucrInputFacet.GetText() + Case strFacetWrap1 + GetParameterValue1(clsFacetVariablesOperator) + Case strFacetCol1 + GetParameterValue1(clsFacetColOp1) + Case strFacetRow1 + GetParameterValue1(clsFacetRowOp1) + End Select + End If + + If clsGroupByFunction1.iParameterCount > 0 Then + clsPipeOperator1.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction1, iPosition:=1) + Else + clsPipeOperator1.RemoveParameterByName("group_by") + End If + Else + clsPipeOperator1.RemoveParameterByName("group_by") + End If + + SetPipeAssignTo1() + End Sub + + Private Sub SetPipeAssignTo1() + If ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator1.clsParameters.Count > 1 Then + clsPipeOperator1.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + Else + clsPipeOperator1.RemoveAssignTo() + End If + End Sub + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputStation.ControlValueChanged If Not bUpdateComboOptions Then Exit Sub @@ -289,6 +591,7 @@ Public Class dlgClimograph clsGgwalterliethFunction.AddParameter("station", ucr1stFactorReceiver.GetVariableNames(), iPosition:=1) Else clsGgwalterliethFunction.RemoveParameterByName("station") + clsBaseOperator.RemoveParameterByName("facets") End If AddRemoveFacets() AddRemoveGroupBy() @@ -307,6 +610,8 @@ Public Class dlgClimograph Private Sub ucrSelectorClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorClimograph.ControlValueChanged AutoFacetStation() SetPipeAssignTo() + AutoFacetYear() + SetPipeAssignTo1() End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -354,7 +659,45 @@ Public Class dlgClimograph End If End Sub - Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged + Private Sub AddGeomLine() + If rdoClimograph.Checked Then + If Not ucrReceiverElement1.IsEmpty Then + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=2) + Else + clsBaseOperator.RemoveParameterByName("geom_line") + End If + If Not ucrReceiverElement1.IsEmpty Then + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=3) + Else + clsBaseOperator.RemoveParameterByName("geom_line1") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_line1") + End If + End Sub + + Private Sub ucrReceiverElement1_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement1.ControlValueChanged + AddGeomLine() + End Sub + + 'Private Sub RemoveFacet() + ' If rdoClimograph.Checked Then + ' If Not ucrReceiverFacet.IsEmpty Then + ' clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction1) + ' Else + ' clsBaseOperator.RemoveParameterByName("facets") + ' End If + ' Else + ' If Not ucr1stFactorReceiver.IsEmpty Then + ' clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + ' Else + ' clsBaseOperator.RemoveParameterByName("facets") + ' End If + ' End If + 'End Sub + + Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file From 288b978ae8e7c81acbed73991183ccf3094d306d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 7 May 2024 08:23:36 +0100 Subject: [PATCH 020/273] Added Ordinary Climograph Button --- instat/dlgClimograph.Designer.vb | 110 ++++++++++++++++++- instat/dlgClimograph.vb | 179 ++++++++++++++++++++++++------- 2 files changed, 248 insertions(+), 41 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index c0deee5015a..ca01682faf6 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -52,6 +52,14 @@ Partial Class dlgClimograph Me.lblElement2 = New System.Windows.Forms.Label() Me.ucrReceiverMonthC = New instat.ucrReceiverSingle() Me.lblMonthC = New System.Windows.Forms.Label() + Me.cmdOptions = New instat.ucrSplitButton() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() + Me.ucrChkColourIdntity = New instat.ucrCheck() + Me.ucrInputName = New instat.ucrInputTextBox() + Me.lblName = New System.Windows.Forms.Label() + Me.lblLabel = New System.Windows.Forms.Label() + Me.ucrInputLabels = New instat.ucrInputTextBox() Me.SuspendLayout() ' 'ucrReceiverAbsolute @@ -227,7 +235,7 @@ Partial Class dlgClimograph ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 344) + Me.ucrBase.Location = New System.Drawing.Point(12, 374) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 75 @@ -235,7 +243,7 @@ Partial Class dlgClimograph 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(12, 317) + Me.ucrSave.Location = New System.Drawing.Point(12, 347) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -398,11 +406,99 @@ Partial Class dlgClimograph Me.lblMonthC.TabIndex = 87 Me.lblMonthC.Text = "Month:" ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.Location = New System.Drawing.Point(11, 234) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(148, 25) + Me.cmdOptions.TabIndex = 95 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(112, 318) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 97 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(12, 315) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 96 + ' + 'ucrChkColourIdntity + ' + Me.ucrChkColourIdntity.AutoSize = True + Me.ucrChkColourIdntity.Checked = False + Me.ucrChkColourIdntity.Location = New System.Drawing.Point(12, 265) + Me.ucrChkColourIdntity.Name = "ucrChkColourIdntity" + Me.ucrChkColourIdntity.Size = New System.Drawing.Size(98, 24) + Me.ucrChkColourIdntity.TabIndex = 98 + ' + 'ucrInputName + ' + Me.ucrInputName.AddQuotesIfUnrecognised = True + Me.ucrInputName.AutoSize = True + Me.ucrInputName.IsMultiline = False + Me.ucrInputName.IsReadOnly = False + Me.ucrInputName.Location = New System.Drawing.Point(62, 288) + Me.ucrInputName.Name = "ucrInputName" + Me.ucrInputName.Size = New System.Drawing.Size(117, 21) + Me.ucrInputName.TabIndex = 99 + ' + 'lblName + ' + Me.lblName.AutoSize = True + Me.lblName.Location = New System.Drawing.Point(9, 293) + Me.lblName.Name = "lblName" + Me.lblName.Size = New System.Drawing.Size(38, 13) + Me.lblName.TabIndex = 100 + Me.lblName.Text = "Name:" + ' + 'lblLabel + ' + Me.lblLabel.AutoSize = True + Me.lblLabel.Location = New System.Drawing.Point(190, 293) + Me.lblLabel.Name = "lblLabel" + Me.lblLabel.Size = New System.Drawing.Size(41, 13) + Me.lblLabel.TabIndex = 102 + Me.lblLabel.Text = "Labels:" + ' + 'ucrInputLabels + ' + Me.ucrInputLabels.AddQuotesIfUnrecognised = True + Me.ucrInputLabels.AutoSize = True + Me.ucrInputLabels.IsMultiline = False + Me.ucrInputLabels.IsReadOnly = False + Me.ucrInputLabels.Location = New System.Drawing.Point(243, 288) + Me.ucrInputLabels.Name = "ucrInputLabels" + Me.ucrInputLabels.Size = New System.Drawing.Size(117, 21) + Me.ucrInputLabels.TabIndex = 101 + ' 'dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(477, 411) + Me.ClientSize = New System.Drawing.Size(472, 434) + Me.Controls.Add(Me.lblLabel) + Me.Controls.Add(Me.ucrInputLabels) + Me.Controls.Add(Me.lblName) + Me.Controls.Add(Me.ucrInputName) + Me.Controls.Add(Me.ucrChkColourIdntity) + Me.Controls.Add(Me.ucrInputLegendPosition) + Me.Controls.Add(Me.ucrChkLegend) + Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrInputFacet) Me.Controls.Add(Me.ucrReceiverFacet) Me.Controls.Add(Me.lblFacet) @@ -474,4 +570,12 @@ Partial Class dlgClimograph Friend WithEvents lblElement2 As Label Friend WithEvents ucrReceiverMonthC As ucrReceiverSingle Friend WithEvents lblMonthC As Label + Friend WithEvents cmdOptions As ucrSplitButton + Friend WithEvents ucrInputLegendPosition As ucrInputComboBox + Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents ucrChkColourIdntity As ucrCheck + Friend WithEvents lblName As Label + Friend WithEvents ucrInputName As ucrInputTextBox + Friend WithEvents lblLabel As Label + Friend WithEvents ucrInputLabels As ucrInputTextBox End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 1b0ea86ed46..4cdad082cd3 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -40,6 +40,23 @@ Public Class dlgClimograph Private clsAesLine1Function As New RFunction Private clsFacetFunction1 As New RFunction Private clsGroupByFunction1 As New RFunction + Private bResetSubdialog As Boolean = True + Private clsCoordPolarFunction As New RFunction + Private clsRFacetFunction As New RFunction + Private clsAnnotateFunction As New RFunction + Private clsCoordPolarStartOperator As New ROperator + Private clsXScaleDateFunction As New RFunction + Private clsYScaleDateFunction As New RFunction + Private clsScaleFillViridisFunction As New RFunction + Private clsScaleColourViridisFunction As New RFunction + Private clsScalecolouridentityFunction As New RFunction + Private clsLabsFunction As New RFunction + Private clsXlabFunction As New RFunction + Private clsYlabFunction As New RFunction + Private dctThemeFunctions As New Dictionary(Of String, RFunction) + Private clsXScalecontinuousFunction As New RFunction + Private clsYScalecontinuousFunction As New RFunction + Private clsThemeFunction As New RFunction Private clsFacetVariablesOperator As New ROperator Private clsFacetRowOp1 As New ROperator Private clsFacetColOp1 As New ROperator @@ -53,7 +70,6 @@ Public Class dlgClimograph Private bUpdateComboOptions1 As Boolean = True Private bUpdatingParameters1 As Boolean = False - Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseDialog() @@ -69,6 +85,8 @@ Public Class dlgClimograph End Sub Private Sub InitialiseDialog() + Dim dctLegendPosition As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 432 ucrSelectorClimograph.SetParameter(New RParameter("data", 0, bNewIncludeArgumentName:=False)) @@ -147,7 +165,7 @@ Public Class dlgClimograph ucrReceiverElement2.strSelectorHeading = "Variables" ucrReceiverElement2.SetLinkedDisplayControl(lblElement2) - ucr1stFactorReceiver.SetParameter(New RParameter("station")) + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) ucr1stFactorReceiver.Selector = ucrSelectorClimograph ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) ucr1stFactorReceiver.strSelectorHeading = "Factors" @@ -158,7 +176,7 @@ Public Class dlgClimograph ucrInputStation.SetItems({strFacetWrap, strFacetRow, strFacetCol, strNone}) ucrInputStation.SetDropDownStyleAsNonEditable() - ucrReceiverFacet.SetParameter(New RParameter("year")) + ucrReceiverFacet.SetParameter(New RParameter("var1")) ucrReceiverFacet.Selector = ucrSelectorClimograph ucrReceiverFacet.SetClimaticType("year") ucrReceiverFacet.bAutoFill = True @@ -176,7 +194,29 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkColourIdntity}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrChkColourIdntity.SetText("Colour Identity") + ucrChkColourIdntity.AddParameterValuesCondition(True, "checked", "True") + ucrChkColourIdntity.AddParameterValuesCondition(False, "checked", "False") + ucrChkColourIdntity.AddToLinkedControls({ucrInputName, ucrInputLabels}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrInputName.SetValidationTypeAsList() + ucrInputName.SetLinkedDisplayControl(lblName) + ucrInputLabels.SetValidationTypeAsList() + ucrInputLabels.SetLinkedDisplayControl(lblLabel) + + ucrChkLegend.SetText("Legend:") + ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrInputLegendPosition.SetDropDownStyleAsNonEditable() + ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) + dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) + dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) + dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) + dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34)) + dctLegendPosition.Add("Bottom", Chr(34) & "bottom" & Chr(34)) + ucrInputLegendPosition.SetItems(dctLegendPosition) + ucrChkLegend.AddParameterPresentCondition(True, "legend.position") + ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) ucrSave.SetPrefix("wl_graph") ucrSave.SetIsComboBox() @@ -206,6 +246,7 @@ Public Class dlgClimograph clsRggplotFunction = New RFunction clsBarAesFunction = New RFunction clsFacetFunction1 = New RFunction + clsScalecolouridentityFunction = New RFunction clsFacetVariablesOperator = New ROperator clsFacetRowOp1 = New ROperator clsFacetColOp1 = New ROperator @@ -271,9 +312,11 @@ Public Class dlgClimograph clsAesLineFunction.SetRCommand("aes") clsAesLineFunction.AddParameter("group", "1", iPosition:=1) + clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) clsAesLine1Function.SetRCommand("aes") clsAesLine1Function.AddParameter("group", "1", iPosition:=1) + clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) clsGeomLineFunction.SetRCommand("geom_line") clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) @@ -281,10 +324,30 @@ Public Class dlgClimograph clsGeomLineFunction1.SetRCommand("geom_line") clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") + clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) + clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() + clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() + clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() + clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() + clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone + clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() + clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) + clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() + clsCoordPolarFunction = GgplotDefaults.clsCoordPolarFunction.Clone() + clsXScaleDateFunction = GgplotDefaults.clsXScaleDateFunction.Clone() + clsYScaleDateFunction = GgplotDefaults.clsYScaleDateFunction.Clone() + clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() + dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) + clsScaleFillViridisFunction = GgplotDefaults.clsScaleFillViridisFunction + clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction + clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub @@ -302,8 +365,13 @@ Public Class dlgClimograph ucrReceiverMaxtem.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverAbsolute.SetRCode(clsGgwalterliethFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) + ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) + ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) + ucrChkColourIdntity.SetRCode(clsScalecolouridentityFunction, bReset) + ucrInputName.SetRCode(clsScalecolouridentityFunction, bReset) + ucrInputLabels.SetRCode(clsScalecolouridentityFunction, bReset) End If End Sub @@ -329,8 +397,9 @@ Public Class dlgClimograph ucrReceiverMonth.SetMeAsReceiver() clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) End If - AutoFacetYear() AddGeomLine() + Identity() + AutoFacetStation() End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -340,14 +409,14 @@ Public Class dlgClimograph TestOKEnabled() End Sub - Private Sub AutoFacetYear() - Dim currentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver - - If currentReceiver IsNot Nothing Then - ucrReceiverFacet.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"year_label"}) - currentReceiver.SetMeAsReceiver() - AddRemoveGroupBy1() - End If + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, + clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, + dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorClimograph, clsNewThemeFunction:=clsThemeFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) + sdgPlots.ShowDialog() + bResetSubdialog = False End Sub Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputFacet.ControlValueChanged @@ -374,7 +443,7 @@ Public Class dlgClimograph End Sub Private Sub UpdateParameters1() - clsFacetVariablesOperator.RemoveParameterByName("wrap" & ucrInputFacet.Name) + clsFacetVariablesOperator.RemoveParameterByName("var1") clsFacetColOp1.RemoveParameterByName("col" & ucrInputFacet.Name) clsFacetRowOp1.RemoveParameterByName("row" & ucrInputFacet.Name) @@ -383,7 +452,7 @@ Public Class dlgClimograph ucrReceiverFacet.SetRCode(Nothing) Select Case ucrInputFacet.GetText() Case strFacetWrap1 - ucrReceiverFacet.ChangeParameterName("wrap") + ucrReceiverFacet.ChangeParameterName("var1") ucrReceiverFacet.SetRCode(clsFacetVariablesOperator) Case strFacetCol1 ucrReceiverFacet.ChangeParameterName("col" & ucrInputFacet.Name) @@ -392,6 +461,9 @@ Public Class dlgClimograph ucrReceiverFacet.ChangeParameterName("row" & ucrInputFacet.Name) ucrReceiverFacet.SetRCode(clsFacetRowOp1) End Select + If Not clsRFacetFunction.ContainsParameter("x") Then + clsRFacetFunction.AddParameter("x", Chr(34) & Chr(34)) + End If bUpdatingParameters1 = False End Sub @@ -519,7 +591,7 @@ Public Class dlgClimograph End Sub Private Sub UpdateParameters() - clsFacetOperator.RemoveParameterByName("wrap" & ucrInputStation.Name) + clsFacetOperator.RemoveParameterByName("var1") clsFacetColOp.RemoveParameterByName("col" & ucrInputStation.Name) clsFacetRowOp.RemoveParameterByName("row" & ucrInputStation.Name) @@ -528,7 +600,7 @@ Public Class dlgClimograph ucr1stFactorReceiver.SetRCode(Nothing) Select Case ucrInputStation.GetText() Case strFacetWrap - ucr1stFactorReceiver.ChangeParameterName("wrap" & ucrInputStation.Name) + ucr1stFactorReceiver.ChangeParameterName("var1") ucr1stFactorReceiver.SetRCode(clsFacetOperator) Case strFacetCol ucr1stFactorReceiver.ChangeParameterName("col" & ucrInputStation.Name) @@ -598,19 +670,28 @@ Public Class dlgClimograph End Sub Private Sub AutoFacetStation() - Dim ucrCurrentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver + If rdoClimograph.Checked Then + Dim currentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver - If ucrCurrentReceiver IsNot Nothing Then - ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) - ucrCurrentReceiver.SetMeAsReceiver() - AddRemoveGroupBy() + If currentReceiver IsNot Nothing Then + ucrReceiverFacet.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"year_label"}) + currentReceiver.SetMeAsReceiver() + AddRemoveGroupBy1() + End If + Else + Dim ucrCurrentReceiver As ucrReceiver = ucrSelectorClimograph.CurrentReceiver + + If ucrCurrentReceiver IsNot Nothing Then + ucr1stFactorReceiver.AddItemsWithMetadataProperty(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, "Climatic_Type", {"station_label"}) + ucrCurrentReceiver.SetMeAsReceiver() + AddRemoveGroupBy() + End If End If End Sub Private Sub ucrSelectorClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorClimograph.ControlValueChanged AutoFacetStation() SetPipeAssignTo() - AutoFacetYear() SetPipeAssignTo1() End Sub @@ -681,21 +762,43 @@ Public Class dlgClimograph AddGeomLine() End Sub - 'Private Sub RemoveFacet() - ' If rdoClimograph.Checked Then - ' If Not ucrReceiverFacet.IsEmpty Then - ' clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction1) - ' Else - ' clsBaseOperator.RemoveParameterByName("facets") - ' End If - ' Else - ' If Not ucr1stFactorReceiver.IsEmpty Then - ' clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) - ' Else - ' clsBaseOperator.RemoveParameterByName("facets") - ' End If - ' End If - 'End Sub + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + + Private Sub Identity() + If rdoClimograph.Checked Then + If ucrChkColourIdntity.Checked Then + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If + Else + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + End If + Else + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + End If + End Sub + + Private Sub ucrChkColourIdntity_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColourIdntity.ControlValueChanged, ucrInputName.ControlValueChanged, ucrInputLabels.ControlValueChanged + Identity() + End Sub Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged TestOKEnabled() From 9143a4181959df87e9e8491bcc6cdf6357e83ff4 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 16 May 2024 12:13:30 +0300 Subject: [PATCH 021/273] More addtions --- instat/UserTables/clsTablesUtils.vb | 76 ++++++ instat/UserTables/dlgGeneralTable.Designer.vb | 200 ++++++++++++++++ .../dlgGeneralTable.resx} | 0 instat/UserTables/dlgGeneralTable.vb | 145 ++++++++++++ .../sdgTableOptions.Designer.vb | 188 +++------------ instat/{ => UserTables}/sdgTableOptions.resx | 6 - instat/{ => UserTables}/sdgTableOptions.vb | 218 ++---------------- .../sdgTableOptionsTextFormat.Designer.vb | 0 .../UserTables/sdgTableOptionsTextFormat.resx | 120 ++++++++++ .../sdgTableOptionsTextFormat.vb | 86 +++---- instat/UserTables/ucrSourceNotes.Designer.vb | 90 ++++++++ instat/UserTables/ucrSourceNotes.resx | 126 ++++++++++ instat/UserTables/ucrSourceNotes.vb | 103 +++++++++ instat/dlgSummaryTables.Designer.vb | 1 + instat/dlgSummaryTables.resx | 3 - instat/instat.vbproj | 31 ++- 16 files changed, 980 insertions(+), 413 deletions(-) create mode 100644 instat/UserTables/clsTablesUtils.vb create mode 100644 instat/UserTables/dlgGeneralTable.Designer.vb rename instat/{sdgTableOptionsTextFormat.resx => UserTables/dlgGeneralTable.resx} (100%) create mode 100644 instat/UserTables/dlgGeneralTable.vb rename instat/{ => UserTables}/sdgTableOptions.Designer.vb (68%) rename instat/{ => UserTables}/sdgTableOptions.resx (94%) rename instat/{ => UserTables}/sdgTableOptions.vb (60%) rename instat/{ => UserTables}/sdgTableOptionsTextFormat.Designer.vb (100%) create mode 100644 instat/UserTables/sdgTableOptionsTextFormat.resx rename instat/{ => UserTables}/sdgTableOptionsTextFormat.vb (58%) create mode 100644 instat/UserTables/ucrSourceNotes.Designer.vb create mode 100644 instat/UserTables/ucrSourceNotes.resx create mode 100644 instat/UserTables/ucrSourceNotes.vb diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb new file mode 100644 index 00000000000..7d296b5c941 --- /dev/null +++ b/instat/UserTables/clsTablesUtils.vb @@ -0,0 +1,76 @@ +Imports System.Reflection + +Public Class clsTablesUtils + + Public Shared Function GetNewHtmlSpanRFunction() As RFunction + Dim clsHtmlDivRFunction As New RFunction + clsHtmlDivRFunction.SetPackageName("htmltools") + clsHtmlDivRFunction.SetRCommand("tags$span") + Return clsHtmlDivRFunction + End Function + + Public Shared Function GetNewHtmlStyleRFunction() As RFunction + Dim clsStyleRFunction As New RFunction + clsStyleRFunction.SetPackageName("htmltools") + clsStyleRFunction.SetRCommand("css") + Return clsStyleRFunction + End Function + + Public Shared Sub ShowTextFormatSubDialog(owner As Form, clsHtmlTagRFunction As RFunction) + If Not clsHtmlTagRFunction.ContainsParameter("style") Then + clsHtmlTagRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewHtmlStyleRFunction(), iPosition:=1) + End If + sdgTableOptionsTextFormat.Setup(clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure) + sdgTableOptionsTextFormat.ShowDialog(owner) + End Sub + + Public Shared Function FindRFunctionsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RFunction) + Dim lstRFunctions As New List(Of RFunction) + For Each clsRParam As RParameter In clsOperator.clsParameters + If clsRParam.bIsFunction AndAlso clsRParam.HasValue() Then + Dim rFunction As RFunction = clsRParam.clsArgumentCodeStructure + If rFunction.strRCommand = strRCommandName Then + lstRFunctions.Add(rFunction) + End If + End If + Next + Return lstRFunctions + End Function + + Public Shared Sub RemoveParameterFromOperator(strParameterName As String, clsOperator As ROperator) + ' Remove all the previous footer parameters first + Dim lstParams As New List(Of RParameter) + For Each clsRParam As RParameter In clsOperator.clsParameters + If clsRParam.strArgumentName.Contains(strParameterName) Then + lstParams.Add(clsRParam) + End If + Next + For Each clsRParam As RParameter In lstParams + clsOperator.RemoveParameter(clsRParam) + Next + End Sub + + Public Shared Sub SetGridTagsInOperator(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) + + If dataGrid.Rows.Count = 0 Then + Exit Sub + End If + + ' Then add the new footer parameters + For index As Integer = 0 To dataGrid.Rows.Count - 1 + Dim clsFooterRFunction As RFunction = dataGrid.Rows.Item(index).Tag + If clsFooterRFunction IsNot Nothing Then + clsOperator.AddParameter(strParameterName & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) + End If + Next + + End Sub + + Public Shared Function GetStringValue(str As String, bwithQuotes As Boolean) As String + If String.IsNullOrEmpty(str) Then + str = "" + End If + Return If(bwithQuotes, """" & str & """", str.Replace("""", "")) + End Function + +End Class diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb new file mode 100644 index 00000000000..0b5cde254cf --- /dev/null +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -0,0 +1,200 @@ + _ +Partial Class dlgGeneralTable + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() + Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() + Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() + Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() + Me.lblHeaderSubtitle = New System.Windows.Forms.Label() + Me.lblHeaderTitle = New System.Windows.Forms.Label() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.lblColumns = New System.Windows.Forms.Label() + Me.btnMoreOptions = New System.Windows.Forms.Button() + Me.ucrBase = New instat.ucrButtons() + Me.ucrSaveTable = New instat.ucrSave() + Me.SuspendLayout() + ' + 'btnHeaderSubTitleFormat + ' + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(390, 71) + Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderSubTitleFormat.TabIndex = 19 + Me.btnHeaderSubTitleFormat.Text = "Format" + Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True + ' + 'btnHeaderTitleFormat + ' + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(386, 29) + Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) + Me.btnHeaderTitleFormat.TabIndex = 18 + Me.btnHeaderTitleFormat.Text = "Format" + Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True + ' + 'ucrInputHeaderSubtitle + ' + Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderSubtitle.AutoSize = True + Me.ucrInputHeaderSubtitle.IsMultiline = False + Me.ucrInputHeaderSubtitle.IsReadOnly = False + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(249, 73) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderSubtitle.TabIndex = 17 + ' + 'ucrInputHeaderTitle + ' + Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderTitle.AutoSize = True + Me.ucrInputHeaderTitle.IsMultiline = False + Me.ucrInputHeaderTitle.IsReadOnly = False + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(245, 31) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderTitle.TabIndex = 16 + ' + 'lblHeaderSubtitle + ' + Me.lblHeaderSubtitle.AutoSize = True + Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(246, 56) + Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) + Me.lblHeaderSubtitle.TabIndex = 15 + Me.lblHeaderSubtitle.Text = "Subtitle:" + ' + 'lblHeaderTitle + ' + Me.lblHeaderTitle.AutoSize = True + Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHeaderTitle.Location = New System.Drawing.Point(242, 13) + Me.lblHeaderTitle.Name = "lblHeaderTitle" + Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) + Me.lblHeaderTitle.TabIndex = 14 + Me.lblHeaderTitle.Text = "Title:" + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(9, 9) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 22 + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Me + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(250, 113) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(137, 100) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 23 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(247, 100) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(50, 13) + Me.lblColumns.TabIndex = 24 + Me.lblColumns.Text = "Columns:" + ' + 'btnMoreOptions + ' + Me.btnMoreOptions.Location = New System.Drawing.Point(250, 225) + Me.btnMoreOptions.Name = "btnMoreOptions" + Me.btnMoreOptions.Size = New System.Drawing.Size(114, 23) + Me.btnMoreOptions.TabIndex = 25 + Me.btnMoreOptions.Text = "More Options" + Me.btnMoreOptions.UseVisualStyleBackColor = True + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 290) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 26 + ' + 'ucrSaveTable + ' + Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveTable.Location = New System.Drawing.Point(9, 258) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTable.Name = "ucrSaveTable" + Me.ucrSaveTable.Size = New System.Drawing.Size(319, 24) + Me.ucrSaveTable.TabIndex = 27 + ' + 'dlgGeneralTable + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(469, 351) + Me.Controls.Add(Me.ucrSaveTable) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.btnMoreOptions) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.btnHeaderSubTitleFormat) + Me.Controls.Add(Me.btnHeaderTitleFormat) + Me.Controls.Add(Me.ucrInputHeaderSubtitle) + Me.Controls.Add(Me.ucrInputHeaderTitle) + Me.Controls.Add(Me.lblHeaderSubtitle) + Me.Controls.Add(Me.lblHeaderTitle) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "dlgGeneralTable" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Table" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents btnHeaderSubTitleFormat As Button + Friend WithEvents btnHeaderTitleFormat As Button + Friend WithEvents ucrInputHeaderSubtitle As ucrInputTextBox + Friend WithEvents ucrInputHeaderTitle As ucrInputTextBox + Friend WithEvents lblHeaderSubtitle As Label + Friend WithEvents lblHeaderTitle As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents btnMoreOptions As Button + Friend WithEvents lblColumns As Label + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrSaveTable As ucrSave +End Class diff --git a/instat/sdgTableOptionsTextFormat.resx b/instat/UserTables/dlgGeneralTable.resx similarity index 100% rename from instat/sdgTableOptionsTextFormat.resx rename to instat/UserTables/dlgGeneralTable.resx diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb new file mode 100644 index 00000000000..e6641b8fa85 --- /dev/null +++ b/instat/UserTables/dlgGeneralTable.vb @@ -0,0 +1,145 @@ +Imports instat.Translations + +Public Class dlgGeneralTable + Private clsBaseOperator As New ROperator + Private clsHeaderRFunction, clsTitleRFunction, clsSubtitleRFunction As New RFunction + + Private bFirstload As Boolean = True + Private bReset As Boolean = True + + Private Sub dlgGeneralTable_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 ucrInputHeaderTitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitle.ControlValueChanged + 'If no title providded, then just remove the tab_header command from the operator + If ucrInputHeaderTitle.IsEmpty() Then + clsBaseOperator.RemoveParameterByName("tab_header_func_name") + Else + clsBaseOperator.AddParameter("tab_header_func_name", clsRFunctionParameter:=clsHeaderRFunction, iPosition:=2, bIncludeArgumentName:=False) + End If + End Sub + + Private Sub ucrInputHeaderSubtitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderSubtitle.ControlValueChanged + ' Subtitle is optional, so remove the parameter when empty + If ucrInputHeaderSubtitle.IsEmpty() Then + clsHeaderRFunction.RemoveParameterByName("subtitle") + Else + clsHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsSubtitleRFunction, iPosition:=1) + End If + End Sub + + Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click + clsTablesUtils.ShowTextFormatSubDialog(Me, clsTitleRFunction) + End Sub + + Private Sub btnHeaderSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click + clsTablesUtils.ShowTextFormatSubDialog(Me, clsSubtitleRFunction) + End Sub + + Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click + sdgTableOptions.Setup(clsBaseOperator) + sdgTableOptions.ShowDialog(Me) + End Sub + + Private Sub ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitle.ControlContentsChanged, ucrInputHeaderSubtitle.ControlContentsChanged, ucrReceiverMultipleCols.ControlContentsChanged + TestOKEnabled() + End Sub + + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOKEnabled() + End Sub + + + Private Sub initialiseDialog() + + ucrInputHeaderTitle.SetParameter(New RParameter("title_text_param", 0, bNewIncludeArgumentName:=False)) + ucrInputHeaderTitle.SetLinkedDisplayControl(New List(Of Control)({lblHeaderTitle, btnHeaderTitleFormat})) + + ucrInputHeaderSubtitle.SetParameter(New RParameter("subtitle_text_param", 0, bNewIncludeArgumentName:=False)) + ucrInputHeaderSubtitle.SetLinkedDisplayControl(New List(Of Control)({lblHeaderSubtitle, btnHeaderSubTitleFormat})) + + ucrReceiverMultipleCols.SetParameter(New RParameter("df_columns_to_use_param", 0, bNewIncludeArgumentName:=False)) + ucrReceiverMultipleCols.SetParameterIsRFunction() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetLinkedDisplayControl(lblColumns) + + ucrSaveTable.SetPrefix("table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetDataFrameSelector(ucrSelectorCols.ucrAvailableDataFrames) + ucrSaveTable.SetIsComboBox() + ucrSaveTable.SetCheckBoxText("Save Table") + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + End Sub + + + Private Sub SetDefaults() + clsBaseOperator = New ROperator + + clsHeaderRFunction = New RFunction + clsTitleRFunction = New RFunction + clsSubtitleRFunction = New RFunction + + ucrSelectorCols.Reset() + ucrReceiverMultipleCols.SetMeAsReceiver() + ucrSaveTable.Reset() + + clsBaseOperator.SetOperation("%>%") + clsBaseOperator.bBrackets = False + + Dim clsGtFunction As New RFunction + clsGtFunction.SetPackageName("gt") + clsGtFunction.SetRCommand("gt") + clsBaseOperator.AddParameter(strParameterName:="gt_funct_param", clsRFunctionParameter:=clsGtFunction, iPosition:=1, bIncludeArgumentName:=False) + + '----------------------------------------- + ' HEADER + clsHeaderRFunction.SetPackageName("gt") + clsHeaderRFunction.SetRCommand("tab_header") + + ' Title related R functions + clsTitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + clsHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsTitleRFunction, iPosition:=0) + + ' Subtitle related R functions + clsSubtitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + + '----------------------------------------- + + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + + End Sub + + + + Private Sub SetRCodeForControls(bReset As Boolean) + + ucrInputHeaderTitle.SetRCode(clsTitleRFunction, bReset) + ucrInputHeaderSubtitle.SetRCode(clsSubtitleRFunction, bReset) + ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) + ucrSaveTable.SetRCode(clsBaseOperator, bReset) + + End Sub + + Private Sub TestOKEnabled() + If Not ucrInputHeaderSubtitle.IsEmpty AndAlso ucrInputHeaderTitle.IsEmpty Then + 'If title not provided then subtitle should not be provided + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(Not ucrReceiverMultipleCols.IsEmpty AndAlso ucrSaveTable.IsComplete) + End If + End Sub + + +End Class \ No newline at end of file diff --git a/instat/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb similarity index 68% rename from instat/sdgTableOptions.Designer.vb rename to instat/UserTables/sdgTableOptions.Designer.vb index 3846bed11ad..bef9db8fac2 100644 --- a/instat/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -24,18 +24,12 @@ Partial Class sdgTableOptions Private Sub InitializeComponent() Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() - Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() - Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() - Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() - Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() - Me.lblHeaderSubtitle = New System.Windows.Forms.Label() - Me.lblHeaderTitle = New System.Windows.Forms.Label() - Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridHeaderFooterNotes = New System.Windows.Forms.DataGridView() Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() Me.DataGridViewButtonColumn1 = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblHeaderFooterNotes = New System.Windows.Forms.Label() + Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -43,10 +37,7 @@ Partial Class sdgTableOptions Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblFooterCellNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() - Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colSourceNoteFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.lblSourceNotes = New System.Windows.Forms.Label() + Me.UcrSourceNotes1 = New instat.ucrSourceNotes() Me.tbpThemes = New System.Windows.Forms.TabPage() Me.ucrCboSelectThemes = New instat.ucrInputComboBox() Me.btnManualTheme = New System.Windows.Forms.Button() @@ -56,11 +47,10 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() - Me.tbpFooters.SuspendLayout() CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbpFooters.SuspendLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() - CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpThemes.SuspendLayout() Me.SuspendLayout() ' @@ -78,12 +68,8 @@ Partial Class sdgTableOptions ' 'tbpHeader ' - Me.tbpHeader.Controls.Add(Me.btnHeaderSubTitleFormat) - Me.tbpHeader.Controls.Add(Me.btnHeaderTitleFormat) - Me.tbpHeader.Controls.Add(Me.ucrInputHeaderSubtitle) - Me.tbpHeader.Controls.Add(Me.ucrInputHeaderTitle) - Me.tbpHeader.Controls.Add(Me.lblHeaderSubtitle) - Me.tbpHeader.Controls.Add(Me.lblHeaderTitle) + Me.tbpHeader.Controls.Add(Me.dataGridHeaderFooterNotes) + Me.tbpHeader.Controls.Add(Me.lblHeaderFooterNotes) Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) @@ -92,92 +78,17 @@ Partial Class sdgTableOptions Me.tbpHeader.Text = "Headers" Me.tbpHeader.UseVisualStyleBackColor = True ' - 'btnHeaderSubTitleFormat - ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(219, 47) - Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) - Me.btnHeaderSubTitleFormat.TabIndex = 13 - Me.btnHeaderSubTitleFormat.Text = "Format" - Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True - ' - 'btnHeaderTitleFormat - ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(219, 17) - Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(75, 23) - Me.btnHeaderTitleFormat.TabIndex = 12 - Me.btnHeaderTitleFormat.Text = "Format" - Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True - ' - 'ucrInputHeaderSubtitle - ' - Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderSubtitle.AutoSize = True - Me.ucrInputHeaderSubtitle.IsMultiline = False - Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(67, 49) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderSubtitle.TabIndex = 11 - ' - 'ucrInputHeaderTitle - ' - Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderTitle.AutoSize = True - Me.ucrInputHeaderTitle.IsMultiline = False - Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(67, 19) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) - Me.ucrInputHeaderTitle.TabIndex = 10 - ' - 'lblHeaderSubtitle - ' - Me.lblHeaderSubtitle.AutoSize = True - Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(13, 54) - Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) - Me.lblHeaderSubtitle.TabIndex = 9 - Me.lblHeaderSubtitle.Text = "Subtitle:" - ' - 'lblHeaderTitle - ' - Me.lblHeaderTitle.AutoSize = True - Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(13, 19) - Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) - Me.lblHeaderTitle.TabIndex = 8 - Me.lblHeaderTitle.Text = "Title:" - ' - 'tbpFooters - ' - Me.tbpFooters.Controls.Add(Me.dataGridHeaderFooterNotes) - Me.tbpFooters.Controls.Add(Me.lblHeaderFooterNotes) - Me.tbpFooters.Controls.Add(Me.dataGridCellFooterNotes) - Me.tbpFooters.Controls.Add(Me.lblFooterCellNotes) - Me.tbpFooters.Location = New System.Drawing.Point(4, 22) - Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(642, 233) - Me.tbpFooters.TabIndex = 3 - Me.tbpFooters.Text = "Footers" - Me.tbpFooters.UseVisualStyleBackColor = True - ' 'dataGridHeaderFooterNotes ' Me.dataGridHeaderFooterNotes.AllowUserToAddRows = False Me.dataGridHeaderFooterNotes.AllowUserToDeleteRows = False Me.dataGridHeaderFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridHeaderFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewButtonColumn1}) - Me.dataGridHeaderFooterNotes.Location = New System.Drawing.Point(6, 24) + Me.dataGridHeaderFooterNotes.Location = New System.Drawing.Point(6, 26) Me.dataGridHeaderFooterNotes.Name = "dataGridHeaderFooterNotes" Me.dataGridHeaderFooterNotes.RowHeadersWidth = 62 Me.dataGridHeaderFooterNotes.Size = New System.Drawing.Size(630, 84) - Me.dataGridHeaderFooterNotes.TabIndex = 7 + Me.dataGridHeaderFooterNotes.TabIndex = 15 ' 'DataGridViewTextBoxColumn2 ' @@ -208,19 +119,30 @@ Partial Class sdgTableOptions 'lblHeaderFooterNotes ' Me.lblHeaderFooterNotes.AutoSize = True - Me.lblHeaderFooterNotes.Location = New System.Drawing.Point(9, 8) + Me.lblHeaderFooterNotes.Location = New System.Drawing.Point(9, 10) Me.lblHeaderFooterNotes.Name = "lblHeaderFooterNotes" Me.lblHeaderFooterNotes.Size = New System.Drawing.Size(109, 13) - Me.lblHeaderFooterNotes.TabIndex = 6 + Me.lblHeaderFooterNotes.TabIndex = 14 Me.lblHeaderFooterNotes.Text = "Header footers notes:" ' + 'tbpFooters + ' + Me.tbpFooters.Controls.Add(Me.dataGridCellFooterNotes) + Me.tbpFooters.Controls.Add(Me.lblFooterCellNotes) + Me.tbpFooters.Location = New System.Drawing.Point(4, 22) + Me.tbpFooters.Name = "tbpFooters" + Me.tbpFooters.Size = New System.Drawing.Size(642, 233) + Me.tbpFooters.TabIndex = 3 + Me.tbpFooters.Text = "Footers" + Me.tbpFooters.UseVisualStyleBackColor = True + ' 'dataGridCellFooterNotes ' Me.dataGridCellFooterNotes.AllowUserToAddRows = False Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(7, 139) + Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(7, 31) Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" Me.dataGridCellFooterNotes.RowHeadersWidth = 62 Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 84) @@ -260,7 +182,7 @@ Partial Class sdgTableOptions 'lblFooterCellNotes ' Me.lblFooterCellNotes.AutoSize = True - Me.lblFooterCellNotes.Location = New System.Drawing.Point(10, 121) + Me.lblFooterCellNotes.Location = New System.Drawing.Point(10, 13) Me.lblFooterCellNotes.Name = "lblFooterCellNotes" Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) Me.lblFooterCellNotes.TabIndex = 4 @@ -268,8 +190,7 @@ Partial Class sdgTableOptions ' 'tbpSourceNotes ' - Me.tbpSourceNotes.Controls.Add(Me.dataGridSourceNotes) - Me.tbpSourceNotes.Controls.Add(Me.lblSourceNotes) + Me.tbpSourceNotes.Controls.Add(Me.UcrSourceNotes1) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" Me.tbpSourceNotes.Size = New System.Drawing.Size(642, 233) @@ -277,42 +198,12 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' - 'dataGridSourceNotes - ' - Me.dataGridSourceNotes.AllowUserToAddRows = False - Me.dataGridSourceNotes.AllowUserToDeleteRows = False - Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colSourceNoteFormat}) - Me.dataGridSourceNotes.Location = New System.Drawing.Point(7, 24) - Me.dataGridSourceNotes.Name = "dataGridSourceNotes" - Me.dataGridSourceNotes.RowHeadersWidth = 62 - Me.dataGridSourceNotes.Size = New System.Drawing.Size(630, 193) - Me.dataGridSourceNotes.TabIndex = 7 - ' - 'DataGridViewTextBoxColumn1 - ' - Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn1.HeaderText = "Note Text" - Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" - ' - 'colSourceNoteFormat - ' - Me.colSourceNoteFormat.HeaderText = "" - Me.colSourceNoteFormat.Name = "colSourceNoteFormat" - Me.colSourceNoteFormat.ReadOnly = True - Me.colSourceNoteFormat.Text = "Format" - Me.colSourceNoteFormat.UseColumnTextForButtonValue = True - Me.colSourceNoteFormat.Width = 55 - ' - 'lblSourceNotes + 'UcrSourceNotes1 ' - Me.lblSourceNotes.AutoSize = True - Me.lblSourceNotes.Location = New System.Drawing.Point(5, 8) - Me.lblSourceNotes.Name = "lblSourceNotes" - Me.lblSourceNotes.Size = New System.Drawing.Size(73, 13) - Me.lblSourceNotes.TabIndex = 6 - Me.lblSourceNotes.Text = "Source notes:" + Me.UcrSourceNotes1.Location = New System.Drawing.Point(7, 7) + Me.UcrSourceNotes1.Name = "UcrSourceNotes1" + Me.UcrSourceNotes1.Size = New System.Drawing.Size(581, 190) + Me.UcrSourceNotes1.TabIndex = 0 ' 'tbpThemes ' @@ -403,13 +294,11 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.ResumeLayout(False) Me.tbpHeader.ResumeLayout(False) Me.tbpHeader.PerformLayout() + CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpFooters.ResumeLayout(False) Me.tbpFooters.PerformLayout() - CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpSourceNotes.ResumeLayout(False) - Me.tbpSourceNotes.PerformLayout() - CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpThemes.ResumeLayout(False) Me.tbpThemes.PerformLayout() Me.ResumeLayout(False) @@ -428,25 +317,16 @@ Partial Class sdgTableOptions Friend WithEvents rdoSelectTheme As RadioButton Friend WithEvents rdoManualTheme As RadioButton Friend WithEvents ucrPnlThemesPanel As UcrPanel - Friend WithEvents ucrInputHeaderSubtitle As ucrInputTextBox - Friend WithEvents ucrInputHeaderTitle As ucrInputTextBox - Friend WithEvents lblHeaderSubtitle As Label - Friend WithEvents lblHeaderTitle As Label - Friend WithEvents btnHeaderSubTitleFormat As Button - Friend WithEvents btnHeaderTitleFormat As Button Friend WithEvents lblFooterCellNotes As Label Friend WithEvents dataGridCellFooterNotes As DataGridView - Friend WithEvents dataGridSourceNotes As DataGridView - Friend WithEvents lblSourceNotes As Label - Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn - Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn + Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn + Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterFormat As DataGridViewButtonColumn Friend WithEvents dataGridHeaderFooterNotes As DataGridView Friend WithEvents lblHeaderFooterNotes As Label Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewComboBoxColumn Friend WithEvents DataGridViewButtonColumn1 As DataGridViewButtonColumn - Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn - Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterFormat As DataGridViewButtonColumn + Friend WithEvents UcrSourceNotes1 As ucrSourceNotes End Class diff --git a/instat/sdgTableOptions.resx b/instat/UserTables/sdgTableOptions.resx similarity index 94% rename from instat/sdgTableOptions.resx rename to instat/UserTables/sdgTableOptions.resx index 3a51d070a74..13b44d9838b 100644 --- a/instat/sdgTableOptions.resx +++ b/instat/UserTables/sdgTableOptions.resx @@ -138,10 +138,4 @@ True - - True - - - True - \ No newline at end of file diff --git a/instat/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb similarity index 60% rename from instat/sdgTableOptions.vb rename to instat/UserTables/sdgTableOptions.vb index 5844c4be23e..83f04b8ded2 100644 --- a/instat/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -14,16 +14,11 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . -Imports System.Reflection -Imports System.Windows.Documents Imports instat.Translations -Imports unvell.ReoGrid.IO.OpenXML.Schema Public Class sdgTableOptions Private clsOperator As ROperator - Private clsTitleRFunction As RFunction - Private clsSubtitleRFunction As RFunction Private clsThemeRFunction As RFunction Private bDialogInitialised As Boolean = False @@ -32,48 +27,14 @@ Public Class sdgTableOptions End Sub Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn - SetHeaderOptionsInOperatorOnReturn(clsOperator) - RemoveParameterFromOperatorOnReturn("tab_footnote", clsOperator) - SetGridOptionsInOperatorOnReturn(dataGridHeaderFooterNotes, "tab_footnote", clsOperator) - SetGridOptionsInOperatorOnReturn(dataGridCellFooterNotes, "tab_footnote", clsOperator) - SetGridOptionsInOperatorOnReturn(dataGridSourceNotes, "tab_source_note", clsOperator) - SetThemesInOperatorOnReturn(clsOperator) - End Sub - - Private Sub SetGridOptionsInOperatorOnReturn(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) - - If dataGrid.Rows.Count = 0 Then - Exit Sub - End If - - ' Then add the new footer parameters - For index As Integer = 0 To dataGrid.Rows.Count - 1 - Dim clsFooterRFunction As RFunction = dataGrid.Rows.Item(index).Tag - If clsFooterRFunction IsNot Nothing Then - clsOperator.AddParameter(strParameterName & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) - End If - Next - - End Sub - - Private Sub RemoveParameterFromOperatorOnReturn(strParameterName As String, clsOperator As ROperator) - - ' Remove all the previous footer parameters first - Dim lstParams As New List(Of RParameter) - For Each clsRParam As RParameter In clsOperator.clsParameters - If clsRParam.strArgumentName.Contains(strParameterName) Then - lstParams.Add(clsRParam) - End If - Next - For Each clsRParam As RParameter In lstParams - clsOperator.RemoveParameter(clsRParam) - Next + clsTablesUtils.RemoveParameterFromOperator("tab_footnote", clsOperator) + clsTablesUtils.SetGridTagsInOperator(dataGridHeaderFooterNotes, "tab_footnote", clsOperator) + clsTablesUtils.SetGridTagsInOperator(dataGridCellFooterNotes, "tab_footnote", clsOperator) + SetThemesInOperatorOnReturn(clsOperator) End Sub - - Private Sub initialiseDialog() ucrPnlThemesPanel.AddRadioButton(rdoSelectTheme) ucrPnlThemesPanel.AddRadioButton(rdoManualTheme) @@ -91,132 +52,23 @@ Public Class sdgTableOptions ''' Public Sub Setup(clsNewOperator As ROperator) - If Not bDialogInitialised Then - initialiseDialog() - bDialogInitialised = True - End If - - clsOperator = clsNewOperator - - If Not clsNewOperator.ContainsParameter("gt") Then + If clsTablesUtils.FindRFunctionsWithRCommand("gt", clsNewOperator).Count = 0 Then MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog") - Me.Close() - Exit Sub - End If - - SetupHeaderRFunctionsInOperatorOnNew(clsOperator) - SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) - SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator) - SetupThemeRFunctionsInOperatorOnNew(clsOperator) - - End Sub - - '----------------------------------------- - ' HEADER CONTROLS - - Private Sub SetupHeaderRFunctionsInOperatorOnNew(clsOperator As ROperator) - - ' Use existing header function it's in the operator, - ' if it's not in the operator create one and add it to the operator. - Dim clsHeaderRFunction As RFunction - - If clsOperator.ContainsParameter("tab_header") Then - clsHeaderRFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure - Else - ' Create new header function - clsHeaderRFunction = New RFunction - clsHeaderRFunction.SetPackageName("gt") - clsHeaderRFunction.SetRCommand("tab_header") - ' add the header function into the operator - clsOperator.AddParameter("tab_header", clsRFunctionParameter:=clsHeaderRFunction, bIncludeArgumentName:=False) - End If - - If clsHeaderRFunction.ContainsParameter("title") Then - clsTitleRFunction = clsHeaderRFunction.GetParameter("title").clsArgumentCodeStructure - Else - ' create new title function and add it to into the header function - clsTitleRFunction = GetNewHtmlDivRFunction() - clsTitleRFunction.AddParameter(strParameterValue:=Chr(34) & "" & Chr(34), iPosition:=0) - clsTitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewStyleRFunction(), iPosition:=1) - - ' Add the title function as the paramter value of header function - clsHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsTitleRFunction) - - End If - - If clsHeaderRFunction.ContainsParameter("subtitle") Then - clsSubtitleRFunction = clsHeaderRFunction.GetParameter("subtitle").clsArgumentCodeStructure - Else - ' Create new sub title function and add it to into the header function - clsSubtitleRFunction = GetNewHtmlDivRFunction() - clsSubtitleRFunction.AddParameter(strParameterValue:=Chr(34) & "" & Chr(34), iPosition:=0) - clsSubtitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewStyleRFunction(), iPosition:=1) - - ' Add the subtitle function as the paramter value of header function - clsHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsSubtitleRFunction) - - End If - - ' set the header controls values - ucrInputHeaderTitle.SetName(GetStringValue(clsTitleRFunction.clsParameters(0).strArgumentValue, False)) - ucrInputHeaderSubtitle.SetName(GetStringValue(clsSubtitleRFunction.clsParameters(0).strArgumentValue, False)) - End Sub - - Private Sub SetHeaderOptionsInOperatorOnReturn(clsOperator As ROperator) - 'Remove any header additions if both title and sub title are empty - - If ucrInputHeaderTitle.IsEmpty() AndAlso ucrInputHeaderSubtitle.IsEmpty() Then - clsOperator.RemoveParameterByName("tab_header") Exit Sub End If - Dim clsHeaderRFunction As RFunction = clsOperator.GetParameter("tab_header").clsArgumentCodeStructure - If ucrInputHeaderTitle.IsEmpty() Then - clsHeaderRFunction.RemoveParameterByName("title") - Else - clsTitleRFunction.AddParameter(strParameterValue:=GetStringValue(ucrInputHeaderTitle.GetText(), True), iPosition:=0) - End If - If ucrInputHeaderSubtitle.IsEmpty() Then - clsHeaderRFunction.RemoveParameterByName("subtitle") - Else - clsSubtitleRFunction.AddParameter(strParameterValue:=GetStringValue(ucrInputHeaderSubtitle.GetText(), True), iPosition:=0) + If Not bDialogInitialised Then + initialiseDialog() + bDialogInitialised = True End If - End Sub - - Private Function GetNewHtmlDivRFunction() As RFunction - Dim clsHtmlDivRFunction As New RFunction - clsHtmlDivRFunction.SetPackageName("htmltools") - clsHtmlDivRFunction.SetRCommand("tags$span") - Return clsHtmlDivRFunction - End Function - - Private Function GetNewStyleRFunction() As RFunction - Dim clsStyleRFunction As New RFunction - clsStyleRFunction.SetPackageName("htmltools") - clsStyleRFunction.SetRCommand("css") - Return clsStyleRFunction - End Function - - Private Sub ucrInputHeaderTitle_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitle.ControlContentsChanged - btnHeaderTitleFormat.Enabled = Not ucrInputHeaderTitle.IsEmpty - End Sub - - Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click - sdgTableOptionsTextFormat.Setup(clsTitleRFunction.GetParameter("style").clsArgumentCodeStructure) - sdgTableOptionsTextFormat.Show(Me) - End Sub - - Private Sub ucrInputHeaderSubtitle_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderSubtitle.ControlContentsChanged - btnHeaderSubTitleFormat.Enabled = Not ucrInputHeaderSubtitle.IsEmpty - End Sub + Me.clsOperator = clsNewOperator - Private Sub btnHeaderSubTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click - sdgTableOptionsTextFormat.Setup(clsSubtitleRFunction.GetParameter("style").clsArgumentCodeStructure) - sdgTableOptionsTextFormat.Show(Me) + SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) + UcrSourceNotes1.Setup(clsOperator) + SetupThemeRFunctionsInOperatorOnNew(clsOperator) End Sub - '----------------------------------------- '----------------------------------------- ' FOOTER CONTROLS @@ -279,38 +131,7 @@ Public Class sdgTableOptions End Sub - - - Private Sub SetupSouceNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) - dataGridSourceNotes.Rows.Clear() - - For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters - If clsFootNoteFunctRParam.strArgumentName.Contains("tab_source_note") Then - ' Create a new row that represents the tab_footnote() parameters - Dim row As New DataGridViewRow - row.CreateCells(dataGridSourceNotes) - - Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure - For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters - If clsFootNoteRParam.strArgumentName = "source_note" Then - ' Set the foot note text - row.Cells(0).Value = GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) - End If - Next - - ' Tag and add the tab_footnote() function contents as a row - row.Tag = clsFooterRFunction - dataGridSourceNotes.Rows.Add(row) - - End If - Next - - ' Always add a place holder row for new foot note - dataGridSourceNotes.Rows.Add() - - End Sub - - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridHeaderFooterNotes.CellEndEdit, dataGridCellFooterNotes.CellEndEdit, dataGridSourceNotes.CellEndEdit + Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellEndEdit Dim dataGrid As DataGridView = sender Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) Dim strNoteTextValue As String = row.Cells(0).Value @@ -347,8 +168,6 @@ Public Class sdgTableOptions clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) End If - ElseIf dataGrid Is dataGridSourceNotes Then - clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_source_note", "source_note", strNoteTextValue) End If ' Overwrite the tag with the new foot function @@ -367,7 +186,7 @@ Public Class sdgTableOptions If clsNewNoteRFunction IsNot Nothing Then clsStyleParam = clsNewNoteRFunction.GetParameter(strRNoteTextParameterName).clsArgumentCodeStructure.GetParameter("style") Else - clsStyleParam = New RParameter(strParameterName:="style", strParamValue:=GetNewStyleRFunction(), iNewPosition:=1) + clsStyleParam = New RParameter(strParameterName:="style", strParamValue:=clsTablesUtils.GetNewHtmlStyleRFunction(), iNewPosition:=1) End If @@ -376,7 +195,7 @@ Public Class sdgTableOptions clsNewNoteRFunction.SetPackageName("gt") clsNewNoteRFunction.SetRCommand(strNoteRCommand) - Dim clsNoteTextRFunction As RFunction = GetNewHtmlDivRFunction() + Dim clsNoteTextRFunction As RFunction = clsTablesUtils.GetNewHtmlSpanRFunction() clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) clsNoteTextRFunction.AddParameter(clsStyleParam) ' Add the style parameter for formating @@ -385,7 +204,7 @@ Public Class sdgTableOptions Return clsNewNoteRFunction End Function - Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridHeaderFooterNotes.CellClick, dataGridCellFooterNotes.CellClick, dataGridSourceNotes.CellClick + Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellClick Dim dataGrid As DataGridView = sender Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag @@ -403,11 +222,6 @@ Public Class sdgTableOptions If e.ColumnIndex <> 3 Then Exit Sub End If - ElseIf dataGrid Is dataGridSourceNotes Then - strParameterName = "source_note" - If e.ColumnIndex <> 1 Then - Exit Sub - End If End If '--------------------------- diff --git a/instat/sdgTableOptionsTextFormat.Designer.vb b/instat/UserTables/sdgTableOptionsTextFormat.Designer.vb similarity index 100% rename from instat/sdgTableOptionsTextFormat.Designer.vb rename to instat/UserTables/sdgTableOptionsTextFormat.Designer.vb diff --git a/instat/UserTables/sdgTableOptionsTextFormat.resx b/instat/UserTables/sdgTableOptionsTextFormat.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/sdgTableOptionsTextFormat.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgTableOptionsTextFormat.vb b/instat/UserTables/sdgTableOptionsTextFormat.vb similarity index 58% rename from instat/sdgTableOptionsTextFormat.vb rename to instat/UserTables/sdgTableOptionsTextFormat.vb index 73aa31f039a..d5362b79d31 100644 --- a/instat/sdgTableOptionsTextFormat.vb +++ b/instat/UserTables/sdgTableOptionsTextFormat.vb @@ -1,36 +1,34 @@ Imports instat.Translations Public Class sdgTableOptionsTextFormat - Private clsParameter As RParameter - Private bDialogInitised As Boolean = False - Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub Private Sub InitialiseDialog() - - Dim dctFontFamily As New Dictionary(Of String, String) - dctFontFamily.Add("None", "NULL") - dctFontFamily.Add("Arial (sans-serif)", Chr(34) & "Arial, sans-serif" & Chr(34)) - dctFontFamily.Add("Verdana (sans-serif)", Chr(34) & "Verdana, sans-serif" & Chr(34)) - dctFontFamily.Add("Tahoma", Chr(34) & "Tahoma, sans-serif" & Chr(34)) - dctFontFamily.Add("Trebuchet MS", Chr(34) & "'Trebuchet MS', sans-serif" & Chr(34)) - dctFontFamily.Add("Times New Roman (serif)", Chr(34) & "'Times New Roman', serif" & Chr(34)) - dctFontFamily.Add("Georgia (serif)", Chr(34) & "Georgia, serif" & Chr(34)) - dctFontFamily.Add("Garamond (serif)", Chr(34) & "Garamond, serif" & Chr(34)) + Dim dctFontFamily As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Arial (sans-serif)", Chr(34) & "Arial, sans-serif" & Chr(34)}, + {"Verdana (sans-serif)", Chr(34) & "Verdana, sans-serif" & Chr(34)}, + {"Tahoma", Chr(34) & "Tahoma, sans-serif" & Chr(34)}, + {"Trebuchet MS", Chr(34) & "'Trebuchet MS', sans-serif" & Chr(34)}, + {"Times New Roman (serif)", Chr(34) & "'Times New Roman', serif" & Chr(34)}, + {"Georgia (serif)", Chr(34) & "Georgia, serif" & Chr(34)}, + {"Garamond (serif)", Chr(34) & "Garamond, serif" & Chr(34)} + } ucrCboFontFamily.SetDropDownStyleAsNonEditable() ucrCboFontFamily.SetParameter(New RParameter("font.family")) ucrCboFontFamily.SetItems(dctFontFamily) ucrCboFontFamily.SetRDefault("NULL") - Dim dctFontStyle As New Dictionary(Of String, String) - dctFontStyle.Add("None", "NULL") - dctFontStyle.Add("Normal", Chr(34) & "normal" & Chr(34)) - dctFontStyle.Add("Italic", Chr(34) & "italic" & Chr(34)) - dctFontStyle.Add("Oblique", Chr(34) & "oblique" & Chr(34)) + Dim dctFontStyle As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Normal", Chr(34) & "normal" & Chr(34)}, + {"Italic", Chr(34) & "italic" & Chr(34)}, + {"Oblique", Chr(34) & "oblique" & Chr(34)} + } ucrCboFontStyle.SetDropDownStyleAsNonEditable() ucrCboFontStyle.SetParameter(New RParameter("font.style")) @@ -38,11 +36,12 @@ Public Class sdgTableOptionsTextFormat ucrCboFontStyle.SetRDefault("NULL") - Dim dctFontWeight As New Dictionary(Of String, String) - dctFontWeight.Add("None", "NULL") - dctFontWeight.Add("Normal", Chr(34) & "normal" & Chr(34)) - dctFontWeight.Add("Lighter", Chr(34) & "lighter" & Chr(34)) - dctFontWeight.Add("Bold", Chr(34) & "bold" & Chr(34)) + Dim dctFontWeight As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Normal", Chr(34) & "normal" & Chr(34)}, + {"Lighter", Chr(34) & "lighter" & Chr(34)}, + {"Bold", Chr(34) & "bold" & Chr(34)} + } ucrCboFontWeight.SetDropDownStyleAsNonEditable() ucrCboFontWeight.SetParameter(New RParameter("font.weight")) @@ -62,24 +61,26 @@ Public Class sdgTableOptionsTextFormat ucrCboColorBackground.SetColours() ucrCboColorBackground.SetRDefault("NULL") - Dim dctUnderlineType As New Dictionary(Of String, String) - dctUnderlineType.Add("None", "NULL") - dctUnderlineType.Add("Underline", Chr(34) & "underline" & Chr(34)) - dctUnderlineType.Add("Overline", Chr(34) & "overline" & Chr(34)) - dctUnderlineType.Add("Underline Overline", Chr(34) & "underline overline" & Chr(34)) - dctUnderlineType.Add("Line-through", Chr(34) & "line-through" & Chr(34)) + Dim dctUnderlineType As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Underline", Chr(34) & "underline" & Chr(34)}, + {"Overline", Chr(34) & "overline" & Chr(34)}, + {"Underline Overline", Chr(34) & "underline overline" & Chr(34)}, + {"Line-through", Chr(34) & "line-through" & Chr(34)} + } ucrCboUnderlineType.SetDropDownStyleAsNonEditable() ucrCboUnderlineType.SetParameter(New RParameter("text.decoration.line")) ucrCboUnderlineType.SetItems(dctUnderlineType) ucrCboUnderlineType.SetRDefault("NULL") - Dim dctUnderlineStyle As New Dictionary(Of String, String) - dctUnderlineStyle.Add("None", "NULL") - dctUnderlineStyle.Add("Solid", Chr(34) & "solid" & Chr(34)) - dctUnderlineStyle.Add("Double", Chr(34) & "double" & Chr(34)) - dctUnderlineStyle.Add("Dotted", Chr(34) & "dotted" & Chr(34)) - dctUnderlineStyle.Add("Dashed", Chr(34) & "dashed" & Chr(34)) - dctUnderlineStyle.Add("Wavy", Chr(34) & "wavy" & Chr(34)) + Dim dctUnderlineStyle As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Solid", Chr(34) & "solid" & Chr(34)}, + {"Double", Chr(34) & "double" & Chr(34)}, + {"Dotted", Chr(34) & "dotted" & Chr(34)}, + {"Dashed", Chr(34) & "dashed" & Chr(34)}, + {"Wavy", Chr(34) & "wavy" & Chr(34)} + } ucrCboUnderlineStyle.SetDropDownStyleAsNonEditable() ucrCboUnderlineStyle.SetParameter(New RParameter("text.decoration.style")) ucrCboUnderlineStyle.SetItems(dctUnderlineStyle) @@ -91,12 +92,13 @@ Public Class sdgTableOptionsTextFormat ucrCboUnderLineColor.SetRDefault("NULL") - Dim dctAlign As New Dictionary(Of String, String) - dctAlign.Add("None", "NULL") - dctAlign.Add("Center", Chr(34) & "center" & Chr(34)) - dctAlign.Add("Left", Chr(34) & "left" & Chr(34)) - dctAlign.Add("Right", Chr(34) & "right" & Chr(34)) - dctAlign.Add("Justify", Chr(34) & "justify" & Chr(34)) + Dim dctAlign As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Center", Chr(34) & "center" & Chr(34)}, + {"Left", Chr(34) & "left" & Chr(34)}, + {"Right", Chr(34) & "right" & Chr(34)}, + {"Justify", Chr(34) & "justify" & Chr(34)} + } ucrCboAlignHorizontal.SetDropDownStyleAsNonEditable() ucrCboAlignHorizontal.SetParameter(New RParameter("text.align")) ucrCboAlignHorizontal.SetItems(dctAlign) diff --git a/instat/UserTables/ucrSourceNotes.Designer.vb b/instat/UserTables/ucrSourceNotes.Designer.vb new file mode 100644 index 00000000000..72453e335da --- /dev/null +++ b/instat/UserTables/ucrSourceNotes.Designer.vb @@ -0,0 +1,90 @@ + _ +Partial Class ucrSourceNotes + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colSourceNoteFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.lblSourceNotes = New System.Windows.Forms.Label() + CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'dataGridSourceNotes + ' + Me.dataGridSourceNotes.AllowUserToAddRows = False + Me.dataGridSourceNotes.AllowUserToDeleteRows = False + Me.dataGridSourceNotes.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colSourceNoteFormat}) + Me.dataGridSourceNotes.Location = New System.Drawing.Point(9, 23) + Me.dataGridSourceNotes.Name = "dataGridSourceNotes" + Me.dataGridSourceNotes.RowHeadersWidth = 62 + Me.dataGridSourceNotes.Size = New System.Drawing.Size(453, 193) + Me.dataGridSourceNotes.TabIndex = 9 + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.DataGridViewTextBoxColumn1.HeaderText = "Note Text" + Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + ' + 'colSourceNoteFormat + ' + Me.colSourceNoteFormat.HeaderText = "" + Me.colSourceNoteFormat.Name = "colSourceNoteFormat" + Me.colSourceNoteFormat.ReadOnly = True + Me.colSourceNoteFormat.Text = "Format" + Me.colSourceNoteFormat.UseColumnTextForButtonValue = True + Me.colSourceNoteFormat.Width = 55 + ' + 'lblSourceNotes + ' + Me.lblSourceNotes.AutoSize = True + Me.lblSourceNotes.Location = New System.Drawing.Point(6, 7) + Me.lblSourceNotes.Name = "lblSourceNotes" + Me.lblSourceNotes.Size = New System.Drawing.Size(73, 13) + Me.lblSourceNotes.TabIndex = 8 + Me.lblSourceNotes.Text = "Source notes:" + ' + 'ucrSourceNotes + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dataGridSourceNotes) + Me.Controls.Add(Me.lblSourceNotes) + Me.Name = "ucrSourceNotes" + Me.Size = New System.Drawing.Size(470, 223) + CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents dataGridSourceNotes As DataGridView + Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn + Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn + Friend WithEvents lblSourceNotes As Label +End Class diff --git a/instat/UserTables/ucrSourceNotes.resx b/instat/UserTables/ucrSourceNotes.resx new file mode 100644 index 00000000000..fa97e058f74 --- /dev/null +++ b/instat/UserTables/ucrSourceNotes.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrSourceNotes.vb b/instat/UserTables/ucrSourceNotes.vb new file mode 100644 index 00000000000..5c590c9017c --- /dev/null +++ b/instat/UserTables/ucrSourceNotes.vb @@ -0,0 +1,103 @@ + +Public Class ucrSourceNotes + + Private clsOperator As New ROperator + + Public Sub Setup(clsOperator As ROperator) + + Me.clsOperator = clsOperator + dataGridSourceNotes.Rows.Clear() + + Dim lstsourceNotesRFunctions As List(Of RFunction) = clsTablesUtils.FindRFunctionsWithRCommand("tab_source_note", clsOperator) + + For Each clsSourceNoteRFunct As RFunction In lstsourceNotesRFunctions + + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridSourceNotes) + + For Each clsFootNoteRParam As RParameter In clsSourceNoteRFunct.clsParameters + If clsFootNoteRParam.strArgumentName = "source_note" Then + ' Set the foot note text + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + End If + Next + + ' Tag and add the tab_footnote() function contents as a row + row.Tag = clsSourceNoteRFunct + dataGridSourceNotes.Rows.Add(row) + + Next + + ' Always add a place holder row for new foot note + dataGridSourceNotes.Rows.Add() + + End Sub + + Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridSourceNotes.CellClick + + ' Ignore clicks that are not from button cells. + If e.ColumnIndex <> 1 Then + Exit Sub + End If + + Dim clsNoteRFunction As RFunction = dataGridSourceNotes.Rows.Item(e.RowIndex).Tag + If clsNoteRFunction IsNot Nothing Then + clsTablesUtils.ShowTextFormatSubDialog(Me.ParentForm, clsNoteRFunction.GetParameter("source_note").clsArgumentCodeStructure) + End If + + End Sub + + Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridSourceNotes.CellEndEdit + + Dim row As DataGridViewRow = dataGridSourceNotes.Rows.Item(e.RowIndex) + Dim strNoteTextValue As String = row.Cells(0).Value + + ' If no foot note typed by user then just exit the sub + If String.IsNullOrEmpty(strNoteTextValue) Then + Exit Sub + End If + + ' Get existing note function if it exists + Dim clsNoteRFunction As RFunction = row.Tag + + ' Get the prevous style parameter to retain any format options previously done + Dim clsStyleParam As RParameter = Nothing + If clsNoteRFunction IsNot Nothing Then + clsStyleParam = clsNoteRFunction.GetParameter("source_note").clsArgumentCodeStructure.GetParameter("style") + End If + + '-------------------------------------- + ' Recreate the footer function + Dim clsNewNoteRFunction As New RFunction + clsNewNoteRFunction.SetPackageName("gt") + clsNewNoteRFunction.SetRCommand("tab_source_note") + + Dim clsNoteTextRFunction As RFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=clsTablesUtils.GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) + + ' Add the previous style if it exists + If clsStyleParam IsNot Nothing Then + clsNoteTextRFunction.AddParameter(clsStyleParam) + End If + + ' Add the foot note text parameter to the footer R function + clsNewNoteRFunction.AddParameter(New RParameter(strParameterName:="source_note", strParamValue:=clsNoteTextRFunction, iNewPosition:=0)) + '-------------------------------------- + + ' Overwrite the tag with the new foot function + row.Tag = clsNewNoteRFunction + + ' Remove all the tab source notes R Functions + clsTablesUtils.RemoveParameterFromOperator("tab_source_note", clsOperator) + + ' Add all the tab source note RFunctions + clsTablesUtils.SetGridTagsInOperator(dataGridSourceNotes, "tab_source_note", clsOperator) + + ' If last row then add new empty row + If e.RowIndex = dataGridSourceNotes.Rows.Count - 1 Then + dataGridSourceNotes.Rows.Add() + End If + End Sub + +End Class diff --git a/instat/dlgSummaryTables.Designer.vb b/instat/dlgSummaryTables.Designer.vb index 2fc3646bcd2..cc8ebfa2823 100644 --- a/instat/dlgSummaryTables.Designer.vb +++ b/instat/dlgSummaryTables.Designer.vb @@ -278,6 +278,7 @@ Partial Class dlgSummaryTables Me.cmdFormatTable.TabIndex = 19 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True + Me.cmdFormatTable.Visible = False ' 'rdoFrequencyTable ' diff --git a/instat/dlgSummaryTables.resx b/instat/dlgSummaryTables.resx index c776d802beb..c838926ad7f 100644 --- a/instat/dlgSummaryTables.resx +++ b/instat/dlgSummaryTables.resx @@ -123,7 +123,4 @@ 17, 17 - - 17, 17 - \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index e1cc8cd3fa1..a408d88c10f 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -349,16 +349,23 @@ Form - + + + dlgGeneralTable.vb + + + Form + + sdgTableOptionsTextFormat.vb - + Form - + sdgTableOptions.vb - + Form @@ -3031,6 +3038,12 @@ UserControl + + ucrSourceNotes.vb + + + UserControl + @@ -3218,10 +3231,13 @@ sdgSummaryThemes.vb - + + dlgGeneralTable.vb + + sdgTableOptionsTextFormat.vb - + sdgTableOptions.vb @@ -5325,6 +5341,9 @@ ucrOutputPages.vb + + ucrSourceNotes.vb + From 97445c7008478266d0a97e447b3d3b1f47cc7945 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 16 May 2024 13:17:33 +0300 Subject: [PATCH 022/273] Dded group by column --- instat/UserTables/dlgGeneralTable.Designer.vb | 51 +++++++++++++++---- instat/UserTables/dlgGeneralTable.vb | 11 +++- instat/UserTables/sdgTableOptions.Designer.vb | 32 ++++++++---- instat/UserTables/sdgTableOptions.vb | 3 +- 4 files changed, 73 insertions(+), 24 deletions(-) diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index 0b5cde254cf..eeb4229eed2 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -34,11 +34,13 @@ Partial Class dlgGeneralTable Me.btnMoreOptions = New System.Windows.Forms.Button() Me.ucrBase = New instat.ucrButtons() Me.ucrSaveTable = New instat.ucrSave() + Me.ucrReceiverSingleGroupByCol = New instat.ucrReceiverSingle() + Me.lblGroupByCol = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'btnHeaderSubTitleFormat ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(390, 71) + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(393, 71) Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) Me.btnHeaderSubTitleFormat.TabIndex = 19 @@ -47,7 +49,7 @@ Partial Class dlgGeneralTable ' 'btnHeaderTitleFormat ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(386, 29) + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(393, 29) Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) Me.btnHeaderTitleFormat.TabIndex = 18 @@ -63,7 +65,7 @@ Partial Class dlgGeneralTable Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(249, 73) Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(142, 21) Me.ucrInputHeaderSubtitle.TabIndex = 17 ' 'ucrInputHeaderTitle @@ -72,10 +74,10 @@ Partial Class dlgGeneralTable Me.ucrInputHeaderTitle.AutoSize = True Me.ucrInputHeaderTitle.IsMultiline = False Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(245, 31) + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(249, 29) Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(142, 21) Me.ucrInputHeaderTitle.TabIndex = 16 ' 'lblHeaderSubtitle @@ -92,7 +94,7 @@ Partial Class dlgGeneralTable ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(242, 13) + Me.lblHeaderTitle.Location = New System.Drawing.Point(246, 9) Me.lblHeaderTitle.Name = "lblHeaderTitle" Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) Me.lblHeaderTitle.TabIndex = 14 @@ -118,7 +120,7 @@ Partial Class dlgGeneralTable Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(137, 100) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(141, 100) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 23 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -135,7 +137,7 @@ Partial Class dlgGeneralTable ' 'btnMoreOptions ' - Me.btnMoreOptions.Location = New System.Drawing.Point(250, 225) + Me.btnMoreOptions.Location = New System.Drawing.Point(12, 233) Me.btnMoreOptions.Name = "btnMoreOptions" Me.btnMoreOptions.Size = New System.Drawing.Size(114, 23) Me.btnMoreOptions.TabIndex = 25 @@ -145,7 +147,7 @@ Partial Class dlgGeneralTable 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 290) + Me.ucrBase.Location = New System.Drawing.Point(9, 302) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 26 @@ -153,17 +155,42 @@ Partial Class dlgGeneralTable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(9, 258) + Me.ucrSaveTable.Location = New System.Drawing.Point(9, 272) Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" Me.ucrSaveTable.Size = New System.Drawing.Size(319, 24) Me.ucrSaveTable.TabIndex = 27 ' + 'ucrReceiverSingleGroupByCol + ' + Me.ucrReceiverSingleGroupByCol.AutoSize = True + Me.ucrReceiverSingleGroupByCol.frmParent = Me + Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(249, 236) + Me.ucrReceiverSingleGroupByCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleGroupByCol.Name = "ucrReceiverSingleGroupByCol" + Me.ucrReceiverSingleGroupByCol.Selector = Nothing + Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(142, 20) + Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" + Me.ucrReceiverSingleGroupByCol.TabIndex = 28 + Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing + ' + 'lblGroupByCol + ' + Me.lblGroupByCol.AutoSize = True + Me.lblGroupByCol.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupByCol.Location = New System.Drawing.Point(247, 222) + Me.lblGroupByCol.Name = "lblGroupByCol" + Me.lblGroupByCol.Size = New System.Drawing.Size(92, 13) + Me.lblGroupByCol.TabIndex = 29 + Me.lblGroupByCol.Text = "Group By Column:" + ' 'dlgGeneralTable ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(469, 351) + Me.ClientSize = New System.Drawing.Size(476, 362) + Me.Controls.Add(Me.lblGroupByCol) + Me.Controls.Add(Me.ucrReceiverSingleGroupByCol) Me.Controls.Add(Me.ucrSaveTable) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.btnMoreOptions) @@ -197,4 +224,6 @@ Partial Class dlgGeneralTable Friend WithEvents lblColumns As Label Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrSaveTable As ucrSave + Friend WithEvents lblGroupByCol As Label + Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle End Class diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index e6641b8fa85..9c50c232095 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -2,6 +2,7 @@ Public Class dlgGeneralTable Private clsBaseOperator As New ROperator + Dim clsGtFunction As New RFunction Private clsHeaderRFunction, clsTitleRFunction, clsSubtitleRFunction As New RFunction Private bFirstload As Boolean = True @@ -75,6 +76,11 @@ Public Class dlgGeneralTable ucrReceiverMultipleCols.Selector = ucrSelectorCols ucrReceiverMultipleCols.SetLinkedDisplayControl(lblColumns) + ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 0)) + ucrReceiverSingleGroupByCol.SetParameterIsString() + ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols + ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) + ucrSaveTable.SetPrefix("table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetDataFrameSelector(ucrSelectorCols.ucrAvailableDataFrames) @@ -86,6 +92,7 @@ Public Class dlgGeneralTable Private Sub SetDefaults() clsBaseOperator = New ROperator + clsGtFunction = New RFunction clsHeaderRFunction = New RFunction clsTitleRFunction = New RFunction @@ -98,7 +105,7 @@ Public Class dlgGeneralTable clsBaseOperator.SetOperation("%>%") clsBaseOperator.bBrackets = False - Dim clsGtFunction As New RFunction + clsGtFunction.SetPackageName("gt") clsGtFunction.SetRCommand("gt") clsBaseOperator.AddParameter(strParameterName:="gt_funct_param", clsRFunctionParameter:=clsGtFunction, iPosition:=1, bIncludeArgumentName:=False) @@ -130,6 +137,8 @@ Public Class dlgGeneralTable ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) ucrSaveTable.SetRCode(clsBaseOperator, bReset) + ucrReceiverSingleGroupByCol.SetRCode(clsGtFunction, bReset) + End Sub Private Sub TestOKEnabled() diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index bef9db8fac2..89c1a1e60c2 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -37,7 +37,7 @@ Partial Class sdgTableOptions Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblFooterCellNotes = New System.Windows.Forms.Label() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() - Me.UcrSourceNotes1 = New instat.ucrSourceNotes() + Me.ucrSourceNotes = New instat.ucrSourceNotes() Me.tbpThemes = New System.Windows.Forms.TabPage() Me.ucrCboSelectThemes = New instat.ucrInputComboBox() Me.btnManualTheme = New System.Windows.Forms.Button() @@ -45,6 +45,7 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.tbpRowGroups = New System.Windows.Forms.TabPage() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,6 +58,7 @@ Partial Class sdgTableOptions 'tbpFormatOptions ' Me.tbpFormatOptions.Controls.Add(Me.tbpHeader) + Me.tbpFormatOptions.Controls.Add(Me.tbpRowGroups) Me.tbpFormatOptions.Controls.Add(Me.tbpFooters) Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) @@ -75,7 +77,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) Me.tbpHeader.Size = New System.Drawing.Size(642, 233) Me.tbpHeader.TabIndex = 0 - Me.tbpHeader.Text = "Headers" + Me.tbpHeader.Text = "Headers Notes" Me.tbpHeader.UseVisualStyleBackColor = True ' 'dataGridHeaderFooterNotes @@ -133,7 +135,7 @@ Partial Class sdgTableOptions Me.tbpFooters.Name = "tbpFooters" Me.tbpFooters.Size = New System.Drawing.Size(642, 233) Me.tbpFooters.TabIndex = 3 - Me.tbpFooters.Text = "Footers" + Me.tbpFooters.Text = "Cells" Me.tbpFooters.UseVisualStyleBackColor = True ' 'dataGridCellFooterNotes @@ -190,7 +192,7 @@ Partial Class sdgTableOptions ' 'tbpSourceNotes ' - Me.tbpSourceNotes.Controls.Add(Me.UcrSourceNotes1) + Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" Me.tbpSourceNotes.Size = New System.Drawing.Size(642, 233) @@ -198,12 +200,12 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' - 'UcrSourceNotes1 + 'ucrSourceNotes ' - Me.UcrSourceNotes1.Location = New System.Drawing.Point(7, 7) - Me.UcrSourceNotes1.Name = "UcrSourceNotes1" - Me.UcrSourceNotes1.Size = New System.Drawing.Size(581, 190) - Me.UcrSourceNotes1.TabIndex = 0 + Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) + Me.ucrSourceNotes.Name = "ucrSourceNotes" + Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) + Me.ucrSourceNotes.TabIndex = 0 ' 'tbpThemes ' @@ -280,6 +282,15 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' + 'tbpRowGroups + ' + Me.tbpRowGroups.Location = New System.Drawing.Point(4, 22) + Me.tbpRowGroups.Name = "tbpRowGroups" + Me.tbpRowGroups.Size = New System.Drawing.Size(642, 233) + Me.tbpRowGroups.TabIndex = 7 + Me.tbpRowGroups.Text = "Row Groups" + Me.tbpRowGroups.UseVisualStyleBackColor = True + ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -328,5 +339,6 @@ Partial Class sdgTableOptions Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewComboBoxColumn Friend WithEvents DataGridViewButtonColumn1 As DataGridViewButtonColumn - Friend WithEvents UcrSourceNotes1 As ucrSourceNotes + Friend WithEvents ucrSourceNotes As ucrSourceNotes + Friend WithEvents tbpRowGroups As TabPage End Class diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 83f04b8ded2..59d4cf1f6d0 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -57,7 +57,6 @@ Public Class sdgTableOptions Exit Sub End If - If Not bDialogInitialised Then initialiseDialog() bDialogInitialised = True @@ -66,7 +65,7 @@ Public Class sdgTableOptions Me.clsOperator = clsNewOperator SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) - UcrSourceNotes1.Setup(clsOperator) + ucrSourceNotes.Setup(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) End Sub From c4808dbbd54ec8762d30b92c448c83dbed410f80 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 16 May 2024 17:32:37 +0300 Subject: [PATCH 023/273] Added more functionalities --- instat/UserTables/dlgGeneralTable.Designer.vb | 36 ++++- instat/UserTables/dlgGeneralTable.vb | 69 ++++++--- instat/UserTables/sdgTableOptions.Designer.vb | 28 +++- instat/UserTables/ucrHeader.Designer.vb | 118 ++++++++++++++ instat/UserTables/ucrHeader.resx | 120 +++++++++++++++ instat/UserTables/ucrHeader.vb | 3 + instat/UserTables/ucrRowGroup.Designer.vb | 100 ++++++++++++ instat/UserTables/ucrRowGroup.resx | 144 ++++++++++++++++++ instat/UserTables/ucrRowGroup.vb | 5 + instat/UserTables/ucrSourceNotes.Designer.vb | 4 +- instat/instat.vbproj | 18 +++ 11 files changed, 608 insertions(+), 37 deletions(-) create mode 100644 instat/UserTables/ucrHeader.Designer.vb create mode 100644 instat/UserTables/ucrHeader.resx create mode 100644 instat/UserTables/ucrHeader.vb create mode 100644 instat/UserTables/ucrRowGroup.Designer.vb create mode 100644 instat/UserTables/ucrRowGroup.resx create mode 100644 instat/UserTables/ucrRowGroup.vb diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index eeb4229eed2..b66e24feb94 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -36,6 +36,8 @@ Partial Class dlgGeneralTable Me.ucrSaveTable = New instat.ucrSave() Me.ucrReceiverSingleGroupByCol = New instat.ucrReceiverSingle() Me.lblGroupByCol = New System.Windows.Forms.Label() + Me.ucrChkPreview = New instat.ucrCheck() + Me.ucrNudPreview = New instat.ucrNud() Me.SuspendLayout() ' 'btnHeaderSubTitleFormat @@ -137,7 +139,7 @@ Partial Class dlgGeneralTable ' 'btnMoreOptions ' - Me.btnMoreOptions.Location = New System.Drawing.Point(12, 233) + Me.btnMoreOptions.Location = New System.Drawing.Point(9, 246) Me.btnMoreOptions.Name = "btnMoreOptions" Me.btnMoreOptions.Size = New System.Drawing.Size(114, 23) Me.btnMoreOptions.TabIndex = 25 @@ -147,7 +149,7 @@ Partial Class dlgGeneralTable 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 302) + Me.ucrBase.Location = New System.Drawing.Point(9, 320) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 26 @@ -155,7 +157,7 @@ Partial Class dlgGeneralTable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(9, 272) + Me.ucrSaveTable.Location = New System.Drawing.Point(9, 289) Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" Me.ucrSaveTable.Size = New System.Drawing.Size(319, 24) @@ -184,11 +186,35 @@ Partial Class dlgGeneralTable Me.lblGroupByCol.TabIndex = 29 Me.lblGroupByCol.Text = "Group By Column:" ' + 'ucrChkPreview + ' + Me.ucrChkPreview.AutoSize = True + Me.ucrChkPreview.Checked = False + Me.ucrChkPreview.Location = New System.Drawing.Point(9, 210) + Me.ucrChkPreview.Name = "ucrChkPreview" + Me.ucrChkPreview.Size = New System.Drawing.Size(144, 23) + Me.ucrChkPreview.TabIndex = 30 + ' + 'ucrNudPreview + ' + Me.ucrNudPreview.AutoSize = True + Me.ucrNudPreview.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPreview.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPreview.Location = New System.Drawing.Point(159, 210) + Me.ucrNudPreview.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPreview.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPreview.Name = "ucrNudPreview" + Me.ucrNudPreview.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreview.TabIndex = 31 + Me.ucrNudPreview.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'dlgGeneralTable ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(476, 362) + Me.ClientSize = New System.Drawing.Size(476, 378) + Me.Controls.Add(Me.ucrNudPreview) + Me.Controls.Add(Me.ucrChkPreview) Me.Controls.Add(Me.lblGroupByCol) Me.Controls.Add(Me.ucrReceiverSingleGroupByCol) Me.Controls.Add(Me.ucrSaveTable) @@ -226,4 +252,6 @@ Partial Class dlgGeneralTable Friend WithEvents ucrSaveTable As ucrSave Friend WithEvents lblGroupByCol As Label Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle + Friend WithEvents ucrNudPreview As ucrNud + Friend WithEvents ucrChkPreview As ucrCheck End Class diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 9c50c232095..65afe4669c2 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -2,8 +2,8 @@ Public Class dlgGeneralTable Private clsBaseOperator As New ROperator - Dim clsGtFunction As New RFunction - Private clsHeaderRFunction, clsTitleRFunction, clsSubtitleRFunction As New RFunction + Private clsHeadRFunction, clsGtRFunction As New RFunction + Private clsGtHeaderRFunction, clsGtTitleRFunction, clsGtSubtitleRFunction As New RFunction Private bFirstload As Boolean = True Private bReset As Boolean = True @@ -26,25 +26,25 @@ Public Class dlgGeneralTable If ucrInputHeaderTitle.IsEmpty() Then clsBaseOperator.RemoveParameterByName("tab_header_func_name") Else - clsBaseOperator.AddParameter("tab_header_func_name", clsRFunctionParameter:=clsHeaderRFunction, iPosition:=2, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("tab_header_func_name", clsRFunctionParameter:=clsGtHeaderRFunction, iPosition:=3, bIncludeArgumentName:=False) End If End Sub Private Sub ucrInputHeaderSubtitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderSubtitle.ControlValueChanged ' Subtitle is optional, so remove the parameter when empty If ucrInputHeaderSubtitle.IsEmpty() Then - clsHeaderRFunction.RemoveParameterByName("subtitle") + clsGtHeaderRFunction.RemoveParameterByName("subtitle") Else - clsHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsSubtitleRFunction, iPosition:=1) + clsGtHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsGtSubtitleRFunction, iPosition:=1) End If End Sub Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click - clsTablesUtils.ShowTextFormatSubDialog(Me, clsTitleRFunction) + clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtTitleRFunction) End Sub Private Sub btnHeaderSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click - clsTablesUtils.ShowTextFormatSubDialog(Me, clsSubtitleRFunction) + clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtSubtitleRFunction) End Sub Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click @@ -81,6 +81,15 @@ Public Class dlgGeneralTable ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) + ucrChkPreview.SetText("Preview") + ucrChkPreview.AddParameterPresentCondition(True, "head", bNewIsPositive:=True) + ucrChkPreview.AddParameterPresentCondition(False, "head", bNewIsPositive:=False) + ucrChkPreview.AddToLinkedControls(ucrNudPreview, {True}, bNewLinkedHideIfParameterMissing:=True) + + ucrNudPreview.SetParameter(New RParameter("x", 0, bNewIncludeArgumentName:=False)) + ucrNudPreview.Minimum = 6 + ucrNudPreview.SetRDefault(6) + ucrSaveTable.SetPrefix("table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetDataFrameSelector(ucrSelectorCols.ucrAvailableDataFrames) @@ -92,35 +101,40 @@ Public Class dlgGeneralTable Private Sub SetDefaults() clsBaseOperator = New ROperator - clsGtFunction = New RFunction + clsHeadRFunction = New RFunction + clsGtRFunction = New RFunction - clsHeaderRFunction = New RFunction - clsTitleRFunction = New RFunction - clsSubtitleRFunction = New RFunction + clsGtHeaderRFunction = New RFunction + clsGtTitleRFunction = New RFunction + clsGtSubtitleRFunction = New RFunction ucrSelectorCols.Reset() ucrReceiverMultipleCols.SetMeAsReceiver() ucrSaveTable.Reset() + ucrChkPreview.Checked = True clsBaseOperator.SetOperation("%>%") clsBaseOperator.bBrackets = False + clsHeadRFunction.SetPackageName("utils") + clsHeadRFunction.SetRCommand("head") + clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False) - clsGtFunction.SetPackageName("gt") - clsGtFunction.SetRCommand("gt") - clsBaseOperator.AddParameter(strParameterName:="gt_funct_param", clsRFunctionParameter:=clsGtFunction, iPosition:=1, bIncludeArgumentName:=False) + clsGtRFunction.SetPackageName("gt") + clsGtRFunction.SetRCommand("gt") + clsBaseOperator.AddParameter(strParameterName:="gt", clsRFunctionParameter:=clsGtRFunction, iPosition:=2, bIncludeArgumentName:=False) '----------------------------------------- ' HEADER - clsHeaderRFunction.SetPackageName("gt") - clsHeaderRFunction.SetRCommand("tab_header") + clsGtHeaderRFunction.SetPackageName("gt") + clsGtHeaderRFunction.SetRCommand("tab_header") ' Title related R functions - clsTitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() - clsHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsTitleRFunction, iPosition:=0) + clsGtTitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + clsGtHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsGtTitleRFunction, iPosition:=0) ' Subtitle related R functions - clsSubtitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + clsGtSubtitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() '----------------------------------------- @@ -132,12 +146,15 @@ Public Class dlgGeneralTable Private Sub SetRCodeForControls(bReset As Boolean) - ucrInputHeaderTitle.SetRCode(clsTitleRFunction, bReset) - ucrInputHeaderSubtitle.SetRCode(clsSubtitleRFunction, bReset) + ucrInputHeaderTitle.SetRCode(clsGtTitleRFunction, bReset) + ucrInputHeaderSubtitle.SetRCode(clsGtSubtitleRFunction, bReset) ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) ucrSaveTable.SetRCode(clsBaseOperator, bReset) - ucrReceiverSingleGroupByCol.SetRCode(clsGtFunction, bReset) + ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, bReset) + + ucrChkPreview.SetRCode(clsBaseOperator, bReset) + ucrNudPreview.SetRCode(clsHeadRFunction, bReset) End Sub @@ -150,5 +167,11 @@ Public Class dlgGeneralTable End If End Sub - + Private Sub ucrChkPreview_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPreview.ControlValueChanged + If ucrChkPreview.Checked Then + clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("head") + End If + End Sub End Class \ No newline at end of file diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 89c1a1e60c2..762cbeb00a3 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -29,6 +29,7 @@ Partial Class sdgTableOptions Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() Me.DataGridViewButtonColumn1 = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblHeaderFooterNotes = New System.Windows.Forms.Label() + Me.tbpRowGroups = New System.Windows.Forms.TabPage() Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -45,10 +46,11 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.tbpRowGroups = New System.Windows.Forms.TabPage() + Me.UcrRowGroup1 = New instat.ucrRowGroup() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.tbpRowGroups.SuspendLayout() Me.tbpFooters.SuspendLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() @@ -127,6 +129,16 @@ Partial Class sdgTableOptions Me.lblHeaderFooterNotes.TabIndex = 14 Me.lblHeaderFooterNotes.Text = "Header footers notes:" ' + 'tbpRowGroups + ' + Me.tbpRowGroups.Controls.Add(Me.UcrRowGroup1) + Me.tbpRowGroups.Location = New System.Drawing.Point(4, 22) + Me.tbpRowGroups.Name = "tbpRowGroups" + Me.tbpRowGroups.Size = New System.Drawing.Size(642, 233) + Me.tbpRowGroups.TabIndex = 7 + Me.tbpRowGroups.Text = "Row Groups" + Me.tbpRowGroups.UseVisualStyleBackColor = True + ' 'tbpFooters ' Me.tbpFooters.Controls.Add(Me.dataGridCellFooterNotes) @@ -282,14 +294,12 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'tbpRowGroups + 'UcrRowGroup1 ' - Me.tbpRowGroups.Location = New System.Drawing.Point(4, 22) - Me.tbpRowGroups.Name = "tbpRowGroups" - Me.tbpRowGroups.Size = New System.Drawing.Size(642, 233) - Me.tbpRowGroups.TabIndex = 7 - Me.tbpRowGroups.Text = "Row Groups" - Me.tbpRowGroups.UseVisualStyleBackColor = True + Me.UcrRowGroup1.Location = New System.Drawing.Point(8, 4) + Me.UcrRowGroup1.Name = "UcrRowGroup1" + Me.UcrRowGroup1.Size = New System.Drawing.Size(583, 225) + Me.UcrRowGroup1.TabIndex = 0 ' 'sdgTableOptions ' @@ -306,6 +316,7 @@ Partial Class sdgTableOptions Me.tbpHeader.ResumeLayout(False) Me.tbpHeader.PerformLayout() CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.tbpRowGroups.ResumeLayout(False) Me.tbpFooters.ResumeLayout(False) Me.tbpFooters.PerformLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() @@ -341,4 +352,5 @@ Partial Class sdgTableOptions Friend WithEvents DataGridViewButtonColumn1 As DataGridViewButtonColumn Friend WithEvents ucrSourceNotes As ucrSourceNotes Friend WithEvents tbpRowGroups As TabPage + Friend WithEvents UcrRowGroup1 As ucrRowGroup End Class diff --git a/instat/UserTables/ucrHeader.Designer.vb b/instat/UserTables/ucrHeader.Designer.vb new file mode 100644 index 00000000000..e4afa8a549c --- /dev/null +++ b/instat/UserTables/ucrHeader.Designer.vb @@ -0,0 +1,118 @@ + _ +Partial Class ucrHeader + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() + Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() + Me.ucrInputHeaderSubtitleFooter = New instat.ucrInputTextBox() + Me.ucrInputHeaderTitleFooter = New instat.ucrInputTextBox() + Me.lblHeaderSubtitle = New System.Windows.Forms.Label() + Me.lblHeaderTitle = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'btnHeaderSubTitleFormat + ' + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(153, 67) + Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderSubTitleFormat.TabIndex = 25 + Me.btnHeaderSubTitleFormat.Text = "Format" + Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True + ' + 'btnHeaderTitleFormat + ' + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(153, 23) + Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) + Me.btnHeaderTitleFormat.TabIndex = 24 + Me.btnHeaderTitleFormat.Text = "Format" + Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True + ' + 'ucrInputHeaderSubtitleFooter + ' + Me.ucrInputHeaderSubtitleFooter.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderSubtitleFooter.AutoSize = True + Me.ucrInputHeaderSubtitleFooter.IsMultiline = False + Me.ucrInputHeaderSubtitleFooter.IsReadOnly = False + Me.ucrInputHeaderSubtitleFooter.Location = New System.Drawing.Point(9, 69) + Me.ucrInputHeaderSubtitleFooter.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitleFooter.Name = "ucrInputHeaderSubtitleFooter" + Me.ucrInputHeaderSubtitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputHeaderSubtitleFooter.TabIndex = 23 + ' + 'ucrInputHeaderTitleFooter + ' + Me.ucrInputHeaderTitleFooter.AddQuotesIfUnrecognised = True + Me.ucrInputHeaderTitleFooter.AutoSize = True + Me.ucrInputHeaderTitleFooter.IsMultiline = False + Me.ucrInputHeaderTitleFooter.IsReadOnly = False + Me.ucrInputHeaderTitleFooter.Location = New System.Drawing.Point(9, 23) + Me.ucrInputHeaderTitleFooter.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitleFooter.Name = "ucrInputHeaderTitleFooter" + Me.ucrInputHeaderTitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputHeaderTitleFooter.TabIndex = 22 + ' + 'lblHeaderSubtitle + ' + Me.lblHeaderSubtitle.AutoSize = True + Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(6, 53) + Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(78, 13) + Me.lblHeaderSubtitle.TabIndex = 21 + Me.lblHeaderSubtitle.Text = "Subtitle Footer:" + ' + 'lblHeaderTitle + ' + Me.lblHeaderTitle.AutoSize = True + Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblHeaderTitle.Location = New System.Drawing.Point(6, 6) + Me.lblHeaderTitle.Name = "lblHeaderTitle" + Me.lblHeaderTitle.Size = New System.Drawing.Size(63, 13) + Me.lblHeaderTitle.TabIndex = 20 + Me.lblHeaderTitle.Text = "Title Footer:" + ' + 'ucrHeader + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btnHeaderSubTitleFormat) + Me.Controls.Add(Me.btnHeaderTitleFormat) + Me.Controls.Add(Me.ucrInputHeaderSubtitleFooter) + Me.Controls.Add(Me.ucrInputHeaderTitleFooter) + Me.Controls.Add(Me.lblHeaderSubtitle) + Me.Controls.Add(Me.lblHeaderTitle) + Me.Name = "ucrHeader" + Me.Size = New System.Drawing.Size(233, 92) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents btnHeaderSubTitleFormat As Button + Friend WithEvents btnHeaderTitleFormat As Button + Friend WithEvents ucrInputHeaderSubtitleFooter As ucrInputTextBox + Friend WithEvents ucrInputHeaderTitleFooter As ucrInputTextBox + Friend WithEvents lblHeaderSubtitle As Label + Friend WithEvents lblHeaderTitle As Label +End Class diff --git a/instat/UserTables/ucrHeader.resx b/instat/UserTables/ucrHeader.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/ucrHeader.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/ucrHeader.vb b/instat/UserTables/ucrHeader.vb new file mode 100644 index 00000000000..cffbccfd090 --- /dev/null +++ b/instat/UserTables/ucrHeader.vb @@ -0,0 +1,3 @@ +Public Class ucrHeader + +End Class diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/ucrRowGroup.Designer.vb new file mode 100644 index 00000000000..44869c6667b --- /dev/null +++ b/instat/UserTables/ucrRowGroup.Designer.vb @@ -0,0 +1,100 @@ + _ +Partial Class ucrRowGroup + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() + Me.lblRowGroups = New System.Windows.Forms.Label() + Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colName = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.colOperator = New System.Windows.Forms.DataGridViewComboBoxColumn() + Me.colValue = New System.Windows.Forms.DataGridViewTextBoxColumn() + CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'dataGridSourceNotes + ' + Me.dataGridSourceNotes.AllowUserToAddRows = False + Me.dataGridSourceNotes.AllowUserToDeleteRows = False + Me.dataGridSourceNotes.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colName, Me.colOperator, Me.colValue}) + Me.dataGridSourceNotes.Location = New System.Drawing.Point(3, 17) + Me.dataGridSourceNotes.Name = "dataGridSourceNotes" + Me.dataGridSourceNotes.RowHeadersWidth = 62 + Me.dataGridSourceNotes.Size = New System.Drawing.Size(480, 205) + Me.dataGridSourceNotes.TabIndex = 11 + ' + 'lblRowGroups + ' + Me.lblRowGroups.AutoSize = True + Me.lblRowGroups.Location = New System.Drawing.Point(0, 1) + Me.lblRowGroups.Name = "lblRowGroups" + Me.lblRowGroups.Size = New System.Drawing.Size(69, 13) + Me.lblRowGroups.TabIndex = 10 + Me.lblRowGroups.Text = "Row Groups:" + ' + 'DataGridViewTextBoxColumn1 + ' + Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.DataGridViewTextBoxColumn1.HeaderText = "Group Name" + Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 + Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + ' + 'colName + ' + Me.colName.HeaderText = "Column" + Me.colName.Name = "colName" + ' + 'colOperator + ' + Me.colOperator.HeaderText = "Operator" + Me.colOperator.Name = "colOperator" + ' + 'colValue + ' + Me.colValue.HeaderText = "Value" + Me.colValue.Name = "colValue" + ' + 'ucrRowGroup + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dataGridSourceNotes) + Me.Controls.Add(Me.lblRowGroups) + Me.Name = "ucrRowGroup" + Me.Size = New System.Drawing.Size(486, 225) + CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents dataGridSourceNotes As DataGridView + Friend WithEvents lblRowGroups As Label + Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn + Friend WithEvents colName As DataGridViewComboBoxColumn + Friend WithEvents colOperator As DataGridViewComboBoxColumn + Friend WithEvents colValue As DataGridViewTextBoxColumn +End Class diff --git a/instat/UserTables/ucrRowGroup.resx b/instat/UserTables/ucrRowGroup.resx new file mode 100644 index 00000000000..b7397a86e87 --- /dev/null +++ b/instat/UserTables/ucrRowGroup.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/ucrRowGroup.vb new file mode 100644 index 00000000000..9e4045c7eb9 --- /dev/null +++ b/instat/UserTables/ucrRowGroup.vb @@ -0,0 +1,5 @@ +Public Class ucrRowGroup + Private Sub ucrRowGroup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class diff --git a/instat/UserTables/ucrSourceNotes.Designer.vb b/instat/UserTables/ucrSourceNotes.Designer.vb index 72453e335da..559937de4c0 100644 --- a/instat/UserTables/ucrSourceNotes.Designer.vb +++ b/instat/UserTables/ucrSourceNotes.Designer.vb @@ -38,10 +38,10 @@ Partial Class ucrSourceNotes Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colSourceNoteFormat}) - Me.dataGridSourceNotes.Location = New System.Drawing.Point(9, 23) + Me.dataGridSourceNotes.Location = New System.Drawing.Point(3, 23) Me.dataGridSourceNotes.Name = "dataGridSourceNotes" Me.dataGridSourceNotes.RowHeadersWidth = 62 - Me.dataGridSourceNotes.Size = New System.Drawing.Size(453, 193) + Me.dataGridSourceNotes.Size = New System.Drawing.Size(464, 197) Me.dataGridSourceNotes.TabIndex = 9 ' 'DataGridViewTextBoxColumn1 diff --git a/instat/instat.vbproj b/instat/instat.vbproj index a408d88c10f..942996a4b97 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3038,6 +3038,18 @@ UserControl + + ucrHeader.vb + + + UserControl + + + ucrRowGroup.vb + + + UserControl + ucrSourceNotes.vb @@ -5341,6 +5353,12 @@ ucrOutputPages.vb + + ucrHeader.vb + + + ucrRowGroup.vb + ucrSourceNotes.vb From 93dec060bbfcdf9c3986ff82de55390de162db4c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 17 May 2024 12:29:25 +0300 Subject: [PATCH 024/273] Made changes to frmMain --- instat/frmMain.Designer.vb | 1328 ++++++++++++++++++------------------ instat/frmMain.resx | 4 +- instat/frmMain.vb | 12 +- 3 files changed, 677 insertions(+), 667 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index bc89e9711c3..ca025c55a2b 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -72,6 +72,8 @@ Partial Class frmMain Me.mnuDescribeSpecificCummulativeDistribution = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificParallelCoordinatePlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTables = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribeSummaries = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuDescribePresentation = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator9 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeMultivariate = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeMultivariateCorrelations = New System.Windows.Forms.ToolStripMenuItem() @@ -708,7 +710,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -716,25 +718,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -742,26 +744,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -769,26 +771,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -796,19 +798,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -816,14 +818,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -831,25 +833,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -857,7 +859,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -865,7 +867,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -873,7 +875,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -881,7 +883,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -889,12 +891,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -902,7 +904,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -910,111 +912,124 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' + Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" ' + 'mnuDescribeSummaries + ' + Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSummaries.Text = "Summaries..." + ' + 'mnuDescribePresentation + ' + Me.mnuDescribePresentation.Name = "mnuDescribePresentation" + Me.mnuDescribePresentation.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribePresentation.Text = "Presentation..." + ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 29) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1022,168 +1037,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1191,14 +1206,14 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" ' 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1206,7 +1221,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1214,7 +1229,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1222,7 +1237,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1231,7 +1246,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" ' @@ -1239,7 +1254,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1247,21 +1262,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1269,14 +1284,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1285,7 +1300,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" ' @@ -1293,21 +1308,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1316,7 +1331,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" ' @@ -1324,7 +1339,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1332,7 +1347,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1340,7 +1355,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1348,7 +1363,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1357,7 +1372,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1366,7 +1381,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1375,7 +1390,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1383,7 +1398,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1391,7 +1406,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1400,21 +1415,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1423,7 +1438,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 29) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1431,7 +1446,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1439,21 +1454,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1461,7 +1476,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1469,19 +1484,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1489,7 +1504,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1497,137 +1512,137 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpData, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 29) + Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(209, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction" ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(209, 22) Me.mnuHelpFAQ.Text = "FAQ" ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGetingStarted.Text = "Getting Started" ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpWindows.Size = New System.Drawing.Size(209, 22) Me.mnuHelpWindows.Text = "Windows" ' 'mnuHelpMenus ' Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpMenus.Size = New System.Drawing.Size(209, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(209, 22) Me.mnuHelpAboutR.Text = "About R" Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics" Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(209, 22) Me.mnuHelpRPackages.Text = "R Packages" ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(209, 22) Me.mnuHelpGlossary.Text = "Glossary" ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpData.Size = New System.Drawing.Size(209, 22) Me.mnuHelpData.Text = "Data" ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpLicence.Size = New System.Drawing.Size(209, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence" ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(311, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(206, 6) ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(314, 34) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(209, 22) Me.mnuHelpPackagesDocumentation.Text = "Packages Documentation" ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1635,299 +1650,299 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'ToolStripSeparator20 ' Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator20.Size = New System.Drawing.Size(279, 6) ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimateFileImportfromClimSoftWizard ' Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard" - Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) + Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineMerge.Text = "Merge..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(194, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(295, 34) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(197, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -1935,169 +1950,169 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2105,7 +2120,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2114,7 +2129,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2123,7 +2138,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2132,7 +2147,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2141,7 +2156,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2150,7 +2165,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2158,362 +2173,362 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Enabled = False Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) + Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2522,7 +2537,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2530,7 +2545,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2538,7 +2553,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2546,7 +2561,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2554,7 +2569,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2562,7 +2577,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2570,7 +2585,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2578,7 +2593,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2586,7 +2601,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2594,7 +2609,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2602,7 +2617,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2610,7 +2625,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2618,7 +2633,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2626,7 +2641,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2634,7 +2649,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2642,7 +2657,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2650,7 +2665,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2658,7 +2673,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2666,7 +2681,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2674,7 +2689,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2682,7 +2697,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2690,7 +2705,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2698,7 +2713,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2706,7 +2721,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2714,7 +2729,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2722,7 +2737,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2730,7 +2745,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2738,7 +2753,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2746,7 +2761,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2754,7 +2769,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2762,7 +2777,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2770,7 +2785,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2778,7 +2793,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2786,7 +2801,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2794,7 +2809,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2802,7 +2817,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2810,7 +2825,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2818,7 +2833,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2826,7 +2841,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSave.Size = New System.Drawing.Size(232, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2834,32 +2849,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(351, 34) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(232, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2867,7 +2882,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrint.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2876,7 +2891,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(351, 34) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(232, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2884,12 +2899,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(229, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(351, 34) + Me.mnuFIleExit.Size = New System.Drawing.Size(232, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -2897,7 +2912,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 29) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -2905,7 +2920,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -2913,7 +2928,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -2921,27 +2936,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -2949,18 +2964,17 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 691) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1251, 32) + Me.stsStrip.Size = New System.Drawing.Size(834, 22) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(182, 25) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -2969,12 +2983,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 33) + Me.Tool_strip.Location = New System.Drawing.Point(0, 24) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -2986,7 +3000,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -2997,7 +3011,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3009,40 +3023,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLast10Dialogs ' @@ -3058,7 +3072,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 39) + Me.separator2.Size = New System.Drawing.Size(6, 37) ' 'mnuTbDataView ' @@ -3068,7 +3082,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3080,34 +3094,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) + Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) + Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3124,25 +3138,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(194, 34) + Me.mnuploty.Size = New System.Drawing.Size(128, 22) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLogScript ' @@ -3160,7 +3174,7 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(196, 34) + Me.mnuLogScript.Size = New System.Drawing.Size(129, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuMetadata @@ -3179,20 +3193,20 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(307, 34) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(202, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) ' 'mnuTbResetLayout ' @@ -3201,13 +3215,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 39) + Me.separator3.Size = New System.Drawing.Size(6, 37) ' 'mnuTbHelp ' @@ -3216,13 +3230,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLan ' @@ -3231,29 +3245,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 39) + Me.separator1.Size = New System.Drawing.Size(6, 37) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) + Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(1251, 33) + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3261,7 +3274,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 29) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3269,7 +3282,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(351, 34) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(232, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3277,33 +3290,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(229, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3311,7 +3324,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3319,82 +3332,82 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(351, 34) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(232, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(351, 34) + Me.mnuFileConvert.Size = New System.Drawing.Size(232, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(348, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(229, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(351, 34) + Me.mnuFileExport.Size = New System.Drawing.Size(232, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(351, 34) + Me.mnuFileCloseData.Size = New System.Drawing.Size(232, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(348, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(229, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3402,105 +3415,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3508,7 +3521,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3517,7 +3530,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3525,7 +3538,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3533,107 +3546,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3641,95 +3654,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3737,105 +3750,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3843,42 +3856,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -3886,7 +3899,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -3894,7 +3907,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -3902,38 +3915,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -3941,7 +3954,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -3949,169 +3962,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.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, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4119,7 +4132,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4127,46 +4140,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4174,7 +4187,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4183,7 +4196,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4192,7 +4205,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4201,35 +4214,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4237,78 +4250,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 29) + Me.mnuStructured.Size = New System.Drawing.Size(74, 22) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4316,126 +4329,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4443,424 +4456,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) + Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 29) + Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -4868,57 +4881,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' - - Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." - ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -4932,8 +4942,7 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -4946,9 +4955,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(1251, 619) - Me.splOverall.SplitterDistance = 252 - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 162 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -4956,7 +4965,6 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -4968,9 +4976,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 252) - Me.splExtraWindows.SplitterDistance = 379 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 162) + Me.splExtraWindows.SplitterDistance = 252 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -4978,7 +4986,6 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -4989,9 +4996,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(379, 252) - Me.splMetadata.SplitterDistance = 103 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(252, 162) + Me.splMetadata.SplitterDistance = 68 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5001,9 +5008,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(103, 252) + Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 162) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5012,9 +5019,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 252) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 162) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5023,9 +5030,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(864, 252) + Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 162) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5035,7 +5042,6 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5047,9 +5053,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(1251, 359) - Me.splDataOutput.SplitterDistance = 574 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 232) + Me.splDataOutput.SplitterDistance = 382 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5059,9 +5065,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(574, 359) + Me.ucrDataViewer.Size = New System.Drawing.Size(382, 232) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5071,9 +5077,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(669, 359) + Me.ucrOutput.Size = New System.Drawing.Size(447, 232) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5113,9 +5119,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1251, 723) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5123,7 +5129,6 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5814,5 +5819,6 @@ Partial Class frmMain Friend WithEvents mnuClimaticFileExportToGoogleBucketsToolStrip As ToolStripMenuItem Friend WithEvents ToolStripSeparator79 As ToolStripSeparator - + Friend WithEvents mnuDescribeSummaries As ToolStripMenuItem + Friend WithEvents mnuDescribePresentation As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index e679779467e..c73bcdce42b 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index bbca143a6a9..ba0923dc8c6 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -637,10 +637,6 @@ Public Class frmMain dlgRegularSequence.ShowDialog() End Sub - Private Sub mnuDescribeSpecificTables_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificTables.Click - dlgSummaryTables.ShowDialog() - End Sub - Private Sub mnuPrepareReshapeStack_Click(sender As Object, e As EventArgs) Handles mnuPrepareColumnReshapeStack.Click dlgStack.enumStackMode = dlgStack.StackMode.Prepare dlgStack.ShowDialog() @@ -2762,4 +2758,12 @@ Public Class frmMain Private Sub mnuClimaticFileExportToGoogleBucketsToolStrip_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileExportToGoogleBucketsToolStrip.Click dlgExportClimaticDefinitions.ShowDialog() End Sub + + Private Sub mnuDescribeSummaries_Click(sender As Object, e As EventArgs) Handles mnuDescribeSummaries.Click + dlgSummaryTables.ShowDialog() + End Sub + + Private Sub mnuDescribePresentation_Click(sender As Object, e As EventArgs) Handles mnuDescribePresentation.Click + dlgGeneralTable.ShowDialog() + End Sub End Class From d3ab2f6bc81d8108fbc7cd2465d3df572b22f31e Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 21 May 2024 15:17:46 +0300 Subject: [PATCH 025/273] made corrections to frmMain --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d657fed0bd2..cae77f2b3e8 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2761,7 +2761,7 @@ Public Class frmMain Private Sub mnuDescribePresentation_Click(sender As Object, e As EventArgs) Handles mnuDescribePresentation.Click dlgGeneralTable.ShowDialog() - + End Sub Private Sub FileToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FileToolStripMenuItem.Click Help.ShowHelp(Me, strStaticPath & "\" & strHelpFilePath, HelpNavigator.TopicId, "13") End Sub From 66a5716dfe8df656d70414caed2e3ef01514f094 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 21 May 2024 19:53:54 +0300 Subject: [PATCH 026/273] Added 2 header footer notes --- instat/UserTables/clsTablesUtils.vb | 12 ++ instat/UserTables/sdgTableOptions.Designer.vb | 174 +++++++----------- instat/UserTables/sdgTableOptions.resx | 9 - instat/UserTables/sdgTableOptions.vb | 7 +- .../UserTables/sdgTableOptionsTextFormat.vb | 6 +- instat/UserTables/ucrHeader.Designer.vb | 69 +++---- instat/UserTables/ucrHeader.vb | 130 ++++++++++++- 7 files changed, 254 insertions(+), 153 deletions(-) diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index 7d296b5c941..1ba9d8ab9f0 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -37,6 +37,18 @@ Public Class clsTablesUtils Return lstRFunctions End Function + Public Shared Function FindRFunctionsParamsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RParameter) + Dim lstRFunctionParams As New List(Of RParameter) + For Each clsRParam As RParameter In clsOperator.clsParameters + If clsRParam.bIsFunction AndAlso clsRParam.HasValue() Then + If DirectCast(clsRParam.clsArgumentCodeStructure, RFunction).strRCommand = strRCommandName Then + lstRFunctionParams.Add(clsRParam) + End If + End If + Next + Return lstRFunctionParams + End Function + Public Shared Sub RemoveParameterFromOperator(strParameterName As String, clsOperator As ROperator) ' Remove all the previous footer parameters first Dim lstParams As New List(Of RParameter) diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 762cbeb00a3..de84913b811 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -24,12 +24,9 @@ Partial Class sdgTableOptions Private Sub InitializeComponent() Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() - Me.dataGridHeaderFooterNotes = New System.Windows.Forms.DataGridView() - Me.DataGridViewTextBoxColumn2 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.DataGridViewTextBoxColumn3 = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.DataGridViewButtonColumn1 = New System.Windows.Forms.DataGridViewButtonColumn() - Me.lblHeaderFooterNotes = New System.Windows.Forms.Label() + Me.ucrHeaderOptions = New instat.ucrHeader() Me.tbpRowGroups = New System.Windows.Forms.TabPage() + Me.UcrRowGroup1 = New instat.ucrRowGroup() Me.tbpFooters = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -46,10 +43,8 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.UcrRowGroup1 = New instat.ucrRowGroup() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() - CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpRowGroups.SuspendLayout() Me.tbpFooters.SuspendLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() @@ -64,88 +59,60 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Controls.Add(Me.tbpFooters) Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) - Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) + Me.tbpFormatOptions.Location = New System.Drawing.Point(4, 8) + Me.tbpFormatOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(650, 259) + Me.tbpFormatOptions.Size = New System.Drawing.Size(975, 398) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader ' - Me.tbpHeader.Controls.Add(Me.dataGridHeaderFooterNotes) - Me.tbpHeader.Controls.Add(Me.lblHeaderFooterNotes) - Me.tbpHeader.Location = New System.Drawing.Point(4, 22) + Me.tbpHeader.Controls.Add(Me.ucrHeaderOptions) + Me.tbpHeader.Location = New System.Drawing.Point(4, 29) + Me.tbpHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpHeader.Name = "tbpHeader" - Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(642, 233) + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpHeader.Size = New System.Drawing.Size(967, 365) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Headers Notes" Me.tbpHeader.UseVisualStyleBackColor = True ' - 'dataGridHeaderFooterNotes - ' - Me.dataGridHeaderFooterNotes.AllowUserToAddRows = False - Me.dataGridHeaderFooterNotes.AllowUserToDeleteRows = False - Me.dataGridHeaderFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridHeaderFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn2, Me.DataGridViewTextBoxColumn3, Me.DataGridViewButtonColumn1}) - Me.dataGridHeaderFooterNotes.Location = New System.Drawing.Point(6, 26) - Me.dataGridHeaderFooterNotes.Name = "dataGridHeaderFooterNotes" - Me.dataGridHeaderFooterNotes.RowHeadersWidth = 62 - Me.dataGridHeaderFooterNotes.Size = New System.Drawing.Size(630, 84) - Me.dataGridHeaderFooterNotes.TabIndex = 15 - ' - 'DataGridViewTextBoxColumn2 - ' - Me.DataGridViewTextBoxColumn2.HeaderText = "Note Text" - Me.DataGridViewTextBoxColumn2.MinimumWidth = 8 - Me.DataGridViewTextBoxColumn2.Name = "DataGridViewTextBoxColumn2" - Me.DataGridViewTextBoxColumn2.Width = 220 - ' - 'DataGridViewTextBoxColumn3 - ' - Me.DataGridViewTextBoxColumn3.HeaderText = "Header" - Me.DataGridViewTextBoxColumn3.Items.AddRange(New Object() {"title", "subtitle"}) - Me.DataGridViewTextBoxColumn3.MinimumWidth = 8 - Me.DataGridViewTextBoxColumn3.Name = "DataGridViewTextBoxColumn3" - Me.DataGridViewTextBoxColumn3.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.DataGridViewTextBoxColumn3.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic - Me.DataGridViewTextBoxColumn3.Width = 140 - ' - 'DataGridViewButtonColumn1 - ' - Me.DataGridViewButtonColumn1.HeaderText = "" - Me.DataGridViewButtonColumn1.Name = "DataGridViewButtonColumn1" - Me.DataGridViewButtonColumn1.ReadOnly = True - Me.DataGridViewButtonColumn1.Text = "Format" - Me.DataGridViewButtonColumn1.UseColumnTextForButtonValue = True - Me.DataGridViewButtonColumn1.Width = 60 - ' - 'lblHeaderFooterNotes - ' - Me.lblHeaderFooterNotes.AutoSize = True - Me.lblHeaderFooterNotes.Location = New System.Drawing.Point(9, 10) - Me.lblHeaderFooterNotes.Name = "lblHeaderFooterNotes" - Me.lblHeaderFooterNotes.Size = New System.Drawing.Size(109, 13) - Me.lblHeaderFooterNotes.TabIndex = 14 - Me.lblHeaderFooterNotes.Text = "Header footers notes:" + 'ucrHeaderOptions + ' + Me.ucrHeaderOptions.Location = New System.Drawing.Point(11, 10) + Me.ucrHeaderOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrHeaderOptions.Name = "ucrHeaderOptions" + Me.ucrHeaderOptions.Size = New System.Drawing.Size(454, 176) + Me.ucrHeaderOptions.TabIndex = 16 ' 'tbpRowGroups ' Me.tbpRowGroups.Controls.Add(Me.UcrRowGroup1) - Me.tbpRowGroups.Location = New System.Drawing.Point(4, 22) + Me.tbpRowGroups.Location = New System.Drawing.Point(4, 29) + Me.tbpRowGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpRowGroups.Name = "tbpRowGroups" - Me.tbpRowGroups.Size = New System.Drawing.Size(642, 233) + Me.tbpRowGroups.Size = New System.Drawing.Size(967, 365) Me.tbpRowGroups.TabIndex = 7 Me.tbpRowGroups.Text = "Row Groups" Me.tbpRowGroups.UseVisualStyleBackColor = True ' + 'UcrRowGroup1 + ' + Me.UcrRowGroup1.Location = New System.Drawing.Point(12, 6) + Me.UcrRowGroup1.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.UcrRowGroup1.Name = "UcrRowGroup1" + Me.UcrRowGroup1.Size = New System.Drawing.Size(874, 346) + Me.UcrRowGroup1.TabIndex = 0 + ' 'tbpFooters ' Me.tbpFooters.Controls.Add(Me.dataGridCellFooterNotes) Me.tbpFooters.Controls.Add(Me.lblFooterCellNotes) - Me.tbpFooters.Location = New System.Drawing.Point(4, 22) + Me.tbpFooters.Location = New System.Drawing.Point(4, 29) + Me.tbpFooters.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(642, 233) + Me.tbpFooters.Size = New System.Drawing.Size(967, 365) Me.tbpFooters.TabIndex = 3 Me.tbpFooters.Text = "Cells" Me.tbpFooters.UseVisualStyleBackColor = True @@ -156,10 +123,11 @@ Partial Class sdgTableOptions Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(7, 31) + Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(10, 48) + Me.dataGridCellFooterNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" Me.dataGridCellFooterNotes.RowHeadersWidth = 62 - Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 84) + Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(945, 129) Me.dataGridCellFooterNotes.TabIndex = 5 ' 'colFooterNoteText @@ -187,6 +155,7 @@ Partial Class sdgTableOptions 'colFooterFormat ' Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.MinimumWidth = 8 Me.colFooterFormat.Name = "colFooterFormat" Me.colFooterFormat.ReadOnly = True Me.colFooterFormat.Text = "Format" @@ -196,27 +165,30 @@ Partial Class sdgTableOptions 'lblFooterCellNotes ' Me.lblFooterCellNotes.AutoSize = True - Me.lblFooterCellNotes.Location = New System.Drawing.Point(10, 13) + Me.lblFooterCellNotes.Location = New System.Drawing.Point(15, 20) + Me.lblFooterCellNotes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFooterCellNotes.Name = "lblFooterCellNotes" - Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) + Me.lblFooterCellNotes.Size = New System.Drawing.Size(137, 20) Me.lblFooterCellNotes.TabIndex = 4 Me.lblFooterCellNotes.Text = "Cell footers notes:" ' 'tbpSourceNotes ' Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) - Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 29) + Me.tbpSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(642, 233) + Me.tbpSourceNotes.Size = New System.Drawing.Size(967, 365) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' 'ucrSourceNotes ' - Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) + Me.ucrSourceNotes.Location = New System.Drawing.Point(10, 11) + Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSourceNotes.Name = "ucrSourceNotes" - Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) + Me.ucrSourceNotes.Size = New System.Drawing.Size(872, 292) Me.ucrSourceNotes.TabIndex = 0 ' 'tbpThemes @@ -226,9 +198,10 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) - Me.tbpThemes.Location = New System.Drawing.Point(4, 22) + Me.tbpThemes.Location = New System.Drawing.Point(4, 29) + Me.tbpThemes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(642, 233) + Me.tbpThemes.Size = New System.Drawing.Size(967, 365) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -239,17 +212,18 @@ Partial Class sdgTableOptions Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 Me.ucrCboSelectThemes.IsReadOnly = False - Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSelectThemes.Location = New System.Drawing.Point(236, 45) + Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(14) Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" - Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) + Me.ucrCboSelectThemes.Size = New System.Drawing.Size(252, 32) Me.ucrCboSelectThemes.TabIndex = 3 ' 'btnManualTheme ' - Me.btnManualTheme.Location = New System.Drawing.Point(157, 59) + Me.btnManualTheme.Location = New System.Drawing.Point(236, 91) + Me.btnManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnManualTheme.Name = "btnManualTheme" - Me.btnManualTheme.Size = New System.Drawing.Size(168, 21) + Me.btnManualTheme.Size = New System.Drawing.Size(252, 32) Me.btnManualTheme.TabIndex = 2 Me.btnManualTheme.Text = "Custom Theme" Me.btnManualTheme.UseVisualStyleBackColor = True @@ -258,9 +232,10 @@ Partial Class sdgTableOptions ' Me.rdoSelectTheme.AutoSize = True Me.rdoSelectTheme.Checked = True - Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) + Me.rdoSelectTheme.Location = New System.Drawing.Point(33, 48) + Me.rdoSelectTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoSelectTheme.Name = "rdoSelectTheme" - Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) + Me.rdoSelectTheme.Size = New System.Drawing.Size(132, 24) Me.rdoSelectTheme.TabIndex = 0 Me.rdoSelectTheme.TabStop = True Me.rdoSelectTheme.Text = "Select Theme" @@ -269,9 +244,10 @@ Partial Class sdgTableOptions 'rdoManualTheme ' Me.rdoManualTheme.AutoSize = True - Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) + Me.rdoManualTheme.Location = New System.Drawing.Point(33, 94) + Me.rdoManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoManualTheme.Name = "rdoManualTheme" - Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) + Me.rdoManualTheme.Size = New System.Drawing.Size(139, 24) Me.rdoManualTheme.TabIndex = 1 Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True @@ -279,43 +255,35 @@ Partial Class sdgTableOptions 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) - Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(18, 25) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" - Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(524, 108) Me.ucrPnlThemesPanel.TabIndex = 4 ' 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 273) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(292, 420) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(6) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(336, 45) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'UcrRowGroup1 - ' - Me.UcrRowGroup1.Location = New System.Drawing.Point(8, 4) - Me.UcrRowGroup1.Name = "UcrRowGroup1" - Me.UcrRowGroup1.Size = New System.Drawing.Size(583, 225) - Me.UcrRowGroup1.TabIndex = 0 - ' 'sdgTableOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(656, 309) + Me.ClientSize = New System.Drawing.Size(984, 475) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgTableOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Table Options" Me.tbpFormatOptions.ResumeLayout(False) Me.tbpHeader.ResumeLayout(False) - Me.tbpHeader.PerformLayout() - CType(Me.dataGridHeaderFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpRowGroups.ResumeLayout(False) Me.tbpFooters.ResumeLayout(False) Me.tbpFooters.PerformLayout() @@ -345,12 +313,8 @@ Partial Class sdgTableOptions Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterFormat As DataGridViewButtonColumn - Friend WithEvents dataGridHeaderFooterNotes As DataGridView - Friend WithEvents lblHeaderFooterNotes As Label - Friend WithEvents DataGridViewTextBoxColumn2 As DataGridViewTextBoxColumn - Friend WithEvents DataGridViewTextBoxColumn3 As DataGridViewComboBoxColumn - Friend WithEvents DataGridViewButtonColumn1 As DataGridViewButtonColumn Friend WithEvents ucrSourceNotes As ucrSourceNotes Friend WithEvents tbpRowGroups As TabPage Friend WithEvents UcrRowGroup1 As ucrRowGroup + Friend WithEvents ucrHeaderOptions As ucrHeader End Class diff --git a/instat/UserTables/sdgTableOptions.resx b/instat/UserTables/sdgTableOptions.resx index 13b44d9838b..418e7a89629 100644 --- a/instat/UserTables/sdgTableOptions.resx +++ b/instat/UserTables/sdgTableOptions.resx @@ -117,15 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - True diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 59d4cf1f6d0..8f2fd7bb127 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -28,7 +28,7 @@ Public Class sdgTableOptions Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn - clsTablesUtils.RemoveParameterFromOperator("tab_footnote", clsOperator) + 'clsTablesUtils.RemoveParameterFromOperator("tab_footnote", clsOperator) clsTablesUtils.SetGridTagsInOperator(dataGridHeaderFooterNotes, "tab_footnote", clsOperator) clsTablesUtils.SetGridTagsInOperator(dataGridCellFooterNotes, "tab_footnote", clsOperator) @@ -62,8 +62,9 @@ Public Class sdgTableOptions bDialogInitialised = True End If - Me.clsOperator = clsNewOperator + clsOperator = clsNewOperator + ucrHeaderOptions.Setup(clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) ucrSourceNotes.Setup(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) @@ -73,7 +74,7 @@ Public Class sdgTableOptions ' FOOTER CONTROLS Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) - SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) + 'SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) SetFooterGridContents(clsOperator, dataGridCellFooterNotes) End Sub diff --git a/instat/UserTables/sdgTableOptionsTextFormat.vb b/instat/UserTables/sdgTableOptionsTextFormat.vb index d5362b79d31..85c110bb5b9 100644 --- a/instat/UserTables/sdgTableOptionsTextFormat.vb +++ b/instat/UserTables/sdgTableOptionsTextFormat.vb @@ -1,7 +1,7 @@ Imports instat.Translations Public Class sdgTableOptionsTextFormat - Private bDialogInitised As Boolean = False + Private bFirstload As Boolean = True Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -108,9 +108,9 @@ Public Class sdgTableOptionsTextFormat Public Sub Setup(clsNewStyleRFunction As RFunction) - If Not bDialogInitised Then + If bFirstload Then InitialiseDialog() - bDialogInitised = True + bFirstload = False End If ucrCboFontFamily.SetRCode(clsNewStyleRFunction, bReset:=True) diff --git a/instat/UserTables/ucrHeader.Designer.vb b/instat/UserTables/ucrHeader.Designer.vb index e4afa8a549c..45d3a89681e 100644 --- a/instat/UserTables/ucrHeader.Designer.vb +++ b/instat/UserTables/ucrHeader.Designer.vb @@ -22,31 +22,33 @@ Partial Class ucrHeader 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() - Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() + Me.btnHeaderSubTitleFooterFormat = New System.Windows.Forms.Button() + Me.btnHeaderTitleFooterFormat = New System.Windows.Forms.Button() Me.ucrInputHeaderSubtitleFooter = New instat.ucrInputTextBox() Me.ucrInputHeaderTitleFooter = New instat.ucrInputTextBox() Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() Me.SuspendLayout() ' - 'btnHeaderSubTitleFormat + 'btnHeaderSubTitleFooterFormat ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(153, 67) - Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) - Me.btnHeaderSubTitleFormat.TabIndex = 25 - Me.btnHeaderSubTitleFormat.Text = "Format" - Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True + Me.btnHeaderSubTitleFooterFormat.Location = New System.Drawing.Point(283, 101) + Me.btnHeaderSubTitleFooterFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnHeaderSubTitleFooterFormat.Name = "btnHeaderSubTitleFooterFormat" + Me.btnHeaderSubTitleFooterFormat.Size = New System.Drawing.Size(112, 35) + Me.btnHeaderSubTitleFooterFormat.TabIndex = 25 + Me.btnHeaderSubTitleFooterFormat.Text = "Format" + Me.btnHeaderSubTitleFooterFormat.UseVisualStyleBackColor = True ' - 'btnHeaderTitleFormat + 'btnHeaderTitleFooterFormat ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(153, 23) - Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) - Me.btnHeaderTitleFormat.TabIndex = 24 - Me.btnHeaderTitleFormat.Text = "Format" - Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True + Me.btnHeaderTitleFooterFormat.Location = New System.Drawing.Point(283, 31) + Me.btnHeaderTitleFooterFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnHeaderTitleFooterFormat.Name = "btnHeaderTitleFooterFormat" + Me.btnHeaderTitleFooterFormat.Size = New System.Drawing.Size(116, 35) + Me.btnHeaderTitleFooterFormat.TabIndex = 24 + Me.btnHeaderTitleFooterFormat.Text = "Format" + Me.btnHeaderTitleFooterFormat.UseVisualStyleBackColor = True ' 'ucrInputHeaderSubtitleFooter ' @@ -54,10 +56,10 @@ Partial Class ucrHeader Me.ucrInputHeaderSubtitleFooter.AutoSize = True Me.ucrInputHeaderSubtitleFooter.IsMultiline = False Me.ucrInputHeaderSubtitleFooter.IsReadOnly = False - Me.ucrInputHeaderSubtitleFooter.Location = New System.Drawing.Point(9, 69) - Me.ucrInputHeaderSubtitleFooter.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitleFooter.Location = New System.Drawing.Point(6, 106) + Me.ucrInputHeaderSubtitleFooter.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputHeaderSubtitleFooter.Name = "ucrInputHeaderSubtitleFooter" - Me.ucrInputHeaderSubtitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputHeaderSubtitleFooter.Size = New System.Drawing.Size(271, 32) Me.ucrInputHeaderSubtitleFooter.TabIndex = 23 ' 'ucrInputHeaderTitleFooter @@ -66,19 +68,20 @@ Partial Class ucrHeader Me.ucrInputHeaderTitleFooter.AutoSize = True Me.ucrInputHeaderTitleFooter.IsMultiline = False Me.ucrInputHeaderTitleFooter.IsReadOnly = False - Me.ucrInputHeaderTitleFooter.Location = New System.Drawing.Point(9, 23) - Me.ucrInputHeaderTitleFooter.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitleFooter.Location = New System.Drawing.Point(6, 35) + Me.ucrInputHeaderTitleFooter.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputHeaderTitleFooter.Name = "ucrInputHeaderTitleFooter" - Me.ucrInputHeaderTitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputHeaderTitleFooter.Size = New System.Drawing.Size(271, 32) Me.ucrInputHeaderTitleFooter.TabIndex = 22 ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(6, 53) + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(1, 82) + Me.lblHeaderSubtitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(78, 13) + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(118, 20) Me.lblHeaderSubtitle.TabIndex = 21 Me.lblHeaderSubtitle.Text = "Subtitle Footer:" ' @@ -86,31 +89,33 @@ Partial Class ucrHeader ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(6, 6) + Me.lblHeaderTitle.Location = New System.Drawing.Point(1, 9) + Me.lblHeaderTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(63, 13) + Me.lblHeaderTitle.Size = New System.Drawing.Size(93, 20) Me.lblHeaderTitle.TabIndex = 20 Me.lblHeaderTitle.Text = "Title Footer:" ' 'ucrHeader ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.btnHeaderSubTitleFormat) - Me.Controls.Add(Me.btnHeaderTitleFormat) + Me.Controls.Add(Me.btnHeaderSubTitleFooterFormat) + Me.Controls.Add(Me.btnHeaderTitleFooterFormat) Me.Controls.Add(Me.ucrInputHeaderSubtitleFooter) Me.Controls.Add(Me.ucrInputHeaderTitleFooter) Me.Controls.Add(Me.lblHeaderSubtitle) Me.Controls.Add(Me.lblHeaderTitle) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrHeader" - Me.Size = New System.Drawing.Size(233, 92) + Me.Size = New System.Drawing.Size(403, 142) Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents btnHeaderSubTitleFormat As Button - Friend WithEvents btnHeaderTitleFormat As Button + Friend WithEvents btnHeaderSubTitleFooterFormat As Button + Friend WithEvents btnHeaderTitleFooterFormat As Button Friend WithEvents ucrInputHeaderSubtitleFooter As ucrInputTextBox Friend WithEvents ucrInputHeaderTitleFooter As ucrInputTextBox Friend WithEvents lblHeaderSubtitle As Label diff --git a/instat/UserTables/ucrHeader.vb b/instat/UserTables/ucrHeader.vb index cffbccfd090..cd5c23ca4de 100644 --- a/instat/UserTables/ucrHeader.vb +++ b/instat/UserTables/ucrHeader.vb @@ -1,3 +1,131 @@ -Public Class ucrHeader +Imports Antlr.Runtime +Imports unvell.ReoGrid.IO.OpenXML.Schema +Public Class ucrHeader + Private clsOperator As New ROperator + Private clsTabTitleFootRParameter, clsTabSubtitleFootRParameter As RParameter + Private clsTitleFootNoteRFunction, clsSubtitleFootNoteRFunction As New RFunction + + Private bFirstload As Boolean = True + + Private Sub InitialiseDialog() + ucrInputHeaderTitleFooter.SetParameter(New RParameter("title_footer_text_param", 0, bNewIncludeArgumentName:=False)) + ucrInputHeaderTitleFooter.SetLinkedDisplayControl(New List(Of Control)({lblHeaderTitle, btnHeaderTitleFooterFormat})) + + ucrInputHeaderSubtitleFooter.SetParameter(New RParameter("subtitle_footer_text_param", 0, bNewIncludeArgumentName:=False)) + ucrInputHeaderSubtitleFooter.SetLinkedDisplayControl(New List(Of Control)({lblHeaderSubtitle, btnHeaderSubTitleFooterFormat})) + End Sub + + Public Sub Setup(clsNewOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + clsOperator = clsNewOperator + + clsTabTitleFootRParameter = Nothing + clsTitleFootNoteRFunction = Nothing + + clsTabSubtitleFootRParameter = Nothing + clsSubtitleFootNoteRFunction = Nothing + + SetupRFunctionsFromOperator() + + If clsTabTitleFootRParameter Is Nothing Then + Dim clsTabTitleFootRFunction As New RFunction + clsTabTitleFootRFunction.SetPackageName("gt") + clsTabTitleFootRFunction.SetRCommand("tab_footnote") + + clsTitleFootNoteRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + + clsTabTitleFootRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=clsTitleFootNoteRFunction, iNewPosition:=0)) + clsTabTitleFootRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=GetNewTitleLocationRFunction("title"), iNewPosition:=1)) + + clsTabTitleFootRParameter = New RParameter("title_footer_param", clsTabTitleFootRFunction, bNewIncludeArgumentName:=False) + End If + + If clsTabSubtitleFootRParameter Is Nothing Then + Dim clsTabSubtitleFootRFunction As New RFunction + clsTabSubtitleFootRFunction.SetPackageName("gt") + clsTabSubtitleFootRFunction.SetRCommand("tab_footnote") + + clsSubtitleFootNoteRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + + clsTabSubtitleFootRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=clsSubtitleFootNoteRFunction, iNewPosition:=0)) + clsTabSubtitleFootRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=GetNewTitleLocationRFunction("subtitle"), iNewPosition:=1)) + + clsTabSubtitleFootRParameter = New RParameter("subtitle_footer_param", clsTabSubtitleFootRFunction, bNewIncludeArgumentName:=False) + End If + + ucrInputHeaderTitleFooter.SetRCode(clsTitleFootNoteRFunction, bReset:=True) + ucrInputHeaderSubtitleFooter.SetRCode(clsSubtitleFootNoteRFunction, bReset:=True) + + End Sub + + Private Sub SetupRFunctionsFromOperator() + Dim clsRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_footnote", clsOperator) + + For Each clsTabFooterRParam As RParameter In clsRParams + + Dim clsFootNoteRFunction As RFunction = Nothing + Dim clsLocationsRFunction As RFunction = Nothing + + For Each clsFootNoteRParam As RParameter In clsTabFooterRParam.clsArgumentCodeStructure.clsParameters + If clsFootNoteRParam.strArgumentName = "footnote" Then + clsFootNoteRFunction = clsFootNoteRParam.clsArgumentCodeStructure + ElseIf clsFootNoteRParam.strArgumentName = "locations" Then + Dim clsNewLocationRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure + If clsNewLocationRFunction.strRCommand = "cells_title" Then + clsLocationsRFunction = clsNewLocationRFunction + End If + End If + Next + + If clsFootNoteRFunction IsNot Nothing AndAlso clsLocationsRFunction IsNot Nothing AndAlso clsLocationsRFunction.clsParameters.Count > 0 Then + + If clsLocationsRFunction.clsParameters(0).strArgumentValue = "title" Then + clsTabTitleFootRParameter = clsTabFooterRParam + clsTitleFootNoteRFunction = clsFootNoteRFunction + ElseIf clsLocationsRFunction.clsParameters(0).strArgumentValue = "subtitle" Then + clsTabSubtitleFootRParameter = clsTabFooterRParam + clsSubtitleFootNoteRFunction = clsFootNoteRFunction + End If + + End If + + Next + End Sub + + Private Function GetNewTitleLocationRFunction(StrLocation As String) As RFunction + Dim clsLocationRFunction As New RFunction + clsLocationRFunction.SetPackageName("gt") + clsLocationRFunction.SetRCommand("cells_title") + clsLocationRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=Chr(34) & StrLocation & Chr(34))) + Return clsLocationRFunction + End Function + + Private Sub btnHeaderTitleFooterFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFooterFormat.Click + clsTablesUtils.ShowTextFormatSubDialog(Me.ParentForm, clsTitleFootNoteRFunction) + End Sub + + Private Sub btnHeaderSubTitleFooterFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFooterFormat.Click + clsTablesUtils.ShowTextFormatSubDialog(Me.ParentForm, clsSubtitleFootNoteRFunction) + End Sub + + Private Sub ucrInputHeaderTitleFooter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitleFooter.ControlValueChanged + If ucrInputHeaderTitleFooter.IsEmpty Then + clsOperator.RemoveParameter(clsTabTitleFootRParameter) + Else + clsOperator.AddParameter(clsTabTitleFootRParameter) + End If + End Sub + + Private Sub ucrInputHeaderFooter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitleFooter.ControlValueChanged, ucrInputHeaderSubtitleFooter.ControlValueChanged + If ucrInputHeaderTitleFooter.IsEmpty OrElse ucrInputHeaderSubtitleFooter.IsEmpty Then + clsOperator.RemoveParameter(clsTabSubtitleFootRParameter) + Else + clsOperator.AddParameter(clsTabTitleFootRParameter) + End If + End Sub End Class From e4d65788cbaa074d444a5d81905d105116733518 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 21 May 2024 21:05:19 +0300 Subject: [PATCH 027/273] Removed syntax errors --- instat/UserTables/sdgTableOptions.vb | 27 +++------------------------ instat/UserTables/ucrHeader.vb | 8 +++----- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 8f2fd7bb127..3230c6c91e6 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -29,7 +29,6 @@ Public Class sdgTableOptions Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn 'clsTablesUtils.RemoveParameterFromOperator("tab_footnote", clsOperator) - clsTablesUtils.SetGridTagsInOperator(dataGridHeaderFooterNotes, "tab_footnote", clsOperator) clsTablesUtils.SetGridTagsInOperator(dataGridCellFooterNotes, "tab_footnote", clsOperator) SetThemesInOperatorOnReturn(clsOperator) @@ -98,11 +97,7 @@ Public Class sdgTableOptions ' todo go through the location function Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - If clsFooterLocationNoteRFunction.strRCommand = "cells_title" AndAlso dataGridFooterNotes Is dataGridHeaderFooterNotes Then - If clsFooterLocationNoteRFunction.clsParameters.Count > 0 Then - row.Cells(1).Value = GetStringValue(clsFooterLocationNoteRFunction.clsParameters(0).strArgumentValue, False) - End If - ElseIf clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then + If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters If clsFootNoteLocationRParam.strArgumentName = "columns" Then row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) @@ -143,18 +138,7 @@ Public Class sdgTableOptions Dim clsNoteRFunction As RFunction = Nothing - If dataGrid Is dataGridHeaderFooterNotes Then - clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) - ' Add column and row expressions as paramters if user has typed them - If Not String.IsNullOrEmpty(row.Cells(1).Value) Then - Dim clsFooterLocationNoteRFunction As New RFunction - clsFooterLocationNoteRFunction.SetPackageName("gt") - clsFooterLocationNoteRFunction.SetRCommand("cells_title") - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=GetStringValue(row.Cells(1).Value, True))) - clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) - End If - - ElseIf dataGrid Is dataGridCellFooterNotes Then + If dataGrid Is dataGridCellFooterNotes Then clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) @@ -212,12 +196,7 @@ Public Class sdgTableOptions '--------------------------- ' Ignore clicks that are not from button cells. - If dataGrid Is dataGridHeaderFooterNotes Then - strParameterName = "footnote" - If e.ColumnIndex <> 2 Then - Exit Sub - End If - ElseIf dataGrid Is dataGridCellFooterNotes Then + If dataGrid Is dataGridCellFooterNotes Then strParameterName = "footnote" If e.ColumnIndex <> 3 Then Exit Sub diff --git a/instat/UserTables/ucrHeader.vb b/instat/UserTables/ucrHeader.vb index cd5c23ca4de..b5377328bce 100644 --- a/instat/UserTables/ucrHeader.vb +++ b/instat/UserTables/ucrHeader.vb @@ -83,15 +83,13 @@ Public Class ucrHeader Next If clsFootNoteRFunction IsNot Nothing AndAlso clsLocationsRFunction IsNot Nothing AndAlso clsLocationsRFunction.clsParameters.Count > 0 Then - - If clsLocationsRFunction.clsParameters(0).strArgumentValue = "title" Then + If clsLocationsRFunction.clsParameters(0).strArgumentValue = clsTablesUtils.GetStringValue("title", True) Then clsTabTitleFootRParameter = clsTabFooterRParam clsTitleFootNoteRFunction = clsFootNoteRFunction - ElseIf clsLocationsRFunction.clsParameters(0).strArgumentValue = "subtitle" Then + ElseIf clsLocationsRFunction.clsParameters(0).strArgumentValue = clsTablesUtils.GetStringValue("subtitle", True) Then clsTabSubtitleFootRParameter = clsTabFooterRParam clsSubtitleFootNoteRFunction = clsFootNoteRFunction End If - End If Next @@ -125,7 +123,7 @@ Public Class ucrHeader If ucrInputHeaderTitleFooter.IsEmpty OrElse ucrInputHeaderSubtitleFooter.IsEmpty Then clsOperator.RemoveParameter(clsTabSubtitleFootRParameter) Else - clsOperator.AddParameter(clsTabTitleFootRParameter) + clsOperator.AddParameter(clsTabSubtitleFootRParameter) End If End Sub End Class From 3adf7bb60f70373d9f98cfbc8daf00b9dd5ecc98 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 22 May 2024 13:11:58 +0300 Subject: [PATCH 028/273] Fixed formatting bug --- instat/UserTables/clsTablesUtils.vb | 3 +++ instat/UserTables/dlgGeneralTable.vb | 16 +++++++++++++++ .../UserTables/sdgTableOptionsTextFormat.vb | 20 +++++++++---------- 3 files changed, 29 insertions(+), 10 deletions(-) diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index 1ba9d8ab9f0..aee39debb6c 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -20,8 +20,11 @@ Public Class clsTablesUtils If Not clsHtmlTagRFunction.ContainsParameter("style") Then clsHtmlTagRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewHtmlStyleRFunction(), iPosition:=1) End If + 'Dim rclone = clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure.Clone() + 'sdgTableOptionsTextFormat.Setup(rclone) sdgTableOptionsTextFormat.Setup(clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure) sdgTableOptionsTextFormat.ShowDialog(owner) + 'clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure = rclone.Clone() End Sub Public Shared Function FindRFunctionsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RFunction) diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 65afe4669c2..01646b3007a 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -41,10 +41,26 @@ Public Class dlgGeneralTable Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtTitleRFunction) + + 'If Not clsGtTitleRFunction.ContainsParameter("style") Then + ' clsGtTitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsTablesUtils.GetNewHtmlStyleRFunction(), iPosition:=1) + 'End If + 'Dim rclone = clsGtTitleRFunction.GetParameter("style").clsArgumentCodeStructure.Clone() + 'sdgTableOptionsTextFormat.Setup(rclone) + 'sdgTableOptionsTextFormat.ShowDialog(Me) + 'clsGtTitleRFunction.GetParameter("style").clsArgumentCodeStructure = rclone.Clone End Sub Private Sub btnHeaderSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtSubtitleRFunction) + + 'If Not clsGtSubtitleRFunction.ContainsParameter("style") Then + ' clsGtSubtitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsTablesUtils.GetNewHtmlStyleRFunction(), iPosition:=1) + 'End If + 'Dim rclone = clsGtSubtitleRFunction.GetParameter("style").clsArgumentCodeStructure.Clone() + 'sdgTableOptionsTextFormat.Setup(rclone) + 'sdgTableOptionsTextFormat.ShowDialog(Me) + 'clsGtSubtitleRFunction.GetParameter("style").clsArgumentCodeStructure = rclone.Clone End Sub Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click diff --git a/instat/UserTables/sdgTableOptionsTextFormat.vb b/instat/UserTables/sdgTableOptionsTextFormat.vb index 85c110bb5b9..fc16f1b984a 100644 --- a/instat/UserTables/sdgTableOptionsTextFormat.vb +++ b/instat/UserTables/sdgTableOptionsTextFormat.vb @@ -113,19 +113,19 @@ Public Class sdgTableOptionsTextFormat bFirstload = False End If - ucrCboFontFamily.SetRCode(clsNewStyleRFunction, bReset:=True) - ucrCboFontStyle.SetRCode(clsNewStyleRFunction, bReset:=True) - ucrCboFontWeight.SetRCode(clsNewStyleRFunction, bReset:=True) - ucrTxtFontSize.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboFontFamily.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboFontStyle.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboFontWeight.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrTxtFontSize.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboColorText.SetRCode(clsNewStyleRFunction, bReset:=True) - ucrCboColorBackground.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboColorText.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboColorBackground.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboUnderlineType.SetRCode(clsNewStyleRFunction, bReset:=True) - ucrCboUnderlineStyle.SetRCode(clsNewStyleRFunction, bReset:=True) - ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboUnderlineType.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboUnderlineStyle.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboAlignHorizontal.SetRCode(clsNewStyleRFunction, bReset:=True) + ucrCboAlignHorizontal.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) End Sub End Class \ No newline at end of file From 68bb98267d8116e2fc3c1a6e381ba5ccda64cd36 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 22 May 2024 13:13:26 +0300 Subject: [PATCH 029/273] Removed formating comments --- instat/UserTables/clsTablesUtils.vb | 3 --- instat/UserTables/dlgGeneralTable.vb | 16 ---------------- 2 files changed, 19 deletions(-) diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index aee39debb6c..1ba9d8ab9f0 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -20,11 +20,8 @@ Public Class clsTablesUtils If Not clsHtmlTagRFunction.ContainsParameter("style") Then clsHtmlTagRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewHtmlStyleRFunction(), iPosition:=1) End If - 'Dim rclone = clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure.Clone() - 'sdgTableOptionsTextFormat.Setup(rclone) sdgTableOptionsTextFormat.Setup(clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure) sdgTableOptionsTextFormat.ShowDialog(owner) - 'clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure = rclone.Clone() End Sub Public Shared Function FindRFunctionsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RFunction) diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 01646b3007a..65afe4669c2 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -41,26 +41,10 @@ Public Class dlgGeneralTable Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtTitleRFunction) - - 'If Not clsGtTitleRFunction.ContainsParameter("style") Then - ' clsGtTitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsTablesUtils.GetNewHtmlStyleRFunction(), iPosition:=1) - 'End If - 'Dim rclone = clsGtTitleRFunction.GetParameter("style").clsArgumentCodeStructure.Clone() - 'sdgTableOptionsTextFormat.Setup(rclone) - 'sdgTableOptionsTextFormat.ShowDialog(Me) - 'clsGtTitleRFunction.GetParameter("style").clsArgumentCodeStructure = rclone.Clone End Sub Private Sub btnHeaderSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtSubtitleRFunction) - - 'If Not clsGtSubtitleRFunction.ContainsParameter("style") Then - ' clsGtSubtitleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsTablesUtils.GetNewHtmlStyleRFunction(), iPosition:=1) - 'End If - 'Dim rclone = clsGtSubtitleRFunction.GetParameter("style").clsArgumentCodeStructure.Clone() - 'sdgTableOptionsTextFormat.Setup(rclone) - 'sdgTableOptionsTextFormat.ShowDialog(Me) - 'clsGtSubtitleRFunction.GetParameter("style").clsArgumentCodeStructure = rclone.Clone End Sub Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click From 15d15641830efec604393e9e26b15fe21c9d4f2f Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 22 May 2024 13:55:05 +0300 Subject: [PATCH 030/273] Added row name functionality --- instat/UserTables/dlgGeneralTable.Designer.vb | 117 ++++++++++++------ instat/UserTables/dlgGeneralTable.vb | 8 +- 2 files changed, 86 insertions(+), 39 deletions(-) diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index b66e24feb94..20e2ee99f6e 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -38,22 +38,26 @@ Partial Class dlgGeneralTable Me.lblGroupByCol = New System.Windows.Forms.Label() Me.ucrChkPreview = New instat.ucrCheck() Me.ucrNudPreview = New instat.ucrNud() + Me.lblRowName = New System.Windows.Forms.Label() + Me.ucrReceiverSingleRowName = New instat.ucrReceiverSingle() Me.SuspendLayout() ' 'btnHeaderSubTitleFormat ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(393, 71) + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(590, 109) + Me.btnHeaderSubTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(112, 35) Me.btnHeaderSubTitleFormat.TabIndex = 19 Me.btnHeaderSubTitleFormat.Text = "Format" Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True ' 'btnHeaderTitleFormat ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(393, 29) + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(590, 45) + Me.btnHeaderTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(118, 35) Me.btnHeaderTitleFormat.TabIndex = 18 Me.btnHeaderTitleFormat.Text = "Format" Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True @@ -64,10 +68,10 @@ Partial Class dlgGeneralTable Me.ucrInputHeaderSubtitle.AutoSize = True Me.ucrInputHeaderSubtitle.IsMultiline = False Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(249, 73) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(374, 112) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(213, 32) Me.ucrInputHeaderSubtitle.TabIndex = 17 ' 'ucrInputHeaderTitle @@ -76,19 +80,20 @@ Partial Class dlgGeneralTable Me.ucrInputHeaderTitle.AutoSize = True Me.ucrInputHeaderTitle.IsMultiline = False Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(249, 29) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(374, 45) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(213, 32) Me.ucrInputHeaderTitle.TabIndex = 16 ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(246, 56) + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(369, 86) + Me.lblHeaderSubtitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(67, 20) Me.lblHeaderSubtitle.TabIndex = 15 Me.lblHeaderSubtitle.Text = "Subtitle:" ' @@ -96,9 +101,10 @@ Partial Class dlgGeneralTable ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(246, 9) + Me.lblHeaderTitle.Location = New System.Drawing.Point(369, 14) + Me.lblHeaderTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) + Me.lblHeaderTitle.Size = New System.Drawing.Size(42, 20) Me.lblHeaderTitle.TabIndex = 14 Me.lblHeaderTitle.Text = "Title:" ' @@ -108,21 +114,21 @@ Partial Class dlgGeneralTable Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(9, 9) + Me.ucrSelectorCols.Location = New System.Drawing.Point(14, 14) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorCols.TabIndex = 22 ' 'ucrReceiverMultipleCols ' Me.ucrReceiverMultipleCols.AutoSize = True Me.ucrReceiverMultipleCols.frmParent = Me - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(250, 113) + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(375, 174) Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(141, 100) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(212, 154) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 23 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -131,17 +137,19 @@ Partial Class dlgGeneralTable ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(247, 100) + Me.lblColumns.Location = New System.Drawing.Point(370, 154) + Me.lblColumns.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(50, 13) + Me.lblColumns.Size = New System.Drawing.Size(75, 20) Me.lblColumns.TabIndex = 24 Me.lblColumns.Text = "Columns:" ' 'btnMoreOptions ' - Me.btnMoreOptions.Location = New System.Drawing.Point(9, 246) + Me.btnMoreOptions.Location = New System.Drawing.Point(2, 419) + Me.btnMoreOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnMoreOptions.Name = "btnMoreOptions" - Me.btnMoreOptions.Size = New System.Drawing.Size(114, 23) + Me.btnMoreOptions.Size = New System.Drawing.Size(171, 35) Me.btnMoreOptions.TabIndex = 25 Me.btnMoreOptions.Text = "More Options" Me.btnMoreOptions.UseVisualStyleBackColor = True @@ -149,29 +157,30 @@ Partial Class dlgGeneralTable 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 320) + Me.ucrBase.Location = New System.Drawing.Point(14, 524) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.Size = New System.Drawing.Size(615, 80) Me.ucrBase.TabIndex = 26 ' 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(9, 289) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTable.Location = New System.Drawing.Point(14, 477) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(319, 24) + Me.ucrSaveTable.Size = New System.Drawing.Size(478, 37) Me.ucrSaveTable.TabIndex = 27 ' 'ucrReceiverSingleGroupByCol ' Me.ucrReceiverSingleGroupByCol.AutoSize = True Me.ucrReceiverSingleGroupByCol.frmParent = Me - Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(249, 236) + Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(374, 423) Me.ucrReceiverSingleGroupByCol.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSingleGroupByCol.Name = "ucrReceiverSingleGroupByCol" Me.ucrReceiverSingleGroupByCol.Selector = Nothing - Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(142, 20) + Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(213, 31) Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" Me.ucrReceiverSingleGroupByCol.TabIndex = 28 Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing @@ -180,19 +189,21 @@ Partial Class dlgGeneralTable ' Me.lblGroupByCol.AutoSize = True Me.lblGroupByCol.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupByCol.Location = New System.Drawing.Point(247, 222) + Me.lblGroupByCol.Location = New System.Drawing.Point(370, 402) + Me.lblGroupByCol.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblGroupByCol.Name = "lblGroupByCol" - Me.lblGroupByCol.Size = New System.Drawing.Size(92, 13) + Me.lblGroupByCol.Size = New System.Drawing.Size(120, 30) Me.lblGroupByCol.TabIndex = 29 - Me.lblGroupByCol.Text = "Group By Column:" + Me.lblGroupByCol.Text = "Group By:" ' 'ucrChkPreview ' Me.ucrChkPreview.AutoSize = True Me.ucrChkPreview.Checked = False - Me.ucrChkPreview.Location = New System.Drawing.Point(9, 210) + Me.ucrChkPreview.Location = New System.Drawing.Point(14, 323) + Me.ucrChkPreview.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkPreview.Name = "ucrChkPreview" - Me.ucrChkPreview.Size = New System.Drawing.Size(144, 23) + Me.ucrChkPreview.Size = New System.Drawing.Size(216, 35) Me.ucrChkPreview.TabIndex = 30 ' 'ucrNudPreview @@ -200,19 +211,46 @@ Partial Class dlgGeneralTable Me.ucrNudPreview.AutoSize = True Me.ucrNudPreview.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreview.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreview.Location = New System.Drawing.Point(159, 210) + Me.ucrNudPreview.Location = New System.Drawing.Point(238, 323) + Me.ucrNudPreview.Margin = New System.Windows.Forms.Padding(9) Me.ucrNudPreview.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreview.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreview.Name = "ucrNudPreview" - Me.ucrNudPreview.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreview.Size = New System.Drawing.Size(75, 31) Me.ucrNudPreview.TabIndex = 31 Me.ucrNudPreview.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' + 'lblRowName + ' + Me.lblRowName.AutoSize = True + Me.lblRowName.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowName.Location = New System.Drawing.Point(371, 338) + Me.lblRowName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRowName.Name = "lblRowName" + Me.lblRowName.Size = New System.Drawing.Size(137, 30) + Me.lblRowName.TabIndex = 33 + Me.lblRowName.Text = "Row Name:" + ' + 'ucrReceiverSingleRowName + ' + Me.ucrReceiverSingleRowName.AutoSize = True + Me.ucrReceiverSingleRowName.frmParent = Me + Me.ucrReceiverSingleRowName.Location = New System.Drawing.Point(375, 359) + Me.ucrReceiverSingleRowName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleRowName.Name = "ucrReceiverSingleRowName" + Me.ucrReceiverSingleRowName.Selector = Nothing + Me.ucrReceiverSingleRowName.Size = New System.Drawing.Size(213, 31) + Me.ucrReceiverSingleRowName.strNcFilePath = "" + Me.ucrReceiverSingleRowName.TabIndex = 32 + Me.ucrReceiverSingleRowName.ucrSelector = Nothing + ' 'dlgGeneralTable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(476, 378) + Me.ClientSize = New System.Drawing.Size(714, 615) + Me.Controls.Add(Me.lblRowName) + Me.Controls.Add(Me.ucrReceiverSingleRowName) Me.Controls.Add(Me.ucrNudPreview) Me.Controls.Add(Me.ucrChkPreview) Me.Controls.Add(Me.lblGroupByCol) @@ -230,6 +268,7 @@ Partial Class dlgGeneralTable Me.Controls.Add(Me.lblHeaderSubtitle) Me.Controls.Add(Me.lblHeaderTitle) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "dlgGeneralTable" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Table" @@ -254,4 +293,6 @@ Partial Class dlgGeneralTable Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle Friend WithEvents ucrNudPreview As ucrNud Friend WithEvents ucrChkPreview As ucrCheck + Friend WithEvents lblRowName As Label + Friend WithEvents ucrReceiverSingleRowName As ucrReceiverSingle End Class diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 65afe4669c2..1b4b356ab5d 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -76,7 +76,12 @@ Public Class dlgGeneralTable ucrReceiverMultipleCols.Selector = ucrSelectorCols ucrReceiverMultipleCols.SetLinkedDisplayControl(lblColumns) - ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 0)) + ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) + ucrReceiverSingleRowName.SetParameterIsString() + ucrReceiverSingleRowName.Selector = ucrSelectorCols + ucrReceiverSingleRowName.SetLinkedDisplayControl(lblRowName) + + ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 1)) ucrReceiverSingleGroupByCol.SetParameterIsString() ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) @@ -151,6 +156,7 @@ Public Class dlgGeneralTable ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) ucrSaveTable.SetRCode(clsBaseOperator, bReset) + ucrReceiverSingleRowName.SetRCode(clsGtRFunction, bReset) ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, bReset) ucrChkPreview.SetRCode(clsBaseOperator, bReset) From e8a346403d1a5b5e7001b87dd2d37cd5df9bfb46 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 23 May 2024 12:15:02 +0300 Subject: [PATCH 031/273] Made changes to user interface --- instat/UserTables/sdgTableOptions.Designer.vb | 171 +++++----- instat/UserTables/ucrCells.Designer.vb | 294 +++++++++++++++++ instat/UserTables/ucrCells.resx | 129 ++++++++ instat/UserTables/ucrCells.vb | 3 + instat/UserTables/ucrColumns.Designer.vb | 271 ++++++++++++++++ instat/UserTables/ucrColumns.resx | 129 ++++++++ instat/UserTables/ucrColumns.vb | 3 + instat/UserTables/ucrHeader.vb | 8 +- instat/UserTables/ucrRowGroup.Designer.vb | 296 +++++++++++++++--- instat/UserTables/ucrRowGroup.resx | 18 +- instat/UserTables/ucrRowGroup.vb | 38 ++- instat/instat.vbproj | 18 ++ 12 files changed, 1229 insertions(+), 149 deletions(-) create mode 100644 instat/UserTables/ucrCells.Designer.vb create mode 100644 instat/UserTables/ucrCells.resx create mode 100644 instat/UserTables/ucrCells.vb create mode 100644 instat/UserTables/ucrColumns.Designer.vb create mode 100644 instat/UserTables/ucrColumns.resx create mode 100644 instat/UserTables/ucrColumns.vb diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index de84913b811..5374b5e03bb 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -25,9 +25,10 @@ Partial Class sdgTableOptions Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() Me.ucrHeaderOptions = New instat.ucrHeader() - Me.tbpRowGroups = New System.Windows.Forms.TabPage() + Me.tbpRows = New System.Windows.Forms.TabPage() Me.UcrRowGroup1 = New instat.ucrRowGroup() - Me.tbpFooters = New System.Windows.Forms.TabPage() + Me.tbpColumns = New System.Windows.Forms.TabPage() + Me.tbpCells = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -43,10 +44,12 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.UcrColumns1 = New instat.ucrColumns() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() - Me.tbpRowGroups.SuspendLayout() - Me.tbpFooters.SuspendLayout() + Me.tbpRows.SuspendLayout() + Me.tbpColumns.SuspendLayout() + Me.tbpCells.SuspendLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() Me.tbpThemes.SuspendLayout() @@ -55,67 +58,73 @@ Partial Class sdgTableOptions 'tbpFormatOptions ' Me.tbpFormatOptions.Controls.Add(Me.tbpHeader) - Me.tbpFormatOptions.Controls.Add(Me.tbpRowGroups) - Me.tbpFormatOptions.Controls.Add(Me.tbpFooters) + Me.tbpFormatOptions.Controls.Add(Me.tbpRows) + Me.tbpFormatOptions.Controls.Add(Me.tbpColumns) + Me.tbpFormatOptions.Controls.Add(Me.tbpCells) Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) - Me.tbpFormatOptions.Location = New System.Drawing.Point(4, 8) - Me.tbpFormatOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(975, 398) + Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 294) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader ' Me.tbpHeader.Controls.Add(Me.ucrHeaderOptions) - Me.tbpHeader.Location = New System.Drawing.Point(4, 29) - Me.tbpHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" - Me.tbpHeader.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpHeader.Size = New System.Drawing.Size(967, 365) + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) + Me.tbpHeader.Size = New System.Drawing.Size(648, 268) Me.tbpHeader.TabIndex = 0 - Me.tbpHeader.Text = "Headers Notes" + Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' 'ucrHeaderOptions ' - Me.ucrHeaderOptions.Location = New System.Drawing.Point(11, 10) - Me.ucrHeaderOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrHeaderOptions.Location = New System.Drawing.Point(7, 6) Me.ucrHeaderOptions.Name = "ucrHeaderOptions" - Me.ucrHeaderOptions.Size = New System.Drawing.Size(454, 176) + Me.ucrHeaderOptions.Size = New System.Drawing.Size(303, 114) Me.ucrHeaderOptions.TabIndex = 16 ' - 'tbpRowGroups + 'tbpRows ' - Me.tbpRowGroups.Controls.Add(Me.UcrRowGroup1) - Me.tbpRowGroups.Location = New System.Drawing.Point(4, 29) - Me.tbpRowGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpRowGroups.Name = "tbpRowGroups" - Me.tbpRowGroups.Size = New System.Drawing.Size(967, 365) - Me.tbpRowGroups.TabIndex = 7 - Me.tbpRowGroups.Text = "Row Groups" - Me.tbpRowGroups.UseVisualStyleBackColor = True + Me.tbpRows.Controls.Add(Me.UcrRowGroup1) + Me.tbpRows.Location = New System.Drawing.Point(4, 22) + Me.tbpRows.Name = "tbpRows" + Me.tbpRows.Size = New System.Drawing.Size(648, 268) + Me.tbpRows.TabIndex = 7 + Me.tbpRows.Text = "Rows" + Me.tbpRows.UseVisualStyleBackColor = True ' 'UcrRowGroup1 ' - Me.UcrRowGroup1.Location = New System.Drawing.Point(12, 6) - Me.UcrRowGroup1.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.UcrRowGroup1.Location = New System.Drawing.Point(8, 4) + Me.UcrRowGroup1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UcrRowGroup1.Name = "UcrRowGroup1" - Me.UcrRowGroup1.Size = New System.Drawing.Size(874, 346) + Me.UcrRowGroup1.Size = New System.Drawing.Size(636, 259) Me.UcrRowGroup1.TabIndex = 0 ' - 'tbpFooters + 'tbpColumns ' - Me.tbpFooters.Controls.Add(Me.dataGridCellFooterNotes) - Me.tbpFooters.Controls.Add(Me.lblFooterCellNotes) - Me.tbpFooters.Location = New System.Drawing.Point(4, 29) - Me.tbpFooters.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpFooters.Name = "tbpFooters" - Me.tbpFooters.Size = New System.Drawing.Size(967, 365) - Me.tbpFooters.TabIndex = 3 - Me.tbpFooters.Text = "Cells" - Me.tbpFooters.UseVisualStyleBackColor = True + Me.tbpColumns.Controls.Add(Me.UcrColumns1) + Me.tbpColumns.Location = New System.Drawing.Point(4, 22) + Me.tbpColumns.Name = "tbpColumns" + Me.tbpColumns.Size = New System.Drawing.Size(648, 268) + Me.tbpColumns.TabIndex = 8 + Me.tbpColumns.Text = "Columns" + Me.tbpColumns.UseVisualStyleBackColor = True + ' + 'tbpCells + ' + Me.tbpCells.Controls.Add(Me.dataGridCellFooterNotes) + Me.tbpCells.Controls.Add(Me.lblFooterCellNotes) + Me.tbpCells.Location = New System.Drawing.Point(4, 22) + Me.tbpCells.Name = "tbpCells" + Me.tbpCells.Size = New System.Drawing.Size(648, 268) + Me.tbpCells.TabIndex = 3 + Me.tbpCells.Text = "Cells" + Me.tbpCells.UseVisualStyleBackColor = True ' 'dataGridCellFooterNotes ' @@ -123,11 +132,10 @@ Partial Class sdgTableOptions Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(10, 48) - Me.dataGridCellFooterNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(7, 31) Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" Me.dataGridCellFooterNotes.RowHeadersWidth = 62 - Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(945, 129) + Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 55) Me.dataGridCellFooterNotes.TabIndex = 5 ' 'colFooterNoteText @@ -165,30 +173,28 @@ Partial Class sdgTableOptions 'lblFooterCellNotes ' Me.lblFooterCellNotes.AutoSize = True - Me.lblFooterCellNotes.Location = New System.Drawing.Point(15, 20) - Me.lblFooterCellNotes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFooterCellNotes.Location = New System.Drawing.Point(10, 13) Me.lblFooterCellNotes.Name = "lblFooterCellNotes" - Me.lblFooterCellNotes.Size = New System.Drawing.Size(137, 20) + Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) Me.lblFooterCellNotes.TabIndex = 4 Me.lblFooterCellNotes.Text = "Cell footers notes:" ' 'tbpSourceNotes ' Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) - Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 29) - Me.tbpSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(967, 365) + Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 268) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' 'ucrSourceNotes ' - Me.ucrSourceNotes.Location = New System.Drawing.Point(10, 11) - Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) + Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSourceNotes.Name = "ucrSourceNotes" - Me.ucrSourceNotes.Size = New System.Drawing.Size(872, 292) + Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) Me.ucrSourceNotes.TabIndex = 0 ' 'tbpThemes @@ -198,10 +204,9 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) - Me.tbpThemes.Location = New System.Drawing.Point(4, 29) - Me.tbpThemes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(967, 365) + Me.tbpThemes.Size = New System.Drawing.Size(648, 268) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -212,18 +217,17 @@ Partial Class sdgTableOptions Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 Me.ucrCboSelectThemes.IsReadOnly = False - Me.ucrCboSelectThemes.Location = New System.Drawing.Point(236, 45) - Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(14) + Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" - Me.ucrCboSelectThemes.Size = New System.Drawing.Size(252, 32) + Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) Me.ucrCboSelectThemes.TabIndex = 3 ' 'btnManualTheme ' - Me.btnManualTheme.Location = New System.Drawing.Point(236, 91) - Me.btnManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnManualTheme.Location = New System.Drawing.Point(157, 59) Me.btnManualTheme.Name = "btnManualTheme" - Me.btnManualTheme.Size = New System.Drawing.Size(252, 32) + Me.btnManualTheme.Size = New System.Drawing.Size(168, 21) Me.btnManualTheme.TabIndex = 2 Me.btnManualTheme.Text = "Custom Theme" Me.btnManualTheme.UseVisualStyleBackColor = True @@ -232,10 +236,9 @@ Partial Class sdgTableOptions ' Me.rdoSelectTheme.AutoSize = True Me.rdoSelectTheme.Checked = True - Me.rdoSelectTheme.Location = New System.Drawing.Point(33, 48) - Me.rdoSelectTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) Me.rdoSelectTheme.Name = "rdoSelectTheme" - Me.rdoSelectTheme.Size = New System.Drawing.Size(132, 24) + Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) Me.rdoSelectTheme.TabIndex = 0 Me.rdoSelectTheme.TabStop = True Me.rdoSelectTheme.Text = "Select Theme" @@ -244,10 +247,9 @@ Partial Class sdgTableOptions 'rdoManualTheme ' Me.rdoManualTheme.AutoSize = True - Me.rdoManualTheme.Location = New System.Drawing.Point(33, 94) - Me.rdoManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) Me.rdoManualTheme.Name = "rdoManualTheme" - Me.rdoManualTheme.Size = New System.Drawing.Size(139, 24) + Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) Me.rdoManualTheme.TabIndex = 1 Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True @@ -255,38 +257,45 @@ Partial Class sdgTableOptions 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(18, 25) - Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" - Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(524, 108) + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) Me.ucrPnlThemesPanel.TabIndex = 4 ' 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(292, 420) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 304) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(336, 45) + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' + 'UcrColumns1 + ' + Me.UcrColumns1.Location = New System.Drawing.Point(5, 6) + Me.UcrColumns1.Name = "UcrColumns1" + Me.UcrColumns1.Size = New System.Drawing.Size(627, 239) + Me.UcrColumns1.TabIndex = 0 + ' 'sdgTableOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(984, 475) + Me.ClientSize = New System.Drawing.Size(657, 335) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgTableOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Table Options" Me.tbpFormatOptions.ResumeLayout(False) Me.tbpHeader.ResumeLayout(False) - Me.tbpRowGroups.ResumeLayout(False) - Me.tbpFooters.ResumeLayout(False) - Me.tbpFooters.PerformLayout() + Me.tbpRows.ResumeLayout(False) + Me.tbpColumns.ResumeLayout(False) + Me.tbpCells.ResumeLayout(False) + Me.tbpCells.PerformLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpSourceNotes.ResumeLayout(False) Me.tbpThemes.ResumeLayout(False) @@ -299,7 +308,7 @@ Partial Class sdgTableOptions Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue Friend WithEvents tbpFormatOptions As TabControl Friend WithEvents tbpHeader As TabPage - Friend WithEvents tbpFooters As TabPage + Friend WithEvents tbpCells As TabPage Friend WithEvents tbpSourceNotes As TabPage Friend WithEvents tbpThemes As TabPage Friend WithEvents ucrCboSelectThemes As ucrInputComboBox @@ -314,7 +323,9 @@ Partial Class sdgTableOptions Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn Friend WithEvents colFooterFormat As DataGridViewButtonColumn Friend WithEvents ucrSourceNotes As ucrSourceNotes - Friend WithEvents tbpRowGroups As TabPage + Friend WithEvents tbpRows As TabPage Friend WithEvents UcrRowGroup1 As ucrRowGroup Friend WithEvents ucrHeaderOptions As ucrHeader + Friend WithEvents tbpColumns As TabPage + Friend WithEvents UcrColumns1 As ucrColumns End Class diff --git a/instat/UserTables/ucrCells.Designer.vb b/instat/UserTables/ucrCells.Designer.vb new file mode 100644 index 00000000000..62457e1c009 --- /dev/null +++ b/instat/UserTables/ucrCells.Designer.vb @@ -0,0 +1,294 @@ + _ +Partial Class ucrCells + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.rdoStyle = New System.Windows.Forms.RadioButton() + Me.rdoGroup = New System.Windows.Forms.RadioButton() + Me.rdoSummary = New System.Windows.Forms.RadioButton() + Me.ucrPnlRow = New instat.UcrPanel() + Me.lblGroupCondition = New System.Windows.Forms.Label() + Me.lblGroups = New System.Windows.Forms.Label() + Me.ucrLogicalCombobox = New instat.ucrInputComboBox() + Me.btnClearGroups = New System.Windows.Forms.Button() + Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() + Me.ucrFilterOperation = New instat.ucrInputComboBox() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblColumns = New System.Windows.Forms.Label() + Me.btnAddGroupCondition = New System.Windows.Forms.Button() + Me.dataGridGroups = New System.Windows.Forms.DataGridView() + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'rdoStyle + ' + Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatAppearance.BorderSize = 2 + Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyle.Location = New System.Drawing.Point(362, 3) + Me.rdoStyle.Name = "rdoStyle" + Me.rdoStyle.Size = New System.Drawing.Size(91, 29) + Me.rdoStyle.TabIndex = 292 + Me.rdoStyle.Text = "Styles" + Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.UseVisualStyleBackColor = True + ' + 'rdoGroup + ' + Me.rdoGroup.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoGroup.BackColor = System.Drawing.SystemColors.Control + Me.rdoGroup.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoGroup.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGroup.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGroup.FlatAppearance.BorderSize = 2 + Me.rdoGroup.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGroup.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoGroup.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoGroup.Location = New System.Drawing.Point(185, 3) + Me.rdoGroup.Name = "rdoGroup" + Me.rdoGroup.Size = New System.Drawing.Size(91, 29) + Me.rdoGroup.TabIndex = 290 + Me.rdoGroup.Text = "Groups" + Me.rdoGroup.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGroup.UseVisualStyleBackColor = True + ' + 'rdoSummary + ' + Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control + Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatAppearance.BorderSize = 2 + Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSummary.Location = New System.Drawing.Point(274, 3) + Me.rdoSummary.Name = "rdoSummary" + Me.rdoSummary.Size = New System.Drawing.Size(91, 29) + Me.rdoSummary.TabIndex = 291 + Me.rdoSummary.Text = "Footers" + Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.UseVisualStyleBackColor = True + ' + 'ucrPnlRow + ' + Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRow.Location = New System.Drawing.Point(168, 3) + Me.ucrPnlRow.Name = "ucrPnlRow" + Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.TabIndex = 289 + ' + 'lblGroupCondition + ' + Me.lblGroupCondition.AutoSize = True + Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupCondition.Location = New System.Drawing.Point(379, 46) + Me.lblGroupCondition.Name = "lblGroupCondition" + Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) + Me.lblGroupCondition.TabIndex = 288 + Me.lblGroupCondition.Text = "Condition:" + ' + 'lblGroups + ' + Me.lblGroups.AutoSize = True + Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroups.Location = New System.Drawing.Point(257, 136) + Me.lblGroups.Name = "lblGroups" + Me.lblGroups.Size = New System.Drawing.Size(44, 13) + Me.lblGroups.TabIndex = 287 + Me.lblGroups.Text = "Groups:" + ' + 'ucrLogicalCombobox + ' + Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True + Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 + Me.ucrLogicalCombobox.IsReadOnly = False + Me.ucrLogicalCombobox.Location = New System.Drawing.Point(454, 65) + Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" + Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) + Me.ucrLogicalCombobox.TabIndex = 286 + ' + 'btnClearGroups + ' + Me.btnClearGroups.Enabled = False + Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearGroups.Location = New System.Drawing.Point(536, 131) + Me.btnClearGroups.Name = "btnClearGroups" + Me.btnClearGroups.Size = New System.Drawing.Size(80, 23) + Me.btnClearGroups.TabIndex = 285 + Me.btnClearGroups.Tag = "" + Me.btnClearGroups.Text = "Clear" + Me.btnClearGroups.UseVisualStyleBackColor = True + ' + 'ucrFilterByReceiver + ' + Me.ucrFilterByReceiver.AutoSize = True + Me.ucrFilterByReceiver.frmParent = Nothing + Me.ucrFilterByReceiver.Location = New System.Drawing.Point(254, 65) + Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" + Me.ucrFilterByReceiver.Selector = Nothing + Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) + Me.ucrFilterByReceiver.strNcFilePath = "" + Me.ucrFilterByReceiver.TabIndex = 281 + Me.ucrFilterByReceiver.ucrSelector = Nothing + ' + 'ucrFilterOperation + ' + Me.ucrFilterOperation.AddQuotesIfUnrecognised = True + Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFilterOperation.GetSetSelectedIndex = -1 + Me.ucrFilterOperation.IsReadOnly = False + Me.ucrFilterOperation.Location = New System.Drawing.Point(375, 65) + Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrFilterOperation.Name = "ucrFilterOperation" + Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) + Me.ucrFilterOperation.TabIndex = 283 + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 49) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 280 + ' + 'colFormat + ' + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 76 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 58 + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(257, 49) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 284 + Me.lblColumns.Text = "Column:" + ' + 'btnAddGroupCondition + ' + Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddGroupCondition.Location = New System.Drawing.Point(254, 86) + Me.btnAddGroupCondition.Name = "btnAddGroupCondition" + Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) + Me.btnAddGroupCondition.TabIndex = 282 + Me.btnAddGroupCondition.Tag = "" + Me.btnAddGroupCondition.Text = "Add" + Me.btnAddGroupCondition.UseVisualStyleBackColor = True + ' + 'dataGridGroups + ' + Me.dataGridGroups.AllowUserToAddRows = False + Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) + Me.dataGridGroups.Location = New System.Drawing.Point(260, 156) + Me.dataGridGroups.Name = "dataGridGroups" + Me.dataGridGroups.RowHeadersWidth = 62 + Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) + Me.dataGridGroups.TabIndex = 279 + ' + 'ucrCells + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.rdoStyle) + Me.Controls.Add(Me.rdoGroup) + Me.Controls.Add(Me.rdoSummary) + Me.Controls.Add(Me.ucrPnlRow) + Me.Controls.Add(Me.lblGroupCondition) + Me.Controls.Add(Me.lblGroups) + Me.Controls.Add(Me.ucrLogicalCombobox) + Me.Controls.Add(Me.btnClearGroups) + Me.Controls.Add(Me.ucrFilterByReceiver) + Me.Controls.Add(Me.ucrFilterOperation) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnAddGroupCondition) + Me.Controls.Add(Me.dataGridGroups) + Me.Name = "ucrCells" + Me.Size = New System.Drawing.Size(634, 241) + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents rdoStyle As RadioButton + Friend WithEvents rdoGroup As RadioButton + Friend WithEvents rdoSummary As RadioButton + Friend WithEvents ucrPnlRow As UcrPanel + Friend WithEvents lblGroupCondition As Label + Friend WithEvents lblGroups As Label + Friend WithEvents ucrLogicalCombobox As ucrInputComboBox + Friend WithEvents btnClearGroups As Button + Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle + Friend WithEvents ucrFilterOperation As ucrInputComboBox + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents lblColumns As Label + Friend WithEvents btnAddGroupCondition As Button + Friend WithEvents dataGridGroups As DataGridView +End Class diff --git a/instat/UserTables/ucrCells.resx b/instat/UserTables/ucrCells.resx new file mode 100644 index 00000000000..229ea162634 --- /dev/null +++ b/instat/UserTables/ucrCells.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrCells.vb b/instat/UserTables/ucrCells.vb new file mode 100644 index 00000000000..9c7db42e6a9 --- /dev/null +++ b/instat/UserTables/ucrCells.vb @@ -0,0 +1,3 @@ +Public Class ucrCells + +End Class diff --git a/instat/UserTables/ucrColumns.Designer.vb b/instat/UserTables/ucrColumns.Designer.vb new file mode 100644 index 00000000000..0ecd6eb3258 --- /dev/null +++ b/instat/UserTables/ucrColumns.Designer.vb @@ -0,0 +1,271 @@ + _ +Partial Class ucrColumns + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.rdoStyle = New System.Windows.Forms.RadioButton() + Me.rdoSummary = New System.Windows.Forms.RadioButton() + Me.ucrPnlRow = New instat.UcrPanel() + Me.lblGroupCondition = New System.Windows.Forms.Label() + Me.lblGroups = New System.Windows.Forms.Label() + Me.ucrLogicalCombobox = New instat.ucrInputComboBox() + Me.btnClearGroups = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() + Me.ucrFilterOperation = New instat.ucrInputComboBox() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.btnAddGroupCondition = New System.Windows.Forms.Button() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGridGroups = New System.Windows.Forms.DataGridView() + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'rdoStyle + ' + Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatAppearance.BorderSize = 2 + Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyle.Location = New System.Drawing.Point(303, 3) + Me.rdoStyle.Name = "rdoStyle" + Me.rdoStyle.Size = New System.Drawing.Size(91, 29) + Me.rdoStyle.TabIndex = 292 + Me.rdoStyle.Text = "Styles" + Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.UseVisualStyleBackColor = True + ' + 'rdoSummary + ' + Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control + Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatAppearance.BorderSize = 2 + Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSummary.Location = New System.Drawing.Point(215, 3) + Me.rdoSummary.Name = "rdoSummary" + Me.rdoSummary.Size = New System.Drawing.Size(91, 29) + Me.rdoSummary.TabIndex = 291 + Me.rdoSummary.Text = "Summaries" + Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.UseVisualStyleBackColor = True + ' + 'ucrPnlRow + ' + Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRow.Location = New System.Drawing.Point(168, 3) + Me.ucrPnlRow.Name = "ucrPnlRow" + Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.TabIndex = 289 + ' + 'lblGroupCondition + ' + Me.lblGroupCondition.AutoSize = True + Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupCondition.Location = New System.Drawing.Point(379, 46) + Me.lblGroupCondition.Name = "lblGroupCondition" + Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) + Me.lblGroupCondition.TabIndex = 288 + Me.lblGroupCondition.Text = "Condition:" + ' + 'lblGroups + ' + Me.lblGroups.AutoSize = True + Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroups.Location = New System.Drawing.Point(257, 136) + Me.lblGroups.Name = "lblGroups" + Me.lblGroups.Size = New System.Drawing.Size(61, 13) + Me.lblGroups.TabIndex = 287 + Me.lblGroups.Text = "Summaries:" + ' + 'ucrLogicalCombobox + ' + Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True + Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 + Me.ucrLogicalCombobox.IsReadOnly = False + Me.ucrLogicalCombobox.Location = New System.Drawing.Point(454, 65) + Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" + Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) + Me.ucrLogicalCombobox.TabIndex = 286 + ' + 'btnClearGroups + ' + Me.btnClearGroups.Enabled = False + Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearGroups.Location = New System.Drawing.Point(541, 131) + Me.btnClearGroups.Name = "btnClearGroups" + Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) + Me.btnClearGroups.TabIndex = 285 + Me.btnClearGroups.Tag = "" + Me.btnClearGroups.Text = "Clear" + Me.btnClearGroups.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(257, 49) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 284 + Me.lblColumns.Text = "Column:" + ' + 'ucrFilterByReceiver + ' + Me.ucrFilterByReceiver.AutoSize = True + Me.ucrFilterByReceiver.frmParent = Nothing + Me.ucrFilterByReceiver.Location = New System.Drawing.Point(254, 65) + Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" + Me.ucrFilterByReceiver.Selector = Nothing + Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) + Me.ucrFilterByReceiver.strNcFilePath = "" + Me.ucrFilterByReceiver.TabIndex = 281 + Me.ucrFilterByReceiver.ucrSelector = Nothing + ' + 'ucrFilterOperation + ' + Me.ucrFilterOperation.AddQuotesIfUnrecognised = True + Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFilterOperation.GetSetSelectedIndex = -1 + Me.ucrFilterOperation.IsReadOnly = False + Me.ucrFilterOperation.Location = New System.Drawing.Point(375, 65) + Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrFilterOperation.Name = "ucrFilterOperation" + Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) + Me.ucrFilterOperation.TabIndex = 283 + ' + 'colFormat + ' + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 76 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 58 + ' + 'btnAddGroupCondition + ' + Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddGroupCondition.Location = New System.Drawing.Point(254, 86) + Me.btnAddGroupCondition.Name = "btnAddGroupCondition" + Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) + Me.btnAddGroupCondition.TabIndex = 282 + Me.btnAddGroupCondition.Tag = "" + Me.btnAddGroupCondition.Text = "Add" + Me.btnAddGroupCondition.UseVisualStyleBackColor = True + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 49) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 280 + ' + 'dataGridGroups + ' + Me.dataGridGroups.AllowUserToAddRows = False + Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) + Me.dataGridGroups.Location = New System.Drawing.Point(260, 156) + Me.dataGridGroups.Name = "dataGridGroups" + Me.dataGridGroups.RowHeadersWidth = 62 + Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) + Me.dataGridGroups.TabIndex = 279 + ' + 'ucrColumns + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.rdoStyle) + Me.Controls.Add(Me.rdoSummary) + Me.Controls.Add(Me.ucrPnlRow) + Me.Controls.Add(Me.lblGroupCondition) + Me.Controls.Add(Me.lblGroups) + Me.Controls.Add(Me.ucrLogicalCombobox) + Me.Controls.Add(Me.btnClearGroups) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.ucrFilterByReceiver) + Me.Controls.Add(Me.ucrFilterOperation) + Me.Controls.Add(Me.btnAddGroupCondition) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridGroups) + Me.Name = "ucrColumns" + Me.Size = New System.Drawing.Size(627, 239) + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents rdoStyle As RadioButton + Friend WithEvents rdoSummary As RadioButton + Friend WithEvents ucrPnlRow As UcrPanel + Friend WithEvents lblGroupCondition As Label + Friend WithEvents lblGroups As Label + Friend WithEvents ucrLogicalCombobox As ucrInputComboBox + Friend WithEvents btnClearGroups As Button + Friend WithEvents lblColumns As Label + Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle + Friend WithEvents ucrFilterOperation As ucrInputComboBox + Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents btnAddGroupCondition As Button + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGridGroups As DataGridView +End Class diff --git a/instat/UserTables/ucrColumns.resx b/instat/UserTables/ucrColumns.resx new file mode 100644 index 00000000000..229ea162634 --- /dev/null +++ b/instat/UserTables/ucrColumns.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrColumns.vb b/instat/UserTables/ucrColumns.vb new file mode 100644 index 00000000000..23ae45d3041 --- /dev/null +++ b/instat/UserTables/ucrColumns.vb @@ -0,0 +1,3 @@ +Public Class ucrColumns + +End Class diff --git a/instat/UserTables/ucrHeader.vb b/instat/UserTables/ucrHeader.vb index b5377328bce..744143e4104 100644 --- a/instat/UserTables/ucrHeader.vb +++ b/instat/UserTables/ucrHeader.vb @@ -1,6 +1,4 @@ -Imports Antlr.Runtime -Imports unvell.ReoGrid.IO.OpenXML.Schema - + Public Class ucrHeader Private clsOperator As New ROperator Private clsTabTitleFootRParameter, clsTabSubtitleFootRParameter As RParameter @@ -64,9 +62,9 @@ Public Class ucrHeader End Sub Private Sub SetupRFunctionsFromOperator() - Dim clsRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_footnote", clsOperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_footnote", clsOperator) - For Each clsTabFooterRParam As RParameter In clsRParams + For Each clsTabFooterRParam As RParameter In lstRParams Dim clsFootNoteRFunction As RFunction = Nothing Dim clsLocationsRFunction As RFunction = Nothing diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/ucrRowGroup.Designer.vb index 44869c6667b..9c6535db815 100644 --- a/instat/UserTables/ucrRowGroup.Designer.vb +++ b/instat/UserTables/ucrRowGroup.Designer.vb @@ -22,79 +22,273 @@ Partial Class ucrRowGroup 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() - Me.lblRowGroups = New System.Windows.Forms.Label() - Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colName = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.colOperator = New System.Windows.Forms.DataGridViewComboBoxColumn() - Me.colValue = New System.Windows.Forms.DataGridViewTextBoxColumn() - CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.dataGridGroups = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrLogicalCombobox = New instat.ucrInputComboBox() + Me.btnClearGroups = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.btnAddGroupCondition = New System.Windows.Forms.Button() + Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() + Me.ucrFilterOperation = New instat.ucrInputComboBox() + Me.lblGroups = New System.Windows.Forms.Label() + Me.lblGroupCondition = New System.Windows.Forms.Label() + Me.rdoGroup = New System.Windows.Forms.RadioButton() + Me.rdoSummary = New System.Windows.Forms.RadioButton() + Me.ucrPnlRow = New instat.UcrPanel() + Me.rdoStyle = New System.Windows.Forms.RadioButton() + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'dataGridSourceNotes + 'dataGridGroups ' - Me.dataGridSourceNotes.AllowUserToAddRows = False - Me.dataGridSourceNotes.AllowUserToDeleteRows = False - Me.dataGridSourceNotes.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colName, Me.colOperator, Me.colValue}) - Me.dataGridSourceNotes.Location = New System.Drawing.Point(3, 17) - Me.dataGridSourceNotes.Name = "dataGridSourceNotes" - Me.dataGridSourceNotes.RowHeadersWidth = 62 - Me.dataGridSourceNotes.Size = New System.Drawing.Size(480, 205) - Me.dataGridSourceNotes.TabIndex = 11 + Me.dataGridGroups.AllowUserToAddRows = False + Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) + Me.dataGridGroups.Location = New System.Drawing.Point(266, 156) + Me.dataGridGroups.Name = "dataGridGroups" + Me.dataGridGroups.RowHeadersWidth = 62 + Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) + Me.dataGridGroups.TabIndex = 11 ' - 'lblRowGroups + 'colLabel ' - Me.lblRowGroups.AutoSize = True - Me.lblRowGroups.Location = New System.Drawing.Point(0, 1) - Me.lblRowGroups.Name = "lblRowGroups" - Me.lblRowGroups.Size = New System.Drawing.Size(69, 13) - Me.lblRowGroups.TabIndex = 10 - Me.lblRowGroups.Text = "Row Groups:" + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 58 ' - 'DataGridViewTextBoxColumn1 + 'colCodnition ' - Me.DataGridViewTextBoxColumn1.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.DataGridViewTextBoxColumn1.HeaderText = "Group Name" - Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 - Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 76 ' - 'colName + 'colFormat ' - Me.colName.HeaderText = "Column" - Me.colName.Name = "colName" + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 ' - 'colOperator + 'ucrSelectorCols ' - Me.colOperator.HeaderText = "Operator" - Me.colOperator.Name = "colOperator" + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(10, 49) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 23 ' - 'colValue + 'ucrLogicalCombobox ' - Me.colValue.HeaderText = "Value" - Me.colValue.Name = "colValue" + Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True + Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 + Me.ucrLogicalCombobox.IsReadOnly = False + Me.ucrLogicalCombobox.Location = New System.Drawing.Point(460, 65) + Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" + Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) + Me.ucrLogicalCombobox.TabIndex = 31 + ' + 'btnClearGroups + ' + Me.btnClearGroups.Enabled = False + Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearGroups.Location = New System.Drawing.Point(543, 131) + Me.btnClearGroups.Name = "btnClearGroups" + Me.btnClearGroups.Size = New System.Drawing.Size(79, 23) + Me.btnClearGroups.TabIndex = 30 + Me.btnClearGroups.Tag = "" + Me.btnClearGroups.Text = "Clear" + Me.btnClearGroups.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(263, 49) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 28 + Me.lblColumns.Text = "Column:" + ' + 'btnAddGroupCondition + ' + Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddGroupCondition.Location = New System.Drawing.Point(260, 86) + Me.btnAddGroupCondition.Name = "btnAddGroupCondition" + Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) + Me.btnAddGroupCondition.TabIndex = 25 + Me.btnAddGroupCondition.Tag = "" + Me.btnAddGroupCondition.Text = "Add" + Me.btnAddGroupCondition.UseVisualStyleBackColor = True + ' + 'ucrFilterByReceiver + ' + Me.ucrFilterByReceiver.AutoSize = True + Me.ucrFilterByReceiver.frmParent = Nothing + Me.ucrFilterByReceiver.Location = New System.Drawing.Point(260, 65) + Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" + Me.ucrFilterByReceiver.Selector = Nothing + Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) + Me.ucrFilterByReceiver.strNcFilePath = "" + Me.ucrFilterByReceiver.TabIndex = 24 + Me.ucrFilterByReceiver.ucrSelector = Nothing + ' + 'ucrFilterOperation + ' + Me.ucrFilterOperation.AddQuotesIfUnrecognised = True + Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFilterOperation.GetSetSelectedIndex = -1 + Me.ucrFilterOperation.IsReadOnly = False + Me.ucrFilterOperation.Location = New System.Drawing.Point(381, 65) + Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrFilterOperation.Name = "ucrFilterOperation" + Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) + Me.ucrFilterOperation.TabIndex = 26 + ' + 'lblGroups + ' + Me.lblGroups.AutoSize = True + Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroups.Location = New System.Drawing.Point(263, 136) + Me.lblGroups.Name = "lblGroups" + Me.lblGroups.Size = New System.Drawing.Size(44, 13) + Me.lblGroups.TabIndex = 32 + Me.lblGroups.Text = "Groups:" + ' + 'lblGroupCondition + ' + Me.lblGroupCondition.AutoSize = True + Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupCondition.Location = New System.Drawing.Point(385, 46) + Me.lblGroupCondition.Name = "lblGroupCondition" + Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) + Me.lblGroupCondition.TabIndex = 33 + Me.lblGroupCondition.Text = "Condition:" + ' + 'rdoGroup + ' + Me.rdoGroup.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoGroup.BackColor = System.Drawing.SystemColors.Control + Me.rdoGroup.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoGroup.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGroup.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGroup.FlatAppearance.BorderSize = 2 + Me.rdoGroup.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGroup.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoGroup.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoGroup.Location = New System.Drawing.Point(191, 3) + Me.rdoGroup.Name = "rdoGroup" + Me.rdoGroup.Size = New System.Drawing.Size(91, 29) + Me.rdoGroup.TabIndex = 276 + Me.rdoGroup.Text = "Groups" + Me.rdoGroup.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGroup.UseVisualStyleBackColor = True + ' + 'rdoSummary + ' + Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control + Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatAppearance.BorderSize = 2 + Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSummary.Location = New System.Drawing.Point(280, 3) + Me.rdoSummary.Name = "rdoSummary" + Me.rdoSummary.Size = New System.Drawing.Size(91, 29) + Me.rdoSummary.TabIndex = 277 + Me.rdoSummary.Text = "Summaries" + Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.UseVisualStyleBackColor = True + ' + 'ucrPnlRow + ' + Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRow.Location = New System.Drawing.Point(174, 3) + Me.ucrPnlRow.Name = "ucrPnlRow" + Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.TabIndex = 275 + ' + 'rdoStyle + ' + Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatAppearance.BorderSize = 2 + Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyle.Location = New System.Drawing.Point(368, 3) + Me.rdoStyle.Name = "rdoStyle" + Me.rdoStyle.Size = New System.Drawing.Size(91, 29) + Me.rdoStyle.TabIndex = 278 + Me.rdoStyle.Text = "Styles" + Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.UseVisualStyleBackColor = True ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.dataGridSourceNotes) - Me.Controls.Add(Me.lblRowGroups) + Me.Controls.Add(Me.rdoStyle) + Me.Controls.Add(Me.rdoGroup) + Me.Controls.Add(Me.rdoSummary) + Me.Controls.Add(Me.ucrPnlRow) + Me.Controls.Add(Me.lblGroupCondition) + Me.Controls.Add(Me.lblGroups) + Me.Controls.Add(Me.ucrLogicalCombobox) + Me.Controls.Add(Me.btnClearGroups) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnAddGroupCondition) + Me.Controls.Add(Me.ucrFilterByReceiver) + Me.Controls.Add(Me.ucrFilterOperation) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrRowGroup" - Me.Size = New System.Drawing.Size(486, 225) - CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(635, 242) + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents dataGridSourceNotes As DataGridView - Friend WithEvents lblRowGroups As Label - Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn - Friend WithEvents colName As DataGridViewComboBoxColumn - Friend WithEvents colOperator As DataGridViewComboBoxColumn - Friend WithEvents colValue As DataGridViewTextBoxColumn + Friend WithEvents dataGridGroups As DataGridView + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrLogicalCombobox As ucrInputComboBox + Friend WithEvents btnClearGroups As Button + Friend WithEvents lblColumns As Label + Friend WithEvents btnAddGroupCondition As Button + Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle + Friend WithEvents ucrFilterOperation As ucrInputComboBox + Friend WithEvents lblGroups As Label + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents lblGroupCondition As Label + Friend WithEvents rdoGroup As RadioButton + Friend WithEvents rdoSummary As RadioButton + Friend WithEvents ucrPnlRow As UcrPanel + Friend WithEvents rdoStyle As RadioButton End Class diff --git a/instat/UserTables/ucrRowGroup.resx b/instat/UserTables/ucrRowGroup.resx index b7397a86e87..191e2e6453d 100644 --- a/instat/UserTables/ucrRowGroup.resx +++ b/instat/UserTables/ucrRowGroup.resx @@ -117,28 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True - + True - + True - - True - - - True - - + True \ No newline at end of file diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/ucrRowGroup.vb index 9e4045c7eb9..bb06ac8a366 100644 --- a/instat/UserTables/ucrRowGroup.vb +++ b/instat/UserTables/ucrRowGroup.vb @@ -1,5 +1,41 @@ Public Class ucrRowGroup - Private Sub ucrRowGroup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Private clsOperator As New ROperator + + Private bFirstload As Boolean = True + + Public Sub Setup(clsOperator As ROperator) + Me.clsOperator = clsOperator + dataGridGroups.Rows.Clear() + + Dim lstsourceNotesRFunctions As List(Of RFunction) = clsTablesUtils.FindRFunctionsWithRCommand("tab_source_note", clsOperator) + + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_row_group", clsOperator) + + + + For Each clsRParam As RParameter In lstRParams + + Dim clsTabSourceNoteRFunction As RFunction = clsRParam.clsArgumentCodeStructure + + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridGroups) + + For Each clsRowGroupRParam As RParameter In clsTabSourceNoteRFunction.clsParameters + If clsRowGroupRParam.strArgumentName = "label" Then + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + End If + Next + + ' Tag and add the tab_footnote() function contents as a row + 'row.Tag = clsSourceNoteRFunct + dataGridGroups.Rows.Add(row) + + Next + + ' Always add a place holder row for new foot note + dataGridGroups.Rows.Add() End Sub + End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index b07b61b4577..419c0d6528b 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3050,6 +3050,18 @@ UserControl + + ucrCells.vb + + + UserControl + + + ucrColumns.vb + + + UserControl + ucrHeader.vb @@ -5371,6 +5383,12 @@ ucrOutputPages.vb + + ucrCells.vb + + + ucrColumns.vb + ucrHeader.vb From 03a0051c7a30ea3c685eee75ce55a98f9b055a5c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 23 May 2024 14:14:34 +0300 Subject: [PATCH 032/273] more changes --- instat/UserTables/sdgTableOptions.Designer.vb | 26 +-- instat/UserTables/sdgTableOptions.resx | 12 + instat/UserTables/sdgTableOptions.vb | 1 + instat/UserTables/ucrRowGroup.Designer.vb | 209 ++++++++++-------- instat/UserTables/ucrRowGroup.resx | 9 - instat/UserTables/ucrRowGroup.vb | 72 +++++- 6 files changed, 200 insertions(+), 129 deletions(-) diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 5374b5e03bb..29db43a1ef5 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -28,6 +28,7 @@ Partial Class sdgTableOptions Me.tbpRows = New System.Windows.Forms.TabPage() Me.UcrRowGroup1 = New instat.ucrRowGroup() Me.tbpColumns = New System.Windows.Forms.TabPage() + Me.UcrColumns1 = New instat.ucrColumns() Me.tbpCells = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -44,7 +45,6 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.UcrColumns1 = New instat.ucrColumns() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpRows.SuspendLayout() @@ -66,7 +66,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 294) + Me.tbpFormatOptions.Size = New System.Drawing.Size(682, 321) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -92,7 +92,7 @@ Partial Class sdgTableOptions Me.tbpRows.Controls.Add(Me.UcrRowGroup1) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(648, 268) + Me.tbpRows.Size = New System.Drawing.Size(674, 295) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True @@ -102,7 +102,7 @@ Partial Class sdgTableOptions Me.UcrRowGroup1.Location = New System.Drawing.Point(8, 4) Me.UcrRowGroup1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.UcrRowGroup1.Name = "UcrRowGroup1" - Me.UcrRowGroup1.Size = New System.Drawing.Size(636, 259) + Me.UcrRowGroup1.Size = New System.Drawing.Size(659, 286) Me.UcrRowGroup1.TabIndex = 0 ' 'tbpColumns @@ -115,6 +115,13 @@ Partial Class sdgTableOptions Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True ' + 'UcrColumns1 + ' + Me.UcrColumns1.Location = New System.Drawing.Point(5, 6) + Me.UcrColumns1.Name = "UcrColumns1" + Me.UcrColumns1.Size = New System.Drawing.Size(627, 239) + Me.UcrColumns1.TabIndex = 0 + ' 'tbpCells ' Me.tbpCells.Controls.Add(Me.dataGridCellFooterNotes) @@ -266,24 +273,17 @@ Partial Class sdgTableOptions 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 304) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 330) Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' - 'UcrColumns1 - ' - Me.UcrColumns1.Location = New System.Drawing.Point(5, 6) - Me.UcrColumns1.Name = "UcrColumns1" - Me.UcrColumns1.Size = New System.Drawing.Size(627, 239) - Me.UcrColumns1.TabIndex = 0 - ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(657, 335) + Me.ClientSize = New System.Drawing.Size(697, 367) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow diff --git a/instat/UserTables/sdgTableOptions.resx b/instat/UserTables/sdgTableOptions.resx index 418e7a89629..0801bc20640 100644 --- a/instat/UserTables/sdgTableOptions.resx +++ b/instat/UserTables/sdgTableOptions.resx @@ -129,4 +129,16 @@ True + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 3230c6c91e6..cf85bf302de 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -64,6 +64,7 @@ Public Class sdgTableOptions clsOperator = clsNewOperator ucrHeaderOptions.Setup(clsOperator) + UcrRowGroup1.Setup("survey", clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) ucrSourceNotes.Setup(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/ucrRowGroup.Designer.vb index 9c6535db815..b07e5d59181 100644 --- a/instat/UserTables/ucrRowGroup.Designer.vb +++ b/instat/UserTables/ucrRowGroup.Designer.vb @@ -23,22 +23,24 @@ Partial Class ucrRowGroup _ Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrLogicalCombobox = New instat.ucrInputComboBox() Me.btnClearGroups = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() - Me.btnAddGroupCondition = New System.Windows.Forms.Button() - Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() - Me.ucrFilterOperation = New instat.ucrInputComboBox() + Me.btnAddCondition = New System.Windows.Forms.Button() + Me.ucrSingleReceiverCol = New instat.ucrReceiverSingle() Me.lblGroups = New System.Windows.Forms.Label() Me.lblGroupCondition = New System.Windows.Forms.Label() Me.rdoGroup = New System.Windows.Forms.RadioButton() Me.rdoSummary = New System.Windows.Forms.RadioButton() Me.ucrPnlRow = New instat.UcrPanel() Me.rdoStyle = New System.Windows.Forms.RadioButton() + Me.cboConditionOperator = New System.Windows.Forms.ComboBox() + Me.cboConditionValue = New System.Windows.Forms.ComboBox() + Me.txtGroupLabel = New System.Windows.Forms.TextBox() + Me.lblCondition = New System.Windows.Forms.Label() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -47,36 +49,12 @@ Partial Class ucrRowGroup Me.dataGridGroups.AllowUserToAddRows = False Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(266, 156) + Me.dataGridGroups.Location = New System.Drawing.Point(266, 175) Me.dataGridGroups.Name = "dataGridGroups" Me.dataGridGroups.RowHeadersWidth = 62 Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) Me.dataGridGroups.TabIndex = 11 ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 58 - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 76 - ' - 'colFormat - ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 - ' 'ucrSelectorCols ' Me.ucrSelectorCols.AutoSize = True @@ -89,23 +67,10 @@ Partial Class ucrRowGroup Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 23 ' - 'ucrLogicalCombobox - ' - Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True - Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 - Me.ucrLogicalCombobox.IsReadOnly = False - Me.ucrLogicalCombobox.Location = New System.Drawing.Point(460, 65) - Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" - Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) - Me.ucrLogicalCombobox.TabIndex = 31 - ' 'btnClearGroups ' - Me.btnClearGroups.Enabled = False Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(543, 131) + Me.btnClearGroups.Location = New System.Drawing.Point(545, 150) Me.btnClearGroups.Name = "btnClearGroups" Me.btnClearGroups.Size = New System.Drawing.Size(79, 23) Me.btnClearGroups.TabIndex = 30 @@ -117,54 +82,42 @@ Partial Class ucrRowGroup ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(263, 49) + Me.lblColumns.Location = New System.Drawing.Point(263, 52) Me.lblColumns.Name = "lblColumns" Me.lblColumns.Size = New System.Drawing.Size(45, 13) Me.lblColumns.TabIndex = 28 Me.lblColumns.Text = "Column:" ' - 'btnAddGroupCondition - ' - Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddGroupCondition.Location = New System.Drawing.Point(260, 86) - Me.btnAddGroupCondition.Name = "btnAddGroupCondition" - Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) - Me.btnAddGroupCondition.TabIndex = 25 - Me.btnAddGroupCondition.Tag = "" - Me.btnAddGroupCondition.Text = "Add" - Me.btnAddGroupCondition.UseVisualStyleBackColor = True - ' - 'ucrFilterByReceiver - ' - Me.ucrFilterByReceiver.AutoSize = True - Me.ucrFilterByReceiver.frmParent = Nothing - Me.ucrFilterByReceiver.Location = New System.Drawing.Point(260, 65) - Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" - Me.ucrFilterByReceiver.Selector = Nothing - Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) - Me.ucrFilterByReceiver.strNcFilePath = "" - Me.ucrFilterByReceiver.TabIndex = 24 - Me.ucrFilterByReceiver.ucrSelector = Nothing - ' - 'ucrFilterOperation - ' - Me.ucrFilterOperation.AddQuotesIfUnrecognised = True - Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFilterOperation.GetSetSelectedIndex = -1 - Me.ucrFilterOperation.IsReadOnly = False - Me.ucrFilterOperation.Location = New System.Drawing.Point(381, 65) - Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrFilterOperation.Name = "ucrFilterOperation" - Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) - Me.ucrFilterOperation.TabIndex = 26 + 'btnAddCondition + ' + Me.btnAddCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddCondition.Location = New System.Drawing.Point(555, 113) + Me.btnAddCondition.Name = "btnAddCondition" + Me.btnAddCondition.Size = New System.Drawing.Size(96, 23) + Me.btnAddCondition.TabIndex = 25 + Me.btnAddCondition.Tag = "" + Me.btnAddCondition.Text = "Add Group" + Me.btnAddCondition.UseVisualStyleBackColor = True + ' + 'ucrSingleReceiverCol + ' + Me.ucrSingleReceiverCol.AutoSize = True + Me.ucrSingleReceiverCol.frmParent = Nothing + Me.ucrSingleReceiverCol.Location = New System.Drawing.Point(260, 68) + Me.ucrSingleReceiverCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSingleReceiverCol.Name = "ucrSingleReceiverCol" + Me.ucrSingleReceiverCol.Selector = Nothing + Me.ucrSingleReceiverCol.Size = New System.Drawing.Size(120, 21) + Me.ucrSingleReceiverCol.strNcFilePath = "" + Me.ucrSingleReceiverCol.TabIndex = 24 + Me.ucrSingleReceiverCol.ucrSelector = Nothing ' 'lblGroups ' Me.lblGroups.AutoSize = True Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(263, 136) + Me.lblGroups.Location = New System.Drawing.Point(263, 156) Me.lblGroups.Name = "lblGroups" Me.lblGroups.Size = New System.Drawing.Size(44, 13) Me.lblGroups.TabIndex = 32 @@ -174,7 +127,7 @@ Partial Class ucrRowGroup ' Me.lblGroupCondition.AutoSize = True Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(385, 46) + Me.lblGroupCondition.Location = New System.Drawing.Point(371, 98) Me.lblGroupCondition.Name = "lblGroupCondition" Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) Me.lblGroupCondition.TabIndex = 33 @@ -248,26 +201,86 @@ Partial Class ucrRowGroup Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoStyle.UseVisualStyleBackColor = True ' + 'cboConditionOperator + ' + Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboConditionOperator.FormattingEnabled = True + Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "expression"}) + Me.cboConditionOperator.Location = New System.Drawing.Point(367, 115) + Me.cboConditionOperator.Name = "cboConditionOperator" + Me.cboConditionOperator.Size = New System.Drawing.Size(78, 21) + Me.cboConditionOperator.TabIndex = 279 + ' + 'cboConditionValue + ' + Me.cboConditionValue.FormattingEnabled = True + Me.cboConditionValue.Location = New System.Drawing.Point(446, 115) + Me.cboConditionValue.Name = "cboConditionValue" + Me.cboConditionValue.Size = New System.Drawing.Size(106, 21) + Me.cboConditionValue.TabIndex = 280 + ' + 'txtGroupLabel + ' + Me.txtGroupLabel.Location = New System.Drawing.Point(261, 117) + Me.txtGroupLabel.Name = "txtGroupLabel" + Me.txtGroupLabel.Size = New System.Drawing.Size(100, 20) + Me.txtGroupLabel.TabIndex = 281 + ' + 'lblCondition + ' + Me.lblCondition.AutoSize = True + Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCondition.Location = New System.Drawing.Point(263, 99) + Me.lblCondition.Name = "lblCondition" + Me.lblCondition.Size = New System.Drawing.Size(68, 13) + Me.lblCondition.TabIndex = 282 + Me.lblCondition.Text = "Group Label:" + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + ' + 'colFormat + ' + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.ReadOnly = True + Me.colFormat.Text = "Format" + Me.colFormat.Width = 99 + ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblCondition) + Me.Controls.Add(Me.txtGroupLabel) + Me.Controls.Add(Me.cboConditionValue) + Me.Controls.Add(Me.cboConditionOperator) Me.Controls.Add(Me.rdoStyle) Me.Controls.Add(Me.rdoGroup) Me.Controls.Add(Me.rdoSummary) Me.Controls.Add(Me.ucrPnlRow) Me.Controls.Add(Me.lblGroupCondition) Me.Controls.Add(Me.lblGroups) - Me.Controls.Add(Me.ucrLogicalCombobox) Me.Controls.Add(Me.btnClearGroups) Me.Controls.Add(Me.lblColumns) - Me.Controls.Add(Me.btnAddGroupCondition) - Me.Controls.Add(Me.ucrFilterByReceiver) - Me.Controls.Add(Me.ucrFilterOperation) + Me.Controls.Add(Me.btnAddCondition) + Me.Controls.Add(Me.ucrSingleReceiverCol) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrRowGroup" - Me.Size = New System.Drawing.Size(635, 242) + Me.Size = New System.Drawing.Size(660, 252) CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -276,19 +289,21 @@ Partial Class ucrRowGroup Friend WithEvents dataGridGroups As DataGridView Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrLogicalCombobox As ucrInputComboBox Friend WithEvents btnClearGroups As Button Friend WithEvents lblColumns As Label - Friend WithEvents btnAddGroupCondition As Button - Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle - Friend WithEvents ucrFilterOperation As ucrInputComboBox + Friend WithEvents btnAddCondition As Button + Friend WithEvents ucrSingleReceiverCol As ucrReceiverSingle Friend WithEvents lblGroups As Label - Friend WithEvents colLabel As DataGridViewTextBoxColumn - Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colFormat As DataGridViewButtonColumn Friend WithEvents lblGroupCondition As Label Friend WithEvents rdoGroup As RadioButton Friend WithEvents rdoSummary As RadioButton Friend WithEvents ucrPnlRow As UcrPanel Friend WithEvents rdoStyle As RadioButton + Friend WithEvents cboConditionOperator As ComboBox + Friend WithEvents cboConditionValue As ComboBox + Friend WithEvents txtGroupLabel As TextBox + Friend WithEvents lblCondition As Label + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colFormat As DataGridViewButtonColumn End Class diff --git a/instat/UserTables/ucrRowGroup.resx b/instat/UserTables/ucrRowGroup.resx index 191e2e6453d..f4b4b7d5a34 100644 --- a/instat/UserTables/ucrRowGroup.resx +++ b/instat/UserTables/ucrRowGroup.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/ucrRowGroup.vb index bb06ac8a366..7ddbc2f8847 100644 --- a/instat/UserTables/ucrRowGroup.vb +++ b/instat/UserTables/ucrRowGroup.vb @@ -4,38 +4,90 @@ Private bFirstload As Boolean = True - Public Sub Setup(clsOperator As ROperator) + Private Sub InitialiseDialog() + ucrSingleReceiverCol.Selector = ucrSelectorCols + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + Me.clsOperator = clsOperator + + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + ucrSingleReceiverCol.SetMeAsReceiver() dataGridGroups.Rows.Clear() - Dim lstsourceNotesRFunctions As List(Of RFunction) = clsTablesUtils.FindRFunctionsWithRCommand("tab_source_note", clsOperator) Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_row_group", clsOperator) - - For Each clsRParam As RParameter In lstRParams - Dim clsTabSourceNoteRFunction As RFunction = clsRParam.clsArgumentCodeStructure + Dim clsTabRowGroupRFunction As RFunction = clsRParam.clsArgumentCodeStructure ' Create a new row that represents the tab_footnote() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridGroups) - For Each clsRowGroupRParam As RParameter In clsTabSourceNoteRFunction.clsParameters + For Each clsRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters If clsRowGroupRParam.strArgumentName = "label" Then row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + ElseIf clsRowGroupRParam.strArgumentName = "rows" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) End If Next - ' Tag and add the tab_footnote() function contents as a row - 'row.Tag = clsSourceNoteRFunct + ' Tag and add the tab_row_group() parameter function contents as a row + row.Tag = clsRParam dataGridGroups.Rows.Add(row) Next - ' Always add a place holder row for new foot note - dataGridGroups.Rows.Add() End Sub + Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click + + Dim strGroupLabel As String = txtGroupLabel.Text + Dim strCondition As String = ucrSingleReceiverCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & cboConditionValue.Text + + Dim clsTabRowGroupRFunction As New RFunction + clsTabRowGroupRFunction.SetPackageName("gt") + clsTabRowGroupRFunction.SetRCommand("tab_row_group") + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="label", strParamValue:=clsTablesUtils.GetStringValue(strGroupLabel, True), iNewPosition:=0)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strCondition, iNewPosition:=1)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strGroupLabel.Replace(" ", String.Empty), True), iNewPosition:=2)) + + Dim clsRParam As New RParameter(strParameterName:="tab_row_group_param", strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) + + Dim row As New DataGridViewRow + row.CreateCells(dataGridGroups) + + row.Cells(0).Value = strGroupLabel + row.Cells(1).Value = strCondition + + ' Tag and add the tab_row_group() parameter function contents as a row + row.Tag = clsRParam + dataGridGroups.Rows.Add(row) + + ' Add to parameter + clsOperator.AddParameter(clsRParam) + + txtGroupLabel.Text = "" + cboConditionValue.Text = "" + + End Sub + + Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearGroups.Click + For index As Integer = 0 To dataGridGroups.Rows.Count - 1 + clsOperator.RemoveParameter(dataGridGroups.Rows(index).Tag) + + Next + dataGridGroups.Rows.Clear() + End Sub + + Private Sub cboConditionValue_TextChanged(sender As Object, e As EventArgs) Handles cboConditionValue.TextChanged, cboConditionOperator.TextChanged, txtGroupLabel.TextChanged + btnAddCondition.Enabled = Not String.IsNullOrWhiteSpace(txtGroupLabel.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) + End Sub End Class From 83ac020e9c77d8f632a881732207149ab43633b6 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 23 May 2024 14:51:19 +0300 Subject: [PATCH 033/273] Added Groups functionality --- instat/UserTables/ucrRowGroup.Designer.vb | 91 ++++++++++++----------- instat/UserTables/ucrRowGroup.vb | 11 +-- instat/UserTables/ucrRows.Designer.vb | 29 ++++++++ instat/UserTables/ucrRows.vb | 3 + instat/instat.vbproj | 6 ++ 5 files changed, 90 insertions(+), 50 deletions(-) create mode 100644 instat/UserTables/ucrRows.Designer.vb create mode 100644 instat/UserTables/ucrRows.vb diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/ucrRowGroup.Designer.vb index b07e5d59181..c20f638a2c8 100644 --- a/instat/UserTables/ucrRowGroup.Designer.vb +++ b/instat/UserTables/ucrRowGroup.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class ucrRowGroup Inherits System.Windows.Forms.UserControl 'UserControl overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,24 +20,24 @@ Partial Class ucrRowGroup 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.btnClearGroups = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() Me.btnAddCondition = New System.Windows.Forms.Button() - Me.ucrSingleReceiverCol = New instat.ucrReceiverSingle() Me.lblGroups = New System.Windows.Forms.Label() Me.lblGroupCondition = New System.Windows.Forms.Label() Me.rdoGroup = New System.Windows.Forms.RadioButton() Me.rdoSummary = New System.Windows.Forms.RadioButton() - Me.ucrPnlRow = New instat.UcrPanel() Me.rdoStyle = New System.Windows.Forms.RadioButton() Me.cboConditionOperator = New System.Windows.Forms.ComboBox() Me.cboConditionValue = New System.Windows.Forms.ComboBox() Me.txtGroupLabel = New System.Windows.Forms.TextBox() Me.lblCondition = New System.Windows.Forms.Label() + Me.ucrPnlRow = New instat.UcrPanel() + Me.ucrSingleReceiverCol = New instat.ucrReceiverSingle() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() @@ -52,25 +52,13 @@ Partial Class ucrRowGroup Me.dataGridGroups.Location = New System.Drawing.Point(266, 175) Me.dataGridGroups.Name = "dataGridGroups" Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) + Me.dataGridGroups.Size = New System.Drawing.Size(385, 73) Me.dataGridGroups.TabIndex = 11 ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(10, 49) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 23 - ' 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(545, 150) + Me.btnClearGroups.Location = New System.Drawing.Point(569, 150) Me.btnClearGroups.Name = "btnClearGroups" Me.btnClearGroups.Size = New System.Drawing.Size(79, 23) Me.btnClearGroups.TabIndex = 30 @@ -100,19 +88,6 @@ Partial Class ucrRowGroup Me.btnAddCondition.Text = "Add Group" Me.btnAddCondition.UseVisualStyleBackColor = True ' - 'ucrSingleReceiverCol - ' - Me.ucrSingleReceiverCol.AutoSize = True - Me.ucrSingleReceiverCol.frmParent = Nothing - Me.ucrSingleReceiverCol.Location = New System.Drawing.Point(260, 68) - Me.ucrSingleReceiverCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSingleReceiverCol.Name = "ucrSingleReceiverCol" - Me.ucrSingleReceiverCol.Selector = Nothing - Me.ucrSingleReceiverCol.Size = New System.Drawing.Size(120, 21) - Me.ucrSingleReceiverCol.strNcFilePath = "" - Me.ucrSingleReceiverCol.TabIndex = 24 - Me.ucrSingleReceiverCol.ucrSelector = Nothing - ' 'lblGroups ' Me.lblGroups.AutoSize = True @@ -127,11 +102,11 @@ Partial Class ucrRowGroup ' Me.lblGroupCondition.AutoSize = True Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(371, 98) + Me.lblGroupCondition.Location = New System.Drawing.Point(370, 98) Me.lblGroupCondition.Name = "lblGroupCondition" - Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) + Me.lblGroupCondition.Size = New System.Drawing.Size(86, 13) Me.lblGroupCondition.TabIndex = 33 - Me.lblGroupCondition.Text = "Condition:" + Me.lblGroupCondition.Text = "Group Condition:" ' 'rdoGroup ' @@ -173,14 +148,6 @@ Partial Class ucrRowGroup Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSummary.UseVisualStyleBackColor = True ' - 'ucrPnlRow - ' - Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(174, 3) - Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) - Me.ucrPnlRow.TabIndex = 275 - ' 'rdoStyle ' Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button @@ -205,7 +172,7 @@ Partial Class ucrRowGroup ' Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboConditionOperator.FormattingEnabled = True - Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "expression"}) + Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) Me.cboConditionOperator.Location = New System.Drawing.Point(367, 115) Me.cboConditionOperator.Name = "cboConditionOperator" Me.cboConditionOperator.Size = New System.Drawing.Size(78, 21) @@ -236,6 +203,39 @@ Partial Class ucrRowGroup Me.lblCondition.TabIndex = 282 Me.lblCondition.Text = "Group Label:" ' + 'ucrPnlRow + ' + Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRow.Location = New System.Drawing.Point(174, 3) + Me.ucrPnlRow.Name = "ucrPnlRow" + Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.TabIndex = 275 + ' + 'ucrSingleReceiverCol + ' + Me.ucrSingleReceiverCol.AutoSize = True + Me.ucrSingleReceiverCol.frmParent = Nothing + Me.ucrSingleReceiverCol.Location = New System.Drawing.Point(260, 68) + Me.ucrSingleReceiverCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSingleReceiverCol.Name = "ucrSingleReceiverCol" + Me.ucrSingleReceiverCol.Selector = Nothing + Me.ucrSingleReceiverCol.Size = New System.Drawing.Size(120, 21) + Me.ucrSingleReceiverCol.strNcFilePath = "" + Me.ucrSingleReceiverCol.TabIndex = 24 + Me.ucrSingleReceiverCol.ucrSelector = Nothing + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(10, 49) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 23 + ' 'colLabel ' Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill @@ -257,6 +257,7 @@ Partial Class ucrRowGroup Me.colFormat.Name = "colFormat" Me.colFormat.ReadOnly = True Me.colFormat.Text = "Format" + Me.colFormat.UseColumnTextForButtonValue = True Me.colFormat.Width = 99 ' 'ucrRowGroup diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/ucrRowGroup.vb index 7ddbc2f8847..c716016615d 100644 --- a/instat/UserTables/ucrRowGroup.vb +++ b/instat/UserTables/ucrRowGroup.vb @@ -33,9 +33,9 @@ For Each clsRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters If clsRowGroupRParam.strArgumentName = "label" Then - row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) ElseIf clsRowGroupRParam.strArgumentName = "rows" Then - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) End If Next @@ -50,7 +50,8 @@ Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click Dim strGroupLabel As String = txtGroupLabel.Text - Dim strCondition As String = ucrSingleReceiverCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & cboConditionValue.Text + Dim strConditionValue As String = If(cboConditionOperator.Text <> "Expression" AndAlso Not IsNumeric(cboConditionValue.Text), clsTablesUtils.GetStringValue(cboConditionValue.Text, True), cboConditionValue.Text) + Dim strCondition As String = ucrSingleReceiverCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & strConditionValue Dim clsTabRowGroupRFunction As New RFunction clsTabRowGroupRFunction.SetPackageName("gt") @@ -59,7 +60,8 @@ clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strCondition, iNewPosition:=1)) clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strGroupLabel.Replace(" ", String.Empty), True), iNewPosition:=2)) - Dim clsRParam As New RParameter(strParameterName:="tab_row_group_param", strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_row_group_param" & (dataGridGroups.Rows.Count + 1), strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) Dim row As New DataGridViewRow row.CreateCells(dataGridGroups) @@ -82,7 +84,6 @@ Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearGroups.Click For index As Integer = 0 To dataGridGroups.Rows.Count - 1 clsOperator.RemoveParameter(dataGridGroups.Rows(index).Tag) - Next dataGridGroups.Rows.Clear() End Sub diff --git a/instat/UserTables/ucrRows.Designer.vb b/instat/UserTables/ucrRows.Designer.vb new file mode 100644 index 00000000000..3081e7bde9b --- /dev/null +++ b/instat/UserTables/ucrRows.Designer.vb @@ -0,0 +1,29 @@ + _ +Partial Class ucrRows + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + components = New System.ComponentModel.Container() + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + End Sub + +End Class diff --git a/instat/UserTables/ucrRows.vb b/instat/UserTables/ucrRows.vb new file mode 100644 index 00000000000..ddcf055087d --- /dev/null +++ b/instat/UserTables/ucrRows.vb @@ -0,0 +1,3 @@ +Public Class ucrRows + +End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 419c0d6528b..4358ae06ab8 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3074,6 +3074,12 @@ UserControl + + ucrRows.vb + + + UserControl + ucrSourceNotes.vb From 4fa9557fad680cc8e4a7f7534899e2689b6744cc Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 28 May 2024 17:21:25 +0100 Subject: [PATCH 034/273] Change made --- instat/dlgClimograph.Designer.vb | 548 ++++++++++++++++--------------- instat/dlgClimograph.vb | 471 ++++++++++++++++++++++---- 2 files changed, 708 insertions(+), 311 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index ca01682faf6..bb0257f9662 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -22,59 +22,49 @@ Partial Class dlgClimograph 'Ne la modifiez pas à l'aide de l'éditeur de code. _ Private Sub InitializeComponent() - Me.ucrReceiverAbsolute = New instat.ucrReceiverSingle() Me.lblAbsolute = New System.Windows.Forms.Label() - Me.ucrInputStation = New instat.ucrInputComboBox() - Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() Me.lblFacetBy = New System.Windows.Forms.Label() - Me.ucrReceiverRain = New instat.ucrReceiverSingle() Me.lblRain = New System.Windows.Forms.Label() - Me.ucrReceiverMaxtem = New instat.ucrReceiverSingle() Me.lblMaxtem = New System.Windows.Forms.Label() - Me.ucrReceiverMintemp = New instat.ucrReceiverSingle() Me.lblMintem = New System.Windows.Forms.Label() Me.rdoClimograph = New System.Windows.Forms.RadioButton() Me.rdoWalterLieth = New System.Windows.Forms.RadioButton() - Me.ucrPnlClimograph = New instat.UcrPanel() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSave = New instat.ucrSave() - Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.lblMonth = New System.Windows.Forms.Label() - Me.ucrSelectorClimograph = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrInputFacet = New instat.ucrInputComboBox() - Me.ucrReceiverFacet = New instat.ucrReceiverSingle() Me.lblFacet = New System.Windows.Forms.Label() - Me.ucrReceiverRainC = New instat.ucrReceiverSingle() Me.lblRainC = New System.Windows.Forms.Label() - Me.ucrReceiverElement1 = New instat.ucrReceiverSingle() Me.lblElement1 = New System.Windows.Forms.Label() - Me.ucrReceiverElement2 = New instat.ucrReceiverSingle() Me.lblElement2 = New System.Windows.Forms.Label() - Me.ucrReceiverMonthC = New instat.ucrReceiverSingle() Me.lblMonthC = New System.Windows.Forms.Label() - Me.cmdOptions = New instat.ucrSplitButton() - Me.ucrInputLegendPosition = New instat.ucrInputComboBox() - Me.ucrChkLegend = New instat.ucrCheck() - Me.ucrChkColourIdntity = New instat.ucrCheck() - Me.ucrInputName = New instat.ucrInputTextBox() Me.lblName = New System.Windows.Forms.Label() Me.lblLabel = New System.Windows.Forms.Label() + Me.ucrChkText = New instat.ucrCheck() + Me.ucrChkRibbon = New instat.ucrCheck() Me.ucrInputLabels = New instat.ucrInputTextBox() + Me.ucrInputName = New instat.ucrInputTextBox() + Me.ucrChkColourIdntity = New instat.ucrCheck() + Me.ucrInputLegendPosition = New instat.ucrInputComboBox() + Me.ucrChkLegend = New instat.ucrCheck() + Me.cmdOptions = New instat.ucrSplitButton() + Me.ucrInputFacet = New instat.ucrInputComboBox() + Me.ucrReceiverFacet = New instat.ucrReceiverSingle() + Me.ucrReceiverRainC = New instat.ucrReceiverSingle() + Me.ucrReceiverElement1 = New instat.ucrReceiverSingle() + Me.ucrReceiverElement2 = New instat.ucrReceiverSingle() + Me.ucrReceiverMonthC = New instat.ucrReceiverSingle() + Me.ucrReceiverAbsolute = New instat.ucrReceiverSingle() + Me.ucrInputStation = New instat.ucrInputComboBox() + Me.ucr1stFactorReceiver = New instat.ucrReceiverSingle() + Me.ucrReceiverRain = New instat.ucrReceiverSingle() + Me.ucrReceiverMaxtem = New instat.ucrReceiverSingle() + Me.ucrReceiverMintemp = New instat.ucrReceiverSingle() + Me.ucrPnlClimograph = New instat.UcrPanel() + Me.ucrBase = New instat.ucrButtons() + Me.ucrSave = New instat.ucrSave() + Me.ucrReceiverMonth = New instat.ucrReceiverSingle() + Me.ucrSelectorClimograph = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrChkTile = New instat.ucrCheck() Me.SuspendLayout() ' - 'ucrReceiverAbsolute - ' - Me.ucrReceiverAbsolute.AutoSize = True - Me.ucrReceiverAbsolute.frmParent = Me - Me.ucrReceiverAbsolute.Location = New System.Drawing.Point(267, 280) - Me.ucrReceiverAbsolute.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverAbsolute.Name = "ucrReceiverAbsolute" - Me.ucrReceiverAbsolute.Selector = Nothing - Me.ucrReceiverAbsolute.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverAbsolute.strNcFilePath = "" - Me.ucrReceiverAbsolute.TabIndex = 77 - Me.ucrReceiverAbsolute.ucrSelector = Nothing - ' 'lblAbsolute ' Me.lblAbsolute.AutoSize = True @@ -84,30 +74,6 @@ Partial Class dlgClimograph Me.lblAbsolute.TabIndex = 76 Me.lblAbsolute.Text = "Temperature min, min:" ' - 'ucrInputStation - ' - Me.ucrInputStation.AddQuotesIfUnrecognised = True - Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputStation.GetSetSelectedIndex = -1 - Me.ucrInputStation.IsReadOnly = False - Me.ucrInputStation.Location = New System.Drawing.Point(379, 68) - Me.ucrInputStation.Name = "ucrInputStation" - Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) - Me.ucrInputStation.TabIndex = 65 - ' - 'ucr1stFactorReceiver - ' - Me.ucr1stFactorReceiver.AutoSize = True - Me.ucr1stFactorReceiver.frmParent = Me - Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(267, 68) - Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" - Me.ucr1stFactorReceiver.Selector = Nothing - Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) - Me.ucr1stFactorReceiver.strNcFilePath = "" - Me.ucr1stFactorReceiver.TabIndex = 64 - Me.ucr1stFactorReceiver.ucrSelector = Nothing - ' 'lblFacetBy ' Me.lblFacetBy.AutoSize = True @@ -119,19 +85,6 @@ Partial Class dlgClimograph Me.lblFacetBy.Tag = "" Me.lblFacetBy.Text = "Station:" ' - 'ucrReceiverRain - ' - Me.ucrReceiverRain.AutoSize = True - Me.ucrReceiverRain.frmParent = Me - Me.ucrReceiverRain.Location = New System.Drawing.Point(267, 150) - Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRain.Name = "ucrReceiverRain" - Me.ucrReceiverRain.Selector = Nothing - Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverRain.strNcFilePath = "" - Me.ucrReceiverRain.TabIndex = 69 - Me.ucrReceiverRain.ucrSelector = Nothing - ' 'lblRain ' Me.lblRain.AutoSize = True @@ -141,19 +94,6 @@ Partial Class dlgClimograph Me.lblRain.TabIndex = 68 Me.lblRain.Text = "RainFall:" ' - 'ucrReceiverMaxtem - ' - Me.ucrReceiverMaxtem.AutoSize = True - Me.ucrReceiverMaxtem.frmParent = Me - Me.ucrReceiverMaxtem.Location = New System.Drawing.Point(267, 193) - Me.ucrReceiverMaxtem.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMaxtem.Name = "ucrReceiverMaxtem" - Me.ucrReceiverMaxtem.Selector = Nothing - Me.ucrReceiverMaxtem.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverMaxtem.strNcFilePath = "" - Me.ucrReceiverMaxtem.TabIndex = 71 - Me.ucrReceiverMaxtem.ucrSelector = Nothing - ' 'lblMaxtem ' Me.lblMaxtem.AutoSize = True @@ -163,19 +103,6 @@ Partial Class dlgClimograph Me.lblMaxtem.TabIndex = 70 Me.lblMaxtem.Text = "Temperature Max:" ' - 'ucrReceiverMintemp - ' - Me.ucrReceiverMintemp.AutoSize = True - Me.ucrReceiverMintemp.frmParent = Me - Me.ucrReceiverMintemp.Location = New System.Drawing.Point(267, 234) - Me.ucrReceiverMintemp.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMintemp.Name = "ucrReceiverMintemp" - Me.ucrReceiverMintemp.Selector = Nothing - Me.ucrReceiverMintemp.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverMintemp.strNcFilePath = "" - Me.ucrReceiverMintemp.TabIndex = 73 - Me.ucrReceiverMintemp.ucrSelector = Nothing - ' 'lblMintem ' Me.lblMintem.AutoSize = True @@ -223,65 +150,159 @@ Partial Class dlgClimograph Me.rdoWalterLieth.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoWalterLieth.UseVisualStyleBackColor = False ' - 'ucrPnlClimograph + 'lblMonth ' - Me.ucrPnlClimograph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlClimograph.Location = New System.Drawing.Point(107, 5) - Me.ucrPnlClimograph.Name = "ucrPnlClimograph" - Me.ucrPnlClimograph.Size = New System.Drawing.Size(236, 41) - Me.ucrPnlClimograph.TabIndex = 60 + Me.lblMonth.AutoSize = True + Me.lblMonth.Location = New System.Drawing.Point(267, 93) + Me.lblMonth.Name = "lblMonth" + Me.lblMonth.Size = New System.Drawing.Size(40, 13) + Me.lblMonth.TabIndex = 66 + Me.lblMonth.Text = "Month:" ' - 'ucrBase + 'lblFacet ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 374) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 75 + Me.lblFacet.AutoSize = True + Me.lblFacet.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFacet.Location = New System.Drawing.Point(267, 53) + Me.lblFacet.Name = "lblFacet" + Me.lblFacet.Size = New System.Drawing.Size(52, 13) + Me.lblFacet.TabIndex = 84 + Me.lblFacet.Tag = "" + Me.lblFacet.Text = "Facet By:" ' - 'ucrSave + 'lblRainC ' - Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(12, 347) - Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSave.Name = "ucrSave" - Me.ucrSave.Size = New System.Drawing.Size(282, 24) - Me.ucrSave.TabIndex = 74 + Me.lblRainC.AutoSize = True + Me.lblRainC.Location = New System.Drawing.Point(267, 134) + Me.lblRainC.Name = "lblRainC" + Me.lblRainC.Size = New System.Drawing.Size(48, 13) + Me.lblRainC.TabIndex = 89 + Me.lblRainC.Text = "RainFall:" ' - 'ucrReceiverMonth + 'lblElement1 ' - Me.ucrReceiverMonth.AutoSize = True - Me.ucrReceiverMonth.frmParent = Me - Me.ucrReceiverMonth.Location = New System.Drawing.Point(267, 109) - Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMonth.Name = "ucrReceiverMonth" - Me.ucrReceiverMonth.Selector = Nothing - Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverMonth.strNcFilePath = "" - Me.ucrReceiverMonth.TabIndex = 67 - Me.ucrReceiverMonth.ucrSelector = Nothing + Me.lblElement1.AutoSize = True + Me.lblElement1.Location = New System.Drawing.Point(267, 177) + Me.lblElement1.Name = "lblElement1" + Me.lblElement1.Size = New System.Drawing.Size(90, 13) + Me.lblElement1.TabIndex = 91 + Me.lblElement1.Text = "Element1 (TMax):" ' - 'lblMonth + 'lblElement2 ' - Me.lblMonth.AutoSize = True - Me.lblMonth.Location = New System.Drawing.Point(267, 93) - Me.lblMonth.Name = "lblMonth" - Me.lblMonth.Size = New System.Drawing.Size(40, 13) - Me.lblMonth.TabIndex = 66 - Me.lblMonth.Text = "Month:" + Me.lblElement2.AutoSize = True + Me.lblElement2.Location = New System.Drawing.Point(267, 218) + Me.lblElement2.Name = "lblElement2" + Me.lblElement2.Size = New System.Drawing.Size(87, 13) + Me.lblElement2.TabIndex = 93 + Me.lblElement2.Text = "Element2 (TMin):" ' - 'ucrSelectorClimograph + 'lblMonthC ' - Me.ucrSelectorClimograph.AutoSize = True - Me.ucrSelectorClimograph.bDropUnusedFilterLevels = False - Me.ucrSelectorClimograph.bShowHiddenColumns = False - Me.ucrSelectorClimograph.bUseCurrentFilter = True - Me.ucrSelectorClimograph.Location = New System.Drawing.Point(11, 48) - Me.ucrSelectorClimograph.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorClimograph.Name = "ucrSelectorClimograph" - Me.ucrSelectorClimograph.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorClimograph.TabIndex = 59 + Me.lblMonthC.AutoSize = True + Me.lblMonthC.Location = New System.Drawing.Point(267, 93) + Me.lblMonthC.Name = "lblMonthC" + Me.lblMonthC.Size = New System.Drawing.Size(40, 13) + Me.lblMonthC.TabIndex = 87 + Me.lblMonthC.Text = "Month:" + ' + 'lblName + ' + Me.lblName.AutoSize = True + Me.lblName.Location = New System.Drawing.Point(9, 399) + Me.lblName.Name = "lblName" + Me.lblName.Size = New System.Drawing.Size(38, 13) + Me.lblName.TabIndex = 100 + Me.lblName.Text = "Name:" + ' + 'lblLabel + ' + Me.lblLabel.AutoSize = True + Me.lblLabel.Location = New System.Drawing.Point(190, 399) + Me.lblLabel.Name = "lblLabel" + Me.lblLabel.Size = New System.Drawing.Size(41, 13) + Me.lblLabel.TabIndex = 102 + Me.lblLabel.Text = "Labels:" + ' + 'ucrChkText + ' + Me.ucrChkText.AutoSize = True + Me.ucrChkText.Checked = False + Me.ucrChkText.Location = New System.Drawing.Point(12, 335) + Me.ucrChkText.Name = "ucrChkText" + Me.ucrChkText.Size = New System.Drawing.Size(98, 24) + Me.ucrChkText.TabIndex = 104 + ' + 'ucrChkRibbon + ' + Me.ucrChkRibbon.AutoSize = True + Me.ucrChkRibbon.Checked = False + Me.ucrChkRibbon.Location = New System.Drawing.Point(12, 269) + Me.ucrChkRibbon.Name = "ucrChkRibbon" + Me.ucrChkRibbon.Size = New System.Drawing.Size(147, 24) + Me.ucrChkRibbon.TabIndex = 103 + ' + 'ucrInputLabels + ' + Me.ucrInputLabels.AddQuotesIfUnrecognised = True + Me.ucrInputLabels.AutoSize = True + Me.ucrInputLabels.IsMultiline = False + Me.ucrInputLabels.IsReadOnly = False + Me.ucrInputLabels.Location = New System.Drawing.Point(243, 394) + Me.ucrInputLabels.Name = "ucrInputLabels" + Me.ucrInputLabels.Size = New System.Drawing.Size(117, 21) + Me.ucrInputLabels.TabIndex = 101 + ' + 'ucrInputName + ' + Me.ucrInputName.AddQuotesIfUnrecognised = True + Me.ucrInputName.AutoSize = True + Me.ucrInputName.IsMultiline = False + Me.ucrInputName.IsReadOnly = False + Me.ucrInputName.Location = New System.Drawing.Point(62, 394) + Me.ucrInputName.Name = "ucrInputName" + Me.ucrInputName.Size = New System.Drawing.Size(117, 21) + Me.ucrInputName.TabIndex = 99 + ' + 'ucrChkColourIdntity + ' + Me.ucrChkColourIdntity.AutoSize = True + Me.ucrChkColourIdntity.Checked = False + Me.ucrChkColourIdntity.Location = New System.Drawing.Point(12, 369) + Me.ucrChkColourIdntity.Name = "ucrChkColourIdntity" + Me.ucrChkColourIdntity.Size = New System.Drawing.Size(98, 24) + Me.ucrChkColourIdntity.TabIndex = 98 + ' + 'ucrInputLegendPosition + ' + Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True + Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 + Me.ucrInputLegendPosition.IsReadOnly = False + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(112, 424) + Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" + Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) + Me.ucrInputLegendPosition.TabIndex = 97 + ' + 'ucrChkLegend + ' + Me.ucrChkLegend.AutoSize = True + Me.ucrChkLegend.Checked = False + Me.ucrChkLegend.Location = New System.Drawing.Point(12, 421) + Me.ucrChkLegend.Name = "ucrChkLegend" + Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) + Me.ucrChkLegend.TabIndex = 96 + ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.Location = New System.Drawing.Point(11, 234) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(148, 25) + Me.cmdOptions.TabIndex = 95 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' 'ucrInputFacet ' @@ -307,17 +328,6 @@ Partial Class dlgClimograph Me.ucrReceiverFacet.TabIndex = 85 Me.ucrReceiverFacet.ucrSelector = Nothing ' - 'lblFacet - ' - Me.lblFacet.AutoSize = True - Me.lblFacet.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFacet.Location = New System.Drawing.Point(267, 53) - Me.lblFacet.Name = "lblFacet" - Me.lblFacet.Size = New System.Drawing.Size(52, 13) - Me.lblFacet.TabIndex = 84 - Me.lblFacet.Tag = "" - Me.lblFacet.Text = "Facet By:" - ' 'ucrReceiverRainC ' Me.ucrReceiverRainC.AutoSize = True @@ -331,15 +341,6 @@ Partial Class dlgClimograph Me.ucrReceiverRainC.TabIndex = 90 Me.ucrReceiverRainC.ucrSelector = Nothing ' - 'lblRainC - ' - Me.lblRainC.AutoSize = True - Me.lblRainC.Location = New System.Drawing.Point(267, 134) - Me.lblRainC.Name = "lblRainC" - Me.lblRainC.Size = New System.Drawing.Size(48, 13) - Me.lblRainC.TabIndex = 89 - Me.lblRainC.Text = "RainFall:" - ' 'ucrReceiverElement1 ' Me.ucrReceiverElement1.AutoSize = True @@ -353,15 +354,6 @@ Partial Class dlgClimograph Me.ucrReceiverElement1.TabIndex = 92 Me.ucrReceiverElement1.ucrSelector = Nothing ' - 'lblElement1 - ' - Me.lblElement1.AutoSize = True - Me.lblElement1.Location = New System.Drawing.Point(267, 177) - Me.lblElement1.Name = "lblElement1" - Me.lblElement1.Size = New System.Drawing.Size(90, 13) - Me.lblElement1.TabIndex = 91 - Me.lblElement1.Text = "Element1 (TMax):" - ' 'ucrReceiverElement2 ' Me.ucrReceiverElement2.AutoSize = True @@ -375,15 +367,6 @@ Partial Class dlgClimograph Me.ucrReceiverElement2.TabIndex = 94 Me.ucrReceiverElement2.ucrSelector = Nothing ' - 'lblElement2 - ' - Me.lblElement2.AutoSize = True - Me.lblElement2.Location = New System.Drawing.Point(267, 218) - Me.lblElement2.Name = "lblElement2" - Me.lblElement2.Size = New System.Drawing.Size(87, 13) - Me.lblElement2.TabIndex = 93 - Me.lblElement2.Text = "Element2 (TMin):" - ' 'ucrReceiverMonthC ' Me.ucrReceiverMonthC.AutoSize = True @@ -397,100 +380,150 @@ Partial Class dlgClimograph Me.ucrReceiverMonthC.TabIndex = 88 Me.ucrReceiverMonthC.ucrSelector = Nothing ' - 'lblMonthC + 'ucrReceiverAbsolute ' - Me.lblMonthC.AutoSize = True - Me.lblMonthC.Location = New System.Drawing.Point(267, 93) - Me.lblMonthC.Name = "lblMonthC" - Me.lblMonthC.Size = New System.Drawing.Size(40, 13) - Me.lblMonthC.TabIndex = 87 - Me.lblMonthC.Text = "Month:" + Me.ucrReceiverAbsolute.AutoSize = True + Me.ucrReceiverAbsolute.frmParent = Me + Me.ucrReceiverAbsolute.Location = New System.Drawing.Point(267, 280) + Me.ucrReceiverAbsolute.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverAbsolute.Name = "ucrReceiverAbsolute" + Me.ucrReceiverAbsolute.Selector = Nothing + Me.ucrReceiverAbsolute.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverAbsolute.strNcFilePath = "" + Me.ucrReceiverAbsolute.TabIndex = 77 + Me.ucrReceiverAbsolute.ucrSelector = Nothing ' - 'cmdOptions + 'ucrInputStation ' - Me.cmdOptions.AutoSize = True - Me.cmdOptions.Location = New System.Drawing.Point(11, 234) - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(148, 25) - Me.cmdOptions.TabIndex = 95 - Me.cmdOptions.Tag = "Plot Options" - Me.cmdOptions.Text = "Plot Options" - Me.cmdOptions.UseVisualStyleBackColor = True + Me.ucrInputStation.AddQuotesIfUnrecognised = True + Me.ucrInputStation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputStation.GetSetSelectedIndex = -1 + Me.ucrInputStation.IsReadOnly = False + Me.ucrInputStation.Location = New System.Drawing.Point(379, 68) + Me.ucrInputStation.Name = "ucrInputStation" + Me.ucrInputStation.Size = New System.Drawing.Size(86, 21) + Me.ucrInputStation.TabIndex = 65 ' - 'ucrInputLegendPosition + 'ucr1stFactorReceiver ' - Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True - Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 - Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(112, 318) - Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" - Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) - Me.ucrInputLegendPosition.TabIndex = 97 + Me.ucr1stFactorReceiver.AutoSize = True + Me.ucr1stFactorReceiver.frmParent = Me + Me.ucr1stFactorReceiver.Location = New System.Drawing.Point(267, 68) + Me.ucr1stFactorReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucr1stFactorReceiver.Name = "ucr1stFactorReceiver" + Me.ucr1stFactorReceiver.Selector = Nothing + Me.ucr1stFactorReceiver.Size = New System.Drawing.Size(109, 26) + Me.ucr1stFactorReceiver.strNcFilePath = "" + Me.ucr1stFactorReceiver.TabIndex = 64 + Me.ucr1stFactorReceiver.ucrSelector = Nothing ' - 'ucrChkLegend + 'ucrReceiverRain ' - Me.ucrChkLegend.AutoSize = True - Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(12, 315) - Me.ucrChkLegend.Name = "ucrChkLegend" - Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) - Me.ucrChkLegend.TabIndex = 96 + Me.ucrReceiverRain.AutoSize = True + Me.ucrReceiverRain.frmParent = Me + Me.ucrReceiverRain.Location = New System.Drawing.Point(267, 150) + Me.ucrReceiverRain.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRain.Name = "ucrReceiverRain" + Me.ucrReceiverRain.Selector = Nothing + Me.ucrReceiverRain.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRain.strNcFilePath = "" + Me.ucrReceiverRain.TabIndex = 69 + Me.ucrReceiverRain.ucrSelector = Nothing ' - 'ucrChkColourIdntity + 'ucrReceiverMaxtem ' - Me.ucrChkColourIdntity.AutoSize = True - Me.ucrChkColourIdntity.Checked = False - Me.ucrChkColourIdntity.Location = New System.Drawing.Point(12, 265) - Me.ucrChkColourIdntity.Name = "ucrChkColourIdntity" - Me.ucrChkColourIdntity.Size = New System.Drawing.Size(98, 24) - Me.ucrChkColourIdntity.TabIndex = 98 + Me.ucrReceiverMaxtem.AutoSize = True + Me.ucrReceiverMaxtem.frmParent = Me + Me.ucrReceiverMaxtem.Location = New System.Drawing.Point(267, 193) + Me.ucrReceiverMaxtem.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMaxtem.Name = "ucrReceiverMaxtem" + Me.ucrReceiverMaxtem.Selector = Nothing + Me.ucrReceiverMaxtem.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMaxtem.strNcFilePath = "" + Me.ucrReceiverMaxtem.TabIndex = 71 + Me.ucrReceiverMaxtem.ucrSelector = Nothing ' - 'ucrInputName + 'ucrReceiverMintemp ' - Me.ucrInputName.AddQuotesIfUnrecognised = True - Me.ucrInputName.AutoSize = True - Me.ucrInputName.IsMultiline = False - Me.ucrInputName.IsReadOnly = False - Me.ucrInputName.Location = New System.Drawing.Point(62, 288) - Me.ucrInputName.Name = "ucrInputName" - Me.ucrInputName.Size = New System.Drawing.Size(117, 21) - Me.ucrInputName.TabIndex = 99 + Me.ucrReceiverMintemp.AutoSize = True + Me.ucrReceiverMintemp.frmParent = Me + Me.ucrReceiverMintemp.Location = New System.Drawing.Point(267, 234) + Me.ucrReceiverMintemp.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMintemp.Name = "ucrReceiverMintemp" + Me.ucrReceiverMintemp.Selector = Nothing + Me.ucrReceiverMintemp.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMintemp.strNcFilePath = "" + Me.ucrReceiverMintemp.TabIndex = 73 + Me.ucrReceiverMintemp.ucrSelector = Nothing ' - 'lblName + 'ucrPnlClimograph ' - Me.lblName.AutoSize = True - Me.lblName.Location = New System.Drawing.Point(9, 293) - Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(38, 13) - Me.lblName.TabIndex = 100 - Me.lblName.Text = "Name:" + Me.ucrPnlClimograph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlClimograph.Location = New System.Drawing.Point(107, 5) + Me.ucrPnlClimograph.Name = "ucrPnlClimograph" + Me.ucrPnlClimograph.Size = New System.Drawing.Size(236, 41) + Me.ucrPnlClimograph.TabIndex = 60 ' - 'lblLabel + 'ucrBase ' - Me.lblLabel.AutoSize = True - Me.lblLabel.Location = New System.Drawing.Point(190, 293) - Me.lblLabel.Name = "lblLabel" - Me.lblLabel.Size = New System.Drawing.Size(41, 13) - Me.lblLabel.TabIndex = 102 - Me.lblLabel.Text = "Labels:" + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(12, 480) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 75 ' - 'ucrInputLabels + 'ucrSave ' - Me.ucrInputLabels.AddQuotesIfUnrecognised = True - Me.ucrInputLabels.AutoSize = True - Me.ucrInputLabels.IsMultiline = False - Me.ucrInputLabels.IsReadOnly = False - Me.ucrInputLabels.Location = New System.Drawing.Point(243, 288) - Me.ucrInputLabels.Name = "ucrInputLabels" - Me.ucrInputLabels.Size = New System.Drawing.Size(117, 21) - Me.ucrInputLabels.TabIndex = 101 + Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSave.Location = New System.Drawing.Point(12, 453) + Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSave.Name = "ucrSave" + Me.ucrSave.Size = New System.Drawing.Size(282, 24) + Me.ucrSave.TabIndex = 74 + ' + 'ucrReceiverMonth + ' + Me.ucrReceiverMonth.AutoSize = True + Me.ucrReceiverMonth.frmParent = Me + Me.ucrReceiverMonth.Location = New System.Drawing.Point(267, 109) + Me.ucrReceiverMonth.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonth.Name = "ucrReceiverMonth" + Me.ucrReceiverMonth.Selector = Nothing + Me.ucrReceiverMonth.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMonth.strNcFilePath = "" + Me.ucrReceiverMonth.TabIndex = 67 + Me.ucrReceiverMonth.ucrSelector = Nothing + ' + 'ucrSelectorClimograph + ' + Me.ucrSelectorClimograph.AutoSize = True + Me.ucrSelectorClimograph.bDropUnusedFilterLevels = False + Me.ucrSelectorClimograph.bShowHiddenColumns = False + Me.ucrSelectorClimograph.bUseCurrentFilter = True + Me.ucrSelectorClimograph.Location = New System.Drawing.Point(11, 48) + Me.ucrSelectorClimograph.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorClimograph.Name = "ucrSelectorClimograph" + Me.ucrSelectorClimograph.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorClimograph.TabIndex = 59 + ' + 'ucrChkTile + ' + Me.ucrChkTile.AutoSize = True + Me.ucrChkTile.Checked = False + Me.ucrChkTile.Location = New System.Drawing.Point(11, 299) + Me.ucrChkTile.Name = "ucrChkTile" + Me.ucrChkTile.Size = New System.Drawing.Size(147, 24) + Me.ucrChkTile.TabIndex = 105 ' 'dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(472, 434) + Me.ClientSize = New System.Drawing.Size(472, 543) + Me.Controls.Add(Me.ucrChkTile) + Me.Controls.Add(Me.ucrChkText) + Me.Controls.Add(Me.ucrChkRibbon) Me.Controls.Add(Me.lblLabel) Me.Controls.Add(Me.ucrInputLabels) Me.Controls.Add(Me.lblName) @@ -578,4 +611,7 @@ Partial Class dlgClimograph Friend WithEvents ucrInputName As ucrInputTextBox Friend WithEvents lblLabel As Label Friend WithEvents ucrInputLabels As ucrInputTextBox + Friend WithEvents ucrChkRibbon As ucrCheck + Friend WithEvents ucrChkText As ucrCheck + Friend WithEvents ucrChkTile As ucrCheck End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 4cdad082cd3..7d6affc7c7e 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -53,9 +53,30 @@ Public Class dlgClimograph Private clsLabsFunction As New RFunction Private clsXlabFunction As New RFunction Private clsYlabFunction As New RFunction + Private clsSecondaryAxisFunction As New RFunction + Private clsSecondaryAxis1Function As New RFunction + Private clsSecondaryAxis2Function As New RFunction + Private clsLenthFunction As New RFunction + Private clsUniqueFunction As New RFunction + Private clsUnique1Function As New RFunction + Private clsSemicommaOperator As New ROperator + Private clsDollarOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsXScalecontinuousFunction As New RFunction Private clsYScalecontinuousFunction As New RFunction + Private clsGeomRibbonFunction As New RFunction + Private clsGeomTileFunction As New RFunction + Private clsAsNumericFunction As New RFunction + Private clsAesGeomRibbonFunction As New RFunction + Private clsGeomTextBarFunction As New RFunction + Private clsGeomTextTmaxFunction As New RFunction + Private ClsGeomTextTminFunction As New RFunction + Private clsRoundBarFunction As New RFunction + Private clsRoundTmaxFunction As New RFunction + Private ClsRoundTminFunction As New RFunction + Private clsAesGeomTextBarFunction As New RFunction + Private clsAesGeomTextTmaxFunction As New RFunction + Private ClsAesGeomTextTminFunction As New RFunction Private clsThemeFunction As New RFunction Private clsFacetVariablesOperator As New ROperator Private clsFacetRowOp1 As New ROperator @@ -194,7 +215,7 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkColourIdntity}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkColourIdntity, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkColourIdntity.SetText("Colour Identity") ucrChkColourIdntity.AddParameterValuesCondition(True, "checked", "True") @@ -218,6 +239,18 @@ Public Class dlgClimograph ucrChkLegend.AddParameterPresentCondition(True, "legend.position") ucrChkLegend.AddParameterPresentCondition(False, "legend.position", False) + ucrChkRibbon.SetText("Add Ribbon") + ucrChkRibbon.AddParameterValuesCondition(True, "checked", "True") + ucrChkRibbon.AddParameterValuesCondition(False, "checked", "False") + + ucrChkTile.SetText("Add Tile") + ucrChkTile.AddParameterValuesCondition(True, "checked", "True") + ucrChkTile.AddParameterValuesCondition(False, "checked", "False") + + ucrChkText.SetText("Add Label") + ucrChkText.AddParameterValuesCondition(True, "checked", "True") + ucrChkText.AddParameterValuesCondition(False, "checked", "False") + ucrSave.SetPrefix("wl_graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() @@ -232,12 +265,13 @@ Public Class dlgClimograph clsDummyFunction = New RFunction clsGroupByFunction = New RFunction clsPipeOperator = New ROperator - clsFacetFunction = New RFunction clsFacetOperator = New ROperator clsFacetRowOp = New ROperator clsFacetColOp = New ROperator - + clsGeomRibbonFunction = New RFunction + clsAsNumericFunction = New RFunction + clsAesGeomRibbonFunction = New RFunction clsGeomBarFunction = New RFunction clsGeomLineFunction = New RFunction clsGeomLineFunction1 = New RFunction @@ -247,6 +281,24 @@ Public Class dlgClimograph clsBarAesFunction = New RFunction clsFacetFunction1 = New RFunction clsScalecolouridentityFunction = New RFunction + clsSecondaryAxisFunction = New RFunction + clsSecondaryAxis1Function = New RFunction + clsSecondaryAxis2Function = New RFunction + clsLenthFunction = New RFunction + clsUnique1Function = New RFunction + clsUniqueFunction = New RFunction + clsGeomTextBarFunction = New RFunction + clsGeomTextTmaxFunction = New RFunction + ClsGeomTextTminFunction = New RFunction + clsAesGeomTextBarFunction = New RFunction + clsAesGeomTextTmaxFunction = New RFunction + ClsAesGeomTextTminFunction = New RFunction + clsRoundBarFunction = New RFunction + clsRoundTmaxFunction = New RFunction + ClsRoundTminFunction = New RFunction + clsGeomTileFunction = New RFunction + clsSemicommaOperator = New ROperator + clsDollarOperator = New ROperator clsFacetVariablesOperator = New ROperator clsFacetRowOp1 = New ROperator clsFacetColOp1 = New ROperator @@ -301,32 +353,109 @@ Public Class dlgClimograph clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") - clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) clsBarAesFunction.SetRCommand("aes") - clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) clsGeomBarFunction.SetRCommand("geom_bar") - clsGeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=0) - clsGeomBarFunction.AddParameter("alpha", "0.5", iPosition:=1) + clsGeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomBarFunction.AddParameter("alpha", "0.5", iPosition:=2) clsAesLineFunction.SetRCommand("aes") clsAesLineFunction.AddParameter("group", "1", iPosition:=1) - clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) clsAesLine1Function.SetRCommand("aes") clsAesLine1Function.AddParameter("group", "1", iPosition:=1) - clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) clsGeomLineFunction1.SetRCommand("geom_line") - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + + clsSecondaryAxisFunction.SetRCommand("sec_axis") + clsSecondaryAxisFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) + clsSecondaryAxisFunction.AddParameter("name", Chr(34) & "Rainfall (inches)" & Chr(34), iPosition:=1) + + clsSecondaryAxis1Function.SetRCommand("sec_axis") + clsSecondaryAxis1Function.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) + clsSecondaryAxis1Function.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) + + clsSecondaryAxis2Function.SetRCommand("sec_axis") + clsSecondaryAxis2Function.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) + clsSecondaryAxis2Function.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) + + clsLenthFunction.SetRCommand("length") + clsLenthFunction.AddParameter("x", clsRFunctionParameter:=clsUniqueFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsUniqueFunction.SetRCommand("unique") + clsUniqueFunction.AddParameter("x", clsROperatorParameter:=clsDollarOperator, bIncludeArgumentName:=False) + + clsUnique1Function.SetRCommand("unique") + clsUnique1Function.AddParameter("x", clsROperatorParameter:=clsDollarOperator, bIncludeArgumentName:=False) + + clsSemicommaOperator.SetOperation(":") + clsSemicommaOperator.AddParameter("left", "1", iPosition:=0, bIncludeArgumentName:=False) + clsSemicommaOperator.AddParameter("right", clsRFunctionParameter:=clsLenthFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsDollarOperator.SetOperation("$") + clsDollarOperator.bSpaceAroundOperation = False + clsDollarOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + clsDollarOperator.AddParameter("right", ucrReceiverMonthC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) + clsGeomRibbonFunction.SetRCommand("geom_ribbon") + + clsGeomTileFunction.SetRCommand("geom_tile") + clsGeomTileFunction.AddParameter("alpha", "0.5", iPosition:=0) + + clsAsNumericFunction.SetRCommand("as.numeric") + + clsAesGeomRibbonFunction.SetRCommand("aes") + + clsAesGeomTextBarFunction.SetRCommand("aes") + clsAesGeomTextBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) + clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) + + clsAesGeomTextTmaxFunction.SetRCommand("aes") + clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsAesGeomTextTmaxFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTmaxFunction, iPosition:=1) + + ClsAesGeomTextTminFunction.SetRCommand("aes") + ClsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + ClsAesGeomTextTminFunction.AddParameter("label", clsRFunctionParameter:=ClsRoundTminFunction, iPosition:=1) + + clsRoundBarFunction.SetRCommand("round") + clsRoundBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsRoundBarFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) + + clsRoundTmaxFunction.SetRCommand("round") + clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsRoundTmaxFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) + + ClsRoundTminFunction.SetRCommand("round") + ClsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + ClsRoundTminFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) + + clsGeomTextBarFunction.SetRCommand("geom_text") + clsGeomTextBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextBarFunction.AddParameter("vjust", "-0.5", iPosition:=1) + clsGeomTextBarFunction.AddParameter("size", "3", iPosition:=2) + + clsGeomTextTmaxFunction.SetRCommand("geom_text") + clsGeomTextTmaxFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextTmaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextTmaxFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) + clsGeomTextTmaxFunction.AddParameter("vjust", "-0.5", iPosition:=2) + clsGeomTextTmaxFunction.AddParameter("size", "3", iPosition:=3) + clsGeomTextTmaxFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) + + ClsGeomTextTminFunction.SetRCommand("geom_text") + ClsGeomTextTminFunction.AddParameter("mapping", clsRFunctionParameter:=ClsAesGeomTextTminFunction, iPosition:=0, bIncludeArgumentName:=False) + ClsGeomTextTminFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) + ClsGeomTextTminFunction.AddParameter("vjust", "1.5", iPosition:=2) + ClsGeomTextTminFunction.AddParameter("size", "3", iPosition:=3) + ClsGeomTextTminFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) + clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) @@ -335,7 +464,7 @@ Public Class dlgClimograph clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() clsXScalecontinuousFunction = GgplotDefaults.clsXScalecontinuousFunction.Clone() - clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone + clsYScalecontinuousFunction = GgplotDefaults.clsYScalecontinuousFunction.Clone() clsRFacetFunction = GgplotDefaults.clsFacetFunction.Clone() clsBaseOperator.AddParameter(GgplotDefaults.clsDefaultThemeParameter.Clone()) clsCoordPolarStartOperator = GgplotDefaults.clsCoordPolarStartOperator.Clone() @@ -348,15 +477,21 @@ Public Class dlgClimograph clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction + clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub Private Sub SetRCodeForControls(bReset) ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverRainC.AddAdditionalCodeParameterPair(clsRoundBarFunction, New RParameter("y", 1), iAdditionalPairNo:=1) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsAesGeomTextTmaxFunction, New RParameter("y", 0), iAdditionalPairNo:=1) + ucrReceiverElement2.AddAdditionalCodeParameterPair(ClsAesGeomTextTminFunction, New RParameter("y", 0), iAdditionalPairNo:=1) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsRoundTmaxFunction, New RParameter("y", 0, False), iAdditionalPairNo:=2) + ucrReceiverElement2.AddAdditionalCodeParameterPair(ClsRoundTminFunction, New RParameter("y", 0, False), iAdditionalPairNo:=2) + ucrReceiverRainC.SetRCode(clsAesGeomTextBarFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) - ucrReceiverRainC.SetRCode(clsBarAesFunction, bReset) - ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) ucrReceiverElement2.SetRCode(clsAesLine1Function, bReset) ucrReceiverElement1.SetRCode(clsAesLineFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) @@ -368,15 +503,18 @@ Public Class dlgClimograph ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then + ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) ucrChkColourIdntity.SetRCode(clsScalecolouridentityFunction, bReset) + ucrChkRibbon.SetRCode(clsGeomRibbonFunction, bReset) + ucrChkTile.SetRCode(clsGeomTileFunction, bReset) ucrInputName.SetRCode(clsScalecolouridentityFunction, bReset) ucrInputLabels.SetRCode(clsScalecolouridentityFunction, bReset) End If End Sub Private Sub TestOKEnabled() - If rdoClimograph.Checked AndAlso ((Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty AndAlso Not ucrReceiverMonthC.IsEmpty AndAlso Not ucrReceiverRainC.IsEmpty) OrElse Not ucrSave.IsComplete) Then + If rdoClimograph.Checked AndAlso Not ucrReceiverMonthC.IsEmpty AndAlso ((Not ucrReceiverElement1.IsEmpty OrElse Not ucrReceiverElement2.IsEmpty OrElse Not ucrReceiverRainC.IsEmpty) OrElse Not ucrSave.IsComplete) Then ucrBase.OKEnabled(True) ElseIf rdoWalterLieth.Checked AndAlso ((Not ucrReceiverAbsolute.IsEmpty AndAlso Not ucrReceiverMaxtem.IsEmpty AndAlso Not ucrReceiverMintemp.IsEmpty AndAlso Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverRain.IsEmpty) OrElse Not ucrSave.IsComplete) Then ucrBase.OKEnabled(True) @@ -397,9 +535,18 @@ Public Class dlgClimograph ucrReceiverMonth.SetMeAsReceiver() clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) End If - AddGeomLine() - Identity() AutoFacetStation() + AddRemoveFacetClimograph() + AddRemoveFacetsWalterLieth() + AddRemoveGeomBar() + AddRemoveGeomLine1() + AddRemoveGeomLines() + AddRemoveSecondaryAxis() + AddRemoveGeomRibbon() + AddRemoveGeomTextBar() + AddRemoveGeomTextTmax() + AddRemoveGeomTextTmin() + EnableTileAndRibbon() End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -513,12 +660,19 @@ Public Class dlgClimograph End If End Sub - Private Sub ucrReceiverFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacet.ControlValueChanged - If Not ucrReceiverFacet.IsEmpty Then - clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction1) + Private Sub AddRemoveFacetClimograph() + If rdoClimograph.Checked Then + If Not ucrReceiverFacet.IsEmpty Then + clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction1) + Else + clsBaseOperator.RemoveParameterByName("facets") + End If Else clsBaseOperator.RemoveParameterByName("facets") End If + End Sub + Private Sub ucrReceiverFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFacet.ControlValueChanged + AddRemoveFacetClimograph() AddRemoveFacets1() AddRemoveGroupBy1() End Sub @@ -634,7 +788,7 @@ Public Class dlgClimograph End If If bWrap OrElse bRow OrElse bCol Then - clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + clsBaseOperator.AddParameter("facets1", clsRFunctionParameter:=clsFacetFunction) End If If bWrap Then clsFacetFunction.SetRCommand("facet_wrap") @@ -658,13 +812,21 @@ Public Class dlgClimograph End If End Sub - Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged - If Not ucr1stFactorReceiver.IsEmpty Then - clsGgwalterliethFunction.AddParameter("station", ucr1stFactorReceiver.GetVariableNames(), iPosition:=1) + Private Sub AddRemoveFacetsWalterLieth() + If rdoWalterLieth.Checked Then + If Not ucr1stFactorReceiver.IsEmpty Then + clsGgwalterliethFunction.AddParameter("station", ucr1stFactorReceiver.GetVariableNames(), iPosition:=1) + Else + clsGgwalterliethFunction.RemoveParameterByName("station") + clsBaseOperator.RemoveParameterByName("facets1") + End If Else - clsGgwalterliethFunction.RemoveParameterByName("station") - clsBaseOperator.RemoveParameterByName("facets") + clsBaseOperator.RemoveParameterByName("facets1") End If + End Sub + + Private Sub ucr1stFactorReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucr1stFactorReceiver.ControlValueChanged + AddRemoveFacetsWalterLieth() AddRemoveFacets() AddRemoveGroupBy() End Sub @@ -693,6 +855,7 @@ Public Class dlgClimograph AutoFacetStation() SetPipeAssignTo() SetPipeAssignTo1() + AddRemoveGeomRibbon() End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -740,64 +903,262 @@ Public Class dlgClimograph End If End Sub - Private Sub AddGeomLine() + Private Sub ucrReceiverElement1_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement1.ControlValueChanged + AddRemoveSecondaryAxis() + AddRemoveGeomLines() + AddRemoveGeomRibbon() + AddRemoveGeomTextTmax() + EnableTileAndRibbon() + End Sub + + Private Sub AddRemoveTheme() + If clsThemeFunction.iParameterCount > 0 Then + clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Else + clsBaseOperator.RemoveParameterByName("theme") + End If + End Sub + + Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged + AddRemoveTheme() + End Sub + + Private Sub ucrChkColourIdntity_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColourIdntity.ControlValueChanged, ucrInputName.ControlValueChanged, ucrInputLabels.ControlValueChanged + AddRemoveGeomLines() + AddRemoveGeomLine1() + End Sub + + Private Sub AddRemoveGeomTextBar() If rdoClimograph.Checked Then - If Not ucrReceiverElement1.IsEmpty Then - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=2) + If ucrChkText.Checked Then + If Not ucrReceiverRainC.IsEmpty Then + clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextBarFunction, iPosition:=5, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_text") + End If Else - clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_text") End If - If Not ucrReceiverElement1.IsEmpty Then - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=3) + Else + clsBaseOperator.RemoveParameterByName("geom_text") + End If + End Sub + + Private Sub AddRemoveGeomTextTmax() + If rdoClimograph.Checked Then + If ucrChkText.Checked Then + If Not ucrReceiverElement1.IsEmpty Then + clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_text1") + End If Else - clsBaseOperator.RemoveParameterByName("geom_line1") + clsBaseOperator.RemoveParameterByName("geom_text1") End If Else - clsBaseOperator.RemoveParameterByName("geom_line") - clsBaseOperator.RemoveParameterByName("geom_line1") + clsBaseOperator.RemoveParameterByName("geom_text1") End If End Sub - Private Sub ucrReceiverElement1_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement1.ControlValueChanged - AddGeomLine() + Private Sub AddRemoveGeomTextTmin() + If rdoClimograph.Checked Then + If ucrChkText.Checked Then + If Not ucrReceiverElement2.IsEmpty Then + clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=ClsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) + Else + clsBaseOperator.RemoveParameterByName("geom_text2") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_text2") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_text2") + End If End Sub - Private Sub AddRemoveTheme() - If clsThemeFunction.iParameterCount > 0 Then - clsBaseOperator.AddParameter("theme", clsRFunctionParameter:=clsThemeFunction, iPosition:=15) + Private Sub AddRemoveGeomRibbon() + If rdoClimograph.Checked Then + If ucrChkRibbon.Checked Then + clsAsNumericFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) + clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) + clsGeomRibbonFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomRibbonFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomRibbonFunction.AddParameter("fill", Chr(34) & "#000000" & Chr(34), iPosition:=1) + clsGeomRibbonFunction.AddParameter("alpha", "0.2", iPosition:=2) + clsXScalecontinuousFunction.AddParameter("name", Chr(34) & "Month" & Chr(34), iPosition:=0) + clsXScalecontinuousFunction.AddParameter("breaks", clsROperatorParameter:=clsSemicommaOperator, iPosition:=1) + clsXScalecontinuousFunction.AddParameter("labels", clsRFunctionParameter:=clsUnique1Function, iPosition:=2) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) + clsBaseOperator.AddParameter("scale_x_continuous", clsRFunctionParameter:=clsXScalecontinuousFunction, iPosition:=12) + Else + clsBarAesFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("scale_x_continuous") + End If Else - clsBaseOperator.RemoveParameterByName("theme") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("scale_x_continuous") End If End Sub - Private Sub ucrChkLegend_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkLegend.ControlValueChanged, ucrInputLegendPosition.ControlValueChanged - AddRemoveTheme() + Private Sub ucrChkTile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTile.ControlValueChanged + AddRemoveGeomBar() + EnableTileAndRibbon() End Sub - Private Sub Identity() + Private Sub ucrChkRibbon_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkRibbon.ControlValueChanged + AddRemoveGeomRibbon() + EnableTileAndRibbon() + End Sub + + Private Sub AddRemoveGeomLines() If rdoClimograph.Checked Then - If ucrChkColourIdntity.Checked Then - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + If Not ucrReceiverElement1.IsEmpty Then + If ucrChkColourIdntity.Checked Then + clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsAesLineFunction.RemoveParameterByName("colour") End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsBaseOperator.RemoveParameterByName("geom_line") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + End If + End Sub + + Private Sub AddRemoveGeomLine1() + If rdoClimograph.Checked Then + If Not ucrReceiverElement2.IsEmpty Then + If ucrChkColourIdntity.Checked Then + clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If Else - clsScalecolouridentityFunction.RemoveParameterByName("name") + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsAesLine1Function.RemoveParameterByName("colour") End If Else - clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsBaseOperator.RemoveParameterByName("geom_line1") End If Else clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsBaseOperator.RemoveParameterByName("geom_line1") End If End Sub - Private Sub ucrChkColourIdntity_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColourIdntity.ControlValueChanged, ucrInputName.ControlValueChanged, ucrInputLabels.ControlValueChanged - Identity() + Private Sub AddRemoveGeomBar() + If rdoClimograph.Checked Then + If Not ucrReceiverRainC.IsEmpty Then + clsLabsFunction.AddParameter("fill", Chr(34) & "Rainfall" & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabsFunction, iPosition:=13) + If ucrChkTile.Checked Then + clsBarAesFunction.AddParameter("fill", ucrReceiverRainC.GetVariableNames(False), iPosition:=3) + clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_tile", clsRFunctionParameter:=clsGeomTileFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + Else + clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) + clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=2) + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + clsBaseOperator.RemoveParameterByName("geom_tile") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + End If + End Sub + + Private Sub EnableTileAndRibbon() + ucrChkRibbon.Enabled = (Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty) AndAlso Not ucrChkTile.Checked + ucrChkTile.Enabled = Not ucrChkRibbon.Checked AndAlso Not ucrReceiverRainC.IsEmpty + End Sub + + Private Sub AddRemoveSecondaryAxis() + If rdoClimograph.Checked Then + If Not ucrReceiverRainC.IsEmpty Then + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + Else + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis1Function, iPosition:=1) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + End If + Else + clsBaseOperator.RemoveParameterByName("scale_y_continuous") + End If + End Sub + + Private Sub ucrReceiverElement2_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement2.ControlValueChanged + AddRemoveSecondaryAxis() + AddRemoveGeomLine1() + AddRemoveGeomRibbon() + AddRemoveGeomTextTmin() + EnableTileAndRibbon() + End Sub + + Private Sub ucrReceiverRainC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainC.ControlValueChanged + AddRemoveSecondaryAxis() + AddRemoveGeomBar() + AddRemoveGeomTextBar() + EnableTileAndRibbon() + End Sub + + Private Sub ucrReceiverMonthC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthC.ControlValueChanged + AddRemoveGeomRibbon() + AddRemoveGeomBar() + End Sub + + Private Sub ucrSelectorClimograph_DataFrameChanged() Handles ucrSelectorClimograph.DataFrameChanged + AddRemoveGeomRibbon() + End Sub + + Private Sub ucrChkText_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkText.ControlValueChanged + AddRemoveGeomTextBar() + AddRemoveGeomTextTmax() + AddRemoveGeomTextTmin() End Sub Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged From af6b6e5a41b0ac3b6b1ca1ff730951881c07fb31 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 29 May 2024 17:29:35 +0300 Subject: [PATCH 035/273] Spanners design additons --- instat/UserTables/sdgTableOptions.Designer.vb | 39 ++- instat/UserTables/sdgTableOptions.resx | 12 - instat/UserTables/sdgTableOptions.vb | 2 +- .../UserTables/ucrColumnFormats.Designer.vb | 214 ++++++++++++++ instat/UserTables/ucrColumnFormats.resx | 129 +++++++++ instat/UserTables/ucrColumnFormats.vb | 3 + .../UserTables/ucrColumnSpanners.Designer.vb | 265 ++++++++++++++++++ instat/UserTables/ucrColumnSpanners.resx | 132 +++++++++ instat/UserTables/ucrColumnSpanners.vb | 3 + instat/UserTables/ucrColumns.Designer.vb | 241 ++++------------ instat/UserTables/ucrColumns.resx | 9 - instat/UserTables/ucrColumns.vb | 2 + instat/UserTables/ucrRowGroup.Designer.vb | 162 +++-------- instat/UserTables/ucrRowGroup.resx | 9 + instat/UserTables/ucrRowGroup.vb | 1 + instat/UserTables/ucrRowSummary.Designer.vb | 37 +++ instat/UserTables/ucrRowSummary.resx | 120 ++++++++ instat/UserTables/ucrRowSummary.vb | 3 + instat/UserTables/ucrRows.Designer.vb | 100 ++++++- instat/UserTables/ucrRows.resx | 120 ++++++++ instat/UserTables/ucrRows.vb | 5 + instat/instat.vbproj | 30 ++ 22 files changed, 1293 insertions(+), 345 deletions(-) create mode 100644 instat/UserTables/ucrColumnFormats.Designer.vb create mode 100644 instat/UserTables/ucrColumnFormats.resx create mode 100644 instat/UserTables/ucrColumnFormats.vb create mode 100644 instat/UserTables/ucrColumnSpanners.Designer.vb create mode 100644 instat/UserTables/ucrColumnSpanners.resx create mode 100644 instat/UserTables/ucrColumnSpanners.vb create mode 100644 instat/UserTables/ucrRowSummary.Designer.vb create mode 100644 instat/UserTables/ucrRowSummary.resx create mode 100644 instat/UserTables/ucrRowSummary.vb create mode 100644 instat/UserTables/ucrRows.resx diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 29db43a1ef5..eaaea661550 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -26,7 +26,7 @@ Partial Class sdgTableOptions Me.tbpHeader = New System.Windows.Forms.TabPage() Me.ucrHeaderOptions = New instat.ucrHeader() Me.tbpRows = New System.Windows.Forms.TabPage() - Me.UcrRowGroup1 = New instat.ucrRowGroup() + Me.ucrRows = New instat.ucrRows() Me.tbpColumns = New System.Windows.Forms.TabPage() Me.UcrColumns1 = New instat.ucrColumns() Me.tbpCells = New System.Windows.Forms.TabPage() @@ -66,7 +66,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(682, 321) + Me.tbpFormatOptions.Size = New System.Drawing.Size(779, 350) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -75,7 +75,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(648, 268) + Me.tbpHeader.Size = New System.Drawing.Size(771, 295) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -89,28 +89,27 @@ Partial Class sdgTableOptions ' 'tbpRows ' - Me.tbpRows.Controls.Add(Me.UcrRowGroup1) + Me.tbpRows.Controls.Add(Me.ucrRows) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(674, 295) + Me.tbpRows.Size = New System.Drawing.Size(771, 295) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True ' - 'UcrRowGroup1 + 'ucrRows ' - Me.UcrRowGroup1.Location = New System.Drawing.Point(8, 4) - Me.UcrRowGroup1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.UcrRowGroup1.Name = "UcrRowGroup1" - Me.UcrRowGroup1.Size = New System.Drawing.Size(659, 286) - Me.UcrRowGroup1.TabIndex = 0 + Me.ucrRows.Location = New System.Drawing.Point(7, 9) + Me.ucrRows.Name = "ucrRows" + Me.ucrRows.Size = New System.Drawing.Size(750, 237) + Me.ucrRows.TabIndex = 0 ' 'tbpColumns ' Me.tbpColumns.Controls.Add(Me.UcrColumns1) Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(648, 268) + Me.tbpColumns.Size = New System.Drawing.Size(771, 324) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True @@ -119,7 +118,7 @@ Partial Class sdgTableOptions ' Me.UcrColumns1.Location = New System.Drawing.Point(5, 6) Me.UcrColumns1.Name = "UcrColumns1" - Me.UcrColumns1.Size = New System.Drawing.Size(627, 239) + Me.UcrColumns1.Size = New System.Drawing.Size(658, 308) Me.UcrColumns1.TabIndex = 0 ' 'tbpCells @@ -128,7 +127,7 @@ Partial Class sdgTableOptions Me.tbpCells.Controls.Add(Me.lblFooterCellNotes) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(648, 268) + Me.tbpCells.Size = New System.Drawing.Size(771, 295) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True @@ -191,7 +190,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 268) + Me.tbpSourceNotes.Size = New System.Drawing.Size(771, 295) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -213,7 +212,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(648, 268) + Me.tbpThemes.Size = New System.Drawing.Size(771, 295) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -273,17 +272,17 @@ Partial Class sdgTableOptions 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(195, 330) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(263, 355) Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(254, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(697, 367) + Me.ClientSize = New System.Drawing.Size(788, 389) Me.Controls.Add(Me.tbpFormatOptions) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -324,8 +323,8 @@ Partial Class sdgTableOptions Friend WithEvents colFooterFormat As DataGridViewButtonColumn Friend WithEvents ucrSourceNotes As ucrSourceNotes Friend WithEvents tbpRows As TabPage - Friend WithEvents UcrRowGroup1 As ucrRowGroup Friend WithEvents ucrHeaderOptions As ucrHeader Friend WithEvents tbpColumns As TabPage Friend WithEvents UcrColumns1 As ucrColumns + Friend WithEvents ucrRows As ucrRows End Class diff --git a/instat/UserTables/sdgTableOptions.resx b/instat/UserTables/sdgTableOptions.resx index 0801bc20640..418e7a89629 100644 --- a/instat/UserTables/sdgTableOptions.resx +++ b/instat/UserTables/sdgTableOptions.resx @@ -129,16 +129,4 @@ True - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index cf85bf302de..2f1c54c8301 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -64,7 +64,7 @@ Public Class sdgTableOptions clsOperator = clsNewOperator ucrHeaderOptions.Setup(clsOperator) - UcrRowGroup1.Setup("survey", clsOperator) + ucrRows.Setup("survey", clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) ucrSourceNotes.Setup(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) diff --git a/instat/UserTables/ucrColumnFormats.Designer.vb b/instat/UserTables/ucrColumnFormats.Designer.vb new file mode 100644 index 00000000000..1b182985adb --- /dev/null +++ b/instat/UserTables/ucrColumnFormats.Designer.vb @@ -0,0 +1,214 @@ + _ +Partial Class ucrColumnFormats + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblGroupCondition = New System.Windows.Forms.Label() + Me.lblGroups = New System.Windows.Forms.Label() + Me.ucrLogicalCombobox = New instat.ucrInputComboBox() + Me.btnClearGroups = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() + Me.ucrFilterOperation = New instat.ucrInputComboBox() + Me.btnAddGroupCondition = New System.Windows.Forms.Button() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGridGroups = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblGroupCondition + ' + Me.lblGroupCondition.AutoSize = True + Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupCondition.Location = New System.Drawing.Point(381, 2) + Me.lblGroupCondition.Name = "lblGroupCondition" + Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) + Me.lblGroupCondition.TabIndex = 298 + Me.lblGroupCondition.Text = "Condition:" + ' + 'lblGroups + ' + Me.lblGroups.AutoSize = True + Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroups.Location = New System.Drawing.Point(259, 92) + Me.lblGroups.Name = "lblGroups" + Me.lblGroups.Size = New System.Drawing.Size(47, 13) + Me.lblGroups.TabIndex = 297 + Me.lblGroups.Text = "Formats:" + ' + 'ucrLogicalCombobox + ' + Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True + Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 + Me.ucrLogicalCombobox.IsReadOnly = False + Me.ucrLogicalCombobox.Location = New System.Drawing.Point(456, 21) + Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" + Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) + Me.ucrLogicalCombobox.TabIndex = 296 + ' + 'btnClearGroups + ' + Me.btnClearGroups.Enabled = False + Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearGroups.Location = New System.Drawing.Point(543, 87) + Me.btnClearGroups.Name = "btnClearGroups" + Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) + Me.btnClearGroups.TabIndex = 295 + Me.btnClearGroups.Tag = "" + Me.btnClearGroups.Text = "Clear" + Me.btnClearGroups.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(259, 5) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 294 + Me.lblColumns.Text = "Column:" + ' + 'ucrFilterByReceiver + ' + Me.ucrFilterByReceiver.AutoSize = True + Me.ucrFilterByReceiver.frmParent = Nothing + Me.ucrFilterByReceiver.Location = New System.Drawing.Point(256, 21) + Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" + Me.ucrFilterByReceiver.Selector = Nothing + Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) + Me.ucrFilterByReceiver.strNcFilePath = "" + Me.ucrFilterByReceiver.TabIndex = 291 + Me.ucrFilterByReceiver.ucrSelector = Nothing + ' + 'ucrFilterOperation + ' + Me.ucrFilterOperation.AddQuotesIfUnrecognised = True + Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrFilterOperation.GetSetSelectedIndex = -1 + Me.ucrFilterOperation.IsReadOnly = False + Me.ucrFilterOperation.Location = New System.Drawing.Point(377, 21) + Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrFilterOperation.Name = "ucrFilterOperation" + Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) + Me.ucrFilterOperation.TabIndex = 293 + ' + 'btnAddGroupCondition + ' + Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddGroupCondition.Location = New System.Drawing.Point(256, 42) + Me.btnAddGroupCondition.Name = "btnAddGroupCondition" + Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) + Me.btnAddGroupCondition.TabIndex = 292 + Me.btnAddGroupCondition.Tag = "" + Me.btnAddGroupCondition.Text = "Add" + Me.btnAddGroupCondition.UseVisualStyleBackColor = True + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 5) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 290 + ' + 'dataGridGroups + ' + Me.dataGridGroups.AllowUserToAddRows = False + Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) + Me.dataGridGroups.Location = New System.Drawing.Point(262, 112) + Me.dataGridGroups.Name = "dataGridGroups" + Me.dataGridGroups.RowHeadersWidth = 62 + Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) + Me.dataGridGroups.TabIndex = 289 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 58 + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 76 + ' + 'colFormat + ' + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 + ' + 'ucrColumnFormats + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblGroupCondition) + Me.Controls.Add(Me.lblGroups) + Me.Controls.Add(Me.ucrLogicalCombobox) + Me.Controls.Add(Me.btnClearGroups) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.ucrFilterByReceiver) + Me.Controls.Add(Me.ucrFilterOperation) + Me.Controls.Add(Me.btnAddGroupCondition) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridGroups) + Me.Name = "ucrColumnFormats" + Me.Size = New System.Drawing.Size(631, 194) + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblGroupCondition As Label + Friend WithEvents lblGroups As Label + Friend WithEvents ucrLogicalCombobox As ucrInputComboBox + Friend WithEvents btnClearGroups As Button + Friend WithEvents lblColumns As Label + Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle + Friend WithEvents ucrFilterOperation As ucrInputComboBox + Friend WithEvents btnAddGroupCondition As Button + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGridGroups As DataGridView + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colFormat As DataGridViewButtonColumn +End Class diff --git a/instat/UserTables/ucrColumnFormats.resx b/instat/UserTables/ucrColumnFormats.resx new file mode 100644 index 00000000000..f4b4b7d5a34 --- /dev/null +++ b/instat/UserTables/ucrColumnFormats.resx @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrColumnFormats.vb b/instat/UserTables/ucrColumnFormats.vb new file mode 100644 index 00000000000..22c93a184ca --- /dev/null +++ b/instat/UserTables/ucrColumnFormats.vb @@ -0,0 +1,3 @@ +Public Class ucrColumnFormats + +End Class diff --git a/instat/UserTables/ucrColumnSpanners.Designer.vb b/instat/UserTables/ucrColumnSpanners.Designer.vb new file mode 100644 index 00000000000..d16134a7a6b --- /dev/null +++ b/instat/UserTables/ucrColumnSpanners.Designer.vb @@ -0,0 +1,265 @@ + _ +Partial Class ucrColumnSpanners + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblGroups = New System.Windows.Forms.Label() + Me.btnClearGroups = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.btnAddGroupCondition = New System.Windows.Forms.Button() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGridGroups = New System.Windows.Forms.DataGridView() + Me.UcrReceiverMultiple1 = New instat.ucrReceiverMultiple() + Me.lblCondition = New System.Windows.Forms.Label() + Me.txtGroupLabel = New System.Windows.Forms.TextBox() + Me.cboConditionOperator = New System.Windows.Forms.ComboBox() + Me.lblGroupCondition = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colValue = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblGroups + ' + Me.lblGroups.AutoSize = True + Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroups.Location = New System.Drawing.Point(245, 169) + Me.lblGroups.Name = "lblGroups" + Me.lblGroups.Size = New System.Drawing.Size(55, 13) + Me.lblGroups.TabIndex = 297 + Me.lblGroups.Text = "Spanners:" + ' + 'btnClearGroups + ' + Me.btnClearGroups.Enabled = False + Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearGroups.Location = New System.Drawing.Point(534, 162) + Me.btnClearGroups.Name = "btnClearGroups" + Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) + Me.btnClearGroups.TabIndex = 295 + Me.btnClearGroups.Tag = "" + Me.btnClearGroups.Text = "Clear" + Me.btnClearGroups.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(245, 5) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(56, 13) + Me.lblColumns.TabIndex = 294 + Me.lblColumns.Text = "Column(s):" + ' + 'btnAddGroupCondition + ' + Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddGroupCondition.Location = New System.Drawing.Point(472, 20) + Me.btnAddGroupCondition.Name = "btnAddGroupCondition" + Me.btnAddGroupCondition.Size = New System.Drawing.Size(99, 23) + Me.btnAddGroupCondition.TabIndex = 292 + Me.btnAddGroupCondition.Tag = "" + Me.btnAddGroupCondition.Text = "Add" + Me.btnAddGroupCondition.UseVisualStyleBackColor = True + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 5) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 290 + ' + 'dataGridGroups + ' + Me.dataGridGroups.AllowUserToAddRows = False + Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colValue, Me.colFormat}) + Me.dataGridGroups.Location = New System.Drawing.Point(240, 189) + Me.dataGridGroups.Name = "dataGridGroups" + Me.dataGridGroups.RowHeadersWidth = 62 + Me.dataGridGroups.Size = New System.Drawing.Size(369, 73) + Me.dataGridGroups.TabIndex = 289 + ' + 'UcrReceiverMultiple1 + ' + Me.UcrReceiverMultiple1.AutoSize = True + Me.UcrReceiverMultiple1.frmParent = Nothing + Me.UcrReceiverMultiple1.Location = New System.Drawing.Point(240, 21) + Me.UcrReceiverMultiple1.Margin = New System.Windows.Forms.Padding(0) + Me.UcrReceiverMultiple1.Name = "UcrReceiverMultiple1" + Me.UcrReceiverMultiple1.Selector = Nothing + Me.UcrReceiverMultiple1.Size = New System.Drawing.Size(120, 78) + Me.UcrReceiverMultiple1.strNcFilePath = "" + Me.UcrReceiverMultiple1.TabIndex = 299 + Me.UcrReceiverMultiple1.ucrSelector = Nothing + ' + 'lblCondition + ' + Me.lblCondition.AutoSize = True + Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCondition.Location = New System.Drawing.Point(370, 5) + Me.lblCondition.Name = "lblCondition" + Me.lblCondition.Size = New System.Drawing.Size(79, 13) + Me.lblCondition.TabIndex = 301 + Me.lblCondition.Text = "Spanner Label:" + ' + 'txtGroupLabel + ' + Me.txtGroupLabel.Location = New System.Drawing.Point(368, 23) + Me.txtGroupLabel.Name = "txtGroupLabel" + Me.txtGroupLabel.Size = New System.Drawing.Size(100, 20) + Me.txtGroupLabel.TabIndex = 300 + ' + 'cboConditionOperator + ' + Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboConditionOperator.FormattingEnabled = True + Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) + Me.cboConditionOperator.Location = New System.Drawing.Point(240, 132) + Me.cboConditionOperator.Name = "cboConditionOperator" + Me.cboConditionOperator.Size = New System.Drawing.Size(120, 21) + Me.cboConditionOperator.TabIndex = 303 + ' + 'lblGroupCondition + ' + Me.lblGroupCondition.AutoSize = True + Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupCondition.Location = New System.Drawing.Point(245, 115) + Me.lblGroupCondition.Name = "lblGroupCondition" + Me.lblGroupCondition.Size = New System.Drawing.Size(62, 13) + Me.lblGroupCondition.TabIndex = 302 + Me.lblGroupCondition.Text = "Spanner Id:" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(370, 115) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(79, 13) + Me.Label1.TabIndex = 305 + Me.Label1.Text = "Spanner Label:" + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(368, 133) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(100, 20) + Me.TextBox1.TabIndex = 304 + ' + 'Button1 + ' + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.Button1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Button1.Location = New System.Drawing.Point(474, 130) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(99, 23) + Me.Button1.TabIndex = 306 + Me.Button1.Tag = "" + Me.Button1.Text = "Add" + Me.Button1.UseVisualStyleBackColor = True + ' + 'colId + ' + Me.colId.HeaderText = "ID" + Me.colId.Name = "colId" + Me.colId.ReadOnly = True + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 58 + ' + 'colValue + ' + Me.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colValue.HeaderText = "Value" + Me.colValue.MinimumWidth = 8 + Me.colValue.Name = "colValue" + Me.colValue.Width = 59 + ' + 'colFormat + ' + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 + ' + 'ucrColumnSpanners + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.TextBox1) + Me.Controls.Add(Me.cboConditionOperator) + Me.Controls.Add(Me.lblGroupCondition) + Me.Controls.Add(Me.lblCondition) + Me.Controls.Add(Me.txtGroupLabel) + Me.Controls.Add(Me.UcrReceiverMultiple1) + Me.Controls.Add(Me.lblGroups) + Me.Controls.Add(Me.btnClearGroups) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnAddGroupCondition) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridGroups) + Me.Name = "ucrColumnSpanners" + Me.Size = New System.Drawing.Size(615, 268) + CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents lblGroups As Label + Friend WithEvents btnClearGroups As Button + Friend WithEvents lblColumns As Label + Friend WithEvents btnAddGroupCondition As Button + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGridGroups As DataGridView + Friend WithEvents UcrReceiverMultiple1 As ucrReceiverMultiple + Friend WithEvents lblCondition As Label + Friend WithEvents txtGroupLabel As TextBox + Friend WithEvents colId As DataGridViewTextBoxColumn + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colValue As DataGridViewTextBoxColumn + Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents cboConditionOperator As ComboBox + Friend WithEvents lblGroupCondition As Label + Friend WithEvents Label1 As Label + Friend WithEvents TextBox1 As TextBox + Friend WithEvents Button1 As Button +End Class diff --git a/instat/UserTables/ucrColumnSpanners.resx b/instat/UserTables/ucrColumnSpanners.resx new file mode 100644 index 00000000000..4cf1a8cb8a9 --- /dev/null +++ b/instat/UserTables/ucrColumnSpanners.resx @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrColumnSpanners.vb b/instat/UserTables/ucrColumnSpanners.vb new file mode 100644 index 00000000000..3f445c6e268 --- /dev/null +++ b/instat/UserTables/ucrColumnSpanners.vb @@ -0,0 +1,3 @@ +Public Class ucrColumnSpanners + +End Class diff --git a/instat/UserTables/ucrColumns.Designer.vb b/instat/UserTables/ucrColumns.Designer.vb index 0ecd6eb3258..bf14f804191 100644 --- a/instat/UserTables/ucrColumns.Designer.vb +++ b/instat/UserTables/ucrColumns.Designer.vb @@ -25,20 +25,9 @@ Partial Class ucrColumns Me.rdoStyle = New System.Windows.Forms.RadioButton() Me.rdoSummary = New System.Windows.Forms.RadioButton() Me.ucrPnlRow = New instat.UcrPanel() - Me.lblGroupCondition = New System.Windows.Forms.Label() - Me.lblGroups = New System.Windows.Forms.Label() - Me.ucrLogicalCombobox = New instat.ucrInputComboBox() - Me.btnClearGroups = New System.Windows.Forms.Button() - Me.lblColumns = New System.Windows.Forms.Label() - Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() - Me.ucrFilterOperation = New instat.ucrInputComboBox() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.btnAddGroupCondition = New System.Windows.Forms.Button() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.dataGridGroups = New System.Windows.Forms.DataGridView() - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.RadioButton1 = New System.Windows.Forms.RadioButton() + Me.RadioButton2 = New System.Windows.Forms.RadioButton() + Me.UcrColumnSpanners1 = New instat.ucrColumnSpanners() Me.SuspendLayout() ' 'rdoStyle @@ -53,7 +42,7 @@ Partial Class ucrColumns Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoStyle.Location = New System.Drawing.Point(303, 3) + Me.rdoStyle.Location = New System.Drawing.Point(406, 3) Me.rdoStyle.Name = "rdoStyle" Me.rdoStyle.Size = New System.Drawing.Size(91, 29) Me.rdoStyle.TabIndex = 292 @@ -73,7 +62,7 @@ Partial Class ucrColumns Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSummary.Location = New System.Drawing.Point(215, 3) + Me.rdoSummary.Location = New System.Drawing.Point(318, 3) Me.rdoSummary.Name = "rdoSummary" Me.rdoSummary.Size = New System.Drawing.Size(91, 29) Me.rdoSummary.TabIndex = 291 @@ -84,188 +73,78 @@ Partial Class ucrColumns 'ucrPnlRow ' Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(168, 3) + Me.ucrPnlRow.Location = New System.Drawing.Point(26, 3) Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.Size = New System.Drawing.Size(533, 29) Me.ucrPnlRow.TabIndex = 289 ' - 'lblGroupCondition - ' - Me.lblGroupCondition.AutoSize = True - Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(379, 46) - Me.lblGroupCondition.Name = "lblGroupCondition" - Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) - Me.lblGroupCondition.TabIndex = 288 - Me.lblGroupCondition.Text = "Condition:" - ' - 'lblGroups - ' - Me.lblGroups.AutoSize = True - Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(257, 136) - Me.lblGroups.Name = "lblGroups" - Me.lblGroups.Size = New System.Drawing.Size(61, 13) - Me.lblGroups.TabIndex = 287 - Me.lblGroups.Text = "Summaries:" - ' - 'ucrLogicalCombobox - ' - Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True - Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 - Me.ucrLogicalCombobox.IsReadOnly = False - Me.ucrLogicalCombobox.Location = New System.Drawing.Point(454, 65) - Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" - Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) - Me.ucrLogicalCombobox.TabIndex = 286 - ' - 'btnClearGroups - ' - Me.btnClearGroups.Enabled = False - Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(541, 131) - Me.btnClearGroups.Name = "btnClearGroups" - Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) - Me.btnClearGroups.TabIndex = 285 - Me.btnClearGroups.Tag = "" - Me.btnClearGroups.Text = "Clear" - Me.btnClearGroups.UseVisualStyleBackColor = True - ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(257, 49) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) - Me.lblColumns.TabIndex = 284 - Me.lblColumns.Text = "Column:" - ' - 'ucrFilterByReceiver - ' - Me.ucrFilterByReceiver.AutoSize = True - Me.ucrFilterByReceiver.frmParent = Nothing - Me.ucrFilterByReceiver.Location = New System.Drawing.Point(254, 65) - Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" - Me.ucrFilterByReceiver.Selector = Nothing - Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) - Me.ucrFilterByReceiver.strNcFilePath = "" - Me.ucrFilterByReceiver.TabIndex = 281 - Me.ucrFilterByReceiver.ucrSelector = Nothing - ' - 'ucrFilterOperation - ' - Me.ucrFilterOperation.AddQuotesIfUnrecognised = True - Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFilterOperation.GetSetSelectedIndex = -1 - Me.ucrFilterOperation.IsReadOnly = False - Me.ucrFilterOperation.Location = New System.Drawing.Point(375, 65) - Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrFilterOperation.Name = "ucrFilterOperation" - Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) - Me.ucrFilterOperation.TabIndex = 283 - ' - 'colFormat - ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 76 - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 58 - ' - 'btnAddGroupCondition - ' - Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddGroupCondition.Location = New System.Drawing.Point(254, 86) - Me.btnAddGroupCondition.Name = "btnAddGroupCondition" - Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) - Me.btnAddGroupCondition.TabIndex = 282 - Me.btnAddGroupCondition.Tag = "" - Me.btnAddGroupCondition.Text = "Add" - Me.btnAddGroupCondition.UseVisualStyleBackColor = True - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 49) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 280 - ' - 'dataGridGroups - ' - Me.dataGridGroups.AllowUserToAddRows = False - Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(260, 156) - Me.dataGridGroups.Name = "dataGridGroups" - Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) - Me.dataGridGroups.TabIndex = 279 + 'RadioButton1 + ' + Me.RadioButton1.Appearance = System.Windows.Forms.Appearance.Button + Me.RadioButton1.BackColor = System.Drawing.SystemColors.Control + Me.RadioButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.RadioButton1.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.RadioButton1.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.RadioButton1.FlatAppearance.BorderSize = 2 + Me.RadioButton1.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.RadioButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.RadioButton1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.RadioButton1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.RadioButton1.Location = New System.Drawing.Point(229, 3) + Me.RadioButton1.Name = "RadioButton1" + Me.RadioButton1.Size = New System.Drawing.Size(91, 29) + Me.RadioButton1.TabIndex = 293 + Me.RadioButton1.Text = "Formats" + Me.RadioButton1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.RadioButton1.UseVisualStyleBackColor = True + ' + 'RadioButton2 + ' + Me.RadioButton2.Appearance = System.Windows.Forms.Appearance.Button + Me.RadioButton2.BackColor = System.Drawing.SystemColors.Control + Me.RadioButton2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.RadioButton2.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.RadioButton2.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.RadioButton2.FlatAppearance.BorderSize = 2 + Me.RadioButton2.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.RadioButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.RadioButton2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.RadioButton2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.RadioButton2.Location = New System.Drawing.Point(140, 3) + Me.RadioButton2.Name = "RadioButton2" + Me.RadioButton2.Size = New System.Drawing.Size(91, 29) + Me.RadioButton2.TabIndex = 294 + Me.RadioButton2.Text = "Spanners" + Me.RadioButton2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.RadioButton2.UseVisualStyleBackColor = True + ' + 'UcrColumnSpanners1 + ' + Me.UcrColumnSpanners1.Location = New System.Drawing.Point(12, 40) + Me.UcrColumnSpanners1.Name = "UcrColumnSpanners1" + Me.UcrColumnSpanners1.Size = New System.Drawing.Size(615, 268) + Me.UcrColumnSpanners1.TabIndex = 295 ' 'ucrColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.UcrColumnSpanners1) + Me.Controls.Add(Me.RadioButton2) + Me.Controls.Add(Me.RadioButton1) Me.Controls.Add(Me.rdoStyle) Me.Controls.Add(Me.rdoSummary) Me.Controls.Add(Me.ucrPnlRow) - Me.Controls.Add(Me.lblGroupCondition) - Me.Controls.Add(Me.lblGroups) - Me.Controls.Add(Me.ucrLogicalCombobox) - Me.Controls.Add(Me.btnClearGroups) - Me.Controls.Add(Me.lblColumns) - Me.Controls.Add(Me.ucrFilterByReceiver) - Me.Controls.Add(Me.ucrFilterOperation) - Me.Controls.Add(Me.btnAddGroupCondition) - Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrColumns" - Me.Size = New System.Drawing.Size(627, 239) - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(633, 309) Me.ResumeLayout(False) - Me.PerformLayout() End Sub Friend WithEvents rdoStyle As RadioButton Friend WithEvents rdoSummary As RadioButton Friend WithEvents ucrPnlRow As UcrPanel - Friend WithEvents lblGroupCondition As Label - Friend WithEvents lblGroups As Label - Friend WithEvents ucrLogicalCombobox As ucrInputComboBox - Friend WithEvents btnClearGroups As Button - Friend WithEvents lblColumns As Label - Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle - Friend WithEvents ucrFilterOperation As ucrInputComboBox - Friend WithEvents colFormat As DataGridViewButtonColumn - Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colLabel As DataGridViewTextBoxColumn - Friend WithEvents btnAddGroupCondition As Button - Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents dataGridGroups As DataGridView + Friend WithEvents RadioButton1 As RadioButton + Friend WithEvents RadioButton2 As RadioButton + Friend WithEvents UcrColumnSpanners1 As ucrColumnSpanners End Class diff --git a/instat/UserTables/ucrColumns.resx b/instat/UserTables/ucrColumns.resx index 229ea162634..1af7de150c9 100644 --- a/instat/UserTables/ucrColumns.resx +++ b/instat/UserTables/ucrColumns.resx @@ -117,13 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/ucrColumns.vb b/instat/UserTables/ucrColumns.vb index 23ae45d3041..f303e9ae332 100644 --- a/instat/UserTables/ucrColumns.vb +++ b/instat/UserTables/ucrColumns.vb @@ -1,3 +1,5 @@ Public Class ucrColumns + Private Sub ucrColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load + End Sub End Class diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/ucrRowGroup.Designer.vb index c20f638a2c8..3afe1404fdc 100644 --- a/instat/UserTables/ucrRowGroup.Designer.vb +++ b/instat/UserTables/ucrRowGroup.Designer.vb @@ -23,24 +23,20 @@ Partial Class ucrRowGroup Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.btnClearGroups = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() Me.btnAddCondition = New System.Windows.Forms.Button() Me.lblGroups = New System.Windows.Forms.Label() Me.lblGroupCondition = New System.Windows.Forms.Label() - Me.rdoGroup = New System.Windows.Forms.RadioButton() - Me.rdoSummary = New System.Windows.Forms.RadioButton() - Me.rdoStyle = New System.Windows.Forms.RadioButton() Me.cboConditionOperator = New System.Windows.Forms.ComboBox() Me.cboConditionValue = New System.Windows.Forms.ComboBox() Me.txtGroupLabel = New System.Windows.Forms.TextBox() Me.lblCondition = New System.Windows.Forms.Label() - Me.ucrPnlRow = New instat.UcrPanel() Me.ucrSingleReceiverCol = New instat.ucrReceiverSingle() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -49,16 +45,40 @@ Partial Class ucrRowGroup Me.dataGridGroups.AllowUserToAddRows = False Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(266, 175) + Me.dataGridGroups.Location = New System.Drawing.Point(227, 95) Me.dataGridGroups.Name = "dataGridGroups" Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(385, 73) + Me.dataGridGroups.Size = New System.Drawing.Size(517, 95) Me.dataGridGroups.TabIndex = 11 ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + ' + 'colFormat + ' + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.ReadOnly = True + Me.colFormat.Text = "Format" + Me.colFormat.UseColumnTextForButtonValue = True + Me.colFormat.Width = 99 + ' 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(569, 150) + Me.btnClearGroups.Location = New System.Drawing.Point(665, 71) Me.btnClearGroups.Name = "btnClearGroups" Me.btnClearGroups.Size = New System.Drawing.Size(79, 23) Me.btnClearGroups.TabIndex = 30 @@ -70,7 +90,7 @@ Partial Class ucrRowGroup ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(263, 52) + Me.lblColumns.Location = New System.Drawing.Point(224, 11) Me.lblColumns.Name = "lblColumns" Me.lblColumns.Size = New System.Drawing.Size(45, 13) Me.lblColumns.TabIndex = 28 @@ -80,7 +100,7 @@ Partial Class ucrRowGroup ' Me.btnAddCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddCondition.Location = New System.Drawing.Point(555, 113) + Me.btnAddCondition.Location = New System.Drawing.Point(648, 24) Me.btnAddCondition.Name = "btnAddCondition" Me.btnAddCondition.Size = New System.Drawing.Size(96, 23) Me.btnAddCondition.TabIndex = 25 @@ -92,7 +112,7 @@ Partial Class ucrRowGroup ' Me.lblGroups.AutoSize = True Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(263, 156) + Me.lblGroups.Location = New System.Drawing.Point(224, 76) Me.lblGroups.Name = "lblGroups" Me.lblGroups.Size = New System.Drawing.Size(44, 13) Me.lblGroups.TabIndex = 32 @@ -102,78 +122,18 @@ Partial Class ucrRowGroup ' Me.lblGroupCondition.AutoSize = True Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(370, 98) + Me.lblGroupCondition.Location = New System.Drawing.Point(458, 9) Me.lblGroupCondition.Name = "lblGroupCondition" Me.lblGroupCondition.Size = New System.Drawing.Size(86, 13) Me.lblGroupCondition.TabIndex = 33 Me.lblGroupCondition.Text = "Group Condition:" ' - 'rdoGroup - ' - Me.rdoGroup.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoGroup.BackColor = System.Drawing.SystemColors.Control - Me.rdoGroup.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoGroup.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoGroup.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGroup.FlatAppearance.BorderSize = 2 - Me.rdoGroup.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGroup.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoGroup.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoGroup.Location = New System.Drawing.Point(191, 3) - Me.rdoGroup.Name = "rdoGroup" - Me.rdoGroup.Size = New System.Drawing.Size(91, 29) - Me.rdoGroup.TabIndex = 276 - Me.rdoGroup.Text = "Groups" - Me.rdoGroup.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoGroup.UseVisualStyleBackColor = True - ' - 'rdoSummary - ' - Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control - Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatAppearance.BorderSize = 2 - Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSummary.Location = New System.Drawing.Point(280, 3) - Me.rdoSummary.Name = "rdoSummary" - Me.rdoSummary.Size = New System.Drawing.Size(91, 29) - Me.rdoSummary.TabIndex = 277 - Me.rdoSummary.Text = "Summaries" - Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.UseVisualStyleBackColor = True - ' - 'rdoStyle - ' - Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control - Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatAppearance.BorderSize = 2 - Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoStyle.Location = New System.Drawing.Point(368, 3) - Me.rdoStyle.Name = "rdoStyle" - Me.rdoStyle.Size = New System.Drawing.Size(91, 29) - Me.rdoStyle.TabIndex = 278 - Me.rdoStyle.Text = "Styles" - Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.UseVisualStyleBackColor = True - ' 'cboConditionOperator ' Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboConditionOperator.FormattingEnabled = True Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) - Me.cboConditionOperator.Location = New System.Drawing.Point(367, 115) + Me.cboConditionOperator.Location = New System.Drawing.Point(460, 26) Me.cboConditionOperator.Name = "cboConditionOperator" Me.cboConditionOperator.Size = New System.Drawing.Size(78, 21) Me.cboConditionOperator.TabIndex = 279 @@ -181,14 +141,14 @@ Partial Class ucrRowGroup 'cboConditionValue ' Me.cboConditionValue.FormattingEnabled = True - Me.cboConditionValue.Location = New System.Drawing.Point(446, 115) + Me.cboConditionValue.Location = New System.Drawing.Point(539, 26) Me.cboConditionValue.Name = "cboConditionValue" Me.cboConditionValue.Size = New System.Drawing.Size(106, 21) Me.cboConditionValue.TabIndex = 280 ' 'txtGroupLabel ' - Me.txtGroupLabel.Location = New System.Drawing.Point(261, 117) + Me.txtGroupLabel.Location = New System.Drawing.Point(354, 28) Me.txtGroupLabel.Name = "txtGroupLabel" Me.txtGroupLabel.Size = New System.Drawing.Size(100, 20) Me.txtGroupLabel.TabIndex = 281 @@ -197,25 +157,17 @@ Partial Class ucrRowGroup ' Me.lblCondition.AutoSize = True Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(263, 99) + Me.lblCondition.Location = New System.Drawing.Point(355, 10) Me.lblCondition.Name = "lblCondition" Me.lblCondition.Size = New System.Drawing.Size(68, 13) Me.lblCondition.TabIndex = 282 Me.lblCondition.Text = "Group Label:" ' - 'ucrPnlRow - ' - Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(174, 3) - Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) - Me.ucrPnlRow.TabIndex = 275 - ' 'ucrSingleReceiverCol ' Me.ucrSingleReceiverCol.AutoSize = True Me.ucrSingleReceiverCol.frmParent = Nothing - Me.ucrSingleReceiverCol.Location = New System.Drawing.Point(260, 68) + Me.ucrSingleReceiverCol.Location = New System.Drawing.Point(226, 27) Me.ucrSingleReceiverCol.Margin = New System.Windows.Forms.Padding(0) Me.ucrSingleReceiverCol.Name = "ucrSingleReceiverCol" Me.ucrSingleReceiverCol.Selector = Nothing @@ -230,36 +182,12 @@ Partial Class ucrRowGroup Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(10, 49) + Me.ucrSelectorCols.Location = New System.Drawing.Point(3, 5) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 23 ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - ' - 'colFormat - ' - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.ReadOnly = True - Me.colFormat.Text = "Format" - Me.colFormat.UseColumnTextForButtonValue = True - Me.colFormat.Width = 99 - ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -268,10 +196,6 @@ Partial Class ucrRowGroup Me.Controls.Add(Me.txtGroupLabel) Me.Controls.Add(Me.cboConditionValue) Me.Controls.Add(Me.cboConditionOperator) - Me.Controls.Add(Me.rdoStyle) - Me.Controls.Add(Me.rdoGroup) - Me.Controls.Add(Me.rdoSummary) - Me.Controls.Add(Me.ucrPnlRow) Me.Controls.Add(Me.lblGroupCondition) Me.Controls.Add(Me.lblGroups) Me.Controls.Add(Me.btnClearGroups) @@ -281,7 +205,7 @@ Partial Class ucrRowGroup Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrRowGroup" - Me.Size = New System.Drawing.Size(660, 252) + Me.Size = New System.Drawing.Size(749, 196) CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -296,10 +220,6 @@ Partial Class ucrRowGroup Friend WithEvents ucrSingleReceiverCol As ucrReceiverSingle Friend WithEvents lblGroups As Label Friend WithEvents lblGroupCondition As Label - Friend WithEvents rdoGroup As RadioButton - Friend WithEvents rdoSummary As RadioButton - Friend WithEvents ucrPnlRow As UcrPanel - Friend WithEvents rdoStyle As RadioButton Friend WithEvents cboConditionOperator As ComboBox Friend WithEvents cboConditionValue As ComboBox Friend WithEvents txtGroupLabel As TextBox diff --git a/instat/UserTables/ucrRowGroup.resx b/instat/UserTables/ucrRowGroup.resx index f4b4b7d5a34..191e2e6453d 100644 --- a/instat/UserTables/ucrRowGroup.resx +++ b/instat/UserTables/ucrRowGroup.resx @@ -126,4 +126,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/ucrRowGroup.vb index c716016615d..1c31c9e6705 100644 --- a/instat/UserTables/ucrRowGroup.vb +++ b/instat/UserTables/ucrRowGroup.vb @@ -91,4 +91,5 @@ Private Sub cboConditionValue_TextChanged(sender As Object, e As EventArgs) Handles cboConditionValue.TextChanged, cboConditionOperator.TextChanged, txtGroupLabel.TextChanged btnAddCondition.Enabled = Not String.IsNullOrWhiteSpace(txtGroupLabel.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) End Sub + End Class diff --git a/instat/UserTables/ucrRowSummary.Designer.vb b/instat/UserTables/ucrRowSummary.Designer.vb new file mode 100644 index 00000000000..266e1ffe684 --- /dev/null +++ b/instat/UserTables/ucrRowSummary.Designer.vb @@ -0,0 +1,37 @@ + _ +Partial Class ucrRowSummary + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'ucrRowSummary + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Name = "ucrRowSummary" + Me.Size = New System.Drawing.Size(671, 355) + Me.ResumeLayout(False) + + End Sub + +End Class diff --git a/instat/UserTables/ucrRowSummary.resx b/instat/UserTables/ucrRowSummary.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/ucrRowSummary.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/ucrRowSummary.vb b/instat/UserTables/ucrRowSummary.vb new file mode 100644 index 00000000000..b0eb1db4031 --- /dev/null +++ b/instat/UserTables/ucrRowSummary.vb @@ -0,0 +1,3 @@ +Public Class ucrRowSummary + +End Class diff --git a/instat/UserTables/ucrRows.Designer.vb b/instat/UserTables/ucrRows.Designer.vb index 3081e7bde9b..eeb99c5dc28 100644 --- a/instat/UserTables/ucrRows.Designer.vb +++ b/instat/UserTables/ucrRows.Designer.vb @@ -22,8 +22,106 @@ Partial Class ucrRows 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - components = New System.ComponentModel.Container() + Me.rdoStyle = New System.Windows.Forms.RadioButton() + Me.rdoGroup = New System.Windows.Forms.RadioButton() + Me.rdoSummary = New System.Windows.Forms.RadioButton() + Me.ucrPnlRow = New instat.UcrPanel() + Me.UcrRowGroup1 = New instat.ucrRowGroup() + Me.SuspendLayout() + ' + 'rdoStyle + ' + Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatAppearance.BorderSize = 2 + Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyle.Location = New System.Drawing.Point(412, 3) + Me.rdoStyle.Name = "rdoStyle" + Me.rdoStyle.Size = New System.Drawing.Size(91, 29) + Me.rdoStyle.TabIndex = 282 + Me.rdoStyle.Text = "Styles" + Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyle.UseVisualStyleBackColor = True + ' + 'rdoGroup + ' + Me.rdoGroup.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoGroup.BackColor = System.Drawing.SystemColors.Control + Me.rdoGroup.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoGroup.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGroup.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGroup.FlatAppearance.BorderSize = 2 + Me.rdoGroup.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoGroup.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoGroup.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoGroup.Location = New System.Drawing.Point(235, 3) + Me.rdoGroup.Name = "rdoGroup" + Me.rdoGroup.Size = New System.Drawing.Size(91, 29) + Me.rdoGroup.TabIndex = 280 + Me.rdoGroup.Text = "Groups" + Me.rdoGroup.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoGroup.UseVisualStyleBackColor = True + ' + 'rdoSummary + ' + Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control + Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatAppearance.BorderSize = 2 + Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSummary.Location = New System.Drawing.Point(324, 3) + Me.rdoSummary.Name = "rdoSummary" + Me.rdoSummary.Size = New System.Drawing.Size(91, 29) + Me.rdoSummary.TabIndex = 281 + Me.rdoSummary.Text = "Summaries" + Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummary.UseVisualStyleBackColor = True + ' + 'ucrPnlRow + ' + Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRow.Location = New System.Drawing.Point(218, 3) + Me.ucrPnlRow.Name = "ucrPnlRow" + Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.TabIndex = 279 + ' + 'UcrRowGroup1 + ' + Me.UcrRowGroup1.Location = New System.Drawing.Point(3, 38) + Me.UcrRowGroup1.Name = "UcrRowGroup1" + Me.UcrRowGroup1.Size = New System.Drawing.Size(749, 194) + Me.UcrRowGroup1.TabIndex = 283 + ' + 'ucrRows + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.UcrRowGroup1) + Me.Controls.Add(Me.rdoStyle) + Me.Controls.Add(Me.rdoGroup) + Me.Controls.Add(Me.rdoSummary) + Me.Controls.Add(Me.ucrPnlRow) + Me.Name = "ucrRows" + Me.Size = New System.Drawing.Size(753, 235) + Me.ResumeLayout(False) + End Sub + Friend WithEvents rdoStyle As RadioButton + Friend WithEvents rdoGroup As RadioButton + Friend WithEvents rdoSummary As RadioButton + Friend WithEvents ucrPnlRow As UcrPanel + Friend WithEvents UcrRowGroup1 As ucrRowGroup End Class diff --git a/instat/UserTables/ucrRows.resx b/instat/UserTables/ucrRows.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/ucrRows.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/ucrRows.vb b/instat/UserTables/ucrRows.vb index ddcf055087d..0e96cb21c27 100644 --- a/instat/UserTables/ucrRows.vb +++ b/instat/UserTables/ucrRows.vb @@ -1,3 +1,8 @@ Public Class ucrRows + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + UcrRowGroup1.Setup(strDataFrameName, clsOperator) + End Sub + End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 4358ae06ab8..aeff90a7747 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3056,12 +3056,24 @@ UserControl + + ucrColumnFormats.vb + + + UserControl + ucrColumns.vb UserControl + + ucrColumnSpanners.vb + + + UserControl + ucrHeader.vb @@ -3080,6 +3092,12 @@ UserControl + + ucrRowSummary.vb + + + UserControl + ucrSourceNotes.vb @@ -5392,15 +5410,27 @@ ucrCells.vb + + ucrColumnFormats.vb + ucrColumns.vb + + ucrColumnSpanners.vb + ucrHeader.vb ucrRowGroup.vb + + ucrRows.vb + + + ucrRowSummary.vb + ucrSourceNotes.vb From c57fe1a8e0bd82f6caa7ba90bb5bebc3bf630df7 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 08:38:40 +0300 Subject: [PATCH 036/273] Added column spanners functionality --- instat/UserTables/sdgTableOptions.Designer.vb | 26 +- instat/UserTables/sdgTableOptions.vb | 1 + .../UserTables/ucrColumnSpanners.Designer.vb | 254 +++++++----------- instat/UserTables/ucrColumnSpanners.vb | 94 +++++++ instat/UserTables/ucrColumns.Designer.vb | 18 +- instat/UserTables/ucrColumns.vb | 4 +- instat/UserTables/ucrRowGroup.Designer.vb | 24 +- instat/UserTables/ucrRowGroup.vb | 19 +- instat/UserTables/ucrRows.Designer.vb | 22 +- instat/UserTables/ucrRows.vb | 2 +- 10 files changed, 256 insertions(+), 208 deletions(-) diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index eaaea661550..afb2eb40973 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -28,7 +28,7 @@ Partial Class sdgTableOptions Me.tbpRows = New System.Windows.Forms.TabPage() Me.ucrRows = New instat.ucrRows() Me.tbpColumns = New System.Windows.Forms.TabPage() - Me.UcrColumns1 = New instat.ucrColumns() + Me.ucrColumns = New instat.ucrColumns() Me.tbpCells = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -75,7 +75,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(771, 295) + Me.tbpHeader.Size = New System.Drawing.Size(771, 324) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -92,7 +92,7 @@ Partial Class sdgTableOptions Me.tbpRows.Controls.Add(Me.ucrRows) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(771, 295) + Me.tbpRows.Size = New System.Drawing.Size(771, 324) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True @@ -106,7 +106,7 @@ Partial Class sdgTableOptions ' 'tbpColumns ' - Me.tbpColumns.Controls.Add(Me.UcrColumns1) + Me.tbpColumns.Controls.Add(Me.ucrColumns) Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" Me.tbpColumns.Size = New System.Drawing.Size(771, 324) @@ -114,12 +114,12 @@ Partial Class sdgTableOptions Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True ' - 'UcrColumns1 + 'ucrColumns ' - Me.UcrColumns1.Location = New System.Drawing.Point(5, 6) - Me.UcrColumns1.Name = "UcrColumns1" - Me.UcrColumns1.Size = New System.Drawing.Size(658, 308) - Me.UcrColumns1.TabIndex = 0 + Me.ucrColumns.Location = New System.Drawing.Point(5, 6) + Me.ucrColumns.Name = "ucrColumns" + Me.ucrColumns.Size = New System.Drawing.Size(700, 270) + Me.ucrColumns.TabIndex = 0 ' 'tbpCells ' @@ -127,7 +127,7 @@ Partial Class sdgTableOptions Me.tbpCells.Controls.Add(Me.lblFooterCellNotes) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(771, 295) + Me.tbpCells.Size = New System.Drawing.Size(771, 324) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True @@ -190,7 +190,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(771, 295) + Me.tbpSourceNotes.Size = New System.Drawing.Size(771, 324) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -212,7 +212,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(771, 295) + Me.tbpThemes.Size = New System.Drawing.Size(771, 324) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -325,6 +325,6 @@ Partial Class sdgTableOptions Friend WithEvents tbpRows As TabPage Friend WithEvents ucrHeaderOptions As ucrHeader Friend WithEvents tbpColumns As TabPage - Friend WithEvents UcrColumns1 As ucrColumns + Friend WithEvents ucrColumns As ucrColumns Friend WithEvents ucrRows As ucrRows End Class diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 2f1c54c8301..ea9e673463e 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -65,6 +65,7 @@ Public Class sdgTableOptions ucrHeaderOptions.Setup(clsOperator) ucrRows.Setup("survey", clsOperator) + ucrColumns.Setup("survey", clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) ucrSourceNotes.Setup(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) diff --git a/instat/UserTables/ucrColumnSpanners.Designer.vb b/instat/UserTables/ucrColumnSpanners.Designer.vb index d16134a7a6b..65a72961cd5 100644 --- a/instat/UserTables/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/ucrColumnSpanners.Designer.vb @@ -22,48 +22,43 @@ Partial Class ucrColumnSpanners 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.lblGroups = New System.Windows.Forms.Label() - Me.btnClearGroups = New System.Windows.Forms.Button() + Me.lblSpanners = New System.Windows.Forms.Label() + Me.btnClearSpanners = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() - Me.btnAddGroupCondition = New System.Windows.Forms.Button() + Me.btnAddColSpanner = New System.Windows.Forms.Button() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.dataGridGroups = New System.Windows.Forms.DataGridView() - Me.UcrReceiverMultiple1 = New instat.ucrReceiverMultiple() - Me.lblCondition = New System.Windows.Forms.Label() - Me.txtGroupLabel = New System.Windows.Forms.TextBox() - Me.cboConditionOperator = New System.Windows.Forms.ComboBox() - Me.lblGroupCondition = New System.Windows.Forms.Label() - Me.Label1 = New System.Windows.Forms.Label() - Me.TextBox1 = New System.Windows.Forms.TextBox() - Me.Button1 = New System.Windows.Forms.Button() + Me.dataGridSpanners = New System.Windows.Forms.DataGridView() Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colValue = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.lblColSpanner = New System.Windows.Forms.Label() + Me.ucrInputColSpanner = New instat.ucrInputTextBox() + CType(Me.dataGridSpanners, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'lblGroups + 'lblSpanners ' - Me.lblGroups.AutoSize = True - Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(245, 169) - Me.lblGroups.Name = "lblGroups" - Me.lblGroups.Size = New System.Drawing.Size(55, 13) - Me.lblGroups.TabIndex = 297 - Me.lblGroups.Text = "Spanners:" + Me.lblSpanners.AutoSize = True + Me.lblSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSpanners.Location = New System.Drawing.Point(245, 118) + Me.lblSpanners.Name = "lblSpanners" + Me.lblSpanners.Size = New System.Drawing.Size(55, 13) + Me.lblSpanners.TabIndex = 297 + Me.lblSpanners.Text = "Spanners:" ' - 'btnClearGroups + 'btnClearSpanners ' - Me.btnClearGroups.Enabled = False - Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(534, 162) - Me.btnClearGroups.Name = "btnClearGroups" - Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) - Me.btnClearGroups.TabIndex = 295 - Me.btnClearGroups.Tag = "" - Me.btnClearGroups.Text = "Clear" - Me.btnClearGroups.UseVisualStyleBackColor = True + Me.btnClearSpanners.Enabled = False + Me.btnClearSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearSpanners.Location = New System.Drawing.Point(534, 111) + Me.btnClearSpanners.Name = "btnClearSpanners" + Me.btnClearSpanners.Size = New System.Drawing.Size(75, 23) + Me.btnClearSpanners.TabIndex = 295 + Me.btnClearSpanners.Tag = "" + Me.btnClearSpanners.Text = "Clear" + Me.btnClearSpanners.UseVisualStyleBackColor = True ' 'lblColumns ' @@ -75,17 +70,17 @@ Partial Class ucrColumnSpanners Me.lblColumns.TabIndex = 294 Me.lblColumns.Text = "Column(s):" ' - 'btnAddGroupCondition + 'btnAddColSpanner ' - Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddGroupCondition.Location = New System.Drawing.Point(472, 20) - Me.btnAddGroupCondition.Name = "btnAddGroupCondition" - Me.btnAddGroupCondition.Size = New System.Drawing.Size(99, 23) - Me.btnAddGroupCondition.TabIndex = 292 - Me.btnAddGroupCondition.Tag = "" - Me.btnAddGroupCondition.Text = "Add" - Me.btnAddGroupCondition.UseVisualStyleBackColor = True + Me.btnAddColSpanner.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddColSpanner.Location = New System.Drawing.Point(472, 20) + Me.btnAddColSpanner.Name = "btnAddColSpanner" + Me.btnAddColSpanner.Size = New System.Drawing.Size(99, 23) + Me.btnAddColSpanner.TabIndex = 292 + Me.btnAddColSpanner.Tag = "" + Me.btnAddColSpanner.Text = "Add" + Me.btnAddColSpanner.UseVisualStyleBackColor = True ' 'ucrSelectorCols ' @@ -99,95 +94,16 @@ Partial Class ucrColumnSpanners Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 290 ' - 'dataGridGroups + 'dataGridSpanners ' - Me.dataGridGroups.AllowUserToAddRows = False - Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colValue, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(240, 189) - Me.dataGridGroups.Name = "dataGridGroups" - Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(369, 73) - Me.dataGridGroups.TabIndex = 289 - ' - 'UcrReceiverMultiple1 - ' - Me.UcrReceiverMultiple1.AutoSize = True - Me.UcrReceiverMultiple1.frmParent = Nothing - Me.UcrReceiverMultiple1.Location = New System.Drawing.Point(240, 21) - Me.UcrReceiverMultiple1.Margin = New System.Windows.Forms.Padding(0) - Me.UcrReceiverMultiple1.Name = "UcrReceiverMultiple1" - Me.UcrReceiverMultiple1.Selector = Nothing - Me.UcrReceiverMultiple1.Size = New System.Drawing.Size(120, 78) - Me.UcrReceiverMultiple1.strNcFilePath = "" - Me.UcrReceiverMultiple1.TabIndex = 299 - Me.UcrReceiverMultiple1.ucrSelector = Nothing - ' - 'lblCondition - ' - Me.lblCondition.AutoSize = True - Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(370, 5) - Me.lblCondition.Name = "lblCondition" - Me.lblCondition.Size = New System.Drawing.Size(79, 13) - Me.lblCondition.TabIndex = 301 - Me.lblCondition.Text = "Spanner Label:" - ' - 'txtGroupLabel - ' - Me.txtGroupLabel.Location = New System.Drawing.Point(368, 23) - Me.txtGroupLabel.Name = "txtGroupLabel" - Me.txtGroupLabel.Size = New System.Drawing.Size(100, 20) - Me.txtGroupLabel.TabIndex = 300 - ' - 'cboConditionOperator - ' - Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboConditionOperator.FormattingEnabled = True - Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) - Me.cboConditionOperator.Location = New System.Drawing.Point(240, 132) - Me.cboConditionOperator.Name = "cboConditionOperator" - Me.cboConditionOperator.Size = New System.Drawing.Size(120, 21) - Me.cboConditionOperator.TabIndex = 303 - ' - 'lblGroupCondition - ' - Me.lblGroupCondition.AutoSize = True - Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(245, 115) - Me.lblGroupCondition.Name = "lblGroupCondition" - Me.lblGroupCondition.Size = New System.Drawing.Size(62, 13) - Me.lblGroupCondition.TabIndex = 302 - Me.lblGroupCondition.Text = "Spanner Id:" - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(370, 115) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(79, 13) - Me.Label1.TabIndex = 305 - Me.Label1.Text = "Spanner Label:" - ' - 'TextBox1 - ' - Me.TextBox1.Location = New System.Drawing.Point(368, 133) - Me.TextBox1.Name = "TextBox1" - Me.TextBox1.Size = New System.Drawing.Size(100, 20) - Me.TextBox1.TabIndex = 304 - ' - 'Button1 - ' - Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.Button1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Button1.Location = New System.Drawing.Point(474, 130) - Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(99, 23) - Me.Button1.TabIndex = 306 - Me.Button1.Tag = "" - Me.Button1.Text = "Add" - Me.Button1.UseVisualStyleBackColor = True + Me.dataGridSpanners.AllowUserToAddRows = False + Me.dataGridSpanners.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridSpanners.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colValue, Me.colFormat}) + Me.dataGridSpanners.Location = New System.Drawing.Point(240, 138) + Me.dataGridSpanners.Name = "dataGridSpanners" + Me.dataGridSpanners.RowHeadersWidth = 62 + Me.dataGridSpanners.Size = New System.Drawing.Size(369, 73) + Me.dataGridSpanners.TabIndex = 289 ' 'colId ' @@ -206,10 +122,10 @@ Partial Class ucrColumnSpanners 'colValue ' Me.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colValue.HeaderText = "Value" + Me.colValue.HeaderText = "Column(s)/Spanner(s)" Me.colValue.MinimumWidth = 8 Me.colValue.Name = "colValue" - Me.colValue.Width = 59 + Me.colValue.Width = 134 ' 'colFormat ' @@ -219,47 +135,71 @@ Partial Class ucrColumnSpanners Me.colFormat.Name = "colFormat" Me.colFormat.Width = 8 ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(240, 21) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 78) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 299 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'lblColSpanner + ' + Me.lblColSpanner.AutoSize = True + Me.lblColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColSpanner.Location = New System.Drawing.Point(370, 5) + Me.lblColSpanner.Name = "lblColSpanner" + Me.lblColSpanner.Size = New System.Drawing.Size(79, 13) + Me.lblColSpanner.TabIndex = 301 + Me.lblColSpanner.Text = "Spanner Label:" + ' + 'ucrInputColSpanner + ' + Me.ucrInputColSpanner.AddQuotesIfUnrecognised = True + Me.ucrInputColSpanner.AutoSize = True + Me.ucrInputColSpanner.IsMultiline = False + Me.ucrInputColSpanner.IsReadOnly = False + Me.ucrInputColSpanner.Location = New System.Drawing.Point(368, 22) + Me.ucrInputColSpanner.Name = "ucrInputColSpanner" + Me.ucrInputColSpanner.Size = New System.Drawing.Size(100, 21) + Me.ucrInputColSpanner.TabIndex = 307 + ' 'ucrColumnSpanners ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.TextBox1) - Me.Controls.Add(Me.cboConditionOperator) - Me.Controls.Add(Me.lblGroupCondition) - Me.Controls.Add(Me.lblCondition) - Me.Controls.Add(Me.txtGroupLabel) - Me.Controls.Add(Me.UcrReceiverMultiple1) - Me.Controls.Add(Me.lblGroups) - Me.Controls.Add(Me.btnClearGroups) + Me.Controls.Add(Me.ucrInputColSpanner) + Me.Controls.Add(Me.lblColSpanner) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.lblSpanners) + Me.Controls.Add(Me.btnClearSpanners) Me.Controls.Add(Me.lblColumns) - Me.Controls.Add(Me.btnAddGroupCondition) + Me.Controls.Add(Me.btnAddColSpanner) Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.dataGridGroups) + Me.Controls.Add(Me.dataGridSpanners) Me.Name = "ucrColumnSpanners" - Me.Size = New System.Drawing.Size(615, 268) - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(612, 216) + CType(Me.dataGridSpanners, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents lblGroups As Label - Friend WithEvents btnClearGroups As Button + Friend WithEvents lblSpanners As Label + Friend WithEvents btnClearSpanners As Button Friend WithEvents lblColumns As Label - Friend WithEvents btnAddGroupCondition As Button + Friend WithEvents btnAddColSpanner As Button Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents dataGridGroups As DataGridView - Friend WithEvents UcrReceiverMultiple1 As ucrReceiverMultiple - Friend WithEvents lblCondition As Label - Friend WithEvents txtGroupLabel As TextBox + Friend WithEvents dataGridSpanners As DataGridView + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents lblColSpanner As Label Friend WithEvents colId As DataGridViewTextBoxColumn Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colValue As DataGridViewTextBoxColumn Friend WithEvents colFormat As DataGridViewButtonColumn - Friend WithEvents cboConditionOperator As ComboBox - Friend WithEvents lblGroupCondition As Label - Friend WithEvents Label1 As Label - Friend WithEvents TextBox1 As TextBox - Friend WithEvents Button1 As Button + Friend WithEvents ucrInputColSpanner As ucrInputTextBox End Class diff --git a/instat/UserTables/ucrColumnSpanners.vb b/instat/UserTables/ucrColumnSpanners.vb index 3f445c6e268..e7f49c0f728 100644 --- a/instat/UserTables/ucrColumnSpanners.vb +++ b/instat/UserTables/ucrColumnSpanners.vb @@ -1,3 +1,97 @@ Public Class ucrColumnSpanners + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub InitialiseDialog() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + dataGridSpanners.Rows.Clear() + + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_spanner", clsOperator) + + For Each clsRParam As RParameter In lstRParams + + Dim clsTabSpannerRFunction As RFunction = clsRParam.clsArgumentCodeStructure + + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridSpanners) + + For Each clsTabSpannerRParam As RParameter In clsTabSpannerRFunction.clsParameters + If clsTabSpannerRParam.strArgumentName = "id" Then + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) + ElseIf clsTabSpannerRParam.strArgumentName = "label" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) + ElseIf clsTabSpannerRParam.strArgumentName = "columns" Then + row.Cells(2).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) + End If + Next + + ' Tag and add the tab_row_group() parameter function contents as a row + row.Tag = clsRParam + dataGridSpanners.Rows.Add(row) + + Next + + End Sub + + Private Sub btnAddColSpanner_Click(sender As Object, e As EventArgs) Handles btnAddColSpanner.Click + + Dim strSpannerLabel As String = ucrInputColSpanner.GetValue() + Dim strSpannerId As String = strSpannerLabel.Replace(" ", String.Empty) + Dim strSpannerColsRFunction As String = mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False) + + Dim clsTabRowGroupRFunction As New RFunction + clsTabRowGroupRFunction.SetPackageName("gt") + clsTabRowGroupRFunction.SetRCommand("tab_spanner") + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="label", strParamValue:=clsTablesUtils.GetStringValue(strSpannerLabel, True), iNewPosition:=0)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strSpannerColsRFunction, iNewPosition:=1)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_spanner_param" & (dataGridSpanners.Rows.Count + 1), strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) + + Dim row As New DataGridViewRow + row.CreateCells(dataGridSpanners) + + row.Cells(0).Value = strSpannerId + row.Cells(1).Value = strSpannerLabel + row.Cells(2).Value = strSpannerColsRFunction + + ' Tag and add the tab_row_group() parameter function contents as a row + row.Tag = clsRParam + dataGridSpanners.Rows.Add(row) + + ' Add to parameter + clsOperator.AddParameter(clsRParam) + + ucrReceiverMultipleCols.Clear() + ucrInputColSpanner.SetName("") + + End Sub + + Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearSpanners.Click + For index As Integer = 0 To dataGridSpanners.Rows.Count - 1 + clsOperator.RemoveParameter(dataGridSpanners.Rows(index).Tag) + Next + dataGridSpanners.Rows.Clear() + End Sub + + + Private Sub ucrColSpanner_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged, ucrInputColSpanner.ControlContentsChanged + btnAddColSpanner.Enabled = Not ucrReceiverMultipleCols.IsEmpty AndAlso Not ucrInputColSpanner.IsEmpty + End Sub + End Class diff --git a/instat/UserTables/ucrColumns.Designer.vb b/instat/UserTables/ucrColumns.Designer.vb index bf14f804191..a516eb605c4 100644 --- a/instat/UserTables/ucrColumns.Designer.vb +++ b/instat/UserTables/ucrColumns.Designer.vb @@ -27,7 +27,7 @@ Partial Class ucrColumns Me.ucrPnlRow = New instat.UcrPanel() Me.RadioButton1 = New System.Windows.Forms.RadioButton() Me.RadioButton2 = New System.Windows.Forms.RadioButton() - Me.UcrColumnSpanners1 = New instat.ucrColumnSpanners() + Me.ucrColumnSpanners = New instat.ucrColumnSpanners() Me.SuspendLayout() ' 'rdoStyle @@ -118,25 +118,25 @@ Partial Class ucrColumns Me.RadioButton2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.RadioButton2.UseVisualStyleBackColor = True ' - 'UcrColumnSpanners1 + 'ucrColumnSpanners ' - Me.UcrColumnSpanners1.Location = New System.Drawing.Point(12, 40) - Me.UcrColumnSpanners1.Name = "UcrColumnSpanners1" - Me.UcrColumnSpanners1.Size = New System.Drawing.Size(615, 268) - Me.UcrColumnSpanners1.TabIndex = 295 + Me.ucrColumnSpanners.Location = New System.Drawing.Point(12, 40) + Me.ucrColumnSpanners.Name = "ucrColumnSpanners" + Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 215) + Me.ucrColumnSpanners.TabIndex = 295 ' 'ucrColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.UcrColumnSpanners1) + Me.Controls.Add(Me.ucrColumnSpanners) Me.Controls.Add(Me.RadioButton2) Me.Controls.Add(Me.RadioButton1) Me.Controls.Add(Me.rdoStyle) Me.Controls.Add(Me.rdoSummary) Me.Controls.Add(Me.ucrPnlRow) Me.Name = "ucrColumns" - Me.Size = New System.Drawing.Size(633, 309) + Me.Size = New System.Drawing.Size(633, 260) Me.ResumeLayout(False) End Sub @@ -146,5 +146,5 @@ Partial Class ucrColumns Friend WithEvents ucrPnlRow As UcrPanel Friend WithEvents RadioButton1 As RadioButton Friend WithEvents RadioButton2 As RadioButton - Friend WithEvents UcrColumnSpanners1 As ucrColumnSpanners + Friend WithEvents ucrColumnSpanners As ucrColumnSpanners End Class diff --git a/instat/UserTables/ucrColumns.vb b/instat/UserTables/ucrColumns.vb index f303e9ae332..33845937784 100644 --- a/instat/UserTables/ucrColumns.vb +++ b/instat/UserTables/ucrColumns.vb @@ -1,5 +1,7 @@ Public Class ucrColumns - Private Sub ucrColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + ucrColumnSpanners.Setup(strDataFrameName, clsOperator) End Sub + End Class diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/ucrRowGroup.Designer.vb index 3afe1404fdc..cd44ebd4200 100644 --- a/instat/UserTables/ucrRowGroup.Designer.vb +++ b/instat/UserTables/ucrRowGroup.Designer.vb @@ -33,10 +33,10 @@ Partial Class ucrRowGroup Me.lblGroupCondition = New System.Windows.Forms.Label() Me.cboConditionOperator = New System.Windows.Forms.ComboBox() Me.cboConditionValue = New System.Windows.Forms.ComboBox() - Me.txtGroupLabel = New System.Windows.Forms.TextBox() Me.lblCondition = New System.Windows.Forms.Label() Me.ucrSingleReceiverCol = New instat.ucrReceiverSingle() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputGroupLabel = New instat.ucrInputTextBox() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -146,13 +146,6 @@ Partial Class ucrRowGroup Me.cboConditionValue.Size = New System.Drawing.Size(106, 21) Me.cboConditionValue.TabIndex = 280 ' - 'txtGroupLabel - ' - Me.txtGroupLabel.Location = New System.Drawing.Point(354, 28) - Me.txtGroupLabel.Name = "txtGroupLabel" - Me.txtGroupLabel.Size = New System.Drawing.Size(100, 20) - Me.txtGroupLabel.TabIndex = 281 - ' 'lblCondition ' Me.lblCondition.AutoSize = True @@ -188,12 +181,23 @@ Partial Class ucrRowGroup Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 23 ' + 'ucrInputGroupLabel + ' + Me.ucrInputGroupLabel.AddQuotesIfUnrecognised = True + Me.ucrInputGroupLabel.AutoSize = True + Me.ucrInputGroupLabel.IsMultiline = False + Me.ucrInputGroupLabel.IsReadOnly = False + Me.ucrInputGroupLabel.Location = New System.Drawing.Point(354, 27) + Me.ucrInputGroupLabel.Name = "ucrInputGroupLabel" + Me.ucrInputGroupLabel.Size = New System.Drawing.Size(100, 21) + Me.ucrInputGroupLabel.TabIndex = 308 + ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrInputGroupLabel) Me.Controls.Add(Me.lblCondition) - Me.Controls.Add(Me.txtGroupLabel) Me.Controls.Add(Me.cboConditionValue) Me.Controls.Add(Me.cboConditionOperator) Me.Controls.Add(Me.lblGroupCondition) @@ -222,9 +226,9 @@ Partial Class ucrRowGroup Friend WithEvents lblGroupCondition As Label Friend WithEvents cboConditionOperator As ComboBox Friend WithEvents cboConditionValue As ComboBox - Friend WithEvents txtGroupLabel As TextBox Friend WithEvents lblCondition As Label Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colCodnition As DataGridViewTextBoxColumn Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents ucrInputGroupLabel As ucrInputTextBox End Class diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/ucrRowGroup.vb index 1c31c9e6705..3e058b90f16 100644 --- a/instat/UserTables/ucrRowGroup.vb +++ b/instat/UserTables/ucrRowGroup.vb @@ -1,11 +1,11 @@ Public Class ucrRowGroup Private clsOperator As New ROperator - Private bFirstload As Boolean = True Private Sub InitialiseDialog() ucrSingleReceiverCol.Selector = ucrSelectorCols + ucrSingleReceiverCol.SetMeAsReceiver() End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -17,7 +17,6 @@ Me.clsOperator = clsOperator ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) - ucrSingleReceiverCol.SetMeAsReceiver() dataGridGroups.Rows.Clear() @@ -49,7 +48,7 @@ Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click - Dim strGroupLabel As String = txtGroupLabel.Text + Dim strGroupLabel As String = ucrInputGroupLabel.GetValue() Dim strConditionValue As String = If(cboConditionOperator.Text <> "Expression" AndAlso Not IsNumeric(cboConditionValue.Text), clsTablesUtils.GetStringValue(cboConditionValue.Text, True), cboConditionValue.Text) Dim strCondition As String = ucrSingleReceiverCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & strConditionValue @@ -76,7 +75,8 @@ ' Add to parameter clsOperator.AddParameter(clsRParam) - txtGroupLabel.Text = "" + ucrSingleReceiverCol.Clear() + ucrInputGroupLabel.SetName("") cboConditionValue.Text = "" End Sub @@ -88,8 +88,15 @@ dataGridGroups.Rows.Clear() End Sub - Private Sub cboConditionValue_TextChanged(sender As Object, e As EventArgs) Handles cboConditionValue.TextChanged, cboConditionOperator.TextChanged, txtGroupLabel.TextChanged - btnAddCondition.Enabled = Not String.IsNullOrWhiteSpace(txtGroupLabel.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) + Private Sub conditionValue_TextChanged(sender As Object, e As EventArgs) Handles cboConditionValue.TextChanged, cboConditionOperator.TextChanged + EnableDisableAddConditionButton() End Sub + Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSingleReceiverCol.ControlContentsChanged, ucrInputGroupLabel.ControlContentsChanged + EnableDisableAddConditionButton() + End Sub + + Private Sub EnableDisableAddConditionButton() + btnAddCondition.Enabled = Not ucrSingleReceiverCol.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) + End Sub End Class diff --git a/instat/UserTables/ucrRows.Designer.vb b/instat/UserTables/ucrRows.Designer.vb index eeb99c5dc28..819009ea4a0 100644 --- a/instat/UserTables/ucrRows.Designer.vb +++ b/instat/UserTables/ucrRows.Designer.vb @@ -26,7 +26,7 @@ Partial Class ucrRows Me.rdoGroup = New System.Windows.Forms.RadioButton() Me.rdoSummary = New System.Windows.Forms.RadioButton() Me.ucrPnlRow = New instat.UcrPanel() - Me.UcrRowGroup1 = New instat.ucrRowGroup() + Me.ucrRowGroups = New instat.ucrRowGroup() Me.SuspendLayout() ' 'rdoStyle @@ -92,29 +92,29 @@ Partial Class ucrRows 'ucrPnlRow ' Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(218, 3) + Me.ucrPnlRow.Location = New System.Drawing.Point(93, 3) Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlRow.Size = New System.Drawing.Size(506, 29) Me.ucrPnlRow.TabIndex = 279 ' - 'UcrRowGroup1 + 'ucrRowGroups ' - Me.UcrRowGroup1.Location = New System.Drawing.Point(3, 38) - Me.UcrRowGroup1.Name = "UcrRowGroup1" - Me.UcrRowGroup1.Size = New System.Drawing.Size(749, 194) - Me.UcrRowGroup1.TabIndex = 283 + Me.ucrRowGroups.Location = New System.Drawing.Point(3, 38) + Me.ucrRowGroups.Name = "ucrRowGroups" + Me.ucrRowGroups.Size = New System.Drawing.Size(749, 194) + Me.ucrRowGroups.TabIndex = 283 ' 'ucrRows ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.UcrRowGroup1) + Me.Controls.Add(Me.ucrRowGroups) Me.Controls.Add(Me.rdoStyle) Me.Controls.Add(Me.rdoGroup) Me.Controls.Add(Me.rdoSummary) Me.Controls.Add(Me.ucrPnlRow) Me.Name = "ucrRows" - Me.Size = New System.Drawing.Size(753, 235) + Me.Size = New System.Drawing.Size(753, 237) Me.ResumeLayout(False) End Sub @@ -123,5 +123,5 @@ Partial Class ucrRows Friend WithEvents rdoGroup As RadioButton Friend WithEvents rdoSummary As RadioButton Friend WithEvents ucrPnlRow As UcrPanel - Friend WithEvents UcrRowGroup1 As ucrRowGroup + Friend WithEvents ucrRowGroups As ucrRowGroup End Class diff --git a/instat/UserTables/ucrRows.vb b/instat/UserTables/ucrRows.vb index 0e96cb21c27..30e6750570c 100644 --- a/instat/UserTables/ucrRows.vb +++ b/instat/UserTables/ucrRows.vb @@ -2,7 +2,7 @@ Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - UcrRowGroup1.Setup(strDataFrameName, clsOperator) + ucrRowGroups.Setup(strDataFrameName, clsOperator) End Sub End Class From 2060321569f778c47bd476b8b0c82056b5b4b4b5 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 13:12:16 +0300 Subject: [PATCH 037/273] Added column labels --- .../ucrColumnFormats.Designer.vb | 0 .../{ => Columns}/ucrColumnFormats.resx | 0 .../{ => Columns}/ucrColumnFormats.vb | 0 .../Columns/ucrColumnLabels.Designer.vb | 197 ++++++++++++++++++ .../ucrColumnLabels.resx} | 0 instat/UserTables/Columns/ucrColumnLabels.vb | 96 +++++++++ .../ucrColumnSpanners.Designer.vb | 80 +++---- .../{ => Columns}/ucrColumnSpanners.resx | 2 +- .../{ => Columns}/ucrColumnSpanners.vb | 17 +- .../UserTables/Columns/ucrColumns.Designer.vb | 183 ++++++++++++++++ .../UserTables/{ => Columns}/ucrColumns.resx | 0 instat/UserTables/Columns/ucrColumns.vb | 29 +++ .../{ => Rows}/ucrRowGroup.Designer.vb | 30 +-- instat/UserTables/Rows/ucrRowGroup.resx | 138 ++++++++++++ instat/UserTables/{ => Rows}/ucrRowGroup.vb | 12 +- .../{ => Rows}/ucrRowSummary.Designer.vb | 0 .../UserTables/{ => Rows}/ucrRowSummary.resx | 0 instat/UserTables/{ => Rows}/ucrRowSummary.vb | 0 .../UserTables/{ => Rows}/ucrRows.Designer.vb | 0 instat/UserTables/{ => Rows}/ucrRows.resx | 0 instat/UserTables/{ => Rows}/ucrRows.vb | 0 instat/UserTables/sdgTableOptions.Designer.vb | 2 +- instat/UserTables/ucrColumns.Designer.vb | 150 ------------- instat/UserTables/ucrColumns.vb | 7 - instat/instat.vbproj | 45 ++-- 25 files changed, 740 insertions(+), 248 deletions(-) rename instat/UserTables/{ => Columns}/ucrColumnFormats.Designer.vb (100%) rename instat/UserTables/{ => Columns}/ucrColumnFormats.resx (100%) rename instat/UserTables/{ => Columns}/ucrColumnFormats.vb (100%) create mode 100644 instat/UserTables/Columns/ucrColumnLabels.Designer.vb rename instat/UserTables/{ucrRowGroup.resx => Columns/ucrColumnLabels.resx} (100%) create mode 100644 instat/UserTables/Columns/ucrColumnLabels.vb rename instat/UserTables/{ => Columns}/ucrColumnSpanners.Designer.vb (92%) rename instat/UserTables/{ => Columns}/ucrColumnSpanners.resx (97%) rename instat/UserTables/{ => Columns}/ucrColumnSpanners.vb (78%) create mode 100644 instat/UserTables/Columns/ucrColumns.Designer.vb rename instat/UserTables/{ => Columns}/ucrColumns.resx (100%) create mode 100644 instat/UserTables/Columns/ucrColumns.vb rename instat/UserTables/{ => Rows}/ucrRowGroup.Designer.vb (92%) create mode 100644 instat/UserTables/Rows/ucrRowGroup.resx rename instat/UserTables/{ => Rows}/ucrRowGroup.vb (92%) rename instat/UserTables/{ => Rows}/ucrRowSummary.Designer.vb (100%) rename instat/UserTables/{ => Rows}/ucrRowSummary.resx (100%) rename instat/UserTables/{ => Rows}/ucrRowSummary.vb (100%) rename instat/UserTables/{ => Rows}/ucrRows.Designer.vb (100%) rename instat/UserTables/{ => Rows}/ucrRows.resx (100%) rename instat/UserTables/{ => Rows}/ucrRows.vb (100%) delete mode 100644 instat/UserTables/ucrColumns.Designer.vb delete mode 100644 instat/UserTables/ucrColumns.vb diff --git a/instat/UserTables/ucrColumnFormats.Designer.vb b/instat/UserTables/Columns/ucrColumnFormats.Designer.vb similarity index 100% rename from instat/UserTables/ucrColumnFormats.Designer.vb rename to instat/UserTables/Columns/ucrColumnFormats.Designer.vb diff --git a/instat/UserTables/ucrColumnFormats.resx b/instat/UserTables/Columns/ucrColumnFormats.resx similarity index 100% rename from instat/UserTables/ucrColumnFormats.resx rename to instat/UserTables/Columns/ucrColumnFormats.resx diff --git a/instat/UserTables/ucrColumnFormats.vb b/instat/UserTables/Columns/ucrColumnFormats.vb similarity index 100% rename from instat/UserTables/ucrColumnFormats.vb rename to instat/UserTables/Columns/ucrColumnFormats.vb diff --git a/instat/UserTables/Columns/ucrColumnLabels.Designer.vb b/instat/UserTables/Columns/ucrColumnLabels.Designer.vb new file mode 100644 index 00000000000..e3e235b0ba8 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnLabels.Designer.vb @@ -0,0 +1,197 @@ + _ +Partial Class ucrColumnLabels + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.dataGridColLabels = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.ucrInputColLabel = New instat.ucrInputTextBox() + Me.lblCondition = New System.Windows.Forms.Label() + Me.lblColLabels = New System.Windows.Forms.Label() + Me.btnClearLabels = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.btnAddLabel = New System.Windows.Forms.Button() + Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + CType(Me.dataGridColLabels, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'dataGridColLabels + ' + Me.dataGridColLabels.AllowUserToAddRows = False + Me.dataGridColLabels.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridColLabels.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) + Me.dataGridColLabels.Location = New System.Drawing.Point(230, 95) + Me.dataGridColLabels.Name = "dataGridColLabels" + Me.dataGridColLabels.RowHeadersWidth = 62 + Me.dataGridColLabels.Size = New System.Drawing.Size(339, 95) + Me.dataGridColLabels.TabIndex = 309 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colLabel.HeaderText = "Column" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colCodnition.HeaderText = "Label" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + ' + 'colFormat + ' + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.ReadOnly = True + Me.colFormat.Text = "Format" + Me.colFormat.UseColumnTextForButtonValue = True + Me.colFormat.Width = 99 + ' + 'ucrInputColLabel + ' + Me.ucrInputColLabel.AddQuotesIfUnrecognised = True + Me.ucrInputColLabel.AutoSize = True + Me.ucrInputColLabel.IsMultiline = False + Me.ucrInputColLabel.IsReadOnly = False + Me.ucrInputColLabel.Location = New System.Drawing.Point(357, 27) + Me.ucrInputColLabel.Name = "ucrInputColLabel" + Me.ucrInputColLabel.Size = New System.Drawing.Size(100, 21) + Me.ucrInputColLabel.TabIndex = 320 + ' + 'lblCondition + ' + Me.lblCondition.AutoSize = True + Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCondition.Location = New System.Drawing.Point(358, 10) + Me.lblCondition.Name = "lblCondition" + Me.lblCondition.Size = New System.Drawing.Size(36, 13) + Me.lblCondition.TabIndex = 319 + Me.lblCondition.Text = "Label:" + ' + 'lblColLabels + ' + Me.lblColLabels.AutoSize = True + Me.lblColLabels.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColLabels.Location = New System.Drawing.Point(227, 76) + Me.lblColLabels.Name = "lblColLabels" + Me.lblColLabels.Size = New System.Drawing.Size(79, 13) + Me.lblColLabels.TabIndex = 315 + Me.lblColLabels.Text = "Column Labels:" + ' + 'btnClearLabels + ' + Me.btnClearLabels.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearLabels.Location = New System.Drawing.Point(490, 71) + Me.btnClearLabels.Name = "btnClearLabels" + Me.btnClearLabels.Size = New System.Drawing.Size(79, 23) + Me.btnClearLabels.TabIndex = 314 + Me.btnClearLabels.Tag = "" + Me.btnClearLabels.Text = "Clear" + Me.btnClearLabels.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(227, 11) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 313 + Me.lblColumns.Text = "Column:" + ' + 'btnAddLabel + ' + Me.btnAddLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddLabel.Location = New System.Drawing.Point(462, 26) + Me.btnAddLabel.Name = "btnAddLabel" + Me.btnAddLabel.Size = New System.Drawing.Size(78, 23) + Me.btnAddLabel.TabIndex = 312 + Me.btnAddLabel.Tag = "" + Me.btnAddLabel.Text = "Add" + Me.btnAddLabel.UseVisualStyleBackColor = True + ' + 'ucrReceiverSingleCol + ' + Me.ucrReceiverSingleCol.AutoSize = True + Me.ucrReceiverSingleCol.frmParent = Nothing + Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(229, 27) + Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" + Me.ucrReceiverSingleCol.Selector = Nothing + Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 21) + Me.ucrReceiverSingleCol.strNcFilePath = "" + Me.ucrReceiverSingleCol.TabIndex = 311 + Me.ucrReceiverSingleCol.ucrSelector = Nothing + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 5) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 310 + ' + 'ucrColumnLabels + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dataGridColLabels) + Me.Controls.Add(Me.ucrInputColLabel) + Me.Controls.Add(Me.lblCondition) + Me.Controls.Add(Me.lblColLabels) + Me.Controls.Add(Me.btnClearLabels) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnAddLabel) + Me.Controls.Add(Me.ucrReceiverSingleCol) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Name = "ucrColumnLabels" + Me.Size = New System.Drawing.Size(575, 194) + CType(Me.dataGridColLabels, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents dataGridColLabels As DataGridView + Friend WithEvents ucrInputColLabel As ucrInputTextBox + Friend WithEvents lblCondition As Label + Friend WithEvents lblColLabels As Label + Friend WithEvents btnClearLabels As Button + Friend WithEvents lblColumns As Label + Friend WithEvents btnAddLabel As Button + Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colFormat As DataGridViewButtonColumn +End Class diff --git a/instat/UserTables/ucrRowGroup.resx b/instat/UserTables/Columns/ucrColumnLabels.resx similarity index 100% rename from instat/UserTables/ucrRowGroup.resx rename to instat/UserTables/Columns/ucrColumnLabels.resx diff --git a/instat/UserTables/Columns/ucrColumnLabels.vb b/instat/UserTables/Columns/ucrColumnLabels.vb new file mode 100644 index 00000000000..d24834a2dcc --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnLabels.vb @@ -0,0 +1,96 @@ +Imports System.Reflection + +Public Class ucrColumnLabels + + Private clsOperator As New ROperator + Private clsColsLabelRParameter As New RParameter + Private bFirstload As Boolean = True + + Private Sub InitialiseDialog() + ucrReceiverSingleCol.Selector = ucrSelectorCols + ucrReceiverSingleCol.SetMeAsReceiver() + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + dataGridColLabels.Rows.Clear() + + + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("cols_label", clsOperator) + If lstRParams.Count > 0 Then + clsColsLabelRParameter = lstRParams(0) + Else + Dim clsColsLabelRFunction As New RFunction + clsColsLabelRFunction.SetPackageName("gt") + clsColsLabelRFunction.SetRCommand("cols_label") + clsColsLabelRParameter = New RParameter(strParameterName:="cols_label_param", strParamValue:=clsColsLabelRFunction, bNewIncludeArgumentName:=False) + End If + + For Each clsColLabelRParam As RParameter In clsColsLabelRParameter.clsArgumentCodeStructure.clsParameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridColLabels) + row.Cells(0).Value = clsColLabelRParam.strArgumentName + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsColLabelRParam.strArgumentValue, False) + row.Tag = clsColLabelRParam + dataGridColLabels.Rows.Add(row) + Next + + End Sub + + Private Sub btnAddLabel_Click(sender As Object, e As EventArgs) Handles btnAddLabel.Click + + Dim strColumnName As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) + Dim strColumnLabel As String = ucrInputColLabel.GetValue() + + Dim clsRParam As New RParameter(strParameterName:=clsTablesUtils.GetStringValue(strColumnName, False), strParamValue:=clsTablesUtils.GetStringValue(strColumnLabel, True), iNewPosition:=0) + + clsColsLabelRParameter.clsArgumentCodeStructure.AddParameter(clsRParam) + + Dim row As DataGridViewRow = Nothing + For Each existingRow As DataGridViewRow In dataGridColLabels.Rows + If existingRow.Cells(0).Value = strColumnName Then + row = existingRow + row.Cells(0).Value = strColumnName + row.Cells(1).Value = strColumnLabel + row.Tag = clsRParam + End If + Next + + + If row Is Nothing Then + row = New DataGridViewRow + row.CreateCells(dataGridColLabels) + row.Cells(0).Value = strColumnName + row.Cells(1).Value = strColumnLabel + row.Tag = clsRParam + dataGridColLabels.Rows.Add(row) + End If + + + ' Add/update cols label parameter to the operator + clsOperator.AddParameter(clsColsLabelRParameter) + + ' Clear controls + ucrReceiverSingleCol.Clear() + ucrInputColLabel.SetName("") + + End Sub + + Private Sub btnClearLabels_Click(sender As Object, e As EventArgs) Handles btnClearLabels.Click + clsOperator.RemoveParameter(clsColsLabelRParameter) + dataGridColLabels.Rows.Clear() + End Sub + + + Private Sub ucrColSpanner_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSingleCol.ControlContentsChanged, ucrInputColLabel.ControlContentsChanged + btnAddLabel.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputColLabel.IsEmpty + End Sub + +End Class diff --git a/instat/UserTables/ucrColumnSpanners.Designer.vb b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb similarity index 92% rename from instat/UserTables/ucrColumnSpanners.Designer.vb rename to instat/UserTables/Columns/ucrColumnSpanners.Designer.vb index 65a72961cd5..1d296fe8707 100644 --- a/instat/UserTables/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb @@ -28,13 +28,13 @@ Partial Class ucrColumnSpanners Me.btnAddColSpanner = New System.Windows.Forms.Button() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGridSpanners = New System.Windows.Forms.DataGridView() - Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colValue = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() Me.lblColSpanner = New System.Windows.Forms.Label() Me.ucrInputColSpanner = New instat.ucrInputTextBox() + Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colSpanners = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() CType(Me.dataGridSpanners, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -44,9 +44,9 @@ Partial Class ucrColumnSpanners Me.lblSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.lblSpanners.Location = New System.Drawing.Point(245, 118) Me.lblSpanners.Name = "lblSpanners" - Me.lblSpanners.Size = New System.Drawing.Size(55, 13) + Me.lblSpanners.Size = New System.Drawing.Size(93, 13) Me.lblSpanners.TabIndex = 297 - Me.lblSpanners.Text = "Spanners:" + Me.lblSpanners.Text = "Column Spanners:" ' 'btnClearSpanners ' @@ -76,7 +76,7 @@ Partial Class ucrColumnSpanners Me.btnAddColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.btnAddColSpanner.Location = New System.Drawing.Point(472, 20) Me.btnAddColSpanner.Name = "btnAddColSpanner" - Me.btnAddColSpanner.Size = New System.Drawing.Size(99, 23) + Me.btnAddColSpanner.Size = New System.Drawing.Size(88, 23) Me.btnAddColSpanner.TabIndex = 292 Me.btnAddColSpanner.Tag = "" Me.btnAddColSpanner.Text = "Add" @@ -98,43 +98,13 @@ Partial Class ucrColumnSpanners ' Me.dataGridSpanners.AllowUserToAddRows = False Me.dataGridSpanners.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSpanners.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colValue, Me.colFormat}) + Me.dataGridSpanners.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colSpanners, Me.colFormat}) Me.dataGridSpanners.Location = New System.Drawing.Point(240, 138) Me.dataGridSpanners.Name = "dataGridSpanners" Me.dataGridSpanners.RowHeadersWidth = 62 Me.dataGridSpanners.Size = New System.Drawing.Size(369, 73) Me.dataGridSpanners.TabIndex = 289 ' - 'colId - ' - Me.colId.HeaderText = "ID" - Me.colId.Name = "colId" - Me.colId.ReadOnly = True - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 58 - ' - 'colValue - ' - Me.colValue.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colValue.HeaderText = "Column(s)/Spanner(s)" - Me.colValue.MinimumWidth = 8 - Me.colValue.Name = "colValue" - Me.colValue.Width = 134 - ' - 'colFormat - ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 - ' 'ucrReceiverMultipleCols ' Me.ucrReceiverMultipleCols.AutoSize = True @@ -169,6 +139,36 @@ Partial Class ucrColumnSpanners Me.ucrInputColSpanner.Size = New System.Drawing.Size(100, 21) Me.ucrInputColSpanner.TabIndex = 307 ' + 'colId + ' + Me.colId.HeaderText = "ID" + Me.colId.Name = "colId" + Me.colId.ReadOnly = True + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 58 + ' + 'colSpanners + ' + Me.colSpanners.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colSpanners.HeaderText = "Column(s)" + Me.colSpanners.MinimumWidth = 8 + Me.colSpanners.Name = "colSpanners" + Me.colSpanners.Width = 78 + ' + 'colFormat + ' + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 + ' 'ucrColumnSpanners ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -197,9 +197,9 @@ Partial Class ucrColumnSpanners Friend WithEvents dataGridSpanners As DataGridView Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents lblColSpanner As Label + Friend WithEvents ucrInputColSpanner As ucrInputTextBox Friend WithEvents colId As DataGridViewTextBoxColumn Friend WithEvents colLabel As DataGridViewTextBoxColumn - Friend WithEvents colValue As DataGridViewTextBoxColumn + Friend WithEvents colSpanners As DataGridViewTextBoxColumn Friend WithEvents colFormat As DataGridViewButtonColumn - Friend WithEvents ucrInputColSpanner As ucrInputTextBox End Class diff --git a/instat/UserTables/ucrColumnSpanners.resx b/instat/UserTables/Columns/ucrColumnSpanners.resx similarity index 97% rename from instat/UserTables/ucrColumnSpanners.resx rename to instat/UserTables/Columns/ucrColumnSpanners.resx index 4cf1a8cb8a9..0bab4cc3f3c 100644 --- a/instat/UserTables/ucrColumnSpanners.resx +++ b/instat/UserTables/Columns/ucrColumnSpanners.resx @@ -123,7 +123,7 @@ True - + True diff --git a/instat/UserTables/ucrColumnSpanners.vb b/instat/UserTables/Columns/ucrColumnSpanners.vb similarity index 78% rename from instat/UserTables/ucrColumnSpanners.vb rename to instat/UserTables/Columns/ucrColumnSpanners.vb index e7f49c0f728..83287bbe7be 100644 --- a/instat/UserTables/ucrColumnSpanners.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.vb @@ -25,7 +25,6 @@ Dim clsTabSpannerRFunction As RFunction = clsRParam.clsArgumentCodeStructure - ' Create a new row that represents the tab_footnote() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridSpanners) @@ -39,7 +38,6 @@ End If Next - ' Tag and add the tab_row_group() parameter function contents as a row row.Tag = clsRParam dataGridSpanners.Rows.Add(row) @@ -53,15 +51,15 @@ Dim strSpannerId As String = strSpannerLabel.Replace(" ", String.Empty) Dim strSpannerColsRFunction As String = mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False) - Dim clsTabRowGroupRFunction As New RFunction - clsTabRowGroupRFunction.SetPackageName("gt") - clsTabRowGroupRFunction.SetRCommand("tab_spanner") - clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="label", strParamValue:=clsTablesUtils.GetStringValue(strSpannerLabel, True), iNewPosition:=0)) - clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strSpannerColsRFunction, iNewPosition:=1)) - clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) + Dim clsTabSpannerRFunction As New RFunction + clsTabSpannerRFunction.SetPackageName("gt") + clsTabSpannerRFunction.SetRCommand("tab_spanner") + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="label", strParamValue:=clsTablesUtils.GetStringValue(strSpannerLabel, True), iNewPosition:=0)) + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strSpannerColsRFunction, iNewPosition:=1)) + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_spanner_param" & (dataGridSpanners.Rows.Count + 1), strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) + Dim clsRParam As New RParameter(strParameterName:="tab_spanner_param" & (dataGridSpanners.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) Dim row As New DataGridViewRow row.CreateCells(dataGridSpanners) @@ -70,7 +68,6 @@ row.Cells(1).Value = strSpannerLabel row.Cells(2).Value = strSpannerColsRFunction - ' Tag and add the tab_row_group() parameter function contents as a row row.Tag = clsRParam dataGridSpanners.Rows.Add(row) diff --git a/instat/UserTables/Columns/ucrColumns.Designer.vb b/instat/UserTables/Columns/ucrColumns.Designer.vb new file mode 100644 index 00000000000..0a2d7ce54cc --- /dev/null +++ b/instat/UserTables/Columns/ucrColumns.Designer.vb @@ -0,0 +1,183 @@ + _ +Partial Class ucrColumns + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.rdoStyles = New System.Windows.Forms.RadioButton() + Me.rdoSummaries = New System.Windows.Forms.RadioButton() + Me.rdoColFormats = New System.Windows.Forms.RadioButton() + Me.rdoColSpanners = New System.Windows.Forms.RadioButton() + Me.rdoColLabel = New System.Windows.Forms.RadioButton() + Me.ucrColumnLabels = New instat.ucrColumnLabels() + Me.ucrColumnSpanners = New instat.ucrColumnSpanners() + Me.ucrPnlCols = New instat.UcrPanel() + Me.SuspendLayout() + ' + 'rdoStyles + ' + Me.rdoStyles.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyles.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyles.FlatAppearance.BorderSize = 2 + Me.rdoStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyles.Location = New System.Drawing.Point(450, 3) + Me.rdoStyles.Name = "rdoStyles" + Me.rdoStyles.Size = New System.Drawing.Size(91, 29) + Me.rdoStyles.TabIndex = 292 + Me.rdoStyles.Text = "Styles" + Me.rdoStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyles.UseVisualStyleBackColor = True + ' + 'rdoSummaries + ' + Me.rdoSummaries.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoSummaries.BackColor = System.Drawing.SystemColors.Control + Me.rdoSummaries.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoSummaries.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummaries.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummaries.FlatAppearance.BorderSize = 2 + Me.rdoSummaries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSummaries.Location = New System.Drawing.Point(362, 3) + Me.rdoSummaries.Name = "rdoSummaries" + Me.rdoSummaries.Size = New System.Drawing.Size(91, 29) + Me.rdoSummaries.TabIndex = 291 + Me.rdoSummaries.Text = "Summaries" + Me.rdoSummaries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoSummaries.UseVisualStyleBackColor = True + ' + 'rdoColFormats + ' + Me.rdoColFormats.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColFormats.BackColor = System.Drawing.SystemColors.Control + Me.rdoColFormats.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColFormats.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColFormats.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColFormats.FlatAppearance.BorderSize = 2 + Me.rdoColFormats.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColFormats.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColFormats.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColFormats.Location = New System.Drawing.Point(273, 3) + Me.rdoColFormats.Name = "rdoColFormats" + Me.rdoColFormats.Size = New System.Drawing.Size(91, 29) + Me.rdoColFormats.TabIndex = 293 + Me.rdoColFormats.Text = "Formats" + Me.rdoColFormats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColFormats.UseVisualStyleBackColor = True + ' + 'rdoColSpanners + ' + Me.rdoColSpanners.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColSpanners.BackColor = System.Drawing.SystemColors.Control + Me.rdoColSpanners.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColSpanners.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColSpanners.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColSpanners.FlatAppearance.BorderSize = 2 + Me.rdoColSpanners.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColSpanners.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColSpanners.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColSpanners.Location = New System.Drawing.Point(184, 3) + Me.rdoColSpanners.Name = "rdoColSpanners" + Me.rdoColSpanners.Size = New System.Drawing.Size(91, 29) + Me.rdoColSpanners.TabIndex = 294 + Me.rdoColSpanners.Text = "Spanners" + Me.rdoColSpanners.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColSpanners.UseVisualStyleBackColor = True + ' + 'rdoColLabel + ' + Me.rdoColLabel.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColLabel.BackColor = System.Drawing.SystemColors.Control + Me.rdoColLabel.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColLabel.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColLabel.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColLabel.FlatAppearance.BorderSize = 2 + Me.rdoColLabel.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColLabel.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColLabel.Location = New System.Drawing.Point(96, 3) + Me.rdoColLabel.Name = "rdoColLabel" + Me.rdoColLabel.Size = New System.Drawing.Size(91, 29) + Me.rdoColLabel.TabIndex = 296 + Me.rdoColLabel.Text = "Labels" + Me.rdoColLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColLabel.UseVisualStyleBackColor = True + ' + 'ucrColumnLabels + ' + Me.ucrColumnLabels.Location = New System.Drawing.Point(16, 42) + Me.ucrColumnLabels.Name = "ucrColumnLabels" + Me.ucrColumnLabels.Size = New System.Drawing.Size(575, 194) + Me.ucrColumnLabels.TabIndex = 297 + ' + 'ucrColumnSpanners + ' + Me.ucrColumnSpanners.Location = New System.Drawing.Point(12, 40) + Me.ucrColumnSpanners.Name = "ucrColumnSpanners" + Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 215) + Me.ucrColumnSpanners.TabIndex = 295 + ' + 'ucrPnlCols + ' + Me.ucrPnlCols.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlCols.Location = New System.Drawing.Point(26, 3) + Me.ucrPnlCols.Name = "ucrPnlCols" + Me.ucrPnlCols.Size = New System.Drawing.Size(570, 29) + Me.ucrPnlCols.TabIndex = 289 + ' + 'ucrColumns + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrColumnLabels) + Me.Controls.Add(Me.rdoColLabel) + Me.Controls.Add(Me.ucrColumnSpanners) + Me.Controls.Add(Me.rdoColSpanners) + Me.Controls.Add(Me.rdoColFormats) + Me.Controls.Add(Me.rdoStyles) + Me.Controls.Add(Me.rdoSummaries) + Me.Controls.Add(Me.ucrPnlCols) + Me.Name = "ucrColumns" + Me.Size = New System.Drawing.Size(633, 260) + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents rdoStyles As RadioButton + Friend WithEvents rdoSummaries As RadioButton + Friend WithEvents ucrPnlCols As UcrPanel + Friend WithEvents rdoColFormats As RadioButton + Friend WithEvents rdoColSpanners As RadioButton + Friend WithEvents ucrColumnSpanners As ucrColumnSpanners + Friend WithEvents rdoColLabel As RadioButton + Friend WithEvents ucrColumnLabels As ucrColumnLabels +End Class diff --git a/instat/UserTables/ucrColumns.resx b/instat/UserTables/Columns/ucrColumns.resx similarity index 100% rename from instat/UserTables/ucrColumns.resx rename to instat/UserTables/Columns/ucrColumns.resx diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb new file mode 100644 index 00000000000..fe71f8dc2cd --- /dev/null +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -0,0 +1,29 @@ +Public Class ucrColumns + + Private bFirstload As Boolean = True + Private Sub InitialiseDialog() + ucrPnlCols.AddRadioButton(rdoColLabel) + ucrPnlCols.AddRadioButton(rdoColSpanners) + ucrPnlCols.AddRadioButton(rdoColFormats) + ucrPnlCols.AddRadioButton(rdoSummaries) + ucrPnlCols.AddRadioButton(rdoStyles) + rdoColLabel.Checked = True + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + ucrColumnLabels.Setup(strDataFrameName, clsOperator) + ucrColumnSpanners.Setup(strDataFrameName, clsOperator) + End Sub + + + Private Sub ucrPnlRow_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged + ucrColumnLabels.Visible = rdoColLabel.Checked + ucrColumnSpanners.Visible = rdoColSpanners.Checked + End Sub + +End Class diff --git a/instat/UserTables/ucrRowGroup.Designer.vb b/instat/UserTables/Rows/ucrRowGroup.Designer.vb similarity index 92% rename from instat/UserTables/ucrRowGroup.Designer.vb rename to instat/UserTables/Rows/ucrRowGroup.Designer.vb index cd44ebd4200..9b03887becb 100644 --- a/instat/UserTables/ucrRowGroup.Designer.vb +++ b/instat/UserTables/Rows/ucrRowGroup.Designer.vb @@ -34,7 +34,7 @@ Partial Class ucrRowGroup Me.cboConditionOperator = New System.Windows.Forms.ComboBox() Me.cboConditionValue = New System.Windows.Forms.ComboBox() Me.lblCondition = New System.Windows.Forms.Label() - Me.ucrSingleReceiverCol = New instat.ucrReceiverSingle() + Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrInputGroupLabel = New instat.ucrInputTextBox() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() @@ -105,7 +105,7 @@ Partial Class ucrRowGroup Me.btnAddCondition.Size = New System.Drawing.Size(96, 23) Me.btnAddCondition.TabIndex = 25 Me.btnAddCondition.Tag = "" - Me.btnAddCondition.Text = "Add Group" + Me.btnAddCondition.Text = "Add" Me.btnAddCondition.UseVisualStyleBackColor = True ' 'lblGroups @@ -156,18 +156,18 @@ Partial Class ucrRowGroup Me.lblCondition.TabIndex = 282 Me.lblCondition.Text = "Group Label:" ' - 'ucrSingleReceiverCol + 'ucrReceiverSingleCol ' - Me.ucrSingleReceiverCol.AutoSize = True - Me.ucrSingleReceiverCol.frmParent = Nothing - Me.ucrSingleReceiverCol.Location = New System.Drawing.Point(226, 27) - Me.ucrSingleReceiverCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSingleReceiverCol.Name = "ucrSingleReceiverCol" - Me.ucrSingleReceiverCol.Selector = Nothing - Me.ucrSingleReceiverCol.Size = New System.Drawing.Size(120, 21) - Me.ucrSingleReceiverCol.strNcFilePath = "" - Me.ucrSingleReceiverCol.TabIndex = 24 - Me.ucrSingleReceiverCol.ucrSelector = Nothing + Me.ucrReceiverSingleCol.AutoSize = True + Me.ucrReceiverSingleCol.frmParent = Nothing + Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(226, 27) + Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" + Me.ucrReceiverSingleCol.Selector = Nothing + Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 21) + Me.ucrReceiverSingleCol.strNcFilePath = "" + Me.ucrReceiverSingleCol.TabIndex = 24 + Me.ucrReceiverSingleCol.ucrSelector = Nothing ' 'ucrSelectorCols ' @@ -205,7 +205,7 @@ Partial Class ucrRowGroup Me.Controls.Add(Me.btnClearGroups) Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.btnAddCondition) - Me.Controls.Add(Me.ucrSingleReceiverCol) + Me.Controls.Add(Me.ucrReceiverSingleCol) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrRowGroup" @@ -221,7 +221,7 @@ Partial Class ucrRowGroup Friend WithEvents btnClearGroups As Button Friend WithEvents lblColumns As Label Friend WithEvents btnAddCondition As Button - Friend WithEvents ucrSingleReceiverCol As ucrReceiverSingle + Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle Friend WithEvents lblGroups As Label Friend WithEvents lblGroupCondition As Label Friend WithEvents cboConditionOperator As ComboBox diff --git a/instat/UserTables/Rows/ucrRowGroup.resx b/instat/UserTables/Rows/ucrRowGroup.resx new file mode 100644 index 00000000000..191e2e6453d --- /dev/null +++ b/instat/UserTables/Rows/ucrRowGroup.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb similarity index 92% rename from instat/UserTables/ucrRowGroup.vb rename to instat/UserTables/Rows/ucrRowGroup.vb index 3e058b90f16..36ddfd77e8a 100644 --- a/instat/UserTables/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -4,8 +4,8 @@ Private bFirstload As Boolean = True Private Sub InitialiseDialog() - ucrSingleReceiverCol.Selector = ucrSelectorCols - ucrSingleReceiverCol.SetMeAsReceiver() + ucrReceiverSingleCol.Selector = ucrSelectorCols + ucrReceiverSingleCol.SetMeAsReceiver() End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -50,7 +50,7 @@ Dim strGroupLabel As String = ucrInputGroupLabel.GetValue() Dim strConditionValue As String = If(cboConditionOperator.Text <> "Expression" AndAlso Not IsNumeric(cboConditionValue.Text), clsTablesUtils.GetStringValue(cboConditionValue.Text, True), cboConditionValue.Text) - Dim strCondition As String = ucrSingleReceiverCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & strConditionValue + Dim strCondition As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & strConditionValue Dim clsTabRowGroupRFunction As New RFunction clsTabRowGroupRFunction.SetPackageName("gt") @@ -75,7 +75,7 @@ ' Add to parameter clsOperator.AddParameter(clsRParam) - ucrSingleReceiverCol.Clear() + ucrReceiverSingleCol.Clear() ucrInputGroupLabel.SetName("") cboConditionValue.Text = "" @@ -92,11 +92,11 @@ EnableDisableAddConditionButton() End Sub - Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSingleReceiverCol.ControlContentsChanged, ucrInputGroupLabel.ControlContentsChanged + Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSingleCol.ControlContentsChanged, ucrInputGroupLabel.ControlContentsChanged EnableDisableAddConditionButton() End Sub Private Sub EnableDisableAddConditionButton() - btnAddCondition.Enabled = Not ucrSingleReceiverCol.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) + btnAddCondition.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) End Sub End Class diff --git a/instat/UserTables/ucrRowSummary.Designer.vb b/instat/UserTables/Rows/ucrRowSummary.Designer.vb similarity index 100% rename from instat/UserTables/ucrRowSummary.Designer.vb rename to instat/UserTables/Rows/ucrRowSummary.Designer.vb diff --git a/instat/UserTables/ucrRowSummary.resx b/instat/UserTables/Rows/ucrRowSummary.resx similarity index 100% rename from instat/UserTables/ucrRowSummary.resx rename to instat/UserTables/Rows/ucrRowSummary.resx diff --git a/instat/UserTables/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb similarity index 100% rename from instat/UserTables/ucrRowSummary.vb rename to instat/UserTables/Rows/ucrRowSummary.vb diff --git a/instat/UserTables/ucrRows.Designer.vb b/instat/UserTables/Rows/ucrRows.Designer.vb similarity index 100% rename from instat/UserTables/ucrRows.Designer.vb rename to instat/UserTables/Rows/ucrRows.Designer.vb diff --git a/instat/UserTables/ucrRows.resx b/instat/UserTables/Rows/ucrRows.resx similarity index 100% rename from instat/UserTables/ucrRows.resx rename to instat/UserTables/Rows/ucrRows.resx diff --git a/instat/UserTables/ucrRows.vb b/instat/UserTables/Rows/ucrRows.vb similarity index 100% rename from instat/UserTables/ucrRows.vb rename to instat/UserTables/Rows/ucrRows.vb diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index afb2eb40973..b8c594fea29 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -58,8 +58,8 @@ Partial Class sdgTableOptions 'tbpFormatOptions ' Me.tbpFormatOptions.Controls.Add(Me.tbpHeader) - Me.tbpFormatOptions.Controls.Add(Me.tbpRows) Me.tbpFormatOptions.Controls.Add(Me.tbpColumns) + Me.tbpFormatOptions.Controls.Add(Me.tbpRows) Me.tbpFormatOptions.Controls.Add(Me.tbpCells) Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) diff --git a/instat/UserTables/ucrColumns.Designer.vb b/instat/UserTables/ucrColumns.Designer.vb deleted file mode 100644 index a516eb605c4..00000000000 --- a/instat/UserTables/ucrColumns.Designer.vb +++ /dev/null @@ -1,150 +0,0 @@ - _ -Partial Class ucrColumns - Inherits System.Windows.Forms.UserControl - - 'UserControl overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.rdoStyle = New System.Windows.Forms.RadioButton() - Me.rdoSummary = New System.Windows.Forms.RadioButton() - Me.ucrPnlRow = New instat.UcrPanel() - Me.RadioButton1 = New System.Windows.Forms.RadioButton() - Me.RadioButton2 = New System.Windows.Forms.RadioButton() - Me.ucrColumnSpanners = New instat.ucrColumnSpanners() - Me.SuspendLayout() - ' - 'rdoStyle - ' - Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control - Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatAppearance.BorderSize = 2 - Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoStyle.Location = New System.Drawing.Point(406, 3) - Me.rdoStyle.Name = "rdoStyle" - Me.rdoStyle.Size = New System.Drawing.Size(91, 29) - Me.rdoStyle.TabIndex = 292 - Me.rdoStyle.Text = "Styles" - Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.UseVisualStyleBackColor = True - ' - 'rdoSummary - ' - Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control - Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatAppearance.BorderSize = 2 - Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSummary.Location = New System.Drawing.Point(318, 3) - Me.rdoSummary.Name = "rdoSummary" - Me.rdoSummary.Size = New System.Drawing.Size(91, 29) - Me.rdoSummary.TabIndex = 291 - Me.rdoSummary.Text = "Summaries" - Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.UseVisualStyleBackColor = True - ' - 'ucrPnlRow - ' - Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(26, 3) - Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(533, 29) - Me.ucrPnlRow.TabIndex = 289 - ' - 'RadioButton1 - ' - Me.RadioButton1.Appearance = System.Windows.Forms.Appearance.Button - Me.RadioButton1.BackColor = System.Drawing.SystemColors.Control - Me.RadioButton1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.RadioButton1.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.RadioButton1.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.RadioButton1.FlatAppearance.BorderSize = 2 - Me.RadioButton1.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.RadioButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.RadioButton1.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.RadioButton1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.RadioButton1.Location = New System.Drawing.Point(229, 3) - Me.RadioButton1.Name = "RadioButton1" - Me.RadioButton1.Size = New System.Drawing.Size(91, 29) - Me.RadioButton1.TabIndex = 293 - Me.RadioButton1.Text = "Formats" - Me.RadioButton1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.RadioButton1.UseVisualStyleBackColor = True - ' - 'RadioButton2 - ' - Me.RadioButton2.Appearance = System.Windows.Forms.Appearance.Button - Me.RadioButton2.BackColor = System.Drawing.SystemColors.Control - Me.RadioButton2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.RadioButton2.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.RadioButton2.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.RadioButton2.FlatAppearance.BorderSize = 2 - Me.RadioButton2.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.RadioButton2.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.RadioButton2.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.RadioButton2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.RadioButton2.Location = New System.Drawing.Point(140, 3) - Me.RadioButton2.Name = "RadioButton2" - Me.RadioButton2.Size = New System.Drawing.Size(91, 29) - Me.RadioButton2.TabIndex = 294 - Me.RadioButton2.Text = "Spanners" - Me.RadioButton2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.RadioButton2.UseVisualStyleBackColor = True - ' - 'ucrColumnSpanners - ' - Me.ucrColumnSpanners.Location = New System.Drawing.Point(12, 40) - Me.ucrColumnSpanners.Name = "ucrColumnSpanners" - Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 215) - Me.ucrColumnSpanners.TabIndex = 295 - ' - 'ucrColumns - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrColumnSpanners) - Me.Controls.Add(Me.RadioButton2) - Me.Controls.Add(Me.RadioButton1) - Me.Controls.Add(Me.rdoStyle) - Me.Controls.Add(Me.rdoSummary) - Me.Controls.Add(Me.ucrPnlRow) - Me.Name = "ucrColumns" - Me.Size = New System.Drawing.Size(633, 260) - Me.ResumeLayout(False) - - End Sub - - Friend WithEvents rdoStyle As RadioButton - Friend WithEvents rdoSummary As RadioButton - Friend WithEvents ucrPnlRow As UcrPanel - Friend WithEvents RadioButton1 As RadioButton - Friend WithEvents RadioButton2 As RadioButton - Friend WithEvents ucrColumnSpanners As ucrColumnSpanners -End Class diff --git a/instat/UserTables/ucrColumns.vb b/instat/UserTables/ucrColumns.vb deleted file mode 100644 index 33845937784..00000000000 --- a/instat/UserTables/ucrColumns.vb +++ /dev/null @@ -1,7 +0,0 @@ -Public Class ucrColumns - - Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - ucrColumnSpanners.Setup(strDataFrameName, clsOperator) - End Sub - -End Class diff --git a/instat/instat.vbproj b/instat/instat.vbproj index aeff90a7747..eece573c800 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3056,22 +3056,28 @@ UserControl - + ucrColumnFormats.vb - + UserControl - + + ucrColumnLabels.vb + + + UserControl + + ucrColumns.vb - + UserControl - + ucrColumnSpanners.vb - + UserControl @@ -3080,22 +3086,22 @@ UserControl - + ucrRowGroup.vb - + UserControl - + ucrRows.vb - + UserControl - + ucrRowSummary.vb - + UserControl @@ -5410,25 +5416,28 @@ ucrCells.vb - + ucrColumnFormats.vb - + + ucrColumnLabels.vb + + ucrColumns.vb - + ucrColumnSpanners.vb ucrHeader.vb - + ucrRowGroup.vb - + ucrRows.vb - + ucrRowSummary.vb From 52e17ab6348cd98e2fae43de08a11be7fb4f9477 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 14:20:58 +0300 Subject: [PATCH 038/273] Added stub tab --- .../{ => Cells}/ucrCells.Designer.vb | 0 instat/UserTables/{ => Cells}/ucrCells.resx | 0 instat/UserTables/{ => Cells}/ucrCells.vb | 0 .../{ => Header}/ucrHeader.Designer.vb | 0 instat/UserTables/{ => Header}/ucrHeader.resx | 0 instat/UserTables/{ => Header}/ucrHeader.vb | 0 .../ucrSourceNotes.Designer.vb | 0 .../{ => SourceNotes}/ucrSourceNotes.resx | 0 .../{ => SourceNotes}/ucrSourceNotes.vb | 0 instat/UserTables/Stub/ucrStub.Designer.vb | 138 ++++++++++++++++++ instat/UserTables/Stub/ucrStub.resx | 120 +++++++++++++++ instat/UserTables/Stub/ucrStub.vb | 25 ++++ instat/UserTables/sdgTableOptions.Designer.vb | 62 +++++--- instat/UserTables/sdgTableOptions.resx | 12 ++ instat/UserTables/sdgTableOptions.vb | 1 + instat/instat.vbproj | 27 ++-- 16 files changed, 357 insertions(+), 28 deletions(-) rename instat/UserTables/{ => Cells}/ucrCells.Designer.vb (100%) rename instat/UserTables/{ => Cells}/ucrCells.resx (100%) rename instat/UserTables/{ => Cells}/ucrCells.vb (100%) rename instat/UserTables/{ => Header}/ucrHeader.Designer.vb (100%) rename instat/UserTables/{ => Header}/ucrHeader.resx (100%) rename instat/UserTables/{ => Header}/ucrHeader.vb (100%) rename instat/UserTables/{ => SourceNotes}/ucrSourceNotes.Designer.vb (100%) rename instat/UserTables/{ => SourceNotes}/ucrSourceNotes.resx (100%) rename instat/UserTables/{ => SourceNotes}/ucrSourceNotes.vb (100%) create mode 100644 instat/UserTables/Stub/ucrStub.Designer.vb create mode 100644 instat/UserTables/Stub/ucrStub.resx create mode 100644 instat/UserTables/Stub/ucrStub.vb diff --git a/instat/UserTables/ucrCells.Designer.vb b/instat/UserTables/Cells/ucrCells.Designer.vb similarity index 100% rename from instat/UserTables/ucrCells.Designer.vb rename to instat/UserTables/Cells/ucrCells.Designer.vb diff --git a/instat/UserTables/ucrCells.resx b/instat/UserTables/Cells/ucrCells.resx similarity index 100% rename from instat/UserTables/ucrCells.resx rename to instat/UserTables/Cells/ucrCells.resx diff --git a/instat/UserTables/ucrCells.vb b/instat/UserTables/Cells/ucrCells.vb similarity index 100% rename from instat/UserTables/ucrCells.vb rename to instat/UserTables/Cells/ucrCells.vb diff --git a/instat/UserTables/ucrHeader.Designer.vb b/instat/UserTables/Header/ucrHeader.Designer.vb similarity index 100% rename from instat/UserTables/ucrHeader.Designer.vb rename to instat/UserTables/Header/ucrHeader.Designer.vb diff --git a/instat/UserTables/ucrHeader.resx b/instat/UserTables/Header/ucrHeader.resx similarity index 100% rename from instat/UserTables/ucrHeader.resx rename to instat/UserTables/Header/ucrHeader.resx diff --git a/instat/UserTables/ucrHeader.vb b/instat/UserTables/Header/ucrHeader.vb similarity index 100% rename from instat/UserTables/ucrHeader.vb rename to instat/UserTables/Header/ucrHeader.vb diff --git a/instat/UserTables/ucrSourceNotes.Designer.vb b/instat/UserTables/SourceNotes/ucrSourceNotes.Designer.vb similarity index 100% rename from instat/UserTables/ucrSourceNotes.Designer.vb rename to instat/UserTables/SourceNotes/ucrSourceNotes.Designer.vb diff --git a/instat/UserTables/ucrSourceNotes.resx b/instat/UserTables/SourceNotes/ucrSourceNotes.resx similarity index 100% rename from instat/UserTables/ucrSourceNotes.resx rename to instat/UserTables/SourceNotes/ucrSourceNotes.resx diff --git a/instat/UserTables/ucrSourceNotes.vb b/instat/UserTables/SourceNotes/ucrSourceNotes.vb similarity index 100% rename from instat/UserTables/ucrSourceNotes.vb rename to instat/UserTables/SourceNotes/ucrSourceNotes.vb diff --git a/instat/UserTables/Stub/ucrStub.Designer.vb b/instat/UserTables/Stub/ucrStub.Designer.vb new file mode 100644 index 00000000000..7bb2e4f0a35 --- /dev/null +++ b/instat/UserTables/Stub/ucrStub.Designer.vb @@ -0,0 +1,138 @@ + _ +Partial Class ucrStub + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblRowName = New System.Windows.Forms.Label() + Me.ucrReceiverSingleRowName = New instat.ucrReceiverSingle() + Me.lblGroupByCol = New System.Windows.Forms.Label() + Me.ucrReceiverSingleGroupByCol = New instat.ucrReceiverSingle() + Me.lblStubHeadLabel = New System.Windows.Forms.Label() + Me.ucrInputStubHead = New instat.ucrInputTextBox() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.SuspendLayout() + ' + 'lblRowName + ' + Me.lblRowName.AutoSize = True + Me.lblRowName.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowName.Location = New System.Drawing.Point(252, 54) + Me.lblRowName.Name = "lblRowName" + Me.lblRowName.Size = New System.Drawing.Size(63, 13) + Me.lblRowName.TabIndex = 37 + Me.lblRowName.Text = "Row Name:" + ' + 'ucrReceiverSingleRowName + ' + Me.ucrReceiverSingleRowName.AutoSize = True + Me.ucrReceiverSingleRowName.frmParent = Nothing + Me.ucrReceiverSingleRowName.Location = New System.Drawing.Point(255, 67) + Me.ucrReceiverSingleRowName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleRowName.Name = "ucrReceiverSingleRowName" + Me.ucrReceiverSingleRowName.Selector = Nothing + Me.ucrReceiverSingleRowName.Size = New System.Drawing.Size(142, 20) + Me.ucrReceiverSingleRowName.strNcFilePath = "" + Me.ucrReceiverSingleRowName.TabIndex = 36 + Me.ucrReceiverSingleRowName.ucrSelector = Nothing + ' + 'lblGroupByCol + ' + Me.lblGroupByCol.AutoSize = True + Me.lblGroupByCol.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupByCol.Location = New System.Drawing.Point(253, 9) + Me.lblGroupByCol.Name = "lblGroupByCol" + Me.lblGroupByCol.Size = New System.Drawing.Size(54, 13) + Me.lblGroupByCol.TabIndex = 35 + Me.lblGroupByCol.Text = "Group By:" + ' + 'ucrReceiverSingleGroupByCol + ' + Me.ucrReceiverSingleGroupByCol.AutoSize = True + Me.ucrReceiverSingleGroupByCol.frmParent = Nothing + Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(255, 23) + Me.ucrReceiverSingleGroupByCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleGroupByCol.Name = "ucrReceiverSingleGroupByCol" + Me.ucrReceiverSingleGroupByCol.Selector = Nothing + Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(142, 20) + Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" + Me.ucrReceiverSingleGroupByCol.TabIndex = 34 + Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing + ' + 'lblStubHeadLabel + ' + Me.lblStubHeadLabel.AutoSize = True + Me.lblStubHeadLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStubHeadLabel.Location = New System.Drawing.Point(253, 100) + Me.lblStubHeadLabel.Name = "lblStubHeadLabel" + Me.lblStubHeadLabel.Size = New System.Drawing.Size(85, 13) + Me.lblStubHeadLabel.TabIndex = 39 + Me.lblStubHeadLabel.Text = "Stubhead Label:" + ' + 'ucrInputStubHead + ' + Me.ucrInputStubHead.AddQuotesIfUnrecognised = True + Me.ucrInputStubHead.AutoSize = True + Me.ucrInputStubHead.IsMultiline = False + Me.ucrInputStubHead.IsReadOnly = False + Me.ucrInputStubHead.Location = New System.Drawing.Point(255, 116) + Me.ucrInputStubHead.Name = "ucrInputStubHead" + Me.ucrInputStubHead.Size = New System.Drawing.Size(142, 21) + Me.ucrInputStubHead.TabIndex = 40 + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(2, 3) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 291 + ' + 'ucrStub + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.ucrInputStubHead) + Me.Controls.Add(Me.lblStubHeadLabel) + Me.Controls.Add(Me.lblRowName) + Me.Controls.Add(Me.ucrReceiverSingleRowName) + Me.Controls.Add(Me.lblGroupByCol) + Me.Controls.Add(Me.ucrReceiverSingleGroupByCol) + Me.Name = "ucrStub" + Me.Size = New System.Drawing.Size(411, 191) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblRowName As Label + Friend WithEvents ucrReceiverSingleRowName As ucrReceiverSingle + Friend WithEvents lblGroupByCol As Label + Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle + Friend WithEvents lblStubHeadLabel As Label + Friend WithEvents ucrInputStubHead As ucrInputTextBox + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove +End Class diff --git a/instat/UserTables/Stub/ucrStub.resx b/instat/UserTables/Stub/ucrStub.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Stub/ucrStub.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb new file mode 100644 index 00000000000..fb0dbb93512 --- /dev/null +++ b/instat/UserTables/Stub/ucrStub.vb @@ -0,0 +1,25 @@ +Public Class ucrStub + + Private Sub initialiseDialog() + ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) + ucrReceiverSingleRowName.SetParameterIsString() + ucrReceiverSingleRowName.Selector = ucrSelectorCols + ucrReceiverSingleRowName.SetLinkedDisplayControl(lblRowName) + + ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 1)) + ucrReceiverSingleGroupByCol.SetParameterIsString() + ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols + ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) + + + 'ucrInputHeaderTitle.SetParameter(New RParameter("title_text_param", 0, bNewIncludeArgumentName:=False)) + + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + + End Sub + + + +End Class diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index b8c594fea29..279424e31fe 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -25,10 +25,11 @@ Partial Class sdgTableOptions Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() Me.ucrHeaderOptions = New instat.ucrHeader() - Me.tbpRows = New System.Windows.Forms.TabPage() - Me.ucrRows = New instat.ucrRows() + Me.tbpStub = New System.Windows.Forms.TabPage() Me.tbpColumns = New System.Windows.Forms.TabPage() Me.ucrColumns = New instat.ucrColumns() + Me.tbpRows = New System.Windows.Forms.TabPage() + Me.ucrRows = New instat.ucrRows() Me.tbpCells = New System.Windows.Forms.TabPage() Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() @@ -45,10 +46,12 @@ Partial Class sdgTableOptions Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.ucrStub = New instat.ucrStub() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() - Me.tbpRows.SuspendLayout() + Me.tbpStub.SuspendLayout() Me.tbpColumns.SuspendLayout() + Me.tbpRows.SuspendLayout() Me.tbpCells.SuspendLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() @@ -58,6 +61,7 @@ Partial Class sdgTableOptions 'tbpFormatOptions ' Me.tbpFormatOptions.Controls.Add(Me.tbpHeader) + Me.tbpFormatOptions.Controls.Add(Me.tbpStub) Me.tbpFormatOptions.Controls.Add(Me.tbpColumns) Me.tbpFormatOptions.Controls.Add(Me.tbpRows) Me.tbpFormatOptions.Controls.Add(Me.tbpCells) @@ -87,22 +91,15 @@ Partial Class sdgTableOptions Me.ucrHeaderOptions.Size = New System.Drawing.Size(303, 114) Me.ucrHeaderOptions.TabIndex = 16 ' - 'tbpRows + 'tbpStub ' - Me.tbpRows.Controls.Add(Me.ucrRows) - Me.tbpRows.Location = New System.Drawing.Point(4, 22) - Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(771, 324) - Me.tbpRows.TabIndex = 7 - Me.tbpRows.Text = "Rows" - Me.tbpRows.UseVisualStyleBackColor = True - ' - 'ucrRows - ' - Me.ucrRows.Location = New System.Drawing.Point(7, 9) - Me.ucrRows.Name = "ucrRows" - Me.ucrRows.Size = New System.Drawing.Size(750, 237) - Me.ucrRows.TabIndex = 0 + Me.tbpStub.Controls.Add(Me.ucrStub) + Me.tbpStub.Location = New System.Drawing.Point(4, 22) + Me.tbpStub.Name = "tbpStub" + Me.tbpStub.Size = New System.Drawing.Size(771, 324) + Me.tbpStub.TabIndex = 9 + Me.tbpStub.Text = "Stub" + Me.tbpStub.UseVisualStyleBackColor = True ' 'tbpColumns ' @@ -121,6 +118,23 @@ Partial Class sdgTableOptions Me.ucrColumns.Size = New System.Drawing.Size(700, 270) Me.ucrColumns.TabIndex = 0 ' + 'tbpRows + ' + Me.tbpRows.Controls.Add(Me.ucrRows) + Me.tbpRows.Location = New System.Drawing.Point(4, 22) + Me.tbpRows.Name = "tbpRows" + Me.tbpRows.Size = New System.Drawing.Size(771, 324) + Me.tbpRows.TabIndex = 7 + Me.tbpRows.Text = "Rows" + Me.tbpRows.UseVisualStyleBackColor = True + ' + 'ucrRows + ' + Me.ucrRows.Location = New System.Drawing.Point(7, 9) + Me.ucrRows.Name = "ucrRows" + Me.ucrRows.Size = New System.Drawing.Size(750, 237) + Me.ucrRows.TabIndex = 0 + ' 'tbpCells ' Me.tbpCells.Controls.Add(Me.dataGridCellFooterNotes) @@ -278,6 +292,13 @@ Partial Class sdgTableOptions Me.ucrBaseSubdialog.Size = New System.Drawing.Size(254, 29) Me.ucrBaseSubdialog.TabIndex = 4 ' + 'ucrStub + ' + Me.ucrStub.Location = New System.Drawing.Point(7, 7) + Me.ucrStub.Name = "ucrStub" + Me.ucrStub.Size = New System.Drawing.Size(411, 191) + Me.ucrStub.TabIndex = 0 + ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -291,8 +312,9 @@ Partial Class sdgTableOptions Me.Text = "Table Options" Me.tbpFormatOptions.ResumeLayout(False) Me.tbpHeader.ResumeLayout(False) - Me.tbpRows.ResumeLayout(False) + Me.tbpStub.ResumeLayout(False) Me.tbpColumns.ResumeLayout(False) + Me.tbpRows.ResumeLayout(False) Me.tbpCells.ResumeLayout(False) Me.tbpCells.PerformLayout() CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() @@ -327,4 +349,6 @@ Partial Class sdgTableOptions Friend WithEvents tbpColumns As TabPage Friend WithEvents ucrColumns As ucrColumns Friend WithEvents ucrRows As ucrRows + Friend WithEvents tbpStub As TabPage + Friend WithEvents ucrStub As ucrStub End Class diff --git a/instat/UserTables/sdgTableOptions.resx b/instat/UserTables/sdgTableOptions.resx index 418e7a89629..0801bc20640 100644 --- a/instat/UserTables/sdgTableOptions.resx +++ b/instat/UserTables/sdgTableOptions.resx @@ -129,4 +129,16 @@ True + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index ea9e673463e..92f75780f9e 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -64,6 +64,7 @@ Public Class sdgTableOptions clsOperator = clsNewOperator ucrHeaderOptions.Setup(clsOperator) + ucrStub.Setup("survey", clsOperator) ucrRows.Setup("survey", clsOperator) ucrColumns.Setup("survey", clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) diff --git a/instat/instat.vbproj b/instat/instat.vbproj index eece573c800..92c40c68d42 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3050,10 +3050,10 @@ UserControl - + ucrCells.vb - + UserControl @@ -3080,10 +3080,10 @@ UserControl - + ucrHeader.vb - + UserControl @@ -3104,10 +3104,16 @@ UserControl - + ucrSourceNotes.vb - + + UserControl + + + ucrStub.vb + + UserControl @@ -5413,7 +5419,7 @@ ucrOutputPages.vb - + ucrCells.vb @@ -5428,7 +5434,7 @@ ucrColumnSpanners.vb - + ucrHeader.vb @@ -5440,9 +5446,12 @@ ucrRowSummary.vb - + ucrSourceNotes.vb + + ucrStub.vb + From ffc52291bcfbf3c7daad56f6ad6d8dae37d90200 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 15:27:49 +0300 Subject: [PATCH 039/273] Stub design changes --- instat/UserTables/Stub/ucrStub.vb | 55 +++++++++++++++++++++++++++++-- 1 file changed, 52 insertions(+), 3 deletions(-) diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb index fb0dbb93512..dfa4de2dded 100644 --- a/instat/UserTables/Stub/ucrStub.vb +++ b/instat/UserTables/Stub/ucrStub.vb @@ -1,4 +1,11 @@ -Public Class ucrStub +Imports Antlr.Runtime + +Public Class ucrStub + + Private clsOperator As New ROperator + Private clsStubHeadRParameter As RParameter + Private clsGtRFunction As New RFunction + Private bFirstload As Boolean = True Private Sub initialiseDialog() ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) @@ -11,13 +18,55 @@ ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) - - 'ucrInputHeaderTitle.SetParameter(New RParameter("title_text_param", 0, bNewIncludeArgumentName:=False)) + ucrInputStubHead.SetParameter(New RParameter("label", 0)) End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If 1 = 1 Then + Exit Sub + End If + + If bFirstload Then + initialiseDialog() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + Dim lstRParams As List(Of RParameter) + + lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand("gt", clsOperator) + + ' The GT paramter should always be there. + If lstRParams.Count > 0 Then + clsGtRFunction = lstRParams(0).clsArgumentCodeStructure + ucrReceiverSingleRowName.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) + ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) + End If + + + lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_stubhead", clsOperator) + If lstRParams.Count > 0 Then + clsStubHeadRParameter = lstRParams(0) + Else + Dim clstabStubHeadFunction As New RFunction + clstabStubHeadFunction.SetPackageName("gt") + clstabStubHeadFunction.SetRCommand("tab_stubhead") + clsStubHeadRParameter = New RParameter(strParameterName:="tab_stubhead_param", strParamValue:=clstabStubHeadFunction, bNewIncludeArgumentName:=False) + End If + + + End Sub + + Private Sub ucrInputStubHead_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStubHead.ControlValueChanged + If ucrInputStubHead.IsEmpty Then + clsOperator.RemoveParameter(clsStubHeadRParameter) + Else + clsStubHeadRParameter.clsArgumentCodeStructure.AddParameter("label", strParameterValue:=clsTablesUtils.GetStringValue(ucrInputStubHead.GetValue(), True) + clsOperator.AddParameter(clsStubHeadRParameter) + End If End Sub From 7c373453b1b1d020e7c35cd086c1d35ab30a86d1 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 15:41:39 +0300 Subject: [PATCH 040/273] Added stub functionality --- instat/UserTables/Stub/ucrStub.vb | 12 +- instat/UserTables/dlgGeneralTable.Designer.vb | 139 +++++------------- instat/UserTables/dlgGeneralTable.vb | 13 -- 3 files changed, 41 insertions(+), 123 deletions(-) diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb index dfa4de2dded..59827d52bf6 100644 --- a/instat/UserTables/Stub/ucrStub.vb +++ b/instat/UserTables/Stub/ucrStub.vb @@ -24,10 +24,6 @@ Public Class ucrStub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If 1 = 1 Then - Exit Sub - End If - If bFirstload Then initialiseDialog() bFirstload = False @@ -35,6 +31,8 @@ Public Class ucrStub Me.clsOperator = clsOperator + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + Dim lstRParams As List(Of RParameter) lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand("gt", clsOperator) @@ -42,8 +40,8 @@ Public Class ucrStub ' The GT paramter should always be there. If lstRParams.Count > 0 Then clsGtRFunction = lstRParams(0).clsArgumentCodeStructure - ucrReceiverSingleRowName.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) - ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) + ucrReceiverSingleRowName.SetRCode(clsGtRFunction, False, bCloneIfNeeded:=True) + ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, False, bCloneIfNeeded:=True) End If @@ -64,7 +62,7 @@ Public Class ucrStub If ucrInputStubHead.IsEmpty Then clsOperator.RemoveParameter(clsStubHeadRParameter) Else - clsStubHeadRParameter.clsArgumentCodeStructure.AddParameter("label", strParameterValue:=clsTablesUtils.GetStringValue(ucrInputStubHead.GetValue(), True) + clsStubHeadRParameter.clsArgumentCodeStructure.AddParameter("label", strParameterValue:=clsTablesUtils.GetStringValue(ucrInputStubHead.GetValue(), True)) clsOperator.AddParameter(clsStubHeadRParameter) End If End Sub diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index 20e2ee99f6e..7c434eb7c8e 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -34,30 +34,24 @@ Partial Class dlgGeneralTable Me.btnMoreOptions = New System.Windows.Forms.Button() Me.ucrBase = New instat.ucrButtons() Me.ucrSaveTable = New instat.ucrSave() - Me.ucrReceiverSingleGroupByCol = New instat.ucrReceiverSingle() - Me.lblGroupByCol = New System.Windows.Forms.Label() Me.ucrChkPreview = New instat.ucrCheck() Me.ucrNudPreview = New instat.ucrNud() - Me.lblRowName = New System.Windows.Forms.Label() - Me.ucrReceiverSingleRowName = New instat.ucrReceiverSingle() Me.SuspendLayout() ' 'btnHeaderSubTitleFormat ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(590, 109) - Me.btnHeaderSubTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(393, 71) Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(112, 35) + Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) Me.btnHeaderSubTitleFormat.TabIndex = 19 Me.btnHeaderSubTitleFormat.Text = "Format" Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True ' 'btnHeaderTitleFormat ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(590, 45) - Me.btnHeaderTitleFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(393, 29) Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(118, 35) + Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) Me.btnHeaderTitleFormat.TabIndex = 18 Me.btnHeaderTitleFormat.Text = "Format" Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True @@ -68,10 +62,10 @@ Partial Class dlgGeneralTable Me.ucrInputHeaderSubtitle.AutoSize = True Me.ucrInputHeaderSubtitle.IsMultiline = False Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(374, 112) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(249, 73) + Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(213, 32) + Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(142, 21) Me.ucrInputHeaderSubtitle.TabIndex = 17 ' 'ucrInputHeaderTitle @@ -80,20 +74,19 @@ Partial Class dlgGeneralTable Me.ucrInputHeaderTitle.AutoSize = True Me.ucrInputHeaderTitle.IsMultiline = False Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(374, 45) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(249, 29) + Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(213, 32) + Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(142, 21) Me.ucrInputHeaderTitle.TabIndex = 16 ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(369, 86) - Me.lblHeaderSubtitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(246, 56) Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(67, 20) + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) Me.lblHeaderSubtitle.TabIndex = 15 Me.lblHeaderSubtitle.Text = "Subtitle:" ' @@ -101,10 +94,9 @@ Partial Class dlgGeneralTable ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(369, 14) - Me.lblHeaderTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHeaderTitle.Location = New System.Drawing.Point(246, 9) Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(42, 20) + Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) Me.lblHeaderTitle.TabIndex = 14 Me.lblHeaderTitle.Text = "Title:" ' @@ -114,21 +106,21 @@ Partial Class dlgGeneralTable Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(14, 14) + Me.ucrSelectorCols.Location = New System.Drawing.Point(9, 9) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 22 ' 'ucrReceiverMultipleCols ' Me.ucrReceiverMultipleCols.AutoSize = True Me.ucrReceiverMultipleCols.frmParent = Me - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(375, 174) + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(250, 113) Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(212, 154) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(141, 100) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 23 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -137,19 +129,17 @@ Partial Class dlgGeneralTable ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(370, 154) - Me.lblColumns.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblColumns.Location = New System.Drawing.Point(247, 100) Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(75, 20) + Me.lblColumns.Size = New System.Drawing.Size(50, 13) Me.lblColumns.TabIndex = 24 Me.lblColumns.Text = "Columns:" ' 'btnMoreOptions ' - Me.btnMoreOptions.Location = New System.Drawing.Point(2, 419) - Me.btnMoreOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnMoreOptions.Location = New System.Drawing.Point(250, 225) Me.btnMoreOptions.Name = "btnMoreOptions" - Me.btnMoreOptions.Size = New System.Drawing.Size(171, 35) + Me.btnMoreOptions.Size = New System.Drawing.Size(141, 23) Me.btnMoreOptions.TabIndex = 25 Me.btnMoreOptions.Text = "More Options" Me.btnMoreOptions.UseVisualStyleBackColor = True @@ -157,53 +147,29 @@ Partial Class dlgGeneralTable 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(14, 524) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(9, 301) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(615, 80) + Me.ucrBase.Size = New System.Drawing.Size(410, 52) Me.ucrBase.TabIndex = 26 ' 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(14, 477) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTable.Location = New System.Drawing.Point(9, 267) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(478, 37) + Me.ucrSaveTable.Size = New System.Drawing.Size(319, 24) Me.ucrSaveTable.TabIndex = 27 ' - 'ucrReceiverSingleGroupByCol - ' - Me.ucrReceiverSingleGroupByCol.AutoSize = True - Me.ucrReceiverSingleGroupByCol.frmParent = Me - Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(374, 423) - Me.ucrReceiverSingleGroupByCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleGroupByCol.Name = "ucrReceiverSingleGroupByCol" - Me.ucrReceiverSingleGroupByCol.Selector = Nothing - Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(213, 31) - Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" - Me.ucrReceiverSingleGroupByCol.TabIndex = 28 - Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing - ' - 'lblGroupByCol - ' - Me.lblGroupByCol.AutoSize = True - Me.lblGroupByCol.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupByCol.Location = New System.Drawing.Point(370, 402) - Me.lblGroupByCol.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblGroupByCol.Name = "lblGroupByCol" - Me.lblGroupByCol.Size = New System.Drawing.Size(120, 30) - Me.lblGroupByCol.TabIndex = 29 - Me.lblGroupByCol.Text = "Group By:" - ' 'ucrChkPreview ' Me.ucrChkPreview.AutoSize = True Me.ucrChkPreview.Checked = False - Me.ucrChkPreview.Location = New System.Drawing.Point(14, 323) - Me.ucrChkPreview.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkPreview.Location = New System.Drawing.Point(9, 210) + Me.ucrChkPreview.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkPreview.Name = "ucrChkPreview" - Me.ucrChkPreview.Size = New System.Drawing.Size(216, 35) + Me.ucrChkPreview.Size = New System.Drawing.Size(144, 23) Me.ucrChkPreview.TabIndex = 30 ' 'ucrNudPreview @@ -211,50 +177,22 @@ Partial Class dlgGeneralTable Me.ucrNudPreview.AutoSize = True Me.ucrNudPreview.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreview.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreview.Location = New System.Drawing.Point(238, 323) - Me.ucrNudPreview.Margin = New System.Windows.Forms.Padding(9) + Me.ucrNudPreview.Location = New System.Drawing.Point(159, 208) + Me.ucrNudPreview.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrNudPreview.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreview.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreview.Name = "ucrNudPreview" - Me.ucrNudPreview.Size = New System.Drawing.Size(75, 31) + Me.ucrNudPreview.Size = New System.Drawing.Size(50, 20) Me.ucrNudPreview.TabIndex = 31 Me.ucrNudPreview.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblRowName - ' - Me.lblRowName.AutoSize = True - Me.lblRowName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowName.Location = New System.Drawing.Point(371, 338) - Me.lblRowName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblRowName.Name = "lblRowName" - Me.lblRowName.Size = New System.Drawing.Size(137, 30) - Me.lblRowName.TabIndex = 33 - Me.lblRowName.Text = "Row Name:" - ' - 'ucrReceiverSingleRowName - ' - Me.ucrReceiverSingleRowName.AutoSize = True - Me.ucrReceiverSingleRowName.frmParent = Me - Me.ucrReceiverSingleRowName.Location = New System.Drawing.Point(375, 359) - Me.ucrReceiverSingleRowName.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleRowName.Name = "ucrReceiverSingleRowName" - Me.ucrReceiverSingleRowName.Selector = Nothing - Me.ucrReceiverSingleRowName.Size = New System.Drawing.Size(213, 31) - Me.ucrReceiverSingleRowName.strNcFilePath = "" - Me.ucrReceiverSingleRowName.TabIndex = 32 - Me.ucrReceiverSingleRowName.ucrSelector = Nothing - ' 'dlgGeneralTable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(714, 615) - Me.Controls.Add(Me.lblRowName) - Me.Controls.Add(Me.ucrReceiverSingleRowName) + Me.ClientSize = New System.Drawing.Size(476, 361) Me.Controls.Add(Me.ucrNudPreview) Me.Controls.Add(Me.ucrChkPreview) - Me.Controls.Add(Me.lblGroupByCol) - Me.Controls.Add(Me.ucrReceiverSingleGroupByCol) Me.Controls.Add(Me.ucrSaveTable) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.btnMoreOptions) @@ -268,7 +206,6 @@ Partial Class dlgGeneralTable Me.Controls.Add(Me.lblHeaderSubtitle) Me.Controls.Add(Me.lblHeaderTitle) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "dlgGeneralTable" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Table" @@ -289,10 +226,6 @@ Partial Class dlgGeneralTable Friend WithEvents lblColumns As Label Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrSaveTable As ucrSave - Friend WithEvents lblGroupByCol As Label - Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle Friend WithEvents ucrNudPreview As ucrNud Friend WithEvents ucrChkPreview As ucrCheck - Friend WithEvents lblRowName As Label - Friend WithEvents ucrReceiverSingleRowName As ucrReceiverSingle End Class diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 1b4b356ab5d..f3877dd03ab 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -76,16 +76,6 @@ Public Class dlgGeneralTable ucrReceiverMultipleCols.Selector = ucrSelectorCols ucrReceiverMultipleCols.SetLinkedDisplayControl(lblColumns) - ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) - ucrReceiverSingleRowName.SetParameterIsString() - ucrReceiverSingleRowName.Selector = ucrSelectorCols - ucrReceiverSingleRowName.SetLinkedDisplayControl(lblRowName) - - ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 1)) - ucrReceiverSingleGroupByCol.SetParameterIsString() - ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols - ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) - ucrChkPreview.SetText("Preview") ucrChkPreview.AddParameterPresentCondition(True, "head", bNewIsPositive:=True) ucrChkPreview.AddParameterPresentCondition(False, "head", bNewIsPositive:=False) @@ -156,9 +146,6 @@ Public Class dlgGeneralTable ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) ucrSaveTable.SetRCode(clsBaseOperator, bReset) - ucrReceiverSingleRowName.SetRCode(clsGtRFunction, bReset) - ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, bReset) - ucrChkPreview.SetRCode(clsBaseOperator, bReset) ucrNudPreview.SetRCode(clsHeadRFunction, bReset) From 7f5a417cf081e86bd6f481a9d5681253a2ff4ece Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 15:58:36 +0300 Subject: [PATCH 041/273] Made rows changes --- instat/UserTables/Columns/ucrColumns.vb | 2 +- instat/UserTables/Rows/ucrRows.Designer.vb | 144 ++++++++++----------- instat/UserTables/Rows/ucrRows.vb | 15 +++ 3 files changed, 88 insertions(+), 73 deletions(-) diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb index fe71f8dc2cd..a3828819e1f 100644 --- a/instat/UserTables/Columns/ucrColumns.vb +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -21,7 +21,7 @@ End Sub - Private Sub ucrPnlRow_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged + Private Sub ucrPnlCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged ucrColumnLabels.Visible = rdoColLabel.Checked ucrColumnSpanners.Visible = rdoColSpanners.Checked End Sub diff --git a/instat/UserTables/Rows/ucrRows.Designer.vb b/instat/UserTables/Rows/ucrRows.Designer.vb index 819009ea4a0..3b94c4be79c 100644 --- a/instat/UserTables/Rows/ucrRows.Designer.vb +++ b/instat/UserTables/Rows/ucrRows.Designer.vb @@ -22,80 +22,80 @@ Partial Class ucrRows 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.rdoStyle = New System.Windows.Forms.RadioButton() - Me.rdoGroup = New System.Windows.Forms.RadioButton() - Me.rdoSummary = New System.Windows.Forms.RadioButton() - Me.ucrPnlRow = New instat.UcrPanel() + Me.rdoRpwsStyles = New System.Windows.Forms.RadioButton() + Me.rdoRowsGroups = New System.Windows.Forms.RadioButton() + Me.rdoRowsSummaries = New System.Windows.Forms.RadioButton() + Me.ucrPnlRows = New instat.UcrPanel() Me.ucrRowGroups = New instat.ucrRowGroup() Me.SuspendLayout() ' - 'rdoStyle + 'rdoRpwsStyles ' - Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control - Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatAppearance.BorderSize = 2 - Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoStyle.Location = New System.Drawing.Point(412, 3) - Me.rdoStyle.Name = "rdoStyle" - Me.rdoStyle.Size = New System.Drawing.Size(91, 29) - Me.rdoStyle.TabIndex = 282 - Me.rdoStyle.Text = "Styles" - Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.UseVisualStyleBackColor = True + Me.rdoRpwsStyles.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoRpwsStyles.BackColor = System.Drawing.SystemColors.Control + Me.rdoRpwsStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoRpwsStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRpwsStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRpwsStyles.FlatAppearance.BorderSize = 2 + Me.rdoRpwsStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRpwsStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoRpwsStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoRpwsStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoRpwsStyles.Location = New System.Drawing.Point(412, 3) + Me.rdoRpwsStyles.Name = "rdoRpwsStyles" + Me.rdoRpwsStyles.Size = New System.Drawing.Size(91, 29) + Me.rdoRpwsStyles.TabIndex = 282 + Me.rdoRpwsStyles.Text = "Styles" + Me.rdoRpwsStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRpwsStyles.UseVisualStyleBackColor = True ' - 'rdoGroup + 'rdoRowsGroups ' - Me.rdoGroup.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoGroup.BackColor = System.Drawing.SystemColors.Control - Me.rdoGroup.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoGroup.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoGroup.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGroup.FlatAppearance.BorderSize = 2 - Me.rdoGroup.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGroup.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoGroup.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoGroup.Location = New System.Drawing.Point(235, 3) - Me.rdoGroup.Name = "rdoGroup" - Me.rdoGroup.Size = New System.Drawing.Size(91, 29) - Me.rdoGroup.TabIndex = 280 - Me.rdoGroup.Text = "Groups" - Me.rdoGroup.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoGroup.UseVisualStyleBackColor = True + Me.rdoRowsGroups.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoRowsGroups.BackColor = System.Drawing.SystemColors.Control + Me.rdoRowsGroups.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoRowsGroups.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRowsGroups.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRowsGroups.FlatAppearance.BorderSize = 2 + Me.rdoRowsGroups.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRowsGroups.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoRowsGroups.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoRowsGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoRowsGroups.Location = New System.Drawing.Point(235, 3) + Me.rdoRowsGroups.Name = "rdoRowsGroups" + Me.rdoRowsGroups.Size = New System.Drawing.Size(91, 29) + Me.rdoRowsGroups.TabIndex = 280 + Me.rdoRowsGroups.Text = "Groups" + Me.rdoRowsGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRowsGroups.UseVisualStyleBackColor = True ' - 'rdoSummary + 'rdoRowsSummaries ' - Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control - Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatAppearance.BorderSize = 2 - Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSummary.Location = New System.Drawing.Point(324, 3) - Me.rdoSummary.Name = "rdoSummary" - Me.rdoSummary.Size = New System.Drawing.Size(91, 29) - Me.rdoSummary.TabIndex = 281 - Me.rdoSummary.Text = "Summaries" - Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.UseVisualStyleBackColor = True + Me.rdoRowsSummaries.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoRowsSummaries.BackColor = System.Drawing.SystemColors.Control + Me.rdoRowsSummaries.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoRowsSummaries.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRowsSummaries.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRowsSummaries.FlatAppearance.BorderSize = 2 + Me.rdoRowsSummaries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRowsSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoRowsSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoRowsSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoRowsSummaries.Location = New System.Drawing.Point(324, 3) + Me.rdoRowsSummaries.Name = "rdoRowsSummaries" + Me.rdoRowsSummaries.Size = New System.Drawing.Size(91, 29) + Me.rdoRowsSummaries.TabIndex = 281 + Me.rdoRowsSummaries.Text = "Summaries" + Me.rdoRowsSummaries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRowsSummaries.UseVisualStyleBackColor = True ' - 'ucrPnlRow + 'ucrPnlRows ' - Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(93, 3) - Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(506, 29) - Me.ucrPnlRow.TabIndex = 279 + Me.ucrPnlRows.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRows.Location = New System.Drawing.Point(93, 3) + Me.ucrPnlRows.Name = "ucrPnlRows" + Me.ucrPnlRows.Size = New System.Drawing.Size(506, 29) + Me.ucrPnlRows.TabIndex = 279 ' 'ucrRowGroups ' @@ -109,19 +109,19 @@ Partial Class ucrRows Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrRowGroups) - Me.Controls.Add(Me.rdoStyle) - Me.Controls.Add(Me.rdoGroup) - Me.Controls.Add(Me.rdoSummary) - Me.Controls.Add(Me.ucrPnlRow) + Me.Controls.Add(Me.rdoRpwsStyles) + Me.Controls.Add(Me.rdoRowsGroups) + Me.Controls.Add(Me.rdoRowsSummaries) + Me.Controls.Add(Me.ucrPnlRows) Me.Name = "ucrRows" Me.Size = New System.Drawing.Size(753, 237) Me.ResumeLayout(False) End Sub - Friend WithEvents rdoStyle As RadioButton - Friend WithEvents rdoGroup As RadioButton - Friend WithEvents rdoSummary As RadioButton - Friend WithEvents ucrPnlRow As UcrPanel + Friend WithEvents rdoRpwsStyles As RadioButton + Friend WithEvents rdoRowsGroups As RadioButton + Friend WithEvents rdoRowsSummaries As RadioButton + Friend WithEvents ucrPnlRows As UcrPanel Friend WithEvents ucrRowGroups As ucrRowGroup End Class diff --git a/instat/UserTables/Rows/ucrRows.vb b/instat/UserTables/Rows/ucrRows.vb index 30e6750570c..a8211fb25df 100644 --- a/instat/UserTables/Rows/ucrRows.vb +++ b/instat/UserTables/Rows/ucrRows.vb @@ -1,8 +1,23 @@ Public Class ucrRows + Private bFirstload As Boolean = True + Private Sub InitialiseDialog() + ucrPnlRows.AddRadioButton(rdoRowsGroups) + ucrPnlRows.AddRadioButton(rdoRowsSummaries) + ucrPnlRows.AddRadioButton(rdoRpwsStyles) + rdoRowsGroups.Checked = True + End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If ucrRowGroups.Setup(strDataFrameName, clsOperator) End Sub + Private Sub ucrPnlRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRows.ControlValueChanged + ucrRowGroups.Visible = rdoRowsGroups.Checked + End Sub + End Class From 082e06fcfa1e3fb3e99dce7ad5e3c5a93e228867 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 30 May 2024 17:56:34 +0300 Subject: [PATCH 042/273] added column format design --- .../Columns/ucrColumnFormats.Designer.vb | 139 ++++++++---------- .../UserTables/Columns/ucrColumnFormats.resx | 9 ++ .../UserTables/Columns/ucrColumns.Designer.vb | 10 ++ instat/UserTables/Columns/ucrColumns.vb | 1 + 4 files changed, 82 insertions(+), 77 deletions(-) diff --git a/instat/UserTables/Columns/ucrColumnFormats.Designer.vb b/instat/UserTables/Columns/ucrColumnFormats.Designer.vb index 1b182985adb..9da1802311f 100644 --- a/instat/UserTables/Columns/ucrColumnFormats.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnFormats.Designer.vb @@ -22,59 +22,46 @@ Partial Class ucrColumnFormats 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.lblGroupCondition = New System.Windows.Forms.Label() + Me.lblFormat = New System.Windows.Forms.Label() Me.lblGroups = New System.Windows.Forms.Label() - Me.ucrLogicalCombobox = New instat.ucrInputComboBox() Me.btnClearGroups = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() - Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() - Me.ucrFilterOperation = New instat.ucrInputComboBox() Me.btnAddGroupCondition = New System.Windows.Forms.Button() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGridGroups = New System.Windows.Forms.DataGridView() Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.ucrLogicalCombobox = New instat.ucrInputComboBox() + Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'lblGroupCondition + 'lblFormat ' - Me.lblGroupCondition.AutoSize = True - Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(381, 2) - Me.lblGroupCondition.Name = "lblGroupCondition" - Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) - Me.lblGroupCondition.TabIndex = 298 - Me.lblGroupCondition.Text = "Condition:" + Me.lblFormat.AutoSize = True + Me.lblFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFormat.Location = New System.Drawing.Point(373, 2) + Me.lblFormat.Name = "lblFormat" + Me.lblFormat.Size = New System.Drawing.Size(42, 13) + Me.lblFormat.TabIndex = 298 + Me.lblFormat.Text = "Format:" ' 'lblGroups ' Me.lblGroups.AutoSize = True Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(259, 92) + Me.lblGroups.Location = New System.Drawing.Point(239, 71) Me.lblGroups.Name = "lblGroups" Me.lblGroups.Size = New System.Drawing.Size(47, 13) Me.lblGroups.TabIndex = 297 Me.lblGroups.Text = "Formats:" ' - 'ucrLogicalCombobox - ' - Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True - Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 - Me.ucrLogicalCombobox.IsReadOnly = False - Me.ucrLogicalCombobox.Location = New System.Drawing.Point(456, 21) - Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" - Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) - Me.ucrLogicalCombobox.TabIndex = 296 - ' 'btnClearGroups ' Me.btnClearGroups.Enabled = False Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(543, 87) + Me.btnClearGroups.Location = New System.Drawing.Point(523, 65) Me.btnClearGroups.Name = "btnClearGroups" Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) Me.btnClearGroups.TabIndex = 295 @@ -86,67 +73,30 @@ Partial Class ucrColumnFormats ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(259, 5) + Me.lblColumns.Location = New System.Drawing.Point(239, 5) Me.lblColumns.Name = "lblColumns" Me.lblColumns.Size = New System.Drawing.Size(45, 13) Me.lblColumns.TabIndex = 294 Me.lblColumns.Text = "Column:" ' - 'ucrFilterByReceiver - ' - Me.ucrFilterByReceiver.AutoSize = True - Me.ucrFilterByReceiver.frmParent = Nothing - Me.ucrFilterByReceiver.Location = New System.Drawing.Point(256, 21) - Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" - Me.ucrFilterByReceiver.Selector = Nothing - Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) - Me.ucrFilterByReceiver.strNcFilePath = "" - Me.ucrFilterByReceiver.TabIndex = 291 - Me.ucrFilterByReceiver.ucrSelector = Nothing - ' - 'ucrFilterOperation - ' - Me.ucrFilterOperation.AddQuotesIfUnrecognised = True - Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFilterOperation.GetSetSelectedIndex = -1 - Me.ucrFilterOperation.IsReadOnly = False - Me.ucrFilterOperation.Location = New System.Drawing.Point(377, 21) - Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrFilterOperation.Name = "ucrFilterOperation" - Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) - Me.ucrFilterOperation.TabIndex = 293 - ' 'btnAddGroupCondition ' Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddGroupCondition.Location = New System.Drawing.Point(256, 42) + Me.btnAddGroupCondition.Location = New System.Drawing.Point(476, 19) Me.btnAddGroupCondition.Name = "btnAddGroupCondition" - Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) + Me.btnAddGroupCondition.Size = New System.Drawing.Size(93, 23) Me.btnAddGroupCondition.TabIndex = 292 Me.btnAddGroupCondition.Tag = "" Me.btnAddGroupCondition.Text = "Add" Me.btnAddGroupCondition.UseVisualStyleBackColor = True ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 5) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 290 - ' 'dataGridGroups ' Me.dataGridGroups.AllowUserToAddRows = False Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(262, 112) + Me.dataGridGroups.Location = New System.Drawing.Point(242, 90) Me.dataGridGroups.Name = "dataGridGroups" Me.dataGridGroups.RowHeadersWidth = 62 Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) @@ -155,18 +105,18 @@ Partial Class ucrColumnFormats 'colLabel ' Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Label" + Me.colLabel.HeaderText = "Column" Me.colLabel.MinimumWidth = 8 Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 58 + Me.colLabel.Width = 67 ' 'colCodnition ' Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.HeaderText = "Format" Me.colCodnition.MinimumWidth = 8 Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 76 + Me.colCodnition.Width = 64 ' 'colFormat ' @@ -176,35 +126,70 @@ Partial Class ucrColumnFormats Me.colFormat.Name = "colFormat" Me.colFormat.Width = 8 ' + 'ucrLogicalCombobox + ' + Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True + Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 + Me.ucrLogicalCombobox.IsReadOnly = False + Me.ucrLogicalCombobox.Location = New System.Drawing.Point(376, 21) + Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) + Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" + Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) + Me.ucrLogicalCombobox.TabIndex = 296 + ' + 'ucrFilterByReceiver + ' + Me.ucrFilterByReceiver.AutoSize = True + Me.ucrFilterByReceiver.frmParent = Nothing + Me.ucrFilterByReceiver.Location = New System.Drawing.Point(236, 21) + Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) + Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" + Me.ucrFilterByReceiver.Selector = Nothing + Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) + Me.ucrFilterByReceiver.strNcFilePath = "" + Me.ucrFilterByReceiver.TabIndex = 291 + Me.ucrFilterByReceiver.ucrSelector = Nothing + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 5) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 290 + ' 'ucrColumnFormats ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.lblGroupCondition) + Me.Controls.Add(Me.lblFormat) Me.Controls.Add(Me.lblGroups) Me.Controls.Add(Me.ucrLogicalCombobox) Me.Controls.Add(Me.btnClearGroups) Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.ucrFilterByReceiver) - Me.Controls.Add(Me.ucrFilterOperation) Me.Controls.Add(Me.btnAddGroupCondition) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrColumnFormats" - Me.Size = New System.Drawing.Size(631, 194) + Me.Size = New System.Drawing.Size(609, 194) CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents lblGroupCondition As Label + Friend WithEvents lblFormat As Label Friend WithEvents lblGroups As Label Friend WithEvents ucrLogicalCombobox As ucrInputComboBox Friend WithEvents btnClearGroups As Button Friend WithEvents lblColumns As Label Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle - Friend WithEvents ucrFilterOperation As ucrInputComboBox Friend WithEvents btnAddGroupCondition As Button Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents dataGridGroups As DataGridView diff --git a/instat/UserTables/Columns/ucrColumnFormats.resx b/instat/UserTables/Columns/ucrColumnFormats.resx index f4b4b7d5a34..191e2e6453d 100644 --- a/instat/UserTables/Columns/ucrColumnFormats.resx +++ b/instat/UserTables/Columns/ucrColumnFormats.resx @@ -126,4 +126,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumns.Designer.vb b/instat/UserTables/Columns/ucrColumns.Designer.vb index 0a2d7ce54cc..1f64b91227e 100644 --- a/instat/UserTables/Columns/ucrColumns.Designer.vb +++ b/instat/UserTables/Columns/ucrColumns.Designer.vb @@ -30,6 +30,7 @@ Partial Class ucrColumns Me.ucrColumnLabels = New instat.ucrColumnLabels() Me.ucrColumnSpanners = New instat.ucrColumnSpanners() Me.ucrPnlCols = New instat.UcrPanel() + Me.UcrColumnFormats1 = New instat.ucrColumnFormats() Me.SuspendLayout() ' 'rdoStyles @@ -154,10 +155,18 @@ Partial Class ucrColumns Me.ucrPnlCols.Size = New System.Drawing.Size(570, 29) Me.ucrPnlCols.TabIndex = 289 ' + 'UcrColumnFormats1 + ' + Me.UcrColumnFormats1.Location = New System.Drawing.Point(6, 51) + Me.UcrColumnFormats1.Name = "UcrColumnFormats1" + Me.UcrColumnFormats1.Size = New System.Drawing.Size(620, 194) + Me.UcrColumnFormats1.TabIndex = 298 + ' 'ucrColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.UcrColumnFormats1) Me.Controls.Add(Me.ucrColumnLabels) Me.Controls.Add(Me.rdoColLabel) Me.Controls.Add(Me.ucrColumnSpanners) @@ -180,4 +189,5 @@ Partial Class ucrColumns Friend WithEvents ucrColumnSpanners As ucrColumnSpanners Friend WithEvents rdoColLabel As RadioButton Friend WithEvents ucrColumnLabels As ucrColumnLabels + Friend WithEvents UcrColumnFormats1 As ucrColumnFormats End Class diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb index a3828819e1f..48e996a4ba1 100644 --- a/instat/UserTables/Columns/ucrColumns.vb +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -24,6 +24,7 @@ Private Sub ucrPnlCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged ucrColumnLabels.Visible = rdoColLabel.Checked ucrColumnSpanners.Visible = rdoColSpanners.Checked + UcrColumnFormats1.Visible = rdoColFormats.Checked End Sub End Class From 4c52ea570a4426670c507dcebd9d5eb7d0004084 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 11 Jun 2024 10:13:38 +0100 Subject: [PATCH 043/273] Change made --- instat/dlgClimograph.vb | 254 +++++++++++++++++++++++++++++++++------- 1 file changed, 213 insertions(+), 41 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 7d6affc7c7e..1ba44df6f1f 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -33,6 +33,8 @@ Public Class dlgClimograph Private clsGroupByFunction As New RFunction Private clsGeomBarFunction As New RFunction Private clsGeomLineFunction As New RFunction + Private clsGeomLine2Function As New RFunction + Private clsGeomLine3Function As New RFunction Private clsGeomLineFunction1 As New RFunction Private clsRggplotFunction As New RFunction Private clsBarAesFunction As New RFunction @@ -78,6 +80,16 @@ Public Class dlgClimograph Private clsAesGeomTextTmaxFunction As New RFunction Private ClsAesGeomTextTminFunction As New RFunction Private clsThemeFunction As New RFunction + Private clsMaxFunction As New RFunction + Private clsMax1Function As New RFunction + Private clsVectorFunction As New RFunction + Private clsStarOperator As New ROperator + Private clsStar1Operator As New ROperator + Private clsDivideOperator As New ROperator + Private clsDivide1Operator As ROperator + Private clsDollar1OPerator As New ROperator + Private clsDollar2OPerator As New ROperator + Private clsDollar3OPerator As New ROperator Private clsFacetVariablesOperator As New ROperator Private clsFacetRowOp1 As New ROperator Private clsFacetColOp1 As New ROperator @@ -90,6 +102,7 @@ Public Class dlgClimograph Private bUpdatingParameters As Boolean = False Private bUpdateComboOptions1 As Boolean = True Private bUpdatingParameters1 As Boolean = False + Private strScale As String = "Scale_Factor" Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -275,6 +288,8 @@ Public Class dlgClimograph clsGeomBarFunction = New RFunction clsGeomLineFunction = New RFunction clsGeomLineFunction1 = New RFunction + clsGeomLine2Function = New RFunction + clsGeomLine3Function = New RFunction clsAesLineFunction = New RFunction clsAesLine1Function = New RFunction clsRggplotFunction = New RFunction @@ -298,12 +313,22 @@ Public Class dlgClimograph ClsRoundTminFunction = New RFunction clsGeomTileFunction = New RFunction clsSemicommaOperator = New ROperator + clsStarOperator = New ROperator + clsStar1Operator = New ROperator clsDollarOperator = New ROperator + clsDollar1OPerator = New ROperator + clsDollar2OPerator = New ROperator + clsDollar3OPerator = New ROperator + clsDivideOperator = New ROperator + clsDivide1Operator = New ROperator clsFacetVariablesOperator = New ROperator clsFacetRowOp1 = New ROperator clsFacetColOp1 = New ROperator clsPipeOperator1 = New ROperator clsGroupByFunction1 = New RFunction + clsMaxFunction = New RFunction + clsMax1Function = New RFunction + clsVectorFunction = New RFunction ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) @@ -370,6 +395,10 @@ Public Class dlgClimograph clsGeomLineFunction1.SetRCommand("geom_line") + clsGeomLine2Function.SetRCommand("geom_line") + + clsGeomLine3Function.SetRCommand("geom_line") + clsSecondaryAxisFunction.SetRCommand("sec_axis") clsSecondaryAxisFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) clsSecondaryAxisFunction.AddParameter("name", Chr(34) & "Rainfall (inches)" & Chr(34), iPosition:=1) @@ -378,10 +407,6 @@ Public Class dlgClimograph clsSecondaryAxis1Function.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) clsSecondaryAxis1Function.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) - clsSecondaryAxis2Function.SetRCommand("sec_axis") - clsSecondaryAxis2Function.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) - clsSecondaryAxis2Function.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) - clsLenthFunction.SetRCommand("length") clsLenthFunction.AddParameter("x", clsRFunctionParameter:=clsUniqueFunction, iPosition:=0, bIncludeArgumentName:=False) @@ -400,7 +425,6 @@ Public Class dlgClimograph clsDollarOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) clsDollarOperator.AddParameter("right", ucrReceiverMonthC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) @@ -456,6 +480,49 @@ Public Class dlgClimograph ClsGeomTextTminFunction.AddParameter("size", "3", iPosition:=3) ClsGeomTextTminFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) + clsSecondaryAxis2Function.SetRCommand("sec_axis") + ''clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsSecondaryAxis2Function.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=1) + + clsDivide1Operator.SetOperation("/") + clsDivide1Operator.AddParameter("left", "~ .", iPosition:=0, bIncludeArgumentName:=False) + 'clsDivide1Operator.AddParameter("rigth", strScale, iPosition:=1, bIncludeArgumentName:=False) + 'clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + + clsDollar1OPerator.SetOperation("$") + clsDollar1OPerator.bSpaceAroundOperation = False + clsDollar1OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + 'clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + + clsDollar2OPerator.SetOperation("$") + clsDollar2OPerator.bSpaceAroundOperation = False + clsDollar2OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + 'clsDollar2OPerator.AddParameter("right", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + + clsDollar3OPerator.SetOperation("$") + clsDollar3OPerator.bSpaceAroundOperation = False + clsDollar3OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + 'clsDollar3OPerator.AddParameter("right", ucrReceiverElement2.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + + clsMaxFunction.SetRCommand("max") + 'clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) + + clsMax1Function.SetRCommand("max") + 'clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsDivideOperator.SetOperation("/") + 'clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + 'clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) + clsDivideOperator.SetAssignTo(strScale) + + clsVectorFunction.SetRCommand("c") + + clsStarOperator.SetOperation("*") + clsStarOperator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + + clsStar1Operator.SetOperation("*") + clsStar1Operator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) @@ -1017,29 +1084,57 @@ Public Class dlgClimograph Private Sub AddRemoveGeomLines() If rdoClimograph.Checked Then If Not ucrReceiverElement1.IsEmpty Then - If ucrChkColourIdntity.Checked Then - clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + If Not ucrReceiverRainC.IsEmpty Then + If ucrChkColourIdntity.Checked Then + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLineFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) + clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLineFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsAesLineFunction.RemoveParameterByName("colour") End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + If ucrChkColourIdntity.Checked Then + clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If Else - clsScalecolouridentityFunction.RemoveParameterByName("name") + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsAesLineFunction.RemoveParameterByName("colour") End If - Else - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) - clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLineFunction.RemoveParameterByName("colour") End If Else - clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_line") End If Else clsBaseOperator.RemoveParameterByName("geom_line") @@ -1050,26 +1145,56 @@ Public Class dlgClimograph Private Sub AddRemoveGeomLine1() If rdoClimograph.Checked Then If Not ucrReceiverElement2.IsEmpty Then - If ucrChkColourIdntity.Checked Then - clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + If Not ucrReceiverRainC.IsEmpty Then + If ucrChkColourIdntity.Checked Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLine1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLine1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsAesLine1Function.RemoveParameterByName("colour") End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + If ucrChkColourIdntity.Checked Then + clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) + If Not ucrInputLabels.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) + Else + clsScalecolouridentityFunction.RemoveParameterByName("labels") + End If + If Not ucrInputName.IsEmpty Then + clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) + Else + clsScalecolouridentityFunction.RemoveParameterByName("name") + End If Else - clsScalecolouridentityFunction.RemoveParameterByName("name") + clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.RemoveParameterByName("scale_colour_identity") + clsAesLine1Function.RemoveParameterByName("colour") End If - Else - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) - clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLine1Function.RemoveParameterByName("colour") End If Else clsBaseOperator.RemoveParameterByName("geom_line1") @@ -1118,9 +1243,54 @@ Public Class dlgClimograph Private Sub AddRemoveSecondaryAxis() If rdoClimograph.Checked Then If Not ucrReceiverRainC.IsEmpty Then - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) - clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + clsVectorFunction.RemoveParameterByName("x") + clsVectorFunction.RemoveParameterByName("y") + If Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty Then + clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsDollar2OPerator.AddParameter("right", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsDollar3OPerator.AddParameter("right", ucrReceiverElement2.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsVectorFunction.AddParameter("x", clsROperatorParameter:=clsDollar2OPerator, iPosition:=0, bIncludeArgumentName:=False) + clsVectorFunction.AddParameter("y", clsROperatorParameter:=clsDollar3OPerator, iPosition:=1, bIncludeArgumentName:=False) + clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) + clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) + clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + ElseIf Not ucrReceiverElement1.IsEmpty AndAlso ucrReceiverElement2.IsEmpty Then + clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsDollar2OPerator.AddParameter("right", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsVectorFunction.AddParameter("x", clsROperatorParameter:=clsDollar2OPerator, iPosition:=0, bIncludeArgumentName:=False) + clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) + clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) + clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + ElseIf ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty Then + clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsDollar3OPerator.AddParameter("right", ucrReceiverElement2.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsVectorFunction.AddParameter("x", clsROperatorParameter:=clsDollar3OPerator, iPosition:=0, bIncludeArgumentName:=False) + clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) + clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) + clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + Else + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + End If Else clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=0) clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis1Function, iPosition:=1) @@ -1144,6 +1314,8 @@ Public Class dlgClimograph AddRemoveGeomBar() AddRemoveGeomTextBar() EnableTileAndRibbon() + AddRemoveGeomLines() + AddRemoveGeomLine1() End Sub Private Sub ucrReceiverMonthC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthC.ControlValueChanged From bbc0ff2920ca37ce5129c32fc6605c356bdda0a5 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 11 Jun 2024 12:09:07 +0100 Subject: [PATCH 044/273] Update dlgRPackages.Designer.vb Designer additions --- instat/dlgRPackages.Designer.vb | 61 +++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index 45cad1a8e16..b62f5844fc6 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class dlgInstallRPackage Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class dlgInstallRPackage 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.cmdCheck = New System.Windows.Forms.Button() Me.lblRPackage = New System.Windows.Forms.Label() @@ -37,9 +37,10 @@ Partial Class dlgInstallRPackage 'cmdCheck ' Me.cmdCheck.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCheck.Location = New System.Drawing.Point(14, 94) + Me.cmdCheck.Location = New System.Drawing.Point(18, 150) + Me.cmdCheck.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCheck.Name = "cmdCheck" - Me.cmdCheck.Size = New System.Drawing.Size(75, 22) + Me.cmdCheck.Size = New System.Drawing.Size(112, 33) Me.cmdCheck.TabIndex = 7 Me.cmdCheck.Text = "Check" Me.cmdCheck.UseVisualStyleBackColor = True @@ -48,9 +49,10 @@ Partial Class dlgInstallRPackage ' Me.lblRPackage.AutoSize = True Me.lblRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRPackage.Location = New System.Drawing.Point(21, 44) + Me.lblRPackage.Location = New System.Drawing.Point(17, 68) + Me.lblRPackage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRPackage.Name = "lblRPackage" - Me.lblRPackage.Size = New System.Drawing.Size(64, 13) + Me.lblRPackage.Size = New System.Drawing.Size(91, 20) Me.lblRPackage.TabIndex = 3 Me.lblRPackage.Text = "R Package:" ' @@ -63,9 +65,10 @@ Partial Class dlgInstallRPackage Me.rdoCRAN.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoCRAN.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoCRAN.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCRAN.Location = New System.Drawing.Point(104, 3) + Me.rdoCRAN.Location = New System.Drawing.Point(206, 9) + Me.rdoCRAN.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoCRAN.Name = "rdoCRAN" - Me.rdoCRAN.Size = New System.Drawing.Size(91, 28) + Me.rdoCRAN.Size = New System.Drawing.Size(136, 42) Me.rdoCRAN.TabIndex = 1 Me.rdoCRAN.TabStop = True Me.rdoCRAN.Tag = "Frequency" @@ -82,9 +85,10 @@ Partial Class dlgInstallRPackage Me.rdoRPackage.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoRPackage.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRPackage.Location = New System.Drawing.Point(192, 3) + Me.rdoRPackage.Location = New System.Drawing.Point(338, 9) + Me.rdoRPackage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoRPackage.Name = "rdoRPackage" - Me.rdoRPackage.Size = New System.Drawing.Size(91, 28) + Me.rdoRPackage.Size = New System.Drawing.Size(136, 42) Me.rdoRPackage.TabIndex = 2 Me.rdoRPackage.TabStop = True Me.rdoRPackage.Tag = "Frequency" @@ -96,9 +100,10 @@ Partial Class dlgInstallRPackage ' Me.lblRepository.AutoSize = True Me.lblRepository.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRepository.Location = New System.Drawing.Point(3, 72) + Me.lblRepository.Location = New System.Drawing.Point(15, 108) + Me.lblRepository.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRepository.Name = "lblRepository" - Me.lblRepository.Size = New System.Drawing.Size(91, 13) + Me.lblRepository.Size = New System.Drawing.Size(135, 20) Me.lblRepository.TabIndex = 5 Me.lblRepository.Text = "Repository Name:" ' @@ -106,9 +111,10 @@ Partial Class dlgInstallRPackage ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(24, 130) + Me.ucrBase.Location = New System.Drawing.Point(15, 199) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 9 ' 'ucrInputTextBoxRPackage @@ -117,17 +123,19 @@ Partial Class dlgInstallRPackage Me.ucrInputTextBoxRPackage.AutoSize = True Me.ucrInputTextBoxRPackage.IsMultiline = False Me.ucrInputTextBoxRPackage.IsReadOnly = False - Me.ucrInputTextBoxRPackage.Location = New System.Drawing.Point(95, 42) + Me.ucrInputTextBoxRPackage.Location = New System.Drawing.Point(151, 66) + Me.ucrInputTextBoxRPackage.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputTextBoxRPackage.Name = "ucrInputTextBoxRPackage" - Me.ucrInputTextBoxRPackage.Size = New System.Drawing.Size(197, 22) + Me.ucrInputTextBoxRPackage.Size = New System.Drawing.Size(296, 33) Me.ucrInputTextBoxRPackage.TabIndex = 4 ' 'ucrPnlRPackages ' Me.ucrPnlRPackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRPackages.Location = New System.Drawing.Point(83, 2) + Me.ucrPnlRPackages.Location = New System.Drawing.Point(174, 8) + Me.ucrPnlRPackages.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlRPackages.Name = "ucrPnlRPackages" - Me.ucrPnlRPackages.Size = New System.Drawing.Size(226, 34) + Me.ucrPnlRPackages.Size = New System.Drawing.Size(339, 51) Me.ucrPnlRPackages.TabIndex = 0 ' 'ucrInputMessage @@ -136,9 +144,10 @@ Partial Class dlgInstallRPackage Me.ucrInputMessage.AutoSize = True Me.ucrInputMessage.IsMultiline = False Me.ucrInputMessage.IsReadOnly = True - Me.ucrInputMessage.Location = New System.Drawing.Point(95, 94) + Me.ucrInputMessage.Location = New System.Drawing.Point(151, 150) + Me.ucrInputMessage.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputMessage.Name = "ucrInputMessage" - Me.ucrInputMessage.Size = New System.Drawing.Size(337, 22) + Me.ucrInputMessage.Size = New System.Drawing.Size(475, 33) Me.ucrInputMessage.TabIndex = 8 ' 'ucrInputRepositoryName @@ -147,17 +156,18 @@ Partial Class dlgInstallRPackage Me.ucrInputRepositoryName.AutoSize = True Me.ucrInputRepositoryName.IsMultiline = False Me.ucrInputRepositoryName.IsReadOnly = False - Me.ucrInputRepositoryName.Location = New System.Drawing.Point(93, 69) + Me.ucrInputRepositoryName.Location = New System.Drawing.Point(151, 105) + Me.ucrInputRepositoryName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputRepositoryName.Name = "ucrInputRepositoryName" - Me.ucrInputRepositoryName.Size = New System.Drawing.Size(197, 22) + Me.ucrInputRepositoryName.Size = New System.Drawing.Size(296, 33) Me.ucrInputRepositoryName.TabIndex = 6 ' 'dlgInstallRPackage ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(448, 194) + Me.ClientSize = New System.Drawing.Size(645, 291) Me.Controls.Add(Me.rdoRPackage) Me.Controls.Add(Me.rdoCRAN) Me.Controls.Add(Me.ucrBase) @@ -169,6 +179,7 @@ Partial Class dlgInstallRPackage Me.Controls.Add(Me.cmdCheck) Me.Controls.Add(Me.ucrInputMessage) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgInstallRPackage" From 14691e715301543ede8e47339567159fede98d26 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 11 Jun 2024 14:55:32 +0300 Subject: [PATCH 045/273] changes to the code --- .../static/InstatObject/R/stand_alone_functions.R | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index ef38345ed0c..5d681b83b7a 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3332,3 +3332,17 @@ ggwalter_lieth <- function (data, month, station = NULL, p_mes, tm_max, tm_min, return(wandlplot) } + +# Function to check if a repo exists and is in R +check_github_repo <- function(owner, repo) { + tryCatch({ + response <- gh::gh("/repos/:owner/:repo", owner = owner, repo = repo, verb = "GET", silent = TRUE) + if (response$language == "R") { + return(1) # Repository exists and is in the R language + } else { + return(2) # Repository exists, but isn't in the R language + } + }, error = function(e) { + return(3) # Error occurred, repository doesn't exist + }) +} \ No newline at end of file From da4e4c85d83ac9a204e40e2bb09f5c4b612bcf6c Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 11 Jun 2024 13:57:28 +0100 Subject: [PATCH 046/273] Change made --- instat/dlgClimograph.vb | 44 +++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 1ba44df6f1f..340e996801d 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -442,11 +442,11 @@ Public Class dlgClimograph clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) clsAesGeomTextTmaxFunction.SetRCommand("aes") - clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + 'clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsAesGeomTextTmaxFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTmaxFunction, iPosition:=1) ClsAesGeomTextTminFunction.SetRCommand("aes") - ClsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + 'ClsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) ClsAesGeomTextTminFunction.AddParameter("label", clsRFunctionParameter:=ClsRoundTminFunction, iPosition:=1) clsRoundBarFunction.SetRCommand("round") @@ -559,8 +559,6 @@ Public Class dlgClimograph ucrReceiverRainC.SetRCode(clsAesGeomTextBarFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) - ucrReceiverElement2.SetRCode(clsAesLine1Function, bReset) - ucrReceiverElement1.SetRCode(clsAesLineFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverRain.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverMintemp.SetRCode(clsGgwalterliethFunction, bReset) @@ -577,7 +575,11 @@ Public Class dlgClimograph ucrChkTile.SetRCode(clsGeomTileFunction, bReset) ucrInputName.SetRCode(clsScalecolouridentityFunction, bReset) ucrInputLabels.SetRCode(clsScalecolouridentityFunction, bReset) + ucrChkText.SetRCode(clsBaseOperator, bReset) End If + 'ucrReceiverElement2.SetRCode(clsAesLine1Function, bReset) + ' ucrReceiverElement1.SetRCode(clsAesLineFunction, bReset) + End Sub Private Sub TestOKEnabled() @@ -1015,7 +1017,14 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverElement1.IsEmpty Then + clsStarOperator.RemoveParameterByName("left") clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) + If Not ucrReceiverRainC.IsEmpty Then + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesGeomTextTmaxFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) + Else + clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + End If Else clsBaseOperator.RemoveParameterByName("geom_text1") End If @@ -1031,7 +1040,14 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverElement2.IsEmpty Then + clsStar1Operator.RemoveParameterByName("left") clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=ClsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) + If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + ClsAesGeomTextTminFunction.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + Else + ClsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + End If Else clsBaseOperator.RemoveParameterByName("geom_text2") End If @@ -1049,8 +1065,17 @@ Public Class dlgClimograph clsAsNumericFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=2) clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) - clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) + clsStarOperator.RemoveParameterByName("left") + clsStar1Operator.RemoveParameterByName("left") + If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesGeomRibbonFunction.AddParameter("ymin", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsAesGeomRibbonFunction.AddParameter("ymax", clsROperatorParameter:=clsStarOperator, iPosition:=1) + Else + clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) + End If clsGeomRibbonFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomRibbonFunction, iPosition:=0, bIncludeArgumentName:=False) clsGeomRibbonFunction.AddParameter("fill", Chr(34) & "#000000" & Chr(34), iPosition:=1) clsGeomRibbonFunction.AddParameter("alpha", "0.2", iPosition:=2) @@ -1111,7 +1136,9 @@ Public Class dlgClimograph clsAesLineFunction.RemoveParameterByName("colour") End If Else + clsStarOperator.RemoveParameterByName("left") If ucrChkColourIdntity.Checked Then + clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) @@ -1127,6 +1154,7 @@ Public Class dlgClimograph clsScalecolouridentityFunction.RemoveParameterByName("name") End If Else + clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) clsBaseOperator.RemoveParameterByName("scale_colour_identity") @@ -1172,6 +1200,7 @@ Public Class dlgClimograph clsAesLine1Function.RemoveParameterByName("colour") End If Else + clsStar1Operator.RemoveParameterByName("left") If ucrChkColourIdntity.Checked Then clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) @@ -1316,6 +1345,9 @@ Public Class dlgClimograph EnableTileAndRibbon() AddRemoveGeomLines() AddRemoveGeomLine1() + AddRemoveGeomRibbon() + AddRemoveGeomTextTmin() + AddRemoveGeomTextTmax() End Sub Private Sub ucrReceiverMonthC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthC.ControlValueChanged From 001085488a71e3cda9f07b2cee058b0e3e2c831a Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 12 Jun 2024 12:57:59 +0300 Subject: [PATCH 047/273] changes to the code --- instat/dlgRPackages.vb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 63ce0a8397a..2ea21aa60af 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -1,8 +1,9 @@ -Imports instat +Imports instat.Translations Imports RDotNet Public Class dlgInstallRPackage Private bReset As Boolean = True Private bFirstLoad As Boolean = True + Private bUniqueChecked As Boolean = False Private clsInstallPackage As New RFunction Private clsRepositoryFunction As New RFunction Private clsBeforeOptionsFunc As New RFunction @@ -19,7 +20,9 @@ Public Class dlgInstallRPackage End If SetRCodeForControls(bReset) bReset = False + bUniqueChecked = False TestOkEnabled() + autoTranslate(Me) End Sub Private Sub InitialiseDialog() @@ -47,6 +50,7 @@ Public Class dlgInstallRPackage clsAfterOptionsFunc = New RFunction clsRepositoryFunction = New RFunction clsDummyFunction = New RFunction + bUniqueChecked = False clsDummyFunction.AddParameter("checked", "cran", iPosition:=1) @@ -77,11 +81,12 @@ Public Class dlgInstallRPackage If rdoCRAN.Checked Then ucrBase.OKEnabled(Not ucrInputTextBoxRPackage.IsEmpty) ElseIf rdoRPackage.Checked Then - ucrBase.OKEnabled(Not ucrInputRepositoryName.IsEmpty AndAlso Not ucrInputTextBoxRPackage.IsEmpty) + ucrBase.OKEnabled(Not ucrInputRepositoryName.IsEmpty AndAlso Not ucrInputTextBoxRPackage.IsEmpty AndAlso bUniqueChecked) End If End Sub Private Sub ucrInputTextBoxRPackage_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputTextBoxRPackage.ControlContentsChanged + bUniqueChecked = False ucrInputMessage.SetText("") ucrInputMessage.txtInput.BackColor = Color.White CheckEnable() @@ -102,9 +107,7 @@ Public Class dlgInstallRPackage clsPackageCheck.AddParameter("repo", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) clsPackageCheck.AddParameter("owner", Chr(34) & ucrInputRepositoryName.GetText() & Chr(34)) End If - expOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsPackageCheck.ToScript(), bSilent:=True) - If expOutput Is Nothing OrElse expOutput.Type = Internals.SymbolicExpressionType.Null Then ucrInputMessage.SetText("Cannot get package information.") Exit Sub @@ -115,9 +118,9 @@ Public Class dlgInstallRPackage ucrInputMessage.SetText("Cannot get package information.") Exit Sub End If - Select Case chrOutput(0) Case "1" + bUniqueChecked = True If rdoCRAN.Checked Then If chrOutput.Count = 4 Then If chrOutput(1) = "0" Then @@ -148,14 +151,18 @@ Public Class dlgInstallRPackage ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Not a package in the given repo. Perhaps spelled wrongly?") ucrInputMessage.txtInput.BackColor = Color.LightCoral + bUniqueChecked = False End If Case "4" ucrInputMessage.SetText("Not a current CRAN package. Perhaps spelled wrongly, or archived?") ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue + bUniqueChecked = False Case "5" ucrInputMessage.SetText("No internet connection.Try reconnecting") ucrInputMessage.txtInput.BackColor = Color.LightCoral + bUniqueChecked = False End Select + TestOkEnabled() End Sub Private Sub CheckEnable() @@ -188,6 +195,7 @@ Public Class dlgInstallRPackage Private Sub ucrInputRepositoryName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRepositoryName.ControlContentsChanged TestOkEnabled() GithubOption() + bUniqueChecked = False End Sub Private Sub GithubOption() From 42e09b2604ff9af61ba07d7c932ae15563be6b21 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 13 Jun 2024 11:10:18 +0100 Subject: [PATCH 048/273] change made --- instat/dlgClimograph.vb | 49 ++++++++++++++--------------------------- 1 file changed, 16 insertions(+), 33 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 340e996801d..425e85653ab 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -72,13 +72,13 @@ Public Class dlgClimograph Private clsAesGeomRibbonFunction As New RFunction Private clsGeomTextBarFunction As New RFunction Private clsGeomTextTmaxFunction As New RFunction - Private ClsGeomTextTminFunction As New RFunction + Private clsGeomTextTminFunction As New RFunction Private clsRoundBarFunction As New RFunction Private clsRoundTmaxFunction As New RFunction - Private ClsRoundTminFunction As New RFunction + Private clsRoundTminFunction As New RFunction Private clsAesGeomTextBarFunction As New RFunction Private clsAesGeomTextTmaxFunction As New RFunction - Private ClsAesGeomTextTminFunction As New RFunction + Private clsAesGeomTextTminFunction As New RFunction Private clsThemeFunction As New RFunction Private clsMaxFunction As New RFunction Private clsMax1Function As New RFunction @@ -331,7 +331,7 @@ Public Class dlgClimograph clsVectorFunction = New RFunction ucrSelectorClimograph.Reset() - ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) + 'ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) ucrSave.Reset() ucrInputStation.SetName(strFacetWrap) @@ -438,28 +438,22 @@ Public Class dlgClimograph clsAesGeomRibbonFunction.SetRCommand("aes") clsAesGeomTextBarFunction.SetRCommand("aes") - clsAesGeomTextBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) clsAesGeomTextTmaxFunction.SetRCommand("aes") - 'clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsAesGeomTextTmaxFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTmaxFunction, iPosition:=1) - ClsAesGeomTextTminFunction.SetRCommand("aes") - 'ClsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - ClsAesGeomTextTminFunction.AddParameter("label", clsRFunctionParameter:=ClsRoundTminFunction, iPosition:=1) + clsAesGeomTextTminFunction.SetRCommand("aes") + clsAesGeomTextTminFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTminFunction, iPosition:=1) clsRoundBarFunction.SetRCommand("round") - clsRoundBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsRoundBarFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) clsRoundTmaxFunction.SetRCommand("round") - clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsRoundTmaxFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) - ClsRoundTminFunction.SetRCommand("round") - ClsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - ClsRoundTminFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) + clsRoundTminFunction.SetRCommand("round") + clsRoundTminFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) clsGeomTextBarFunction.SetRCommand("geom_text") clsGeomTextBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextBarFunction, iPosition:=0, bIncludeArgumentName:=False) @@ -481,38 +475,28 @@ Public Class dlgClimograph ClsGeomTextTminFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) clsSecondaryAxis2Function.SetRCommand("sec_axis") - ''clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) clsSecondaryAxis2Function.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=1) clsDivide1Operator.SetOperation("/") clsDivide1Operator.AddParameter("left", "~ .", iPosition:=0, bIncludeArgumentName:=False) - 'clsDivide1Operator.AddParameter("rigth", strScale, iPosition:=1, bIncludeArgumentName:=False) - 'clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) clsDollar1OPerator.SetOperation("$") clsDollar1OPerator.bSpaceAroundOperation = False clsDollar1OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) - 'clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) clsDollar2OPerator.SetOperation("$") clsDollar2OPerator.bSpaceAroundOperation = False clsDollar2OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) - 'clsDollar2OPerator.AddParameter("right", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) clsDollar3OPerator.SetOperation("$") clsDollar3OPerator.bSpaceAroundOperation = False clsDollar3OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) - 'clsDollar3OPerator.AddParameter("right", ucrReceiverElement2.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) clsMaxFunction.SetRCommand("max") - 'clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) clsMax1Function.SetRCommand("max") - 'clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) clsDivideOperator.SetOperation("/") - 'clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - 'clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) clsDivideOperator.SetAssignTo(strScale) clsVectorFunction.SetRCommand("c") @@ -551,11 +535,9 @@ Public Class dlgClimograph Private Sub SetRCodeForControls(bReset) ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrReceiverRainC.AddAdditionalCodeParameterPair(clsRoundBarFunction, New RParameter("y", 1), iAdditionalPairNo:=1) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsAesGeomTextTmaxFunction, New RParameter("y", 0), iAdditionalPairNo:=1) - ucrReceiverElement2.AddAdditionalCodeParameterPair(ClsAesGeomTextTminFunction, New RParameter("y", 0), iAdditionalPairNo:=1) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsRoundTmaxFunction, New RParameter("y", 0, False), iAdditionalPairNo:=2) - ucrReceiverElement2.AddAdditionalCodeParameterPair(ClsRoundTminFunction, New RParameter("y", 0, False), iAdditionalPairNo:=2) + ucrReceiverRainC.AddAdditionalCodeParameterPair(clsRoundBarFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsRoundTmaxFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) + ucrReceiverElement2.AddAdditionalCodeParameterPair(clsRoundTminFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) ucrReceiverRainC.SetRCode(clsAesGeomTextBarFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) @@ -577,8 +559,8 @@ Public Class dlgClimograph ucrInputLabels.SetRCode(clsScalecolouridentityFunction, bReset) ucrChkText.SetRCode(clsBaseOperator, bReset) End If - 'ucrReceiverElement2.SetRCode(clsAesLine1Function, bReset) - ' ucrReceiverElement1.SetRCode(clsAesLineFunction, bReset) + ucrReceiverElement2.SetRCode(clsAesGeomTextTminFunction, bReset) + ucrReceiverElement1.SetRCode(clsAesGeomTextTmaxFunction, bReset) End Sub @@ -938,7 +920,6 @@ Public Class dlgClimograph End Sub Private Sub AddRemoveGroupBy() - If clsPipeOperator.ContainsParameter("mutate") Then clsGroupByFunction.ClearParameters() If clsBaseOperator.ContainsParameter("facets") Then @@ -951,7 +932,6 @@ Public Class dlgClimograph GetParameterValue(clsFacetRowOp) End Select End If - If clsGroupByFunction.iParameterCount > 0 Then clsPipeOperator.AddParameter("group_by", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) Else @@ -1001,6 +981,7 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverRainC.IsEmpty Then + clsAesGeomTextBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextBarFunction, iPosition:=5, bIncludeArgumentName:=False) Else clsBaseOperator.RemoveParameterByName("geom_text") @@ -1018,6 +999,7 @@ Public Class dlgClimograph If ucrChkText.Checked Then If Not ucrReceiverElement1.IsEmpty Then clsStarOperator.RemoveParameterByName("left") + clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) If Not ucrReceiverRainC.IsEmpty Then clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) @@ -1041,6 +1023,7 @@ Public Class dlgClimograph If ucrChkText.Checked Then If Not ucrReceiverElement2.IsEmpty Then clsStar1Operator.RemoveParameterByName("left") + clsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=ClsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) If Not ucrReceiverRainC.IsEmpty Then clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) From 60fdc150d936d28bb288283e7cebc1ee0ce0bac9 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 19 Jun 2024 08:41:38 +0100 Subject: [PATCH 049/273] change made --- instat/dlgClimograph.vb | 409 +++++++++++++++++++--------------------- 1 file changed, 192 insertions(+), 217 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 425e85653ab..9c06d5408a9 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -33,13 +33,15 @@ Public Class dlgClimograph Private clsGroupByFunction As New RFunction Private clsGeomBarFunction As New RFunction Private clsGeomLineFunction As New RFunction - Private clsGeomLine2Function As New RFunction - Private clsGeomLine3Function As New RFunction + Private clsGeomLineStarFunction As New RFunction + Private clsGeomLineStar1Function As New RFunction Private clsGeomLineFunction1 As New RFunction Private clsRggplotFunction As New RFunction Private clsBarAesFunction As New RFunction Private clsAesLineFunction As New RFunction + Private clsAesLineStarFunction As New RFunction Private clsAesLine1Function As New RFunction + Private clsAesLineStar1Function As New RFunction Private clsFacetFunction1 As New RFunction Private clsGroupByFunction1 As New RFunction Private bResetSubdialog As Boolean = True @@ -60,25 +62,29 @@ Public Class dlgClimograph Private clsSecondaryAxis2Function As New RFunction Private clsLenthFunction As New RFunction Private clsUniqueFunction As New RFunction - Private clsUnique1Function As New RFunction Private clsSemicommaOperator As New ROperator - Private clsDollarOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsXScalecontinuousFunction As New RFunction + Private clsXScalediscreteFunction As New RFunction Private clsYScalecontinuousFunction As New RFunction Private clsGeomRibbonFunction As New RFunction + Private clsGeomRibbon1Function As New RFunction Private clsGeomTileFunction As New RFunction - Private clsAsNumericFunction As New RFunction Private clsAesGeomRibbonFunction As New RFunction + Private clsAesGeomRibbon1Function As New RFunction Private clsGeomTextBarFunction As New RFunction Private clsGeomTextTmaxFunction As New RFunction Private clsGeomTextTminFunction As New RFunction + Private clsGeomTextTmaxStarFunction As New RFunction + Private clsGeomTextTminStarFunction As New RFunction Private clsRoundBarFunction As New RFunction Private clsRoundTmaxFunction As New RFunction Private clsRoundTminFunction As New RFunction Private clsAesGeomTextBarFunction As New RFunction Private clsAesGeomTextTmaxFunction As New RFunction + Private clsAesGeomTextStarTmaxFunction As New RFunction Private clsAesGeomTextTminFunction As New RFunction + Private clsAesGeomTextStarTminFunction As New RFunction Private clsThemeFunction As New RFunction Private clsMaxFunction As New RFunction Private clsMax1Function As New RFunction @@ -87,9 +93,6 @@ Public Class dlgClimograph Private clsStar1Operator As New ROperator Private clsDivideOperator As New ROperator Private clsDivide1Operator As ROperator - Private clsDollar1OPerator As New ROperator - Private clsDollar2OPerator As New ROperator - Private clsDollar3OPerator As New ROperator Private clsFacetVariablesOperator As New ROperator Private clsFacetRowOp1 As New ROperator Private clsFacetColOp1 As New ROperator @@ -140,7 +143,7 @@ Public Class dlgClimograph ucrReceiverMonth.SetLinkedDisplayControl(lblMonth) ucrReceiverMonthC.SetParameter(New RParameter("x", 2)) - ucrReceiverMonthC.SetParameterIsString() + ucrReceiverMonthC.SetParameterIsRFunction() ucrReceiverMonthC.Selector = ucrSelectorClimograph ucrReceiverMonthC.bWithQuotes = False ucrReceiverMonthC.SetClimaticType("month") @@ -157,7 +160,7 @@ Public Class dlgClimograph ucrReceiverRain.SetLinkedDisplayControl(lblRain) ucrReceiverRainC.SetParameter(New RParameter("y", 1)) - ucrReceiverRainC.SetParameterIsString() + ucrReceiverRainC.SetParameterIsRFunction() ucrReceiverRainC.Selector = ucrSelectorClimograph ucrReceiverRainC.bWithQuotes = False ucrReceiverRainC.SetClimaticType("rain") @@ -182,7 +185,7 @@ Public Class dlgClimograph ucrReceiverMintemp.SetLinkedDisplayControl(lblMintem) ucrReceiverElement1.SetParameter(New RParameter("y", 4)) - ucrReceiverElement1.SetParameterIsString() + ucrReceiverElement1.SetParameterIsRFunction() ucrReceiverElement1.Selector = ucrSelectorClimograph ucrReceiverElement1.bWithQuotes = False ucrReceiverElement1.SetClimaticType("temp_max") @@ -191,7 +194,7 @@ Public Class dlgClimograph ucrReceiverElement1.SetLinkedDisplayControl(lblElement1) ucrReceiverElement2.SetParameter(New RParameter("y", 5)) - ucrReceiverElement2.SetParameterIsString() + ucrReceiverElement2.SetParameterIsRFunction() ucrReceiverElement2.Selector = ucrSelectorClimograph ucrReceiverElement2.bWithQuotes = False ucrReceiverElement2.SetClimaticType("temp_min") @@ -267,7 +270,7 @@ Public Class dlgClimograph ucrSave.SetPrefix("wl_graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() - ucrSave.SetCheckBoxText("Save") + ucrSave.SetCheckBoxText("Store Graph") ucrSave.SetDataFrameSelector(ucrSelectorClimograph.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") End Sub @@ -283,15 +286,18 @@ Public Class dlgClimograph clsFacetRowOp = New ROperator clsFacetColOp = New ROperator clsGeomRibbonFunction = New RFunction - clsAsNumericFunction = New RFunction + clsGeomRibbon1Function = New RFunction clsAesGeomRibbonFunction = New RFunction + clsAesGeomRibbon1Function = New RFunction clsGeomBarFunction = New RFunction clsGeomLineFunction = New RFunction clsGeomLineFunction1 = New RFunction - clsGeomLine2Function = New RFunction - clsGeomLine3Function = New RFunction + clsGeomLineStarFunction = New RFunction + clsGeomLineStar1Function = New RFunction clsAesLineFunction = New RFunction + clsAesLineStarFunction = New RFunction clsAesLine1Function = New RFunction + clsAesLineStar1Function = New RFunction clsRggplotFunction = New RFunction clsBarAesFunction = New RFunction clsFacetFunction1 = New RFunction @@ -300,25 +306,25 @@ Public Class dlgClimograph clsSecondaryAxis1Function = New RFunction clsSecondaryAxis2Function = New RFunction clsLenthFunction = New RFunction - clsUnique1Function = New RFunction clsUniqueFunction = New RFunction clsGeomTextBarFunction = New RFunction clsGeomTextTmaxFunction = New RFunction - ClsGeomTextTminFunction = New RFunction + clsGeomTextTminFunction = New RFunction clsAesGeomTextBarFunction = New RFunction clsAesGeomTextTmaxFunction = New RFunction - ClsAesGeomTextTminFunction = New RFunction + clsAesGeomTextTminFunction = New RFunction + clsGeomTextTmaxStarFunction = New RFunction + clsGeomTextTminStarFunction = New RFunction + clsAesGeomTextStarTmaxFunction = New RFunction + clsAesGeomTextStarTminFunction = New RFunction + clsXScalediscreteFunction = New RFunction clsRoundBarFunction = New RFunction clsRoundTmaxFunction = New RFunction - ClsRoundTminFunction = New RFunction + clsRoundTminFunction = New RFunction clsGeomTileFunction = New RFunction clsSemicommaOperator = New ROperator clsStarOperator = New ROperator clsStar1Operator = New ROperator - clsDollarOperator = New ROperator - clsDollar1OPerator = New ROperator - clsDollar2OPerator = New ROperator - clsDollar3OPerator = New ROperator clsDivideOperator = New ROperator clsDivide1Operator = New ROperator clsFacetVariablesOperator = New ROperator @@ -331,7 +337,6 @@ Public Class dlgClimograph clsVectorFunction = New RFunction ucrSelectorClimograph.Reset() - 'ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) ucrSave.Reset() ucrInputStation.SetName(strFacetWrap) @@ -342,6 +347,10 @@ Public Class dlgClimograph clsDummyFunction.AddParameter("checked", "Climograph", iPosition:=0) + clsBaseOperator.SetOperation("+") + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + clsFacetFunction1.SetPackageName("ggplot2") clsFacetRowOp1.SetOperation("+") clsFacetRowOp1.bBrackets = False @@ -378,6 +387,7 @@ Public Class dlgClimograph clsRggplotFunction.SetPackageName("ggplot2") clsRggplotFunction.SetRCommand("ggplot") + clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) clsBarAesFunction.SetRCommand("aes") @@ -385,19 +395,31 @@ Public Class dlgClimograph clsGeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) clsGeomBarFunction.AddParameter("alpha", "0.5", iPosition:=2) + clsGeomLineFunction.SetRCommand("geom_line") + clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + + clsGeomLineFunction1.SetRCommand("geom_line") + clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + + clsGeomLineStarFunction.SetRCommand("geom_line") + clsGeomLineStarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineStarFunction, iPosition:=0) + + clsGeomLineStar1Function.SetRCommand("geom_line") + clsGeomLineStar1Function.AddParameter("mapping", clsRFunctionParameter:=clsAesLineStar1Function, iPosition:=0) + clsAesLineFunction.SetRCommand("aes") clsAesLineFunction.AddParameter("group", "1", iPosition:=1) + clsAesLineStarFunction.SetRCommand("aes") + clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) + clsAesLineStarFunction.AddParameter("group", "1", iPosition:=1) + clsAesLine1Function.SetRCommand("aes") clsAesLine1Function.AddParameter("group", "1", iPosition:=1) - clsGeomLineFunction.SetRCommand("geom_line") - - clsGeomLineFunction1.SetRCommand("geom_line") - - clsGeomLine2Function.SetRCommand("geom_line") - - clsGeomLine3Function.SetRCommand("geom_line") + clsAesLineStar1Function.SetRCommand("aes") + clsAesLineStar1Function.AddParameter("group", "1", iPosition:=1) + clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) clsSecondaryAxisFunction.SetRCommand("sec_axis") clsSecondaryAxisFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) @@ -407,59 +429,53 @@ Public Class dlgClimograph clsSecondaryAxis1Function.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) clsSecondaryAxis1Function.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) - clsLenthFunction.SetRCommand("length") - clsLenthFunction.AddParameter("x", clsRFunctionParameter:=clsUniqueFunction, iPosition:=0, bIncludeArgumentName:=False) - - clsUniqueFunction.SetRCommand("unique") - clsUniqueFunction.AddParameter("x", clsROperatorParameter:=clsDollarOperator, bIncludeArgumentName:=False) - - clsUnique1Function.SetRCommand("unique") - clsUnique1Function.AddParameter("x", clsROperatorParameter:=clsDollarOperator, bIncludeArgumentName:=False) + clsXScalediscreteFunction.SetRCommand("scale_x_discrete") + clsXScalediscreteFunction.AddParameter("name", Chr(34) & "Month" & Chr(34), iPosition:=0) clsSemicommaOperator.SetOperation(":") clsSemicommaOperator.AddParameter("left", "1", iPosition:=0, bIncludeArgumentName:=False) clsSemicommaOperator.AddParameter("right", clsRFunctionParameter:=clsLenthFunction, iPosition:=1, bIncludeArgumentName:=False) - clsDollarOperator.SetOperation("$") - clsDollarOperator.bSpaceAroundOperation = False - clsDollarOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) - clsDollarOperator.AddParameter("right", ucrReceiverMonthC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsLenthFunction.SetRCommand("length") + clsLenthFunction.AddParameter("x", clsRFunctionParameter:=clsUniqueFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsUniqueFunction.SetRCommand("unique") clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) clsGeomRibbonFunction.SetRCommand("geom_ribbon") + clsGeomRibbonFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomRibbonFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomRibbonFunction.AddParameter("fill", Chr(34) & "#000000" & Chr(34), iPosition:=1) + clsGeomRibbonFunction.AddParameter("alpha", "0.2", iPosition:=2) + + clsAesGeomRibbonFunction.SetRCommand("aes") + clsAesGeomRibbonFunction.AddParameter("group", "1", iPosition:=2) clsGeomTileFunction.SetRCommand("geom_tile") clsGeomTileFunction.AddParameter("alpha", "0.5", iPosition:=0) - clsAsNumericFunction.SetRCommand("as.numeric") + clsGeomRibbon1Function.SetRCommand("geom_ribbon") + clsGeomRibbon1Function.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomRibbon1Function, iPosition:=0, bIncludeArgumentName:=False) + clsGeomRibbon1Function.AddParameter("fill", Chr(34) & "#000000" & Chr(34), iPosition:=1) + clsGeomRibbon1Function.AddParameter("alpha", "0.2", iPosition:=2) - clsAesGeomRibbonFunction.SetRCommand("aes") + clsAesGeomRibbon1Function.SetRCommand("aes") + clsAesGeomRibbon1Function.AddParameter("ymin", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsAesGeomRibbon1Function.AddParameter("ymax", clsROperatorParameter:=clsStarOperator, iPosition:=1) + clsAesGeomRibbon1Function.AddParameter("group", "1", iPosition:=2) + + clsGeomTextBarFunction.SetRCommand("geom_text") + clsGeomTextBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextBarFunction.AddParameter("vjust", "-0.5", iPosition:=1) + clsGeomTextBarFunction.AddParameter("size", "3", iPosition:=2) clsAesGeomTextBarFunction.SetRCommand("aes") clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) - clsAesGeomTextTmaxFunction.SetRCommand("aes") - clsAesGeomTextTmaxFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTmaxFunction, iPosition:=1) - - clsAesGeomTextTminFunction.SetRCommand("aes") - clsAesGeomTextTminFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTminFunction, iPosition:=1) - clsRoundBarFunction.SetRCommand("round") clsRoundBarFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) - clsRoundTmaxFunction.SetRCommand("round") - clsRoundTmaxFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) - - clsRoundTminFunction.SetRCommand("round") - clsRoundTminFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) - - clsGeomTextBarFunction.SetRCommand("geom_text") - clsGeomTextBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsGeomTextBarFunction.AddParameter("vjust", "-0.5", iPosition:=1) - clsGeomTextBarFunction.AddParameter("size", "3", iPosition:=2) - clsGeomTextTmaxFunction.SetRCommand("geom_text") clsGeomTextTmaxFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextTmaxFunction, iPosition:=0, bIncludeArgumentName:=False) clsGeomTextTmaxFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) @@ -467,39 +483,54 @@ Public Class dlgClimograph clsGeomTextTmaxFunction.AddParameter("size", "3", iPosition:=3) clsGeomTextTmaxFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) - ClsGeomTextTminFunction.SetRCommand("geom_text") - ClsGeomTextTminFunction.AddParameter("mapping", clsRFunctionParameter:=ClsAesGeomTextTminFunction, iPosition:=0, bIncludeArgumentName:=False) - ClsGeomTextTminFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) - ClsGeomTextTminFunction.AddParameter("vjust", "1.5", iPosition:=2) - ClsGeomTextTminFunction.AddParameter("size", "3", iPosition:=3) - ClsGeomTextTminFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) + clsAesGeomTextTmaxFunction.SetRCommand("aes") + clsAesGeomTextTmaxFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTmaxFunction, iPosition:=1) - clsSecondaryAxis2Function.SetRCommand("sec_axis") - clsSecondaryAxis2Function.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=1) + clsGeomTextTmaxStarFunction.SetRCommand("geom_text") + clsGeomTextTmaxStarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextStarTmaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextTmaxStarFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) + clsGeomTextTmaxStarFunction.AddParameter("vjust", "-0.5", iPosition:=2) + clsGeomTextTmaxStarFunction.AddParameter("size", "3", iPosition:=3) + clsGeomTextTmaxStarFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) - clsDivide1Operator.SetOperation("/") - clsDivide1Operator.AddParameter("left", "~ .", iPosition:=0, bIncludeArgumentName:=False) + clsAesGeomTextStarTmaxFunction.SetRCommand("aes") + clsAesGeomTextStarTmaxFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) + clsAesGeomTextStarTmaxFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTmaxFunction, iPosition:=1) - clsDollar1OPerator.SetOperation("$") - clsDollar1OPerator.bSpaceAroundOperation = False - clsDollar1OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + clsRoundTmaxFunction.SetRCommand("round") + clsRoundTmaxFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) - clsDollar2OPerator.SetOperation("$") - clsDollar2OPerator.bSpaceAroundOperation = False - clsDollar2OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextTminFunction.SetRCommand("geom_text") + clsGeomTextTminFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextTminFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextTminFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) + clsGeomTextTminFunction.AddParameter("vjust", "1.5", iPosition:=2) + clsGeomTextTminFunction.AddParameter("size", "3", iPosition:=3) + clsGeomTextTminFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) - clsDollar3OPerator.SetOperation("$") - clsDollar3OPerator.bSpaceAroundOperation = False - clsDollar3OPerator.AddParameter("left", clsRFunctionParameter:=ucrSelectorClimograph.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0, bIncludeArgumentName:=False) + clsAesGeomTextTminFunction.SetRCommand("aes") + clsAesGeomTextTminFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTminFunction, iPosition:=1) - clsMaxFunction.SetRCommand("max") + clsGeomTextTminStarFunction.SetRCommand("geom_text") + clsGeomTextTminStarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomTextStarTminFunction, iPosition:=0, bIncludeArgumentName:=False) + clsGeomTextTminStarFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) + clsGeomTextTminStarFunction.AddParameter("vjust", "1.5", iPosition:=2) + clsGeomTextTminStarFunction.AddParameter("size", "3", iPosition:=3) + clsGeomTextTminStarFunction.AddParameter("Show.legend", "FALSE", iPosition:=4) - clsMax1Function.SetRCommand("max") + clsAesGeomTextStarTminFunction.SetRCommand("aes") + clsAesGeomTextStarTminFunction.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsAesGeomTextStarTminFunction.AddParameter("label", clsRFunctionParameter:=clsRoundTminFunction, iPosition:=1) - clsDivideOperator.SetOperation("/") - clsDivideOperator.SetAssignTo(strScale) + clsRoundTminFunction.SetRCommand("round") + clsRoundTminFunction.AddParameter("x", "1", iPosition:=1, bIncludeArgumentName:=False) - clsVectorFunction.SetRCommand("c") + clsSecondaryAxis2Function.SetRCommand("sec_axis") + clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsSecondaryAxis2Function.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=1) + + clsDivide1Operator.SetOperation("/") + clsDivide1Operator.AddParameter("left", "~ .", iPosition:=0, bIncludeArgumentName:=False) + clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) clsStarOperator.SetOperation("*") clsStarOperator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) @@ -507,9 +538,17 @@ Public Class dlgClimograph clsStar1Operator.SetOperation("*") clsStar1Operator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) - clsBaseOperator.SetOperation("+") - clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + clsDivideOperator.SetOperation("/") + clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) + clsDivideOperator.SetAssignTo(strScale,) + + clsMaxFunction.SetRCommand("max") + + clsMax1Function.SetRCommand("max") + clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsVectorFunction.SetRCommand("c") clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() @@ -536,10 +575,21 @@ Public Class dlgClimograph Private Sub SetRCodeForControls(bReset) ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) ucrReceiverRainC.AddAdditionalCodeParameterPair(clsRoundBarFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsRoundTmaxFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) - ucrReceiverElement2.AddAdditionalCodeParameterPair(clsRoundTminFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) - - ucrReceiverRainC.SetRCode(clsAesGeomTextBarFunction, bReset) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsStarOperator, New RParameter("left", 0, False), iAdditionalPairNo:=1) + ucrReceiverElement2.AddAdditionalCodeParameterPair(clsStar1Operator, New RParameter("left", 0, False), iAdditionalPairNo:=1) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsAesGeomRibbonFunction, New RParameter("ymax", 1), iAdditionalPairNo:=2) + ucrReceiverElement2.AddAdditionalCodeParameterPair(clsAesGeomRibbonFunction, New RParameter("ymin", 0), iAdditionalPairNo:=2) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsAesLineFunction, New RParameter("y", 0), iAdditionalPairNo:=3) + ucrReceiverElement2.AddAdditionalCodeParameterPair(clsAesLine1Function, New RParameter("y", 0), iAdditionalPairNo:=3) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsRoundTmaxFunction, New RParameter("y", 0, False), iAdditionalPairNo:=4) + ucrReceiverElement2.AddAdditionalCodeParameterPair(clsRoundTminFunction, New RParameter("y", 0, False), iAdditionalPairNo:=4) + ucrReceiverElement1.AddAdditionalCodeParameterPair(clsVectorFunction, New RParameter("x", 0, False), iAdditionalPairNo:=5) + ucrReceiverElement2.AddAdditionalCodeParameterPair(clsVectorFunction, New RParameter("y", 0, False), iAdditionalPairNo:=5) + ucrReceiverMonthC.AddAdditionalCodeParameterPair(clsUniqueFunction, New RParameter("x", 0, False), iAdditionalPairNo:=1) + ucrReceiverRainC.AddAdditionalCodeParameterPair(clsMaxFunction, New RParameter("x", 0, False), iAdditionalPairNo:=2) + ucrReceiverRainC.AddAdditionalCodeParameterPair(clsAesGeomTextBarFunction, New RParameter("y", 0), iAdditionalPairNo:=3) + + ucrReceiverRainC.SetRCode(clsBarAesFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverRain.SetRCode(clsGgwalterliethFunction, bReset) @@ -561,7 +611,6 @@ Public Class dlgClimograph End If ucrReceiverElement2.SetRCode(clsAesGeomTextTminFunction, bReset) ucrReceiverElement1.SetRCode(clsAesGeomTextTmaxFunction, bReset) - End Sub Private Sub TestOKEnabled() @@ -981,7 +1030,6 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverRainC.IsEmpty Then - clsAesGeomTextBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextBarFunction, iPosition:=5, bIncludeArgumentName:=False) Else clsBaseOperator.RemoveParameterByName("geom_text") @@ -998,14 +1046,10 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverElement1.IsEmpty Then - clsStarOperator.RemoveParameterByName("left") - clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) If Not ucrReceiverRainC.IsEmpty Then - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesGeomTextTmaxFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) + clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxStarFunction, iPosition:=6, bIncludeArgumentName:=False) Else - clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) End If Else clsBaseOperator.RemoveParameterByName("geom_text1") @@ -1022,14 +1066,10 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverElement2.IsEmpty Then - clsStar1Operator.RemoveParameterByName("left") - clsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=ClsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) If Not ucrReceiverRainC.IsEmpty Then - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - ClsAesGeomTextTminFunction.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminStarFunction, iPosition:=7, bIncludeArgumentName:=False) Else - ClsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) End If Else clsBaseOperator.RemoveParameterByName("geom_text2") @@ -1045,37 +1085,19 @@ Public Class dlgClimograph Private Sub AddRemoveGeomRibbon() If rdoClimograph.Checked Then If ucrChkRibbon.Checked Then - clsAsNumericFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsBarAesFunction.AddParameter("x", clsRFunctionParameter:=clsAsNumericFunction, iPosition:=2) - clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) - clsStarOperator.RemoveParameterByName("left") - clsStar1Operator.RemoveParameterByName("left") + clsBaseOperator.AddParameter("scale_x_discrete", clsRFunctionParameter:=clsXScalediscreteFunction, iPosition:=12) If Not ucrReceiverRainC.IsEmpty Then - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesGeomRibbonFunction.AddParameter("ymin", clsROperatorParameter:=clsStar1Operator, iPosition:=0) - clsAesGeomRibbonFunction.AddParameter("ymax", clsROperatorParameter:=clsStarOperator, iPosition:=1) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) Else - clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) End If - clsGeomRibbonFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomRibbonFunction, iPosition:=0, bIncludeArgumentName:=False) - clsGeomRibbonFunction.AddParameter("fill", Chr(34) & "#000000" & Chr(34), iPosition:=1) - clsGeomRibbonFunction.AddParameter("alpha", "0.2", iPosition:=2) - clsXScalecontinuousFunction.AddParameter("name", Chr(34) & "Month" & Chr(34), iPosition:=0) - clsXScalecontinuousFunction.AddParameter("breaks", clsROperatorParameter:=clsSemicommaOperator, iPosition:=1) - clsXScalecontinuousFunction.AddParameter("labels", clsRFunctionParameter:=clsUnique1Function, iPosition:=2) - clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) - clsBaseOperator.AddParameter("scale_x_continuous", clsRFunctionParameter:=clsXScalecontinuousFunction, iPosition:=12) Else - clsBarAesFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=2) - clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) clsBaseOperator.RemoveParameterByName("geom_ribbon") - clsBaseOperator.RemoveParameterByName("scale_x_continuous") + clsBaseOperator.RemoveParameterByName("scale_x_discrete") End If Else clsBaseOperator.RemoveParameterByName("geom_ribbon") - clsBaseOperator.RemoveParameterByName("scale_x_continuous") + clsBaseOperator.RemoveParameterByName("scale_x_discrete") End If End Sub @@ -1092,13 +1114,12 @@ Public Class dlgClimograph Private Sub AddRemoveGeomLines() If rdoClimograph.Checked Then If Not ucrReceiverElement1.IsEmpty Then + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_line1") If Not ucrReceiverRainC.IsEmpty Then + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) If ucrChkColourIdntity.Checked Then - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesLineFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) - clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsAesLineStarFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) If Not ucrInputLabels.IsEmpty Then clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) @@ -1111,20 +1132,13 @@ Public Class dlgClimograph clsScalecolouridentityFunction.RemoveParameterByName("name") End If Else - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesLineFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLineFunction.RemoveParameterByName("colour") + clsAesLineStarFunction.RemoveParameterByName("colour") End If Else - clsStarOperator.RemoveParameterByName("left") + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) If ucrChkColourIdntity.Checked Then - clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) If Not ucrInputLabels.IsEmpty Then clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) @@ -1137,18 +1151,17 @@ Public Class dlgClimograph clsScalecolouridentityFunction.RemoveParameterByName("name") End If Else - clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) clsBaseOperator.RemoveParameterByName("scale_colour_identity") clsAesLineFunction.RemoveParameterByName("colour") End If End If Else - clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_line1") End If Else clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_line1") clsBaseOperator.RemoveParameterByName("scale_colour_identity") End If End Sub @@ -1156,13 +1169,12 @@ Public Class dlgClimograph Private Sub AddRemoveGeomLine1() If rdoClimograph.Checked Then If Not ucrReceiverElement2.IsEmpty Then + clsBaseOperator.RemoveParameterByName("geom_line3") + clsBaseOperator.RemoveParameterByName("geom_line2") If Not ucrReceiverRainC.IsEmpty Then + clsBaseOperator.AddParameter("geom_line2", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) If ucrChkColourIdntity.Checked Then - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesLine1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) - clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsAesLineStar1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) If Not ucrInputLabels.IsEmpty Then clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) @@ -1175,20 +1187,13 @@ Public Class dlgClimograph clsScalecolouridentityFunction.RemoveParameterByName("name") End If Else - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesLine1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLine1Function.RemoveParameterByName("colour") + clsAesLineStar1Function.RemoveParameterByName("colour") End If Else - clsStar1Operator.RemoveParameterByName("left") + clsBaseOperator.AddParameter("geom_line3", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) If ucrChkColourIdntity.Checked Then - clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) If Not ucrInputLabels.IsEmpty Then clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) @@ -1201,19 +1206,18 @@ Public Class dlgClimograph clsScalecolouridentityFunction.RemoveParameterByName("name") End If Else - clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) clsBaseOperator.RemoveParameterByName("scale_colour_identity") clsAesLine1Function.RemoveParameterByName("colour") End If End If Else - clsBaseOperator.RemoveParameterByName("geom_line1") + clsBaseOperator.RemoveParameterByName("geom_line3") + clsBaseOperator.RemoveParameterByName("geom_line2") End If Else clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsBaseOperator.RemoveParameterByName("geom_line1") + clsBaseOperator.RemoveParameterByName("geom_line2") + clsBaseOperator.RemoveParameterByName("geom_line3") End If End Sub @@ -1224,14 +1228,10 @@ Public Class dlgClimograph clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabsFunction, iPosition:=13) If ucrChkTile.Checked Then clsBarAesFunction.AddParameter("fill", ucrReceiverRainC.GetVariableNames(False), iPosition:=3) - clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=2) - clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) clsBaseOperator.AddParameter("geom_tile", clsRFunctionParameter:=clsGeomTileFunction, iPosition:=1) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) Else clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) - clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=2) - clsRggplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsBarAesFunction, iPosition:=1) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) clsBaseOperator.RemoveParameterByName("geom_tile") End If @@ -1250,63 +1250,38 @@ Public Class dlgClimograph Private Sub EnableTileAndRibbon() ucrChkRibbon.Enabled = (Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty) AndAlso Not ucrChkTile.Checked ucrChkTile.Enabled = Not ucrChkRibbon.Checked AndAlso Not ucrReceiverRainC.IsEmpty + If ucrChkRibbon.Checked Then + If ucrChkRibbon.Enabled = True Then + If Not ucrReceiverRainC.IsEmpty Then + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.AddParameter("geom_ribbon1", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) + Else + clsBaseOperator.RemoveParameterByName("geom_ribbon1") + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) + End If + Else + clsBaseOperator.RemoveParameterByName("geom_ribbon1") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_ribbon1") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + End If End Sub Private Sub AddRemoveSecondaryAxis() If rdoClimograph.Checked Then + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) If Not ucrReceiverRainC.IsEmpty Then - clsVectorFunction.RemoveParameterByName("x") - clsVectorFunction.RemoveParameterByName("y") - If Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty Then - clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsDollar2OPerator.AddParameter("right", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsDollar3OPerator.AddParameter("right", ucrReceiverElement2.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsVectorFunction.AddParameter("x", clsROperatorParameter:=clsDollar2OPerator, iPosition:=0, bIncludeArgumentName:=False) - clsVectorFunction.AddParameter("y", clsROperatorParameter:=clsDollar3OPerator, iPosition:=1, bIncludeArgumentName:=False) - clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) - clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) - clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) - clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) - clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) - clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) - ElseIf Not ucrReceiverElement1.IsEmpty AndAlso ucrReceiverElement2.IsEmpty Then - clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsDollar2OPerator.AddParameter("right", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsVectorFunction.AddParameter("x", clsROperatorParameter:=clsDollar2OPerator, iPosition:=0, bIncludeArgumentName:=False) - clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) - clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) - clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) - clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) - clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) - clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) - ElseIf ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty Then - clsDollar1OPerator.AddParameter("right", ucrReceiverRainC.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsDollar3OPerator.AddParameter("right", ucrReceiverElement2.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsVectorFunction.AddParameter("x", clsROperatorParameter:=clsDollar3OPerator, iPosition:=0, bIncludeArgumentName:=False) - clsMax1Function.AddParameter("x", clsRFunctionParameter:=clsVectorFunction, iPosition:=0, bIncludeArgumentName:=False) - clsMaxFunction.AddParameter("x", clsROperatorParameter:=clsDollar1OPerator, iPosition:=0, bIncludeArgumentName:=False) - clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsDivideOperator.AddParameter("right", clsRFunctionParameter:=clsMax1Function, iPosition:=1, bIncludeArgumentName:=False) - clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) - clsSecondaryAxis2Function.AddParameter("x", clsROperatorParameter:=clsDivide1Operator, iPosition:=0, bIncludeArgumentName:=False) - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + If Not ucrReceiverElement1.IsEmpty OrElse Not ucrReceiverElement2.IsEmpty Then clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) Else - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) End If Else clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=0) clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis1Function, iPosition:=1) - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) End If Else clsBaseOperator.RemoveParameterByName("scale_y_continuous") From 401a3f1a2f1a0b34ee73a28086c229065481e0d7 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 19 Jun 2024 16:15:14 +0300 Subject: [PATCH 050/273] Made structural changes and added cell features --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 107 ++++++ .../Cells/FootNotes/ucrCellsFootNotes.resx | 144 +++++++ .../Cells/FootNotes/ucrCellsFootNotes.vb | 202 ++++++++++ .../Date/sdgCellFormatDateOptions.Designer.vb | 79 ++++ .../Date/sdgCellFormatDateOptions.resx | 120 ++++++ .../Formats/Date/sdgCellFormatDateOptions.vb | 104 +++++ .../sdgCellFormatNumberOptions.Designer.vb | 197 ++++++++++ .../Number/sdgCellFormatNumberOptions.resx | 120 ++++++ .../Number/sdgCellFormatNumberOptions.vb | 127 ++++++ .../Text/sdgCellFormatTextOptions.Designer.vb | 119 ++++++ .../Text/sdgCellFormatTextOptions.resx | 120 ++++++ .../Formats/Text/sdgCellFormatTextOptions.vb | 74 ++++ .../Text/ucrCellFormatEmail.Designer.vb | 115 ++++++ .../Formats/Text/ucrCellFormatEmail.resx | 120 ++++++ .../Cells/Formats/Text/ucrCellFormatEmail.vb | 36 ++ .../Cells/Formats/ucrCellFormats.Designer.vb | 229 +++++++++++ .../Formats/ucrCellFormats.resx} | 10 +- .../Cells/Formats/ucrCellFormats.vb | 148 +++++++ instat/UserTables/Cells/ucrCells.Designer.vb | 363 +++++------------- instat/UserTables/Cells/ucrCells.resx | 9 - instat/UserTables/Cells/ucrCells.vb | 28 ++ .../Columns/ucrColumnFormats.Designer.vb | 199 ---------- instat/UserTables/Columns/ucrColumnFormats.vb | 3 - instat/UserTables/Columns/ucrColumnLabels.vb | 2 +- .../UserTables/Columns/ucrColumnSpanners.vb | 2 +- .../UserTables/Columns/ucrColumns.Designer.vb | 84 +--- instat/UserTables/Columns/ucrColumns.vb | 5 +- instat/UserTables/Header/ucrHeader.vb | 2 +- instat/UserTables/Rows/ucrRowGroup.vb | 2 +- instat/UserTables/Rows/ucrRows.Designer.vb | 28 +- instat/UserTables/Rows/ucrRows.vb | 1 - .../UserTables/SourceNotes/ucrSourceNotes.vb | 2 +- instat/UserTables/Stub/ucrStub.vb | 4 +- instat/UserTables/clsTablesUtils.vb | 37 +- instat/UserTables/dlgGeneralTable.vb | 2 +- instat/UserTables/sdgTableOptions.Designer.vb | 131 ++----- instat/UserTables/sdgTableOptions.resx | 24 -- instat/UserTables/sdgTableOptions.vb | 91 +---- instat/dlgSummaryTables.vb | 2 +- instat/instat.vbproj | 63 ++- 40 files changed, 2455 insertions(+), 800 deletions(-) create mode 100644 instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb create mode 100644 instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx create mode 100644 instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb create mode 100644 instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.Designer.vb create mode 100644 instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.resx create mode 100644 instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb create mode 100644 instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.Designer.vb create mode 100644 instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.resx create mode 100644 instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb create mode 100644 instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.Designer.vb create mode 100644 instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.resx create mode 100644 instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb create mode 100644 instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.Designer.vb create mode 100644 instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.resx create mode 100644 instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.vb create mode 100644 instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb rename instat/UserTables/{Columns/ucrColumnFormats.resx => Cells/Formats/ucrCellFormats.resx} (94%) create mode 100644 instat/UserTables/Cells/Formats/ucrCellFormats.vb delete mode 100644 instat/UserTables/Columns/ucrColumnFormats.Designer.vb delete mode 100644 instat/UserTables/Columns/ucrColumnFormats.vb diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb new file mode 100644 index 00000000000..43e23a2dc51 --- /dev/null +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -0,0 +1,107 @@ + _ +Partial Class ucrCellsFootNotes + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() + Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.lblFooterCellNotes = New System.Windows.Forms.Label() + CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'dataGridCellFooterNotes + ' + Me.dataGridCellFooterNotes.AllowUserToAddRows = False + Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False + Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) + Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(4, 22) + Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" + Me.dataGridCellFooterNotes.RowHeadersWidth = 62 + Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 55) + Me.dataGridCellFooterNotes.TabIndex = 7 + ' + 'colFooterNoteText + ' + Me.colFooterNoteText.HeaderText = "Note Text" + Me.colFooterNoteText.MinimumWidth = 8 + Me.colFooterNoteText.Name = "colFooterNoteText" + Me.colFooterNoteText.Width = 220 + ' + 'colFooterColExpression + ' + Me.colFooterColExpression.HeaderText = "Column Expression" + Me.colFooterColExpression.MinimumWidth = 8 + Me.colFooterColExpression.Name = "colFooterColExpression" + Me.colFooterColExpression.Resizable = System.Windows.Forms.DataGridViewTriState.[True] + Me.colFooterColExpression.Width = 140 + ' + 'colFooterRowExpression + ' + Me.colFooterRowExpression.HeaderText = "Row Expression(s)" + Me.colFooterRowExpression.MinimumWidth = 8 + Me.colFooterRowExpression.Name = "colFooterRowExpression" + Me.colFooterRowExpression.Width = 140 + ' + 'colFooterFormat + ' + Me.colFooterFormat.HeaderText = "" + Me.colFooterFormat.MinimumWidth = 8 + Me.colFooterFormat.Name = "colFooterFormat" + Me.colFooterFormat.ReadOnly = True + Me.colFooterFormat.Text = "Format" + Me.colFooterFormat.UseColumnTextForButtonValue = True + Me.colFooterFormat.Width = 60 + ' + 'lblFooterCellNotes + ' + Me.lblFooterCellNotes.AutoSize = True + Me.lblFooterCellNotes.Location = New System.Drawing.Point(7, 4) + Me.lblFooterCellNotes.Name = "lblFooterCellNotes" + Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) + Me.lblFooterCellNotes.TabIndex = 6 + Me.lblFooterCellNotes.Text = "Cell footers notes:" + ' + 'ucrCellsFootNotes + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.dataGridCellFooterNotes) + Me.Controls.Add(Me.lblFooterCellNotes) + Me.Name = "ucrCellsFootNotes" + Me.Size = New System.Drawing.Size(641, 113) + CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents dataGridCellFooterNotes As DataGridView + Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn + Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn + Friend WithEvents colFooterFormat As DataGridViewButtonColumn + Friend WithEvents lblFooterCellNotes As Label +End Class diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx new file mode 100644 index 00000000000..0801bc20640 --- /dev/null +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb new file mode 100644 index 00000000000..8642204d8ea --- /dev/null +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb @@ -0,0 +1,202 @@ +Public Class ucrCellsFootNotes + + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) + End Sub + + + + + Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) + 'SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) + SetFooterGridContents(clsOperator, dataGridCellFooterNotes) + End Sub + + Private Sub SetFooterGridContents(clsOperator As ROperator, dataGridFooterNotes As DataGridView) + dataGridFooterNotes.Rows.Clear() + + For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters + If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFooterNotes) + + Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure + + For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters + + If clsFootNoteRParam.strArgumentName = "footnote" Then + ' Set the foot note text + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + ElseIf clsFootNoteRParam.strArgumentName = "locations" Then + ' todo go through the location function + Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure + + If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then + For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters + If clsFootNoteLocationRParam.strArgumentName = "columns" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then + row.Cells(2).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + End If + Next + End If + End If + + ' Tag and add the tab_footnote() function contents as a row + ' Check if second cell has a value + If row.Cells(1).Value IsNot Nothing Then + row.Tag = clsFooterRFunction + dataGridFooterNotes.Rows.Add(row) + End If + + + Next + + End If + Next + + ' Always add a place holder row for new foot note + dataGridFooterNotes.Rows.Add() + + End Sub + + + Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellEndEdit + Dim dataGrid As DataGridView = sender + Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) + Dim strNoteTextValue As String = row.Cells(0).Value + + ' If no foot note typed by user then just exit the sub + If String.IsNullOrEmpty(strNoteTextValue) Then + Exit Sub + End If + + Dim clsNoteRFunction As RFunction = Nothing + + If dataGrid Is dataGridCellFooterNotes Then + + clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) + + ' Add column and row expressions as paramters if user has typed them + If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then + Dim clsFooterLocationNoteRFunction As New RFunction + clsFooterLocationNoteRFunction.SetPackageName("gt") + clsFooterLocationNoteRFunction.SetRCommand("cells_body") + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=clsTablesUtils.GetStringValue(row.Cells(1).Value, False))) + clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=clsTablesUtils.GetStringValue(row.Cells(2).Value, False))) + clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) + End If + + End If + + ' Overwrite the tag with the new foot function + row.Tag = clsNoteRFunction + + ' If last row then add new empty row + If e.RowIndex = dataGrid.Rows.Count - 1 Then + dataGrid.Rows.Add() + End If + End Sub + + + Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellClick + + Dim dataGrid As DataGridView = sender + Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag + Dim strParameterName As String = Nothing + + '--------------------------- + ' Ignore clicks that are not from button cells. + If dataGrid Is dataGridCellFooterNotes Then + strParameterName = "footnote" + If e.ColumnIndex <> 3 Then + Exit Sub + End If + End If + '--------------------------- + + If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then + sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) + sdgTableOptionsTextFormat.Show(Me) + End If + + End Sub + + + Private Function SetupAndGetNewNoteRFunction(clsPossibleNoteRFunction As RFunction, strNoteRCommand As String, strRNoteTextParameterName As String, strNoteTextValue As String) As RFunction + Dim clsNewNoteRFunction As RFunction = clsPossibleNoteRFunction + ' Get the prevous style parameter to retain any format options previously done + Dim clsStyleParam As RParameter + If clsNewNoteRFunction IsNot Nothing Then + clsStyleParam = clsNewNoteRFunction.GetParameter(strRNoteTextParameterName).clsArgumentCodeStructure.GetParameter("style") + Else + clsStyleParam = New RParameter(strParameterName:="style", strParamValue:=clsTablesUtils.GetNewHtmlStyleRFunction(), iNewPosition:=1) + End If + + + ' Recreate the footer function + clsNewNoteRFunction = New RFunction + clsNewNoteRFunction.SetPackageName("gt") + clsNewNoteRFunction.SetRCommand(strNoteRCommand) + + Dim clsNoteTextRFunction As RFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=clsTablesUtils.GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) + clsNoteTextRFunction.AddParameter(clsStyleParam) ' Add the style parameter for formating + + ' Add the foot note text parameter to the footer R function + clsNewNoteRFunction.AddParameter(New RParameter(strParameterName:=strRNoteTextParameterName, strParamValue:=clsNoteTextRFunction, iNewPosition:=0)) + Return clsNewNoteRFunction + End Function + + + Private Sub SetFooterGridContents1(clsOperator As ROperator, dataGridFooterNotes As DataGridView) + dataGridFooterNotes.Rows.Clear() + + For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters + If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFooterNotes) + + Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure + + For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters + + If clsFootNoteRParam.strArgumentName = "footnote" Then + ' Set the foot note text + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + ElseIf clsFootNoteRParam.strArgumentName = "locations" Then + ' todo go through the location function + Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure + + If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then + For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters + If clsFootNoteLocationRParam.strArgumentName = "columns" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then + row.Cells(2).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + End If + Next + End If + End If + + ' Tag and add the tab_footnote() function contents as a row + ' Check if second cell has a value + If row.Cells(1).Value IsNot Nothing Then + row.Tag = clsFooterRFunction + dataGridFooterNotes.Rows.Add(row) + End If + + + Next + + End If + Next + + ' Always add a place holder row for new foot note + dataGridFooterNotes.Rows.Add() + + End Sub +End Class diff --git a/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.Designer.vb b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.Designer.vb new file mode 100644 index 00000000000..a1bc3ea22f3 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.Designer.vb @@ -0,0 +1,79 @@ + _ +Partial Class sdgCellFormatDateOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrInputCboDateFormat = New instat.ucrInputComboBox() + Me.lblDateFormat = New System.Windows.Forms.Label() + Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrInputCboDateFormat + ' + Me.ucrInputCboDateFormat.AddQuotesIfUnrecognised = True + Me.ucrInputCboDateFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputCboDateFormat.GetSetSelectedIndex = -1 + Me.ucrInputCboDateFormat.IsReadOnly = False + Me.ucrInputCboDateFormat.Location = New System.Drawing.Point(12, 25) + Me.ucrInputCboDateFormat.Name = "ucrInputCboDateFormat" + Me.ucrInputCboDateFormat.Size = New System.Drawing.Size(137, 21) + Me.ucrInputCboDateFormat.TabIndex = 0 + ' + 'lblDateFormat + ' + Me.lblDateFormat.AutoSize = True + Me.lblDateFormat.Location = New System.Drawing.Point(7, 9) + Me.lblDateFormat.Name = "lblDateFormat" + Me.lblDateFormat.Size = New System.Drawing.Size(103, 13) + Me.lblDateFormat.TabIndex = 1 + Me.lblDateFormat.Text = "Specify Date Format" + ' + 'ucrSdgBaseButtons + ' + Me.ucrSdgBaseButtons.AutoSize = True + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(10, 65) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.TabIndex = 343 + ' + 'sdgCellFormatDateOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(255, 103) + Me.Controls.Add(Me.ucrSdgBaseButtons) + Me.Controls.Add(Me.lblDateFormat) + Me.Controls.Add(Me.ucrInputCboDateFormat) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgCellFormatDateOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Cell Date Format Options" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrInputCboDateFormat As ucrInputComboBox + Friend WithEvents lblDateFormat As Label + Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue +End Class diff --git a/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.resx b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb new file mode 100644 index 00000000000..0e187903bf2 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb @@ -0,0 +1,104 @@ +Public Class sdgCellFormatDateOptions + + Private clsFormatDateRFunction As New RFunction + Private bFirstload As Boolean = True + + Private bUserMadeChanges As Boolean = False + Private bUserClickedReturn As Boolean = False + + Private Sub sdgCellFormatDateOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + SetDefaults() + SetRCode(True) + + bUserMadeChanges = False + bUserClickedReturn = False + End Sub + + Private Sub InitialiseDialog() + Dim dctDateFormat As New Dictionary(Of String, String) From { + {"2000-02-29", Chr(34) & "iso" & Chr(34)}, + {"Tuesday, February 29, 2000", Chr(34) & "wday_month_day_year" & Chr(34)}, + {"Tue, Feb 29, 2000", Chr(34) & "wd_m_day_year" & Chr(34)}, + {"Tuesday 29 February 2000", Chr(34) & "wday_day_month_year" & Chr(34)}, + {"February 29, 2000", Chr(34) & "month_day_year" & Chr(34)}, + {"Feb 29, 2000", Chr(34) & "m_day_year" & Chr(34)}, + {"29 Feb 2000", Chr(34) & "day_m_year" & Chr(34)}, + {"29 February 2000", Chr(34) & "day_month_year" & Chr(34)}, + {"29 February", Chr(34) & "day_month" & Chr(34)}, + {"29 Feb", Chr(34) & "day_m" & Chr(34)}, + {"2000", Chr(34) & "year" & Chr(34)}, + {"month", Chr(34) & "February" & Chr(34)}, + {"day", Chr(34) & "29" & Chr(34)}, + {"year.mn.day", Chr(34) & "2000/02/29" & Chr(34)}, + {"y.mn.day", Chr(34) & "00/02/29" & Chr(34)}, + {"year_week", Chr(34) & "2000-W09" & Chr(34)}, + {"year_quarter", Chr(34) & "2000-Q1" & Chr(34)}, + {"yMd", Chr(34) & "2/29/2000" & Chr(34)}, + {"yMEd", Chr(34) & "Tue, 2/29/2000" & Chr(34)}, + {"yMMM", Chr(34) & "Feb 2000" & Chr(34)}, + {"yMMMM", Chr(34) & "February 2000" & Chr(34)}, + {"yMMMd", Chr(34) & "Feb 29, 2000" & Chr(34)}, + {"yMMMEd", Chr(34) & "Tue, Feb 29, 2000" & Chr(34)}, + {"GyMd", Chr(34) & "2/29/2000 A" & Chr(34)}, + {"GyMMMd", Chr(34) & "Feb 29, 2000 AD" & Chr(34)}, + {"GyMMMEd", Chr(34) & "Tue, Feb 29, 2000 AD" & Chr(34)}, + {"yM", Chr(34) & "2/2000" & Chr(34)}, + {"Md", Chr(34) & "2/29" & Chr(34)}, + {"MEd", Chr(34) & "Tue, 2/29" & Chr(34)}, + {"MMMd", Chr(34) & "Feb 29" & Chr(34)}, + {"MMMEd", Chr(34) & "Tue, Feb 29" & Chr(34)}, + {"MMMMd", Chr(34) & "February 29" & Chr(34)}, + {"GyMMM", Chr(34) & "Feb 2000 AD" & Chr(34)}, + {"yQQQ", Chr(34) & "Q1 2000" & Chr(34)}, + {"yQQQQ", Chr(34) & "1st quarter 2000" & Chr(34)}, + {"Gy", Chr(34) & "2000 AD" & Chr(34)}, + {"y", Chr(34) & "2000" & Chr(34)}, + {"MMM", Chr(34) & "Feb" & Chr(34)}, + {"d", Chr(34) & "29" & Chr(34)}, + {"Ed", Chr(34) & "29 Tue" & Chr(34)} + } + + ucrInputCboDateFormat.SetParameter(New RParameter("date_style", 3)) + ucrInputCboDateFormat.SetItems(dctDateFormat) + ucrInputCboDateFormat.SetDropDownStyleAsNonEditable() + ucrInputCboDateFormat.SetRDefault("iso") + + End Sub + + Private Sub SetDefaults() + clsFormatDateRFunction = New RFunction + + clsFormatDateRFunction.SetPackageName("gt") + clsFormatDateRFunction.SetRCommand("fmt_date") + clsFormatDateRFunction.AddParameter(strParameterName:="date_style", strParameterValue:=Chr(34) & "iso" & Chr(34)) + + End Sub + + Private Sub SetRCode(bReset As Boolean) + ucrInputCboDateFormat.SetRCode(clsFormatDateRFunction, bReset) + End Sub + + Public Function GetNewUserInputAsRFunction() As RFunction + If Not bUserClickedReturn OrElse Not bUserMadeChanges Then + Return Nothing + End If + + Return clsFormatDateRFunction + End Function + + + Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn + bUserClickedReturn = True + End Sub + + Private Sub controls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCboDateFormat.ControlValueChanged + bUserMadeChanges = True + End Sub + + +End Class \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.Designer.vb b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.Designer.vb new file mode 100644 index 00000000000..ffbf40b7935 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.Designer.vb @@ -0,0 +1,197 @@ + _ +Partial Class sdgCellFormatNumberOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrChkSuffix = New instat.ucrCheck() + Me.ucrInputSeperatorMark = New instat.ucrInputTextBox() + Me.ucrChkSeparatorMark = New instat.ucrCheck() + Me.ucrChkDropTrailingDecimalMark = New instat.ucrCheck() + Me.ucrInputDecimalMark = New instat.ucrInputTextBox() + Me.ucrChkDecimalMark = New instat.ucrCheck() + Me.ucrChkDropTrailingZeros = New instat.ucrCheck() + Me.ucrChkSignificantFigures = New instat.ucrCheck() + Me.ucrChkDecimalPlaces = New instat.ucrCheck() + Me.ucrNudSignificantFigures = New instat.ucrNud() + Me.ucrNudDecimalPlaces = New instat.ucrNud() + Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'ucrChkSuffix + ' + Me.ucrChkSuffix.AutoSize = True + Me.ucrChkSuffix.Checked = False + Me.ucrChkSuffix.Location = New System.Drawing.Point(8, 187) + Me.ucrChkSuffix.Name = "ucrChkSuffix" + Me.ucrChkSuffix.Size = New System.Drawing.Size(152, 23) + Me.ucrChkSuffix.TabIndex = 28 + ' + 'ucrInputSeperatorMark + ' + Me.ucrInputSeperatorMark.AddQuotesIfUnrecognised = True + Me.ucrInputSeperatorMark.AutoSize = True + Me.ucrInputSeperatorMark.IsMultiline = False + Me.ucrInputSeperatorMark.IsReadOnly = False + Me.ucrInputSeperatorMark.Location = New System.Drawing.Point(166, 96) + Me.ucrInputSeperatorMark.Name = "ucrInputSeperatorMark" + Me.ucrInputSeperatorMark.Size = New System.Drawing.Size(137, 21) + Me.ucrInputSeperatorMark.TabIndex = 27 + ' + 'ucrChkSeparatorMark + ' + Me.ucrChkSeparatorMark.AutoSize = True + Me.ucrChkSeparatorMark.Checked = False + Me.ucrChkSeparatorMark.Location = New System.Drawing.Point(8, 96) + Me.ucrChkSeparatorMark.Name = "ucrChkSeparatorMark" + Me.ucrChkSeparatorMark.Size = New System.Drawing.Size(152, 23) + Me.ucrChkSeparatorMark.TabIndex = 26 + ' + 'ucrChkDropTrailingDecimalMark + ' + Me.ucrChkDropTrailingDecimalMark.AutoSize = True + Me.ucrChkDropTrailingDecimalMark.Checked = False + Me.ucrChkDropTrailingDecimalMark.Location = New System.Drawing.Point(8, 158) + Me.ucrChkDropTrailingDecimalMark.Name = "ucrChkDropTrailingDecimalMark" + Me.ucrChkDropTrailingDecimalMark.Size = New System.Drawing.Size(152, 23) + Me.ucrChkDropTrailingDecimalMark.TabIndex = 25 + ' + 'ucrInputDecimalMark + ' + Me.ucrInputDecimalMark.AddQuotesIfUnrecognised = True + Me.ucrInputDecimalMark.AutoSize = True + Me.ucrInputDecimalMark.IsMultiline = False + Me.ucrInputDecimalMark.IsReadOnly = False + Me.ucrInputDecimalMark.Location = New System.Drawing.Point(166, 67) + Me.ucrInputDecimalMark.Name = "ucrInputDecimalMark" + Me.ucrInputDecimalMark.Size = New System.Drawing.Size(137, 21) + Me.ucrInputDecimalMark.TabIndex = 24 + ' + 'ucrChkDecimalMark + ' + Me.ucrChkDecimalMark.AutoSize = True + Me.ucrChkDecimalMark.Checked = False + Me.ucrChkDecimalMark.Location = New System.Drawing.Point(8, 67) + Me.ucrChkDecimalMark.Name = "ucrChkDecimalMark" + Me.ucrChkDecimalMark.Size = New System.Drawing.Size(152, 23) + Me.ucrChkDecimalMark.TabIndex = 23 + ' + 'ucrChkDropTrailingZeros + ' + Me.ucrChkDropTrailingZeros.AutoSize = True + Me.ucrChkDropTrailingZeros.Checked = False + Me.ucrChkDropTrailingZeros.Location = New System.Drawing.Point(8, 129) + Me.ucrChkDropTrailingZeros.Name = "ucrChkDropTrailingZeros" + Me.ucrChkDropTrailingZeros.Size = New System.Drawing.Size(152, 23) + Me.ucrChkDropTrailingZeros.TabIndex = 22 + ' + 'ucrChkSignificantFigures + ' + Me.ucrChkSignificantFigures.AutoSize = True + Me.ucrChkSignificantFigures.Checked = False + Me.ucrChkSignificantFigures.Location = New System.Drawing.Point(8, 36) + Me.ucrChkSignificantFigures.Name = "ucrChkSignificantFigures" + Me.ucrChkSignificantFigures.Size = New System.Drawing.Size(152, 23) + Me.ucrChkSignificantFigures.TabIndex = 21 + ' + 'ucrChkDecimalPlaces + ' + Me.ucrChkDecimalPlaces.AutoSize = True + Me.ucrChkDecimalPlaces.Checked = False + Me.ucrChkDecimalPlaces.Location = New System.Drawing.Point(8, 7) + Me.ucrChkDecimalPlaces.Name = "ucrChkDecimalPlaces" + Me.ucrChkDecimalPlaces.Size = New System.Drawing.Size(152, 23) + Me.ucrChkDecimalPlaces.TabIndex = 20 + ' + 'ucrNudSignificantFigures + ' + Me.ucrNudSignificantFigures.AutoSize = True + Me.ucrNudSignificantFigures.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSignificantFigures.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSignificantFigures.Location = New System.Drawing.Point(166, 39) + Me.ucrNudSignificantFigures.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSignificantFigures.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSignificantFigures.Name = "ucrNudSignificantFigures" + Me.ucrNudSignificantFigures.Size = New System.Drawing.Size(50, 20) + Me.ucrNudSignificantFigures.TabIndex = 19 + Me.ucrNudSignificantFigures.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudDecimalPlaces + ' + Me.ucrNudDecimalPlaces.AutoSize = True + Me.ucrNudDecimalPlaces.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDecimalPlaces.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDecimalPlaces.Location = New System.Drawing.Point(166, 7) + Me.ucrNudDecimalPlaces.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDecimalPlaces.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDecimalPlaces.Name = "ucrNudDecimalPlaces" + Me.ucrNudDecimalPlaces.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDecimalPlaces.TabIndex = 18 + Me.ucrNudDecimalPlaces.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrSdgBaseButtons + ' + Me.ucrSdgBaseButtons.AutoSize = True + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(43, 223) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.TabIndex = 342 + ' + 'sdgCellFormatNumberOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(314, 263) + Me.Controls.Add(Me.ucrSdgBaseButtons) + Me.Controls.Add(Me.ucrChkSuffix) + Me.Controls.Add(Me.ucrInputSeperatorMark) + Me.Controls.Add(Me.ucrChkSeparatorMark) + Me.Controls.Add(Me.ucrChkDropTrailingDecimalMark) + Me.Controls.Add(Me.ucrInputDecimalMark) + Me.Controls.Add(Me.ucrChkDecimalMark) + Me.Controls.Add(Me.ucrChkDropTrailingZeros) + Me.Controls.Add(Me.ucrChkSignificantFigures) + Me.Controls.Add(Me.ucrChkDecimalPlaces) + Me.Controls.Add(Me.ucrNudSignificantFigures) + Me.Controls.Add(Me.ucrNudDecimalPlaces) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgCellFormatNumberOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Cell Format Number Options" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrChkSuffix As ucrCheck + Friend WithEvents ucrInputSeperatorMark As ucrInputTextBox + Friend WithEvents ucrChkSeparatorMark As ucrCheck + Friend WithEvents ucrChkDropTrailingDecimalMark As ucrCheck + Friend WithEvents ucrInputDecimalMark As ucrInputTextBox + Friend WithEvents ucrChkDecimalMark As ucrCheck + Friend WithEvents ucrChkDropTrailingZeros As ucrCheck + Friend WithEvents ucrChkSignificantFigures As ucrCheck + Friend WithEvents ucrChkDecimalPlaces As ucrCheck + Friend WithEvents ucrNudSignificantFigures As ucrNud + Friend WithEvents ucrNudDecimalPlaces As ucrNud + Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue +End Class diff --git a/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.resx b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb new file mode 100644 index 00000000000..6c63ccb8958 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb @@ -0,0 +1,127 @@ +Public Class sdgCellFormatNumberOptions + Private clsFormatNumberRFunction As New RFunction + Private bFirstload As Boolean = True + + Private bUserMadeChanges As Boolean = False + Private bUserClickedReturn As Boolean = False + + + Private Sub sdgCellFormatNumberOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + SetDefaults() + SetRCode(True) + + bUserMadeChanges = False + bUserClickedReturn = False + End Sub + + + Private Sub InitialiseDialog() + + '--------------- + ucrChkDecimalPlaces.SetText("Change Decimal Places") + ucrChkDecimalPlaces.AddToLinkedControls(ucrNudDecimalPlaces, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="2") + + ucrNudDecimalPlaces.SetParameter(New RParameter("decimals", 3)) + '--------------- + + '-------------- + ucrChkSignificantFigures.SetText("Change Significant Figures") + ucrChkSignificantFigures.AddToLinkedControls(ucrNudSignificantFigures, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) + + ucrNudSignificantFigures.SetParameter(New RParameter(" n_sigfig", 4)) + '-------------- + + + '-------------- + ucrChkDecimalMark.SetText("Change Decimal Mark") + ucrChkDecimalMark.AddToLinkedControls(ucrInputDecimalMark, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=".") + + ucrInputDecimalMark.SetParameter(New RParameter("dec_mark", 13)) + '-------------- + + '--------------- + ucrChkSeparatorMark.SetText("Change Digits Separator Mark") + ucrChkSeparatorMark.AddToLinkedControls(ucrInputSeperatorMark, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=",") + + ucrInputSeperatorMark.SetParameter(New RParameter(" sep_mark", 14)) + '--------------- + + '--------------- + ucrChkDropTrailingZeros.SetText("Drop Trailing Zeros") + ucrChkDropTrailingZeros.SetParameter(New RParameter("drop_trailing_zeros", 5)) + ucrChkDropTrailingZeros.SetValuesCheckedAndUnchecked("TRUE", False) + ucrChkDropTrailingZeros.SetRDefault("FALSE") + '--------------- + + '--------------- + ucrChkDropTrailingDecimalMark.SetText("Drop Trailing Decimal Mark") + ucrChkDropTrailingDecimalMark.SetParameter(New RParameter("drop_trailing_dec_mark", 6)) + ucrChkDropTrailingDecimalMark.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkDropTrailingDecimalMark.SetRDefault("TRUE") + '--------------- + + '--------------- + ucrChkSuffix.SetText("Suffix Large Numbers") + ucrChkSuffix.SetParameter(New RParameter("suffixing", 10)) + ucrChkSuffix.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkSuffix.SetRDefault("FALSE") + '--------------- + + + End Sub + + Private Sub SetDefaults() + clsFormatNumberRFunction = New RFunction + + clsFormatNumberRFunction.SetPackageName("gt") + clsFormatNumberRFunction.SetRCommand("fmt_number") + + End Sub + + Private Sub SetRCode(bReset As Boolean) + ucrChkDecimalPlaces.SetRCode(clsFormatNumberRFunction, bReset) + ucrNudDecimalPlaces.SetRCode(clsFormatNumberRFunction, bReset) + + ucrChkSignificantFigures.SetRCode(clsFormatNumberRFunction, bReset) + ucrNudSignificantFigures.SetRCode(clsFormatNumberRFunction, bReset) + + ucrChkDecimalMark.SetRCode(clsFormatNumberRFunction, bReset) + ucrInputDecimalMark.SetRCode(clsFormatNumberRFunction, bReset) + + ucrChkSeparatorMark.SetRCode(clsFormatNumberRFunction, bReset) + ucrInputSeperatorMark.SetRCode(clsFormatNumberRFunction, bReset) + + ucrChkDropTrailingZeros.SetRCode(clsFormatNumberRFunction, bReset) + ucrChkDropTrailingDecimalMark.SetRCode(clsFormatNumberRFunction, bReset) + + ucrChkSuffix.SetRCode(clsFormatNumberRFunction, bReset) + + End Sub + + Public Function GetNewUserInputAsRFunction() As RFunction + If Not bUserClickedReturn OrElse Not bUserMadeChanges Then + Return Nothing + End If + + Return clsFormatNumberRFunction + End Function + + Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn + bUserClickedReturn = True + End Sub + + Private Sub controls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDecimalMark.ControlValueChanged, + ucrChkDecimalPlaces.ControlValueChanged, ucrChkDropTrailingDecimalMark.ControlValueChanged, ucrChkDropTrailingZeros.ControlValueChanged, + ucrChkSeparatorMark.ControlValueChanged, ucrChkSignificantFigures.ControlValueChanged, ucrChkSuffix.ControlValueChanged, + ucrInputDecimalMark.ControlValueChanged, ucrInputSeperatorMark.ControlValueChanged, ucrNudDecimalPlaces.ControlValueChanged, + ucrNudSignificantFigures.ControlValueChanged + + bUserMadeChanges = True + End Sub + +End Class \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.Designer.vb b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.Designer.vb new file mode 100644 index 00000000000..0e699d42903 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.Designer.vb @@ -0,0 +1,119 @@ + _ +Partial Class sdgCellFormatTextOptions + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.rdoEmail = New System.Windows.Forms.RadioButton() + Me.ucrInputFormatExpression = New instat.ucrInputTextBox() + Me.rdoCustom = New System.Windows.Forms.RadioButton() + Me.rdoUnits = New System.Windows.Forms.RadioButton() + Me.ucrCellFormatEmail = New instat.ucrCellFormatEmail() + Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() + Me.SuspendLayout() + ' + 'rdoEmail + ' + Me.rdoEmail.AutoSize = True + Me.rdoEmail.Location = New System.Drawing.Point(5, 76) + Me.rdoEmail.Name = "rdoEmail" + Me.rdoEmail.Size = New System.Drawing.Size(65, 17) + Me.rdoEmail.TabIndex = 339 + Me.rdoEmail.TabStop = True + Me.rdoEmail.Text = "As Email" + Me.rdoEmail.UseVisualStyleBackColor = True + ' + 'ucrInputFormatExpression + ' + Me.ucrInputFormatExpression.AddQuotesIfUnrecognised = True + Me.ucrInputFormatExpression.AutoSize = True + Me.ucrInputFormatExpression.IsMultiline = False + Me.ucrInputFormatExpression.IsReadOnly = False + Me.ucrInputFormatExpression.Location = New System.Drawing.Point(123, 8) + Me.ucrInputFormatExpression.Name = "ucrInputFormatExpression" + Me.ucrInputFormatExpression.Size = New System.Drawing.Size(137, 21) + Me.ucrInputFormatExpression.TabIndex = 338 + ' + 'rdoCustom + ' + Me.rdoCustom.AutoSize = True + Me.rdoCustom.Location = New System.Drawing.Point(6, 8) + Me.rdoCustom.Name = "rdoCustom" + Me.rdoCustom.Size = New System.Drawing.Size(95, 17) + Me.rdoCustom.TabIndex = 337 + Me.rdoCustom.TabStop = True + Me.rdoCustom.Text = "Custom Format" + Me.rdoCustom.UseVisualStyleBackColor = True + ' + 'rdoUnits + ' + Me.rdoUnits.AutoSize = True + Me.rdoUnits.Location = New System.Drawing.Point(6, 42) + Me.rdoUnits.Name = "rdoUnits" + Me.rdoUnits.Size = New System.Drawing.Size(64, 17) + Me.rdoUnits.TabIndex = 336 + Me.rdoUnits.TabStop = True + Me.rdoUnits.Text = "As Units" + Me.rdoUnits.UseVisualStyleBackColor = True + ' + 'ucrCellFormatEmail + ' + Me.ucrCellFormatEmail.Location = New System.Drawing.Point(123, 76) + Me.ucrCellFormatEmail.Name = "ucrCellFormatEmail" + Me.ucrCellFormatEmail.Size = New System.Drawing.Size(190, 154) + Me.ucrCellFormatEmail.TabIndex = 340 + ' + 'ucrSdgBaseButtons + ' + Me.ucrSdgBaseButtons.AutoSize = True + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(52, 237) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.TabIndex = 341 + ' + 'sdgCellFormatTextOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(341, 271) + Me.Controls.Add(Me.ucrSdgBaseButtons) + Me.Controls.Add(Me.rdoEmail) + Me.Controls.Add(Me.ucrInputFormatExpression) + Me.Controls.Add(Me.rdoCustom) + Me.Controls.Add(Me.rdoUnits) + Me.Controls.Add(Me.ucrCellFormatEmail) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgCellFormatTextOptions" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Cell Text Format Options" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents rdoEmail As RadioButton + Friend WithEvents ucrInputFormatExpression As ucrInputTextBox + Friend WithEvents rdoCustom As RadioButton + Friend WithEvents rdoUnits As RadioButton + Friend WithEvents ucrCellFormatEmail As ucrCellFormatEmail + Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue +End Class diff --git a/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.resx b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb new file mode 100644 index 00000000000..8c03f664de0 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb @@ -0,0 +1,74 @@ +Public Class sdgCellFormatTextOptions + Private clsUnitsFormatRFunction, clsCustomFormatRFunction As New RFunction + Private bFirstload As Boolean = True + Private bUserMadeChanges As Boolean = False + Private bUserClickedReturn As Boolean = False + + + Private Sub sdgCellFormatTextOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + SetDefaults() + + bUserMadeChanges = False + bUserClickedReturn = False + End Sub + + Private Sub InitialiseDialog() + rdoCustom.Checked = True + ucrCellFormatEmail.Enabled = False + End Sub + + Private Sub SetDefaults() + clsUnitsFormatRFunction = New RFunction + clsCustomFormatRFunction = New RFunction + + clsCustomFormatRFunction.SetPackageName("gt") + clsCustomFormatRFunction.SetRCommand("fmt") + + + clsUnitsFormatRFunction.SetPackageName("gt") + clsUnitsFormatRFunction.SetRCommand("fmt_units") + + + ucrInputFormatExpression.SetName("") + End Sub + + Public Function GetNewUserInputAsRFunction() As RFunction + If Not bUserClickedReturn OrElse Not bUserMadeChanges Then + Return Nothing + End If + + If rdoUnits.Checked Then + Return clsUnitsFormatRFunction + ElseIf rdoCustom.Checked AndAlso Not ucrInputFormatExpression.IsEmpty Then + Return clsCustomFormatRFunction + End If + + Return Nothing + End Function + + Private Sub radioButtons_CheckedChanged(sender As Object, e As EventArgs) Handles rdoCustom.CheckedChanged, rdoUnits.CheckedChanged, rdoEmail.CheckedChanged + ucrInputFormatExpression.Visible = rdoCustom.Checked + ucrCellFormatEmail.Visible = rdoEmail.Checked + bUserMadeChanges = True + End Sub + + Private Sub ucrInputFormatExpression_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFormatExpression.ControlValueChanged + If ucrInputFormatExpression.IsEmpty Then + clsCustomFormatRFunction.ClearParameters() + Else + clsCustomFormatRFunction.AddParameter(strParameterName:="fns", strParameterValue:="function(x){ " & ucrInputFormatExpression.GetText() & " }") + End If + + bUserMadeChanges = True + + End Sub + + Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn + bUserClickedReturn = True + End Sub +End Class \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.Designer.vb b/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.Designer.vb new file mode 100644 index 00000000000..469ef8d0ae2 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.Designer.vb @@ -0,0 +1,115 @@ + _ +Partial Class ucrCellFormatEmail + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrCboColors = New instat.ucrColors() + Me.lblColor = New System.Windows.Forms.Label() + Me.ucrChkShowUnderline = New instat.ucrCheck() + Me.ucrChkAsButton = New instat.ucrCheck() + Me.ucrReceiverSingleDisplayName = New instat.ucrReceiverSingle() + Me.Label1 = New System.Windows.Forms.Label() + Me.SuspendLayout() + ' + 'ucrCboColors + ' + Me.ucrCboColors.AddQuotesIfUnrecognised = True + Me.ucrCboColors.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColors.GetSetSelectedIndex = -1 + Me.ucrCboColors.IsReadOnly = False + Me.ucrCboColors.Location = New System.Drawing.Point(9, 129) + Me.ucrCboColors.Name = "ucrCboColors" + Me.ucrCboColors.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColors.TabIndex = 1 + ' + 'lblColor + ' + Me.lblColor.AutoSize = True + Me.lblColor.Location = New System.Drawing.Point(6, 113) + Me.lblColor.Name = "lblColor" + Me.lblColor.Size = New System.Drawing.Size(34, 13) + Me.lblColor.TabIndex = 2 + Me.lblColor.Text = "Color:" + ' + 'ucrChkShowUnderline + ' + Me.ucrChkShowUnderline.AutoSize = True + Me.ucrChkShowUnderline.Checked = False + Me.ucrChkShowUnderline.Location = New System.Drawing.Point(6, 80) + Me.ucrChkShowUnderline.Name = "ucrChkShowUnderline" + Me.ucrChkShowUnderline.Size = New System.Drawing.Size(189, 23) + Me.ucrChkShowUnderline.TabIndex = 3 + ' + 'ucrChkAsButton + ' + Me.ucrChkAsButton.AutoSize = True + Me.ucrChkAsButton.Checked = False + Me.ucrChkAsButton.Location = New System.Drawing.Point(6, 47) + Me.ucrChkAsButton.Name = "ucrChkAsButton" + Me.ucrChkAsButton.Size = New System.Drawing.Size(189, 23) + Me.ucrChkAsButton.TabIndex = 4 + ' + 'ucrReceiverSingleDisplayName + ' + Me.ucrReceiverSingleDisplayName.AutoSize = True + Me.ucrReceiverSingleDisplayName.frmParent = Nothing + Me.ucrReceiverSingleDisplayName.Location = New System.Drawing.Point(10, 19) + Me.ucrReceiverSingleDisplayName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleDisplayName.Name = "ucrReceiverSingleDisplayName" + Me.ucrReceiverSingleDisplayName.Selector = Nothing + Me.ucrReceiverSingleDisplayName.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSingleDisplayName.strNcFilePath = "" + Me.ucrReceiverSingleDisplayName.TabIndex = 5 + Me.ucrReceiverSingleDisplayName.ucrSelector = Nothing + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(7, 5) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(74, 13) + Me.Label1.TabIndex = 6 + Me.Label1.Text = "Link Email To:" + ' + 'ucrCellFormatEmail + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.ucrReceiverSingleDisplayName) + Me.Controls.Add(Me.ucrChkAsButton) + Me.Controls.Add(Me.ucrChkShowUnderline) + Me.Controls.Add(Me.lblColor) + Me.Controls.Add(Me.ucrCboColors) + Me.Name = "ucrCellFormatEmail" + Me.Size = New System.Drawing.Size(205, 154) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents ucrCboColors As ucrColors + Friend WithEvents lblColor As Label + Friend WithEvents ucrChkShowUnderline As ucrCheck + Friend WithEvents ucrChkAsButton As ucrCheck + Friend WithEvents ucrReceiverSingleDisplayName As ucrReceiverSingle + Friend WithEvents Label1 As Label +End Class diff --git a/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.resx b/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.vb b/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.vb new file mode 100644 index 00000000000..d0f15fc038e --- /dev/null +++ b/instat/UserTables/Cells/Formats/Text/ucrCellFormatEmail.vb @@ -0,0 +1,36 @@ +Public Class ucrCellFormatEmail + + Private clsFormatEmailRFunction, clsFromColumnRFunction As New RFunction + Private bFirstload As Boolean = True + + Private Sub InitialiseControl() + ucrReceiverSingleDisplayName.SetParameter(New RParameter("display_name", 0)) + ucrReceiverSingleDisplayName.SetParameterIsString() + + + ucrChkAsButton.SetText("Display As Button") + ucrChkAsButton.SetParameter(New RParameter("as_button", 5)) + ucrChkAsButton.SetRDefault("FALSE") + + ucrChkShowUnderline.SetText("Show underline") + End Sub + + Public Sub Setup() + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + + clsFormatEmailRFunction = New RFunction + clsFormatEmailRFunction.SetRCommand("fmt_email") + 'TODO. This gt function is documented in https://gt.rstudio.com/reference/fmt_email.html but RStudio could not find the function. + ' Implement later. + + clsFromColumnRFunction = New RFunction + clsFromColumnRFunction.SetRCommand("from_column") + + End Sub + + +End Class diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb new file mode 100644 index 00000000000..810bf5b641d --- /dev/null +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb @@ -0,0 +1,229 @@ + _ +Partial Class ucrCellFormats + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblFormats = New System.Windows.Forms.Label() + Me.btnClearFormats = New System.Windows.Forms.Button() + Me.btnEnterFormat = New System.Windows.Forms.Button() + Me.dataGridFormats = New System.Windows.Forms.DataGridView() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblColumns = New System.Windows.Forms.Label() + Me.cboSelectFormat = New System.Windows.Forms.ComboBox() + Me.Label2 = New System.Windows.Forms.Label() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.ucrInputRows = New instat.ucrInputTextBox() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblFormats + ' + Me.lblFormats.AutoSize = True + Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFormats.Location = New System.Drawing.Point(231, 220) + Me.lblFormats.Name = "lblFormats" + Me.lblFormats.Size = New System.Drawing.Size(47, 13) + Me.lblFormats.TabIndex = 312 + Me.lblFormats.Text = "Formats:" + ' + 'btnClearFormats + ' + Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearFormats.Location = New System.Drawing.Point(515, 211) + Me.btnClearFormats.Name = "btnClearFormats" + Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) + Me.btnClearFormats.TabIndex = 311 + Me.btnClearFormats.Tag = "" + Me.btnClearFormats.Text = "Clear" + Me.btnClearFormats.UseVisualStyleBackColor = True + ' + 'btnEnterFormat + ' + Me.btnEnterFormat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnEnterFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnEnterFormat.Location = New System.Drawing.Point(234, 188) + Me.btnEnterFormat.Name = "btnEnterFormat" + Me.btnEnterFormat.Size = New System.Drawing.Size(126, 23) + Me.btnEnterFormat.TabIndex = 309 + Me.btnEnterFormat.Tag = "" + Me.btnEnterFormat.Text = "Enter Format" + Me.btnEnterFormat.UseVisualStyleBackColor = True + ' + 'dataGridFormats + ' + Me.dataGridFormats.AllowUserToAddRows = False + Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colCodnition, Me.colLabel, Me.colRow, Me.colFormat}) + Me.dataGridFormats.Location = New System.Drawing.Point(234, 237) + Me.dataGridFormats.Name = "dataGridFormats" + Me.dataGridFormats.RowHeadersWidth = 62 + Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) + Me.dataGridFormats.TabIndex = 307 + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Format" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 64 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Column(s)" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 78 + ' + 'colRow + ' + Me.colRow.HeaderText = "Row(s)" + Me.colRow.Name = "colRow" + ' + 'colFormat + ' + Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.Width = 8 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(231, 140) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(134, 13) + Me.Label1.TabIndex = 320 + Me.Label1.Text = "Row Expression (Optional):" + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(237, 60) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 310 + Me.lblColumns.Text = "Column:" + ' + 'cboSelectFormat + ' + Me.cboSelectFormat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboSelectFormat.FormattingEnabled = True + Me.cboSelectFormat.Items.AddRange(New Object() {"Text", "Number", "Date"}) + Me.cboSelectFormat.Location = New System.Drawing.Point(234, 33) + Me.cboSelectFormat.Name = "cboSelectFormat" + Me.cboSelectFormat.Size = New System.Drawing.Size(132, 21) + Me.cboSelectFormat.TabIndex = 321 + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label2.Location = New System.Drawing.Point(231, 17) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(75, 13) + Me.Label2.TabIndex = 322 + Me.Label2.Text = "Select Format:" + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(234, 76) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 55) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 317 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'ucrInputRows + ' + Me.ucrInputRows.AddQuotesIfUnrecognised = True + Me.ucrInputRows.AutoSize = True + Me.ucrInputRows.IsMultiline = False + Me.ucrInputRows.IsReadOnly = False + Me.ucrInputRows.Location = New System.Drawing.Point(234, 156) + Me.ucrInputRows.Name = "ucrInputRows" + Me.ucrInputRows.Size = New System.Drawing.Size(137, 21) + Me.ucrInputRows.TabIndex = 319 + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 6) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 308 + ' + 'ucrCellFormats + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.cboSelectFormat) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.ucrInputRows) + Me.Controls.Add(Me.lblFormats) + Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnEnterFormat) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridFormats) + Me.Name = "ucrCellFormats" + Me.Size = New System.Drawing.Size(602, 312) + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents lblFormats As Label + Friend WithEvents btnClearFormats As Button + Friend WithEvents btnEnterFormat As Button + Friend WithEvents dataGridFormats As DataGridView + Friend WithEvents ucrInputRows As ucrInputTextBox + Friend WithEvents Label1 As Label + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents lblColumns As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents cboSelectFormat As ComboBox + Friend WithEvents Label2 As Label + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colRow As DataGridViewTextBoxColumn + Friend WithEvents colFormat As DataGridViewButtonColumn +End Class diff --git a/instat/UserTables/Columns/ucrColumnFormats.resx b/instat/UserTables/Cells/Formats/ucrCellFormats.resx similarity index 94% rename from instat/UserTables/Columns/ucrColumnFormats.resx rename to instat/UserTables/Cells/Formats/ucrCellFormats.resx index 191e2e6453d..b639adfa96c 100644 --- a/instat/UserTables/Columns/ucrColumnFormats.resx +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.resx @@ -117,19 +117,25 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True - + True True + + True + True - + True diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb new file mode 100644 index 00000000000..5b5aad48a7e --- /dev/null +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -0,0 +1,148 @@ +Public Class ucrCellFormats + + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + + Private Sub InitialiseControl() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + + cboSelectFormat.SelectedIndex = 0 + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + ' Clear and Set up the data grid with contents + dataGridFormats.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator)) + + End Sub + + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRFunctionsFromOperator({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + Dim clsFormatRFunction As RFunction = clsRParam.clsArgumentCodeStructure + + ' Create a new row that represents the tab_footnote() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + + ' Set the function name + row.Cells(0).Value = clsFormatRFunction.strRCommand + + For Each clsRowGroupRParam As RParameter In clsFormatRFunction.clsParameters + If clsRowGroupRParam.strArgumentName = "columns" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + ElseIf clsRowGroupRParam.strArgumentName = "rows" Then + row.Cells(2).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + End If + Next + + + ' Tag and add the tab_row_group() parameter function contents as a row + row.Tag = clsRParam + dataGridFormats.Rows.Add(row) + + Next + End Sub + + Private Sub ucrReceiverMultipleCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlValueChanged + btnEnterFormat.Enabled = Not ucrReceiverMultipleCols.IsEmpty + End Sub + + Private Sub btnEnter_Click(sender As Object, e As EventArgs) Handles btnEnterFormat.Click + Dim clsFormatRFunction As RFunction = Nothing + If cboSelectFormat.Text = "Text" Then + sdgCellFormatTextOptions.ShowDialog(Me.ParentForm) + clsFormatRFunction = sdgCellFormatTextOptions.GetNewUserInputAsRFunction() + + ElseIf cboSelectFormat.Text = "Number" Then + sdgCellFormatNumberOptions.ShowDialog(Me.ParentForm) + clsFormatRFunction = sdgCellFormatNumberOptions.GetNewUserInputAsRFunction() + + ElseIf cboSelectFormat.Text = "Date" Then + sdgCellFormatDateOptions.ShowDialog(Me.ParentForm) + clsFormatRFunction = sdgCellFormatDateOptions.GetNewUserInputAsRFunction() + ElseIf cboSelectFormat.Text = "Missing" Then + End If + + If clsFormatRFunction Is Nothing Then + Exit Sub + End If + + AddFormatParameterToGrid(clsFormatRFunction) + ucrReceiverMultipleCols.Clear() + ucrInputRows.SetName("") + + End Sub + + + Private Sub AddFormatParameterToGrid(clsFormatRFunction As RFunction) + + Dim strColumnsExpression As String = ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False) + Dim strRowsExpression As String = ucrInputRows.GetText + + ' Add columns parameter + clsFormatRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) + + ' Add rows as paramater if present + If Not ucrInputRows.IsEmpty Then + clsFormatRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) + End If + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="fmt_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsFormatRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + row.Cells(0).Value = clsFormatRFunction.strRCommand + row.Cells(1).Value = strColumnsExpression + row.Cells(2).Value = strRowsExpression + + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGridFormats.Rows.Add(row) + + End Sub + + Private Sub btnClearFormats_Click(sender As Object, e As EventArgs) Handles btnClearFormats.Click + dataGridFormats.Rows.Clear() + End Sub + + Private Sub cboSelectFormat_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cboSelectFormat.TextChanged + If cboSelectFormat.Text = "Text" OrElse cboSelectFormat.Text = "Missing" Then + 'ucrReceiverMultipleCols.SetIncludedDataTypes({}) + ucrReceiverMultipleCols.strSelectorHeading = "Select Columns" + ElseIf cboSelectFormat.Text = "Number" Then + 'ucrReceiverMultipleCols.SetIncludedDataTypes({"numeric"}) + ucrReceiverMultipleCols.strSelectorHeading = "Select Numerics" + ElseIf cboSelectFormat.Text = "Date" Then + 'ucrReceiverMultipleCols.SetIncludedDataTypes({"date"}) + ucrReceiverMultipleCols.strSelectorHeading = "Select Dates" + End If + + ucrReceiverMultipleCols.SetMeAsReceiver() + End Sub + + +End Class diff --git a/instat/UserTables/Cells/ucrCells.Designer.vb b/instat/UserTables/Cells/ucrCells.Designer.vb index 62457e1c009..ed906665f11 100644 --- a/instat/UserTables/Cells/ucrCells.Designer.vb +++ b/instat/UserTables/Cells/ucrCells.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class ucrCells Inherits System.Windows.Forms.UserControl 'UserControl overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,275 +20,118 @@ Partial Class ucrCells 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() - Me.rdoStyle = New System.Windows.Forms.RadioButton() - Me.rdoGroup = New System.Windows.Forms.RadioButton() - Me.rdoSummary = New System.Windows.Forms.RadioButton() - Me.ucrPnlRow = New instat.UcrPanel() - Me.lblGroupCondition = New System.Windows.Forms.Label() - Me.lblGroups = New System.Windows.Forms.Label() - Me.ucrLogicalCombobox = New instat.ucrInputComboBox() - Me.btnClearGroups = New System.Windows.Forms.Button() - Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() - Me.ucrFilterOperation = New instat.ucrInputComboBox() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.lblColumns = New System.Windows.Forms.Label() - Me.btnAddGroupCondition = New System.Windows.Forms.Button() - Me.dataGridGroups = New System.Windows.Forms.DataGridView() - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() + Me.rdoStyles = New System.Windows.Forms.RadioButton() + Me.rdoFormat = New System.Windows.Forms.RadioButton() + Me.rdoFootNotes = New System.Windows.Forms.RadioButton() + Me.ucrCellsFootNotes = New instat.ucrCellsFootNotes() + Me.ucrCellFormats = New instat.ucrCellFormats() + Me.ucrPnlCells = New instat.UcrPanel() Me.SuspendLayout() ' - 'rdoStyle - ' - Me.rdoStyle.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoStyle.BackColor = System.Drawing.SystemColors.Control - Me.rdoStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatAppearance.BorderSize = 2 - Me.rdoStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoStyle.Location = New System.Drawing.Point(362, 3) - Me.rdoStyle.Name = "rdoStyle" - Me.rdoStyle.Size = New System.Drawing.Size(91, 29) - Me.rdoStyle.TabIndex = 292 - Me.rdoStyle.Text = "Styles" - Me.rdoStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyle.UseVisualStyleBackColor = True - ' - 'rdoGroup - ' - Me.rdoGroup.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoGroup.BackColor = System.Drawing.SystemColors.Control - Me.rdoGroup.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoGroup.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoGroup.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGroup.FlatAppearance.BorderSize = 2 - Me.rdoGroup.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoGroup.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoGroup.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoGroup.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoGroup.Location = New System.Drawing.Point(185, 3) - Me.rdoGroup.Name = "rdoGroup" - Me.rdoGroup.Size = New System.Drawing.Size(91, 29) - Me.rdoGroup.TabIndex = 290 - Me.rdoGroup.Text = "Groups" - Me.rdoGroup.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoGroup.UseVisualStyleBackColor = True - ' - 'rdoSummary - ' - Me.rdoSummary.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoSummary.BackColor = System.Drawing.SystemColors.Control - Me.rdoSummary.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoSummary.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatAppearance.BorderSize = 2 - Me.rdoSummary.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummary.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSummary.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSummary.Location = New System.Drawing.Point(274, 3) - Me.rdoSummary.Name = "rdoSummary" - Me.rdoSummary.Size = New System.Drawing.Size(91, 29) - Me.rdoSummary.TabIndex = 291 - Me.rdoSummary.Text = "Footers" - Me.rdoSummary.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummary.UseVisualStyleBackColor = True - ' - 'ucrPnlRow - ' - Me.ucrPnlRow.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRow.Location = New System.Drawing.Point(168, 3) - Me.ucrPnlRow.Name = "ucrPnlRow" - Me.ucrPnlRow.Size = New System.Drawing.Size(309, 29) - Me.ucrPnlRow.TabIndex = 289 - ' - 'lblGroupCondition - ' - Me.lblGroupCondition.AutoSize = True - Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(379, 46) - Me.lblGroupCondition.Name = "lblGroupCondition" - Me.lblGroupCondition.Size = New System.Drawing.Size(54, 13) - Me.lblGroupCondition.TabIndex = 288 - Me.lblGroupCondition.Text = "Condition:" - ' - 'lblGroups - ' - Me.lblGroups.AutoSize = True - Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(257, 136) - Me.lblGroups.Name = "lblGroups" - Me.lblGroups.Size = New System.Drawing.Size(44, 13) - Me.lblGroups.TabIndex = 287 - Me.lblGroups.Text = "Groups:" - ' - 'ucrLogicalCombobox - ' - Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True - Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 - Me.ucrLogicalCombobox.IsReadOnly = False - Me.ucrLogicalCombobox.Location = New System.Drawing.Point(454, 65) - Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" - Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) - Me.ucrLogicalCombobox.TabIndex = 286 - ' - 'btnClearGroups - ' - Me.btnClearGroups.Enabled = False - Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(536, 131) - Me.btnClearGroups.Name = "btnClearGroups" - Me.btnClearGroups.Size = New System.Drawing.Size(80, 23) - Me.btnClearGroups.TabIndex = 285 - Me.btnClearGroups.Tag = "" - Me.btnClearGroups.Text = "Clear" - Me.btnClearGroups.UseVisualStyleBackColor = True - ' - 'ucrFilterByReceiver - ' - Me.ucrFilterByReceiver.AutoSize = True - Me.ucrFilterByReceiver.frmParent = Nothing - Me.ucrFilterByReceiver.Location = New System.Drawing.Point(254, 65) - Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" - Me.ucrFilterByReceiver.Selector = Nothing - Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) - Me.ucrFilterByReceiver.strNcFilePath = "" - Me.ucrFilterByReceiver.TabIndex = 281 - Me.ucrFilterByReceiver.ucrSelector = Nothing - ' - 'ucrFilterOperation - ' - Me.ucrFilterOperation.AddQuotesIfUnrecognised = True - Me.ucrFilterOperation.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrFilterOperation.GetSetSelectedIndex = -1 - Me.ucrFilterOperation.IsReadOnly = False - Me.ucrFilterOperation.Location = New System.Drawing.Point(375, 65) - Me.ucrFilterOperation.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrFilterOperation.Name = "ucrFilterOperation" - Me.ucrFilterOperation.Size = New System.Drawing.Size(78, 21) - Me.ucrFilterOperation.TabIndex = 283 - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 49) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 280 - ' - 'colFormat - ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 76 - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 58 - ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(257, 49) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) - Me.lblColumns.TabIndex = 284 - Me.lblColumns.Text = "Column:" - ' - 'btnAddGroupCondition - ' - Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddGroupCondition.Location = New System.Drawing.Point(254, 86) - Me.btnAddGroupCondition.Name = "btnAddGroupCondition" - Me.btnAddGroupCondition.Size = New System.Drawing.Size(120, 23) - Me.btnAddGroupCondition.TabIndex = 282 - Me.btnAddGroupCondition.Tag = "" - Me.btnAddGroupCondition.Text = "Add" - Me.btnAddGroupCondition.UseVisualStyleBackColor = True - ' - 'dataGridGroups - ' - Me.dataGridGroups.AllowUserToAddRows = False - Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(260, 156) - Me.dataGridGroups.Name = "dataGridGroups" - Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) - Me.dataGridGroups.TabIndex = 279 + 'rdoStyles + ' + Me.rdoStyles.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyles.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyles.FlatAppearance.BorderSize = 2 + Me.rdoStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyles.Location = New System.Drawing.Point(279, 3) + Me.rdoStyles.Name = "rdoStyles" + Me.rdoStyles.Size = New System.Drawing.Size(91, 29) + Me.rdoStyles.TabIndex = 292 + Me.rdoStyles.Text = "Styles" + Me.rdoStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyles.UseVisualStyleBackColor = True + ' + 'rdoFormat + ' + Me.rdoFormat.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoFormat.BackColor = System.Drawing.SystemColors.Control + Me.rdoFormat.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoFormat.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoFormat.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoFormat.FlatAppearance.BorderSize = 2 + Me.rdoFormat.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoFormat.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoFormat.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoFormat.Location = New System.Drawing.Point(102, 3) + Me.rdoFormat.Name = "rdoFormat" + Me.rdoFormat.Size = New System.Drawing.Size(91, 29) + Me.rdoFormat.TabIndex = 290 + Me.rdoFormat.Text = "Formats" + Me.rdoFormat.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoFormat.UseVisualStyleBackColor = True + ' + 'rdoFootNotes + ' + Me.rdoFootNotes.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoFootNotes.BackColor = System.Drawing.SystemColors.Control + Me.rdoFootNotes.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoFootNotes.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoFootNotes.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoFootNotes.FlatAppearance.BorderSize = 2 + Me.rdoFootNotes.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoFootNotes.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoFootNotes.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoFootNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoFootNotes.Location = New System.Drawing.Point(191, 3) + Me.rdoFootNotes.Name = "rdoFootNotes" + Me.rdoFootNotes.Size = New System.Drawing.Size(91, 29) + Me.rdoFootNotes.TabIndex = 291 + Me.rdoFootNotes.Text = "Footer Notes" + Me.rdoFootNotes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoFootNotes.UseVisualStyleBackColor = True + ' + 'ucrCellsFootNotes + ' + Me.ucrCellsFootNotes.Location = New System.Drawing.Point(7, 38) + Me.ucrCellsFootNotes.Name = "ucrCellsFootNotes" + Me.ucrCellsFootNotes.Size = New System.Drawing.Size(604, 104) + Me.ucrCellsFootNotes.TabIndex = 294 + ' + 'ucrCellFormats + ' + Me.ucrCellFormats.Location = New System.Drawing.Point(7, 37) + Me.ucrCellFormats.Name = "ucrCellFormats" + Me.ucrCellFormats.Size = New System.Drawing.Size(604, 319) + Me.ucrCellFormats.TabIndex = 293 + ' + 'ucrPnlCells + ' + Me.ucrPnlCells.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlCells.Location = New System.Drawing.Point(85, 3) + Me.ucrPnlCells.Name = "ucrPnlCells" + Me.ucrPnlCells.Size = New System.Drawing.Size(309, 29) + Me.ucrPnlCells.TabIndex = 289 ' 'ucrCells ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.rdoStyle) - Me.Controls.Add(Me.rdoGroup) - Me.Controls.Add(Me.rdoSummary) - Me.Controls.Add(Me.ucrPnlRow) - Me.Controls.Add(Me.lblGroupCondition) - Me.Controls.Add(Me.lblGroups) - Me.Controls.Add(Me.ucrLogicalCombobox) - Me.Controls.Add(Me.btnClearGroups) - Me.Controls.Add(Me.ucrFilterByReceiver) - Me.Controls.Add(Me.ucrFilterOperation) - Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.lblColumns) - Me.Controls.Add(Me.btnAddGroupCondition) - Me.Controls.Add(Me.dataGridGroups) + Me.Controls.Add(Me.ucrCellsFootNotes) + Me.Controls.Add(Me.ucrCellFormats) + Me.Controls.Add(Me.rdoStyles) + Me.Controls.Add(Me.rdoFormat) + Me.Controls.Add(Me.rdoFootNotes) + Me.Controls.Add(Me.ucrPnlCells) Me.Name = "ucrCells" - Me.Size = New System.Drawing.Size(634, 241) - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(629, 362) Me.ResumeLayout(False) - Me.PerformLayout() End Sub - Friend WithEvents rdoStyle As RadioButton - Friend WithEvents rdoGroup As RadioButton - Friend WithEvents rdoSummary As RadioButton - Friend WithEvents ucrPnlRow As UcrPanel - Friend WithEvents lblGroupCondition As Label - Friend WithEvents lblGroups As Label - Friend WithEvents ucrLogicalCombobox As ucrInputComboBox - Friend WithEvents btnClearGroups As Button - Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle - Friend WithEvents ucrFilterOperation As ucrInputComboBox - Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents colFormat As DataGridViewButtonColumn - Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colLabel As DataGridViewTextBoxColumn - Friend WithEvents lblColumns As Label - Friend WithEvents btnAddGroupCondition As Button - Friend WithEvents dataGridGroups As DataGridView + Friend WithEvents rdoStyles As RadioButton + Friend WithEvents rdoFormat As RadioButton + Friend WithEvents rdoFootNotes As RadioButton + Friend WithEvents ucrPnlCells As UcrPanel + Friend WithEvents ucrCellFormats As ucrCellFormats + Friend WithEvents ucrCellsFootNotes As ucrCellsFootNotes End Class diff --git a/instat/UserTables/Cells/ucrCells.resx b/instat/UserTables/Cells/ucrCells.resx index 229ea162634..1af7de150c9 100644 --- a/instat/UserTables/Cells/ucrCells.resx +++ b/instat/UserTables/Cells/ucrCells.resx @@ -117,13 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/Cells/ucrCells.vb b/instat/UserTables/Cells/ucrCells.vb index 9c7db42e6a9..5ae8e74a6d6 100644 --- a/instat/UserTables/Cells/ucrCells.vb +++ b/instat/UserTables/Cells/ucrCells.vb @@ -1,3 +1,31 @@ Public Class ucrCells + Private bFirstload As Boolean = True + Private Sub InitialiseDialog() + ucrPnlCells.AddRadioButton(rdoFormat) + ucrPnlCells.AddRadioButton(rdoFootNotes) + ucrPnlCells.AddRadioButton(rdoStyles) + rdoFormat.Checked = True + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + ucrCellFormats.Setup(strDataFrameName, clsOperator) + ucrCellsFootNotes.Setup(strDataFrameName, clsOperator) + End Sub + + Private Sub ucrPnlRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCells.ControlValueChanged + ucrCellFormats.Visible = rdoFormat.Checked + ucrCellsFootNotes.Visible = rdoFootNotes.Checked + End Sub + + Public Sub SetValuesToOperator() + ' TODO. All controls to set values + ucrCellFormats.SetValuesToOperator() + + End Sub + End Class diff --git a/instat/UserTables/Columns/ucrColumnFormats.Designer.vb b/instat/UserTables/Columns/ucrColumnFormats.Designer.vb deleted file mode 100644 index 9da1802311f..00000000000 --- a/instat/UserTables/Columns/ucrColumnFormats.Designer.vb +++ /dev/null @@ -1,199 +0,0 @@ - _ -Partial Class ucrColumnFormats - Inherits System.Windows.Forms.UserControl - - 'UserControl overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.lblFormat = New System.Windows.Forms.Label() - Me.lblGroups = New System.Windows.Forms.Label() - Me.btnClearGroups = New System.Windows.Forms.Button() - Me.lblColumns = New System.Windows.Forms.Label() - Me.btnAddGroupCondition = New System.Windows.Forms.Button() - Me.dataGridGroups = New System.Windows.Forms.DataGridView() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.ucrLogicalCombobox = New instat.ucrInputComboBox() - Me.ucrFilterByReceiver = New instat.ucrReceiverSingle() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'lblFormat - ' - Me.lblFormat.AutoSize = True - Me.lblFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFormat.Location = New System.Drawing.Point(373, 2) - Me.lblFormat.Name = "lblFormat" - Me.lblFormat.Size = New System.Drawing.Size(42, 13) - Me.lblFormat.TabIndex = 298 - Me.lblFormat.Text = "Format:" - ' - 'lblGroups - ' - Me.lblGroups.AutoSize = True - Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(239, 71) - Me.lblGroups.Name = "lblGroups" - Me.lblGroups.Size = New System.Drawing.Size(47, 13) - Me.lblGroups.TabIndex = 297 - Me.lblGroups.Text = "Formats:" - ' - 'btnClearGroups - ' - Me.btnClearGroups.Enabled = False - Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(523, 65) - Me.btnClearGroups.Name = "btnClearGroups" - Me.btnClearGroups.Size = New System.Drawing.Size(75, 23) - Me.btnClearGroups.TabIndex = 295 - Me.btnClearGroups.Tag = "" - Me.btnClearGroups.Text = "Clear" - Me.btnClearGroups.UseVisualStyleBackColor = True - ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(239, 5) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) - Me.lblColumns.TabIndex = 294 - Me.lblColumns.Text = "Column:" - ' - 'btnAddGroupCondition - ' - Me.btnAddGroupCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) - Me.btnAddGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddGroupCondition.Location = New System.Drawing.Point(476, 19) - Me.btnAddGroupCondition.Name = "btnAddGroupCondition" - Me.btnAddGroupCondition.Size = New System.Drawing.Size(93, 23) - Me.btnAddGroupCondition.TabIndex = 292 - Me.btnAddGroupCondition.Tag = "" - Me.btnAddGroupCondition.Text = "Add" - Me.btnAddGroupCondition.UseVisualStyleBackColor = True - ' - 'dataGridGroups - ' - Me.dataGridGroups.AllowUserToAddRows = False - Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(242, 90) - Me.dataGridGroups.Name = "dataGridGroups" - Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(361, 73) - Me.dataGridGroups.TabIndex = 289 - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Column" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 67 - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Format" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 64 - ' - 'colFormat - ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 - ' - 'ucrLogicalCombobox - ' - Me.ucrLogicalCombobox.AddQuotesIfUnrecognised = True - Me.ucrLogicalCombobox.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrLogicalCombobox.GetSetSelectedIndex = -1 - Me.ucrLogicalCombobox.IsReadOnly = False - Me.ucrLogicalCombobox.Location = New System.Drawing.Point(376, 21) - Me.ucrLogicalCombobox.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) - Me.ucrLogicalCombobox.Name = "ucrLogicalCombobox" - Me.ucrLogicalCombobox.Size = New System.Drawing.Size(89, 21) - Me.ucrLogicalCombobox.TabIndex = 296 - ' - 'ucrFilterByReceiver - ' - Me.ucrFilterByReceiver.AutoSize = True - Me.ucrFilterByReceiver.frmParent = Nothing - Me.ucrFilterByReceiver.Location = New System.Drawing.Point(236, 21) - Me.ucrFilterByReceiver.Margin = New System.Windows.Forms.Padding(0) - Me.ucrFilterByReceiver.Name = "ucrFilterByReceiver" - Me.ucrFilterByReceiver.Selector = Nothing - Me.ucrFilterByReceiver.Size = New System.Drawing.Size(120, 21) - Me.ucrFilterByReceiver.strNcFilePath = "" - Me.ucrFilterByReceiver.TabIndex = 291 - Me.ucrFilterByReceiver.ucrSelector = Nothing - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 5) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 290 - ' - 'ucrColumnFormats - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.lblFormat) - Me.Controls.Add(Me.lblGroups) - Me.Controls.Add(Me.ucrLogicalCombobox) - Me.Controls.Add(Me.btnClearGroups) - Me.Controls.Add(Me.lblColumns) - Me.Controls.Add(Me.ucrFilterByReceiver) - Me.Controls.Add(Me.btnAddGroupCondition) - Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.dataGridGroups) - Me.Name = "ucrColumnFormats" - Me.Size = New System.Drawing.Size(609, 194) - CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents lblFormat As Label - Friend WithEvents lblGroups As Label - Friend WithEvents ucrLogicalCombobox As ucrInputComboBox - Friend WithEvents btnClearGroups As Button - Friend WithEvents lblColumns As Label - Friend WithEvents ucrFilterByReceiver As ucrReceiverSingle - Friend WithEvents btnAddGroupCondition As Button - Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents dataGridGroups As DataGridView - Friend WithEvents colLabel As DataGridViewTextBoxColumn - Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colFormat As DataGridViewButtonColumn -End Class diff --git a/instat/UserTables/Columns/ucrColumnFormats.vb b/instat/UserTables/Columns/ucrColumnFormats.vb deleted file mode 100644 index 22c93a184ca..00000000000 --- a/instat/UserTables/Columns/ucrColumnFormats.vb +++ /dev/null @@ -1,3 +0,0 @@ -Public Class ucrColumnFormats - -End Class diff --git a/instat/UserTables/Columns/ucrColumnLabels.vb b/instat/UserTables/Columns/ucrColumnLabels.vb index d24834a2dcc..d608f9989e7 100644 --- a/instat/UserTables/Columns/ucrColumnLabels.vb +++ b/instat/UserTables/Columns/ucrColumnLabels.vb @@ -23,7 +23,7 @@ Public Class ucrColumnLabels dataGridColLabels.Rows.Clear() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("cols_label", clsOperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"cols_label"}, clsOperator) If lstRParams.Count > 0 Then clsColsLabelRParameter = lstRParams(0) Else diff --git a/instat/UserTables/Columns/ucrColumnSpanners.vb b/instat/UserTables/Columns/ucrColumnSpanners.vb index 83287bbe7be..219b5b51b5a 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.vb @@ -19,7 +19,7 @@ ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) dataGridSpanners.Rows.Clear() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_spanner", clsOperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_spanner"}, clsOperator) For Each clsRParam As RParameter In lstRParams diff --git a/instat/UserTables/Columns/ucrColumns.Designer.vb b/instat/UserTables/Columns/ucrColumns.Designer.vb index 1f64b91227e..fd9917f9d6f 100644 --- a/instat/UserTables/Columns/ucrColumns.Designer.vb +++ b/instat/UserTables/Columns/ucrColumns.Designer.vb @@ -22,77 +22,13 @@ Partial Class ucrColumns 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.rdoStyles = New System.Windows.Forms.RadioButton() - Me.rdoSummaries = New System.Windows.Forms.RadioButton() - Me.rdoColFormats = New System.Windows.Forms.RadioButton() Me.rdoColSpanners = New System.Windows.Forms.RadioButton() Me.rdoColLabel = New System.Windows.Forms.RadioButton() Me.ucrColumnLabels = New instat.ucrColumnLabels() Me.ucrColumnSpanners = New instat.ucrColumnSpanners() Me.ucrPnlCols = New instat.UcrPanel() - Me.UcrColumnFormats1 = New instat.ucrColumnFormats() Me.SuspendLayout() ' - 'rdoStyles - ' - Me.rdoStyles.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoStyles.BackColor = System.Drawing.SystemColors.Control - Me.rdoStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyles.FlatAppearance.BorderSize = 2 - Me.rdoStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoStyles.Location = New System.Drawing.Point(450, 3) - Me.rdoStyles.Name = "rdoStyles" - Me.rdoStyles.Size = New System.Drawing.Size(91, 29) - Me.rdoStyles.TabIndex = 292 - Me.rdoStyles.Text = "Styles" - Me.rdoStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoStyles.UseVisualStyleBackColor = True - ' - 'rdoSummaries - ' - Me.rdoSummaries.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoSummaries.BackColor = System.Drawing.SystemColors.Control - Me.rdoSummaries.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoSummaries.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummaries.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummaries.FlatAppearance.BorderSize = 2 - Me.rdoSummaries.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSummaries.Location = New System.Drawing.Point(362, 3) - Me.rdoSummaries.Name = "rdoSummaries" - Me.rdoSummaries.Size = New System.Drawing.Size(91, 29) - Me.rdoSummaries.TabIndex = 291 - Me.rdoSummaries.Text = "Summaries" - Me.rdoSummaries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSummaries.UseVisualStyleBackColor = True - ' - 'rdoColFormats - ' - Me.rdoColFormats.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoColFormats.BackColor = System.Drawing.SystemColors.Control - Me.rdoColFormats.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoColFormats.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoColFormats.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoColFormats.FlatAppearance.BorderSize = 2 - Me.rdoColFormats.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoColFormats.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoColFormats.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoColFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColFormats.Location = New System.Drawing.Point(273, 3) - Me.rdoColFormats.Name = "rdoColFormats" - Me.rdoColFormats.Size = New System.Drawing.Size(91, 29) - Me.rdoColFormats.TabIndex = 293 - Me.rdoColFormats.Text = "Formats" - Me.rdoColFormats.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoColFormats.UseVisualStyleBackColor = True - ' 'rdoColSpanners ' Me.rdoColSpanners.Appearance = System.Windows.Forms.Appearance.Button @@ -105,7 +41,7 @@ Partial Class ucrColumns Me.rdoColSpanners.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColSpanners.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColSpanners.Location = New System.Drawing.Point(184, 3) + Me.rdoColSpanners.Location = New System.Drawing.Point(329, 3) Me.rdoColSpanners.Name = "rdoColSpanners" Me.rdoColSpanners.Size = New System.Drawing.Size(91, 29) Me.rdoColSpanners.TabIndex = 294 @@ -125,7 +61,7 @@ Partial Class ucrColumns Me.rdoColLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColLabel.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColLabel.Location = New System.Drawing.Point(96, 3) + Me.rdoColLabel.Location = New System.Drawing.Point(241, 3) Me.rdoColLabel.Name = "rdoColLabel" Me.rdoColLabel.Size = New System.Drawing.Size(91, 29) Me.rdoColLabel.TabIndex = 296 @@ -155,39 +91,23 @@ Partial Class ucrColumns Me.ucrPnlCols.Size = New System.Drawing.Size(570, 29) Me.ucrPnlCols.TabIndex = 289 ' - 'UcrColumnFormats1 - ' - Me.UcrColumnFormats1.Location = New System.Drawing.Point(6, 51) - Me.UcrColumnFormats1.Name = "UcrColumnFormats1" - Me.UcrColumnFormats1.Size = New System.Drawing.Size(620, 194) - Me.UcrColumnFormats1.TabIndex = 298 - ' 'ucrColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.UcrColumnFormats1) Me.Controls.Add(Me.ucrColumnLabels) Me.Controls.Add(Me.rdoColLabel) Me.Controls.Add(Me.ucrColumnSpanners) Me.Controls.Add(Me.rdoColSpanners) - Me.Controls.Add(Me.rdoColFormats) - Me.Controls.Add(Me.rdoStyles) - Me.Controls.Add(Me.rdoSummaries) Me.Controls.Add(Me.ucrPnlCols) Me.Name = "ucrColumns" Me.Size = New System.Drawing.Size(633, 260) Me.ResumeLayout(False) End Sub - - Friend WithEvents rdoStyles As RadioButton - Friend WithEvents rdoSummaries As RadioButton Friend WithEvents ucrPnlCols As UcrPanel - Friend WithEvents rdoColFormats As RadioButton Friend WithEvents rdoColSpanners As RadioButton Friend WithEvents ucrColumnSpanners As ucrColumnSpanners Friend WithEvents rdoColLabel As RadioButton Friend WithEvents ucrColumnLabels As ucrColumnLabels - Friend WithEvents UcrColumnFormats1 As ucrColumnFormats End Class diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb index 48e996a4ba1..6295bb73025 100644 --- a/instat/UserTables/Columns/ucrColumns.vb +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -4,9 +4,6 @@ Private Sub InitialiseDialog() ucrPnlCols.AddRadioButton(rdoColLabel) ucrPnlCols.AddRadioButton(rdoColSpanners) - ucrPnlCols.AddRadioButton(rdoColFormats) - ucrPnlCols.AddRadioButton(rdoSummaries) - ucrPnlCols.AddRadioButton(rdoStyles) rdoColLabel.Checked = True End Sub @@ -24,7 +21,7 @@ Private Sub ucrPnlCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged ucrColumnLabels.Visible = rdoColLabel.Checked ucrColumnSpanners.Visible = rdoColSpanners.Checked - UcrColumnFormats1.Visible = rdoColFormats.Checked End Sub + End Class diff --git a/instat/UserTables/Header/ucrHeader.vb b/instat/UserTables/Header/ucrHeader.vb index 744143e4104..a8a5e297504 100644 --- a/instat/UserTables/Header/ucrHeader.vb +++ b/instat/UserTables/Header/ucrHeader.vb @@ -62,7 +62,7 @@ Public Class ucrHeader End Sub Private Sub SetupRFunctionsFromOperator() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_footnote", clsOperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_footnote"}, clsOperator) For Each clsTabFooterRParam As RParameter In lstRParams diff --git a/instat/UserTables/Rows/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb index 36ddfd77e8a..f52bf5286f0 100644 --- a/instat/UserTables/Rows/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -20,7 +20,7 @@ dataGridGroups.Rows.Clear() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_row_group", clsOperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator) For Each clsRParam As RParameter In lstRParams diff --git a/instat/UserTables/Rows/ucrRows.Designer.vb b/instat/UserTables/Rows/ucrRows.Designer.vb index 3b94c4be79c..ae5ae4186e0 100644 --- a/instat/UserTables/Rows/ucrRows.Designer.vb +++ b/instat/UserTables/Rows/ucrRows.Designer.vb @@ -22,33 +22,12 @@ Partial Class ucrRows 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.rdoRpwsStyles = New System.Windows.Forms.RadioButton() Me.rdoRowsGroups = New System.Windows.Forms.RadioButton() Me.rdoRowsSummaries = New System.Windows.Forms.RadioButton() Me.ucrPnlRows = New instat.UcrPanel() Me.ucrRowGroups = New instat.ucrRowGroup() Me.SuspendLayout() ' - 'rdoRpwsStyles - ' - Me.rdoRpwsStyles.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoRpwsStyles.BackColor = System.Drawing.SystemColors.Control - Me.rdoRpwsStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoRpwsStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoRpwsStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoRpwsStyles.FlatAppearance.BorderSize = 2 - Me.rdoRpwsStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoRpwsStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoRpwsStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoRpwsStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRpwsStyles.Location = New System.Drawing.Point(412, 3) - Me.rdoRpwsStyles.Name = "rdoRpwsStyles" - Me.rdoRpwsStyles.Size = New System.Drawing.Size(91, 29) - Me.rdoRpwsStyles.TabIndex = 282 - Me.rdoRpwsStyles.Text = "Styles" - Me.rdoRpwsStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoRpwsStyles.UseVisualStyleBackColor = True - ' 'rdoRowsGroups ' Me.rdoRowsGroups.Appearance = System.Windows.Forms.Appearance.Button @@ -61,7 +40,7 @@ Partial Class ucrRows Me.rdoRowsGroups.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsGroups.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsGroups.Location = New System.Drawing.Point(235, 3) + Me.rdoRowsGroups.Location = New System.Drawing.Point(283, 3) Me.rdoRowsGroups.Name = "rdoRowsGroups" Me.rdoRowsGroups.Size = New System.Drawing.Size(91, 29) Me.rdoRowsGroups.TabIndex = 280 @@ -81,7 +60,7 @@ Partial Class ucrRows Me.rdoRowsSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsSummaries.Location = New System.Drawing.Point(324, 3) + Me.rdoRowsSummaries.Location = New System.Drawing.Point(372, 3) Me.rdoRowsSummaries.Name = "rdoRowsSummaries" Me.rdoRowsSummaries.Size = New System.Drawing.Size(91, 29) Me.rdoRowsSummaries.TabIndex = 281 @@ -109,7 +88,6 @@ Partial Class ucrRows Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrRowGroups) - Me.Controls.Add(Me.rdoRpwsStyles) Me.Controls.Add(Me.rdoRowsGroups) Me.Controls.Add(Me.rdoRowsSummaries) Me.Controls.Add(Me.ucrPnlRows) @@ -118,8 +96,6 @@ Partial Class ucrRows Me.ResumeLayout(False) End Sub - - Friend WithEvents rdoRpwsStyles As RadioButton Friend WithEvents rdoRowsGroups As RadioButton Friend WithEvents rdoRowsSummaries As RadioButton Friend WithEvents ucrPnlRows As UcrPanel diff --git a/instat/UserTables/Rows/ucrRows.vb b/instat/UserTables/Rows/ucrRows.vb index a8211fb25df..c8880166a4d 100644 --- a/instat/UserTables/Rows/ucrRows.vb +++ b/instat/UserTables/Rows/ucrRows.vb @@ -4,7 +4,6 @@ Private Sub InitialiseDialog() ucrPnlRows.AddRadioButton(rdoRowsGroups) ucrPnlRows.AddRadioButton(rdoRowsSummaries) - ucrPnlRows.AddRadioButton(rdoRpwsStyles) rdoRowsGroups.Checked = True End Sub diff --git a/instat/UserTables/SourceNotes/ucrSourceNotes.vb b/instat/UserTables/SourceNotes/ucrSourceNotes.vb index 5c590c9017c..8df00e029b1 100644 --- a/instat/UserTables/SourceNotes/ucrSourceNotes.vb +++ b/instat/UserTables/SourceNotes/ucrSourceNotes.vb @@ -89,7 +89,7 @@ Public Class ucrSourceNotes row.Tag = clsNewNoteRFunction ' Remove all the tab source notes R Functions - clsTablesUtils.RemoveParameterFromOperator("tab_source_note", clsOperator) + clsTablesUtils.RemoveParameterFromOperator({"tab_source_note"}, clsOperator) ' Add all the tab source note RFunctions clsTablesUtils.SetGridTagsInOperator(dataGridSourceNotes, "tab_source_note", clsOperator) diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb index 59827d52bf6..729dad4f5dc 100644 --- a/instat/UserTables/Stub/ucrStub.vb +++ b/instat/UserTables/Stub/ucrStub.vb @@ -35,7 +35,7 @@ Public Class ucrStub Dim lstRParams As List(Of RParameter) - lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand("gt", clsOperator) + lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsOperator) ' The GT paramter should always be there. If lstRParams.Count > 0 Then @@ -45,7 +45,7 @@ Public Class ucrStub End If - lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand("tab_stubhead", clsOperator) + lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_stubhead"}, clsOperator) If lstRParams.Count > 0 Then clsStubHeadRParameter = lstRParams(0) Else diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index 1ba9d8ab9f0..270d18841aa 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -37,11 +37,11 @@ Public Class clsTablesUtils Return lstRFunctions End Function - Public Shared Function FindRFunctionsParamsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RParameter) + Public Shared Function FindRFunctionsParamsWithRCommand(strRCommandNames() As String, clsOperator As ROperator) As List(Of RParameter) Dim lstRFunctionParams As New List(Of RParameter) For Each clsRParam As RParameter In clsOperator.clsParameters If clsRParam.bIsFunction AndAlso clsRParam.HasValue() Then - If DirectCast(clsRParam.clsArgumentCodeStructure, RFunction).strRCommand = strRCommandName Then + If strRCommandNames.Contains(DirectCast(clsRParam.clsArgumentCodeStructure, RFunction).strRCommand) Then lstRFunctionParams.Add(clsRParam) End If End If @@ -49,11 +49,39 @@ Public Class clsTablesUtils Return lstRFunctionParams End Function - Public Shared Sub RemoveParameterFromOperator(strParameterName As String, clsOperator As ROperator) + + Public Shared Sub RemoveRFunctionsFromOperator(strRCommandNames() As String, clsOperator As ROperator) ' Remove all the previous footer parameters first Dim lstParams As New List(Of RParameter) For Each clsRParam As RParameter In clsOperator.clsParameters - If clsRParam.strArgumentName.Contains(strParameterName) Then + If clsRParam.bIsFunction AndAlso clsRParam.HasValue() Then + If strRCommandNames.Contains(DirectCast(clsRParam.clsArgumentCodeStructure, RFunction).strRCommand) Then + lstParams.Add(clsRParam) + End If + End If + Next + For Each clsRParam As RParameter In lstParams + clsOperator.RemoveParameter(clsRParam) + Next + End Sub + + Public Shared Sub AddGridRowTagsRParamsToROperator(dataGrid As DataGridView, clsOperator As ROperator) + + For index As Integer = 0 To dataGrid.Rows.Count - 1 + If dataGrid.Rows.Item(index).Tag IsNot Nothing Then + Dim clsRParam As RParameter = dataGrid.Rows.Item(index).Tag + clsOperator.AddParameter(clsRParam) + End If + Next + + End Sub + + ' TODO. Delete + Public Shared Sub RemoveParameterFromOperator(strParameterNames() As String, clsOperator As ROperator) + ' Remove all the previous footer parameters first + Dim lstParams As New List(Of RParameter) + For Each clsRParam As RParameter In clsOperator.clsParameters + If strParameterNames.Contains(clsRParam.strArgumentName) Then lstParams.Add(clsRParam) End If Next @@ -62,6 +90,7 @@ Public Class clsTablesUtils Next End Sub + Public Shared Sub SetGridTagsInOperator(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) If dataGrid.Rows.Count = 0 Then diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index f3877dd03ab..6528b863d56 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -48,7 +48,7 @@ Public Class dlgGeneralTable End Sub Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click - sdgTableOptions.Setup(clsBaseOperator) + sdgTableOptions.Setup(ucrSelectorCols.strCurrentDataFrame, clsBaseOperator) sdgTableOptions.ShowDialog(Me) End Sub diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 279424e31fe..68cfe3210b0 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -26,17 +26,13 @@ Partial Class sdgTableOptions Me.tbpHeader = New System.Windows.Forms.TabPage() Me.ucrHeaderOptions = New instat.ucrHeader() Me.tbpStub = New System.Windows.Forms.TabPage() + Me.ucrStub = New instat.ucrStub() Me.tbpColumns = New System.Windows.Forms.TabPage() Me.ucrColumns = New instat.ucrColumns() Me.tbpRows = New System.Windows.Forms.TabPage() Me.ucrRows = New instat.ucrRows() Me.tbpCells = New System.Windows.Forms.TabPage() - Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.lblFooterCellNotes = New System.Windows.Forms.Label() + Me.ucrCells = New instat.ucrCells() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() Me.ucrSourceNotes = New instat.ucrSourceNotes() Me.tbpThemes = New System.Windows.Forms.TabPage() @@ -45,15 +41,13 @@ Partial Class sdgTableOptions Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() Me.ucrPnlThemesPanel = New instat.UcrPanel() - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.ucrStub = New instat.ucrStub() + Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpStub.SuspendLayout() Me.tbpColumns.SuspendLayout() Me.tbpRows.SuspendLayout() Me.tbpCells.SuspendLayout() - CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.tbpSourceNotes.SuspendLayout() Me.tbpThemes.SuspendLayout() Me.SuspendLayout() @@ -70,7 +64,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(779, 350) + Me.tbpFormatOptions.Size = New System.Drawing.Size(784, 411) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -79,7 +73,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(771, 324) + Me.tbpHeader.Size = New System.Drawing.Size(813, 385) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -96,17 +90,24 @@ Partial Class sdgTableOptions Me.tbpStub.Controls.Add(Me.ucrStub) Me.tbpStub.Location = New System.Drawing.Point(4, 22) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(771, 324) + Me.tbpStub.Size = New System.Drawing.Size(813, 385) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True ' + 'ucrStub + ' + Me.ucrStub.Location = New System.Drawing.Point(7, 7) + Me.ucrStub.Name = "ucrStub" + Me.ucrStub.Size = New System.Drawing.Size(411, 191) + Me.ucrStub.TabIndex = 0 + ' 'tbpColumns ' Me.tbpColumns.Controls.Add(Me.ucrColumns) Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(771, 324) + Me.tbpColumns.Size = New System.Drawing.Size(813, 385) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True @@ -123,7 +124,7 @@ Partial Class sdgTableOptions Me.tbpRows.Controls.Add(Me.ucrRows) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(771, 324) + Me.tbpRows.Size = New System.Drawing.Size(776, 385) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True @@ -137,74 +138,27 @@ Partial Class sdgTableOptions ' 'tbpCells ' - Me.tbpCells.Controls.Add(Me.dataGridCellFooterNotes) - Me.tbpCells.Controls.Add(Me.lblFooterCellNotes) + Me.tbpCells.Controls.Add(Me.ucrCells) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(771, 324) + Me.tbpCells.Size = New System.Drawing.Size(813, 385) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True ' - 'dataGridCellFooterNotes - ' - Me.dataGridCellFooterNotes.AllowUserToAddRows = False - Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False - Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(7, 31) - Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" - Me.dataGridCellFooterNotes.RowHeadersWidth = 62 - Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 55) - Me.dataGridCellFooterNotes.TabIndex = 5 - ' - 'colFooterNoteText - ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 - ' - 'colFooterColExpression - ' - Me.colFooterColExpression.HeaderText = "Column Expression" - Me.colFooterColExpression.MinimumWidth = 8 - Me.colFooterColExpression.Name = "colFooterColExpression" - Me.colFooterColExpression.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.colFooterColExpression.Width = 140 + 'ucrCells ' - 'colFooterRowExpression - ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 - ' - 'colFooterFormat - ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.MinimumWidth = 8 - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 - ' - 'lblFooterCellNotes - ' - Me.lblFooterCellNotes.AutoSize = True - Me.lblFooterCellNotes.Location = New System.Drawing.Point(10, 13) - Me.lblFooterCellNotes.Name = "lblFooterCellNotes" - Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) - Me.lblFooterCellNotes.TabIndex = 4 - Me.lblFooterCellNotes.Text = "Cell footers notes:" + Me.ucrCells.Location = New System.Drawing.Point(8, 8) + Me.ucrCells.Name = "ucrCells" + Me.ucrCells.Size = New System.Drawing.Size(644, 360) + Me.ucrCells.TabIndex = 6 ' 'tbpSourceNotes ' Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(771, 324) + Me.tbpSourceNotes.Size = New System.Drawing.Size(813, 385) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -226,7 +180,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(771, 324) + Me.tbpThemes.Size = New System.Drawing.Size(813, 385) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -283,29 +237,22 @@ Partial Class sdgTableOptions Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) Me.ucrPnlThemesPanel.TabIndex = 4 ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(263, 355) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(254, 29) - Me.ucrBaseSubdialog.TabIndex = 4 + 'ucrSdgBaseButtons ' - 'ucrStub - ' - Me.ucrStub.Location = New System.Drawing.Point(7, 7) - Me.ucrStub.Name = "ucrStub" - Me.ucrStub.Size = New System.Drawing.Size(411, 191) - Me.ucrStub.TabIndex = 0 + Me.ucrSdgBaseButtons.AutoSize = True + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(219, 419) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.TabIndex = 343 ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(788, 389) + Me.ClientSize = New System.Drawing.Size(788, 452) + Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.tbpFormatOptions) - Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgTableOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent @@ -316,8 +263,6 @@ Partial Class sdgTableOptions Me.tbpColumns.ResumeLayout(False) Me.tbpRows.ResumeLayout(False) Me.tbpCells.ResumeLayout(False) - Me.tbpCells.PerformLayout() - CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.tbpSourceNotes.ResumeLayout(False) Me.tbpThemes.ResumeLayout(False) Me.tbpThemes.PerformLayout() @@ -325,8 +270,6 @@ Partial Class sdgTableOptions Me.PerformLayout() End Sub - - Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue Friend WithEvents tbpFormatOptions As TabControl Friend WithEvents tbpHeader As TabPage Friend WithEvents tbpCells As TabPage @@ -337,12 +280,6 @@ Partial Class sdgTableOptions Friend WithEvents rdoSelectTheme As RadioButton Friend WithEvents rdoManualTheme As RadioButton Friend WithEvents ucrPnlThemesPanel As UcrPanel - Friend WithEvents lblFooterCellNotes As Label - Friend WithEvents dataGridCellFooterNotes As DataGridView - Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn - Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterFormat As DataGridViewButtonColumn Friend WithEvents ucrSourceNotes As ucrSourceNotes Friend WithEvents tbpRows As TabPage Friend WithEvents ucrHeaderOptions As ucrHeader @@ -351,4 +288,6 @@ Partial Class sdgTableOptions Friend WithEvents ucrRows As ucrRows Friend WithEvents tbpStub As TabPage Friend WithEvents ucrStub As ucrStub + Friend WithEvents ucrCells As ucrCells + Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue End Class diff --git a/instat/UserTables/sdgTableOptions.resx b/instat/UserTables/sdgTableOptions.resx index 0801bc20640..1af7de150c9 100644 --- a/instat/UserTables/sdgTableOptions.resx +++ b/instat/UserTables/sdgTableOptions.resx @@ -117,28 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 92f75780f9e..b737bf92c95 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -26,10 +26,12 @@ Public Class sdgTableOptions autoTranslate(Me) End Sub - Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn + Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn 'clsTablesUtils.RemoveParameterFromOperator("tab_footnote", clsOperator) - clsTablesUtils.SetGridTagsInOperator(dataGridCellFooterNotes, "tab_footnote", clsOperator) + 'clsTablesUtils.SetGridTagsInOperator(dataGridCellFooterNotes, "tab_footnote", clsOperator) + + ucrCells.SetValuesToOperator() SetThemesInOperatorOnReturn(clsOperator) End Sub @@ -49,7 +51,7 @@ Public Class sdgTableOptions ''' The parameter should be an R Function that generates script "gt:gt()" as part of the last script statement. ''' ''' - Public Sub Setup(clsNewOperator As ROperator) + Public Sub Setup(strDataFrameName As String, clsNewOperator As ROperator) If clsTablesUtils.FindRFunctionsWithRCommand("gt", clsNewOperator).Count = 0 Then MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog") @@ -64,9 +66,10 @@ Public Class sdgTableOptions clsOperator = clsNewOperator ucrHeaderOptions.Setup(clsOperator) - ucrStub.Setup("survey", clsOperator) - ucrRows.Setup("survey", clsOperator) - ucrColumns.Setup("survey", clsOperator) + ucrStub.Setup(strDataFrameName, clsOperator) + ucrRows.Setup(strDataFrameName, clsOperator) + ucrColumns.Setup(strDataFrameName, clsOperator) + ucrCells.Setup(strDataFrameName, clsOperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) ucrSourceNotes.Setup(clsOperator) SetupThemeRFunctionsInOperatorOnNew(clsOperator) @@ -77,7 +80,7 @@ Public Class sdgTableOptions Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) 'SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) - SetFooterGridContents(clsOperator, dataGridCellFooterNotes) + 'SetFooterGridContents(clsOperator, dataGridCellFooterNotes) End Sub Private Sub SetFooterGridContents(clsOperator As ROperator, dataGridFooterNotes As DataGridView) @@ -100,15 +103,15 @@ Public Class sdgTableOptions ' todo go through the location function Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then - For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters - If clsFootNoteLocationRParam.strArgumentName = "columns" Then - row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then - row.Cells(2).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - End If - Next - End If + 'If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then + ' For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters + ' If clsFootNoteLocationRParam.strArgumentName = "columns" Then + ' row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + ' ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then + ' row.Cells(2).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) + ' End If + ' Next + 'End If End If ' Tag and add the tab_footnote() function contents as a row @@ -129,42 +132,7 @@ Public Class sdgTableOptions End Sub - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellEndEdit - Dim dataGrid As DataGridView = sender - Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) - Dim strNoteTextValue As String = row.Cells(0).Value - - ' If no foot note typed by user then just exit the sub - If String.IsNullOrEmpty(strNoteTextValue) Then - Exit Sub - End If - - Dim clsNoteRFunction As RFunction = Nothing - - If dataGrid Is dataGridCellFooterNotes Then - - clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) - - ' Add column and row expressions as paramters if user has typed them - If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then - Dim clsFooterLocationNoteRFunction As New RFunction - clsFooterLocationNoteRFunction.SetPackageName("gt") - clsFooterLocationNoteRFunction.SetRCommand("cells_body") - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=GetStringValue(row.Cells(1).Value, False))) - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=GetStringValue(row.Cells(2).Value, False))) - clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) - End If - - End If - ' Overwrite the tag with the new foot function - row.Tag = clsNoteRFunction - - ' If last row then add new empty row - If e.RowIndex = dataGrid.Rows.Count - 1 Then - dataGrid.Rows.Add() - End If - End Sub Private Function SetupAndGetNewNoteRFunction(clsPossibleNoteRFunction As RFunction, strNoteRCommand As String, strRNoteTextParameterName As String, strNoteTextValue As String) As RFunction Dim clsNewNoteRFunction As RFunction = clsPossibleNoteRFunction @@ -191,28 +159,7 @@ Public Class sdgTableOptions Return clsNewNoteRFunction End Function - Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellClick - - Dim dataGrid As DataGridView = sender - Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag - Dim strParameterName As String = Nothing - - '--------------------------- - ' Ignore clicks that are not from button cells. - If dataGrid Is dataGridCellFooterNotes Then - strParameterName = "footnote" - If e.ColumnIndex <> 3 Then - Exit Sub - End If - End If - '--------------------------- - If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then - sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) - sdgTableOptionsTextFormat.Show(Me) - End If - - End Sub diff --git a/instat/dlgSummaryTables.vb b/instat/dlgSummaryTables.vb index c00e819948e..3b2fe5be0f3 100644 --- a/instat/dlgSummaryTables.vb +++ b/instat/dlgSummaryTables.vb @@ -329,7 +329,7 @@ Public Class dlgSummaryTables Exit Sub End If - sdgTableOptions.Setup(clsROperator) + 'sdgTableOptions.Setup(clsROperator) sdgTableOptions.ShowDialog(Me) End Sub diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 92c40c68d42..1089080d18e 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -361,6 +361,42 @@ Form + + ucrCellsFootNotes.vb + + + UserControl + + + sdgCellFormatDateOptions.vb + + + Form + + + sdgCellFormatNumberOptions.vb + + + Form + + + sdgCellFormatTextOptions.vb + + + Form + + + ucrCellFormatEmail.vb + + + UserControl + + + ucrCellFormats.vb + + + UserControl + dlgGeneralTable.vb @@ -3056,12 +3092,6 @@ UserControl - - ucrColumnFormats.vb - - - UserControl - ucrColumnLabels.vb @@ -3309,6 +3339,24 @@ sdgSummaryThemes.vb + + ucrCellsFootNotes.vb + + + sdgCellFormatDateOptions.vb + + + sdgCellFormatNumberOptions.vb + + + sdgCellFormatTextOptions.vb + + + ucrCellFormatEmail.vb + + + ucrCellFormats.vb + dlgGeneralTable.vb @@ -5422,9 +5470,6 @@ ucrCells.vb - - ucrColumnFormats.vb - ucrColumnLabels.vb From f19ae09cf739b7bb4885e16c98b009c9daecc984 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 20 Jun 2024 08:04:30 +0100 Subject: [PATCH 051/273] Change made --- instat/dlgClimograph.vb | 119 +++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 63 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 9c06d5408a9..b884d2d059d 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -55,6 +55,7 @@ Public Class dlgClimograph Private clsScaleColourViridisFunction As New RFunction Private clsScalecolouridentityFunction As New RFunction Private clsLabsFunction As New RFunction + Private clsLabFunction As New RFunction Private clsXlabFunction As New RFunction Private clsYlabFunction As New RFunction Private clsSecondaryAxisFunction As New RFunction @@ -66,6 +67,7 @@ Public Class dlgClimograph Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsXScalecontinuousFunction As New RFunction Private clsXScalediscreteFunction As New RFunction + Private clsScaleycontinuousFunction As New RFunction Private clsYScalecontinuousFunction As New RFunction Private clsGeomRibbonFunction As New RFunction Private clsGeomRibbon1Function As New RFunction @@ -184,7 +186,7 @@ Public Class dlgClimograph ucrReceiverMintemp.strSelectorHeading = "Variables" ucrReceiverMintemp.SetLinkedDisplayControl(lblMintem) - ucrReceiverElement1.SetParameter(New RParameter("y", 4)) + ucrReceiverElement1.SetParameter(New RParameter("y", 4, False)) ucrReceiverElement1.SetParameterIsRFunction() ucrReceiverElement1.Selector = ucrSelectorClimograph ucrReceiverElement1.bWithQuotes = False @@ -193,7 +195,7 @@ Public Class dlgClimograph ucrReceiverElement1.strSelectorHeading = "Variables" ucrReceiverElement1.SetLinkedDisplayControl(lblElement1) - ucrReceiverElement2.SetParameter(New RParameter("y", 5)) + ucrReceiverElement2.SetParameter(New RParameter("x", 5, False)) ucrReceiverElement2.SetParameterIsRFunction() ucrReceiverElement2.Selector = ucrSelectorClimograph ucrReceiverElement2.bWithQuotes = False @@ -335,8 +337,11 @@ Public Class dlgClimograph clsMaxFunction = New RFunction clsMax1Function = New RFunction clsVectorFunction = New RFunction + clsScaleycontinuousFunction = New RFunction + clsLabFunction = New RFunction ucrSelectorClimograph.Reset() + ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) ucrSave.Reset() ucrInputStation.SetName(strFacetWrap) @@ -533,10 +538,10 @@ Public Class dlgClimograph clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) clsStarOperator.SetOperation("*") - clsStarOperator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsStarOperator.AddParameter("right", strScale, iPosition:=1, bIncludeArgumentName:=False) clsStar1Operator.SetOperation("*") - clsStar1Operator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsStar1Operator.AddParameter("right", strScale, iPosition:=1, bIncludeArgumentName:=False) clsDivideOperator.SetOperation("/") clsDivideOperator.AddParameter("left", clsRFunctionParameter:=clsMaxFunction, iPosition:=0, bIncludeArgumentName:=False) @@ -550,6 +555,10 @@ Public Class dlgClimograph clsVectorFunction.SetRCommand("c") + clsScaleycontinuousFunction.SetRCommand("scale_y_continuous") + + clsLabFunction.SetRCommand("labs") + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -574,22 +583,9 @@ Public Class dlgClimograph Private Sub SetRCodeForControls(bReset) ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrReceiverRainC.AddAdditionalCodeParameterPair(clsRoundBarFunction, New RParameter("y", 0, False), iAdditionalPairNo:=1) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsStarOperator, New RParameter("left", 0, False), iAdditionalPairNo:=1) - ucrReceiverElement2.AddAdditionalCodeParameterPair(clsStar1Operator, New RParameter("left", 0, False), iAdditionalPairNo:=1) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsAesGeomRibbonFunction, New RParameter("ymax", 1), iAdditionalPairNo:=2) - ucrReceiverElement2.AddAdditionalCodeParameterPair(clsAesGeomRibbonFunction, New RParameter("ymin", 0), iAdditionalPairNo:=2) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsAesLineFunction, New RParameter("y", 0), iAdditionalPairNo:=3) - ucrReceiverElement2.AddAdditionalCodeParameterPair(clsAesLine1Function, New RParameter("y", 0), iAdditionalPairNo:=3) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsRoundTmaxFunction, New RParameter("y", 0, False), iAdditionalPairNo:=4) - ucrReceiverElement2.AddAdditionalCodeParameterPair(clsRoundTminFunction, New RParameter("y", 0, False), iAdditionalPairNo:=4) - ucrReceiverElement1.AddAdditionalCodeParameterPair(clsVectorFunction, New RParameter("x", 0, False), iAdditionalPairNo:=5) - ucrReceiverElement2.AddAdditionalCodeParameterPair(clsVectorFunction, New RParameter("y", 0, False), iAdditionalPairNo:=5) ucrReceiverMonthC.AddAdditionalCodeParameterPair(clsUniqueFunction, New RParameter("x", 0, False), iAdditionalPairNo:=1) - ucrReceiverRainC.AddAdditionalCodeParameterPair(clsMaxFunction, New RParameter("x", 0, False), iAdditionalPairNo:=2) - ucrReceiverRainC.AddAdditionalCodeParameterPair(clsAesGeomTextBarFunction, New RParameter("y", 0), iAdditionalPairNo:=3) - ucrReceiverRainC.SetRCode(clsBarAesFunction, bReset) + ucrReceiverRainC.SetRCode(clsMaxFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverRain.SetRCode(clsGgwalterliethFunction, bReset) @@ -600,6 +596,8 @@ Public Class dlgClimograph ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then + ucrReceiverElement2.SetRCode(clsVectorFunction, bReset) + ucrReceiverElement1.SetRCode(clsVectorFunction, bReset) ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) ucrChkColourIdntity.SetRCode(clsScalecolouridentityFunction, bReset) @@ -609,8 +607,7 @@ Public Class dlgClimograph ucrInputLabels.SetRCode(clsScalecolouridentityFunction, bReset) ucrChkText.SetRCode(clsBaseOperator, bReset) End If - ucrReceiverElement2.SetRCode(clsAesGeomTextTminFunction, bReset) - ucrReceiverElement1.SetRCode(clsAesGeomTextTmaxFunction, bReset) + End Sub Private Sub TestOKEnabled() @@ -1030,6 +1027,8 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverRainC.IsEmpty Then + clsRoundBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextBarFunction, iPosition:=5, bIncludeArgumentName:=False) Else clsBaseOperator.RemoveParameterByName("geom_text") @@ -1046,7 +1045,9 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverElement1.IsEmpty Then + clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) If Not ucrReceiverRainC.IsEmpty Then + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxStarFunction, iPosition:=6, bIncludeArgumentName:=False) Else clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) @@ -1066,9 +1067,12 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If ucrChkText.Checked Then If Not ucrReceiverElement2.IsEmpty Then + clsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminStarFunction, iPosition:=7, bIncludeArgumentName:=False) Else + clsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) End If Else @@ -1085,14 +1089,23 @@ Public Class dlgClimograph Private Sub AddRemoveGeomRibbon() If rdoClimograph.Checked Then If ucrChkRibbon.Checked Then - clsBaseOperator.AddParameter("scale_x_discrete", clsRFunctionParameter:=clsXScalediscreteFunction, iPosition:=12) - If Not ucrReceiverRainC.IsEmpty Then - clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) + If ucrChkRibbon.Enabled = True Then + clsBaseOperator.AddParameter("scale_x_discrete", clsRFunctionParameter:=clsXScalediscreteFunction, iPosition:=12) + If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) + Else + clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) + End If Else - clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("scale_x_discrete") End If Else - clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_ribbon") clsBaseOperator.RemoveParameterByName("scale_x_discrete") End If Else @@ -1114,9 +1127,8 @@ Public Class dlgClimograph Private Sub AddRemoveGeomLines() If rdoClimograph.Checked Then If Not ucrReceiverElement1.IsEmpty Then - clsBaseOperator.RemoveParameterByName("geom_line") - clsBaseOperator.RemoveParameterByName("geom_line1") If Not ucrReceiverRainC.IsEmpty Then + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) If ucrChkColourIdntity.Checked Then clsAesLineStarFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) @@ -1136,7 +1148,8 @@ Public Class dlgClimograph clsAesLineStarFunction.RemoveParameterByName("colour") End If Else - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) If ucrChkColourIdntity.Checked Then clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) @@ -1157,11 +1170,9 @@ Public Class dlgClimograph End If Else clsBaseOperator.RemoveParameterByName("geom_line") - clsBaseOperator.RemoveParameterByName("geom_line1") End If Else clsBaseOperator.RemoveParameterByName("geom_line") - clsBaseOperator.RemoveParameterByName("geom_line1") clsBaseOperator.RemoveParameterByName("scale_colour_identity") End If End Sub @@ -1169,10 +1180,9 @@ Public Class dlgClimograph Private Sub AddRemoveGeomLine1() If rdoClimograph.Checked Then If Not ucrReceiverElement2.IsEmpty Then - clsBaseOperator.RemoveParameterByName("geom_line3") - clsBaseOperator.RemoveParameterByName("geom_line2") If Not ucrReceiverRainC.IsEmpty Then - clsBaseOperator.AddParameter("geom_line2", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) If ucrChkColourIdntity.Checked Then clsAesLineStar1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) @@ -1187,11 +1197,12 @@ Public Class dlgClimograph clsScalecolouridentityFunction.RemoveParameterByName("name") End If Else + clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) clsBaseOperator.RemoveParameterByName("scale_colour_identity") clsAesLineStar1Function.RemoveParameterByName("colour") End If Else - clsBaseOperator.AddParameter("geom_line3", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) If ucrChkColourIdntity.Checked Then clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) @@ -1211,21 +1222,20 @@ Public Class dlgClimograph End If End If Else - clsBaseOperator.RemoveParameterByName("geom_line3") - clsBaseOperator.RemoveParameterByName("geom_line2") + clsBaseOperator.RemoveParameterByName("geom_line1") End If Else clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsBaseOperator.RemoveParameterByName("geom_line2") - clsBaseOperator.RemoveParameterByName("geom_line3") + clsBaseOperator.RemoveParameterByName("geom_line1") End If End Sub Private Sub AddRemoveGeomBar() If rdoClimograph.Checked Then If Not ucrReceiverRainC.IsEmpty Then - clsLabsFunction.AddParameter("fill", Chr(34) & "Rainfall" & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabsFunction, iPosition:=13) + clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) + clsLabFunction.AddParameter("fill", Chr(34) & "Rainfall" & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabFunction, iPosition:=13) If ucrChkTile.Checked Then clsBarAesFunction.AddParameter("fill", ucrReceiverRainC.GetVariableNames(False), iPosition:=3) clsBaseOperator.AddParameter("geom_tile", clsRFunctionParameter:=clsGeomTileFunction, iPosition:=1) @@ -1250,38 +1260,21 @@ Public Class dlgClimograph Private Sub EnableTileAndRibbon() ucrChkRibbon.Enabled = (Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty) AndAlso Not ucrChkTile.Checked ucrChkTile.Enabled = Not ucrChkRibbon.Checked AndAlso Not ucrReceiverRainC.IsEmpty - If ucrChkRibbon.Checked Then - If ucrChkRibbon.Enabled = True Then - If Not ucrReceiverRainC.IsEmpty Then - clsBaseOperator.RemoveParameterByName("geom_ribbon") - clsBaseOperator.AddParameter("geom_ribbon1", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) - Else - clsBaseOperator.RemoveParameterByName("geom_ribbon1") - clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) - End If - Else - clsBaseOperator.RemoveParameterByName("geom_ribbon1") - clsBaseOperator.RemoveParameterByName("geom_ribbon") - End If - Else - clsBaseOperator.RemoveParameterByName("geom_ribbon1") - clsBaseOperator.RemoveParameterByName("geom_ribbon") - End If End Sub Private Sub AddRemoveSecondaryAxis() If rdoClimograph.Checked Then - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsYScalecontinuousFunction, iPosition:=9) + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsScaleycontinuousFunction, iPosition:=9) If Not ucrReceiverRainC.IsEmpty Then - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsScaleycontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) If Not ucrReceiverElement1.IsEmpty OrElse Not ucrReceiverElement2.IsEmpty Then - clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) + clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) Else - clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) + clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) End If Else - clsYScalecontinuousFunction.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=0) - clsYScalecontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis1Function, iPosition:=1) + clsScaleycontinuousFunction.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=0) + clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis1Function, iPosition:=1) End If Else clsBaseOperator.RemoveParameterByName("scale_y_continuous") From 095881ce77797d03e35666ced4d67a749711dfff Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 20 Jun 2024 12:30:03 +0100 Subject: [PATCH 052/273] Change made --- instat/dlgClimograph.vb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index b884d2d059d..105061fe386 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -535,7 +535,7 @@ Public Class dlgClimograph clsDivide1Operator.SetOperation("/") clsDivide1Operator.AddParameter("left", "~ .", iPosition:=0, bIncludeArgumentName:=False) - clsDivide1Operator.AddParameter("rigth", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) + clsDivide1Operator.AddParameter("right", clsROperatorParameter:=clsDivideOperator, iPosition:=1, bIncludeArgumentName:=False) clsStarOperator.SetOperation("*") clsStarOperator.AddParameter("right", strScale, iPosition:=1, bIncludeArgumentName:=False) @@ -660,6 +660,17 @@ Public Class dlgClimograph clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() + AutoFacetStation() + AddRemoveFacetClimograph() + AddRemoveFacetsWalterLieth() + AddRemoveGeomBar() + AddRemoveGeomLine1() + AddRemoveGeomLines() + AddRemoveSecondaryAxis() + AddRemoveGeomRibbon() + AddRemoveGeomTextBar() + AddRemoveGeomTextTmax() + AddRemoveGeomTextTmin() bResetSubdialog = False End Sub @@ -1050,6 +1061,7 @@ Public Class dlgClimograph clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxStarFunction, iPosition:=6, bIncludeArgumentName:=False) Else + clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) End If Else @@ -1246,6 +1258,7 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("geom_tile") End If Else + clsBarAesFunction.RemoveParameterByName("y") clsBaseOperator.RemoveParameterByName("geom_tile") clsBaseOperator.RemoveParameterByName("geom_bar") clsBaseOperator.RemoveParameterByName("labs") From 31130501f1fc55c643c5f0c60767686ff5f4eb2b Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 20 Jun 2024 16:57:56 +0300 Subject: [PATCH 053/273] Table styles UI designs --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 2 +- .../Cells/FootNotes/ucrCellsFootNotes.resx | 12 - .../Cells/Formats/ucrCellFormats.Designer.vb | 82 +-- .../Cells/Formats/ucrCellFormats.resx | 15 - .../Cells/Formats/ucrCellFormats.vb | 6 +- .../Cells/Styles/ucrCellStyles.Designer.vb | 187 +++++ .../Cells/Styles/ucrCellStyles.resx | 126 ++++ .../UserTables/Cells/Styles/ucrCellStyles.vb | 115 +++ instat/UserTables/Cells/ucrCells.Designer.vb | 10 + instat/UserTables/Cells/ucrCells.vb | 4 + instat/UserTables/clsTablesUtils.vb | 32 +- instat/UserTables/sdgTableStyles.Designer.vb | 682 ++++++++++++++++++ instat/UserTables/sdgTableStyles.resx | 120 +++ instat/UserTables/sdgTableStyles.vb | 264 +++++++ instat/instat.vbproj | 18 + 15 files changed, 1595 insertions(+), 80 deletions(-) create mode 100644 instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb create mode 100644 instat/UserTables/Cells/Styles/ucrCellStyles.resx create mode 100644 instat/UserTables/Cells/Styles/ucrCellStyles.vb create mode 100644 instat/UserTables/sdgTableStyles.Designer.vb create mode 100644 instat/UserTables/sdgTableStyles.resx create mode 100644 instat/UserTables/sdgTableStyles.vb diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb index 43e23a2dc51..bb4aeb913f1 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -91,7 +91,7 @@ Partial Class ucrCellsFootNotes Me.Controls.Add(Me.dataGridCellFooterNotes) Me.Controls.Add(Me.lblFooterCellNotes) Me.Name = "ucrCellsFootNotes" - Me.Size = New System.Drawing.Size(641, 113) + Me.Size = New System.Drawing.Size(641, 270) CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx index 0801bc20640..418e7a89629 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx @@ -129,16 +129,4 @@ True - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb index 810bf5b641d..ce76e58fb55 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb @@ -26,17 +26,16 @@ Partial Class ucrCellFormats Me.btnClearFormats = New System.Windows.Forms.Button() Me.btnEnterFormat = New System.Windows.Forms.Button() Me.dataGridFormats = New System.Windows.Forms.DataGridView() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.Label1 = New System.Windows.Forms.Label() + Me.lblRowExpression = New System.Windows.Forms.Label() Me.lblColumns = New System.Windows.Forms.Label() Me.cboSelectFormat = New System.Windows.Forms.ComboBox() Me.Label2 = New System.Windows.Forms.Label() Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() Me.ucrInputRows = New instat.ucrInputTextBox() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -77,51 +76,22 @@ Partial Class ucrCellFormats ' Me.dataGridFormats.AllowUserToAddRows = False Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colCodnition, Me.colLabel, Me.colRow, Me.colFormat}) + Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colCodnition, Me.colLabel, Me.colRow}) Me.dataGridFormats.Location = New System.Drawing.Point(234, 237) Me.dataGridFormats.Name = "dataGridFormats" Me.dataGridFormats.RowHeadersWidth = 62 Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) Me.dataGridFormats.TabIndex = 307 ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Format" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 64 - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Column(s)" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 78 - ' - 'colRow - ' - Me.colRow.HeaderText = "Row(s)" - Me.colRow.Name = "colRow" - ' - 'colFormat - ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 - ' - 'Label1 + 'lblRowExpression ' - Me.Label1.AutoSize = True - Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(231, 140) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(134, 13) - Me.Label1.TabIndex = 320 - Me.Label1.Text = "Row Expression (Optional):" + Me.lblRowExpression.AutoSize = True + Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowExpression.Location = New System.Drawing.Point(231, 140) + Me.lblRowExpression.Name = "lblRowExpression" + Me.lblRowExpression.Size = New System.Drawing.Size(134, 13) + Me.lblRowExpression.TabIndex = 320 + Me.lblRowExpression.Text = "Row Expression (Optional):" ' 'lblColumns ' @@ -189,13 +159,34 @@ Partial Class ucrCellFormats Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 308 ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Format" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 64 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Column(s)" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 78 + ' + 'colRow + ' + Me.colRow.HeaderText = "Row(s)" + Me.colRow.Name = "colRow" + ' 'ucrCellFormats ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.cboSelectFormat) - Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.lblRowExpression) Me.Controls.Add(Me.ucrReceiverMultipleCols) Me.Controls.Add(Me.ucrInputRows) Me.Controls.Add(Me.lblFormats) @@ -216,7 +207,7 @@ Partial Class ucrCellFormats Friend WithEvents btnEnterFormat As Button Friend WithEvents dataGridFormats As DataGridView Friend WithEvents ucrInputRows As ucrInputTextBox - Friend WithEvents Label1 As Label + Friend WithEvents lblRowExpression As Label Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents lblColumns As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove @@ -225,5 +216,4 @@ Partial Class ucrCellFormats Friend WithEvents colCodnition As DataGridViewTextBoxColumn Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colRow As DataGridViewTextBoxColumn - Friend WithEvents colFormat As DataGridViewButtonColumn End Class diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.resx b/instat/UserTables/Cells/Formats/ucrCellFormats.resx index b639adfa96c..df1d8e46938 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.resx +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.resx @@ -126,19 +126,4 @@ True - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb index 5b5aad48a7e..a73c709a92a 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -29,7 +29,7 @@ End Sub Public Sub SetValuesToOperator() - clsTablesUtils.RemoveRFunctionsFromOperator({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) End Sub @@ -39,7 +39,7 @@ Dim clsFormatRFunction As RFunction = clsRParam.clsArgumentCodeStructure - ' Create a new row that represents the tab_footnote() parameters + ' Create a new row that represents the tab_row_group() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridFormats) @@ -54,7 +54,6 @@ End If Next - ' Tag and add the tab_row_group() parameter function contents as a row row.Tag = clsRParam dataGridFormats.Rows.Add(row) @@ -144,5 +143,4 @@ ucrReceiverMultipleCols.SetMeAsReceiver() End Sub - End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb new file mode 100644 index 00000000000..46fe7f4b36d --- /dev/null +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb @@ -0,0 +1,187 @@ + _ +Partial Class ucrCellStyles + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblRowExpression = New System.Windows.Forms.Label() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.ucrInputRows = New instat.ucrInputTextBox() + Me.lblFormats = New System.Windows.Forms.Label() + Me.btnClearFormats = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGridFormats = New System.Windows.Forms.DataGridView() + Me.btnEnterStyle = New System.Windows.Forms.Button() + Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCells = New System.Windows.Forms.DataGridViewTextBoxColumn() + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblRowExpression + ' + Me.lblRowExpression.AutoSize = True + Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowExpression.Location = New System.Drawing.Point(239, 87) + Me.lblRowExpression.Name = "lblRowExpression" + Me.lblRowExpression.Size = New System.Drawing.Size(86, 13) + Me.lblRowExpression.TabIndex = 329 + Me.lblRowExpression.Text = "Row Expression:" + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(242, 23) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 55) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 327 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'ucrInputRows + ' + Me.ucrInputRows.AddQuotesIfUnrecognised = True + Me.ucrInputRows.AutoSize = True + Me.ucrInputRows.IsMultiline = False + Me.ucrInputRows.IsReadOnly = False + Me.ucrInputRows.Location = New System.Drawing.Point(242, 103) + Me.ucrInputRows.Name = "ucrInputRows" + Me.ucrInputRows.Size = New System.Drawing.Size(137, 21) + Me.ucrInputRows.TabIndex = 328 + ' + 'lblFormats + ' + Me.lblFormats.AutoSize = True + Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFormats.Location = New System.Drawing.Point(239, 167) + Me.lblFormats.Name = "lblFormats" + Me.lblFormats.Size = New System.Drawing.Size(38, 13) + Me.lblFormats.TabIndex = 326 + Me.lblFormats.Text = "Styles:" + ' + 'btnClearFormats + ' + Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearFormats.Location = New System.Drawing.Point(523, 158) + Me.btnClearFormats.Name = "btnClearFormats" + Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) + Me.btnClearFormats.TabIndex = 325 + Me.btnClearFormats.Tag = "" + Me.btnClearFormats.Text = "Clear" + Me.btnClearFormats.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(245, 7) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 324 + Me.lblColumns.Text = "Column:" + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(7, 7) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 322 + ' + 'dataGridFormats + ' + Me.dataGridFormats.AllowUserToAddRows = False + Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles, Me.colCells}) + Me.dataGridFormats.Location = New System.Drawing.Point(242, 184) + Me.dataGridFormats.Name = "dataGridFormats" + Me.dataGridFormats.RowHeadersWidth = 62 + Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) + Me.dataGridFormats.TabIndex = 321 + ' + 'btnEnterStyle + ' + Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnEnterStyle.Location = New System.Drawing.Point(242, 135) + Me.btnEnterStyle.Name = "btnEnterStyle" + Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) + Me.btnEnterStyle.TabIndex = 323 + Me.btnEnterStyle.Tag = "" + Me.btnEnterStyle.Text = "Enter Style" + Me.btnEnterStyle.UseVisualStyleBackColor = True + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colStyles.HeaderText = "Style" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" + Me.colStyles.Width = 55 + ' + 'colCells + ' + Me.colCells.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCells.HeaderText = "Cell(s)" + Me.colCells.MinimumWidth = 8 + Me.colCells.Name = "colCells" + Me.colCells.Width = 60 + ' + 'ucrCellStyles + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblRowExpression) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.ucrInputRows) + Me.Controls.Add(Me.lblFormats) + Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnEnterStyle) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridFormats) + Me.Name = "ucrCellStyles" + Me.Size = New System.Drawing.Size(609, 264) + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblRowExpression As Label + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents ucrInputRows As ucrInputTextBox + Friend WithEvents lblFormats As Label + Friend WithEvents btnClearFormats As Button + Friend WithEvents lblColumns As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGridFormats As DataGridView + Friend WithEvents btnEnterStyle As Button + Friend WithEvents colStyles As DataGridViewTextBoxColumn + Friend WithEvents colCells As DataGridViewTextBoxColumn +End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.resx b/instat/UserTables/Cells/Styles/ucrCellStyles.resx new file mode 100644 index 00000000000..11d31b5f1bf --- /dev/null +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.vb new file mode 100644 index 00000000000..460bb72fa90 --- /dev/null +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.vb @@ -0,0 +1,115 @@ +Public Class ucrCellStyles + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub InitialiseControl() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + ' Clear and Set up the data grid with contents + dataGridFormats.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_style", "locations", "cells_body", clsOperator)) + + End Sub + + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + Dim clsFormatRFunction As RFunction = clsRParam.clsArgumentCodeStructure + + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + + For Each clsRowGroupRParam As RParameter In clsFormatRFunction.clsParameters + If clsRowGroupRParam.strArgumentName = "style" Then + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + ElseIf clsRowGroupRParam.strArgumentName = "locations" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + End If + Next + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGridFormats.Rows.Add(row) + + Next + End Sub + + Private Sub ucrReceiverMultipleCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlValueChanged, ucrInputRows.ControlValueChanged + btnEnterStyle.Enabled = Not ucrReceiverMultipleCols.IsEmpty AndAlso Not ucrInputRows.IsEmpty + End Sub + + Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click + Dim clsFormatRFunction As RFunction = Nothing + sdgTableStyles.Setup() + sdgTableStyles.ShowDialog(Me.ParentForm) + 'clsFormatRFunction = sdgCellFormatTextOptions.GetNewUserInputAsRFunction() + + 'If clsFormatRFunction Is Nothing Then + ' Exit Sub + 'End If + + 'AddFormatParameterToGrid(clsFormatRFunction) + 'ucrReceiverMultipleCols.Clear() + 'ucrInputRows.SetName("") + + End Sub + + + Private Sub AddFormatParameterToGrid(clsFormatRFunction As RFunction) + + Dim strColumnsExpression As String = ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False) + Dim strRowsExpression As String = ucrInputRows.GetText + + ' Add columns parameter + clsFormatRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) + + ' Add rows as paramater if present + If Not ucrInputRows.IsEmpty Then + clsFormatRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) + End If + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsFormatRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + row.Cells(0).Value = clsFormatRFunction.strRCommand + row.Cells(1).Value = strColumnsExpression + row.Cells(2).Value = strRowsExpression + + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGridFormats.Rows.Add(row) + + End Sub + + Private Sub btnClearFormats_Click(sender As Object, e As EventArgs) Handles btnClearFormats.Click + dataGridFormats.Rows.Clear() + End Sub + + +End Class diff --git a/instat/UserTables/Cells/ucrCells.Designer.vb b/instat/UserTables/Cells/ucrCells.Designer.vb index ed906665f11..daf69d9f9ba 100644 --- a/instat/UserTables/Cells/ucrCells.Designer.vb +++ b/instat/UserTables/Cells/ucrCells.Designer.vb @@ -28,6 +28,7 @@ Partial Class ucrCells Me.ucrCellsFootNotes = New instat.ucrCellsFootNotes() Me.ucrCellFormats = New instat.ucrCellFormats() Me.ucrPnlCells = New instat.UcrPanel() + Me.ucrCellStyles = New instat.ucrCellStyles() Me.SuspendLayout() ' 'rdoStyles @@ -112,10 +113,18 @@ Partial Class ucrCells Me.ucrPnlCells.Size = New System.Drawing.Size(309, 29) Me.ucrPnlCells.TabIndex = 289 ' + 'ucrCellStyles + ' + Me.ucrCellStyles.Location = New System.Drawing.Point(7, 56) + Me.ucrCellStyles.Name = "ucrCellStyles" + Me.ucrCellStyles.Size = New System.Drawing.Size(609, 264) + Me.ucrCellStyles.TabIndex = 295 + ' 'ucrCells ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrCellStyles) Me.Controls.Add(Me.ucrCellsFootNotes) Me.Controls.Add(Me.ucrCellFormats) Me.Controls.Add(Me.rdoStyles) @@ -134,4 +143,5 @@ Partial Class ucrCells Friend WithEvents ucrPnlCells As UcrPanel Friend WithEvents ucrCellFormats As ucrCellFormats Friend WithEvents ucrCellsFootNotes As ucrCellsFootNotes + Friend WithEvents ucrCellStyles As ucrCellStyles End Class diff --git a/instat/UserTables/Cells/ucrCells.vb b/instat/UserTables/Cells/ucrCells.vb index 5ae8e74a6d6..ef4b89c2d47 100644 --- a/instat/UserTables/Cells/ucrCells.vb +++ b/instat/UserTables/Cells/ucrCells.vb @@ -13,13 +13,17 @@ InitialiseDialog() bFirstload = False End If + ucrCellFormats.Setup(strDataFrameName, clsOperator) ucrCellsFootNotes.Setup(strDataFrameName, clsOperator) + ucrCellStyles.Setup(strDataFrameName, clsOperator) + End Sub Private Sub ucrPnlRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCells.ControlValueChanged ucrCellFormats.Visible = rdoFormat.Checked ucrCellsFootNotes.Visible = rdoFootNotes.Checked + ucrCellStyles.Visible = rdoStyles.Checked End Sub Public Sub SetValuesToOperator() diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index 270d18841aa..2191b24bbff 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -49,8 +49,7 @@ Public Class clsTablesUtils Return lstRFunctionParams End Function - - Public Shared Sub RemoveRFunctionsFromOperator(strRCommandNames() As String, clsOperator As ROperator) + Public Shared Sub RemoveRFunctionsParamsWithRCommand(strRCommandNames() As String, clsOperator As ROperator) ' Remove all the previous footer parameters first Dim lstParams As New List(Of RParameter) For Each clsRParam As RParameter In clsOperator.clsParameters @@ -76,6 +75,34 @@ Public Class clsTablesUtils End Sub + ''' + ''' E.g Finding cells_body in R Function tab_style( style = cell_fill(color = "gray85"), locations = cells_body() ) + ''' + ''' e.g tab_style + ''' e.g locations + ''' e.g cells_body + ''' Operator that contains the parent strRCommandName + ''' + Public Shared Function FindRFunctionsParamsWithRParamValue(strRCommandName As String, strParamName As String, strParamValueRCommand As String, clsOperator As ROperator) As List(Of RParameter) + + Dim lstRFunctionParams As List(Of RParameter) = FindRFunctionsParamsWithRCommand({strRCommandName}, clsOperator) + Dim lstRFunctionsParamsFound As New List(Of RParameter) + + For Each clsRParam As RParameter In lstRFunctionParams + Dim rFunctionParent As RFunction = clsRParam.clsArgumentCodeStructure + If rFunctionParent.strRCommand = strRCommandName AndAlso rFunctionParent.ContainsParameter(strParamName) Then + + Dim rFunctionchild As RFunction = rFunctionParent.GetParameter(strParamName).clsArgumentCodeStructure + If rFunctionchild.strRCommand = strParamValueRCommand Then + lstRFunctionsParamsFound.Add(clsRParam) + End If + + End If + Next + Return lstRFunctionsParamsFound + End Function + + ' TODO. Delete Public Shared Sub RemoveParameterFromOperator(strParameterNames() As String, clsOperator As ROperator) ' Remove all the previous footer parameters first @@ -91,6 +118,7 @@ Public Class clsTablesUtils End Sub + 'TODO. Delete Public Shared Sub SetGridTagsInOperator(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) If dataGrid.Rows.Count = 0 Then diff --git a/instat/UserTables/sdgTableStyles.Designer.vb b/instat/UserTables/sdgTableStyles.Designer.vb new file mode 100644 index 00000000000..c3a241efa21 --- /dev/null +++ b/instat/UserTables/sdgTableStyles.Designer.vb @@ -0,0 +1,682 @@ + _ +Partial Class sdgTableStyles + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.Label2 = New System.Windows.Forms.Label() + Me.grpBoxColor = New System.Windows.Forms.GroupBox() + Me.lblFill = New System.Windows.Forms.Label() + Me.grpBoxAlignment = New System.Windows.Forms.GroupBox() + Me.lblAlignHorizontal = New System.Windows.Forms.Label() + Me.lblUnderlineType = New System.Windows.Forms.Label() + Me.grpBoxUnderline = New System.Windows.Forms.GroupBox() + Me.lblUnderlineStyle = New System.Windows.Forms.Label() + Me.lblUnderlineColor = New System.Windows.Forms.Label() + Me.lblFontWeight = New System.Windows.Forms.Label() + Me.grpBoxFont = New System.Windows.Forms.GroupBox() + Me.lblFontFamily = New System.Windows.Forms.Label() + Me.lblFontStyle = New System.Windows.Forms.Label() + Me.lblFontSize = New System.Windows.Forms.Label() + Me.lblAlignVertical = New System.Windows.Forms.Label() + Me.grpBoxOthers = New System.Windows.Forms.GroupBox() + Me.lblTransform = New System.Windows.Forms.Label() + Me.lblIndent = New System.Windows.Forms.Label() + Me.lblWhiteSpace = New System.Windows.Forms.Label() + Me.lblStretch = New System.Windows.Forms.Label() + Me.ucrCboStretch = New instat.ucrInputComboBox() + Me.ucrCboWhiteSpace = New instat.ucrInputComboBox() + Me.ucrTxtIndent = New instat.ucrInputTextBox() + Me.ucrInputCboTransform = New instat.ucrInputComboBox() + Me.ucrCboColorBackground = New instat.ucrColors() + Me.ucrCboColorText = New instat.ucrColors() + Me.ucrCboAlignVertical = New instat.ucrInputComboBox() + Me.ucrCboAlignHorizontal = New instat.ucrInputComboBox() + Me.ucrCboUnderlineType = New instat.ucrInputComboBox() + Me.ucrCboUnderLineColor = New instat.ucrColors() + Me.ucrCboUnderlineStyle = New instat.ucrInputComboBox() + Me.ucrTxtFontSize = New instat.ucrInputTextBox() + Me.ucrCboFontWeight = New instat.ucrInputComboBox() + Me.ucrCboFontStyle = New instat.ucrInputComboBox() + Me.ucrCboFontFamily = New instat.ucrInputComboBox() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.grpBoxBorders = New System.Windows.Forms.GroupBox() + Me.lblBordersSides = New System.Windows.Forms.Label() + Me.ucrCboBorderColor = New instat.ucrColors() + Me.lblBorderColor = New System.Windows.Forms.Label() + Me.ucrCboBorderWeight = New instat.ucrInputTextBox() + Me.lblBorderWeight = New System.Windows.Forms.Label() + Me.lblBorderStyle = New System.Windows.Forms.Label() + Me.ucrCboBorderStyle = New instat.ucrInputComboBox() + Me.ucrChkBorderLeft = New instat.ucrCheck() + Me.ucrChkBorderRight = New instat.ucrCheck() + Me.ucrChkBorderBottom = New instat.ucrCheck() + Me.ucrChkBorderTop = New instat.ucrCheck() + Me.grpBoxColor.SuspendLayout() + Me.grpBoxAlignment.SuspendLayout() + Me.grpBoxUnderline.SuspendLayout() + Me.grpBoxFont.SuspendLayout() + Me.grpBoxOthers.SuspendLayout() + Me.grpBoxBorders.SuspendLayout() + Me.SuspendLayout() + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(155, 21) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(68, 13) + Me.Label2.TabIndex = 16 + Me.Label2.Text = "Background:" + ' + 'grpBoxColor + ' + Me.grpBoxColor.Controls.Add(Me.ucrCboColorBackground) + Me.grpBoxColor.Controls.Add(Me.ucrCboColorText) + Me.grpBoxColor.Controls.Add(Me.lblFill) + Me.grpBoxColor.Controls.Add(Me.Label2) + Me.grpBoxColor.Location = New System.Drawing.Point(7, 78) + Me.grpBoxColor.Name = "grpBoxColor" + Me.grpBoxColor.Size = New System.Drawing.Size(594, 68) + Me.grpBoxColor.TabIndex = 29 + Me.grpBoxColor.TabStop = False + Me.grpBoxColor.Text = "Color" + ' + 'lblFill + ' + Me.lblFill.AutoSize = True + Me.lblFill.Location = New System.Drawing.Point(6, 21) + Me.lblFill.Name = "lblFill" + Me.lblFill.Size = New System.Drawing.Size(22, 13) + Me.lblFill.TabIndex = 14 + Me.lblFill.Text = "Fill:" + ' + 'grpBoxAlignment + ' + Me.grpBoxAlignment.Controls.Add(Me.lblAlignVertical) + Me.grpBoxAlignment.Controls.Add(Me.ucrCboAlignVertical) + Me.grpBoxAlignment.Controls.Add(Me.lblAlignHorizontal) + Me.grpBoxAlignment.Controls.Add(Me.ucrCboAlignHorizontal) + Me.grpBoxAlignment.Enabled = False + Me.grpBoxAlignment.Location = New System.Drawing.Point(7, 221) + Me.grpBoxAlignment.Name = "grpBoxAlignment" + Me.grpBoxAlignment.Size = New System.Drawing.Size(594, 65) + Me.grpBoxAlignment.TabIndex = 28 + Me.grpBoxAlignment.TabStop = False + Me.grpBoxAlignment.Text = "Alignment" + ' + 'lblAlignHorizontal + ' + Me.lblAlignHorizontal.AutoSize = True + Me.lblAlignHorizontal.Location = New System.Drawing.Point(6, 20) + Me.lblAlignHorizontal.Name = "lblAlignHorizontal" + Me.lblAlignHorizontal.Size = New System.Drawing.Size(57, 13) + Me.lblAlignHorizontal.TabIndex = 18 + Me.lblAlignHorizontal.Text = "Horizontal:" + ' + 'lblUnderlineType + ' + Me.lblUnderlineType.AutoSize = True + Me.lblUnderlineType.Location = New System.Drawing.Point(6, 16) + Me.lblUnderlineType.Name = "lblUnderlineType" + Me.lblUnderlineType.Size = New System.Drawing.Size(34, 13) + Me.lblUnderlineType.TabIndex = 21 + Me.lblUnderlineType.Text = "Type:" + ' + 'grpBoxUnderline + ' + Me.grpBoxUnderline.Controls.Add(Me.lblUnderlineType) + Me.grpBoxUnderline.Controls.Add(Me.ucrCboUnderlineType) + Me.grpBoxUnderline.Controls.Add(Me.ucrCboUnderLineColor) + Me.grpBoxUnderline.Controls.Add(Me.lblUnderlineStyle) + Me.grpBoxUnderline.Controls.Add(Me.ucrCboUnderlineStyle) + Me.grpBoxUnderline.Controls.Add(Me.lblUnderlineColor) + Me.grpBoxUnderline.Location = New System.Drawing.Point(7, 149) + Me.grpBoxUnderline.Name = "grpBoxUnderline" + Me.grpBoxUnderline.Size = New System.Drawing.Size(594, 68) + Me.grpBoxUnderline.TabIndex = 27 + Me.grpBoxUnderline.TabStop = False + Me.grpBoxUnderline.Text = "Underline" + ' + 'lblUnderlineStyle + ' + Me.lblUnderlineStyle.AutoSize = True + Me.lblUnderlineStyle.Enabled = False + Me.lblUnderlineStyle.Location = New System.Drawing.Point(151, 16) + Me.lblUnderlineStyle.Name = "lblUnderlineStyle" + Me.lblUnderlineStyle.Size = New System.Drawing.Size(33, 13) + Me.lblUnderlineStyle.TabIndex = 14 + Me.lblUnderlineStyle.Text = "Style:" + ' + 'lblUnderlineColor + ' + Me.lblUnderlineColor.AutoSize = True + Me.lblUnderlineColor.Enabled = False + Me.lblUnderlineColor.Location = New System.Drawing.Point(300, 16) + Me.lblUnderlineColor.Name = "lblUnderlineColor" + Me.lblUnderlineColor.Size = New System.Drawing.Size(34, 13) + Me.lblUnderlineColor.TabIndex = 16 + Me.lblUnderlineColor.Text = "Color:" + ' + 'lblFontWeight + ' + Me.lblFontWeight.AutoSize = True + Me.lblFontWeight.Location = New System.Drawing.Point(297, 19) + Me.lblFontWeight.Name = "lblFontWeight" + Me.lblFontWeight.Size = New System.Drawing.Size(44, 13) + Me.lblFontWeight.TabIndex = 14 + Me.lblFontWeight.Text = "Weight:" + ' + 'grpBoxFont + ' + Me.grpBoxFont.Controls.Add(Me.ucrTxtFontSize) + Me.grpBoxFont.Controls.Add(Me.ucrCboFontWeight) + Me.grpBoxFont.Controls.Add(Me.lblFontWeight) + Me.grpBoxFont.Controls.Add(Me.lblFontFamily) + Me.grpBoxFont.Controls.Add(Me.ucrCboFontStyle) + Me.grpBoxFont.Controls.Add(Me.ucrCboFontFamily) + Me.grpBoxFont.Controls.Add(Me.lblFontStyle) + Me.grpBoxFont.Controls.Add(Me.lblFontSize) + Me.grpBoxFont.Location = New System.Drawing.Point(7, 6) + Me.grpBoxFont.Name = "grpBoxFont" + Me.grpBoxFont.Size = New System.Drawing.Size(594, 68) + Me.grpBoxFont.TabIndex = 26 + Me.grpBoxFont.TabStop = False + Me.grpBoxFont.Text = "Font" + ' + 'lblFontFamily + ' + Me.lblFontFamily.AutoSize = True + Me.lblFontFamily.Location = New System.Drawing.Point(6, 19) + Me.lblFontFamily.Name = "lblFontFamily" + Me.lblFontFamily.Size = New System.Drawing.Size(69, 13) + Me.lblFontFamily.TabIndex = 6 + Me.lblFontFamily.Text = "Type (family):" + ' + 'lblFontStyle + ' + Me.lblFontStyle.AutoSize = True + Me.lblFontStyle.Location = New System.Drawing.Point(151, 19) + Me.lblFontStyle.Name = "lblFontStyle" + Me.lblFontStyle.Size = New System.Drawing.Size(33, 13) + Me.lblFontStyle.TabIndex = 8 + Me.lblFontStyle.Text = "Style:" + ' + 'lblFontSize + ' + Me.lblFontSize.AutoSize = True + Me.lblFontSize.Location = New System.Drawing.Point(444, 19) + Me.lblFontSize.Name = "lblFontSize" + Me.lblFontSize.Size = New System.Drawing.Size(30, 13) + Me.lblFontSize.TabIndex = 10 + Me.lblFontSize.Text = "Size:" + ' + 'lblAlignVertical + ' + Me.lblAlignVertical.AutoSize = True + Me.lblAlignVertical.Location = New System.Drawing.Point(155, 20) + Me.lblAlignVertical.Name = "lblAlignVertical" + Me.lblAlignVertical.Size = New System.Drawing.Size(45, 13) + Me.lblAlignVertical.TabIndex = 20 + Me.lblAlignVertical.Text = "Vertical:" + ' + 'grpBoxOthers + ' + Me.grpBoxOthers.Controls.Add(Me.lblStretch) + Me.grpBoxOthers.Controls.Add(Me.ucrCboStretch) + Me.grpBoxOthers.Controls.Add(Me.lblWhiteSpace) + Me.grpBoxOthers.Controls.Add(Me.ucrCboWhiteSpace) + Me.grpBoxOthers.Controls.Add(Me.ucrTxtIndent) + Me.grpBoxOthers.Controls.Add(Me.lblIndent) + Me.grpBoxOthers.Controls.Add(Me.lblTransform) + Me.grpBoxOthers.Controls.Add(Me.ucrInputCboTransform) + Me.grpBoxOthers.Enabled = False + Me.grpBoxOthers.Location = New System.Drawing.Point(7, 409) + Me.grpBoxOthers.Name = "grpBoxOthers" + Me.grpBoxOthers.Size = New System.Drawing.Size(594, 65) + Me.grpBoxOthers.TabIndex = 30 + Me.grpBoxOthers.TabStop = False + Me.grpBoxOthers.Text = "Others" + ' + 'lblTransform + ' + Me.lblTransform.AutoSize = True + Me.lblTransform.Location = New System.Drawing.Point(6, 20) + Me.lblTransform.Name = "lblTransform" + Me.lblTransform.Size = New System.Drawing.Size(57, 13) + Me.lblTransform.TabIndex = 18 + Me.lblTransform.Text = "Transform:" + ' + 'lblIndent + ' + Me.lblIndent.AutoSize = True + Me.lblIndent.Location = New System.Drawing.Point(151, 20) + Me.lblIndent.Name = "lblIndent" + Me.lblIndent.Size = New System.Drawing.Size(40, 13) + Me.lblIndent.TabIndex = 19 + Me.lblIndent.Text = "Indent:" + ' + 'lblWhiteSpace + ' + Me.lblWhiteSpace.AutoSize = True + Me.lblWhiteSpace.Location = New System.Drawing.Point(300, 20) + Me.lblWhiteSpace.Name = "lblWhiteSpace" + Me.lblWhiteSpace.Size = New System.Drawing.Size(72, 13) + Me.lblWhiteSpace.TabIndex = 22 + Me.lblWhiteSpace.Text = "White Space:" + ' + 'lblStretch + ' + Me.lblStretch.AutoSize = True + Me.lblStretch.Location = New System.Drawing.Point(447, 20) + Me.lblStretch.Name = "lblStretch" + Me.lblStretch.Size = New System.Drawing.Size(44, 13) + Me.lblStretch.TabIndex = 24 + Me.lblStretch.Text = "Stretch:" + ' + 'ucrCboStretch + ' + Me.ucrCboStretch.AddQuotesIfUnrecognised = True + Me.ucrCboStretch.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboStretch.GetSetSelectedIndex = -1 + Me.ucrCboStretch.IsReadOnly = False + Me.ucrCboStretch.Location = New System.Drawing.Point(450, 36) + Me.ucrCboStretch.Name = "ucrCboStretch" + Me.ucrCboStretch.Size = New System.Drawing.Size(137, 21) + Me.ucrCboStretch.TabIndex = 23 + ' + 'ucrCboWhiteSpace + ' + Me.ucrCboWhiteSpace.AddQuotesIfUnrecognised = True + Me.ucrCboWhiteSpace.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboWhiteSpace.GetSetSelectedIndex = -1 + Me.ucrCboWhiteSpace.IsReadOnly = False + Me.ucrCboWhiteSpace.Location = New System.Drawing.Point(303, 36) + Me.ucrCboWhiteSpace.Name = "ucrCboWhiteSpace" + Me.ucrCboWhiteSpace.Size = New System.Drawing.Size(137, 21) + Me.ucrCboWhiteSpace.TabIndex = 21 + ' + 'ucrTxtIndent + ' + Me.ucrTxtIndent.AddQuotesIfUnrecognised = True + Me.ucrTxtIndent.AutoSize = True + Me.ucrTxtIndent.IsMultiline = False + Me.ucrTxtIndent.IsReadOnly = False + Me.ucrTxtIndent.Location = New System.Drawing.Point(154, 36) + Me.ucrTxtIndent.Name = "ucrTxtIndent" + Me.ucrTxtIndent.Size = New System.Drawing.Size(137, 21) + Me.ucrTxtIndent.TabIndex = 20 + ' + 'ucrInputCboTransform + ' + Me.ucrInputCboTransform.AddQuotesIfUnrecognised = True + Me.ucrInputCboTransform.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputCboTransform.GetSetSelectedIndex = -1 + Me.ucrInputCboTransform.IsReadOnly = False + Me.ucrInputCboTransform.Location = New System.Drawing.Point(9, 36) + Me.ucrInputCboTransform.Name = "ucrInputCboTransform" + Me.ucrInputCboTransform.Size = New System.Drawing.Size(137, 21) + Me.ucrInputCboTransform.TabIndex = 17 + ' + 'ucrCboColorBackground + ' + Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True + Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorBackground.GetSetSelectedIndex = -1 + Me.ucrCboColorBackground.IsReadOnly = False + Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) + Me.ucrCboColorBackground.Name = "ucrCboColorBackground" + Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorBackground.TabIndex = 18 + ' + 'ucrCboColorText + ' + Me.ucrCboColorText.AddQuotesIfUnrecognised = True + Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorText.GetSetSelectedIndex = -1 + Me.ucrCboColorText.IsReadOnly = False + Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) + Me.ucrCboColorText.Name = "ucrCboColorText" + Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorText.TabIndex = 17 + ' + 'ucrCboAlignVertical + ' + Me.ucrCboAlignVertical.AddQuotesIfUnrecognised = True + Me.ucrCboAlignVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboAlignVertical.GetSetSelectedIndex = -1 + Me.ucrCboAlignVertical.IsReadOnly = False + Me.ucrCboAlignVertical.Location = New System.Drawing.Point(158, 36) + Me.ucrCboAlignVertical.Name = "ucrCboAlignVertical" + Me.ucrCboAlignVertical.Size = New System.Drawing.Size(137, 21) + Me.ucrCboAlignVertical.TabIndex = 19 + ' + 'ucrCboAlignHorizontal + ' + Me.ucrCboAlignHorizontal.AddQuotesIfUnrecognised = True + Me.ucrCboAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboAlignHorizontal.GetSetSelectedIndex = -1 + Me.ucrCboAlignHorizontal.IsReadOnly = False + Me.ucrCboAlignHorizontal.Location = New System.Drawing.Point(9, 36) + Me.ucrCboAlignHorizontal.Name = "ucrCboAlignHorizontal" + Me.ucrCboAlignHorizontal.Size = New System.Drawing.Size(137, 21) + Me.ucrCboAlignHorizontal.TabIndex = 17 + ' + 'ucrCboUnderlineType + ' + Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True + Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 + Me.ucrCboUnderlineType.IsReadOnly = False + Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 32) + Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" + Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderlineType.TabIndex = 20 + ' + 'ucrCboUnderLineColor + ' + Me.ucrCboUnderLineColor.AddQuotesIfUnrecognised = True + Me.ucrCboUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderLineColor.Enabled = False + Me.ucrCboUnderLineColor.GetSetSelectedIndex = -1 + Me.ucrCboUnderLineColor.IsReadOnly = False + Me.ucrCboUnderLineColor.Location = New System.Drawing.Point(302, 32) + Me.ucrCboUnderLineColor.Name = "ucrCboUnderLineColor" + Me.ucrCboUnderLineColor.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderLineColor.TabIndex = 19 + ' + 'ucrCboUnderlineStyle + ' + Me.ucrCboUnderlineStyle.AddQuotesIfUnrecognised = True + Me.ucrCboUnderlineStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderlineStyle.Enabled = False + Me.ucrCboUnderlineStyle.GetSetSelectedIndex = -1 + Me.ucrCboUnderlineStyle.IsReadOnly = False + Me.ucrCboUnderlineStyle.Location = New System.Drawing.Point(157, 32) + Me.ucrCboUnderlineStyle.Name = "ucrCboUnderlineStyle" + Me.ucrCboUnderlineStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderlineStyle.TabIndex = 13 + ' + 'ucrTxtFontSize + ' + Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True + Me.ucrTxtFontSize.AutoSize = True + Me.ucrTxtFontSize.IsMultiline = False + Me.ucrTxtFontSize.IsReadOnly = False + Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) + Me.ucrTxtFontSize.Name = "ucrTxtFontSize" + Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) + Me.ucrTxtFontSize.TabIndex = 15 + ' + 'ucrCboFontWeight + ' + Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True + Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontWeight.GetSetSelectedIndex = -1 + Me.ucrCboFontWeight.IsReadOnly = False + Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) + Me.ucrCboFontWeight.Name = "ucrCboFontWeight" + Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontWeight.TabIndex = 13 + ' + 'ucrCboFontStyle + ' + Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True + Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontStyle.GetSetSelectedIndex = -1 + Me.ucrCboFontStyle.IsReadOnly = False + Me.ucrCboFontStyle.Location = New System.Drawing.Point(154, 35) + Me.ucrCboFontStyle.Name = "ucrCboFontStyle" + Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontStyle.TabIndex = 7 + ' + 'ucrCboFontFamily + ' + Me.ucrCboFontFamily.AddQuotesIfUnrecognised = True + Me.ucrCboFontFamily.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontFamily.GetSetSelectedIndex = -1 + Me.ucrCboFontFamily.IsReadOnly = False + Me.ucrCboFontFamily.Location = New System.Drawing.Point(9, 35) + Me.ucrCboFontFamily.Name = "ucrCboFontFamily" + Me.ucrCboFontFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontFamily.TabIndex = 5 + ' + 'ucrBaseSubdialog + ' + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(211, 479) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 25 + ' + 'grpBoxBorders + ' + Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderTop) + Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderBottom) + Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderRight) + Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderLeft) + Me.grpBoxBorders.Controls.Add(Me.lblBorderStyle) + Me.grpBoxBorders.Controls.Add(Me.ucrCboBorderStyle) + Me.grpBoxBorders.Controls.Add(Me.ucrCboBorderWeight) + Me.grpBoxBorders.Controls.Add(Me.ucrCboBorderColor) + Me.grpBoxBorders.Controls.Add(Me.lblBorderWeight) + Me.grpBoxBorders.Controls.Add(Me.lblBorderColor) + Me.grpBoxBorders.Controls.Add(Me.lblBordersSides) + Me.grpBoxBorders.Enabled = False + Me.grpBoxBorders.Location = New System.Drawing.Point(7, 295) + Me.grpBoxBorders.Name = "grpBoxBorders" + Me.grpBoxBorders.Size = New System.Drawing.Size(594, 109) + Me.grpBoxBorders.TabIndex = 31 + Me.grpBoxBorders.TabStop = False + Me.grpBoxBorders.Text = "Borders" + ' + 'lblBordersSides + ' + Me.lblBordersSides.AutoSize = True + Me.lblBordersSides.Location = New System.Drawing.Point(6, 20) + Me.lblBordersSides.Name = "lblBordersSides" + Me.lblBordersSides.Size = New System.Drawing.Size(36, 13) + Me.lblBordersSides.TabIndex = 18 + Me.lblBordersSides.Text = "Sides:" + ' + 'ucrCboBorderColor + ' + Me.ucrCboBorderColor.AddQuotesIfUnrecognised = True + Me.ucrCboBorderColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboBorderColor.Enabled = False + Me.ucrCboBorderColor.GetSetSelectedIndex = -1 + Me.ucrCboBorderColor.IsReadOnly = False + Me.ucrCboBorderColor.Location = New System.Drawing.Point(302, 36) + Me.ucrCboBorderColor.Name = "ucrCboBorderColor" + Me.ucrCboBorderColor.Size = New System.Drawing.Size(137, 21) + Me.ucrCboBorderColor.TabIndex = 23 + ' + 'lblBorderColor + ' + Me.lblBorderColor.AutoSize = True + Me.lblBorderColor.Enabled = False + Me.lblBorderColor.Location = New System.Drawing.Point(300, 20) + Me.lblBorderColor.Name = "lblBorderColor" + Me.lblBorderColor.Size = New System.Drawing.Size(34, 13) + Me.lblBorderColor.TabIndex = 22 + Me.lblBorderColor.Text = "Color:" + ' + 'ucrCboBorderWeight + ' + Me.ucrCboBorderWeight.AddQuotesIfUnrecognised = True + Me.ucrCboBorderWeight.AutoSize = True + Me.ucrCboBorderWeight.IsMultiline = False + Me.ucrCboBorderWeight.IsReadOnly = False + Me.ucrCboBorderWeight.Location = New System.Drawing.Point(450, 36) + Me.ucrCboBorderWeight.Name = "ucrCboBorderWeight" + Me.ucrCboBorderWeight.Size = New System.Drawing.Size(137, 21) + Me.ucrCboBorderWeight.TabIndex = 22 + ' + 'lblBorderWeight + ' + Me.lblBorderWeight.AutoSize = True + Me.lblBorderWeight.Location = New System.Drawing.Point(447, 20) + Me.lblBorderWeight.Name = "lblBorderWeight" + Me.lblBorderWeight.Size = New System.Drawing.Size(44, 13) + Me.lblBorderWeight.TabIndex = 21 + Me.lblBorderWeight.Text = "Weight:" + ' + 'lblBorderStyle + ' + Me.lblBorderStyle.AutoSize = True + Me.lblBorderStyle.Enabled = False + Me.lblBorderStyle.Location = New System.Drawing.Point(299, 65) + Me.lblBorderStyle.Name = "lblBorderStyle" + Me.lblBorderStyle.Size = New System.Drawing.Size(33, 13) + Me.lblBorderStyle.TabIndex = 25 + Me.lblBorderStyle.Text = "Style:" + ' + 'ucrCboBorderStyle + ' + Me.ucrCboBorderStyle.AddQuotesIfUnrecognised = True + Me.ucrCboBorderStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboBorderStyle.Enabled = False + Me.ucrCboBorderStyle.GetSetSelectedIndex = -1 + Me.ucrCboBorderStyle.IsReadOnly = False + Me.ucrCboBorderStyle.Location = New System.Drawing.Point(305, 81) + Me.ucrCboBorderStyle.Name = "ucrCboBorderStyle" + Me.ucrCboBorderStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboBorderStyle.TabIndex = 24 + ' + 'ucrChkBorderLeft + ' + Me.ucrChkBorderLeft.AutoSize = True + Me.ucrChkBorderLeft.Checked = False + Me.ucrChkBorderLeft.Location = New System.Drawing.Point(9, 36) + Me.ucrChkBorderLeft.Name = "ucrChkBorderLeft" + Me.ucrChkBorderLeft.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderLeft.TabIndex = 26 + ' + 'ucrChkBorderRight + ' + Me.ucrChkBorderRight.AutoSize = True + Me.ucrChkBorderRight.Checked = False + Me.ucrChkBorderRight.Location = New System.Drawing.Point(9, 65) + Me.ucrChkBorderRight.Name = "ucrChkBorderRight" + Me.ucrChkBorderRight.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderRight.TabIndex = 27 + ' + 'ucrChkBorderBottom + ' + Me.ucrChkBorderBottom.AutoSize = True + Me.ucrChkBorderBottom.Checked = False + Me.ucrChkBorderBottom.Location = New System.Drawing.Point(115, 63) + Me.ucrChkBorderBottom.Name = "ucrChkBorderBottom" + Me.ucrChkBorderBottom.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderBottom.TabIndex = 28 + ' + 'ucrChkBorderTop + ' + Me.ucrChkBorderTop.AutoSize = True + Me.ucrChkBorderTop.Checked = False + Me.ucrChkBorderTop.Location = New System.Drawing.Point(115, 34) + Me.ucrChkBorderTop.Name = "ucrChkBorderTop" + Me.ucrChkBorderTop.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderTop.TabIndex = 29 + ' + 'sdgTableStyles + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(607, 517) + Me.Controls.Add(Me.grpBoxBorders) + Me.Controls.Add(Me.grpBoxOthers) + Me.Controls.Add(Me.grpBoxColor) + Me.Controls.Add(Me.grpBoxAlignment) + Me.Controls.Add(Me.grpBoxUnderline) + Me.Controls.Add(Me.grpBoxFont) + Me.Controls.Add(Me.ucrBaseSubdialog) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgTableStyles" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Format Text" + Me.grpBoxColor.ResumeLayout(False) + Me.grpBoxColor.PerformLayout() + Me.grpBoxAlignment.ResumeLayout(False) + Me.grpBoxAlignment.PerformLayout() + Me.grpBoxUnderline.ResumeLayout(False) + Me.grpBoxUnderline.PerformLayout() + Me.grpBoxFont.ResumeLayout(False) + Me.grpBoxFont.PerformLayout() + Me.grpBoxOthers.ResumeLayout(False) + Me.grpBoxOthers.PerformLayout() + Me.grpBoxBorders.ResumeLayout(False) + Me.grpBoxBorders.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrCboColorBackground As ucrColors + Friend WithEvents ucrCboColorText As ucrColors + Friend WithEvents Label2 As Label + Friend WithEvents grpBoxColor As GroupBox + Friend WithEvents lblFill As Label + Friend WithEvents ucrCboAlignHorizontal As ucrInputComboBox + Friend WithEvents grpBoxAlignment As GroupBox + Friend WithEvents lblAlignHorizontal As Label + Friend WithEvents lblUnderlineType As Label + Friend WithEvents ucrCboUnderlineType As ucrInputComboBox + Friend WithEvents ucrCboUnderLineColor As ucrColors + Friend WithEvents ucrCboUnderlineStyle As ucrInputComboBox + Friend WithEvents grpBoxUnderline As GroupBox + Friend WithEvents lblUnderlineStyle As Label + Friend WithEvents lblUnderlineColor As Label + Friend WithEvents ucrTxtFontSize As ucrInputTextBox + Friend WithEvents ucrCboFontWeight As ucrInputComboBox + Friend WithEvents lblFontWeight As Label + Friend WithEvents ucrCboFontStyle As ucrInputComboBox + Friend WithEvents grpBoxFont As GroupBox + Friend WithEvents lblFontFamily As Label + Friend WithEvents ucrCboFontFamily As ucrInputComboBox + Friend WithEvents lblFontStyle As Label + Friend WithEvents lblFontSize As Label + Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue + Friend WithEvents lblAlignVertical As Label + Friend WithEvents ucrCboAlignVertical As ucrInputComboBox + Friend WithEvents grpBoxOthers As GroupBox + Friend WithEvents lblTransform As Label + Friend WithEvents ucrInputCboTransform As ucrInputComboBox + Friend WithEvents ucrTxtIndent As ucrInputTextBox + Friend WithEvents lblIndent As Label + Friend WithEvents lblWhiteSpace As Label + Friend WithEvents ucrCboWhiteSpace As ucrInputComboBox + Friend WithEvents lblStretch As Label + Friend WithEvents ucrCboStretch As ucrInputComboBox + Friend WithEvents grpBoxBorders As GroupBox + Friend WithEvents lblBordersSides As Label + Friend WithEvents lblBorderStyle As Label + Friend WithEvents ucrCboBorderStyle As ucrInputComboBox + Friend WithEvents ucrCboBorderWeight As ucrInputTextBox + Friend WithEvents ucrCboBorderColor As ucrColors + Friend WithEvents lblBorderWeight As Label + Friend WithEvents lblBorderColor As Label + Friend WithEvents ucrChkBorderTop As ucrCheck + Friend WithEvents ucrChkBorderBottom As ucrCheck + Friend WithEvents ucrChkBorderRight As ucrCheck + Friend WithEvents ucrChkBorderLeft As ucrCheck +End Class diff --git a/instat/UserTables/sdgTableStyles.resx b/instat/UserTables/sdgTableStyles.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/sdgTableStyles.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb new file mode 100644 index 00000000000..bcfaf33363f --- /dev/null +++ b/instat/UserTables/sdgTableStyles.vb @@ -0,0 +1,264 @@ +Imports instat.Translations + +Public Class sdgTableStyles + + Private clsCellTextRFunction, clsCellFillRFunction As New RFunction + Private bFirstload As Boolean = True + + Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + End Sub + + Private Sub InitialiseDialog() + + '----------------- + ucrCboColorText.SetDropDownStyleAsNonEditable() + ucrCboColorText.SetParameter(New RParameter("color", iNewPosition:=0)) + ucrCboColorText.SetColours() + ucrCboColorText.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctFontFamily As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Arial (sans-serif)", Chr(34) & "Arial, sans-serif" & Chr(34)}, + {"Verdana (sans-serif)", Chr(34) & "Verdana, sans-serif" & Chr(34)}, + {"Tahoma", Chr(34) & "Tahoma, sans-serif" & Chr(34)}, + {"Trebuchet MS", Chr(34) & "'Trebuchet MS', sans-serif" & Chr(34)}, + {"Times New Roman (serif)", Chr(34) & "'Times New Roman', serif" & Chr(34)}, + {"Georgia (serif)", Chr(34) & "Georgia, serif" & Chr(34)}, + {"Garamond (serif)", Chr(34) & "Garamond, serif" & Chr(34)} + } + ucrCboFontFamily.SetDropDownStyleAsNonEditable() + ucrCboFontFamily.SetParameter(New RParameter("font", iNewPosition:=1)) + ucrCboFontFamily.SetItems(dctFontFamily) + ucrCboFontFamily.SetRDefault("NULL") + '----------------- + + '----------------- + ucrTxtFontSize.SetParameter(New RParameter("size", iNewPosition:=2)) + ucrTxtFontSize.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctAlignHorizontal As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Center", Chr(34) & "center" & Chr(34)}, + {"Left", Chr(34) & "left" & Chr(34)}, + {"Right", Chr(34) & "right" & Chr(34)}, + {"Justify", Chr(34) & "justify" & Chr(34)} + } + ucrCboAlignHorizontal.SetDropDownStyleAsNonEditable() + ucrCboAlignHorizontal.SetParameter(New RParameter("align", iNewPosition:=3)) + ucrCboAlignHorizontal.SetItems(dctAlignHorizontal) + ucrCboAlignHorizontal.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctAlignVertical As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Middle", Chr(34) & "middle" & Chr(34)}, + {"Top", Chr(34) & "top" & Chr(34)}, + {"Bottom", Chr(34) & "bottom" & Chr(34)} + } + ucrCboAlignVertical.SetDropDownStyleAsNonEditable() + ucrCboAlignVertical.SetParameter(New RParameter("align", iNewPosition:=4)) + ucrCboAlignVertical.SetItems(dctAlignHorizontal) + ucrCboAlignVertical.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctFontStyle As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Normal", Chr(34) & "normal" & Chr(34)}, + {"Italic", Chr(34) & "italic" & Chr(34)}, + {"Oblique", Chr(34) & "oblique" & Chr(34)} + } + + ucrCboFontStyle.SetDropDownStyleAsNonEditable() + ucrCboFontStyle.SetParameter(New RParameter("style", iNewPosition:=5)) + ucrCboFontStyle.SetItems(dctFontStyle) + ucrCboFontStyle.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctFontWeight As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Normal", Chr(34) & "normal" & Chr(34)}, + {"Bold", Chr(34) & "bold" & Chr(34)}, + {"Lighter", Chr(34) & "lighter" & Chr(34)}, + {"Bolder", Chr(34) & "bold" & Chr(34)} + } + + ucrCboFontWeight.SetDropDownStyleAsNonEditable() + ucrCboFontWeight.SetParameter(New RParameter("weight", iNewPosition:=7)) + ucrCboFontWeight.SetItems(dctFontWeight) + ucrCboFontWeight.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctUnderlineType As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Underline", Chr(34) & "underline" & Chr(34)}, + {"Overline", Chr(34) & "overline" & Chr(34)}, + {"Line-through", Chr(34) & "line-through" & Chr(34)} + } + ucrCboUnderlineType.SetDropDownStyleAsNonEditable() + ucrCboUnderlineType.SetParameter(New RParameter("decorate", iNewPosition:=8)) + ucrCboUnderlineType.SetItems(dctUnderlineType) + ucrCboUnderlineType.SetRDefault("NULL") + + + 'Dim dctUnderlineStyle As New Dictionary(Of String, String) From { + ' {"Default", "NULL"}, + ' {"Solid", Chr(34) & "solid" & Chr(34)}, + ' {"Double", Chr(34) & "double" & Chr(34)}, + ' {"Dotted", Chr(34) & "dotted" & Chr(34)}, + ' {"Dashed", Chr(34) & "dashed" & Chr(34)}, + ' {"Wavy", Chr(34) & "wavy" & Chr(34)} + '} + 'ucrCboUnderlineStyle.SetDropDownStyleAsNonEditable() + 'ucrCboUnderlineStyle.SetParameter(New RParameter("text.decoration.style")) + 'ucrCboUnderlineStyle.SetItems(dctUnderlineStyle) + 'ucrCboUnderlineStyle.SetRDefault("NULL") + + 'ucrCboUnderLineColor.SetDropDownStyleAsNonEditable() + 'ucrCboUnderLineColor.SetParameter(New RParameter("text.decoration.color")) + 'ucrCboUnderLineColor.SetColours() + 'ucrCboUnderLineColor.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctTransform As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Uppercase", Chr(34) & "uppercase" & Chr(34)}, + {"Lowercase", Chr(34) & "lowercase" & Chr(34)}, + {"Capitalize", Chr(34) & "capitalize" & Chr(34)} + } + ucrInputCboTransform.SetDropDownStyleAsNonEditable() + ucrInputCboTransform.SetParameter(New RParameter("transform", iNewPosition:=9)) + ucrInputCboTransform.SetItems(dctTransform) + ucrInputCboTransform.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctStretch As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Ultra-condensed", Chr(34) & "ultra-condensed" & Chr(34)}, + {"Extra-condensed", Chr(34) & "extra-condensed" & Chr(34)}, + {"Condensed", Chr(34) & "condensed" & Chr(34)}, + {"Semi-condensed", Chr(34) & "semi-condensed" & Chr(34)}, + {"normal", Chr(34) & "normal" & Chr(34)}, + {"Semi-expanded", Chr(34) & "semi-expanded" & Chr(34)}, + {"Expanded", Chr(34) & "expanded" & Chr(34)}, + {"Extra-expanded", Chr(34) & "extra-expanded" & Chr(34)}, + {"Ultra-expanded", Chr(34) & "ultra-expanded" & Chr(34)} + } + ucrCboStretch.SetDropDownStyleAsNonEditable() + ucrCboStretch.SetParameter(New RParameter("stretch", iNewPosition:=10)) + ucrCboStretch.SetItems(dctStretch) + ucrCboStretch.SetRDefault("NULL") + '----------------- + + '----------------- + ucrTxtIndent.SetParameter(New RParameter("indent", iNewPosition:=11)) + ucrTxtIndent.SetRDefault("NULL") + '----------------- + + '----------------- + Dim dctWhiteSpace As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Normal", Chr(34) & "normal" & Chr(34)}, + {"No wrap", Chr(34) & "nowrap" & Chr(34)}, + {"Pre", Chr(34) & "pre" & Chr(34)}, + {"Pre-wrap", Chr(34) & "pre-wrap" & Chr(34)}, + {"Pre-line", Chr(34) & "pre-line" & Chr(34)}, + {"Break-spaces", Chr(34) & "break-spaces" & Chr(34)} + } + ucrCboStretch.SetDropDownStyleAsNonEditable() + ucrCboStretch.SetParameter(New RParameter("transform", iNewPosition:=11)) + ucrCboStretch.SetItems(dctWhiteSpace) + ucrCboStretch.SetRDefault("NULL") + '----------------- + + '--------------------------------------------------- + ' Cell fill controls + ucrCboColorBackground.SetDropDownStyleAsNonEditable() + ucrCboColorBackground.SetParameter(New RParameter("color", iNewPosition:=0)) + ucrCboColorBackground.SetColours() + ucrCboColorBackground.SetRDefault("NULL") + '----------------- + + '--------------------------------------------------- + ' Cell Border + '----------------- + Dim dctBorderSpace As New Dictionary(Of String, String) From { + {"Default", "NULL"}, + {"Left", Chr(34) & "left" & Chr(34)}, + {"Right", Chr(34) & "right" & Chr(34)}, + {"Top", Chr(34) & "top" & Chr(34)}, + {"Bottom", Chr(34) & "bottom" & Chr(34)} + } + 'ucrCboBorderSides.SetParameter(New RParameter("sides", iNewPosition:=0)) + 'ucrCboBorderSides.SetRDefault("NULL") + + + + '----------------- + ucrCboColorBackground.SetDropDownStyleAsNonEditable() + ucrCboColorBackground.SetParameter(New RParameter("color", iNewPosition:=0)) + ucrCboColorBackground.SetColours() + ucrCboColorBackground.SetRDefault("NULL") + + '----------------- + + + + End Sub + + Public Sub Setup() + + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + clsCellTextRFunction = New RFunction + clsCellFillRFunction = New RFunction + + clsCellTextRFunction.SetRCommand("cell_fill") + clsCellTextRFunction.SetRCommand("cell_text") + + + + SetRCode() + + End Sub + + Private Sub SetRCode() + '----------------- + ' Cell text controls + ucrCboFontFamily.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboFontStyle.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboFontWeight.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrTxtFontSize.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboColorText.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboUnderlineType.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + 'ucrCboUnderlineStyle.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + 'ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboAlignHorizontal.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboAlignVertical.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrInputCboTransform.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrTxtFontSize.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboWhiteSpace.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboStretch.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + '----------------- + + '----------------- + 'Cell fill controls + ucrCboColorBackground.SetRCode(clsCellFillRFunction, bReset:=False, bCloneIfNeeded:=True) + '----------------- + + + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 1089080d18e..58c7326eea8 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -397,6 +397,12 @@ UserControl + + ucrCellStyles.vb + + + UserControl + dlgGeneralTable.vb @@ -3134,6 +3140,12 @@ UserControl + + sdgTableStyles.vb + + + Form + ucrSourceNotes.vb @@ -3357,6 +3369,9 @@ ucrCellFormats.vb + + ucrCellStyles.vb + dlgGeneralTable.vb @@ -5491,6 +5506,9 @@ ucrRowSummary.vb + + sdgTableStyles.vb + ucrSourceNotes.vb From 6aeed765ce02f34eb71a45d7cb1d03204e065797 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 20 Jun 2024 17:18:54 +0300 Subject: [PATCH 054/273] Structural changes --- instat/UserTables/sdgTableStyles.vb | 36 ++++++++++++++++++----------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb index bcfaf33363f..c25cb3ce7ff 100644 --- a/instat/UserTables/sdgTableStyles.vb +++ b/instat/UserTables/sdgTableStyles.vb @@ -192,23 +192,33 @@ Public Class sdgTableStyles '--------------------------------------------------- ' Cell Border '----------------- - Dim dctBorderSpace As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Left", Chr(34) & "left" & Chr(34)}, - {"Right", Chr(34) & "right" & Chr(34)}, - {"Top", Chr(34) & "top" & Chr(34)}, - {"Bottom", Chr(34) & "bottom" & Chr(34)} - } - 'ucrCboBorderSides.SetParameter(New RParameter("sides", iNewPosition:=0)) - 'ucrCboBorderSides.SetRDefault("NULL") + ucrChkBorderLeft.SetText("Left") + ucrChkBorderLeft.SetParameter(New RParameter("left", iNewPosition:=0, bNewIncludeArgumentName:=False)) + ucrChkBorderLeft.SetValuesCheckedAndUnchecked("left", "NULL") + ucrChkBorderLeft.SetRDefault("NULL") + ucrChkBorderRight.SetText("Right") + ucrChkBorderRight.SetParameter(New RParameter("right", iNewPosition:=1, bNewIncludeArgumentName:=False)) + ucrChkBorderRight.SetValuesCheckedAndUnchecked("right", "NULL") + ucrChkBorderRight.SetRDefault("NULL") + ucrChkBorderTop.SetText("Top") + ucrChkBorderTop.SetParameter(New RParameter("top", iNewPosition:=2, bNewIncludeArgumentName:=False)) + ucrChkBorderTop.SetValuesCheckedAndUnchecked("top", "NULL") + ucrChkBorderTop.SetRDefault("NULL") + + ucrChkBorderBottom.SetText("Bottom") + ucrChkBorderBottom.SetParameter(New RParameter("bottom", iNewPosition:=3, bNewIncludeArgumentName:=False)) + ucrChkBorderBottom.SetValuesCheckedAndUnchecked("bottom", "NULL") + ucrChkBorderBottom.SetRDefault("NULL") '----------------- - ucrCboColorBackground.SetDropDownStyleAsNonEditable() - ucrCboColorBackground.SetParameter(New RParameter("color", iNewPosition:=0)) - ucrCboColorBackground.SetColours() - ucrCboColorBackground.SetRDefault("NULL") + ucrCboBorderColor.SetDropDownStyleAsNonEditable() + ucrCboBorderColor.SetParameter(New RParameter("color", iNewPosition:=1)) + ucrCboBorderColor.SetColours() + ucrCboBorderColor.SetRDefault("NULL") + + ' Left here '----------------- From 8115082097d5c24db3b104ec2d44f85232c30ce0 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 24 Jun 2024 12:35:38 +0300 Subject: [PATCH 055/273] Made changes to cells styles --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 6 +- .../Number/sdgCellFormatNumberOptions.vb | 4 +- .../Formats/Text/sdgCellFormatTextOptions.vb | 4 +- .../Cells/Formats/ucrCellFormats.vb | 5 +- .../Cells/Styles/ucrCellStyles.Designer.vb | 63 +- .../Cells/Styles/ucrCellStyles.resx | 3 - .../UserTables/Cells/Styles/ucrCellStyles.vb | 66 +- instat/UserTables/Cells/ucrCells.vb | 3 +- instat/UserTables/clsTablesUtils.vb | 1 + instat/UserTables/sdgTableOptions.vb | 2 +- instat/UserTables/sdgTableStyles.Designer.vb | 645 ++++++++---------- instat/UserTables/sdgTableStyles.vb | 150 +++- 12 files changed, 484 insertions(+), 468 deletions(-) diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb index bb4aeb913f1..7ccc053394c 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -37,7 +37,7 @@ Partial Class ucrCellsFootNotes Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(4, 22) + Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(0, 18) Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" Me.dataGridCellFooterNotes.RowHeadersWidth = 62 Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 55) @@ -78,7 +78,7 @@ Partial Class ucrCellsFootNotes 'lblFooterCellNotes ' Me.lblFooterCellNotes.AutoSize = True - Me.lblFooterCellNotes.Location = New System.Drawing.Point(7, 4) + Me.lblFooterCellNotes.Location = New System.Drawing.Point(3, 0) Me.lblFooterCellNotes.Name = "lblFooterCellNotes" Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) Me.lblFooterCellNotes.TabIndex = 6 @@ -91,7 +91,7 @@ Partial Class ucrCellsFootNotes Me.Controls.Add(Me.dataGridCellFooterNotes) Me.Controls.Add(Me.lblFooterCellNotes) Me.Name = "ucrCellsFootNotes" - Me.Size = New System.Drawing.Size(641, 270) + Me.Size = New System.Drawing.Size(637, 77) CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb index 6c63ccb8958..8c944238b12 100644 --- a/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb +++ b/instat/UserTables/Cells/Formats/Number/sdgCellFormatNumberOptions.vb @@ -33,7 +33,7 @@ ucrChkSignificantFigures.SetText("Change Significant Figures") ucrChkSignificantFigures.AddToLinkedControls(ucrNudSignificantFigures, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True) - ucrNudSignificantFigures.SetParameter(New RParameter(" n_sigfig", 4)) + ucrNudSignificantFigures.SetParameter(New RParameter("n_sigfig", 4)) '-------------- @@ -48,7 +48,7 @@ ucrChkSeparatorMark.SetText("Change Digits Separator Mark") ucrChkSeparatorMark.AddToLinkedControls(ucrInputSeperatorMark, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=",") - ucrInputSeperatorMark.SetParameter(New RParameter(" sep_mark", 14)) + ucrInputSeperatorMark.SetParameter(New RParameter("sep_mark", 14)) '--------------- '--------------- diff --git a/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb index 8c03f664de0..01ad42ce4a1 100644 --- a/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb +++ b/instat/UserTables/Cells/Formats/Text/sdgCellFormatTextOptions.vb @@ -1,4 +1,5 @@ -Public Class sdgCellFormatTextOptions +Imports instat.Translations +Public Class sdgCellFormatTextOptions Private clsUnitsFormatRFunction, clsCustomFormatRFunction As New RFunction Private bFirstload As Boolean = True Private bUserMadeChanges As Boolean = False @@ -15,6 +16,7 @@ bUserMadeChanges = False bUserClickedReturn = False + autoTranslate(Me) End Sub Private Sub InitialiseDialog() diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb index a73c709a92a..bdc5e012c3c 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -61,7 +61,7 @@ Next End Sub - Private Sub ucrReceiverMultipleCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlValueChanged + Private Sub ucrReceiverMultipleCols_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged btnEnterFormat.Enabled = Not ucrReceiverMultipleCols.IsEmpty End Sub @@ -70,15 +70,14 @@ If cboSelectFormat.Text = "Text" Then sdgCellFormatTextOptions.ShowDialog(Me.ParentForm) clsFormatRFunction = sdgCellFormatTextOptions.GetNewUserInputAsRFunction() - ElseIf cboSelectFormat.Text = "Number" Then sdgCellFormatNumberOptions.ShowDialog(Me.ParentForm) clsFormatRFunction = sdgCellFormatNumberOptions.GetNewUserInputAsRFunction() - ElseIf cboSelectFormat.Text = "Date" Then sdgCellFormatDateOptions.ShowDialog(Me.ParentForm) clsFormatRFunction = sdgCellFormatDateOptions.GetNewUserInputAsRFunction() ElseIf cboSelectFormat.Text = "Missing" Then + ' TODO End If If clsFormatRFunction Is Nothing Then diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb index 46fe7f4b36d..7171cf101b5 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb @@ -23,7 +23,6 @@ Partial Class ucrCellStyles _ Private Sub InitializeComponent() Me.lblRowExpression = New System.Windows.Forms.Label() - Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() Me.ucrInputRows = New instat.ucrInputTextBox() Me.lblFormats = New System.Windows.Forms.Label() Me.btnClearFormats = New System.Windows.Forms.Button() @@ -31,8 +30,8 @@ Partial Class ucrCellStyles Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGridFormats = New System.Windows.Forms.DataGridView() Me.btnEnterStyle = New System.Windows.Forms.Button() + Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCells = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -40,32 +39,19 @@ Partial Class ucrCellStyles ' Me.lblRowExpression.AutoSize = True Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowExpression.Location = New System.Drawing.Point(239, 87) + Me.lblRowExpression.Location = New System.Drawing.Point(239, 53) Me.lblRowExpression.Name = "lblRowExpression" Me.lblRowExpression.Size = New System.Drawing.Size(86, 13) Me.lblRowExpression.TabIndex = 329 Me.lblRowExpression.Text = "Row Expression:" ' - 'ucrReceiverMultipleCols - ' - Me.ucrReceiverMultipleCols.AutoSize = True - Me.ucrReceiverMultipleCols.frmParent = Nothing - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(242, 23) - Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" - Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 55) - Me.ucrReceiverMultipleCols.strNcFilePath = "" - Me.ucrReceiverMultipleCols.TabIndex = 327 - Me.ucrReceiverMultipleCols.ucrSelector = Nothing - ' 'ucrInputRows ' Me.ucrInputRows.AddQuotesIfUnrecognised = True Me.ucrInputRows.AutoSize = True Me.ucrInputRows.IsMultiline = False Me.ucrInputRows.IsReadOnly = False - Me.ucrInputRows.Location = New System.Drawing.Point(242, 103) + Me.ucrInputRows.Location = New System.Drawing.Point(242, 69) Me.ucrInputRows.Name = "ucrInputRows" Me.ucrInputRows.Size = New System.Drawing.Size(137, 21) Me.ucrInputRows.TabIndex = 328 @@ -74,7 +60,7 @@ Partial Class ucrCellStyles ' Me.lblFormats.AutoSize = True Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFormats.Location = New System.Drawing.Point(239, 167) + Me.lblFormats.Location = New System.Drawing.Point(239, 134) Me.lblFormats.Name = "lblFormats" Me.lblFormats.Size = New System.Drawing.Size(38, 13) Me.lblFormats.TabIndex = 326 @@ -83,7 +69,7 @@ Partial Class ucrCellStyles 'btnClearFormats ' Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearFormats.Location = New System.Drawing.Point(523, 158) + Me.btnClearFormats.Location = New System.Drawing.Point(523, 125) Me.btnClearFormats.Name = "btnClearFormats" Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) Me.btnClearFormats.TabIndex = 325 @@ -117,8 +103,8 @@ Partial Class ucrCellStyles ' Me.dataGridFormats.AllowUserToAddRows = False Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles, Me.colCells}) - Me.dataGridFormats.Location = New System.Drawing.Point(242, 184) + Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) + Me.dataGridFormats.Location = New System.Drawing.Point(242, 151) Me.dataGridFormats.Name = "dataGridFormats" Me.dataGridFormats.RowHeadersWidth = 62 Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) @@ -128,7 +114,7 @@ Partial Class ucrCellStyles ' Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEnterStyle.Location = New System.Drawing.Point(242, 135) + Me.btnEnterStyle.Location = New System.Drawing.Point(242, 101) Me.btnEnterStyle.Name = "btnEnterStyle" Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) Me.btnEnterStyle.TabIndex = 323 @@ -136,28 +122,32 @@ Partial Class ucrCellStyles Me.btnEnterStyle.Text = "Enter Style" Me.btnEnterStyle.UseVisualStyleBackColor = True ' + 'ucrReceiverSingleCol + ' + Me.ucrReceiverSingleCol.AutoSize = True + Me.ucrReceiverSingleCol.frmParent = Nothing + Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(242, 20) + Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" + Me.ucrReceiverSingleCol.Selector = Nothing + Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSingleCol.strNcFilePath = "" + Me.ucrReceiverSingleCol.TabIndex = 330 + Me.ucrReceiverSingleCol.ucrSelector = Nothing + ' 'colStyles ' - Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colStyles.HeaderText = "Style" + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Style Expressions" Me.colStyles.MinimumWidth = 8 Me.colStyles.Name = "colStyles" - Me.colStyles.Width = 55 - ' - 'colCells - ' - Me.colCells.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCells.HeaderText = "Cell(s)" - Me.colCells.MinimumWidth = 8 - Me.colCells.Name = "colCells" - Me.colCells.Width = 60 ' 'ucrCellStyles ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrReceiverSingleCol) Me.Controls.Add(Me.lblRowExpression) - Me.Controls.Add(Me.ucrReceiverMultipleCols) Me.Controls.Add(Me.ucrInputRows) Me.Controls.Add(Me.lblFormats) Me.Controls.Add(Me.btnClearFormats) @@ -166,7 +156,7 @@ Partial Class ucrCellStyles Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridFormats) Me.Name = "ucrCellStyles" - Me.Size = New System.Drawing.Size(609, 264) + Me.Size = New System.Drawing.Size(609, 231) CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -174,7 +164,6 @@ Partial Class ucrCellStyles End Sub Friend WithEvents lblRowExpression As Label - Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents ucrInputRows As ucrInputTextBox Friend WithEvents lblFormats As Label Friend WithEvents btnClearFormats As Button @@ -182,6 +171,6 @@ Partial Class ucrCellStyles Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents dataGridFormats As DataGridView Friend WithEvents btnEnterStyle As Button + Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle Friend WithEvents colStyles As DataGridViewTextBoxColumn - Friend WithEvents colCells As DataGridViewTextBoxColumn End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.resx b/instat/UserTables/Cells/Styles/ucrCellStyles.resx index 11d31b5f1bf..d937ee32b35 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.resx +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.resx @@ -120,7 +120,4 @@ True - - True - \ No newline at end of file diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.vb index 460bb72fa90..df0c482faef 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.vb @@ -3,8 +3,8 @@ Private bFirstload As Boolean = True Private Sub InitialiseControl() - ucrReceiverMultipleCols.Selector = ucrSelectorCols - ucrReceiverMultipleCols.SetMeAsReceiver() + ucrReceiverSingleCol.Selector = ucrSelectorCols + ucrReceiverSingleCol.SetMeAsReceiver() End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -25,7 +25,12 @@ End Sub Public Sub SetValuesToOperator() - clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) + + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_style", "locations", "cells_body", clsOperator) + For Each clsRParam As RParameter In lstRParams + clsOperator.RemoveParameter(clsRParam) + Next + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) End Sub @@ -33,19 +38,10 @@ For Each clsRParam As RParameter In lstRParams - Dim clsFormatRFunction As RFunction = clsRParam.clsArgumentCodeStructure - ' Create a new row that represents the tab_style() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridFormats) - - For Each clsRowGroupRParam As RParameter In clsFormatRFunction.clsParameters - If clsRowGroupRParam.strArgumentName = "style" Then - row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) - ElseIf clsRowGroupRParam.strArgumentName = "locations" Then - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) - End If - Next + row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript ' Tag and add the tab_style() parameter function contents as a row row.Tag = clsRParam @@ -54,50 +50,54 @@ Next End Sub - Private Sub ucrReceiverMultipleCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlValueChanged, ucrInputRows.ControlValueChanged - btnEnterStyle.Enabled = Not ucrReceiverMultipleCols.IsEmpty AndAlso Not ucrInputRows.IsEmpty + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRows.ControlContentsChanged, ucrReceiverSingleCol.ControlContentsChanged + btnEnterStyle.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputRows.IsEmpty End Sub Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click - Dim clsFormatRFunction As RFunction = Nothing - sdgTableStyles.Setup() + sdgTableStyles.ShowDialog(Me.ParentForm) - 'clsFormatRFunction = sdgCellFormatTextOptions.GetNewUserInputAsRFunction() + Dim clsListStyleRFunction As RFunction = sdgTableStyles.GetNewUserInputAsRFunction() - 'If clsFormatRFunction Is Nothing Then - ' Exit Sub - 'End If + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If - 'AddFormatParameterToGrid(clsFormatRFunction) - 'ucrReceiverMultipleCols.Clear() - 'ucrInputRows.SetName("") + AddFormatParameterToGrid(clsListStyleRFunction) End Sub - Private Sub AddFormatParameterToGrid(clsFormatRFunction As RFunction) + Private Sub AddFormatParameterToGrid(clsListStyleRFunction As RFunction) + + Dim clsTabStyleRFunction As New RFunction + Dim clsLocationsRFunction As New RFunction - Dim strColumnsExpression As String = ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False) + Dim strColumnsExpression As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) Dim strRowsExpression As String = ucrInputRows.GetText + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_body") + ' Add columns parameter - clsFormatRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) ' Add rows as paramater if present If Not ucrInputRows.IsEmpty Then - clsFormatRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) End If + clsTabStyleRFunction.SetPackageName("gt") + clsTabStyleRFunction.SetRCommand("tab_style") + clsTabStyleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsListStyleRFunction, iPosition:=1) + clsTabStyleRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsFormatRFunction, bNewIncludeArgumentName:=False) + Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) ' Create row and its cells Dim row As New DataGridViewRow row.CreateCells(dataGridFormats) - row.Cells(0).Value = clsFormatRFunction.strRCommand - row.Cells(1).Value = strColumnsExpression - row.Cells(2).Value = strRowsExpression - + row.Cells(0).Value = clsTabStyleRFunction.Clone.ToScript ' Tag the row with the parameter row.Tag = clsRParam diff --git a/instat/UserTables/Cells/ucrCells.vb b/instat/UserTables/Cells/ucrCells.vb index ef4b89c2d47..0d74ab3e2d8 100644 --- a/instat/UserTables/Cells/ucrCells.vb +++ b/instat/UserTables/Cells/ucrCells.vb @@ -27,9 +27,8 @@ End Sub Public Sub SetValuesToOperator() - ' TODO. All controls to set values ucrCellFormats.SetValuesToOperator() - + ucrCellStyles.SetValuesToOperator() End Sub End Class diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index 2191b24bbff..d3f36976ed7 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -24,6 +24,7 @@ Public Class clsTablesUtils sdgTableOptionsTextFormat.ShowDialog(owner) End Sub + 'TODO. Delete Public Shared Function FindRFunctionsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RFunction) Dim lstRFunctions As New List(Of RFunction) For Each clsRParam As RParameter In clsOperator.clsParameters diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index b737bf92c95..079c62b0f10 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -53,7 +53,7 @@ Public Class sdgTableOptions ''' Public Sub Setup(strDataFrameName As String, clsNewOperator As ROperator) - If clsTablesUtils.FindRFunctionsWithRCommand("gt", clsNewOperator).Count = 0 Then + If clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsNewOperator).Count = 0 Then MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog") Exit Sub End If diff --git a/instat/UserTables/sdgTableStyles.Designer.vb b/instat/UserTables/sdgTableStyles.Designer.vb index c3a241efa21..75bdb4b6f3f 100644 --- a/instat/UserTables/sdgTableStyles.Designer.vb +++ b/instat/UserTables/sdgTableStyles.Designer.vb @@ -24,58 +24,53 @@ Partial Class sdgTableStyles Private Sub InitializeComponent() Me.Label2 = New System.Windows.Forms.Label() Me.grpBoxColor = New System.Windows.Forms.GroupBox() + Me.ucrCboColorBackground = New instat.ucrColors() + Me.ucrCboColorText = New instat.ucrColors() Me.lblFill = New System.Windows.Forms.Label() Me.grpBoxAlignment = New System.Windows.Forms.GroupBox() + Me.lblAlignVertical = New System.Windows.Forms.Label() + Me.ucrCboAlignVertical = New instat.ucrInputComboBox() Me.lblAlignHorizontal = New System.Windows.Forms.Label() + Me.ucrCboAlignHorizontal = New instat.ucrInputComboBox() Me.lblUnderlineType = New System.Windows.Forms.Label() - Me.grpBoxUnderline = New System.Windows.Forms.GroupBox() - Me.lblUnderlineStyle = New System.Windows.Forms.Label() - Me.lblUnderlineColor = New System.Windows.Forms.Label() + Me.ucrCboUnderlineType = New instat.ucrInputComboBox() Me.lblFontWeight = New System.Windows.Forms.Label() Me.grpBoxFont = New System.Windows.Forms.GroupBox() + Me.ucrTxtFontSize = New instat.ucrInputTextBox() + Me.ucrCboFontWeight = New instat.ucrInputComboBox() Me.lblFontFamily = New System.Windows.Forms.Label() + Me.ucrCboFontStyle = New instat.ucrInputComboBox() + Me.ucrCboFontFamily = New instat.ucrInputComboBox() Me.lblFontStyle = New System.Windows.Forms.Label() Me.lblFontSize = New System.Windows.Forms.Label() - Me.lblAlignVertical = New System.Windows.Forms.Label() Me.grpBoxOthers = New System.Windows.Forms.GroupBox() - Me.lblTransform = New System.Windows.Forms.Label() - Me.lblIndent = New System.Windows.Forms.Label() - Me.lblWhiteSpace = New System.Windows.Forms.Label() + Me.ucrNudIndent = New instat.ucrNud() Me.lblStretch = New System.Windows.Forms.Label() Me.ucrCboStretch = New instat.ucrInputComboBox() + Me.lblWhiteSpace = New System.Windows.Forms.Label() Me.ucrCboWhiteSpace = New instat.ucrInputComboBox() - Me.ucrTxtIndent = New instat.ucrInputTextBox() - Me.ucrInputCboTransform = New instat.ucrInputComboBox() - Me.ucrCboColorBackground = New instat.ucrColors() - Me.ucrCboColorText = New instat.ucrColors() - Me.ucrCboAlignVertical = New instat.ucrInputComboBox() - Me.ucrCboAlignHorizontal = New instat.ucrInputComboBox() - Me.ucrCboUnderlineType = New instat.ucrInputComboBox() - Me.ucrCboUnderLineColor = New instat.ucrColors() - Me.ucrCboUnderlineStyle = New instat.ucrInputComboBox() - Me.ucrTxtFontSize = New instat.ucrInputTextBox() - Me.ucrCboFontWeight = New instat.ucrInputComboBox() - Me.ucrCboFontStyle = New instat.ucrInputComboBox() - Me.ucrCboFontFamily = New instat.ucrInputComboBox() - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.lblIndent = New System.Windows.Forms.Label() + Me.lblTransform = New System.Windows.Forms.Label() + Me.ucrCboTransform = New instat.ucrInputComboBox() Me.grpBoxBorders = New System.Windows.Forms.GroupBox() - Me.lblBordersSides = New System.Windows.Forms.Label() - Me.ucrCboBorderColor = New instat.ucrColors() - Me.lblBorderColor = New System.Windows.Forms.Label() - Me.ucrCboBorderWeight = New instat.ucrInputTextBox() - Me.lblBorderWeight = New System.Windows.Forms.Label() - Me.lblBorderStyle = New System.Windows.Forms.Label() - Me.ucrCboBorderStyle = New instat.ucrInputComboBox() + Me.ucrNudBorderWeight = New instat.ucrNud() + Me.grpBoxSides = New System.Windows.Forms.GroupBox() Me.ucrChkBorderLeft = New instat.ucrCheck() - Me.ucrChkBorderRight = New instat.ucrCheck() Me.ucrChkBorderBottom = New instat.ucrCheck() Me.ucrChkBorderTop = New instat.ucrCheck() + Me.ucrChkBorderRight = New instat.ucrCheck() + Me.lblBorderStyle = New System.Windows.Forms.Label() + Me.ucrCboBorderStyle = New instat.ucrInputComboBox() + Me.ucrCboBorderColor = New instat.ucrColors() + Me.lblBorderWeight = New System.Windows.Forms.Label() + Me.lblBorderColor = New System.Windows.Forms.Label() + Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() Me.grpBoxColor.SuspendLayout() Me.grpBoxAlignment.SuspendLayout() - Me.grpBoxUnderline.SuspendLayout() Me.grpBoxFont.SuspendLayout() Me.grpBoxOthers.SuspendLayout() Me.grpBoxBorders.SuspendLayout() + Me.grpBoxSides.SuspendLayout() Me.SuspendLayout() ' 'Label2 @@ -100,14 +95,36 @@ Partial Class sdgTableStyles Me.grpBoxColor.TabStop = False Me.grpBoxColor.Text = "Color" ' + 'ucrCboColorBackground + ' + Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True + Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorBackground.GetSetSelectedIndex = -1 + Me.ucrCboColorBackground.IsReadOnly = False + Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) + Me.ucrCboColorBackground.Name = "ucrCboColorBackground" + Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorBackground.TabIndex = 18 + ' + 'ucrCboColorText + ' + Me.ucrCboColorText.AddQuotesIfUnrecognised = True + Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboColorText.GetSetSelectedIndex = -1 + Me.ucrCboColorText.IsReadOnly = False + Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) + Me.ucrCboColorText.Name = "ucrCboColorText" + Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) + Me.ucrCboColorText.TabIndex = 17 + ' 'lblFill ' Me.lblFill.AutoSize = True Me.lblFill.Location = New System.Drawing.Point(6, 21) Me.lblFill.Name = "lblFill" - Me.lblFill.Size = New System.Drawing.Size(22, 13) + Me.lblFill.Size = New System.Drawing.Size(31, 13) Me.lblFill.TabIndex = 14 - Me.lblFill.Text = "Fill:" + Me.lblFill.Text = "Text:" ' 'grpBoxAlignment ' @@ -115,14 +132,33 @@ Partial Class sdgTableStyles Me.grpBoxAlignment.Controls.Add(Me.ucrCboAlignVertical) Me.grpBoxAlignment.Controls.Add(Me.lblAlignHorizontal) Me.grpBoxAlignment.Controls.Add(Me.ucrCboAlignHorizontal) - Me.grpBoxAlignment.Enabled = False - Me.grpBoxAlignment.Location = New System.Drawing.Point(7, 221) + Me.grpBoxAlignment.Location = New System.Drawing.Point(7, 149) Me.grpBoxAlignment.Name = "grpBoxAlignment" Me.grpBoxAlignment.Size = New System.Drawing.Size(594, 65) Me.grpBoxAlignment.TabIndex = 28 Me.grpBoxAlignment.TabStop = False Me.grpBoxAlignment.Text = "Alignment" ' + 'lblAlignVertical + ' + Me.lblAlignVertical.AutoSize = True + Me.lblAlignVertical.Location = New System.Drawing.Point(155, 20) + Me.lblAlignVertical.Name = "lblAlignVertical" + Me.lblAlignVertical.Size = New System.Drawing.Size(45, 13) + Me.lblAlignVertical.TabIndex = 20 + Me.lblAlignVertical.Text = "Vertical:" + ' + 'ucrCboAlignVertical + ' + Me.ucrCboAlignVertical.AddQuotesIfUnrecognised = True + Me.ucrCboAlignVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboAlignVertical.GetSetSelectedIndex = -1 + Me.ucrCboAlignVertical.IsReadOnly = False + Me.ucrCboAlignVertical.Location = New System.Drawing.Point(158, 36) + Me.ucrCboAlignVertical.Name = "ucrCboAlignVertical" + Me.ucrCboAlignVertical.Size = New System.Drawing.Size(137, 21) + Me.ucrCboAlignVertical.TabIndex = 19 + ' 'lblAlignHorizontal ' Me.lblAlignHorizontal.AutoSize = True @@ -132,49 +168,36 @@ Partial Class sdgTableStyles Me.lblAlignHorizontal.TabIndex = 18 Me.lblAlignHorizontal.Text = "Horizontal:" ' + 'ucrCboAlignHorizontal + ' + Me.ucrCboAlignHorizontal.AddQuotesIfUnrecognised = True + Me.ucrCboAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboAlignHorizontal.GetSetSelectedIndex = -1 + Me.ucrCboAlignHorizontal.IsReadOnly = False + Me.ucrCboAlignHorizontal.Location = New System.Drawing.Point(9, 36) + Me.ucrCboAlignHorizontal.Name = "ucrCboAlignHorizontal" + Me.ucrCboAlignHorizontal.Size = New System.Drawing.Size(137, 21) + Me.ucrCboAlignHorizontal.TabIndex = 17 + ' 'lblUnderlineType ' Me.lblUnderlineType.AutoSize = True - Me.lblUnderlineType.Location = New System.Drawing.Point(6, 16) + Me.lblUnderlineType.Location = New System.Drawing.Point(6, 67) Me.lblUnderlineType.Name = "lblUnderlineType" - Me.lblUnderlineType.Size = New System.Drawing.Size(34, 13) + Me.lblUnderlineType.Size = New System.Drawing.Size(82, 13) Me.lblUnderlineType.TabIndex = 21 - Me.lblUnderlineType.Text = "Type:" - ' - 'grpBoxUnderline - ' - Me.grpBoxUnderline.Controls.Add(Me.lblUnderlineType) - Me.grpBoxUnderline.Controls.Add(Me.ucrCboUnderlineType) - Me.grpBoxUnderline.Controls.Add(Me.ucrCboUnderLineColor) - Me.grpBoxUnderline.Controls.Add(Me.lblUnderlineStyle) - Me.grpBoxUnderline.Controls.Add(Me.ucrCboUnderlineStyle) - Me.grpBoxUnderline.Controls.Add(Me.lblUnderlineColor) - Me.grpBoxUnderline.Location = New System.Drawing.Point(7, 149) - Me.grpBoxUnderline.Name = "grpBoxUnderline" - Me.grpBoxUnderline.Size = New System.Drawing.Size(594, 68) - Me.grpBoxUnderline.TabIndex = 27 - Me.grpBoxUnderline.TabStop = False - Me.grpBoxUnderline.Text = "Underline" - ' - 'lblUnderlineStyle - ' - Me.lblUnderlineStyle.AutoSize = True - Me.lblUnderlineStyle.Enabled = False - Me.lblUnderlineStyle.Location = New System.Drawing.Point(151, 16) - Me.lblUnderlineStyle.Name = "lblUnderlineStyle" - Me.lblUnderlineStyle.Size = New System.Drawing.Size(33, 13) - Me.lblUnderlineStyle.TabIndex = 14 - Me.lblUnderlineStyle.Text = "Style:" - ' - 'lblUnderlineColor - ' - Me.lblUnderlineColor.AutoSize = True - Me.lblUnderlineColor.Enabled = False - Me.lblUnderlineColor.Location = New System.Drawing.Point(300, 16) - Me.lblUnderlineColor.Name = "lblUnderlineColor" - Me.lblUnderlineColor.Size = New System.Drawing.Size(34, 13) - Me.lblUnderlineColor.TabIndex = 16 - Me.lblUnderlineColor.Text = "Color:" + Me.lblUnderlineType.Text = "Underline Type:" + ' + 'ucrCboUnderlineType + ' + Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True + Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 + Me.ucrCboUnderlineType.IsReadOnly = False + Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 83) + Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" + Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboUnderlineType.TabIndex = 20 ' 'lblFontWeight ' @@ -202,6 +225,28 @@ Partial Class sdgTableStyles Me.grpBoxFont.TabStop = False Me.grpBoxFont.Text = "Font" ' + 'ucrTxtFontSize + ' + Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True + Me.ucrTxtFontSize.AutoSize = True + Me.ucrTxtFontSize.IsMultiline = False + Me.ucrTxtFontSize.IsReadOnly = False + Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) + Me.ucrTxtFontSize.Name = "ucrTxtFontSize" + Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) + Me.ucrTxtFontSize.TabIndex = 15 + ' + 'ucrCboFontWeight + ' + Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True + Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontWeight.GetSetSelectedIndex = -1 + Me.ucrCboFontWeight.IsReadOnly = False + Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) + Me.ucrCboFontWeight.Name = "ucrCboFontWeight" + Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontWeight.TabIndex = 13 + ' 'lblFontFamily ' Me.lblFontFamily.AutoSize = True @@ -211,6 +256,28 @@ Partial Class sdgTableStyles Me.lblFontFamily.TabIndex = 6 Me.lblFontFamily.Text = "Type (family):" ' + 'ucrCboFontStyle + ' + Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True + Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontStyle.GetSetSelectedIndex = -1 + Me.ucrCboFontStyle.IsReadOnly = False + Me.ucrCboFontStyle.Location = New System.Drawing.Point(154, 35) + Me.ucrCboFontStyle.Name = "ucrCboFontStyle" + Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontStyle.TabIndex = 7 + ' + 'ucrCboFontFamily + ' + Me.ucrCboFontFamily.AddQuotesIfUnrecognised = True + Me.ucrCboFontFamily.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboFontFamily.GetSetSelectedIndex = -1 + Me.ucrCboFontFamily.IsReadOnly = False + Me.ucrCboFontFamily.Location = New System.Drawing.Point(9, 35) + Me.ucrCboFontFamily.Name = "ucrCboFontFamily" + Me.ucrCboFontFamily.Size = New System.Drawing.Size(137, 21) + Me.ucrCboFontFamily.TabIndex = 5 + ' 'lblFontStyle ' Me.lblFontStyle.AutoSize = True @@ -229,64 +296,42 @@ Partial Class sdgTableStyles Me.lblFontSize.TabIndex = 10 Me.lblFontSize.Text = "Size:" ' - 'lblAlignVertical - ' - Me.lblAlignVertical.AutoSize = True - Me.lblAlignVertical.Location = New System.Drawing.Point(155, 20) - Me.lblAlignVertical.Name = "lblAlignVertical" - Me.lblAlignVertical.Size = New System.Drawing.Size(45, 13) - Me.lblAlignVertical.TabIndex = 20 - Me.lblAlignVertical.Text = "Vertical:" - ' 'grpBoxOthers ' + Me.grpBoxOthers.Controls.Add(Me.lblUnderlineType) + Me.grpBoxOthers.Controls.Add(Me.ucrCboUnderlineType) + Me.grpBoxOthers.Controls.Add(Me.ucrNudIndent) Me.grpBoxOthers.Controls.Add(Me.lblStretch) Me.grpBoxOthers.Controls.Add(Me.ucrCboStretch) Me.grpBoxOthers.Controls.Add(Me.lblWhiteSpace) Me.grpBoxOthers.Controls.Add(Me.ucrCboWhiteSpace) - Me.grpBoxOthers.Controls.Add(Me.ucrTxtIndent) Me.grpBoxOthers.Controls.Add(Me.lblIndent) Me.grpBoxOthers.Controls.Add(Me.lblTransform) - Me.grpBoxOthers.Controls.Add(Me.ucrInputCboTransform) - Me.grpBoxOthers.Enabled = False - Me.grpBoxOthers.Location = New System.Drawing.Point(7, 409) + Me.grpBoxOthers.Controls.Add(Me.ucrCboTransform) + Me.grpBoxOthers.Location = New System.Drawing.Point(7, 330) Me.grpBoxOthers.Name = "grpBoxOthers" - Me.grpBoxOthers.Size = New System.Drawing.Size(594, 65) + Me.grpBoxOthers.Size = New System.Drawing.Size(594, 132) Me.grpBoxOthers.TabIndex = 30 Me.grpBoxOthers.TabStop = False Me.grpBoxOthers.Text = "Others" ' - 'lblTransform - ' - Me.lblTransform.AutoSize = True - Me.lblTransform.Location = New System.Drawing.Point(6, 20) - Me.lblTransform.Name = "lblTransform" - Me.lblTransform.Size = New System.Drawing.Size(57, 13) - Me.lblTransform.TabIndex = 18 - Me.lblTransform.Text = "Transform:" + 'ucrNudIndent ' - 'lblIndent - ' - Me.lblIndent.AutoSize = True - Me.lblIndent.Location = New System.Drawing.Point(151, 20) - Me.lblIndent.Name = "lblIndent" - Me.lblIndent.Size = New System.Drawing.Size(40, 13) - Me.lblIndent.TabIndex = 19 - Me.lblIndent.Text = "Indent:" - ' - 'lblWhiteSpace - ' - Me.lblWhiteSpace.AutoSize = True - Me.lblWhiteSpace.Location = New System.Drawing.Point(300, 20) - Me.lblWhiteSpace.Name = "lblWhiteSpace" - Me.lblWhiteSpace.Size = New System.Drawing.Size(72, 13) - Me.lblWhiteSpace.TabIndex = 22 - Me.lblWhiteSpace.Text = "White Space:" + Me.ucrNudIndent.AutoSize = True + Me.ucrNudIndent.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudIndent.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudIndent.Location = New System.Drawing.Point(469, 35) + Me.ucrNudIndent.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudIndent.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudIndent.Name = "ucrNudIndent" + Me.ucrNudIndent.Size = New System.Drawing.Size(50, 20) + Me.ucrNudIndent.TabIndex = 27 + Me.ucrNudIndent.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblStretch ' Me.lblStretch.AutoSize = True - Me.lblStretch.Location = New System.Drawing.Point(447, 20) + Me.lblStretch.Location = New System.Drawing.Point(302, 20) Me.lblStretch.Name = "lblStretch" Me.lblStretch.Size = New System.Drawing.Size(44, 13) Me.lblStretch.TabIndex = 24 @@ -298,253 +343,142 @@ Partial Class sdgTableStyles Me.ucrCboStretch.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboStretch.GetSetSelectedIndex = -1 Me.ucrCboStretch.IsReadOnly = False - Me.ucrCboStretch.Location = New System.Drawing.Point(450, 36) + Me.ucrCboStretch.Location = New System.Drawing.Point(303, 36) Me.ucrCboStretch.Name = "ucrCboStretch" Me.ucrCboStretch.Size = New System.Drawing.Size(137, 21) Me.ucrCboStretch.TabIndex = 23 ' + 'lblWhiteSpace + ' + Me.lblWhiteSpace.AutoSize = True + Me.lblWhiteSpace.Location = New System.Drawing.Point(155, 20) + Me.lblWhiteSpace.Name = "lblWhiteSpace" + Me.lblWhiteSpace.Size = New System.Drawing.Size(72, 13) + Me.lblWhiteSpace.TabIndex = 22 + Me.lblWhiteSpace.Text = "White Space:" + ' 'ucrCboWhiteSpace ' Me.ucrCboWhiteSpace.AddQuotesIfUnrecognised = True Me.ucrCboWhiteSpace.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboWhiteSpace.GetSetSelectedIndex = -1 Me.ucrCboWhiteSpace.IsReadOnly = False - Me.ucrCboWhiteSpace.Location = New System.Drawing.Point(303, 36) + Me.ucrCboWhiteSpace.Location = New System.Drawing.Point(158, 36) Me.ucrCboWhiteSpace.Name = "ucrCboWhiteSpace" Me.ucrCboWhiteSpace.Size = New System.Drawing.Size(137, 21) Me.ucrCboWhiteSpace.TabIndex = 21 ' - 'ucrTxtIndent - ' - Me.ucrTxtIndent.AddQuotesIfUnrecognised = True - Me.ucrTxtIndent.AutoSize = True - Me.ucrTxtIndent.IsMultiline = False - Me.ucrTxtIndent.IsReadOnly = False - Me.ucrTxtIndent.Location = New System.Drawing.Point(154, 36) - Me.ucrTxtIndent.Name = "ucrTxtIndent" - Me.ucrTxtIndent.Size = New System.Drawing.Size(137, 21) - Me.ucrTxtIndent.TabIndex = 20 - ' - 'ucrInputCboTransform - ' - Me.ucrInputCboTransform.AddQuotesIfUnrecognised = True - Me.ucrInputCboTransform.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCboTransform.GetSetSelectedIndex = -1 - Me.ucrInputCboTransform.IsReadOnly = False - Me.ucrInputCboTransform.Location = New System.Drawing.Point(9, 36) - Me.ucrInputCboTransform.Name = "ucrInputCboTransform" - Me.ucrInputCboTransform.Size = New System.Drawing.Size(137, 21) - Me.ucrInputCboTransform.TabIndex = 17 - ' - 'ucrCboColorBackground - ' - Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True - Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboColorBackground.GetSetSelectedIndex = -1 - Me.ucrCboColorBackground.IsReadOnly = False - Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) - Me.ucrCboColorBackground.Name = "ucrCboColorBackground" - Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) - Me.ucrCboColorBackground.TabIndex = 18 - ' - 'ucrCboColorText - ' - Me.ucrCboColorText.AddQuotesIfUnrecognised = True - Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboColorText.GetSetSelectedIndex = -1 - Me.ucrCboColorText.IsReadOnly = False - Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) - Me.ucrCboColorText.Name = "ucrCboColorText" - Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) - Me.ucrCboColorText.TabIndex = 17 - ' - 'ucrCboAlignVertical - ' - Me.ucrCboAlignVertical.AddQuotesIfUnrecognised = True - Me.ucrCboAlignVertical.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboAlignVertical.GetSetSelectedIndex = -1 - Me.ucrCboAlignVertical.IsReadOnly = False - Me.ucrCboAlignVertical.Location = New System.Drawing.Point(158, 36) - Me.ucrCboAlignVertical.Name = "ucrCboAlignVertical" - Me.ucrCboAlignVertical.Size = New System.Drawing.Size(137, 21) - Me.ucrCboAlignVertical.TabIndex = 19 - ' - 'ucrCboAlignHorizontal - ' - Me.ucrCboAlignHorizontal.AddQuotesIfUnrecognised = True - Me.ucrCboAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboAlignHorizontal.GetSetSelectedIndex = -1 - Me.ucrCboAlignHorizontal.IsReadOnly = False - Me.ucrCboAlignHorizontal.Location = New System.Drawing.Point(9, 36) - Me.ucrCboAlignHorizontal.Name = "ucrCboAlignHorizontal" - Me.ucrCboAlignHorizontal.Size = New System.Drawing.Size(137, 21) - Me.ucrCboAlignHorizontal.TabIndex = 17 - ' - 'ucrCboUnderlineType - ' - Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True - Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 - Me.ucrCboUnderlineType.IsReadOnly = False - Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 32) - Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" - Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderlineType.TabIndex = 20 - ' - 'ucrCboUnderLineColor - ' - Me.ucrCboUnderLineColor.AddQuotesIfUnrecognised = True - Me.ucrCboUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderLineColor.Enabled = False - Me.ucrCboUnderLineColor.GetSetSelectedIndex = -1 - Me.ucrCboUnderLineColor.IsReadOnly = False - Me.ucrCboUnderLineColor.Location = New System.Drawing.Point(302, 32) - Me.ucrCboUnderLineColor.Name = "ucrCboUnderLineColor" - Me.ucrCboUnderLineColor.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderLineColor.TabIndex = 19 - ' - 'ucrCboUnderlineStyle - ' - Me.ucrCboUnderlineStyle.AddQuotesIfUnrecognised = True - Me.ucrCboUnderlineStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderlineStyle.Enabled = False - Me.ucrCboUnderlineStyle.GetSetSelectedIndex = -1 - Me.ucrCboUnderlineStyle.IsReadOnly = False - Me.ucrCboUnderlineStyle.Location = New System.Drawing.Point(157, 32) - Me.ucrCboUnderlineStyle.Name = "ucrCboUnderlineStyle" - Me.ucrCboUnderlineStyle.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderlineStyle.TabIndex = 13 - ' - 'ucrTxtFontSize - ' - Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True - Me.ucrTxtFontSize.AutoSize = True - Me.ucrTxtFontSize.IsMultiline = False - Me.ucrTxtFontSize.IsReadOnly = False - Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) - Me.ucrTxtFontSize.Name = "ucrTxtFontSize" - Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) - Me.ucrTxtFontSize.TabIndex = 15 - ' - 'ucrCboFontWeight - ' - Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True - Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontWeight.GetSetSelectedIndex = -1 - Me.ucrCboFontWeight.IsReadOnly = False - Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) - Me.ucrCboFontWeight.Name = "ucrCboFontWeight" - Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontWeight.TabIndex = 13 + 'lblIndent ' - 'ucrCboFontStyle + Me.lblIndent.AutoSize = True + Me.lblIndent.Location = New System.Drawing.Point(466, 16) + Me.lblIndent.Name = "lblIndent" + Me.lblIndent.Size = New System.Drawing.Size(40, 13) + Me.lblIndent.TabIndex = 19 + Me.lblIndent.Text = "Indent:" ' - Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True - Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontStyle.GetSetSelectedIndex = -1 - Me.ucrCboFontStyle.IsReadOnly = False - Me.ucrCboFontStyle.Location = New System.Drawing.Point(154, 35) - Me.ucrCboFontStyle.Name = "ucrCboFontStyle" - Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontStyle.TabIndex = 7 + 'lblTransform ' - 'ucrCboFontFamily + Me.lblTransform.AutoSize = True + Me.lblTransform.Location = New System.Drawing.Point(6, 20) + Me.lblTransform.Name = "lblTransform" + Me.lblTransform.Size = New System.Drawing.Size(57, 13) + Me.lblTransform.TabIndex = 18 + Me.lblTransform.Text = "Transform:" ' - Me.ucrCboFontFamily.AddQuotesIfUnrecognised = True - Me.ucrCboFontFamily.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontFamily.GetSetSelectedIndex = -1 - Me.ucrCboFontFamily.IsReadOnly = False - Me.ucrCboFontFamily.Location = New System.Drawing.Point(9, 35) - Me.ucrCboFontFamily.Name = "ucrCboFontFamily" - Me.ucrCboFontFamily.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontFamily.TabIndex = 5 + 'ucrCboTransform ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(211, 479) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) - Me.ucrBaseSubdialog.TabIndex = 25 + Me.ucrCboTransform.AddQuotesIfUnrecognised = True + Me.ucrCboTransform.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboTransform.GetSetSelectedIndex = -1 + Me.ucrCboTransform.IsReadOnly = False + Me.ucrCboTransform.Location = New System.Drawing.Point(9, 36) + Me.ucrCboTransform.Name = "ucrCboTransform" + Me.ucrCboTransform.Size = New System.Drawing.Size(137, 21) + Me.ucrCboTransform.TabIndex = 17 ' 'grpBoxBorders ' - Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderTop) - Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderBottom) - Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderRight) - Me.grpBoxBorders.Controls.Add(Me.ucrChkBorderLeft) + Me.grpBoxBorders.Controls.Add(Me.ucrNudBorderWeight) + Me.grpBoxBorders.Controls.Add(Me.grpBoxSides) Me.grpBoxBorders.Controls.Add(Me.lblBorderStyle) Me.grpBoxBorders.Controls.Add(Me.ucrCboBorderStyle) - Me.grpBoxBorders.Controls.Add(Me.ucrCboBorderWeight) Me.grpBoxBorders.Controls.Add(Me.ucrCboBorderColor) Me.grpBoxBorders.Controls.Add(Me.lblBorderWeight) Me.grpBoxBorders.Controls.Add(Me.lblBorderColor) - Me.grpBoxBorders.Controls.Add(Me.lblBordersSides) - Me.grpBoxBorders.Enabled = False - Me.grpBoxBorders.Location = New System.Drawing.Point(7, 295) + Me.grpBoxBorders.Location = New System.Drawing.Point(7, 218) Me.grpBoxBorders.Name = "grpBoxBorders" Me.grpBoxBorders.Size = New System.Drawing.Size(594, 109) Me.grpBoxBorders.TabIndex = 31 Me.grpBoxBorders.TabStop = False Me.grpBoxBorders.Text = "Borders" ' - 'lblBordersSides - ' - Me.lblBordersSides.AutoSize = True - Me.lblBordersSides.Location = New System.Drawing.Point(6, 20) - Me.lblBordersSides.Name = "lblBordersSides" - Me.lblBordersSides.Size = New System.Drawing.Size(36, 13) - Me.lblBordersSides.TabIndex = 18 - Me.lblBordersSides.Text = "Sides:" + 'ucrNudBorderWeight + ' + Me.ucrNudBorderWeight.AutoSize = True + Me.ucrNudBorderWeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBorderWeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudBorderWeight.Location = New System.Drawing.Point(469, 36) + Me.ucrNudBorderWeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudBorderWeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudBorderWeight.Name = "ucrNudBorderWeight" + Me.ucrNudBorderWeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudBorderWeight.TabIndex = 26 + Me.ucrNudBorderWeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'grpBoxSides + ' + Me.grpBoxSides.Controls.Add(Me.ucrChkBorderLeft) + Me.grpBoxSides.Controls.Add(Me.ucrChkBorderBottom) + Me.grpBoxSides.Controls.Add(Me.ucrChkBorderTop) + Me.grpBoxSides.Controls.Add(Me.ucrChkBorderRight) + Me.grpBoxSides.Location = New System.Drawing.Point(9, 19) + Me.grpBoxSides.Name = "grpBoxSides" + Me.grpBoxSides.Size = New System.Drawing.Size(259, 83) + Me.grpBoxSides.TabIndex = 21 + Me.grpBoxSides.TabStop = False + Me.grpBoxSides.Text = "Sides" ' - 'ucrCboBorderColor + 'ucrChkBorderLeft ' - Me.ucrCboBorderColor.AddQuotesIfUnrecognised = True - Me.ucrCboBorderColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboBorderColor.Enabled = False - Me.ucrCboBorderColor.GetSetSelectedIndex = -1 - Me.ucrCboBorderColor.IsReadOnly = False - Me.ucrCboBorderColor.Location = New System.Drawing.Point(302, 36) - Me.ucrCboBorderColor.Name = "ucrCboBorderColor" - Me.ucrCboBorderColor.Size = New System.Drawing.Size(137, 21) - Me.ucrCboBorderColor.TabIndex = 23 + Me.ucrChkBorderLeft.AutoSize = True + Me.ucrChkBorderLeft.Checked = False + Me.ucrChkBorderLeft.Location = New System.Drawing.Point(6, 21) + Me.ucrChkBorderLeft.Name = "ucrChkBorderLeft" + Me.ucrChkBorderLeft.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderLeft.TabIndex = 26 ' - 'lblBorderColor + 'ucrChkBorderBottom ' - Me.lblBorderColor.AutoSize = True - Me.lblBorderColor.Enabled = False - Me.lblBorderColor.Location = New System.Drawing.Point(300, 20) - Me.lblBorderColor.Name = "lblBorderColor" - Me.lblBorderColor.Size = New System.Drawing.Size(34, 13) - Me.lblBorderColor.TabIndex = 22 - Me.lblBorderColor.Text = "Color:" + Me.ucrChkBorderBottom.AutoSize = True + Me.ucrChkBorderBottom.Checked = False + Me.ucrChkBorderBottom.Location = New System.Drawing.Point(137, 54) + Me.ucrChkBorderBottom.Name = "ucrChkBorderBottom" + Me.ucrChkBorderBottom.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderBottom.TabIndex = 28 ' - 'ucrCboBorderWeight + 'ucrChkBorderTop ' - Me.ucrCboBorderWeight.AddQuotesIfUnrecognised = True - Me.ucrCboBorderWeight.AutoSize = True - Me.ucrCboBorderWeight.IsMultiline = False - Me.ucrCboBorderWeight.IsReadOnly = False - Me.ucrCboBorderWeight.Location = New System.Drawing.Point(450, 36) - Me.ucrCboBorderWeight.Name = "ucrCboBorderWeight" - Me.ucrCboBorderWeight.Size = New System.Drawing.Size(137, 21) - Me.ucrCboBorderWeight.TabIndex = 22 + Me.ucrChkBorderTop.AutoSize = True + Me.ucrChkBorderTop.Checked = False + Me.ucrChkBorderTop.Location = New System.Drawing.Point(137, 21) + Me.ucrChkBorderTop.Name = "ucrChkBorderTop" + Me.ucrChkBorderTop.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderTop.TabIndex = 29 ' - 'lblBorderWeight + 'ucrChkBorderRight ' - Me.lblBorderWeight.AutoSize = True - Me.lblBorderWeight.Location = New System.Drawing.Point(447, 20) - Me.lblBorderWeight.Name = "lblBorderWeight" - Me.lblBorderWeight.Size = New System.Drawing.Size(44, 13) - Me.lblBorderWeight.TabIndex = 21 - Me.lblBorderWeight.Text = "Weight:" + Me.ucrChkBorderRight.AutoSize = True + Me.ucrChkBorderRight.Checked = False + Me.ucrChkBorderRight.Location = New System.Drawing.Point(6, 54) + Me.ucrChkBorderRight.Name = "ucrChkBorderRight" + Me.ucrChkBorderRight.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBorderRight.TabIndex = 27 ' 'lblBorderStyle ' Me.lblBorderStyle.AutoSize = True - Me.lblBorderStyle.Enabled = False - Me.lblBorderStyle.Location = New System.Drawing.Point(299, 65) + Me.lblBorderStyle.Location = New System.Drawing.Point(300, 65) Me.lblBorderStyle.Name = "lblBorderStyle" Me.lblBorderStyle.Size = New System.Drawing.Size(33, 13) Me.lblBorderStyle.TabIndex = 25 @@ -554,78 +488,78 @@ Partial Class sdgTableStyles ' Me.ucrCboBorderStyle.AddQuotesIfUnrecognised = True Me.ucrCboBorderStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboBorderStyle.Enabled = False Me.ucrCboBorderStyle.GetSetSelectedIndex = -1 Me.ucrCboBorderStyle.IsReadOnly = False - Me.ucrCboBorderStyle.Location = New System.Drawing.Point(305, 81) + Me.ucrCboBorderStyle.Location = New System.Drawing.Point(300, 81) Me.ucrCboBorderStyle.Name = "ucrCboBorderStyle" Me.ucrCboBorderStyle.Size = New System.Drawing.Size(137, 21) Me.ucrCboBorderStyle.TabIndex = 24 ' - 'ucrChkBorderLeft + 'ucrCboBorderColor ' - Me.ucrChkBorderLeft.AutoSize = True - Me.ucrChkBorderLeft.Checked = False - Me.ucrChkBorderLeft.Location = New System.Drawing.Point(9, 36) - Me.ucrChkBorderLeft.Name = "ucrChkBorderLeft" - Me.ucrChkBorderLeft.Size = New System.Drawing.Size(100, 23) - Me.ucrChkBorderLeft.TabIndex = 26 + Me.ucrCboBorderColor.AddQuotesIfUnrecognised = True + Me.ucrCboBorderColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboBorderColor.GetSetSelectedIndex = -1 + Me.ucrCboBorderColor.IsReadOnly = False + Me.ucrCboBorderColor.Location = New System.Drawing.Point(300, 35) + Me.ucrCboBorderColor.Name = "ucrCboBorderColor" + Me.ucrCboBorderColor.Size = New System.Drawing.Size(137, 21) + Me.ucrCboBorderColor.TabIndex = 23 ' - 'ucrChkBorderRight + 'lblBorderWeight ' - Me.ucrChkBorderRight.AutoSize = True - Me.ucrChkBorderRight.Checked = False - Me.ucrChkBorderRight.Location = New System.Drawing.Point(9, 65) - Me.ucrChkBorderRight.Name = "ucrChkBorderRight" - Me.ucrChkBorderRight.Size = New System.Drawing.Size(100, 23) - Me.ucrChkBorderRight.TabIndex = 27 + Me.lblBorderWeight.AutoSize = True + Me.lblBorderWeight.Location = New System.Drawing.Point(466, 20) + Me.lblBorderWeight.Name = "lblBorderWeight" + Me.lblBorderWeight.Size = New System.Drawing.Size(44, 13) + Me.lblBorderWeight.TabIndex = 21 + Me.lblBorderWeight.Text = "Weight:" ' - 'ucrChkBorderBottom + 'lblBorderColor ' - Me.ucrChkBorderBottom.AutoSize = True - Me.ucrChkBorderBottom.Checked = False - Me.ucrChkBorderBottom.Location = New System.Drawing.Point(115, 63) - Me.ucrChkBorderBottom.Name = "ucrChkBorderBottom" - Me.ucrChkBorderBottom.Size = New System.Drawing.Size(100, 23) - Me.ucrChkBorderBottom.TabIndex = 28 + Me.lblBorderColor.AutoSize = True + Me.lblBorderColor.Location = New System.Drawing.Point(300, 20) + Me.lblBorderColor.Name = "lblBorderColor" + Me.lblBorderColor.Size = New System.Drawing.Size(34, 13) + Me.lblBorderColor.TabIndex = 22 + Me.lblBorderColor.Text = "Color:" ' - 'ucrChkBorderTop + 'ucrBaseSubdialog ' - Me.ucrChkBorderTop.AutoSize = True - Me.ucrChkBorderTop.Checked = False - Me.ucrChkBorderTop.Location = New System.Drawing.Point(115, 34) - Me.ucrChkBorderTop.Name = "ucrChkBorderTop" - Me.ucrChkBorderTop.Size = New System.Drawing.Size(100, 23) - Me.ucrChkBorderTop.TabIndex = 29 + Me.ucrBaseSubdialog.AutoSize = True + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(185, 467) + Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" + Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) + Me.ucrBaseSubdialog.TabIndex = 25 ' 'sdgTableStyles ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(607, 517) + Me.ClientSize = New System.Drawing.Size(607, 504) Me.Controls.Add(Me.grpBoxBorders) Me.Controls.Add(Me.grpBoxOthers) Me.Controls.Add(Me.grpBoxColor) Me.Controls.Add(Me.grpBoxAlignment) - Me.Controls.Add(Me.grpBoxUnderline) Me.Controls.Add(Me.grpBoxFont) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgTableStyles" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "Format Text" + Me.Text = "Styles" Me.grpBoxColor.ResumeLayout(False) Me.grpBoxColor.PerformLayout() Me.grpBoxAlignment.ResumeLayout(False) Me.grpBoxAlignment.PerformLayout() - Me.grpBoxUnderline.ResumeLayout(False) - Me.grpBoxUnderline.PerformLayout() Me.grpBoxFont.ResumeLayout(False) Me.grpBoxFont.PerformLayout() Me.grpBoxOthers.ResumeLayout(False) Me.grpBoxOthers.PerformLayout() Me.grpBoxBorders.ResumeLayout(False) Me.grpBoxBorders.PerformLayout() + Me.grpBoxSides.ResumeLayout(False) + Me.grpBoxSides.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -641,11 +575,6 @@ Partial Class sdgTableStyles Friend WithEvents lblAlignHorizontal As Label Friend WithEvents lblUnderlineType As Label Friend WithEvents ucrCboUnderlineType As ucrInputComboBox - Friend WithEvents ucrCboUnderLineColor As ucrColors - Friend WithEvents ucrCboUnderlineStyle As ucrInputComboBox - Friend WithEvents grpBoxUnderline As GroupBox - Friend WithEvents lblUnderlineStyle As Label - Friend WithEvents lblUnderlineColor As Label Friend WithEvents ucrTxtFontSize As ucrInputTextBox Friend WithEvents ucrCboFontWeight As ucrInputComboBox Friend WithEvents lblFontWeight As Label @@ -660,18 +589,15 @@ Partial Class sdgTableStyles Friend WithEvents ucrCboAlignVertical As ucrInputComboBox Friend WithEvents grpBoxOthers As GroupBox Friend WithEvents lblTransform As Label - Friend WithEvents ucrInputCboTransform As ucrInputComboBox - Friend WithEvents ucrTxtIndent As ucrInputTextBox + Friend WithEvents ucrCboTransform As ucrInputComboBox Friend WithEvents lblIndent As Label Friend WithEvents lblWhiteSpace As Label Friend WithEvents ucrCboWhiteSpace As ucrInputComboBox Friend WithEvents lblStretch As Label Friend WithEvents ucrCboStretch As ucrInputComboBox Friend WithEvents grpBoxBorders As GroupBox - Friend WithEvents lblBordersSides As Label Friend WithEvents lblBorderStyle As Label Friend WithEvents ucrCboBorderStyle As ucrInputComboBox - Friend WithEvents ucrCboBorderWeight As ucrInputTextBox Friend WithEvents ucrCboBorderColor As ucrColors Friend WithEvents lblBorderWeight As Label Friend WithEvents lblBorderColor As Label @@ -679,4 +605,7 @@ Partial Class sdgTableStyles Friend WithEvents ucrChkBorderBottom As ucrCheck Friend WithEvents ucrChkBorderRight As ucrCheck Friend WithEvents ucrChkBorderLeft As ucrCheck + Friend WithEvents grpBoxSides As GroupBox + Friend WithEvents ucrNudBorderWeight As ucrNud + Friend WithEvents ucrNudIndent As ucrNud End Class diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb index c25cb3ce7ff..e21ad7025e0 100644 --- a/instat/UserTables/sdgTableStyles.vb +++ b/instat/UserTables/sdgTableStyles.vb @@ -2,10 +2,26 @@ Public Class sdgTableStyles - Private clsCellTextRFunction, clsCellFillRFunction As New RFunction + Private clsStyleRFunction, clsCellTextRFunction, clsCellFillRFunction, clsCellBordersRFunction, clsCellBorderSidesRFunction As New RFunction Private bFirstload As Boolean = True + Private bUserMadeChanges As Boolean = False + Private bUserClickedReturn As Boolean = False + Private bSetDefaults As Boolean = True Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + + If bSetDefaults Then + SetDefaults() + End If + + SetRCode() + + bUserMadeChanges = False + bUserClickedReturn = False autoTranslate(Me) End Sub @@ -37,6 +53,7 @@ Public Class sdgTableStyles '----------------- ucrTxtFontSize.SetParameter(New RParameter("size", iNewPosition:=2)) + ucrTxtFontSize.AddQuotesIfUnrecognised = False ucrTxtFontSize.SetRDefault("NULL") '----------------- @@ -98,7 +115,7 @@ Public Class sdgTableStyles '----------------- Dim dctUnderlineType As New Dictionary(Of String, String) From { - {"Default", "NULL"}, + {"None", "NULL"}, {"Underline", Chr(34) & "underline" & Chr(34)}, {"Overline", Chr(34) & "overline" & Chr(34)}, {"Line-through", Chr(34) & "line-through" & Chr(34)} @@ -135,10 +152,10 @@ Public Class sdgTableStyles {"Lowercase", Chr(34) & "lowercase" & Chr(34)}, {"Capitalize", Chr(34) & "capitalize" & Chr(34)} } - ucrInputCboTransform.SetDropDownStyleAsNonEditable() - ucrInputCboTransform.SetParameter(New RParameter("transform", iNewPosition:=9)) - ucrInputCboTransform.SetItems(dctTransform) - ucrInputCboTransform.SetRDefault("NULL") + ucrCboTransform.SetDropDownStyleAsNonEditable() + ucrCboTransform.SetParameter(New RParameter("transform", iNewPosition:=9)) + ucrCboTransform.SetItems(dctTransform) + ucrCboTransform.SetRDefault("NULL") '----------------- '----------------- @@ -161,8 +178,8 @@ Public Class sdgTableStyles '----------------- '----------------- - ucrTxtIndent.SetParameter(New RParameter("indent", iNewPosition:=11)) - ucrTxtIndent.SetRDefault("NULL") + ucrNudIndent.SetParameter(New RParameter("indent", iNewPosition:=11)) + ucrNudIndent.SetRDefault(0) '----------------- '----------------- @@ -175,10 +192,10 @@ Public Class sdgTableStyles {"Pre-line", Chr(34) & "pre-line" & Chr(34)}, {"Break-spaces", Chr(34) & "break-spaces" & Chr(34)} } - ucrCboStretch.SetDropDownStyleAsNonEditable() - ucrCboStretch.SetParameter(New RParameter("transform", iNewPosition:=11)) - ucrCboStretch.SetItems(dctWhiteSpace) - ucrCboStretch.SetRDefault("NULL") + ucrCboWhiteSpace.SetDropDownStyleAsNonEditable() + ucrCboWhiteSpace.SetParameter(New RParameter("transform", iNewPosition:=11)) + ucrCboWhiteSpace.SetItems(dctWhiteSpace) + ucrCboWhiteSpace.SetRDefault("NULL") '----------------- '--------------------------------------------------- @@ -194,22 +211,22 @@ Public Class sdgTableStyles '----------------- ucrChkBorderLeft.SetText("Left") ucrChkBorderLeft.SetParameter(New RParameter("left", iNewPosition:=0, bNewIncludeArgumentName:=False)) - ucrChkBorderLeft.SetValuesCheckedAndUnchecked("left", "NULL") + ucrChkBorderLeft.SetValuesCheckedAndUnchecked(Chr(34) & "left" & Chr(34), "NULL") ucrChkBorderLeft.SetRDefault("NULL") ucrChkBorderRight.SetText("Right") ucrChkBorderRight.SetParameter(New RParameter("right", iNewPosition:=1, bNewIncludeArgumentName:=False)) - ucrChkBorderRight.SetValuesCheckedAndUnchecked("right", "NULL") + ucrChkBorderRight.SetValuesCheckedAndUnchecked(Chr(34) & "right" & Chr(34), "NULL") ucrChkBorderRight.SetRDefault("NULL") ucrChkBorderTop.SetText("Top") ucrChkBorderTop.SetParameter(New RParameter("top", iNewPosition:=2, bNewIncludeArgumentName:=False)) - ucrChkBorderTop.SetValuesCheckedAndUnchecked("top", "NULL") + ucrChkBorderTop.SetValuesCheckedAndUnchecked(Chr(34) & "top" & Chr(34), "NULL") ucrChkBorderTop.SetRDefault("NULL") ucrChkBorderBottom.SetText("Bottom") ucrChkBorderBottom.SetParameter(New RParameter("bottom", iNewPosition:=3, bNewIncludeArgumentName:=False)) - ucrChkBorderBottom.SetValuesCheckedAndUnchecked("bottom", "NULL") + ucrChkBorderBottom.SetValuesCheckedAndUnchecked(Chr(34) & "bottom" & Chr(34), "NULL") ucrChkBorderBottom.SetRDefault("NULL") '----------------- @@ -217,31 +234,60 @@ Public Class sdgTableStyles ucrCboBorderColor.SetParameter(New RParameter("color", iNewPosition:=1)) ucrCboBorderColor.SetColours() ucrCboBorderColor.SetRDefault("NULL") + '----------------- - ' Left here + '----------------- + Dim dctBorderStyle As New Dictionary(Of String, String) From { + {"Default", "solid"}, + {"Solid", Chr(34) & "solid" & Chr(34)}, + {"Dashed", Chr(34) & "dashed" & Chr(34)}, + {"Dotted", Chr(34) & "dotted" & Chr(34)} + } + ucrCboBorderStyle.SetDropDownStyleAsNonEditable() + ucrCboBorderStyle.SetParameter(New RParameter("style", iNewPosition:=2)) + ucrCboBorderStyle.SetItems(dctBorderStyle) + ucrCboBorderStyle.SetRDefault("solid") + '----------------- '----------------- + ucrNudBorderWeight.SetParameter(New RParameter("weight", iNewPosition:=3)) + ucrNudBorderWeight.SetRDefault(1) + '----------------- + + '--------------------------------------------------- End Sub - Public Sub Setup() + Public Sub Setup(clsNewStyleRFunction As RFunction) - If bFirstload Then - InitialiseDialog() - bFirstload = False - End If + ' TODO + + bSetDefaults = False + End Sub + Private Sub SetDefaults() + + clsStyleRFunction = New RFunction clsCellTextRFunction = New RFunction clsCellFillRFunction = New RFunction + clsCellBordersRFunction = New RFunction + clsCellBorderSidesRFunction = New RFunction + + clsStyleRFunction.SetRCommand("list") - clsCellTextRFunction.SetRCommand("cell_fill") + clsCellTextRFunction.SetPackageName("gt") clsCellTextRFunction.SetRCommand("cell_text") + clsCellFillRFunction.SetPackageName("gt") + clsCellFillRFunction.SetRCommand("cell_fill") + clsCellBordersRFunction.SetPackageName("gt") + clsCellBordersRFunction.SetRCommand("cell_borders") + + clsCellBorderSidesRFunction.SetRCommand("c") - SetRCode() End Sub @@ -258,10 +304,12 @@ Public Class sdgTableStyles 'ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboAlignHorizontal.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboAlignVertical.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrInputCboTransform.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboTransform.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrTxtFontSize.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboWhiteSpace.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboStretch.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + 'ucrTxtIndent.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrNudIndent.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) '----------------- '----------------- @@ -269,6 +317,58 @@ Public Class sdgTableStyles ucrCboColorBackground.SetRCode(clsCellFillRFunction, bReset:=False, bCloneIfNeeded:=True) '----------------- + '----------------- + 'Cell border controls + ucrChkBorderLeft.SetRCode(clsCellBorderSidesRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrChkBorderRight.SetRCode(clsCellBorderSidesRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrChkBorderTop.SetRCode(clsCellBorderSidesRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrChkBorderBottom.SetRCode(clsCellBorderSidesRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboBorderColor.SetRCode(clsCellBordersRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrCboBorderStyle.SetRCode(clsCellBordersRFunction, bReset:=False, bCloneIfNeeded:=True) + ucrNudBorderWeight.SetRCode(clsCellBordersRFunction, bReset:=False, bCloneIfNeeded:=True) + '----------------- End Sub + + Public Function GetNewUserInputAsRFunction() As RFunction + If Not bUserClickedReturn OrElse Not bUserMadeChanges Then + Return Nothing + End If + + If clsCellTextRFunction.clsParameters.Count > 0 Then + clsStyleRFunction.AddParameter(strParameterName:="cell_text_param", clsRFunctionParameter:=clsCellTextRFunction, bIncludeArgumentName:=False, iPosition:=0) + End If + + If clsCellFillRFunction.clsParameters.Count > 0 Then + clsStyleRFunction.AddParameter(strParameterName:="cell_fill_param", clsRFunctionParameter:=clsCellFillRFunction, bIncludeArgumentName:=False, iPosition:=1) + End If + + If clsCellBordersRFunction.clsParameters.Count > 0 OrElse clsCellBorderSidesRFunction.clsParameters.Count > 0 Then + If clsCellBorderSidesRFunction.clsParameters.Count > 0 Then + clsCellBordersRFunction.AddParameter(strParameterName:="sides", clsRFunctionParameter:=clsCellBorderSidesRFunction, iPosition:=0) + End If + clsStyleRFunction.AddParameter(strParameterName:="cell_borders_param", clsRFunctionParameter:=clsCellBordersRFunction, bIncludeArgumentName:=False, iPosition:=1) + End If + + Return clsStyleRFunction + End Function + + Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn + bUserClickedReturn = True + End Sub + + Private Sub controls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCboAlignHorizontal.ControlValueChanged, + ucrCboAlignVertical.ControlValueChanged, ucrCboBorderColor.ControlValueChanged, ucrCboBorderStyle.ControlValueChanged, + ucrNudBorderWeight.ControlValueChanged, ucrCboColorBackground.ControlValueChanged, ucrCboColorText.ControlValueChanged, + ucrCboFontFamily.ControlValueChanged, ucrCboFontStyle.ControlValueChanged, ucrCboFontWeight.ControlValueChanged, + ucrCboStretch.ControlValueChanged, + ucrCboUnderlineType.ControlValueChanged, ucrCboWhiteSpace.ControlValueChanged, ucrChkBorderBottom.ControlValueChanged, + ucrChkBorderLeft.ControlValueChanged, ucrChkBorderRight.ControlValueChanged, ucrChkBorderTop.ControlValueChanged, + ucrCboTransform.ControlValueChanged, ucrTxtFontSize.ControlValueChanged, ucrNudIndent.ControlValueChanged + + bUserMadeChanges = True + End Sub + + + End Class \ No newline at end of file From 9e8b01ec6d4331bb0b46a8ab2b90d9d2cae8be8c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 26 Jun 2024 06:59:35 +0300 Subject: [PATCH 056/273] design changes --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 239 +++++++++++++----- .../Cells/FootNotes/ucrCellsFootNotes.resx | 11 +- .../Cells/FootNotes/ucrCellsFootNotes.vb | 188 +++++++++++--- .../Cells/Formats/ucrCellFormats.vb | 1 + instat/UserTables/Cells/ucrCells.Designer.vb | 4 +- .../UserTables/Rows/ucrRowGroup.Designer.vb | 24 +- instat/UserTables/Rows/ucrRowGroup.resx | 9 - instat/UserTables/Rows/ucrRows.Designer.vb | 12 +- instat/UserTables/sdgTableOptions.Designer.vb | 24 +- 9 files changed, 373 insertions(+), 139 deletions(-) diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb index 7ccc053394c..64512ca006b 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -22,86 +22,207 @@ Partial Class ucrCellsFootNotes 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.dataGridCellFooterNotes = New System.Windows.Forms.DataGridView() - Me.colFooterNoteText = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterColExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterRowExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFooterFormat = New System.Windows.Forms.DataGridViewButtonColumn() - Me.lblFooterCellNotes = New System.Windows.Forms.Label() - CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.lblRowExpression = New System.Windows.Forms.Label() + Me.ucrInputRows = New instat.ucrInputTextBox() + Me.lblFooteNotes = New System.Windows.Forms.Label() + Me.btnClearFormats = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGridFootNotes = New System.Windows.Forms.DataGridView() + Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() + Me.btnAdd = New System.Windows.Forms.Button() + Me.lblFootNote = New System.Windows.Forms.Label() + Me.ucrTxtFootNote = New instat.ucrInputTextBox() + Me.lblPlacement = New System.Windows.Forms.Label() + Me.ucrCboPlacement = New instat.ucrInputComboBox() + CType(Me.dataGridFootNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'dataGridCellFooterNotes + 'lblRowExpression ' - Me.dataGridCellFooterNotes.AllowUserToAddRows = False - Me.dataGridCellFooterNotes.AllowUserToDeleteRows = False - Me.dataGridCellFooterNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridCellFooterNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colFooterNoteText, Me.colFooterColExpression, Me.colFooterRowExpression, Me.colFooterFormat}) - Me.dataGridCellFooterNotes.Location = New System.Drawing.Point(0, 18) - Me.dataGridCellFooterNotes.Name = "dataGridCellFooterNotes" - Me.dataGridCellFooterNotes.RowHeadersWidth = 62 - Me.dataGridCellFooterNotes.Size = New System.Drawing.Size(630, 55) - Me.dataGridCellFooterNotes.TabIndex = 7 + Me.lblRowExpression.AutoSize = True + Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowExpression.Location = New System.Drawing.Point(238, 46) + Me.lblRowExpression.Name = "lblRowExpression" + Me.lblRowExpression.Size = New System.Drawing.Size(86, 13) + Me.lblRowExpression.TabIndex = 338 + Me.lblRowExpression.Text = "Row Expression:" ' - 'colFooterNoteText + 'ucrInputRows ' - Me.colFooterNoteText.HeaderText = "Note Text" - Me.colFooterNoteText.MinimumWidth = 8 - Me.colFooterNoteText.Name = "colFooterNoteText" - Me.colFooterNoteText.Width = 220 + Me.ucrInputRows.AddQuotesIfUnrecognised = True + Me.ucrInputRows.AutoSize = True + Me.ucrInputRows.IsMultiline = False + Me.ucrInputRows.IsReadOnly = False + Me.ucrInputRows.Location = New System.Drawing.Point(240, 62) + Me.ucrInputRows.Name = "ucrInputRows" + Me.ucrInputRows.Size = New System.Drawing.Size(137, 21) + Me.ucrInputRows.TabIndex = 337 ' - 'colFooterColExpression + 'lblFooteNotes ' - Me.colFooterColExpression.HeaderText = "Column Expression" - Me.colFooterColExpression.MinimumWidth = 8 - Me.colFooterColExpression.Name = "colFooterColExpression" - Me.colFooterColExpression.Resizable = System.Windows.Forms.DataGridViewTriState.[True] - Me.colFooterColExpression.Width = 140 + Me.lblFooteNotes.AutoSize = True + Me.lblFooteNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFooteNotes.Location = New System.Drawing.Point(233, 219) + Me.lblFooteNotes.Name = "lblFooteNotes" + Me.lblFooteNotes.Size = New System.Drawing.Size(62, 13) + Me.lblFooteNotes.TabIndex = 336 + Me.lblFooteNotes.Text = "Foot Notes:" ' - 'colFooterRowExpression + 'btnClearFormats ' - Me.colFooterRowExpression.HeaderText = "Row Expression(s)" - Me.colFooterRowExpression.MinimumWidth = 8 - Me.colFooterRowExpression.Name = "colFooterRowExpression" - Me.colFooterRowExpression.Width = 140 + Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearFormats.Location = New System.Drawing.Point(517, 210) + Me.btnClearFormats.Name = "btnClearFormats" + Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) + Me.btnClearFormats.TabIndex = 335 + Me.btnClearFormats.Tag = "" + Me.btnClearFormats.Text = "Clear" + Me.btnClearFormats.UseVisualStyleBackColor = True ' - 'colFooterFormat + 'lblColumns ' - Me.colFooterFormat.HeaderText = "" - Me.colFooterFormat.MinimumWidth = 8 - Me.colFooterFormat.Name = "colFooterFormat" - Me.colFooterFormat.ReadOnly = True - Me.colFooterFormat.Text = "Format" - Me.colFooterFormat.UseColumnTextForButtonValue = True - Me.colFooterFormat.Width = 60 + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(238, 0) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 334 + Me.lblColumns.Text = "Column:" ' - 'lblFooterCellNotes + 'ucrSelectorCols ' - Me.lblFooterCellNotes.AutoSize = True - Me.lblFooterCellNotes.Location = New System.Drawing.Point(3, 0) - Me.lblFooterCellNotes.Name = "lblFooterCellNotes" - Me.lblFooterCellNotes.Size = New System.Drawing.Size(91, 13) - Me.lblFooterCellNotes.TabIndex = 6 - Me.lblFooterCellNotes.Text = "Cell footers notes:" + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(5, 0) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 332 + ' + 'dataGridFootNotes + ' + Me.dataGridFootNotes.AllowUserToAddRows = False + Me.dataGridFootNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFootNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) + Me.dataGridFootNotes.Location = New System.Drawing.Point(236, 236) + Me.dataGridFootNotes.Name = "dataGridFootNotes" + Me.dataGridFootNotes.RowHeadersWidth = 62 + Me.dataGridFootNotes.Size = New System.Drawing.Size(361, 73) + Me.dataGridFootNotes.TabIndex = 331 + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Foot Note Expressions" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" + ' + 'ucrReceiverSingleCol + ' + Me.ucrReceiverSingleCol.AutoSize = True + Me.ucrReceiverSingleCol.frmParent = Nothing + Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(235, 13) + Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" + Me.ucrReceiverSingleCol.Selector = Nothing + Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSingleCol.strNcFilePath = "" + Me.ucrReceiverSingleCol.TabIndex = 339 + Me.ucrReceiverSingleCol.ucrSelector = Nothing + ' + 'btnAdd + ' + Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAdd.Location = New System.Drawing.Point(241, 183) + Me.btnAdd.Name = "btnAdd" + Me.btnAdd.Size = New System.Drawing.Size(126, 23) + Me.btnAdd.TabIndex = 333 + Me.btnAdd.Tag = "" + Me.btnAdd.Text = "Add Foot Note" + Me.btnAdd.UseVisualStyleBackColor = True + ' + 'lblFootNote + ' + Me.lblFootNote.AutoSize = True + Me.lblFootNote.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFootNote.Location = New System.Drawing.Point(243, 91) + Me.lblFootNote.Name = "lblFootNote" + Me.lblFootNote.Size = New System.Drawing.Size(81, 13) + Me.lblFootNote.TabIndex = 341 + Me.lblFootNote.Text = "Foot Note Text:" + ' + 'ucrTxtFootNote + ' + Me.ucrTxtFootNote.AddQuotesIfUnrecognised = True + Me.ucrTxtFootNote.AutoSize = True + Me.ucrTxtFootNote.IsMultiline = False + Me.ucrTxtFootNote.IsReadOnly = False + Me.ucrTxtFootNote.Location = New System.Drawing.Point(241, 107) + Me.ucrTxtFootNote.Name = "ucrTxtFootNote" + Me.ucrTxtFootNote.Size = New System.Drawing.Size(279, 21) + Me.ucrTxtFootNote.TabIndex = 340 + ' + 'lblPlacement + ' + Me.lblPlacement.AutoSize = True + Me.lblPlacement.Location = New System.Drawing.Point(238, 136) + Me.lblPlacement.Name = "lblPlacement" + Me.lblPlacement.Size = New System.Drawing.Size(60, 13) + Me.lblPlacement.TabIndex = 343 + Me.lblPlacement.Text = "Placement:" + ' + 'ucrCboPlacement + ' + Me.ucrCboPlacement.AddQuotesIfUnrecognised = True + Me.ucrCboPlacement.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboPlacement.GetSetSelectedIndex = -1 + Me.ucrCboPlacement.IsReadOnly = False + Me.ucrCboPlacement.Location = New System.Drawing.Point(241, 152) + Me.ucrCboPlacement.Name = "ucrCboPlacement" + Me.ucrCboPlacement.Size = New System.Drawing.Size(137, 21) + Me.ucrCboPlacement.TabIndex = 342 ' 'ucrCellsFootNotes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.dataGridCellFooterNotes) - Me.Controls.Add(Me.lblFooterCellNotes) + Me.Controls.Add(Me.ucrCboPlacement) + Me.Controls.Add(Me.lblPlacement) + Me.Controls.Add(Me.lblFootNote) + Me.Controls.Add(Me.ucrTxtFootNote) + Me.Controls.Add(Me.lblRowExpression) + Me.Controls.Add(Me.ucrInputRows) + Me.Controls.Add(Me.lblFooteNotes) + Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGridFootNotes) + Me.Controls.Add(Me.ucrReceiverSingleCol) + Me.Controls.Add(Me.btnAdd) Me.Name = "ucrCellsFootNotes" - Me.Size = New System.Drawing.Size(637, 77) - CType(Me.dataGridCellFooterNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(602, 314) + CType(Me.dataGridFootNotes, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents dataGridCellFooterNotes As DataGridView - Friend WithEvents colFooterNoteText As DataGridViewTextBoxColumn - Friend WithEvents colFooterColExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterRowExpression As DataGridViewTextBoxColumn - Friend WithEvents colFooterFormat As DataGridViewButtonColumn - Friend WithEvents lblFooterCellNotes As Label + Friend WithEvents lblRowExpression As Label + Friend WithEvents ucrInputRows As ucrInputTextBox + Friend WithEvents lblFooteNotes As Label + Friend WithEvents btnClearFormats As Button + Friend WithEvents lblColumns As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGridFootNotes As DataGridView + Friend WithEvents colStyles As DataGridViewTextBoxColumn + Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle + Friend WithEvents btnAdd As Button + Friend WithEvents lblFootNote As Label + Friend WithEvents ucrTxtFootNote As ucrInputTextBox + Friend WithEvents lblPlacement As Label + Friend WithEvents ucrCboPlacement As ucrInputComboBox End Class diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx index 418e7a89629..d937ee32b35 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx @@ -117,16 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - - - True - - - True - - + True \ No newline at end of file diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb index 8642204d8ea..1f8734030b4 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb @@ -1,7 +1,139 @@ Public Class ucrCellsFootNotes + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub InitialiseControl() + ucrReceiverSingleCol.Selector = ucrSelectorCols + ucrReceiverSingleCol.SetMeAsReceiver() + + + '----------------- + Dim dctPlacement As New Dictionary(Of String, String) From { + {"Default", "auto"}, + {"Auto", Chr(34) & "auto" & Chr(34)}, + {"Left", Chr(34) & "left" & Chr(34)}, + {"Right", Chr(34) & "right" & Chr(34)} + } + ucrCboPlacement.SetDropDownStyleAsNonEditable() + ucrCboPlacement.SetParameter(New RParameter("placement", iNewPosition:=1)) + ucrCboPlacement.SetItems(dctPlacement) + ucrCboPlacement.SetRDefault("auto") + '----------------- + End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + ' Clear and Set up the data grid with contents + dataGridFootNotes.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_body", clsOperator)) + + End Sub + + Public Sub SetValuesToOperator() + + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_body", clsOperator) + For Each clsRParam As RParameter In lstRParams + clsOperator.RemoveParameter(clsRParam) + Next + + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFootNotes, clsOperator) + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFootNotes) + row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGridFootNotes.Rows.Add(row) + + Next + End Sub + + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRows.ControlContentsChanged, ucrReceiverSingleCol.ControlContentsChanged + btnAdd.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputRows.IsEmpty + End Sub + + Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click + + sdgTableStyles.ShowDialog(Me.ParentForm) + Dim clsListStyleRFunction As RFunction = sdgTableStyles.GetNewUserInputAsRFunction() + + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + AddFormatParameterToGrid(clsListStyleRFunction) + + End Sub + + + Private Sub AddFormatParameterToGrid(clsListStyleRFunction As RFunction) + + Dim clsTabFootNoteRFunction As New RFunction + + Dim clsLocationsRFunction As New RFunction + + Dim strColumnsExpression As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) + Dim strRowsExpression As String = ucrInputRows.GetText + Dim strFootNoteText As String = ucrTxtFootNote.GetText + + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_body") + + ' Add columns parameter + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) + + ' Add rows as paramater if present + If Not ucrInputRows.IsEmpty Then + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) + End If + + clsTabFootNoteRFunction.SetPackageName("gt") + clsTabFootNoteRFunction.SetRCommand("tab_footnote") + clsTabFootNoteRFunction.AddParameter(strParameterName:="footnote", strParameterValue:=strFootNoteText, iPosition:=1) + clsTabFootNoteRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_footnote_cells_param" & (dataGridFootNotes.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGridFootNotes) + row.Cells(0).Value = clsTabFootNoteRFunction.Clone.ToScript + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGridFootNotes.Rows.Add(row) + + End Sub + + Private Sub btnClearFormats_Click(sender As Object, e As EventArgs) Handles btnClearFormats.Click + dataGridFootNotes.Rows.Clear() + End Sub + + + + '--------------------------------------------------------------------------------------- + 'Preevious code + + Public Sub Setup2(strDataFrameName As String, clsOperator As ROperator) SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) End Sub @@ -9,8 +141,8 @@ Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) - 'SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) - SetFooterGridContents(clsOperator, dataGridCellFooterNotes) + + 'SetFooterGridContents(clsOperator, dataGridCellFooterNotes) End Sub Private Sub SetFooterGridContents(clsOperator As ROperator, dataGridFooterNotes As DataGridView) @@ -33,7 +165,7 @@ ' todo go through the location function Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then + If clsFooterLocationNoteRFunction.strRCommand = "cells_body" Then For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters If clsFootNoteLocationRParam.strArgumentName = "columns" Then row.Cells(1).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) @@ -63,7 +195,7 @@ End Sub - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellEndEdit + Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Dim dataGrid As DataGridView = sender Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) Dim strNoteTextValue As String = row.Cells(0).Value @@ -75,9 +207,8 @@ Dim clsNoteRFunction As RFunction = Nothing - If dataGrid Is dataGridCellFooterNotes Then - clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) + clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) ' Add column and row expressions as paramters if user has typed them If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then @@ -89,10 +220,9 @@ clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) End If - End If - ' Overwrite the tag with the new foot function - row.Tag = clsNoteRFunction + ' Overwrite the tag with the new foot function + row.Tag = clsNoteRFunction ' If last row then add new empty row If e.RowIndex = dataGrid.Rows.Count - 1 Then @@ -101,28 +231,28 @@ End Sub - Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellClick + 'Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellClick - Dim dataGrid As DataGridView = sender - Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag - Dim strParameterName As String = Nothing - - '--------------------------- - ' Ignore clicks that are not from button cells. - If dataGrid Is dataGridCellFooterNotes Then - strParameterName = "footnote" - If e.ColumnIndex <> 3 Then - Exit Sub - End If - End If - '--------------------------- + ' Dim dataGrid As DataGridView = sender + ' Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag + ' Dim strParameterName As String = Nothing - If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then - sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) - sdgTableOptionsTextFormat.Show(Me) - End If + ' '--------------------------- + ' ' Ignore clicks that are not from button cells. + ' If dataGrid Is dataGridCellFooterNotes Then + ' strParameterName = "footnote" + ' If e.ColumnIndex <> 3 Then + ' Exit Sub + ' End If + ' End If + ' '--------------------------- - End Sub + ' If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then + ' sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) + ' sdgTableOptionsTextFormat.Show(Me) + ' End If + + 'End Sub Private Function SetupAndGetNewNoteRFunction(clsPossibleNoteRFunction As RFunction, strNoteRCommand As String, strRNoteTextParameterName As String, strNoteTextValue As String) As RFunction @@ -171,7 +301,7 @@ ' todo go through the location function Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then + If clsFooterLocationNoteRFunction.strRCommand = "cells_body" Then For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters If clsFootNoteLocationRParam.strArgumentName = "columns" Then row.Cells(1).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb index bdc5e012c3c..b6dfddc374c 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -21,6 +21,7 @@ ' Set up the selector ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + ucrReceiverMultipleCols.SetMeAsReceiver() ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() diff --git a/instat/UserTables/Cells/ucrCells.Designer.vb b/instat/UserTables/Cells/ucrCells.Designer.vb index daf69d9f9ba..2fb0f5c89d5 100644 --- a/instat/UserTables/Cells/ucrCells.Designer.vb +++ b/instat/UserTables/Cells/ucrCells.Designer.vb @@ -95,7 +95,7 @@ Partial Class ucrCells ' Me.ucrCellsFootNotes.Location = New System.Drawing.Point(7, 38) Me.ucrCellsFootNotes.Name = "ucrCellsFootNotes" - Me.ucrCellsFootNotes.Size = New System.Drawing.Size(604, 104) + Me.ucrCellsFootNotes.Size = New System.Drawing.Size(604, 318) Me.ucrCellsFootNotes.TabIndex = 294 ' 'ucrCellFormats @@ -124,8 +124,8 @@ Partial Class ucrCells ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrCellStyles) Me.Controls.Add(Me.ucrCellsFootNotes) + Me.Controls.Add(Me.ucrCellStyles) Me.Controls.Add(Me.ucrCellFormats) Me.Controls.Add(Me.rdoStyles) Me.Controls.Add(Me.rdoFormat) diff --git a/instat/UserTables/Rows/ucrRowGroup.Designer.vb b/instat/UserTables/Rows/ucrRowGroup.Designer.vb index 9b03887becb..db9f534f46b 100644 --- a/instat/UserTables/Rows/ucrRowGroup.Designer.vb +++ b/instat/UserTables/Rows/ucrRowGroup.Designer.vb @@ -45,10 +45,10 @@ Partial Class ucrRowGroup Me.dataGridGroups.AllowUserToAddRows = False Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(227, 95) + Me.dataGridGroups.Location = New System.Drawing.Point(229, 204) Me.dataGridGroups.Name = "dataGridGroups" Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(517, 95) + Me.dataGridGroups.Size = New System.Drawing.Size(323, 95) Me.dataGridGroups.TabIndex = 11 ' 'colLabel @@ -78,7 +78,7 @@ Partial Class ucrRowGroup 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(665, 71) + Me.btnClearGroups.Location = New System.Drawing.Point(467, 175) Me.btnClearGroups.Name = "btnClearGroups" Me.btnClearGroups.Size = New System.Drawing.Size(79, 23) Me.btnClearGroups.TabIndex = 30 @@ -100,7 +100,7 @@ Partial Class ucrRowGroup ' Me.btnAddCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddCondition.Location = New System.Drawing.Point(648, 24) + Me.btnAddCondition.Location = New System.Drawing.Point(230, 153) Me.btnAddCondition.Name = "btnAddCondition" Me.btnAddCondition.Size = New System.Drawing.Size(96, 23) Me.btnAddCondition.TabIndex = 25 @@ -112,7 +112,7 @@ Partial Class ucrRowGroup ' Me.lblGroups.AutoSize = True Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(224, 76) + Me.lblGroups.Location = New System.Drawing.Point(226, 185) Me.lblGroups.Name = "lblGroups" Me.lblGroups.Size = New System.Drawing.Size(44, 13) Me.lblGroups.TabIndex = 32 @@ -122,7 +122,7 @@ Partial Class ucrRowGroup ' Me.lblGroupCondition.AutoSize = True Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(458, 9) + Me.lblGroupCondition.Location = New System.Drawing.Point(227, 109) Me.lblGroupCondition.Name = "lblGroupCondition" Me.lblGroupCondition.Size = New System.Drawing.Size(86, 13) Me.lblGroupCondition.TabIndex = 33 @@ -133,7 +133,7 @@ Partial Class ucrRowGroup Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboConditionOperator.FormattingEnabled = True Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) - Me.cboConditionOperator.Location = New System.Drawing.Point(460, 26) + Me.cboConditionOperator.Location = New System.Drawing.Point(229, 126) Me.cboConditionOperator.Name = "cboConditionOperator" Me.cboConditionOperator.Size = New System.Drawing.Size(78, 21) Me.cboConditionOperator.TabIndex = 279 @@ -141,7 +141,7 @@ Partial Class ucrRowGroup 'cboConditionValue ' Me.cboConditionValue.FormattingEnabled = True - Me.cboConditionValue.Location = New System.Drawing.Point(539, 26) + Me.cboConditionValue.Location = New System.Drawing.Point(313, 126) Me.cboConditionValue.Name = "cboConditionValue" Me.cboConditionValue.Size = New System.Drawing.Size(106, 21) Me.cboConditionValue.TabIndex = 280 @@ -150,7 +150,7 @@ Partial Class ucrRowGroup ' Me.lblCondition.AutoSize = True Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(355, 10) + Me.lblCondition.Location = New System.Drawing.Point(227, 58) Me.lblCondition.Name = "lblCondition" Me.lblCondition.Size = New System.Drawing.Size(68, 13) Me.lblCondition.TabIndex = 282 @@ -187,9 +187,9 @@ Partial Class ucrRowGroup Me.ucrInputGroupLabel.AutoSize = True Me.ucrInputGroupLabel.IsMultiline = False Me.ucrInputGroupLabel.IsReadOnly = False - Me.ucrInputGroupLabel.Location = New System.Drawing.Point(354, 27) + Me.ucrInputGroupLabel.Location = New System.Drawing.Point(226, 75) Me.ucrInputGroupLabel.Name = "ucrInputGroupLabel" - Me.ucrInputGroupLabel.Size = New System.Drawing.Size(100, 21) + Me.ucrInputGroupLabel.Size = New System.Drawing.Size(120, 21) Me.ucrInputGroupLabel.TabIndex = 308 ' 'ucrRowGroup @@ -209,7 +209,7 @@ Partial Class ucrRowGroup Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridGroups) Me.Name = "ucrRowGroup" - Me.Size = New System.Drawing.Size(749, 196) + Me.Size = New System.Drawing.Size(557, 301) CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Rows/ucrRowGroup.resx b/instat/UserTables/Rows/ucrRowGroup.resx index 191e2e6453d..f4b4b7d5a34 100644 --- a/instat/UserTables/Rows/ucrRowGroup.resx +++ b/instat/UserTables/Rows/ucrRowGroup.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRows.Designer.vb b/instat/UserTables/Rows/ucrRows.Designer.vb index ae5ae4186e0..3ed882bb06f 100644 --- a/instat/UserTables/Rows/ucrRows.Designer.vb +++ b/instat/UserTables/Rows/ucrRows.Designer.vb @@ -40,7 +40,7 @@ Partial Class ucrRows Me.rdoRowsGroups.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsGroups.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsGroups.Location = New System.Drawing.Point(283, 3) + Me.rdoRowsGroups.Location = New System.Drawing.Point(203, 3) Me.rdoRowsGroups.Name = "rdoRowsGroups" Me.rdoRowsGroups.Size = New System.Drawing.Size(91, 29) Me.rdoRowsGroups.TabIndex = 280 @@ -60,7 +60,7 @@ Partial Class ucrRows Me.rdoRowsSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsSummaries.Location = New System.Drawing.Point(372, 3) + Me.rdoRowsSummaries.Location = New System.Drawing.Point(292, 3) Me.rdoRowsSummaries.Name = "rdoRowsSummaries" Me.rdoRowsSummaries.Size = New System.Drawing.Size(91, 29) Me.rdoRowsSummaries.TabIndex = 281 @@ -71,16 +71,16 @@ Partial Class ucrRows 'ucrPnlRows ' Me.ucrPnlRows.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRows.Location = New System.Drawing.Point(93, 3) + Me.ucrPnlRows.Location = New System.Drawing.Point(178, 3) Me.ucrPnlRows.Name = "ucrPnlRows" - Me.ucrPnlRows.Size = New System.Drawing.Size(506, 29) + Me.ucrPnlRows.Size = New System.Drawing.Size(232, 29) Me.ucrPnlRows.TabIndex = 279 ' 'ucrRowGroups ' Me.ucrRowGroups.Location = New System.Drawing.Point(3, 38) Me.ucrRowGroups.Name = "ucrRowGroups" - Me.ucrRowGroups.Size = New System.Drawing.Size(749, 194) + Me.ucrRowGroups.Size = New System.Drawing.Size(577, 306) Me.ucrRowGroups.TabIndex = 283 ' 'ucrRows @@ -92,7 +92,7 @@ Partial Class ucrRows Me.Controls.Add(Me.rdoRowsSummaries) Me.Controls.Add(Me.ucrPnlRows) Me.Name = "ucrRows" - Me.Size = New System.Drawing.Size(753, 237) + Me.Size = New System.Drawing.Size(583, 340) Me.ResumeLayout(False) End Sub diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 68cfe3210b0..d682e56a154 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -64,7 +64,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(784, 411) + Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 411) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -73,7 +73,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(813, 385) + Me.tbpHeader.Size = New System.Drawing.Size(673, 385) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -90,7 +90,7 @@ Partial Class sdgTableOptions Me.tbpStub.Controls.Add(Me.ucrStub) Me.tbpStub.Location = New System.Drawing.Point(4, 22) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(813, 385) + Me.tbpStub.Size = New System.Drawing.Size(673, 385) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True @@ -107,7 +107,7 @@ Partial Class sdgTableOptions Me.tbpColumns.Controls.Add(Me.ucrColumns) Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(813, 385) + Me.tbpColumns.Size = New System.Drawing.Size(648, 385) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True @@ -116,7 +116,7 @@ Partial Class sdgTableOptions ' Me.ucrColumns.Location = New System.Drawing.Point(5, 6) Me.ucrColumns.Name = "ucrColumns" - Me.ucrColumns.Size = New System.Drawing.Size(700, 270) + Me.ucrColumns.Size = New System.Drawing.Size(632, 270) Me.ucrColumns.TabIndex = 0 ' 'tbpRows @@ -124,7 +124,7 @@ Partial Class sdgTableOptions Me.tbpRows.Controls.Add(Me.ucrRows) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(776, 385) + Me.tbpRows.Size = New System.Drawing.Size(673, 385) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True @@ -133,7 +133,7 @@ Partial Class sdgTableOptions ' Me.ucrRows.Location = New System.Drawing.Point(7, 9) Me.ucrRows.Name = "ucrRows" - Me.ucrRows.Size = New System.Drawing.Size(750, 237) + Me.ucrRows.Size = New System.Drawing.Size(600, 345) Me.ucrRows.TabIndex = 0 ' 'tbpCells @@ -141,7 +141,7 @@ Partial Class sdgTableOptions Me.tbpCells.Controls.Add(Me.ucrCells) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(813, 385) + Me.tbpCells.Size = New System.Drawing.Size(673, 385) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True @@ -158,7 +158,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(813, 385) + Me.tbpSourceNotes.Size = New System.Drawing.Size(673, 385) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -180,7 +180,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(813, 385) + Me.tbpThemes.Size = New System.Drawing.Size(673, 385) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -240,7 +240,7 @@ Partial Class sdgTableOptions 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(219, 419) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 419) Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) @@ -250,7 +250,7 @@ Partial Class sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(788, 452) + Me.ClientSize = New System.Drawing.Size(661, 452) Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.tbpFormatOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow From 3e419a2c597fbcdc5ca8c0c151b157acdc718183 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 27 Jun 2024 07:47:10 +0300 Subject: [PATCH 057/273] Added cell foot notes --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 47 ++-- .../Cells/FootNotes/ucrCellsFootNotes.resx | 3 + .../Cells/FootNotes/ucrCellsFootNotes.vb | 254 +----------------- instat/UserTables/Cells/ucrCells.vb | 1 + 4 files changed, 38 insertions(+), 267 deletions(-) diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb index 64512ca006b..953fb124d7b 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -25,7 +25,7 @@ Partial Class ucrCellsFootNotes Me.lblRowExpression = New System.Windows.Forms.Label() Me.ucrInputRows = New instat.ucrInputTextBox() Me.lblFooteNotes = New System.Windows.Forms.Label() - Me.btnClearFormats = New System.Windows.Forms.Button() + Me.btnClear = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGridFootNotes = New System.Windows.Forms.DataGridView() @@ -35,7 +35,7 @@ Partial Class ucrCellsFootNotes Me.lblFootNote = New System.Windows.Forms.Label() Me.ucrTxtFootNote = New instat.ucrInputTextBox() Me.lblPlacement = New System.Windows.Forms.Label() - Me.ucrCboPlacement = New instat.ucrInputComboBox() + Me.cboPlacement = New System.Windows.Forms.ComboBox() CType(Me.dataGridFootNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -70,16 +70,16 @@ Partial Class ucrCellsFootNotes Me.lblFooteNotes.TabIndex = 336 Me.lblFooteNotes.Text = "Foot Notes:" ' - 'btnClearFormats + 'btnClear ' - Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearFormats.Location = New System.Drawing.Point(517, 210) - Me.btnClearFormats.Name = "btnClearFormats" - Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) - Me.btnClearFormats.TabIndex = 335 - Me.btnClearFormats.Tag = "" - Me.btnClearFormats.Text = "Clear" - Me.btnClearFormats.UseVisualStyleBackColor = True + Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClear.Location = New System.Drawing.Point(517, 210) + Me.btnClear.Name = "btnClear" + Me.btnClear.Size = New System.Drawing.Size(75, 23) + Me.btnClear.TabIndex = 335 + Me.btnClear.Tag = "" + Me.btnClear.Text = "Clear" + Me.btnClear.UseVisualStyleBackColor = True ' 'lblColumns ' @@ -176,29 +176,28 @@ Partial Class ucrCellsFootNotes Me.lblPlacement.TabIndex = 343 Me.lblPlacement.Text = "Placement:" ' - 'ucrCboPlacement + 'cboPlacement ' - Me.ucrCboPlacement.AddQuotesIfUnrecognised = True - Me.ucrCboPlacement.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboPlacement.GetSetSelectedIndex = -1 - Me.ucrCboPlacement.IsReadOnly = False - Me.ucrCboPlacement.Location = New System.Drawing.Point(241, 152) - Me.ucrCboPlacement.Name = "ucrCboPlacement" - Me.ucrCboPlacement.Size = New System.Drawing.Size(137, 21) - Me.ucrCboPlacement.TabIndex = 342 + Me.cboPlacement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboPlacement.FormattingEnabled = True + Me.cboPlacement.Items.AddRange(New Object() {"Auto", "Left", "Right"}) + Me.cboPlacement.Location = New System.Drawing.Point(241, 152) + Me.cboPlacement.Name = "cboPlacement" + Me.cboPlacement.Size = New System.Drawing.Size(136, 21) + Me.cboPlacement.TabIndex = 344 ' 'ucrCellsFootNotes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrCboPlacement) + Me.Controls.Add(Me.cboPlacement) Me.Controls.Add(Me.lblPlacement) Me.Controls.Add(Me.lblFootNote) Me.Controls.Add(Me.ucrTxtFootNote) Me.Controls.Add(Me.lblRowExpression) Me.Controls.Add(Me.ucrInputRows) Me.Controls.Add(Me.lblFooteNotes) - Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.btnClear) Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridFootNotes) @@ -214,7 +213,7 @@ Partial Class ucrCellsFootNotes Friend WithEvents lblRowExpression As Label Friend WithEvents ucrInputRows As ucrInputTextBox Friend WithEvents lblFooteNotes As Label - Friend WithEvents btnClearFormats As Button + Friend WithEvents btnClear As Button Friend WithEvents lblColumns As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents dataGridFootNotes As DataGridView @@ -224,5 +223,5 @@ Partial Class ucrCellsFootNotes Friend WithEvents lblFootNote As Label Friend WithEvents ucrTxtFootNote As ucrInputTextBox Friend WithEvents lblPlacement As Label - Friend WithEvents ucrCboPlacement As ucrInputComboBox + Friend WithEvents cboPlacement As ComboBox End Class diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx index d937ee32b35..a249bebae7f 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx @@ -120,4 +120,7 @@ True + + True + \ No newline at end of file diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb index 1f8734030b4..1e4b866db13 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb @@ -7,19 +7,7 @@ ucrReceiverSingleCol.Selector = ucrSelectorCols ucrReceiverSingleCol.SetMeAsReceiver() - - '----------------- - Dim dctPlacement As New Dictionary(Of String, String) From { - {"Default", "auto"}, - {"Auto", Chr(34) & "auto" & Chr(34)}, - {"Left", Chr(34) & "left" & Chr(34)}, - {"Right", Chr(34) & "right" & Chr(34)} - } - ucrCboPlacement.SetDropDownStyleAsNonEditable() - ucrCboPlacement.SetParameter(New RParameter("placement", iNewPosition:=1)) - ucrCboPlacement.SetItems(dctPlacement) - ucrCboPlacement.SetRDefault("auto") - '----------------- + cboPlacement.SelectedIndex = 0 End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -40,12 +28,13 @@ End Sub Public Sub SetValuesToOperator() - + ' Remove any previous cell footers Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_body", clsOperator) For Each clsRParam As RParameter In lstRParams clsOperator.RemoveParameter(clsRParam) Next + ' Add new changes clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFootNotes, clsOperator) End Sub @@ -71,43 +60,23 @@ Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click - sdgTableStyles.ShowDialog(Me.ParentForm) - Dim clsListStyleRFunction As RFunction = sdgTableStyles.GetNewUserInputAsRFunction() - - If clsListStyleRFunction Is Nothing Then - Exit Sub - End If - - AddFormatParameterToGrid(clsListStyleRFunction) - - End Sub - - - Private Sub AddFormatParameterToGrid(clsListStyleRFunction As RFunction) - Dim clsTabFootNoteRFunction As New RFunction - Dim clsLocationsRFunction As New RFunction - Dim strColumnsExpression As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) - Dim strRowsExpression As String = ucrInputRows.GetText - Dim strFootNoteText As String = ucrTxtFootNote.GetText clsLocationsRFunction.SetPackageName("gt") clsLocationsRFunction.SetRCommand("cells_body") - - ' Add columns parameter - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) - - ' Add rows as paramater if present - If Not ucrInputRows.IsEmpty Then - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) - End If + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrInputRows.GetText, iNewPosition:=1)) clsTabFootNoteRFunction.SetPackageName("gt") clsTabFootNoteRFunction.SetRCommand("tab_footnote") - clsTabFootNoteRFunction.AddParameter(strParameterName:="footnote", strParameterValue:=strFootNoteText, iPosition:=1) + clsTabFootNoteRFunction.AddParameter(strParameterName:="footnote", strParameterValue:=Chr(34) & ucrTxtFootNote.GetText & Chr(34), iPosition:=0) clsTabFootNoteRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) + If cboPlacement.Text.ToLower <> "auto" Then + clsTabFootNoteRFunction.AddParameter(strParameterName:="placement", strParameterValue:=Chr(34) & cboPlacement.Text.ToLower & Chr(34), iPosition:=2) + End If + ' Create parameter with unique name Dim clsRParam As New RParameter(strParameterName:="tab_footnote_cells_param" & (dataGridFootNotes.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) @@ -124,209 +93,8 @@ End Sub - Private Sub btnClearFormats_Click(sender As Object, e As EventArgs) Handles btnClearFormats.Click + Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click dataGridFootNotes.Rows.Clear() End Sub - - - '--------------------------------------------------------------------------------------- - 'Preevious code - - Public Sub Setup2(strDataFrameName As String, clsOperator As ROperator) - SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) - End Sub - - - - - Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) - - 'SetFooterGridContents(clsOperator, dataGridCellFooterNotes) - End Sub - - Private Sub SetFooterGridContents(clsOperator As ROperator, dataGridFooterNotes As DataGridView) - dataGridFooterNotes.Rows.Clear() - - For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters - If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then - ' Create a new row that represents the tab_footnote() parameters - Dim row As New DataGridViewRow - row.CreateCells(dataGridFooterNotes) - - Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure - - For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters - - If clsFootNoteRParam.strArgumentName = "footnote" Then - ' Set the foot note text - row.Cells(0).Value = clsTablesUtils.GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) - ElseIf clsFootNoteRParam.strArgumentName = "locations" Then - ' todo go through the location function - Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - - If clsFooterLocationNoteRFunction.strRCommand = "cells_body" Then - For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters - If clsFootNoteLocationRParam.strArgumentName = "columns" Then - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then - row.Cells(2).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - End If - Next - End If - End If - - ' Tag and add the tab_footnote() function contents as a row - ' Check if second cell has a value - If row.Cells(1).Value IsNot Nothing Then - row.Tag = clsFooterRFunction - dataGridFooterNotes.Rows.Add(row) - End If - - - Next - - End If - Next - - ' Always add a place holder row for new foot note - dataGridFooterNotes.Rows.Add() - - End Sub - - - Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) - Dim dataGrid As DataGridView = sender - Dim row As DataGridViewRow = dataGrid.Rows.Item(e.RowIndex) - Dim strNoteTextValue As String = row.Cells(0).Value - - ' If no foot note typed by user then just exit the sub - If String.IsNullOrEmpty(strNoteTextValue) Then - Exit Sub - End If - - Dim clsNoteRFunction As RFunction = Nothing - - - clsNoteRFunction = SetupAndGetNewNoteRFunction(row.Tag, "tab_footnote", "footnote", strNoteTextValue) - - ' Add column and row expressions as paramters if user has typed them - If Not String.IsNullOrEmpty(row.Cells(1).Value) AndAlso Not String.IsNullOrEmpty(row.Cells(2).Value) Then - Dim clsFooterLocationNoteRFunction As New RFunction - clsFooterLocationNoteRFunction.SetPackageName("gt") - clsFooterLocationNoteRFunction.SetRCommand("cells_body") - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=clsTablesUtils.GetStringValue(row.Cells(1).Value, False))) - clsFooterLocationNoteRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=clsTablesUtils.GetStringValue(row.Cells(2).Value, False))) - clsNoteRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=clsFooterLocationNoteRFunction, iNewPosition:=1)) - End If - - - ' Overwrite the tag with the new foot function - row.Tag = clsNoteRFunction - - ' If last row then add new empty row - If e.RowIndex = dataGrid.Rows.Count - 1 Then - dataGrid.Rows.Add() - End If - End Sub - - - 'Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridCellFooterNotes.CellClick - - ' Dim dataGrid As DataGridView = sender - ' Dim clsNoteRFunction As RFunction = dataGrid.Rows.Item(e.RowIndex).Tag - ' Dim strParameterName As String = Nothing - - ' '--------------------------- - ' ' Ignore clicks that are not from button cells. - ' If dataGrid Is dataGridCellFooterNotes Then - ' strParameterName = "footnote" - ' If e.ColumnIndex <> 3 Then - ' Exit Sub - ' End If - ' End If - ' '--------------------------- - - ' If clsNoteRFunction IsNot Nothing AndAlso strParameterName IsNot Nothing Then - ' sdgTableOptionsTextFormat.Setup(clsNoteRFunction.GetParameter(strParameterName).clsArgumentCodeStructure.GetParameter("style").clsArgumentCodeStructure) - ' sdgTableOptionsTextFormat.Show(Me) - ' End If - - 'End Sub - - - Private Function SetupAndGetNewNoteRFunction(clsPossibleNoteRFunction As RFunction, strNoteRCommand As String, strRNoteTextParameterName As String, strNoteTextValue As String) As RFunction - Dim clsNewNoteRFunction As RFunction = clsPossibleNoteRFunction - ' Get the prevous style parameter to retain any format options previously done - Dim clsStyleParam As RParameter - If clsNewNoteRFunction IsNot Nothing Then - clsStyleParam = clsNewNoteRFunction.GetParameter(strRNoteTextParameterName).clsArgumentCodeStructure.GetParameter("style") - Else - clsStyleParam = New RParameter(strParameterName:="style", strParamValue:=clsTablesUtils.GetNewHtmlStyleRFunction(), iNewPosition:=1) - End If - - - ' Recreate the footer function - clsNewNoteRFunction = New RFunction - clsNewNoteRFunction.SetPackageName("gt") - clsNewNoteRFunction.SetRCommand(strNoteRCommand) - - Dim clsNoteTextRFunction As RFunction = clsTablesUtils.GetNewHtmlSpanRFunction() - clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=clsTablesUtils.GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) - clsNoteTextRFunction.AddParameter(clsStyleParam) ' Add the style parameter for formating - - ' Add the foot note text parameter to the footer R function - clsNewNoteRFunction.AddParameter(New RParameter(strParameterName:=strRNoteTextParameterName, strParamValue:=clsNoteTextRFunction, iNewPosition:=0)) - Return clsNewNoteRFunction - End Function - - - Private Sub SetFooterGridContents1(clsOperator As ROperator, dataGridFooterNotes As DataGridView) - dataGridFooterNotes.Rows.Clear() - - For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters - If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then - ' Create a new row that represents the tab_footnote() parameters - Dim row As New DataGridViewRow - row.CreateCells(dataGridFooterNotes) - - Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure - - For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters - - If clsFootNoteRParam.strArgumentName = "footnote" Then - ' Set the foot note text - row.Cells(0).Value = clsTablesUtils.GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) - ElseIf clsFootNoteRParam.strArgumentName = "locations" Then - ' todo go through the location function - Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - - If clsFooterLocationNoteRFunction.strRCommand = "cells_body" Then - For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters - If clsFootNoteLocationRParam.strArgumentName = "columns" Then - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then - row.Cells(2).Value = clsTablesUtils.GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - End If - Next - End If - End If - - ' Tag and add the tab_footnote() function contents as a row - ' Check if second cell has a value - If row.Cells(1).Value IsNot Nothing Then - row.Tag = clsFooterRFunction - dataGridFooterNotes.Rows.Add(row) - End If - - - Next - - End If - Next - - ' Always add a place holder row for new foot note - dataGridFooterNotes.Rows.Add() - - End Sub End Class diff --git a/instat/UserTables/Cells/ucrCells.vb b/instat/UserTables/Cells/ucrCells.vb index 0d74ab3e2d8..9a367caef91 100644 --- a/instat/UserTables/Cells/ucrCells.vb +++ b/instat/UserTables/Cells/ucrCells.vb @@ -28,6 +28,7 @@ Public Sub SetValuesToOperator() ucrCellFormats.SetValuesToOperator() + ucrCellsFootNotes.SetValuesToOperator() ucrCellStyles.SetValuesToOperator() End Sub From 8546157adfe4bd8827a4d37bb81afb3116c348df Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 27 Jun 2024 09:28:17 +0300 Subject: [PATCH 058/273] Made structural changes and added more features --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 87 +++------ .../Cells/FootNotes/ucrCellsFootNotes.resx | 3 - .../Cells/FootNotes/ucrCellsFootNotes.vb | 21 +-- .../Columns/ucrColumnFootNote.Designer.vb | 176 +++++++++++++++++ .../UserTables/Columns/ucrColumnFootNote.resx | 126 +++++++++++++ .../UserTables/Columns/ucrColumnFootNote.vb | 93 +++++++++ .../Columns/ucrColumnLabels.Designer.vb | 16 +- .../Columns/ucrColumnSpanners.Designer.vb | 112 +++++------ .../UserTables/Columns/ucrColumnSpanners.vb | 18 +- .../Columns/ucrColumnWidth.Designer.vb | 178 ++++++++++++++++++ instat/UserTables/Columns/ucrColumnWidth.resx | 123 ++++++++++++ instat/UserTables/Columns/ucrColumnWidth.vb | 87 +++++++++ .../UserTables/Columns/ucrColumns.Designer.vb | 155 ++++++++++++++- instat/UserTables/Columns/ucrColumns.vb | 16 +- instat/UserTables/sdgTableOptions.Designer.vb | 20 +- instat/UserTables/sdgTableOptions.vb | 11 +- instat/instat.vbproj | 18 ++ 17 files changed, 1084 insertions(+), 176 deletions(-) create mode 100644 instat/UserTables/Columns/ucrColumnFootNote.Designer.vb create mode 100644 instat/UserTables/Columns/ucrColumnFootNote.resx create mode 100644 instat/UserTables/Columns/ucrColumnFootNote.vb create mode 100644 instat/UserTables/Columns/ucrColumnWidth.Designer.vb create mode 100644 instat/UserTables/Columns/ucrColumnWidth.resx create mode 100644 instat/UserTables/Columns/ucrColumnWidth.vb diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb index 953fb124d7b..1dfcb663dfe 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -28,15 +28,13 @@ Partial Class ucrCellsFootNotes Me.btnClear = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.dataGridFootNotes = New System.Windows.Forms.DataGridView() + Me.dataGrid = New System.Windows.Forms.DataGridView() Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.btnAdd = New System.Windows.Forms.Button() - Me.lblFootNote = New System.Windows.Forms.Label() Me.ucrTxtFootNote = New instat.ucrInputTextBox() - Me.lblPlacement = New System.Windows.Forms.Label() - Me.cboPlacement = New System.Windows.Forms.ComboBox() - CType(Me.dataGridFootNotes, System.ComponentModel.ISupportInitialize).BeginInit() + Me.lblFootNote = New System.Windows.Forms.Label() + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'lblRowExpression @@ -64,7 +62,7 @@ Partial Class ucrCellsFootNotes ' Me.lblFooteNotes.AutoSize = True Me.lblFooteNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFooteNotes.Location = New System.Drawing.Point(233, 219) + Me.lblFooteNotes.Location = New System.Drawing.Point(233, 171) Me.lblFooteNotes.Name = "lblFooteNotes" Me.lblFooteNotes.Size = New System.Drawing.Size(62, 13) Me.lblFooteNotes.TabIndex = 336 @@ -73,7 +71,7 @@ Partial Class ucrCellsFootNotes 'btnClear ' Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClear.Location = New System.Drawing.Point(517, 210) + Me.btnClear.Location = New System.Drawing.Point(517, 162) Me.btnClear.Name = "btnClear" Me.btnClear.Size = New System.Drawing.Size(75, 23) Me.btnClear.TabIndex = 335 @@ -103,16 +101,16 @@ Partial Class ucrCellsFootNotes Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 332 ' - 'dataGridFootNotes + 'dataGrid ' - Me.dataGridFootNotes.AllowUserToAddRows = False - Me.dataGridFootNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridFootNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) - Me.dataGridFootNotes.Location = New System.Drawing.Point(236, 236) - Me.dataGridFootNotes.Name = "dataGridFootNotes" - Me.dataGridFootNotes.RowHeadersWidth = 62 - Me.dataGridFootNotes.Size = New System.Drawing.Size(361, 73) - Me.dataGridFootNotes.TabIndex = 331 + Me.dataGrid.AllowUserToAddRows = False + Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) + Me.dataGrid.Location = New System.Drawing.Point(236, 188) + Me.dataGrid.Name = "dataGrid" + Me.dataGrid.RowHeadersWidth = 62 + Me.dataGrid.Size = New System.Drawing.Size(361, 73) + Me.dataGrid.TabIndex = 331 ' 'colStyles ' @@ -138,24 +136,14 @@ Partial Class ucrCellsFootNotes ' Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAdd.Location = New System.Drawing.Point(241, 183) + Me.btnAdd.Location = New System.Drawing.Point(241, 135) Me.btnAdd.Name = "btnAdd" - Me.btnAdd.Size = New System.Drawing.Size(126, 23) + Me.btnAdd.Size = New System.Drawing.Size(83, 23) Me.btnAdd.TabIndex = 333 Me.btnAdd.Tag = "" - Me.btnAdd.Text = "Add Foot Note" + Me.btnAdd.Text = "Add" Me.btnAdd.UseVisualStyleBackColor = True ' - 'lblFootNote - ' - Me.lblFootNote.AutoSize = True - Me.lblFootNote.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFootNote.Location = New System.Drawing.Point(243, 91) - Me.lblFootNote.Name = "lblFootNote" - Me.lblFootNote.Size = New System.Drawing.Size(81, 13) - Me.lblFootNote.TabIndex = 341 - Me.lblFootNote.Text = "Foot Note Text:" - ' 'ucrTxtFootNote ' Me.ucrTxtFootNote.AddQuotesIfUnrecognised = True @@ -164,34 +152,23 @@ Partial Class ucrCellsFootNotes Me.ucrTxtFootNote.IsReadOnly = False Me.ucrTxtFootNote.Location = New System.Drawing.Point(241, 107) Me.ucrTxtFootNote.Name = "ucrTxtFootNote" - Me.ucrTxtFootNote.Size = New System.Drawing.Size(279, 21) + Me.ucrTxtFootNote.Size = New System.Drawing.Size(136, 21) Me.ucrTxtFootNote.TabIndex = 340 ' - 'lblPlacement - ' - Me.lblPlacement.AutoSize = True - Me.lblPlacement.Location = New System.Drawing.Point(238, 136) - Me.lblPlacement.Name = "lblPlacement" - Me.lblPlacement.Size = New System.Drawing.Size(60, 13) - Me.lblPlacement.TabIndex = 343 - Me.lblPlacement.Text = "Placement:" - ' - 'cboPlacement + 'lblFootNote ' - Me.cboPlacement.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboPlacement.FormattingEnabled = True - Me.cboPlacement.Items.AddRange(New Object() {"Auto", "Left", "Right"}) - Me.cboPlacement.Location = New System.Drawing.Point(241, 152) - Me.cboPlacement.Name = "cboPlacement" - Me.cboPlacement.Size = New System.Drawing.Size(136, 21) - Me.cboPlacement.TabIndex = 344 + Me.lblFootNote.AutoSize = True + Me.lblFootNote.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFootNote.Location = New System.Drawing.Point(243, 91) + Me.lblFootNote.Name = "lblFootNote" + Me.lblFootNote.Size = New System.Drawing.Size(81, 13) + Me.lblFootNote.TabIndex = 341 + Me.lblFootNote.Text = "Foot Note Text:" ' 'ucrCellsFootNotes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.cboPlacement) - Me.Controls.Add(Me.lblPlacement) Me.Controls.Add(Me.lblFootNote) Me.Controls.Add(Me.ucrTxtFootNote) Me.Controls.Add(Me.lblRowExpression) @@ -200,12 +177,12 @@ Partial Class ucrCellsFootNotes Me.Controls.Add(Me.btnClear) Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.dataGridFootNotes) + Me.Controls.Add(Me.dataGrid) Me.Controls.Add(Me.ucrReceiverSingleCol) Me.Controls.Add(Me.btnAdd) Me.Name = "ucrCellsFootNotes" - Me.Size = New System.Drawing.Size(602, 314) - CType(Me.dataGridFootNotes, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(602, 265) + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -216,12 +193,10 @@ Partial Class ucrCellsFootNotes Friend WithEvents btnClear As Button Friend WithEvents lblColumns As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents dataGridFootNotes As DataGridView + Friend WithEvents dataGrid As DataGridView Friend WithEvents colStyles As DataGridViewTextBoxColumn Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle Friend WithEvents btnAdd As Button - Friend WithEvents lblFootNote As Label Friend WithEvents ucrTxtFootNote As ucrInputTextBox - Friend WithEvents lblPlacement As Label - Friend WithEvents cboPlacement As ComboBox + Friend WithEvents lblFootNote As Label End Class diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx index a249bebae7f..d937ee32b35 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx @@ -120,7 +120,4 @@ True - - True - \ No newline at end of file diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb index 1e4b866db13..79e92836983 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb @@ -6,8 +6,6 @@ Private Sub InitialiseControl() ucrReceiverSingleCol.Selector = ucrSelectorCols ucrReceiverSingleCol.SetMeAsReceiver() - - cboPlacement.SelectedIndex = 0 End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -22,7 +20,7 @@ ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) ' Clear and Set up the data grid with contents - dataGridFootNotes.Rows.Clear() + dataGrid.Rows.Clear() SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_body", clsOperator)) End Sub @@ -35,7 +33,7 @@ Next ' Add new changes - clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFootNotes, clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) End Sub Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) @@ -44,12 +42,12 @@ ' Create a new row that represents the tab_style() parameters Dim row As New DataGridViewRow - row.CreateCells(dataGridFootNotes) + row.CreateCells(dataGrid) row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript ' Tag and add the tab_style() parameter function contents as a row row.Tag = clsRParam - dataGridFootNotes.Rows.Add(row) + dataGrid.Rows.Add(row) Next End Sub @@ -73,28 +71,25 @@ clsTabFootNoteRFunction.SetRCommand("tab_footnote") clsTabFootNoteRFunction.AddParameter(strParameterName:="footnote", strParameterValue:=Chr(34) & ucrTxtFootNote.GetText & Chr(34), iPosition:=0) clsTabFootNoteRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) - If cboPlacement.Text.ToLower <> "auto" Then - clsTabFootNoteRFunction.AddParameter(strParameterName:="placement", strParameterValue:=Chr(34) & cboPlacement.Text.ToLower & Chr(34), iPosition:=2) - End If ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_footnote_cells_param" & (dataGridFootNotes.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) + Dim clsRParam As New RParameter(strParameterName:="tab_footnote_cells_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) ' Create row and its cells Dim row As New DataGridViewRow - row.CreateCells(dataGridFootNotes) + row.CreateCells(dataGrid) row.Cells(0).Value = clsTabFootNoteRFunction.Clone.ToScript ' Tag the row with the parameter row.Tag = clsRParam ' Add it to grid - dataGridFootNotes.Rows.Add(row) + dataGrid.Rows.Add(row) End Sub Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click - dataGridFootNotes.Rows.Clear() + dataGrid.Rows.Clear() End Sub End Class diff --git a/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb b/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb new file mode 100644 index 00000000000..468016ceba0 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb @@ -0,0 +1,176 @@ + _ +Partial Class ucrColumnFootNote + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblFooteNotes = New System.Windows.Forms.Label() + Me.btnClear = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGrid = New System.Windows.Forms.DataGridView() + Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblFootNote = New System.Windows.Forms.Label() + Me.ucrTxtFootNote = New instat.ucrInputTextBox() + Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() + Me.btnAdd = New System.Windows.Forms.Button() + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblFooteNotes + ' + Me.lblFooteNotes.AutoSize = True + Me.lblFooteNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFooteNotes.Location = New System.Drawing.Point(231, 125) + Me.lblFooteNotes.Name = "lblFooteNotes" + Me.lblFooteNotes.Size = New System.Drawing.Size(62, 13) + Me.lblFooteNotes.TabIndex = 347 + Me.lblFooteNotes.Text = "Foot Notes:" + ' + 'btnClear + ' + Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClear.Location = New System.Drawing.Point(515, 116) + Me.btnClear.Name = "btnClear" + Me.btnClear.Size = New System.Drawing.Size(75, 23) + Me.btnClear.TabIndex = 346 + Me.btnClear.Tag = "" + Me.btnClear.Text = "Clear" + Me.btnClear.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(241, 4) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.TabIndex = 345 + Me.lblColumns.Text = "Column:" + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 4) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 343 + ' + 'dataGrid + ' + Me.dataGrid.AllowUserToAddRows = False + Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) + Me.dataGrid.Location = New System.Drawing.Point(234, 142) + Me.dataGrid.Name = "dataGrid" + Me.dataGrid.RowHeadersWidth = 62 + Me.dataGrid.Size = New System.Drawing.Size(361, 73) + Me.dataGrid.TabIndex = 342 + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Foot Note Expressions" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" + ' + 'lblFootNote + ' + Me.lblFootNote.AutoSize = True + Me.lblFootNote.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFootNote.Location = New System.Drawing.Point(241, 45) + Me.lblFootNote.Name = "lblFootNote" + Me.lblFootNote.Size = New System.Drawing.Size(81, 13) + Me.lblFootNote.TabIndex = 352 + Me.lblFootNote.Text = "Foot Note Text:" + ' + 'ucrTxtFootNote + ' + Me.ucrTxtFootNote.AddQuotesIfUnrecognised = True + Me.ucrTxtFootNote.AutoSize = True + Me.ucrTxtFootNote.IsMultiline = False + Me.ucrTxtFootNote.IsReadOnly = False + Me.ucrTxtFootNote.Location = New System.Drawing.Point(239, 61) + Me.ucrTxtFootNote.Name = "ucrTxtFootNote" + Me.ucrTxtFootNote.Size = New System.Drawing.Size(136, 21) + Me.ucrTxtFootNote.TabIndex = 351 + ' + 'ucrReceiverSingleCol + ' + Me.ucrReceiverSingleCol.AutoSize = True + Me.ucrReceiverSingleCol.frmParent = Nothing + Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(239, 18) + Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" + Me.ucrReceiverSingleCol.Selector = Nothing + Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSingleCol.strNcFilePath = "" + Me.ucrReceiverSingleCol.TabIndex = 350 + Me.ucrReceiverSingleCol.ucrSelector = Nothing + ' + 'btnAdd + ' + Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAdd.Location = New System.Drawing.Point(239, 89) + Me.btnAdd.Name = "btnAdd" + Me.btnAdd.Size = New System.Drawing.Size(83, 23) + Me.btnAdd.TabIndex = 344 + Me.btnAdd.Tag = "" + Me.btnAdd.Text = "Add" + Me.btnAdd.UseVisualStyleBackColor = True + ' + 'ucrColumnFootNote + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblFooteNotes) + Me.Controls.Add(Me.btnClear) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGrid) + Me.Controls.Add(Me.lblFootNote) + Me.Controls.Add(Me.ucrTxtFootNote) + Me.Controls.Add(Me.ucrReceiverSingleCol) + Me.Controls.Add(Me.btnAdd) + Me.Name = "ucrColumnFootNote" + Me.Size = New System.Drawing.Size(599, 220) + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblFooteNotes As Label + Friend WithEvents btnClear As Button + Friend WithEvents lblColumns As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGrid As DataGridView + Friend WithEvents colStyles As DataGridViewTextBoxColumn + Friend WithEvents lblFootNote As Label + Friend WithEvents ucrTxtFootNote As ucrInputTextBox + Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle + Friend WithEvents btnAdd As Button +End Class diff --git a/instat/UserTables/Columns/ucrColumnFootNote.resx b/instat/UserTables/Columns/ucrColumnFootNote.resx new file mode 100644 index 00000000000..a249bebae7f --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnFootNote.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnFootNote.vb b/instat/UserTables/Columns/ucrColumnFootNote.vb new file mode 100644 index 00000000000..78a4adf282c --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnFootNote.vb @@ -0,0 +1,93 @@ +Public Class ucrColumnFootNote + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub InitialiseControl() + ucrReceiverSingleCol.Selector = ucrSelectorCols + ucrReceiverSingleCol.SetMeAsReceiver() + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + ' Clear and Set up the data grid with contents + dataGrid.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_column_labels", clsOperator)) + + End Sub + + Public Sub SetValuesToOperator() + ' Remove any previous cell footers + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_column_labels", clsOperator) + For Each clsRParam As RParameter In lstRParams + clsOperator.RemoveParameter(clsRParam) + Next + + ' Add new changes + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGrid) + row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGrid.Rows.Add(row) + + Next + End Sub + + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSingleCol.ControlContentsChanged + btnAdd.Enabled = Not ucrReceiverSingleCol.IsEmpty + End Sub + + Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click + + Dim clsTabFootNoteRFunction As New RFunction + Dim clsLocationsRFunction As New RFunction + + + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_column_labels") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + + clsTabFootNoteRFunction.SetPackageName("gt") + clsTabFootNoteRFunction.SetRCommand("tab_footnote") + clsTabFootNoteRFunction.AddParameter(strParameterName:="footnote", strParameterValue:=Chr(34) & ucrTxtFootNote.GetText & Chr(34), iPosition:=0) + clsTabFootNoteRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_footnote_columns_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGrid) + row.Cells(0).Value = clsTabFootNoteRFunction.Clone.ToScript + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGrid.Rows.Add(row) + + End Sub + + Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click + dataGrid.Rows.Clear() + End Sub + +End Class diff --git a/instat/UserTables/Columns/ucrColumnLabels.Designer.vb b/instat/UserTables/Columns/ucrColumnLabels.Designer.vb index e3e235b0ba8..2f571311c77 100644 --- a/instat/UserTables/Columns/ucrColumnLabels.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnLabels.Designer.vb @@ -42,7 +42,7 @@ Partial Class ucrColumnLabels Me.dataGridColLabels.AllowUserToAddRows = False Me.dataGridColLabels.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridColLabels.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridColLabels.Location = New System.Drawing.Point(230, 95) + Me.dataGridColLabels.Location = New System.Drawing.Point(230, 159) Me.dataGridColLabels.Name = "dataGridColLabels" Me.dataGridColLabels.RowHeadersWidth = 62 Me.dataGridColLabels.Size = New System.Drawing.Size(339, 95) @@ -78,16 +78,16 @@ Partial Class ucrColumnLabels Me.ucrInputColLabel.AutoSize = True Me.ucrInputColLabel.IsMultiline = False Me.ucrInputColLabel.IsReadOnly = False - Me.ucrInputColLabel.Location = New System.Drawing.Point(357, 27) + Me.ucrInputColLabel.Location = New System.Drawing.Point(230, 73) Me.ucrInputColLabel.Name = "ucrInputColLabel" - Me.ucrInputColLabel.Size = New System.Drawing.Size(100, 21) + Me.ucrInputColLabel.Size = New System.Drawing.Size(119, 21) Me.ucrInputColLabel.TabIndex = 320 ' 'lblCondition ' Me.lblCondition.AutoSize = True Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(358, 10) + Me.lblCondition.Location = New System.Drawing.Point(227, 57) Me.lblCondition.Name = "lblCondition" Me.lblCondition.Size = New System.Drawing.Size(36, 13) Me.lblCondition.TabIndex = 319 @@ -97,7 +97,7 @@ Partial Class ucrColumnLabels ' Me.lblColLabels.AutoSize = True Me.lblColLabels.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColLabels.Location = New System.Drawing.Point(227, 76) + Me.lblColLabels.Location = New System.Drawing.Point(227, 140) Me.lblColLabels.Name = "lblColLabels" Me.lblColLabels.Size = New System.Drawing.Size(79, 13) Me.lblColLabels.TabIndex = 315 @@ -106,7 +106,7 @@ Partial Class ucrColumnLabels 'btnClearLabels ' Me.btnClearLabels.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearLabels.Location = New System.Drawing.Point(490, 71) + Me.btnClearLabels.Location = New System.Drawing.Point(490, 135) Me.btnClearLabels.Name = "btnClearLabels" Me.btnClearLabels.Size = New System.Drawing.Size(79, 23) Me.btnClearLabels.TabIndex = 314 @@ -128,7 +128,7 @@ Partial Class ucrColumnLabels ' Me.btnAddLabel.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddLabel.Location = New System.Drawing.Point(462, 26) + Me.btnAddLabel.Location = New System.Drawing.Point(230, 100) Me.btnAddLabel.Name = "btnAddLabel" Me.btnAddLabel.Size = New System.Drawing.Size(78, 23) Me.btnAddLabel.TabIndex = 312 @@ -175,7 +175,7 @@ Partial Class ucrColumnLabels Me.Controls.Add(Me.ucrReceiverSingleCol) Me.Controls.Add(Me.ucrSelectorCols) Me.Name = "ucrColumnLabels" - Me.Size = New System.Drawing.Size(575, 194) + Me.Size = New System.Drawing.Size(575, 257) CType(Me.dataGridColLabels, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb index 1d296fe8707..a04156ee21d 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb @@ -27,22 +27,22 @@ Partial Class ucrColumnSpanners Me.lblColumns = New System.Windows.Forms.Label() Me.btnAddColSpanner = New System.Windows.Forms.Button() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.dataGridSpanners = New System.Windows.Forms.DataGridView() - Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() - Me.lblColSpanner = New System.Windows.Forms.Label() - Me.ucrInputColSpanner = New instat.ucrInputTextBox() + Me.dataGrid = New System.Windows.Forms.DataGridView() Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colSpanners = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() - CType(Me.dataGridSpanners, System.ComponentModel.ISupportInitialize).BeginInit() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.lblColSpanner = New System.Windows.Forms.Label() + Me.ucrInputColSpanner = New instat.ucrInputTextBox() + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'lblSpanners ' Me.lblSpanners.AutoSize = True Me.lblSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSpanners.Location = New System.Drawing.Point(245, 118) + Me.lblSpanners.Location = New System.Drawing.Point(245, 171) Me.lblSpanners.Name = "lblSpanners" Me.lblSpanners.Size = New System.Drawing.Size(93, 13) Me.lblSpanners.TabIndex = 297 @@ -52,7 +52,7 @@ Partial Class ucrColumnSpanners ' Me.btnClearSpanners.Enabled = False Me.btnClearSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearSpanners.Location = New System.Drawing.Point(534, 111) + Me.btnClearSpanners.Location = New System.Drawing.Point(534, 162) Me.btnClearSpanners.Name = "btnClearSpanners" Me.btnClearSpanners.Size = New System.Drawing.Size(75, 23) Me.btnClearSpanners.TabIndex = 295 @@ -64,7 +64,7 @@ Partial Class ucrColumnSpanners ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(245, 5) + Me.lblColumns.Location = New System.Drawing.Point(242, 5) Me.lblColumns.Name = "lblColumns" Me.lblColumns.Size = New System.Drawing.Size(56, 13) Me.lblColumns.TabIndex = 294 @@ -74,7 +74,7 @@ Partial Class ucrColumnSpanners ' Me.btnAddColSpanner.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddColSpanner.Location = New System.Drawing.Point(472, 20) + Me.btnAddColSpanner.Location = New System.Drawing.Point(243, 138) Me.btnAddColSpanner.Name = "btnAddColSpanner" Me.btnAddColSpanner.Size = New System.Drawing.Size(88, 23) Me.btnAddColSpanner.TabIndex = 292 @@ -94,50 +94,16 @@ Partial Class ucrColumnSpanners Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 290 ' - 'dataGridSpanners - ' - Me.dataGridSpanners.AllowUserToAddRows = False - Me.dataGridSpanners.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSpanners.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colSpanners, Me.colFormat}) - Me.dataGridSpanners.Location = New System.Drawing.Point(240, 138) - Me.dataGridSpanners.Name = "dataGridSpanners" - Me.dataGridSpanners.RowHeadersWidth = 62 - Me.dataGridSpanners.Size = New System.Drawing.Size(369, 73) - Me.dataGridSpanners.TabIndex = 289 - ' - 'ucrReceiverMultipleCols + 'dataGrid ' - Me.ucrReceiverMultipleCols.AutoSize = True - Me.ucrReceiverMultipleCols.frmParent = Nothing - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(240, 21) - Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" - Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 78) - Me.ucrReceiverMultipleCols.strNcFilePath = "" - Me.ucrReceiverMultipleCols.TabIndex = 299 - Me.ucrReceiverMultipleCols.ucrSelector = Nothing - ' - 'lblColSpanner - ' - Me.lblColSpanner.AutoSize = True - Me.lblColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColSpanner.Location = New System.Drawing.Point(370, 5) - Me.lblColSpanner.Name = "lblColSpanner" - Me.lblColSpanner.Size = New System.Drawing.Size(79, 13) - Me.lblColSpanner.TabIndex = 301 - Me.lblColSpanner.Text = "Spanner Label:" - ' - 'ucrInputColSpanner - ' - Me.ucrInputColSpanner.AddQuotesIfUnrecognised = True - Me.ucrInputColSpanner.AutoSize = True - Me.ucrInputColSpanner.IsMultiline = False - Me.ucrInputColSpanner.IsReadOnly = False - Me.ucrInputColSpanner.Location = New System.Drawing.Point(368, 22) - Me.ucrInputColSpanner.Name = "ucrInputColSpanner" - Me.ucrInputColSpanner.Size = New System.Drawing.Size(100, 21) - Me.ucrInputColSpanner.TabIndex = 307 + Me.dataGrid.AllowUserToAddRows = False + Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colSpanners, Me.colFormat}) + Me.dataGrid.Location = New System.Drawing.Point(240, 188) + Me.dataGrid.Name = "dataGrid" + Me.dataGrid.RowHeadersWidth = 62 + Me.dataGrid.Size = New System.Drawing.Size(369, 73) + Me.dataGrid.TabIndex = 289 ' 'colId ' @@ -169,6 +135,40 @@ Partial Class ucrColumnSpanners Me.colFormat.Name = "colFormat" Me.colFormat.Width = 8 ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(240, 21) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 64) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 299 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'lblColSpanner + ' + Me.lblColSpanner.AutoSize = True + Me.lblColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColSpanner.Location = New System.Drawing.Point(245, 94) + Me.lblColSpanner.Name = "lblColSpanner" + Me.lblColSpanner.Size = New System.Drawing.Size(79, 13) + Me.lblColSpanner.TabIndex = 301 + Me.lblColSpanner.Text = "Spanner Label:" + ' + 'ucrInputColSpanner + ' + Me.ucrInputColSpanner.AddQuotesIfUnrecognised = True + Me.ucrInputColSpanner.AutoSize = True + Me.ucrInputColSpanner.IsMultiline = False + Me.ucrInputColSpanner.IsReadOnly = False + Me.ucrInputColSpanner.Location = New System.Drawing.Point(243, 111) + Me.ucrInputColSpanner.Name = "ucrInputColSpanner" + Me.ucrInputColSpanner.Size = New System.Drawing.Size(117, 21) + Me.ucrInputColSpanner.TabIndex = 307 + ' 'ucrColumnSpanners ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -181,10 +181,10 @@ Partial Class ucrColumnSpanners Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.btnAddColSpanner) Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.dataGridSpanners) + Me.Controls.Add(Me.dataGrid) Me.Name = "ucrColumnSpanners" - Me.Size = New System.Drawing.Size(612, 216) - CType(Me.dataGridSpanners, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(612, 265) + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -194,7 +194,7 @@ Partial Class ucrColumnSpanners Friend WithEvents lblColumns As Label Friend WithEvents btnAddColSpanner As Button Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents dataGridSpanners As DataGridView + Friend WithEvents dataGrid As DataGridView Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents lblColSpanner As Label Friend WithEvents ucrInputColSpanner As ucrInputTextBox diff --git a/instat/UserTables/Columns/ucrColumnSpanners.vb b/instat/UserTables/Columns/ucrColumnSpanners.vb index 219b5b51b5a..5c4676dd144 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.vb @@ -17,7 +17,7 @@ Me.clsOperator = clsOperator ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) - dataGridSpanners.Rows.Clear() + dataGrid.Rows.Clear() Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_spanner"}, clsOperator) @@ -26,7 +26,7 @@ Dim clsTabSpannerRFunction As RFunction = clsRParam.clsArgumentCodeStructure Dim row As New DataGridViewRow - row.CreateCells(dataGridSpanners) + row.CreateCells(dataGrid) For Each clsTabSpannerRParam As RParameter In clsTabSpannerRFunction.clsParameters If clsTabSpannerRParam.strArgumentName = "id" Then @@ -39,7 +39,7 @@ Next row.Tag = clsRParam - dataGridSpanners.Rows.Add(row) + dataGrid.Rows.Add(row) Next @@ -59,17 +59,17 @@ clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_spanner_param" & (dataGridSpanners.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) + Dim clsRParam As New RParameter(strParameterName:="tab_spanner_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) Dim row As New DataGridViewRow - row.CreateCells(dataGridSpanners) + row.CreateCells(dataGrid) row.Cells(0).Value = strSpannerId row.Cells(1).Value = strSpannerLabel row.Cells(2).Value = strSpannerColsRFunction row.Tag = clsRParam - dataGridSpanners.Rows.Add(row) + dataGrid.Rows.Add(row) ' Add to parameter clsOperator.AddParameter(clsRParam) @@ -80,10 +80,10 @@ End Sub Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearSpanners.Click - For index As Integer = 0 To dataGridSpanners.Rows.Count - 1 - clsOperator.RemoveParameter(dataGridSpanners.Rows(index).Tag) + For index As Integer = 0 To dataGrid.Rows.Count - 1 + clsOperator.RemoveParameter(dataGrid.Rows(index).Tag) Next - dataGridSpanners.Rows.Clear() + dataGrid.Rows.Clear() End Sub diff --git a/instat/UserTables/Columns/ucrColumnWidth.Designer.vb b/instat/UserTables/Columns/ucrColumnWidth.Designer.vb new file mode 100644 index 00000000000..9b80946b34f --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnWidth.Designer.vb @@ -0,0 +1,178 @@ + _ +Partial Class ucrColumnWidth + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblColumnWidths = New System.Windows.Forms.Label() + Me.btnClear = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.btnAdd = New System.Windows.Forms.Button() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.dataGrid = New System.Windows.Forms.DataGridView() + Me.colWidthExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.lblColWidth = New System.Windows.Forms.Label() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.ucrNudWidth = New instat.ucrNud() + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblColumnWidths + ' + Me.lblColumnWidths.AutoSize = True + Me.lblColumnWidths.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumnWidths.Location = New System.Drawing.Point(245, 171) + Me.lblColumnWidths.Name = "lblColumnWidths" + Me.lblColumnWidths.Size = New System.Drawing.Size(81, 13) + Me.lblColumnWidths.TabIndex = 313 + Me.lblColumnWidths.Text = "Column Widths:" + ' + 'btnClear + ' + Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClear.Location = New System.Drawing.Point(534, 162) + Me.btnClear.Name = "btnClear" + Me.btnClear.Size = New System.Drawing.Size(75, 23) + Me.btnClear.TabIndex = 312 + Me.btnClear.Tag = "" + Me.btnClear.Text = "Clear" + Me.btnClear.UseVisualStyleBackColor = True + ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(242, 5) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(56, 13) + Me.lblColumns.TabIndex = 311 + Me.lblColumns.Text = "Column(s):" + ' + 'btnAdd + ' + Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAdd.Location = New System.Drawing.Point(243, 138) + Me.btnAdd.Name = "btnAdd" + Me.btnAdd.Size = New System.Drawing.Size(88, 23) + Me.btnAdd.TabIndex = 310 + Me.btnAdd.Tag = "" + Me.btnAdd.Text = "Add" + Me.btnAdd.UseVisualStyleBackColor = True + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 5) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 309 + ' + 'dataGrid + ' + Me.dataGrid.AllowUserToAddRows = False + Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colWidthExpression}) + Me.dataGrid.Location = New System.Drawing.Point(240, 188) + Me.dataGrid.Name = "dataGrid" + Me.dataGrid.RowHeadersWidth = 62 + Me.dataGrid.Size = New System.Drawing.Size(369, 73) + Me.dataGrid.TabIndex = 308 + ' + 'colWidthExpression + ' + Me.colWidthExpression.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colWidthExpression.HeaderText = "Width Expression" + Me.colWidthExpression.Name = "colWidthExpression" + Me.colWidthExpression.ReadOnly = True + ' + 'lblColWidth + ' + Me.lblColWidth.AutoSize = True + Me.lblColWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColWidth.Location = New System.Drawing.Point(245, 94) + Me.lblColWidth.Name = "lblColWidth" + Me.lblColWidth.Size = New System.Drawing.Size(38, 13) + Me.lblColWidth.TabIndex = 315 + Me.lblColWidth.Text = "Width:" + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(240, 21) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 64) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 314 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'ucrNudWidth + ' + Me.ucrNudWidth.AutoSize = True + Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWidth.Location = New System.Drawing.Point(246, 110) + Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWidth.Name = "ucrNudWidth" + Me.ucrNudWidth.Size = New System.Drawing.Size(50, 20) + Me.ucrNudWidth.TabIndex = 318 + Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrColumnWidth + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrNudWidth) + Me.Controls.Add(Me.lblColumnWidths) + Me.Controls.Add(Me.btnClear) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.btnAdd) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.dataGrid) + Me.Controls.Add(Me.lblColWidth) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Name = "ucrColumnWidth" + Me.Size = New System.Drawing.Size(613, 267) + CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblColumnWidths As Label + Friend WithEvents btnClear As Button + Friend WithEvents lblColumns As Label + Friend WithEvents btnAdd As Button + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents dataGrid As DataGridView + Friend WithEvents colWidthExpression As DataGridViewTextBoxColumn + Friend WithEvents lblColWidth As Label + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents ucrNudWidth As ucrNud +End Class diff --git a/instat/UserTables/Columns/ucrColumnWidth.resx b/instat/UserTables/Columns/ucrColumnWidth.resx new file mode 100644 index 00000000000..58cffaf9bfe --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnWidth.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnWidth.vb b/instat/UserTables/Columns/ucrColumnWidth.vb new file mode 100644 index 00000000000..e8e244d82f7 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnWidth.vb @@ -0,0 +1,87 @@ +Public Class ucrColumnWidth + + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub InitialiseControl() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + + ucrNudWidth.Minimum = 0 + ucrNudWidth.Maximum = Decimal.MaxValue + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + ' Clear and Set up the data grid with contents + dataGrid.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"cols_width"}, clsOperator)) + + End Sub + + Public Sub SetValuesToOperator() + ' Remove any previous col widths + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"cols_width"}, clsOperator) + + ' Add new changes + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGrid) + row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGrid.Rows.Add(row) + + Next + End Sub + + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged + btnAdd.Enabled = Not ucrReceiverMultipleCols.IsEmpty + End Sub + + Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click + + Dim clsColWidthRFunction As New RFunction + clsColWidthRFunction.SetPackageName("gt") + clsColWidthRFunction.SetRCommand("cols_width") + clsColWidthRFunction.AddParameter(strParameterName:="column_param", strParameterValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False) & " ~ px(" & ucrNudWidth.Value & ")", iPosition:=0, bIncludeArgumentName:=False) + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_col_width_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsColWidthRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGrid) + row.Cells(0).Value = clsColWidthRFunction.Clone.ToScript + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGrid.Rows.Add(row) + + End Sub + + Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click + dataGrid.Rows.Clear() + End Sub + + +End Class diff --git a/instat/UserTables/Columns/ucrColumns.Designer.vb b/instat/UserTables/Columns/ucrColumns.Designer.vb index fd9917f9d6f..ab0458587a2 100644 --- a/instat/UserTables/Columns/ucrColumns.Designer.vb +++ b/instat/UserTables/Columns/ucrColumns.Designer.vb @@ -27,6 +27,13 @@ Partial Class ucrColumns Me.ucrColumnLabels = New instat.ucrColumnLabels() Me.ucrColumnSpanners = New instat.ucrColumnSpanners() Me.ucrPnlCols = New instat.UcrPanel() + Me.rdoColFootNotes = New System.Windows.Forms.RadioButton() + Me.ucrColumnFootNote = New instat.ucrColumnFootNote() + Me.rdoColWidth = New System.Windows.Forms.RadioButton() + Me.ucrColumnWidth = New instat.ucrColumnWidth() + Me.rdoColNanoPlot = New System.Windows.Forms.RadioButton() + Me.rdoColHide = New System.Windows.Forms.RadioButton() + Me.rdoColStyle = New System.Windows.Forms.RadioButton() Me.SuspendLayout() ' 'rdoColSpanners @@ -41,7 +48,7 @@ Partial Class ucrColumns Me.rdoColSpanners.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColSpanners.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColSpanners.Location = New System.Drawing.Point(329, 3) + Me.rdoColSpanners.Location = New System.Drawing.Point(546, 3) Me.rdoColSpanners.Name = "rdoColSpanners" Me.rdoColSpanners.Size = New System.Drawing.Size(91, 29) Me.rdoColSpanners.TabIndex = 294 @@ -61,7 +68,7 @@ Partial Class ucrColumns Me.rdoColLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColLabel.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColLabel.Location = New System.Drawing.Point(241, 3) + Me.rdoColLabel.Location = New System.Drawing.Point(12, 3) Me.rdoColLabel.Name = "rdoColLabel" Me.rdoColLabel.Size = New System.Drawing.Size(91, 29) Me.rdoColLabel.TabIndex = 296 @@ -71,37 +78,158 @@ Partial Class ucrColumns ' 'ucrColumnLabels ' - Me.ucrColumnLabels.Location = New System.Drawing.Point(16, 42) + Me.ucrColumnLabels.Location = New System.Drawing.Point(13, 42) Me.ucrColumnLabels.Name = "ucrColumnLabels" - Me.ucrColumnLabels.Size = New System.Drawing.Size(575, 194) + Me.ucrColumnLabels.Size = New System.Drawing.Size(575, 262) Me.ucrColumnLabels.TabIndex = 297 ' 'ucrColumnSpanners ' - Me.ucrColumnSpanners.Location = New System.Drawing.Point(12, 40) + Me.ucrColumnSpanners.Location = New System.Drawing.Point(6, 40) Me.ucrColumnSpanners.Name = "ucrColumnSpanners" - Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 215) + Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 266) Me.ucrColumnSpanners.TabIndex = 295 ' 'ucrPnlCols ' Me.ucrPnlCols.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlCols.Location = New System.Drawing.Point(26, 3) + Me.ucrPnlCols.Location = New System.Drawing.Point(3, 3) Me.ucrPnlCols.Name = "ucrPnlCols" - Me.ucrPnlCols.Size = New System.Drawing.Size(570, 29) + Me.ucrPnlCols.Size = New System.Drawing.Size(634, 29) Me.ucrPnlCols.TabIndex = 289 ' + 'rdoColFootNotes + ' + Me.rdoColFootNotes.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColFootNotes.BackColor = System.Drawing.SystemColors.Control + Me.rdoColFootNotes.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColFootNotes.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColFootNotes.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColFootNotes.FlatAppearance.BorderSize = 2 + Me.rdoColFootNotes.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColFootNotes.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColFootNotes.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColFootNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColFootNotes.Location = New System.Drawing.Point(367, 3) + Me.rdoColFootNotes.Name = "rdoColFootNotes" + Me.rdoColFootNotes.Size = New System.Drawing.Size(91, 29) + Me.rdoColFootNotes.TabIndex = 298 + Me.rdoColFootNotes.Text = "Foot Notes" + Me.rdoColFootNotes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColFootNotes.UseVisualStyleBackColor = True + ' + 'ucrColumnFootNote + ' + Me.ucrColumnFootNote.Location = New System.Drawing.Point(7, 37) + Me.ucrColumnFootNote.Name = "ucrColumnFootNote" + Me.ucrColumnFootNote.Size = New System.Drawing.Size(599, 220) + Me.ucrColumnFootNote.TabIndex = 299 + ' + 'rdoColWidth + ' + Me.rdoColWidth.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColWidth.BackColor = System.Drawing.SystemColors.Control + Me.rdoColWidth.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColWidth.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColWidth.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColWidth.FlatAppearance.BorderSize = 2 + Me.rdoColWidth.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColWidth.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColWidth.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColWidth.Location = New System.Drawing.Point(101, 3) + Me.rdoColWidth.Name = "rdoColWidth" + Me.rdoColWidth.Size = New System.Drawing.Size(91, 29) + Me.rdoColWidth.TabIndex = 300 + Me.rdoColWidth.Text = "Width" + Me.rdoColWidth.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColWidth.UseVisualStyleBackColor = True + ' + 'ucrColumnWidth + ' + Me.ucrColumnWidth.Location = New System.Drawing.Point(5, 37) + Me.ucrColumnWidth.Name = "ucrColumnWidth" + Me.ucrColumnWidth.Size = New System.Drawing.Size(613, 267) + Me.ucrColumnWidth.TabIndex = 301 + ' + 'rdoColNanoPlot + ' + Me.rdoColNanoPlot.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColNanoPlot.BackColor = System.Drawing.SystemColors.Control + Me.rdoColNanoPlot.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColNanoPlot.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColNanoPlot.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColNanoPlot.FlatAppearance.BorderSize = 2 + Me.rdoColNanoPlot.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColNanoPlot.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColNanoPlot.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColNanoPlot.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColNanoPlot.Location = New System.Drawing.Point(278, 3) + Me.rdoColNanoPlot.Name = "rdoColNanoPlot" + Me.rdoColNanoPlot.Size = New System.Drawing.Size(91, 29) + Me.rdoColNanoPlot.TabIndex = 303 + Me.rdoColNanoPlot.Text = "Nano Plot" + Me.rdoColNanoPlot.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColNanoPlot.UseVisualStyleBackColor = True + ' + 'rdoColHide + ' + Me.rdoColHide.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColHide.BackColor = System.Drawing.SystemColors.Control + Me.rdoColHide.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColHide.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColHide.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColHide.FlatAppearance.BorderSize = 2 + Me.rdoColHide.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColHide.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColHide.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColHide.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColHide.Location = New System.Drawing.Point(189, 3) + Me.rdoColHide.Name = "rdoColHide" + Me.rdoColHide.Size = New System.Drawing.Size(91, 29) + Me.rdoColHide.TabIndex = 302 + Me.rdoColHide.Text = "Hide" + Me.rdoColHide.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColHide.UseVisualStyleBackColor = True + ' + 'rdoColStyle + ' + Me.rdoColStyle.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColStyle.BackColor = System.Drawing.SystemColors.Control + Me.rdoColStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColStyle.FlatAppearance.BorderSize = 2 + Me.rdoColStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColStyle.Location = New System.Drawing.Point(456, 3) + Me.rdoColStyle.Name = "rdoColStyle" + Me.rdoColStyle.Size = New System.Drawing.Size(91, 29) + Me.rdoColStyle.TabIndex = 304 + Me.rdoColStyle.Text = "Style" + Me.rdoColStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColStyle.UseVisualStyleBackColor = True + ' 'ucrColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.rdoColStyle) + Me.Controls.Add(Me.rdoColNanoPlot) + Me.Controls.Add(Me.rdoColHide) + Me.Controls.Add(Me.ucrColumnSpanners) Me.Controls.Add(Me.ucrColumnLabels) + Me.Controls.Add(Me.ucrColumnFootNote) + Me.Controls.Add(Me.ucrColumnWidth) + Me.Controls.Add(Me.rdoColWidth) + Me.Controls.Add(Me.rdoColFootNotes) Me.Controls.Add(Me.rdoColLabel) - Me.Controls.Add(Me.ucrColumnSpanners) Me.Controls.Add(Me.rdoColSpanners) Me.Controls.Add(Me.ucrPnlCols) Me.Name = "ucrColumns" - Me.Size = New System.Drawing.Size(633, 260) + Me.Size = New System.Drawing.Size(651, 309) Me.ResumeLayout(False) End Sub @@ -110,4 +238,11 @@ Partial Class ucrColumns Friend WithEvents ucrColumnSpanners As ucrColumnSpanners Friend WithEvents rdoColLabel As RadioButton Friend WithEvents ucrColumnLabels As ucrColumnLabels + Friend WithEvents rdoColFootNotes As RadioButton + Friend WithEvents ucrColumnFootNote As ucrColumnFootNote + Friend WithEvents rdoColWidth As RadioButton + Friend WithEvents ucrColumnWidth As ucrColumnWidth + Friend WithEvents rdoColNanoPlot As RadioButton + Friend WithEvents rdoColHide As RadioButton + Friend WithEvents rdoColStyle As RadioButton End Class diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb index 6295bb73025..b28a0ad2743 100644 --- a/instat/UserTables/Columns/ucrColumns.vb +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -3,6 +3,11 @@ Private bFirstload As Boolean = True Private Sub InitialiseDialog() ucrPnlCols.AddRadioButton(rdoColLabel) + ucrPnlCols.AddRadioButton(rdoColWidth) + ucrPnlCols.AddRadioButton(rdoColHide) + ucrPnlCols.AddRadioButton(rdoColNanoPlot) + ucrPnlCols.AddRadioButton(rdoColFootNotes) + ucrPnlCols.AddRadioButton(rdoColStyle) ucrPnlCols.AddRadioButton(rdoColSpanners) rdoColLabel.Checked = True End Sub @@ -14,14 +19,23 @@ End If ucrColumnLabels.Setup(strDataFrameName, clsOperator) + ucrColumnWidth.Setup(strDataFrameName, clsOperator) + ucrColumnFootNote.Setup(strDataFrameName, clsOperator) ucrColumnSpanners.Setup(strDataFrameName, clsOperator) End Sub - Private Sub ucrPnlCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged ucrColumnLabels.Visible = rdoColLabel.Checked + ucrColumnWidth.Visible = rdoColWidth.Checked + ucrColumnFootNote.Visible = rdoColFootNotes.Checked ucrColumnSpanners.Visible = rdoColSpanners.Checked End Sub + Public Sub SetValuesToOperator() + 'ucrColumnLabels.SetValuesToOperator() + ucrColumnWidth.SetValuesToOperator() + ucrColumnFootNote.SetValuesToOperator() + 'ucrColumnSpanners.SetValuesToOperator() + End Sub End Class diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index d682e56a154..5fa7c563cc7 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -64,7 +64,7 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 411) + Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 395) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -73,7 +73,7 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(673, 385) + Me.tbpHeader.Size = New System.Drawing.Size(648, 385) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True @@ -90,7 +90,7 @@ Partial Class sdgTableOptions Me.tbpStub.Controls.Add(Me.ucrStub) Me.tbpStub.Location = New System.Drawing.Point(4, 22) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(673, 385) + Me.tbpStub.Size = New System.Drawing.Size(648, 385) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True @@ -116,7 +116,7 @@ Partial Class sdgTableOptions ' Me.ucrColumns.Location = New System.Drawing.Point(5, 6) Me.ucrColumns.Name = "ucrColumns" - Me.ucrColumns.Size = New System.Drawing.Size(632, 270) + Me.ucrColumns.Size = New System.Drawing.Size(632, 344) Me.ucrColumns.TabIndex = 0 ' 'tbpRows @@ -124,7 +124,7 @@ Partial Class sdgTableOptions Me.tbpRows.Controls.Add(Me.ucrRows) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(673, 385) + Me.tbpRows.Size = New System.Drawing.Size(648, 369) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True @@ -141,7 +141,7 @@ Partial Class sdgTableOptions Me.tbpCells.Controls.Add(Me.ucrCells) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(673, 385) + Me.tbpCells.Size = New System.Drawing.Size(648, 385) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True @@ -158,7 +158,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(673, 385) + Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 385) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -180,7 +180,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(673, 385) + Me.tbpThemes.Size = New System.Drawing.Size(648, 385) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -240,7 +240,7 @@ Partial Class sdgTableOptions 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 419) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 401) Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) @@ -250,7 +250,7 @@ Partial Class sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(661, 452) + Me.ClientSize = New System.Drawing.Size(661, 437) Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.tbpFormatOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 079c62b0f10..dd1d94c4cce 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -27,12 +27,8 @@ Public Class sdgTableOptions End Sub Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn - - 'clsTablesUtils.RemoveParameterFromOperator("tab_footnote", clsOperator) - 'clsTablesUtils.SetGridTagsInOperator(dataGridCellFooterNotes, "tab_footnote", clsOperator) - ucrCells.SetValuesToOperator() - + ucrColumns.SetValuesToOperator() SetThemesInOperatorOnReturn(clsOperator) End Sub @@ -45,7 +41,6 @@ Public Class sdgTableOptions End Sub - ''' ''' An R operateor that has a parameter named "gt" set up. ''' The parameter should be an R Function that generates script "gt:gt()" as part of the last script statement. @@ -159,10 +154,6 @@ Public Class sdgTableOptions Return clsNewNoteRFunction End Function - - - - '----------------------------------------- '----------------------------------------- diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 58c7326eea8..da2c27bf7bd 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -404,6 +404,18 @@ UserControl + + ucrColumnFootNote.vb + + + UserControl + + + ucrColumnWidth.vb + + + UserControl + dlgGeneralTable.vb @@ -3372,6 +3384,12 @@ ucrCellStyles.vb + + ucrColumnFootNote.vb + + + ucrColumnWidth.vb + dlgGeneralTable.vb From 6813fb591e05ff420a018728f95865626de14f12 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 27 Jun 2024 15:39:53 +0300 Subject: [PATCH 059/273] Made structural changes to header and its footers. --- .../Cells/FootNotes/ucrCellsFootNotes.vb | 37 ++- .../UserTables/Cells/Styles/ucrCellStyles.vb | 46 +--- .../UserTables/Columns/ucrColumnFootNote.vb | 4 +- .../UserTables/Header/ucrHeader.Designer.vb | 215 +++++++++++------ instat/UserTables/Header/ucrHeader.vb | 220 +++++++++++------- .../UserTables/SourceNotes/ucrSourceNotes.vb | 2 +- instat/UserTables/clsTablesUtils.vb | 38 ++- instat/UserTables/dlgGeneralTable.Designer.vb | 203 +++++----------- instat/UserTables/dlgGeneralTable.vb | 63 +---- instat/UserTables/sdgTableOptions.Designer.vb | 28 +-- instat/UserTables/sdgTableOptions.vb | 27 ++- instat/UserTables/sdgTableStyles.vb | 16 +- 12 files changed, 449 insertions(+), 450 deletions(-) diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb index 79e92836983..c7cc5c3cf51 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.vb @@ -16,28 +16,17 @@ Me.clsOperator = clsOperator - ' Set up the selector + ' Set up the controls ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + SetupDataGrid(clsOperator) - ' Clear and Set up the data grid with contents - dataGrid.Rows.Clear() - SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_body", clsOperator)) - - End Sub - - Public Sub SetValuesToOperator() - ' Remove any previous cell footers - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_body", clsOperator) - For Each clsRParam As RParameter In lstRParams - clsOperator.RemoveParameter(clsRParam) - Next - - ' Add new changes - clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) End Sub - Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + Private Sub SetupDataGrid(clsOperator As ROperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_body", clsOperator) + ' Clear grid rgen add contents from operator + dataGrid.Rows.Clear() For Each clsRParam As RParameter In lstRParams ' Create a new row that represents the tab_style() parameters @@ -45,10 +34,9 @@ row.CreateCells(dataGrid) row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript - ' Tag and add the tab_style() parameter function contents as a row + ' Tag and add the parameter function contents as a row row.Tag = clsRParam dataGrid.Rows.Add(row) - Next End Sub @@ -92,4 +80,15 @@ dataGrid.Rows.Clear() End Sub + Public Sub SetValuesToOperator() + ' Remove any previous cell footers + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_body", clsOperator) + For Each clsRParam As RParameter In lstRParams + clsOperator.RemoveParameter(clsRParam) + Next + + ' Add new changes + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) + End Sub + End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.vb index df0c482faef..e44443f600c 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.vb @@ -20,20 +20,10 @@ ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() - SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_style", "locations", "cells_body", clsOperator)) + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_body", clsOperator)) End Sub - Public Sub SetValuesToOperator() - - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_style", "locations", "cells_body", clsOperator) - For Each clsRParam As RParameter In lstRParams - clsOperator.RemoveParameter(clsRParam) - Next - - clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) - End Sub - Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) For Each clsRParam As RParameter In lstRParams @@ -56,41 +46,19 @@ Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click - sdgTableStyles.ShowDialog(Me.ParentForm) - Dim clsListStyleRFunction As RFunction = sdgTableStyles.GetNewUserInputAsRFunction() - + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) If clsListStyleRFunction Is Nothing Then Exit Sub End If - AddFormatParameterToGrid(clsListStyleRFunction) - - End Sub - - - Private Sub AddFormatParameterToGrid(clsListStyleRFunction As RFunction) - - Dim clsTabStyleRFunction As New RFunction Dim clsLocationsRFunction As New RFunction - - Dim strColumnsExpression As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) - Dim strRowsExpression As String = ucrInputRows.GetText - clsLocationsRFunction.SetPackageName("gt") clsLocationsRFunction.SetRCommand("cells_body") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrInputRows.GetText, iNewPosition:=1)) - ' Add columns parameter - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) - ' Add rows as paramater if present - If Not ucrInputRows.IsEmpty Then - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) - End If - - clsTabStyleRFunction.SetPackageName("gt") - clsTabStyleRFunction.SetRCommand("tab_style") - clsTabStyleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsListStyleRFunction, iPosition:=1) - clsTabStyleRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) ' Create parameter with unique name Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) @@ -111,5 +79,9 @@ dataGridFormats.Rows.Clear() End Sub + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_body", clsOperator), clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) + End Sub End Class diff --git a/instat/UserTables/Columns/ucrColumnFootNote.vb b/instat/UserTables/Columns/ucrColumnFootNote.vb index 78a4adf282c..1152f09785d 100644 --- a/instat/UserTables/Columns/ucrColumnFootNote.vb +++ b/instat/UserTables/Columns/ucrColumnFootNote.vb @@ -20,13 +20,13 @@ ' Clear and Set up the data grid with contents dataGrid.Rows.Clear() - SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_column_labels", clsOperator)) + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_column_labels", clsOperator)) End Sub Public Sub SetValuesToOperator() ' Remove any previous cell footers - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue("tab_footnote", "locations", "cells_column_labels", clsOperator) + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_column_labels", clsOperator) For Each clsRParam As RParameter In lstRParams clsOperator.RemoveParameter(clsRParam) Next diff --git a/instat/UserTables/Header/ucrHeader.Designer.vb b/instat/UserTables/Header/ucrHeader.Designer.vb index 45d3a89681e..b05909fe369 100644 --- a/instat/UserTables/Header/ucrHeader.Designer.vb +++ b/instat/UserTables/Header/ucrHeader.Designer.vb @@ -22,66 +22,53 @@ Partial Class ucrHeader 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.btnHeaderSubTitleFooterFormat = New System.Windows.Forms.Button() - Me.btnHeaderTitleFooterFormat = New System.Windows.Forms.Button() - Me.ucrInputHeaderSubtitleFooter = New instat.ucrInputTextBox() - Me.ucrInputHeaderTitleFooter = New instat.ucrInputTextBox() + Me.ucrInputSubtitleFooter = New instat.ucrInputTextBox() + Me.ucrInputTitleFooter = New instat.ucrInputTextBox() Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() + Me.btnSubTitleFormat = New System.Windows.Forms.Button() + Me.btnTitleFormat = New System.Windows.Forms.Button() + Me.ucrInputSubtitle = New instat.ucrInputTextBox() + Me.ucrInputTitle = New instat.ucrInputTextBox() + Me.lblSubtitle = New System.Windows.Forms.Label() + Me.lblTitle = New System.Windows.Forms.Label() + Me.grpBoxTitle = New System.Windows.Forms.GroupBox() + Me.grpBoxSubtitle = New System.Windows.Forms.GroupBox() + Me.grpBoxTitle.SuspendLayout() + Me.grpBoxSubtitle.SuspendLayout() Me.SuspendLayout() ' - 'btnHeaderSubTitleFooterFormat - ' - Me.btnHeaderSubTitleFooterFormat.Location = New System.Drawing.Point(283, 101) - Me.btnHeaderSubTitleFooterFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.btnHeaderSubTitleFooterFormat.Name = "btnHeaderSubTitleFooterFormat" - Me.btnHeaderSubTitleFooterFormat.Size = New System.Drawing.Size(112, 35) - Me.btnHeaderSubTitleFooterFormat.TabIndex = 25 - Me.btnHeaderSubTitleFooterFormat.Text = "Format" - Me.btnHeaderSubTitleFooterFormat.UseVisualStyleBackColor = True - ' - 'btnHeaderTitleFooterFormat - ' - Me.btnHeaderTitleFooterFormat.Location = New System.Drawing.Point(283, 31) - Me.btnHeaderTitleFooterFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.btnHeaderTitleFooterFormat.Name = "btnHeaderTitleFooterFormat" - Me.btnHeaderTitleFooterFormat.Size = New System.Drawing.Size(116, 35) - Me.btnHeaderTitleFooterFormat.TabIndex = 24 - Me.btnHeaderTitleFooterFormat.Text = "Format" - Me.btnHeaderTitleFooterFormat.UseVisualStyleBackColor = True - ' - 'ucrInputHeaderSubtitleFooter - ' - Me.ucrInputHeaderSubtitleFooter.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderSubtitleFooter.AutoSize = True - Me.ucrInputHeaderSubtitleFooter.IsMultiline = False - Me.ucrInputHeaderSubtitleFooter.IsReadOnly = False - Me.ucrInputHeaderSubtitleFooter.Location = New System.Drawing.Point(6, 106) - Me.ucrInputHeaderSubtitleFooter.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputHeaderSubtitleFooter.Name = "ucrInputHeaderSubtitleFooter" - Me.ucrInputHeaderSubtitleFooter.Size = New System.Drawing.Size(271, 32) - Me.ucrInputHeaderSubtitleFooter.TabIndex = 23 - ' - 'ucrInputHeaderTitleFooter - ' - Me.ucrInputHeaderTitleFooter.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderTitleFooter.AutoSize = True - Me.ucrInputHeaderTitleFooter.IsMultiline = False - Me.ucrInputHeaderTitleFooter.IsReadOnly = False - Me.ucrInputHeaderTitleFooter.Location = New System.Drawing.Point(6, 35) - Me.ucrInputHeaderTitleFooter.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputHeaderTitleFooter.Name = "ucrInputHeaderTitleFooter" - Me.ucrInputHeaderTitleFooter.Size = New System.Drawing.Size(271, 32) - Me.ucrInputHeaderTitleFooter.TabIndex = 22 + 'ucrInputSubtitleFooter + ' + Me.ucrInputSubtitleFooter.AddQuotesIfUnrecognised = True + Me.ucrInputSubtitleFooter.AutoSize = True + Me.ucrInputSubtitleFooter.IsMultiline = False + Me.ucrInputSubtitleFooter.IsReadOnly = False + Me.ucrInputSubtitleFooter.Location = New System.Drawing.Point(9, 88) + Me.ucrInputSubtitleFooter.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSubtitleFooter.Name = "ucrInputSubtitleFooter" + Me.ucrInputSubtitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputSubtitleFooter.TabIndex = 23 + ' + 'ucrInputTitleFooter + ' + Me.ucrInputTitleFooter.AddQuotesIfUnrecognised = True + Me.ucrInputTitleFooter.AutoSize = True + Me.ucrInputTitleFooter.IsMultiline = False + Me.ucrInputTitleFooter.IsReadOnly = False + Me.ucrInputTitleFooter.Location = New System.Drawing.Point(11, 89) + Me.ucrInputTitleFooter.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputTitleFooter.Name = "ucrInputTitleFooter" + Me.ucrInputTitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputTitleFooter.TabIndex = 22 ' 'lblHeaderSubtitle ' Me.lblHeaderSubtitle.AutoSize = True Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(1, 82) - Me.lblHeaderSubtitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHeaderSubtitle.Location = New System.Drawing.Point(6, 72) Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(118, 20) + Me.lblHeaderSubtitle.Size = New System.Drawing.Size(78, 13) Me.lblHeaderSubtitle.TabIndex = 21 Me.lblHeaderSubtitle.Text = "Subtitle Footer:" ' @@ -89,35 +76,127 @@ Partial Class ucrHeader ' Me.lblHeaderTitle.AutoSize = True Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(1, 9) - Me.lblHeaderTitle.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHeaderTitle.Location = New System.Drawing.Point(8, 72) Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(93, 20) + Me.lblHeaderTitle.Size = New System.Drawing.Size(63, 13) Me.lblHeaderTitle.TabIndex = 20 Me.lblHeaderTitle.Text = "Title Footer:" ' + 'btnSubTitleFormat + ' + Me.btnSubTitleFormat.Location = New System.Drawing.Point(153, 40) + Me.btnSubTitleFormat.Name = "btnSubTitleFormat" + Me.btnSubTitleFormat.Size = New System.Drawing.Size(75, 23) + Me.btnSubTitleFormat.TabIndex = 31 + Me.btnSubTitleFormat.Text = "Format" + Me.btnSubTitleFormat.UseVisualStyleBackColor = True + ' + 'btnTitleFormat + ' + Me.btnTitleFormat.Location = New System.Drawing.Point(155, 42) + Me.btnTitleFormat.Name = "btnTitleFormat" + Me.btnTitleFormat.Size = New System.Drawing.Size(79, 23) + Me.btnTitleFormat.TabIndex = 30 + Me.btnTitleFormat.Text = "Format" + Me.btnTitleFormat.UseVisualStyleBackColor = True + ' + 'ucrInputSubtitle + ' + Me.ucrInputSubtitle.AddQuotesIfUnrecognised = True + Me.ucrInputSubtitle.AutoSize = True + Me.ucrInputSubtitle.IsMultiline = False + Me.ucrInputSubtitle.IsReadOnly = False + Me.ucrInputSubtitle.Location = New System.Drawing.Point(9, 42) + Me.ucrInputSubtitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSubtitle.Name = "ucrInputSubtitle" + Me.ucrInputSubtitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputSubtitle.TabIndex = 29 + ' + 'ucrInputTitle + ' + Me.ucrInputTitle.AddQuotesIfUnrecognised = True + Me.ucrInputTitle.AutoSize = True + Me.ucrInputTitle.IsMultiline = False + Me.ucrInputTitle.IsReadOnly = False + Me.ucrInputTitle.Location = New System.Drawing.Point(11, 42) + Me.ucrInputTitle.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputTitle.Name = "ucrInputTitle" + Me.ucrInputTitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputTitle.TabIndex = 28 + ' + 'lblSubtitle + ' + Me.lblSubtitle.AutoSize = True + Me.lblSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSubtitle.Location = New System.Drawing.Point(6, 25) + Me.lblSubtitle.Name = "lblSubtitle" + Me.lblSubtitle.Size = New System.Drawing.Size(74, 13) + Me.lblSubtitle.TabIndex = 27 + Me.lblSubtitle.Text = "Subtitle Label:" + ' + 'lblTitle + ' + Me.lblTitle.AutoSize = True + Me.lblTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTitle.Location = New System.Drawing.Point(8, 22) + Me.lblTitle.Name = "lblTitle" + Me.lblTitle.Size = New System.Drawing.Size(59, 13) + Me.lblTitle.TabIndex = 26 + Me.lblTitle.Text = "Title Label:" + ' + 'grpBoxTitle + ' + Me.grpBoxTitle.Controls.Add(Me.lblTitle) + Me.grpBoxTitle.Controls.Add(Me.ucrInputTitle) + Me.grpBoxTitle.Controls.Add(Me.btnTitleFormat) + Me.grpBoxTitle.Controls.Add(Me.lblHeaderTitle) + Me.grpBoxTitle.Controls.Add(Me.ucrInputTitleFooter) + Me.grpBoxTitle.Location = New System.Drawing.Point(4, 5) + Me.grpBoxTitle.Name = "grpBoxTitle" + Me.grpBoxTitle.Size = New System.Drawing.Size(248, 115) + Me.grpBoxTitle.TabIndex = 32 + Me.grpBoxTitle.TabStop = False + Me.grpBoxTitle.Text = "Title" + ' + 'grpBoxSubtitle + ' + Me.grpBoxSubtitle.Controls.Add(Me.lblHeaderSubtitle) + Me.grpBoxSubtitle.Controls.Add(Me.ucrInputSubtitleFooter) + Me.grpBoxSubtitle.Controls.Add(Me.btnSubTitleFormat) + Me.grpBoxSubtitle.Controls.Add(Me.ucrInputSubtitle) + Me.grpBoxSubtitle.Controls.Add(Me.lblSubtitle) + Me.grpBoxSubtitle.Location = New System.Drawing.Point(4, 125) + Me.grpBoxSubtitle.Name = "grpBoxSubtitle" + Me.grpBoxSubtitle.Size = New System.Drawing.Size(248, 116) + Me.grpBoxSubtitle.TabIndex = 33 + Me.grpBoxSubtitle.TabStop = False + Me.grpBoxSubtitle.Text = "Subtitle" + ' 'ucrHeader ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.btnHeaderSubTitleFooterFormat) - Me.Controls.Add(Me.btnHeaderTitleFooterFormat) - Me.Controls.Add(Me.ucrInputHeaderSubtitleFooter) - Me.Controls.Add(Me.ucrInputHeaderTitleFooter) - Me.Controls.Add(Me.lblHeaderSubtitle) - Me.Controls.Add(Me.lblHeaderTitle) - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.Controls.Add(Me.grpBoxSubtitle) + Me.Controls.Add(Me.grpBoxTitle) Me.Name = "ucrHeader" - Me.Size = New System.Drawing.Size(403, 142) + Me.Size = New System.Drawing.Size(259, 246) + Me.grpBoxTitle.ResumeLayout(False) + Me.grpBoxTitle.PerformLayout() + Me.grpBoxSubtitle.ResumeLayout(False) + Me.grpBoxSubtitle.PerformLayout() Me.ResumeLayout(False) - Me.PerformLayout() End Sub - - Friend WithEvents btnHeaderSubTitleFooterFormat As Button - Friend WithEvents btnHeaderTitleFooterFormat As Button - Friend WithEvents ucrInputHeaderSubtitleFooter As ucrInputTextBox - Friend WithEvents ucrInputHeaderTitleFooter As ucrInputTextBox + Friend WithEvents ucrInputSubtitleFooter As ucrInputTextBox + Friend WithEvents ucrInputTitleFooter As ucrInputTextBox Friend WithEvents lblHeaderSubtitle As Label Friend WithEvents lblHeaderTitle As Label + Friend WithEvents btnSubTitleFormat As Button + Friend WithEvents btnTitleFormat As Button + Friend WithEvents ucrInputSubtitle As ucrInputTextBox + Friend WithEvents ucrInputTitle As ucrInputTextBox + Friend WithEvents lblSubtitle As Label + Friend WithEvents lblTitle As Label + Friend WithEvents grpBoxTitle As GroupBox + Friend WithEvents grpBoxSubtitle As GroupBox End Class diff --git a/instat/UserTables/Header/ucrHeader.vb b/instat/UserTables/Header/ucrHeader.vb index a8a5e297504..6850e928898 100644 --- a/instat/UserTables/Header/ucrHeader.vb +++ b/instat/UserTables/Header/ucrHeader.vb @@ -1,127 +1,183 @@  Public Class ucrHeader Private clsOperator As New ROperator - Private clsTabTitleFootRParameter, clsTabSubtitleFootRParameter As RParameter - Private clsTitleFootNoteRFunction, clsSubtitleFootNoteRFunction As New RFunction + Private clsHeaderRFunction, clsTitleFooterRFunction, clsSubtitleFooterRFunction, clsTitleLocationRFunction, clsSubtitleLocationRFunction, clsTitleStyleRFunction, clsSubtitleStyleRFunction As New RFunction + Private bFirstload As Boolean = True Private Sub InitialiseDialog() - ucrInputHeaderTitleFooter.SetParameter(New RParameter("title_footer_text_param", 0, bNewIncludeArgumentName:=False)) - ucrInputHeaderTitleFooter.SetLinkedDisplayControl(New List(Of Control)({lblHeaderTitle, btnHeaderTitleFooterFormat})) - ucrInputHeaderSubtitleFooter.SetParameter(New RParameter("subtitle_footer_text_param", 0, bNewIncludeArgumentName:=False)) - ucrInputHeaderSubtitleFooter.SetLinkedDisplayControl(New List(Of Control)({lblHeaderSubtitle, btnHeaderSubTitleFooterFormat})) + ucrInputTitle.SetParameter(New RParameter("title", iNewPosition:=0)) + + ucrInputSubtitle.SetParameter(New RParameter("subtitle", iNewPosition:=1)) + + ucrInputTitleFooter.SetParameter(New RParameter("footnote", iNewPosition:=0)) + + ucrInputSubtitleFooter.SetParameter(New RParameter("footnote", iNewPosition:=0)) + End Sub - Public Sub Setup(clsNewOperator As ROperator) + Public Sub Setup(clsOperator As ROperator) If bFirstload Then InitialiseDialog() bFirstload = False End If - clsOperator = clsNewOperator - - clsTabTitleFootRParameter = Nothing - clsTitleFootNoteRFunction = Nothing + Me.clsOperator = clsOperator - clsTabSubtitleFootRParameter = Nothing - clsSubtitleFootNoteRFunction = Nothing + SetRFunctions(clsOperator) + SetRCode() - SetupRFunctionsFromOperator() + End Sub - If clsTabTitleFootRParameter Is Nothing Then - Dim clsTabTitleFootRFunction As New RFunction - clsTabTitleFootRFunction.SetPackageName("gt") - clsTabTitleFootRFunction.SetRCommand("tab_footnote") + Private Sub SetRFunctions(clsOperator As ROperator) + + clsHeaderRFunction = Nothing + clsTitleStyleRFunction = Nothing + clsSubtitleStyleRFunction = Nothing + clsTitleLocationRFunction = Nothing + clsSubtitleLocationRFunction = Nothing + clsTitleFooterRFunction = Nothing + clsSubtitleFooterRFunction = Nothing + + '-------------- + ' Set up the header R function for title and subtitle + clsHeaderRFunction = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_header"}, clsOperator).FirstOrDefault()?.clsArgumentCodeStructure + If clsHeaderRFunction Is Nothing Then + clsHeaderRFunction = New RFunction + clsHeaderRFunction.SetPackageName("gt") + clsHeaderRFunction.SetRCommand("tab_header") + End If + '-------------- + + '-------------- + ' Set up the title and subtitle styles R function + Dim lstTabStyleForRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_title", clsOperator) + For Each clsTabFootNoteRParam As RParameter In lstTabStyleForRParams + For Each clsFooterParam As RParameter In clsTabFootNoteRParam.clsArgumentCodeStructure.clsParameters + If clsFooterParam.strArgumentName = "locations" AndAlso clsFooterParam.clsArgumentCodeStructure.ContainsParameter("groups") Then + If clsTablesUtils.GetStringValue(clsFooterParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "title" Then + clsTitleStyleRFunction = clsTabFootNoteRParam.clsArgumentCodeStructure + clsTitleLocationRFunction = clsFooterParam.clsArgumentCodeStructure + ElseIf clsTablesUtils.GetStringValue(clsFooterParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "subtitle" Then + clsSubtitleStyleRFunction = clsTabFootNoteRParam.clsArgumentCodeStructure + clsSubtitleLocationRFunction = clsFooterParam.clsArgumentCodeStructure + End If + End If + Next + Next + '-------------- + + '-------------- + ' Set up the title footer and subtitle footer, locations R function + Dim lstTabFootNoteRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_title", clsOperator) + For Each clsTabFootNoteRParam As RParameter In lstTabFootNoteRParams + For Each clsFooterParam As RParameter In clsTabFootNoteRParam.clsArgumentCodeStructure.clsParameters + If clsFooterParam.strArgumentName = "locations" AndAlso clsFooterParam.clsArgumentCodeStructure.ContainsParameter("groups") Then + If clsTablesUtils.GetStringValue(clsFooterParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "title" Then + clsTitleFooterRFunction = clsTabFootNoteRParam.clsArgumentCodeStructure + clsTitleLocationRFunction = clsFooterParam.clsArgumentCodeStructure + ElseIf clsTablesUtils.GetStringValue(clsFooterParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "subtitle" Then + clsSubtitleFooterRFunction = clsTabFootNoteRParam.clsArgumentCodeStructure + clsSubtitleLocationRFunction = clsFooterParam.clsArgumentCodeStructure + End If + End If + Next + Next - clsTitleFootNoteRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + If clsTitleFooterRFunction Is Nothing Then + clsTitleLocationRFunction = GetNewCellsTitleRFunction("title") + clsTitleFooterRFunction = New RFunction - clsTabTitleFootRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=clsTitleFootNoteRFunction, iNewPosition:=0)) - clsTabTitleFootRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=GetNewTitleLocationRFunction("title"), iNewPosition:=1)) + clsTitleFooterRFunction.SetPackageName("gt") + clsTitleFooterRFunction.SetRCommand("tab_footnote") + clsTitleFooterRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsTitleLocationRFunction, iPosition:=1) - clsTabTitleFootRParameter = New RParameter("title_footer_param", clsTabTitleFootRFunction, bNewIncludeArgumentName:=False) End If - If clsTabSubtitleFootRParameter Is Nothing Then - Dim clsTabSubtitleFootRFunction As New RFunction - clsTabSubtitleFootRFunction.SetPackageName("gt") - clsTabSubtitleFootRFunction.SetRCommand("tab_footnote") - - clsSubtitleFootNoteRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() + If clsSubtitleFooterRFunction Is Nothing Then + clsSubtitleLocationRFunction = GetNewCellsTitleRFunction("subtitle") + clsSubtitleFooterRFunction = New RFunction - clsTabSubtitleFootRFunction.AddParameter(New RParameter(strParameterName:="footnote", strParamValue:=clsSubtitleFootNoteRFunction, iNewPosition:=0)) - clsTabSubtitleFootRFunction.AddParameter(New RParameter(strParameterName:="locations", strParamValue:=GetNewTitleLocationRFunction("subtitle"), iNewPosition:=1)) - clsTabSubtitleFootRParameter = New RParameter("subtitle_footer_param", clsTabSubtitleFootRFunction, bNewIncludeArgumentName:=False) + clsSubtitleFooterRFunction.SetPackageName("gt") + clsSubtitleFooterRFunction.SetRCommand("tab_footnote") + clsSubtitleFooterRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsSubtitleLocationRFunction, iPosition:=1) End If - - ucrInputHeaderTitleFooter.SetRCode(clsTitleFootNoteRFunction, bReset:=True) - ucrInputHeaderSubtitleFooter.SetRCode(clsSubtitleFootNoteRFunction, bReset:=True) - + '-------------- End Sub - Private Sub SetupRFunctionsFromOperator() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_footnote"}, clsOperator) + Private Function GetNewCellsTitleRFunction(strGroupParamValue As String) + Dim clsCellsTitleRFunction As New RFunction + clsCellsTitleRFunction.SetPackageName("gt") + clsCellsTitleRFunction.SetRCommand("cells_title") + clsCellsTitleRFunction.AddParameter(strParameterName:="groups", strParameterValue:=Chr(34) & strGroupParamValue & Chr(34), iPosition:=0) + Return clsCellsTitleRFunction + End Function - For Each clsTabFooterRParam As RParameter In lstRParams + Private Sub SetRCode() - Dim clsFootNoteRFunction As RFunction = Nothing - Dim clsLocationsRFunction As RFunction = Nothing + ucrInputTitle.SetRCode(clsHeaderRFunction, True, bCloneIfNeeded:=True) + ucrInputSubtitle.SetRCode(clsHeaderRFunction, True, bCloneIfNeeded:=True) - For Each clsFootNoteRParam As RParameter In clsTabFooterRParam.clsArgumentCodeStructure.clsParameters - If clsFootNoteRParam.strArgumentName = "footnote" Then - clsFootNoteRFunction = clsFootNoteRParam.clsArgumentCodeStructure - ElseIf clsFootNoteRParam.strArgumentName = "locations" Then - Dim clsNewLocationRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - If clsNewLocationRFunction.strRCommand = "cells_title" Then - clsLocationsRFunction = clsNewLocationRFunction - End If - End If - Next + ucrInputTitleFooter.SetRCode(clsTitleFooterRFunction, True, bCloneIfNeeded:=True) + ucrInputSubtitleFooter.SetRCode(clsSubtitleFooterRFunction, True, bCloneIfNeeded:=True) - If clsFootNoteRFunction IsNot Nothing AndAlso clsLocationsRFunction IsNot Nothing AndAlso clsLocationsRFunction.clsParameters.Count > 0 Then - If clsLocationsRFunction.clsParameters(0).strArgumentValue = clsTablesUtils.GetStringValue("title", True) Then - clsTabTitleFootRParameter = clsTabFooterRParam - clsTitleFootNoteRFunction = clsFootNoteRFunction - ElseIf clsLocationsRFunction.clsParameters(0).strArgumentValue = clsTablesUtils.GetStringValue("subtitle", True) Then - clsTabSubtitleFootRParameter = clsTabFooterRParam - clsSubtitleFootNoteRFunction = clsFootNoteRFunction - End If - End If + End Sub - Next + Private Sub btnTitleFormat_Click(sender As Object, e As EventArgs) Handles btnTitleFormat.Click + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm, clsTitleStyleRFunction) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + clsTitleStyleRFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsTitleLocationRFunction) End Sub - Private Function GetNewTitleLocationRFunction(StrLocation As String) As RFunction - Dim clsLocationRFunction As New RFunction - clsLocationRFunction.SetPackageName("gt") - clsLocationRFunction.SetRCommand("cells_title") - clsLocationRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=Chr(34) & StrLocation & Chr(34))) - Return clsLocationRFunction - End Function - Private Sub btnHeaderTitleFooterFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFooterFormat.Click - clsTablesUtils.ShowTextFormatSubDialog(Me.ParentForm, clsTitleFootNoteRFunction) + Private Sub btnSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnSubTitleFormat.Click + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm, clsSubtitleStyleRFunction) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + clsSubtitleStyleRFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsSubtitleLocationRFunction) End Sub - Private Sub btnHeaderSubTitleFooterFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFooterFormat.Click - clsTablesUtils.ShowTextFormatSubDialog(Me.ParentForm, clsSubtitleFootNoteRFunction) + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputTitle.ControlContentsChanged, ucrInputTitleFooter.ControlContentsChanged, ucrInputSubtitle.ControlContentsChanged, ucrInputSubtitleFooter.ControlContentsChanged + ucrInputTitleFooter.Enabled = Not ucrInputTitle.IsEmpty() + ucrInputSubtitle.Enabled = Not ucrInputTitle.IsEmpty() + ucrInputSubtitleFooter.Enabled = ucrInputSubtitle.Enabled AndAlso Not ucrInputSubtitle.IsEmpty() End Sub - Private Sub ucrInputHeaderTitleFooter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitleFooter.ControlValueChanged - If ucrInputHeaderTitleFooter.IsEmpty Then - clsOperator.RemoveParameter(clsTabTitleFootRParameter) - Else - clsOperator.AddParameter(clsTabTitleFootRParameter) + Public Sub SetValuesToOperator() + ' Remove any previous header parameters + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"tab_header"}, clsOperator) + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote", "tab_style"}, "locations", "cells_title", clsOperator), clsOperator) + + ' Add new changes + If Not ucrInputTitle.IsEmpty Then + clsOperator.AddParameter(strParameterName:="tab_header_param", clsRFunctionParameter:=clsHeaderRFunction) + + If ucrInputTitleFooter.Enabled AndAlso Not ucrInputTitleFooter.IsEmpty Then + clsOperator.AddParameter(strParameterName:="tab_footer_for_tile_param", clsRFunctionParameter:=clsTitleFooterRFunction) + End If + + If ucrInputSubtitleFooter.Enabled AndAlso Not ucrInputSubtitleFooter.IsEmpty Then + clsOperator.AddParameter(strParameterName:="tab_footer_for_subtitle_param", clsRFunctionParameter:=clsSubtitleFooterRFunction) + End If + + End If + + If clsTitleStyleRFunction IsNot Nothing Then + clsOperator.AddParameter(strParameterName:="tab_style_for_title_param", clsRFunctionParameter:=clsTitleStyleRFunction) End If - End Sub - Private Sub ucrInputHeaderFooter_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitleFooter.ControlValueChanged, ucrInputHeaderSubtitleFooter.ControlValueChanged - If ucrInputHeaderTitleFooter.IsEmpty OrElse ucrInputHeaderSubtitleFooter.IsEmpty Then - clsOperator.RemoveParameter(clsTabSubtitleFootRParameter) - Else - clsOperator.AddParameter(clsTabSubtitleFootRParameter) + If clsSubtitleStyleRFunction IsNot Nothing Then + clsOperator.AddParameter(strParameterName:="tab_style_for_subtitle_param", clsRFunctionParameter:=clsSubtitleStyleRFunction) End If + End Sub + End Class diff --git a/instat/UserTables/SourceNotes/ucrSourceNotes.vb b/instat/UserTables/SourceNotes/ucrSourceNotes.vb index 8df00e029b1..e8080d12aee 100644 --- a/instat/UserTables/SourceNotes/ucrSourceNotes.vb +++ b/instat/UserTables/SourceNotes/ucrSourceNotes.vb @@ -89,7 +89,7 @@ Public Class ucrSourceNotes row.Tag = clsNewNoteRFunction ' Remove all the tab source notes R Functions - clsTablesUtils.RemoveParameterFromOperator({"tab_source_note"}, clsOperator) + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"tab_source_note"}, clsOperator) ' Add all the tab source note RFunctions clsTablesUtils.SetGridTagsInOperator(dataGridSourceNotes, "tab_source_note", clsOperator) diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index d3f36976ed7..ec2981c3dbc 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -2,6 +2,7 @@ Public Class clsTablesUtils + 'TODO. Delete Public Shared Function GetNewHtmlSpanRFunction() As RFunction Dim clsHtmlDivRFunction As New RFunction clsHtmlDivRFunction.SetPackageName("htmltools") @@ -9,6 +10,7 @@ Public Class clsTablesUtils Return clsHtmlDivRFunction End Function + 'TODO. Delete Public Shared Function GetNewHtmlStyleRFunction() As RFunction Dim clsStyleRFunction As New RFunction clsStyleRFunction.SetPackageName("htmltools") @@ -24,6 +26,15 @@ Public Class clsTablesUtils sdgTableOptionsTextFormat.ShowDialog(owner) End Sub + Public Shared Function ShowStyleSubDialog(owner As Form, Optional clsListStyleRFunction As RFunction = Nothing) As RFunction + If clsListStyleRFunction IsNot Nothing AndAlso clsListStyleRFunction.ContainsParameter("style") Then + sdgTableStyles.Setup(clsListStyleRFunction.GetParameter("style").clsArgumentCodeStructure) + End If + + sdgTableStyles.ShowDialog(owner) + Return sdgTableStyles.GetNewUserInputAsRFunction() + End Function + 'TODO. Delete Public Shared Function FindRFunctionsWithRCommand(strRCommandName As String, clsOperator As ROperator) As List(Of RFunction) Dim lstRFunctions As New List(Of RFunction) @@ -38,6 +49,15 @@ Public Class clsTablesUtils Return lstRFunctions End Function + Public Shared Function GetNewStyleRFunction(clsListStyleRFunction As RFunction, clsLocationsRFunction As RFunction) As RFunction + Dim clsTabStyleRFunction As New RFunction + clsTabStyleRFunction.SetPackageName("gt") + clsTabStyleRFunction.SetRCommand("tab_style") + clsTabStyleRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=clsListStyleRFunction, iPosition:=0) + clsTabStyleRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) + Return clsTabStyleRFunction + End Function + Public Shared Function FindRFunctionsParamsWithRCommand(strRCommandNames() As String, clsOperator As ROperator) As List(Of RParameter) Dim lstRFunctionParams As New List(Of RParameter) For Each clsRParam As RParameter In clsOperator.clsParameters @@ -60,6 +80,11 @@ Public Class clsTablesUtils End If End If Next + + RemoveRParams(lstParams, clsOperator) + End Sub + + Public Shared Sub RemoveRParams(lstParams As IEnumerable(Of RParameter), clsOperator As ROperator) For Each clsRParam As RParameter In lstParams clsOperator.RemoveParameter(clsRParam) Next @@ -79,19 +104,19 @@ Public Class clsTablesUtils ''' ''' E.g Finding cells_body in R Function tab_style( style = cell_fill(color = "gray85"), locations = cells_body() ) ''' - ''' e.g tab_style + ''' e.g tab_style ''' e.g locations ''' e.g cells_body ''' Operator that contains the parent strRCommandName ''' - Public Shared Function FindRFunctionsParamsWithRParamValue(strRCommandName As String, strParamName As String, strParamValueRCommand As String, clsOperator As ROperator) As List(Of RParameter) + Public Shared Function FindRFunctionsParamsWithRParamValue(strRCommandNames() As String, strParamName As String, strParamValueRCommand As String, clsOperator As ROperator) As List(Of RParameter) - Dim lstRFunctionParams As List(Of RParameter) = FindRFunctionsParamsWithRCommand({strRCommandName}, clsOperator) + Dim lstRFunctionParams As List(Of RParameter) = FindRFunctionsParamsWithRCommand(strRCommandNames, clsOperator) Dim lstRFunctionsParamsFound As New List(Of RParameter) For Each clsRParam As RParameter In lstRFunctionParams Dim rFunctionParent As RFunction = clsRParam.clsArgumentCodeStructure - If rFunctionParent.strRCommand = strRCommandName AndAlso rFunctionParent.ContainsParameter(strParamName) Then + If strRCommandNames.Contains(rFunctionParent.strRCommand) AndAlso rFunctionParent.ContainsParameter(strParamName) Then Dim rFunctionchild As RFunction = rFunctionParent.GetParameter(strParamName).clsArgumentCodeStructure If rFunctionchild.strRCommand = strParamValueRCommand Then @@ -104,8 +129,11 @@ Public Class clsTablesUtils End Function + + + ' TODO. Delete - Public Shared Sub RemoveParameterFromOperator(strParameterNames() As String, clsOperator As ROperator) + Private Shared Sub RemoveParameterFromOperator(strParameterNames() As String, clsOperator As ROperator) ' Remove all the previous footer parameters first Dim lstParams As New List(Of RParameter) For Each clsRParam As RParameter In clsOperator.clsParameters diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index 7c434eb7c8e..95e57bd177a 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -22,114 +22,21 @@ Partial Class dlgGeneralTable 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.btnHeaderSubTitleFormat = New System.Windows.Forms.Button() - Me.btnHeaderTitleFormat = New System.Windows.Forms.Button() - Me.ucrInputHeaderSubtitle = New instat.ucrInputTextBox() - Me.ucrInputHeaderTitle = New instat.ucrInputTextBox() - Me.lblHeaderSubtitle = New System.Windows.Forms.Label() - Me.lblHeaderTitle = New System.Windows.Forms.Label() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() Me.lblColumns = New System.Windows.Forms.Label() Me.btnMoreOptions = New System.Windows.Forms.Button() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSaveTable = New instat.ucrSave() - Me.ucrChkPreview = New instat.ucrCheck() Me.ucrNudPreview = New instat.ucrNud() + Me.ucrChkPreview = New instat.ucrCheck() + Me.ucrSaveTable = New instat.ucrSave() + Me.ucrBase = New instat.ucrButtons() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.SuspendLayout() ' - 'btnHeaderSubTitleFormat - ' - Me.btnHeaderSubTitleFormat.Location = New System.Drawing.Point(393, 71) - Me.btnHeaderSubTitleFormat.Name = "btnHeaderSubTitleFormat" - Me.btnHeaderSubTitleFormat.Size = New System.Drawing.Size(75, 23) - Me.btnHeaderSubTitleFormat.TabIndex = 19 - Me.btnHeaderSubTitleFormat.Text = "Format" - Me.btnHeaderSubTitleFormat.UseVisualStyleBackColor = True - ' - 'btnHeaderTitleFormat - ' - Me.btnHeaderTitleFormat.Location = New System.Drawing.Point(393, 29) - Me.btnHeaderTitleFormat.Name = "btnHeaderTitleFormat" - Me.btnHeaderTitleFormat.Size = New System.Drawing.Size(79, 23) - Me.btnHeaderTitleFormat.TabIndex = 18 - Me.btnHeaderTitleFormat.Text = "Format" - Me.btnHeaderTitleFormat.UseVisualStyleBackColor = True - ' - 'ucrInputHeaderSubtitle - ' - Me.ucrInputHeaderSubtitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderSubtitle.AutoSize = True - Me.ucrInputHeaderSubtitle.IsMultiline = False - Me.ucrInputHeaderSubtitle.IsReadOnly = False - Me.ucrInputHeaderSubtitle.Location = New System.Drawing.Point(249, 73) - Me.ucrInputHeaderSubtitle.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputHeaderSubtitle.Name = "ucrInputHeaderSubtitle" - Me.ucrInputHeaderSubtitle.Size = New System.Drawing.Size(142, 21) - Me.ucrInputHeaderSubtitle.TabIndex = 17 - ' - 'ucrInputHeaderTitle - ' - Me.ucrInputHeaderTitle.AddQuotesIfUnrecognised = True - Me.ucrInputHeaderTitle.AutoSize = True - Me.ucrInputHeaderTitle.IsMultiline = False - Me.ucrInputHeaderTitle.IsReadOnly = False - Me.ucrInputHeaderTitle.Location = New System.Drawing.Point(249, 29) - Me.ucrInputHeaderTitle.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputHeaderTitle.Name = "ucrInputHeaderTitle" - Me.ucrInputHeaderTitle.Size = New System.Drawing.Size(142, 21) - Me.ucrInputHeaderTitle.TabIndex = 16 - ' - 'lblHeaderSubtitle - ' - Me.lblHeaderSubtitle.AutoSize = True - Me.lblHeaderSubtitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderSubtitle.Location = New System.Drawing.Point(246, 56) - Me.lblHeaderSubtitle.Name = "lblHeaderSubtitle" - Me.lblHeaderSubtitle.Size = New System.Drawing.Size(45, 13) - Me.lblHeaderSubtitle.TabIndex = 15 - Me.lblHeaderSubtitle.Text = "Subtitle:" - ' - 'lblHeaderTitle - ' - Me.lblHeaderTitle.AutoSize = True - Me.lblHeaderTitle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHeaderTitle.Location = New System.Drawing.Point(246, 9) - Me.lblHeaderTitle.Name = "lblHeaderTitle" - Me.lblHeaderTitle.Size = New System.Drawing.Size(30, 13) - Me.lblHeaderTitle.TabIndex = 14 - Me.lblHeaderTitle.Text = "Title:" - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(9, 9) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 22 - ' - 'ucrReceiverMultipleCols - ' - Me.ucrReceiverMultipleCols.AutoSize = True - Me.ucrReceiverMultipleCols.frmParent = Me - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(250, 113) - Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" - Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(141, 100) - Me.ucrReceiverMultipleCols.strNcFilePath = "" - Me.ucrReceiverMultipleCols.TabIndex = 23 - Me.ucrReceiverMultipleCols.ucrSelector = Nothing - ' 'lblColumns ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(247, 100) + Me.lblColumns.Location = New System.Drawing.Point(247, 50) Me.lblColumns.Name = "lblColumns" Me.lblColumns.Size = New System.Drawing.Size(50, 13) Me.lblColumns.TabIndex = 24 @@ -137,60 +44,85 @@ Partial Class dlgGeneralTable ' 'btnMoreOptions ' - Me.btnMoreOptions.Location = New System.Drawing.Point(250, 225) + Me.btnMoreOptions.Location = New System.Drawing.Point(250, 209) Me.btnMoreOptions.Name = "btnMoreOptions" Me.btnMoreOptions.Size = New System.Drawing.Size(141, 23) Me.btnMoreOptions.TabIndex = 25 Me.btnMoreOptions.Text = "More Options" Me.btnMoreOptions.UseVisualStyleBackColor = True ' - 'ucrBase + 'ucrNudPreview ' - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 301) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 52) - Me.ucrBase.TabIndex = 26 + Me.ucrNudPreview.AutoSize = True + Me.ucrNudPreview.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPreview.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudPreview.Location = New System.Drawing.Point(400, 173) + Me.ucrNudPreview.Margin = New System.Windows.Forms.Padding(6) + Me.ucrNudPreview.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudPreview.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudPreview.Name = "ucrNudPreview" + Me.ucrNudPreview.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreview.TabIndex = 31 + Me.ucrNudPreview.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkPreview + ' + Me.ucrChkPreview.AutoSize = True + Me.ucrChkPreview.Checked = False + Me.ucrChkPreview.Location = New System.Drawing.Point(250, 175) + Me.ucrChkPreview.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkPreview.Name = "ucrChkPreview" + Me.ucrChkPreview.Size = New System.Drawing.Size(144, 23) + Me.ucrChkPreview.TabIndex = 30 ' 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(9, 267) + Me.ucrSaveTable.Location = New System.Drawing.Point(9, 242) Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" Me.ucrSaveTable.Size = New System.Drawing.Size(319, 24) Me.ucrSaveTable.TabIndex = 27 ' - 'ucrChkPreview + 'ucrBase ' - Me.ucrChkPreview.AutoSize = True - Me.ucrChkPreview.Checked = False - Me.ucrChkPreview.Location = New System.Drawing.Point(9, 210) - Me.ucrChkPreview.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkPreview.Name = "ucrChkPreview" - Me.ucrChkPreview.Size = New System.Drawing.Size(144, 23) - Me.ucrChkPreview.TabIndex = 30 + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 276) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 26 ' - 'ucrNudPreview + 'ucrReceiverMultipleCols ' - Me.ucrNudPreview.AutoSize = True - Me.ucrNudPreview.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPreview.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreview.Location = New System.Drawing.Point(159, 208) - Me.ucrNudPreview.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrNudPreview.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudPreview.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudPreview.Name = "ucrNudPreview" - Me.ucrNudPreview.Size = New System.Drawing.Size(50, 20) - Me.ucrNudPreview.TabIndex = 31 - Me.ucrNudPreview.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Me + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(250, 63) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(141, 100) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 23 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(9, 9) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 22 ' 'dlgGeneralTable ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(476, 361) + Me.ClientSize = New System.Drawing.Size(476, 338) Me.Controls.Add(Me.ucrNudPreview) Me.Controls.Add(Me.ucrChkPreview) Me.Controls.Add(Me.ucrSaveTable) @@ -199,12 +131,6 @@ Partial Class dlgGeneralTable Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.ucrReceiverMultipleCols) Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.btnHeaderSubTitleFormat) - Me.Controls.Add(Me.btnHeaderTitleFormat) - Me.Controls.Add(Me.ucrInputHeaderSubtitle) - Me.Controls.Add(Me.ucrInputHeaderTitle) - Me.Controls.Add(Me.lblHeaderSubtitle) - Me.Controls.Add(Me.lblHeaderTitle) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgGeneralTable" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -213,13 +139,6 @@ Partial Class dlgGeneralTable Me.PerformLayout() End Sub - - Friend WithEvents btnHeaderSubTitleFormat As Button - Friend WithEvents btnHeaderTitleFormat As Button - Friend WithEvents ucrInputHeaderSubtitle As ucrInputTextBox - Friend WithEvents ucrInputHeaderTitle As ucrInputTextBox - Friend WithEvents lblHeaderSubtitle As Label - Friend WithEvents lblHeaderTitle As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents btnMoreOptions As Button diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 6528b863d56..2706570ec3f 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -3,7 +3,6 @@ Public Class dlgGeneralTable Private clsBaseOperator As New ROperator Private clsHeadRFunction, clsGtRFunction As New RFunction - Private clsGtHeaderRFunction, clsGtTitleRFunction, clsGtSubtitleRFunction As New RFunction Private bFirstload As Boolean = True Private bReset As Boolean = True @@ -21,38 +20,12 @@ Public Class dlgGeneralTable autoTranslate(Me) End Sub - Private Sub ucrInputHeaderTitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitle.ControlValueChanged - 'If no title providded, then just remove the tab_header command from the operator - If ucrInputHeaderTitle.IsEmpty() Then - clsBaseOperator.RemoveParameterByName("tab_header_func_name") - Else - clsBaseOperator.AddParameter("tab_header_func_name", clsRFunctionParameter:=clsGtHeaderRFunction, iPosition:=3, bIncludeArgumentName:=False) - End If - End Sub - - Private Sub ucrInputHeaderSubtitle_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderSubtitle.ControlValueChanged - ' Subtitle is optional, so remove the parameter when empty - If ucrInputHeaderSubtitle.IsEmpty() Then - clsGtHeaderRFunction.RemoveParameterByName("subtitle") - Else - clsGtHeaderRFunction.AddParameter("subtitle", clsRFunctionParameter:=clsGtSubtitleRFunction, iPosition:=1) - End If - End Sub - - Private Sub btnHeaderTitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderTitleFormat.Click - clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtTitleRFunction) - End Sub - - Private Sub btnHeaderSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnHeaderSubTitleFormat.Click - clsTablesUtils.ShowTextFormatSubDialog(Me, clsGtSubtitleRFunction) - End Sub - Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click sdgTableOptions.Setup(ucrSelectorCols.strCurrentDataFrame, clsBaseOperator) sdgTableOptions.ShowDialog(Me) End Sub - Private Sub ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputHeaderTitle.ControlContentsChanged, ucrInputHeaderSubtitle.ControlContentsChanged, ucrReceiverMultipleCols.ControlContentsChanged + Private Sub ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged TestOKEnabled() End Sub @@ -65,12 +38,6 @@ Public Class dlgGeneralTable Private Sub initialiseDialog() - ucrInputHeaderTitle.SetParameter(New RParameter("title_text_param", 0, bNewIncludeArgumentName:=False)) - ucrInputHeaderTitle.SetLinkedDisplayControl(New List(Of Control)({lblHeaderTitle, btnHeaderTitleFormat})) - - ucrInputHeaderSubtitle.SetParameter(New RParameter("subtitle_text_param", 0, bNewIncludeArgumentName:=False)) - ucrInputHeaderSubtitle.SetLinkedDisplayControl(New List(Of Control)({lblHeaderSubtitle, btnHeaderSubTitleFormat})) - ucrReceiverMultipleCols.SetParameter(New RParameter("df_columns_to_use_param", 0, bNewIncludeArgumentName:=False)) ucrReceiverMultipleCols.SetParameterIsRFunction() ucrReceiverMultipleCols.Selector = ucrSelectorCols @@ -99,10 +66,6 @@ Public Class dlgGeneralTable clsHeadRFunction = New RFunction clsGtRFunction = New RFunction - clsGtHeaderRFunction = New RFunction - clsGtTitleRFunction = New RFunction - clsGtSubtitleRFunction = New RFunction - ucrSelectorCols.Reset() ucrReceiverMultipleCols.SetMeAsReceiver() ucrSaveTable.Reset() @@ -119,30 +82,13 @@ Public Class dlgGeneralTable clsGtRFunction.SetRCommand("gt") clsBaseOperator.AddParameter(strParameterName:="gt", clsRFunctionParameter:=clsGtRFunction, iPosition:=2, bIncludeArgumentName:=False) - '----------------------------------------- - ' HEADER - clsGtHeaderRFunction.SetPackageName("gt") - clsGtHeaderRFunction.SetRCommand("tab_header") - - ' Title related R functions - clsGtTitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() - clsGtHeaderRFunction.AddParameter("title", clsRFunctionParameter:=clsGtTitleRFunction, iPosition:=0) - - ' Subtitle related R functions - clsGtSubtitleRFunction = clsTablesUtils.GetNewHtmlSpanRFunction() - - '----------------------------------------- - ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub - Private Sub SetRCodeForControls(bReset As Boolean) - ucrInputHeaderTitle.SetRCode(clsGtTitleRFunction, bReset) - ucrInputHeaderSubtitle.SetRCode(clsGtSubtitleRFunction, bReset) ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) ucrSaveTable.SetRCode(clsBaseOperator, bReset) @@ -152,12 +98,7 @@ Public Class dlgGeneralTable End Sub Private Sub TestOKEnabled() - If Not ucrInputHeaderSubtitle.IsEmpty AndAlso ucrInputHeaderTitle.IsEmpty Then - 'If title not provided then subtitle should not be provided - ucrBase.OKEnabled(False) - Else - ucrBase.OKEnabled(Not ucrReceiverMultipleCols.IsEmpty AndAlso ucrSaveTable.IsComplete) - End If + ucrBase.OKEnabled(Not ucrReceiverMultipleCols.IsEmpty AndAlso ucrSaveTable.IsComplete) End Sub Private Sub ucrChkPreview_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkPreview.ControlValueChanged diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 5fa7c563cc7..1b01416d608 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -24,7 +24,7 @@ Partial Class sdgTableOptions Private Sub InitializeComponent() Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() - Me.ucrHeaderOptions = New instat.ucrHeader() + Me.ucrHeader = New instat.ucrHeader() Me.tbpStub = New System.Windows.Forms.TabPage() Me.ucrStub = New instat.ucrStub() Me.tbpColumns = New System.Windows.Forms.TabPage() @@ -69,28 +69,28 @@ Partial Class sdgTableOptions ' 'tbpHeader ' - Me.tbpHeader.Controls.Add(Me.ucrHeaderOptions) + Me.tbpHeader.Controls.Add(Me.ucrHeader) Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(648, 385) + Me.tbpHeader.Size = New System.Drawing.Size(648, 369) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' - 'ucrHeaderOptions + 'ucrHeader ' - Me.ucrHeaderOptions.Location = New System.Drawing.Point(7, 6) - Me.ucrHeaderOptions.Name = "ucrHeaderOptions" - Me.ucrHeaderOptions.Size = New System.Drawing.Size(303, 114) - Me.ucrHeaderOptions.TabIndex = 16 + Me.ucrHeader.Location = New System.Drawing.Point(7, 6) + Me.ucrHeader.Name = "ucrHeader" + Me.ucrHeader.Size = New System.Drawing.Size(303, 266) + Me.ucrHeader.TabIndex = 16 ' 'tbpStub ' Me.tbpStub.Controls.Add(Me.ucrStub) Me.tbpStub.Location = New System.Drawing.Point(4, 22) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(648, 385) + Me.tbpStub.Size = New System.Drawing.Size(648, 369) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True @@ -107,7 +107,7 @@ Partial Class sdgTableOptions Me.tbpColumns.Controls.Add(Me.ucrColumns) Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(648, 385) + Me.tbpColumns.Size = New System.Drawing.Size(648, 369) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True @@ -141,7 +141,7 @@ Partial Class sdgTableOptions Me.tbpCells.Controls.Add(Me.ucrCells) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(648, 385) + Me.tbpCells.Size = New System.Drawing.Size(648, 369) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True @@ -158,7 +158,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 385) + Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 369) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True @@ -180,7 +180,7 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(648, 385) + Me.tbpThemes.Size = New System.Drawing.Size(648, 369) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -282,7 +282,7 @@ Partial Class sdgTableOptions Friend WithEvents ucrPnlThemesPanel As UcrPanel Friend WithEvents ucrSourceNotes As ucrSourceNotes Friend WithEvents tbpRows As TabPage - Friend WithEvents ucrHeaderOptions As ucrHeader + Friend WithEvents ucrHeader As ucrHeader Friend WithEvents tbpColumns As TabPage Friend WithEvents ucrColumns As ucrColumns Friend WithEvents ucrRows As ucrRows diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index dd1d94c4cce..54545e1375d 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -20,18 +20,12 @@ Public Class sdgTableOptions Private clsOperator As ROperator Private clsThemeRFunction As RFunction - Private bDialogInitialised As Boolean = False + Private bFirstload As Boolean = True Private Sub sdgTableOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub - Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn - ucrCells.SetValuesToOperator() - ucrColumns.SetValuesToOperator() - SetThemesInOperatorOnReturn(clsOperator) - End Sub - Private Sub initialiseDialog() ucrPnlThemesPanel.AddRadioButton(rdoSelectTheme) ucrPnlThemesPanel.AddRadioButton(rdoManualTheme) @@ -40,7 +34,6 @@ Public Class sdgTableOptions ucrCboSelectThemes.SetDropDownStyleAsNonEditable() End Sub - ''' ''' An R operateor that has a parameter named "gt" set up. ''' The parameter should be an R Function that generates script "gt:gt()" as part of the last script statement. @@ -53,14 +46,14 @@ Public Class sdgTableOptions Exit Sub End If - If Not bDialogInitialised Then + If bFirstload Then initialiseDialog() - bDialogInitialised = True + bFirstload = False End If clsOperator = clsNewOperator - ucrHeaderOptions.Setup(clsOperator) + ucrHeader.Setup(clsOperator) ucrStub.Setup(strDataFrameName, clsOperator) ucrRows.Setup(strDataFrameName, clsOperator) ucrColumns.Setup(strDataFrameName, clsOperator) @@ -70,6 +63,18 @@ Public Class sdgTableOptions SetupThemeRFunctionsInOperatorOnNew(clsOperator) End Sub + Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn + ucrHeader.SetValuesToOperator() + ucrColumns.SetValuesToOperator() + ucrCells.SetValuesToOperator() + SetThemesInOperatorOnReturn(clsOperator) + End Sub + + + + + + '----------------------------------------- ' FOOTER CONTROLS diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb index e21ad7025e0..0f73abb23af 100644 --- a/instat/UserTables/sdgTableStyles.vb +++ b/instat/UserTables/sdgTableStyles.vb @@ -2,7 +2,7 @@ Public Class sdgTableStyles - Private clsStyleRFunction, clsCellTextRFunction, clsCellFillRFunction, clsCellBordersRFunction, clsCellBorderSidesRFunction As New RFunction + Private clsStyleListRFunction, clsCellTextRFunction, clsCellFillRFunction, clsCellBordersRFunction, clsCellBorderSidesRFunction As New RFunction Private bFirstload As Boolean = True Private bUserMadeChanges As Boolean = False Private bUserClickedReturn As Boolean = False @@ -260,7 +260,7 @@ Public Class sdgTableStyles End Sub - Public Sub Setup(clsNewStyleRFunction As RFunction) + Public Sub Setup(clsStyleListRFunction As RFunction) ' TODO @@ -269,13 +269,13 @@ Public Class sdgTableStyles Private Sub SetDefaults() - clsStyleRFunction = New RFunction + clsStyleListRFunction = New RFunction clsCellTextRFunction = New RFunction clsCellFillRFunction = New RFunction clsCellBordersRFunction = New RFunction clsCellBorderSidesRFunction = New RFunction - clsStyleRFunction.SetRCommand("list") + clsStyleListRFunction.SetRCommand("list") clsCellTextRFunction.SetPackageName("gt") clsCellTextRFunction.SetRCommand("cell_text") @@ -336,21 +336,21 @@ Public Class sdgTableStyles End If If clsCellTextRFunction.clsParameters.Count > 0 Then - clsStyleRFunction.AddParameter(strParameterName:="cell_text_param", clsRFunctionParameter:=clsCellTextRFunction, bIncludeArgumentName:=False, iPosition:=0) + clsStyleListRFunction.AddParameter(strParameterName:="cell_text_param", clsRFunctionParameter:=clsCellTextRFunction, bIncludeArgumentName:=False, iPosition:=0) End If If clsCellFillRFunction.clsParameters.Count > 0 Then - clsStyleRFunction.AddParameter(strParameterName:="cell_fill_param", clsRFunctionParameter:=clsCellFillRFunction, bIncludeArgumentName:=False, iPosition:=1) + clsStyleListRFunction.AddParameter(strParameterName:="cell_fill_param", clsRFunctionParameter:=clsCellFillRFunction, bIncludeArgumentName:=False, iPosition:=1) End If If clsCellBordersRFunction.clsParameters.Count > 0 OrElse clsCellBorderSidesRFunction.clsParameters.Count > 0 Then If clsCellBorderSidesRFunction.clsParameters.Count > 0 Then clsCellBordersRFunction.AddParameter(strParameterName:="sides", clsRFunctionParameter:=clsCellBorderSidesRFunction, iPosition:=0) End If - clsStyleRFunction.AddParameter(strParameterName:="cell_borders_param", clsRFunctionParameter:=clsCellBordersRFunction, bIncludeArgumentName:=False, iPosition:=1) + clsStyleListRFunction.AddParameter(strParameterName:="cell_borders_param", clsRFunctionParameter:=clsCellBordersRFunction, bIncludeArgumentName:=False, iPosition:=1) End If - Return clsStyleRFunction + Return clsStyleListRFunction End Function Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn From 26ae1541eb9a7d1a31fa7780cf178d8e37e3eef5 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 28 Jun 2024 16:08:10 +0300 Subject: [PATCH 060/273] Added stub styling structure --- .../Rows/ucrRowExpression.Designer.vb | 66 +++++++ instat/UserTables/Rows/ucrRowExpression.resx | 120 ++++++++++++ instat/UserTables/Rows/ucrRowExpression.vb | 5 + instat/UserTables/Stub/ucrStub.Designer.vb | 184 ++++++++---------- instat/UserTables/Stub/ucrStub.vb | 50 ++--- .../Stub/ucrStubOptions.Designer.vb | 138 +++++++++++++ instat/UserTables/Stub/ucrStubOptions.resx | 120 ++++++++++++ instat/UserTables/Stub/ucrStubOptions.vb | 78 ++++++++ .../UserTables/Stub/ucrStubStyle.Designer.vb | 128 ++++++++++++ instat/UserTables/Stub/ucrStubStyle.resx | 123 ++++++++++++ instat/UserTables/Stub/ucrStubStyle.vb | 6 + instat/UserTables/dlgGeneralTable.Designer.vb | 4 +- instat/UserTables/sdgTableOptions.Designer.vb | 2 +- instat/UserTables/sdgTableOptions.vb | 1 + .../sdgTableRowExpression.Designer.vb | 132 +++++++++++++ instat/UserTables/sdgTableRowExpression.resx | 120 ++++++++++++ instat/UserTables/sdgTableRowExpression.vb | 5 + instat/instat.vbproj | 36 ++++ 18 files changed, 1172 insertions(+), 146 deletions(-) create mode 100644 instat/UserTables/Rows/ucrRowExpression.Designer.vb create mode 100644 instat/UserTables/Rows/ucrRowExpression.resx create mode 100644 instat/UserTables/Rows/ucrRowExpression.vb create mode 100644 instat/UserTables/Stub/ucrStubOptions.Designer.vb create mode 100644 instat/UserTables/Stub/ucrStubOptions.resx create mode 100644 instat/UserTables/Stub/ucrStubOptions.vb create mode 100644 instat/UserTables/Stub/ucrStubStyle.Designer.vb create mode 100644 instat/UserTables/Stub/ucrStubStyle.resx create mode 100644 instat/UserTables/Stub/ucrStubStyle.vb create mode 100644 instat/UserTables/sdgTableRowExpression.Designer.vb create mode 100644 instat/UserTables/sdgTableRowExpression.resx create mode 100644 instat/UserTables/sdgTableRowExpression.vb diff --git a/instat/UserTables/Rows/ucrRowExpression.Designer.vb b/instat/UserTables/Rows/ucrRowExpression.Designer.vb new file mode 100644 index 00000000000..ebbc50761ce --- /dev/null +++ b/instat/UserTables/Rows/ucrRowExpression.Designer.vb @@ -0,0 +1,66 @@ + _ +Partial Class ucrRowExpression + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.btnSet = New System.Windows.Forms.Button() + Me.UcrInputRowExpression = New instat.ucrInputTextBox() + Me.SuspendLayout() + ' + 'btnSet + ' + Me.btnSet.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnSet.Location = New System.Drawing.Point(148, 2) + Me.btnSet.Name = "btnSet" + Me.btnSet.Size = New System.Drawing.Size(44, 23) + Me.btnSet.TabIndex = 341 + Me.btnSet.Tag = "" + Me.btnSet.Text = "Set" + Me.btnSet.UseVisualStyleBackColor = True + ' + 'UcrInputRowExpression + ' + Me.UcrInputRowExpression.AddQuotesIfUnrecognised = True + Me.UcrInputRowExpression.AutoSize = True + Me.UcrInputRowExpression.IsMultiline = False + Me.UcrInputRowExpression.IsReadOnly = False + Me.UcrInputRowExpression.Location = New System.Drawing.Point(6, 4) + Me.UcrInputRowExpression.Name = "UcrInputRowExpression" + Me.UcrInputRowExpression.Size = New System.Drawing.Size(142, 21) + Me.UcrInputRowExpression.TabIndex = 340 + ' + 'ucrRowExpression + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btnSet) + Me.Controls.Add(Me.UcrInputRowExpression) + Me.Name = "ucrRowExpression" + Me.Size = New System.Drawing.Size(193, 26) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents btnSet As Button + Friend WithEvents UcrInputRowExpression As ucrInputTextBox +End Class diff --git a/instat/UserTables/Rows/ucrRowExpression.resx b/instat/UserTables/Rows/ucrRowExpression.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Rows/ucrRowExpression.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRowExpression.vb b/instat/UserTables/Rows/ucrRowExpression.vb new file mode 100644 index 00000000000..facc552f06b --- /dev/null +++ b/instat/UserTables/Rows/ucrRowExpression.vb @@ -0,0 +1,5 @@ +Public Class ucrRowExpression + Private Sub btnSet_Click(sender As Object, e As EventArgs) Handles btnSet.Click + sdgTableRowExpression.ShowDialog(Me.ParentForm) + End Sub +End Class diff --git a/instat/UserTables/Stub/ucrStub.Designer.vb b/instat/UserTables/Stub/ucrStub.Designer.vb index 7bb2e4f0a35..94e76a4240e 100644 --- a/instat/UserTables/Stub/ucrStub.Designer.vb +++ b/instat/UserTables/Stub/ucrStub.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class ucrStub Inherits System.Windows.Forms.UserControl 'UserControl overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,119 +20,95 @@ Partial Class ucrStub 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() - Me.lblRowName = New System.Windows.Forms.Label() - Me.ucrReceiverSingleRowName = New instat.ucrReceiverSingle() - Me.lblGroupByCol = New System.Windows.Forms.Label() - Me.ucrReceiverSingleGroupByCol = New instat.ucrReceiverSingle() - Me.lblStubHeadLabel = New System.Windows.Forms.Label() - Me.ucrInputStubHead = New instat.ucrInputTextBox() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrStubOptions = New instat.ucrStubOptions() + Me.rdoVariables = New System.Windows.Forms.RadioButton() + Me.rdoStyles = New System.Windows.Forms.RadioButton() + Me.ucrPnlStub = New instat.UcrPanel() + Me.ucrStubStyle = New instat.ucrStubStyle() Me.SuspendLayout() ' - 'lblRowName - ' - Me.lblRowName.AutoSize = True - Me.lblRowName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowName.Location = New System.Drawing.Point(252, 54) - Me.lblRowName.Name = "lblRowName" - Me.lblRowName.Size = New System.Drawing.Size(63, 13) - Me.lblRowName.TabIndex = 37 - Me.lblRowName.Text = "Row Name:" - ' - 'ucrReceiverSingleRowName - ' - Me.ucrReceiverSingleRowName.AutoSize = True - Me.ucrReceiverSingleRowName.frmParent = Nothing - Me.ucrReceiverSingleRowName.Location = New System.Drawing.Point(255, 67) - Me.ucrReceiverSingleRowName.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleRowName.Name = "ucrReceiverSingleRowName" - Me.ucrReceiverSingleRowName.Selector = Nothing - Me.ucrReceiverSingleRowName.Size = New System.Drawing.Size(142, 20) - Me.ucrReceiverSingleRowName.strNcFilePath = "" - Me.ucrReceiverSingleRowName.TabIndex = 36 - Me.ucrReceiverSingleRowName.ucrSelector = Nothing - ' - 'lblGroupByCol - ' - Me.lblGroupByCol.AutoSize = True - Me.lblGroupByCol.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupByCol.Location = New System.Drawing.Point(253, 9) - Me.lblGroupByCol.Name = "lblGroupByCol" - Me.lblGroupByCol.Size = New System.Drawing.Size(54, 13) - Me.lblGroupByCol.TabIndex = 35 - Me.lblGroupByCol.Text = "Group By:" - ' - 'ucrReceiverSingleGroupByCol - ' - Me.ucrReceiverSingleGroupByCol.AutoSize = True - Me.ucrReceiverSingleGroupByCol.frmParent = Nothing - Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(255, 23) - Me.ucrReceiverSingleGroupByCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleGroupByCol.Name = "ucrReceiverSingleGroupByCol" - Me.ucrReceiverSingleGroupByCol.Selector = Nothing - Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(142, 20) - Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" - Me.ucrReceiverSingleGroupByCol.TabIndex = 34 - Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing - ' - 'lblStubHeadLabel - ' - Me.lblStubHeadLabel.AutoSize = True - Me.lblStubHeadLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStubHeadLabel.Location = New System.Drawing.Point(253, 100) - Me.lblStubHeadLabel.Name = "lblStubHeadLabel" - Me.lblStubHeadLabel.Size = New System.Drawing.Size(85, 13) - Me.lblStubHeadLabel.TabIndex = 39 - Me.lblStubHeadLabel.Text = "Stubhead Label:" - ' - 'ucrInputStubHead - ' - Me.ucrInputStubHead.AddQuotesIfUnrecognised = True - Me.ucrInputStubHead.AutoSize = True - Me.ucrInputStubHead.IsMultiline = False - Me.ucrInputStubHead.IsReadOnly = False - Me.ucrInputStubHead.Location = New System.Drawing.Point(255, 116) - Me.ucrInputStubHead.Name = "ucrInputStubHead" - Me.ucrInputStubHead.Size = New System.Drawing.Size(142, 21) - Me.ucrInputStubHead.TabIndex = 40 - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(2, 3) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 291 + 'ucrStubOptions + ' + Me.ucrStubOptions.Location = New System.Drawing.Point(3, 40) + Me.ucrStubOptions.Name = "ucrStubOptions" + Me.ucrStubOptions.Size = New System.Drawing.Size(405, 187) + Me.ucrStubOptions.TabIndex = 0 + ' + 'rdoVariables + ' + Me.rdoVariables.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoVariables.BackColor = System.Drawing.SystemColors.Control + Me.rdoVariables.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoVariables.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoVariables.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoVariables.FlatAppearance.BorderSize = 2 + Me.rdoVariables.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoVariables.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoVariables.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoVariables.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoVariables.Location = New System.Drawing.Point(106, 3) + Me.rdoVariables.Name = "rdoVariables" + Me.rdoVariables.Size = New System.Drawing.Size(91, 29) + Me.rdoVariables.TabIndex = 283 + Me.rdoVariables.Text = "Contents" + Me.rdoVariables.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoVariables.UseVisualStyleBackColor = True + ' + 'rdoStyles + ' + Me.rdoStyles.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoStyles.BackColor = System.Drawing.SystemColors.Control + Me.rdoStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyles.FlatAppearance.BorderSize = 2 + Me.rdoStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoStyles.Location = New System.Drawing.Point(195, 3) + Me.rdoStyles.Name = "rdoStyles" + Me.rdoStyles.Size = New System.Drawing.Size(91, 29) + Me.rdoStyles.TabIndex = 284 + Me.rdoStyles.Text = "Styles" + Me.rdoStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoStyles.UseVisualStyleBackColor = True + ' + 'ucrPnlStub + ' + Me.ucrPnlStub.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlStub.Location = New System.Drawing.Point(81, 3) + Me.ucrPnlStub.Name = "ucrPnlStub" + Me.ucrPnlStub.Size = New System.Drawing.Size(232, 29) + Me.ucrPnlStub.TabIndex = 282 + ' + 'ucrStubStyle + ' + Me.ucrStubStyle.Location = New System.Drawing.Point(3, 43) + Me.ucrStubStyle.Name = "ucrStubStyle" + Me.ucrStubStyle.Size = New System.Drawing.Size(372, 186) + Me.ucrStubStyle.TabIndex = 285 ' 'ucrStub ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.ucrInputStubHead) - Me.Controls.Add(Me.lblStubHeadLabel) - Me.Controls.Add(Me.lblRowName) - Me.Controls.Add(Me.ucrReceiverSingleRowName) - Me.Controls.Add(Me.lblGroupByCol) - Me.Controls.Add(Me.ucrReceiverSingleGroupByCol) + Me.Controls.Add(Me.ucrStubStyle) + Me.Controls.Add(Me.rdoVariables) + Me.Controls.Add(Me.rdoStyles) + Me.Controls.Add(Me.ucrPnlStub) + Me.Controls.Add(Me.ucrStubOptions) Me.Name = "ucrStub" - Me.Size = New System.Drawing.Size(411, 191) + Me.Size = New System.Drawing.Size(420, 239) Me.ResumeLayout(False) - Me.PerformLayout() End Sub - Friend WithEvents lblRowName As Label - Friend WithEvents ucrReceiverSingleRowName As ucrReceiverSingle - Friend WithEvents lblGroupByCol As Label - Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle - Friend WithEvents lblStubHeadLabel As Label - Friend WithEvents ucrInputStubHead As ucrInputTextBox - Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrStubOptions As ucrStubOptions + Friend WithEvents rdoVariables As RadioButton + Friend WithEvents rdoStyles As RadioButton + Friend WithEvents ucrPnlStub As UcrPanel + Friend WithEvents ucrStubStyle As ucrStubStyle End Class diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb index 729dad4f5dc..3135659e71c 100644 --- a/instat/UserTables/Stub/ucrStub.vb +++ b/instat/UserTables/Stub/ucrStub.vb @@ -2,23 +2,14 @@ Public Class ucrStub - Private clsOperator As New ROperator - Private clsStubHeadRParameter As RParameter - Private clsGtRFunction As New RFunction Private bFirstload As Boolean = True Private Sub initialiseDialog() - ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) - ucrReceiverSingleRowName.SetParameterIsString() - ucrReceiverSingleRowName.Selector = ucrSelectorCols - ucrReceiverSingleRowName.SetLinkedDisplayControl(lblRowName) - ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 1)) - ucrReceiverSingleGroupByCol.SetParameterIsString() - ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols - ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) + ucrPnlStub.AddRadioButton(rdoVariables) + ucrPnlStub.AddRadioButton(rdoStyles) - ucrInputStubHead.SetParameter(New RParameter("label", 0)) + rdoVariables.Checked = True End Sub @@ -29,42 +20,23 @@ Public Class ucrStub bFirstload = False End If - Me.clsOperator = clsOperator + ucrStubOptions.Setup(strDataFrameName, clsOperator) - ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + End Sub - Dim lstRParams As List(Of RParameter) + Private Sub ucrPnlRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStub.ControlValueChanged + ucrStubOptions.Visible = rdoVariables.Checked + ucrStubStyle.Visible = rdoStyles.Checked + End Sub - lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsOperator) - ' The GT paramter should always be there. - If lstRParams.Count > 0 Then - clsGtRFunction = lstRParams(0).clsArgumentCodeStructure - ucrReceiverSingleRowName.SetRCode(clsGtRFunction, False, bCloneIfNeeded:=True) - ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, False, bCloneIfNeeded:=True) - End If + Public Sub SetValuesToOperator() - lstRParams = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_stubhead"}, clsOperator) - If lstRParams.Count > 0 Then - clsStubHeadRParameter = lstRParams(0) - Else - Dim clstabStubHeadFunction As New RFunction - clstabStubHeadFunction.SetPackageName("gt") - clstabStubHeadFunction.SetRCommand("tab_stubhead") - clsStubHeadRParameter = New RParameter(strParameterName:="tab_stubhead_param", strParamValue:=clstabStubHeadFunction, bNewIncludeArgumentName:=False) - End If + ucrStubOptions.SetValuesToOperator() - End Sub - Private Sub ucrInputStubHead_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStubHead.ControlValueChanged - If ucrInputStubHead.IsEmpty Then - clsOperator.RemoveParameter(clsStubHeadRParameter) - Else - clsStubHeadRParameter.clsArgumentCodeStructure.AddParameter("label", strParameterValue:=clsTablesUtils.GetStringValue(ucrInputStubHead.GetValue(), True)) - clsOperator.AddParameter(clsStubHeadRParameter) - End If End Sub diff --git a/instat/UserTables/Stub/ucrStubOptions.Designer.vb b/instat/UserTables/Stub/ucrStubOptions.Designer.vb new file mode 100644 index 00000000000..415a5ae96f6 --- /dev/null +++ b/instat/UserTables/Stub/ucrStubOptions.Designer.vb @@ -0,0 +1,138 @@ + _ +Partial Class ucrStubOptions + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrInputStubHead = New instat.ucrInputTextBox() + Me.lblStubHeadLabel = New System.Windows.Forms.Label() + Me.lblRowName = New System.Windows.Forms.Label() + Me.ucrReceiverSingleRowName = New instat.ucrReceiverSingle() + Me.lblGroupByCol = New System.Windows.Forms.Label() + Me.ucrReceiverSingleGroupByCol = New instat.ucrReceiverSingle() + Me.SuspendLayout() + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(3, 1) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 298 + ' + 'ucrInputStubHead + ' + Me.ucrInputStubHead.AddQuotesIfUnrecognised = True + Me.ucrInputStubHead.AutoSize = True + Me.ucrInputStubHead.IsMultiline = False + Me.ucrInputStubHead.IsReadOnly = False + Me.ucrInputStubHead.Location = New System.Drawing.Point(256, 122) + Me.ucrInputStubHead.Name = "ucrInputStubHead" + Me.ucrInputStubHead.Size = New System.Drawing.Size(142, 21) + Me.ucrInputStubHead.TabIndex = 297 + ' + 'lblStubHeadLabel + ' + Me.lblStubHeadLabel.AutoSize = True + Me.lblStubHeadLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblStubHeadLabel.Location = New System.Drawing.Point(254, 106) + Me.lblStubHeadLabel.Name = "lblStubHeadLabel" + Me.lblStubHeadLabel.Size = New System.Drawing.Size(133, 13) + Me.lblStubHeadLabel.TabIndex = 296 + Me.lblStubHeadLabel.Text = "Stubhead Label (Optional):" + ' + 'lblRowName + ' + Me.lblRowName.AutoSize = True + Me.lblRowName.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowName.Location = New System.Drawing.Point(254, 16) + Me.lblRowName.Name = "lblRowName" + Me.lblRowName.Size = New System.Drawing.Size(63, 13) + Me.lblRowName.TabIndex = 295 + Me.lblRowName.Text = "Row Name:" + ' + 'ucrReceiverSingleRowName + ' + Me.ucrReceiverSingleRowName.AutoSize = True + Me.ucrReceiverSingleRowName.frmParent = Nothing + Me.ucrReceiverSingleRowName.Location = New System.Drawing.Point(257, 29) + Me.ucrReceiverSingleRowName.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleRowName.Name = "ucrReceiverSingleRowName" + Me.ucrReceiverSingleRowName.Selector = Nothing + Me.ucrReceiverSingleRowName.Size = New System.Drawing.Size(142, 20) + Me.ucrReceiverSingleRowName.strNcFilePath = "" + Me.ucrReceiverSingleRowName.TabIndex = 294 + Me.ucrReceiverSingleRowName.ucrSelector = Nothing + ' + 'lblGroupByCol + ' + Me.lblGroupByCol.AutoSize = True + Me.lblGroupByCol.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupByCol.Location = New System.Drawing.Point(253, 61) + Me.lblGroupByCol.Name = "lblGroupByCol" + Me.lblGroupByCol.Size = New System.Drawing.Size(102, 13) + Me.lblGroupByCol.TabIndex = 293 + Me.lblGroupByCol.Text = "Group By (Optional):" + ' + 'ucrReceiverSingleGroupByCol + ' + Me.ucrReceiverSingleGroupByCol.AutoSize = True + Me.ucrReceiverSingleGroupByCol.frmParent = Nothing + Me.ucrReceiverSingleGroupByCol.Location = New System.Drawing.Point(255, 75) + Me.ucrReceiverSingleGroupByCol.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverSingleGroupByCol.Name = "ucrReceiverSingleGroupByCol" + Me.ucrReceiverSingleGroupByCol.Selector = Nothing + Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(142, 20) + Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" + Me.ucrReceiverSingleGroupByCol.TabIndex = 292 + Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing + ' + 'ucrStubOptions + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrSelectorCols) + Me.Controls.Add(Me.ucrInputStubHead) + Me.Controls.Add(Me.lblStubHeadLabel) + Me.Controls.Add(Me.lblRowName) + Me.Controls.Add(Me.ucrReceiverSingleRowName) + Me.Controls.Add(Me.lblGroupByCol) + Me.Controls.Add(Me.ucrReceiverSingleGroupByCol) + Me.Name = "ucrStubOptions" + Me.Size = New System.Drawing.Size(405, 187) + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrInputStubHead As ucrInputTextBox + Friend WithEvents lblStubHeadLabel As Label + Friend WithEvents lblRowName As Label + Friend WithEvents ucrReceiverSingleRowName As ucrReceiverSingle + Friend WithEvents lblGroupByCol As Label + Friend WithEvents ucrReceiverSingleGroupByCol As ucrReceiverSingle +End Class diff --git a/instat/UserTables/Stub/ucrStubOptions.resx b/instat/UserTables/Stub/ucrStubOptions.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Stub/ucrStubOptions.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Stub/ucrStubOptions.vb b/instat/UserTables/Stub/ucrStubOptions.vb new file mode 100644 index 00000000000..6799b3a6c21 --- /dev/null +++ b/instat/UserTables/Stub/ucrStubOptions.vb @@ -0,0 +1,78 @@ +Public Class ucrStubOptions + Private clsOperator As New ROperator + Private clsGtRFunction, clsStubHeadRFunction, clsStubStyleRFunction, clsStubLocationRFunction As New RFunction + Private bFirstload As Boolean = True + + Private Sub initialiseDialog() + ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) + ucrReceiverSingleRowName.SetParameterIsString() + ucrReceiverSingleRowName.Selector = ucrSelectorCols + ucrReceiverSingleRowName.SetLinkedDisplayControl(lblRowName) + + ucrReceiverSingleGroupByCol.SetParameter(New RParameter("groupname_col", 1)) + ucrReceiverSingleGroupByCol.SetParameterIsString() + ucrReceiverSingleGroupByCol.Selector = ucrSelectorCols + ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) + + ucrInputStubHead.SetParameter(New RParameter("label", 0)) + + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + + If bFirstload Then + initialiseDialog() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + ucrReceiverSingleGroupByCol.SetMeAsReceiver() + + ' The GT paramter should always be there. + clsGtRFunction = clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsOperator).FirstOrDefault()?.clsArgumentCodeStructure + + clsStubHeadRFunction = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_stubhead"}, clsOperator).FirstOrDefault()?.clsArgumentCodeStructure + If clsStubHeadRFunction Is Nothing Then + clsStubHeadRFunction = New RFunction + clsStubHeadRFunction.SetPackageName("gt") + clsStubHeadRFunction.SetRCommand("tab_stubhead") + End If + + Dim lstTabStyleForRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator) + + SetRCode() + End Sub + + Private Sub SetRCode() + ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) + ucrReceiverSingleRowName.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) + ucrInputStubHead.SetRCode(clsStubHeadRFunction, True, bCloneIfNeeded:=True) + End Sub + + + Private Sub ucrInputStubHead_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStubHead.ControlValueChanged + 'clsStubHeadRFunction.AddParameter("label", strParameterValue:=clsTablesUtils.GetStringValue(ucrInputStubHead.GetValue(), True)) + + + End Sub + + Private Sub btnStyle_Click(sender As Object, e As EventArgs) + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm, clsStubStyleRFunction) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + clsStubStyleRFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsStubLocationRFunction) + End Sub + + Public Sub SetValuesToOperator() + + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"tab_stubhead"}, clsOperator) + + If Not ucrInputStubHead.IsEmpty Then + clsOperator.AddParameter(New RParameter(strParameterName:="tab_stubhead_param", strParamValue:=clsStubHeadRFunction, bNewIncludeArgumentName:=False)) + End If + End Sub +End Class diff --git a/instat/UserTables/Stub/ucrStubStyle.Designer.vb b/instat/UserTables/Stub/ucrStubStyle.Designer.vb new file mode 100644 index 00000000000..9acd6745629 --- /dev/null +++ b/instat/UserTables/Stub/ucrStubStyle.Designer.vb @@ -0,0 +1,128 @@ + _ +Partial Class ucrStubStyle + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.btnEnterStyle = New System.Windows.Forms.Button() + Me.lblFormats = New System.Windows.Forms.Label() + Me.btnClearFormats = New System.Windows.Forms.Button() + Me.dataGridFormats = New System.Windows.Forms.DataGridView() + Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.Label1 = New System.Windows.Forms.Label() + Me.ucrRowExpression = New instat.ucrRowExpression() + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'btnEnterStyle + ' + Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnEnterStyle.Location = New System.Drawing.Point(8, 59) + Me.btnEnterStyle.Name = "btnEnterStyle" + Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) + Me.btnEnterStyle.TabIndex = 335 + Me.btnEnterStyle.Tag = "" + Me.btnEnterStyle.Text = "Enter Style" + Me.btnEnterStyle.UseVisualStyleBackColor = True + ' + 'lblFormats + ' + Me.lblFormats.AutoSize = True + Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFormats.Location = New System.Drawing.Point(6, 90) + Me.lblFormats.Name = "lblFormats" + Me.lblFormats.Size = New System.Drawing.Size(38, 13) + Me.lblFormats.TabIndex = 338 + Me.lblFormats.Text = "Styles:" + ' + 'btnClearFormats + ' + Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearFormats.Location = New System.Drawing.Point(290, 81) + Me.btnClearFormats.Name = "btnClearFormats" + Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) + Me.btnClearFormats.TabIndex = 337 + Me.btnClearFormats.Tag = "" + Me.btnClearFormats.Text = "Clear" + Me.btnClearFormats.UseVisualStyleBackColor = True + ' + 'dataGridFormats + ' + Me.dataGridFormats.AllowUserToAddRows = False + Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) + Me.dataGridFormats.Location = New System.Drawing.Point(8, 107) + Me.dataGridFormats.Name = "dataGridFormats" + Me.dataGridFormats.RowHeadersWidth = 62 + Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) + Me.dataGridFormats.TabIndex = 336 + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Style Expressions" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(6, 4) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(131, 13) + Me.Label1.TabIndex = 333 + Me.Label1.Text = "Row Expression(Optional):" + ' + 'ucrRowExpression + ' + Me.ucrRowExpression.Location = New System.Drawing.Point(8, 20) + Me.ucrRowExpression.Name = "ucrRowExpression" + Me.ucrRowExpression.Size = New System.Drawing.Size(193, 26) + Me.ucrRowExpression.TabIndex = 339 + ' + 'ucrStubStyle + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrRowExpression) + Me.Controls.Add(Me.lblFormats) + Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.dataGridFormats) + Me.Controls.Add(Me.btnEnterStyle) + Me.Controls.Add(Me.Label1) + Me.Name = "ucrStubStyle" + Me.Size = New System.Drawing.Size(372, 186) + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents btnEnterStyle As Button + Friend WithEvents lblFormats As Label + Friend WithEvents btnClearFormats As Button + Friend WithEvents dataGridFormats As DataGridView + Friend WithEvents colStyles As DataGridViewTextBoxColumn + Friend WithEvents Label1 As Label + Friend WithEvents ucrRowExpression As ucrRowExpression +End Class diff --git a/instat/UserTables/Stub/ucrStubStyle.resx b/instat/UserTables/Stub/ucrStubStyle.resx new file mode 100644 index 00000000000..d937ee32b35 --- /dev/null +++ b/instat/UserTables/Stub/ucrStubStyle.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Stub/ucrStubStyle.vb b/instat/UserTables/Stub/ucrStubStyle.vb new file mode 100644 index 00000000000..ac1bcbd55f7 --- /dev/null +++ b/instat/UserTables/Stub/ucrStubStyle.vb @@ -0,0 +1,6 @@ +Public Class ucrStubStyle + + ' TODO. left here + ' use the row expressions control to get styles for the stub + +End Class diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index 95e57bd177a..dedeb89ad4a 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -56,7 +56,7 @@ Partial Class dlgGeneralTable Me.ucrNudPreview.AutoSize = True Me.ucrNudPreview.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreview.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreview.Location = New System.Drawing.Point(400, 173) + Me.ucrNudPreview.Location = New System.Drawing.Point(370, 174) Me.ucrNudPreview.Margin = New System.Windows.Forms.Padding(6) Me.ucrNudPreview.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreview.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -72,7 +72,7 @@ Partial Class dlgGeneralTable Me.ucrChkPreview.Location = New System.Drawing.Point(250, 175) Me.ucrChkPreview.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkPreview.Name = "ucrChkPreview" - Me.ucrChkPreview.Size = New System.Drawing.Size(144, 23) + Me.ucrChkPreview.Size = New System.Drawing.Size(119, 23) Me.ucrChkPreview.TabIndex = 30 ' 'ucrSaveTable diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 1b01416d608..3ba79742503 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -99,7 +99,7 @@ Partial Class sdgTableOptions ' Me.ucrStub.Location = New System.Drawing.Point(7, 7) Me.ucrStub.Name = "ucrStub" - Me.ucrStub.Size = New System.Drawing.Size(411, 191) + Me.ucrStub.Size = New System.Drawing.Size(425, 258) Me.ucrStub.TabIndex = 0 ' 'tbpColumns diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 54545e1375d..f5d86e1e9ab 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -65,6 +65,7 @@ Public Class sdgTableOptions Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn ucrHeader.SetValuesToOperator() + ucrStub.SetValuesToOperator() ucrColumns.SetValuesToOperator() ucrCells.SetValuesToOperator() SetThemesInOperatorOnReturn(clsOperator) diff --git a/instat/UserTables/sdgTableRowExpression.Designer.vb b/instat/UserTables/sdgTableRowExpression.Designer.vb new file mode 100644 index 00000000000..fd5443d5887 --- /dev/null +++ b/instat/UserTables/sdgTableRowExpression.Designer.vb @@ -0,0 +1,132 @@ + _ +Partial Class sdgTableRowExpression + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.cboCondition = New System.Windows.Forms.ComboBox() + Me.lblCondition = New System.Windows.Forms.Label() + Me.lblExpression = New System.Windows.Forms.Label() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() + Me.ucrInputExpression = New instat.ucrInputTextBox() + Me.btnAddCondition = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'cboCondition + ' + Me.cboCondition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboCondition.FormattingEnabled = True + Me.cboCondition.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) + Me.cboCondition.Location = New System.Drawing.Point(5, 221) + Me.cboCondition.Name = "cboCondition" + Me.cboCondition.Size = New System.Drawing.Size(148, 21) + Me.cboCondition.TabIndex = 285 + ' + 'lblCondition + ' + Me.lblCondition.AutoSize = True + Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblCondition.Location = New System.Drawing.Point(12, 204) + Me.lblCondition.Name = "lblCondition" + Me.lblCondition.Size = New System.Drawing.Size(54, 13) + Me.lblCondition.TabIndex = 284 + Me.lblCondition.Text = "Condition:" + ' + 'lblExpression + ' + Me.lblExpression.AutoSize = True + Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExpression.Location = New System.Drawing.Point(237, 95) + Me.lblExpression.Name = "lblExpression" + Me.lblExpression.Size = New System.Drawing.Size(61, 13) + Me.lblExpression.TabIndex = 283 + Me.lblExpression.Text = "Expression:" + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(5, 4) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 281 + ' + 'ucrSdgBaseButtons + ' + Me.ucrSdgBaseButtons.AutoSize = True + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(103, 271) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.TabIndex = 344 + ' + 'ucrInputExpression + ' + Me.ucrInputExpression.AddQuotesIfUnrecognised = True + Me.ucrInputExpression.AutoSize = True + Me.ucrInputExpression.IsMultiline = False + Me.ucrInputExpression.IsReadOnly = False + Me.ucrInputExpression.Location = New System.Drawing.Point(240, 111) + Me.ucrInputExpression.Name = "ucrInputExpression" + Me.ucrInputExpression.Size = New System.Drawing.Size(177, 23) + Me.ucrInputExpression.TabIndex = 345 + ' + 'btnAddCondition + ' + Me.btnAddCondition.Location = New System.Drawing.Point(158, 219) + Me.btnAddCondition.Name = "btnAddCondition" + Me.btnAddCondition.Size = New System.Drawing.Size(75, 23) + Me.btnAddCondition.TabIndex = 346 + Me.btnAddCondition.Text = "Add" + Me.btnAddCondition.UseVisualStyleBackColor = True + ' + 'sdgTableRowExpression + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(423, 304) + Me.Controls.Add(Me.btnAddCondition) + Me.Controls.Add(Me.ucrInputExpression) + Me.Controls.Add(Me.ucrSdgBaseButtons) + Me.Controls.Add(Me.cboCondition) + Me.Controls.Add(Me.lblCondition) + Me.Controls.Add(Me.lblExpression) + Me.Controls.Add(Me.ucrSelectorCols) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Name = "sdgTableRowExpression" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent + Me.Text = "Set Expression" + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents cboCondition As ComboBox + Friend WithEvents lblCondition As Label + Friend WithEvents lblExpression As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue + Friend WithEvents ucrInputExpression As ucrInputTextBox + Friend WithEvents btnAddCondition As Button +End Class diff --git a/instat/UserTables/sdgTableRowExpression.resx b/instat/UserTables/sdgTableRowExpression.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/sdgTableRowExpression.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/sdgTableRowExpression.vb b/instat/UserTables/sdgTableRowExpression.vb new file mode 100644 index 00000000000..c5c2a1a0015 --- /dev/null +++ b/instat/UserTables/sdgTableRowExpression.vb @@ -0,0 +1,5 @@ +Public Class sdgTableRowExpression + Private Sub sdgTableRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index da2c27bf7bd..2d821c83cbe 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -422,6 +422,12 @@ Form + + ucrRowExpression.vb + + + UserControl + sdgTableOptionsTextFormat.vb @@ -3152,6 +3158,12 @@ UserControl + + sdgTableRowExpression.vb + + + Form + sdgTableStyles.vb @@ -3170,6 +3182,18 @@ UserControl + + ucrStubOptions.vb + + + UserControl + + + ucrStubStyle.vb + + + UserControl + @@ -3393,6 +3417,9 @@ dlgGeneralTable.vb + + ucrRowExpression.vb + sdgTableOptionsTextFormat.vb @@ -5524,6 +5551,9 @@ ucrRowSummary.vb + + sdgTableRowExpression.vb + sdgTableStyles.vb @@ -5533,6 +5563,12 @@ ucrStub.vb + + ucrStubOptions.vb + + + ucrStubStyle.vb + From 012588f3dd1289e580d4f6d4f8f0256213466312 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 3 Jul 2024 12:19:37 +0100 Subject: [PATCH 061/273] Change made --- instat/dlgClimograph.vb | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 105061fe386..6b8bff81d92 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -91,6 +91,7 @@ Public Class dlgClimograph Private clsMaxFunction As New RFunction Private clsMax1Function As New RFunction Private clsVectorFunction As New RFunction + Private clsGetObjectDataFunction As New RFunction Private clsStarOperator As New ROperator Private clsStar1Operator As New ROperator Private clsDivideOperator As New ROperator @@ -235,7 +236,7 @@ Public Class dlgClimograph ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkColourIdntity, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourIdntity.SetText("Colour Identity") + ucrChkColourIdntity.SetText("Legend for Lines") ucrChkColourIdntity.AddParameterValuesCondition(True, "checked", "True") ucrChkColourIdntity.AddParameterValuesCondition(False, "checked", "False") ucrChkColourIdntity.AddToLinkedControls({ucrInputName, ucrInputLabels}, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -339,6 +340,7 @@ Public Class dlgClimograph clsVectorFunction = New RFunction clsScaleycontinuousFunction = New RFunction clsLabFunction = New RFunction + clsGetObjectDataFunction = New RFunction ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) @@ -576,9 +578,14 @@ Public Class dlgClimograph clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction + clsGetObjectDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") + clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsGetObjectDataFunction.AddParameter("as_file", "TRUE", iPosition:=2) + clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) + ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction, iPosition:=0) End Sub Private Sub SetRCodeForControls(bReset) @@ -1320,6 +1327,7 @@ Public Class dlgClimograph End Sub Private Sub ucrSelectorClimograph_DataFrameChanged() Handles ucrSelectorClimograph.DataFrameChanged + clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) AddRemoveGeomRibbon() End Sub @@ -1329,6 +1337,14 @@ Public Class dlgClimograph AddRemoveGeomTextTmin() End Sub + Private Sub ucrSave_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlValueChanged + If ucrSave.ucrChkSave.Checked Then + clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & ucrSave.GetText & Chr(34), iPosition:=1) + Else + clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & "last_graph" & Chr(34), iPosition:=1) + End If + End Sub + Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged TestOKEnabled() End Sub From 9ca1fe450a151ae663e8fb1da16f5f2969778003 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Thu, 4 Jul 2024 19:46:09 +0100 Subject: [PATCH 062/273] Update to crops definition function to allow for "both" Want to have the option to see the results with "Start Check" both TRUE and FALSE in the same table (as two columns) --- .../static/InstatObject/R/instat_object_R6.R | 149 ++++++++++++------ 1 file changed, 100 insertions(+), 49 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 7bf6274f247..c1812c3d890 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2046,6 +2046,7 @@ DataBook$set("public","get_variable_sets", function(data_name, set_names, force_ } ) + DataBook$set("public", "crops_definitions", function(data_name, year, station, rain, day, rain_totals, plant_days, plant_lengths, start_check = TRUE, season_data_name, start_day, end_day, definition_props = TRUE, print_table = TRUE) { plant_day_name <- "plant_day" plant_length_name <- "plant_length" @@ -2054,8 +2055,8 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r is_station <- !missing(station) if(missing(year)) stop("Year column must be specified.") - if(!is_station) by <- year - else by <- c(year, station) + by <- if(!is_station) year else c(year, station) + if(missing(season_data_name)) season_data_name <- data_name if(season_data_name != data_name) { season_by <- self$get_equivalent_columns(from_data_name = data_name, columns = by, to_data_name = season_data_name) @@ -2064,20 +2065,8 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r year_col <- self$get_columns_from_data(data_name, year) unique_year <- na.omit(unique(year_col)) - expand_list <- list() - names_list <- c() - - expand_list[[length(expand_list) + 1]] <- rain_totals - names_list[length(names_list) + 1] <- rain_total_name - - expand_list[[length(expand_list) + 1]] <- plant_lengths - names_list[length(names_list) + 1] <- plant_length_name - - expand_list[[length(expand_list) + 1]] <- plant_days - names_list[length(names_list) + 1] <- plant_day_name - - expand_list[[length(expand_list) + 1]] <- unique_year - names_list[length(names_list) + 1] <- year + expand_list <- list(rain_totals, plant_lengths, plant_days, unique_year) + names_list <- c(rain_total_name, plant_length_name, plant_day_name, year) if(is_station) { station_col <- self$get_columns_from_data(data_name, station) @@ -2085,8 +2074,10 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r expand_list[[length(expand_list) + 1]] <- unique_station names_list[length(names_list) + 1] <- station } + df <- setNames(expand.grid(expand_list), names_list) daily_data <- self$get_data_frame(data_name) + if(season_data_name != data_name) { join_by <- by names(join_by) <- season_by @@ -2106,7 +2097,7 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r } # Plant day condition - if(start_check) { + if(start_check %in% c("yes", "both")) { df$plant_day_cond <- (df[[start_day]] <= df[[plant_day_name]]) } @@ -2114,34 +2105,57 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r df$length_cond <- (df[[plant_day_name]] + df[[plant_length_name]] <= df[[end_day]]) # Rain total condition - df[["rain_total_actual"]] <- sapply(1:nrow(df), - function(x) { - ind <- daily_data[[year]] == df[[year]][x] & daily_data[[day]] >= df[[plant_day_name]][x] & - daily_data[[day]] < (df[[plant_day_name]][x] + df[[plant_length_name]][x]) - if(is_station) ind <- ind & (daily_data[[station]] == df[[station]][x]) - rain_values <- daily_data[[rain]][ind] - sum_rain <- sum(rain_values, na.rm = TRUE) - # TODO + 1 is needed because of non leap years - # if period include 29 Feb then period is 1 less than required length - if(length(rain_values) + 1 < df[[plant_length_name]][x] || (anyNA(rain_values) && sum_rain < df[[rain_total_name]][x])) sum_rain <- NA - sum_rain - } - ) +# Create a column for the rain total actuals initialised with NA +df[["rain_total_actual"]] <- NA + +# Vectorise the conditions for each +for (i in 1:nrow(df)) { + # Create a condition to filter the daily data based on the year, day, and plant day/length + ind <- daily_data[[year]] == df[[year]][i] & + daily_data[[day]] >= df[[plant_day_name]][i] & + daily_data[[day]] < (df[[plant_day_name]][i] + df[[plant_length_name]][i]) + + if (is_station) { + ind <- ind & (daily_data[[station]] == df[[station]][i]) + } + + # Filter the daily data based on the condition + rain_values <- daily_data[[rain]][ind] + + # Calculate the sum of rain values and check conditions + sum_rain <- sum(rain_values, na.rm = TRUE) + + if (length(rain_values) + 1 < df[[plant_length_name]][i] || (anyNA(rain_values) && sum_rain < df[[rain_total_name]][i])) { + sum_rain <- NA + } + + # Assign the calculated sum to the respective row in the result dataframe + df[["rain_total_actual"]][i] <- sum_rain +} df$rain_cond <- df[[rain_total_name]] <= df[["rain_total_actual"]] # All three conditions met - df$overall_cond <- ((if(start_check) df$plant_day_cond else TRUE) & df$length_cond & df$rain_cond) + if (start_check == "yes"){ + df$overall_cond <- df$plant_day_cond & df$length_cond & df$rain_cond + } else if (start_check == "no"){ + df$overall_cond <- TRUE & df$length_cond & df$rain_cond + } else { + df$overall_cond_with_start <- df$plant_day_cond & df$length_cond & df$rain_cond + df$overall_cond_no_start <- TRUE & df$length_cond & df$rain_cond + } crops_name <- "crop_def" crops_name <- next_default_item(prefix = crops_name, existing_names = self$get_data_names(), include_index = FALSE) data_tables <- list(df) names(data_tables) <- crops_name self$import_data(data_tables = data_tables) + if(season_data_name != data_name) { crops_by <- season_by names(crops_by) <- by self$add_link(crops_name, season_data_name, crops_by, keyed_link_label) } + if(definition_props) { calc_from <- list() if(!missing(station)) calc_from[[length(calc_from) + 1]] <- station @@ -2150,24 +2164,61 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r calc_from[[length(calc_from) + 1]] <- rain_total_name names(calc_from) <- rep(crops_name, length(calc_from)) grouping <- instat_calculation$new(type = "by", calculated_from = calc_from) - prop_calc_from <- list("overall_cond") - names(prop_calc_from) <- crops_name - propor_table <- instat_calculation$new(function_exp="sum(overall_cond, na.rm = TRUE)/length(na.omit(overall_cond))", - save = 2, calculated_from = prop_calc_from, - manipulations = list(grouping), - type="summary", result_name = "prop_success", result_data_frame = "crop_prop") - prop_data_frame <- self$run_instat_calculation(propor_table, display = TRUE) - if(print_table) { - prop_data_frame$prop_success <- round(prop_data_frame$prop_success, 2) - prop_table_unstacked <- reshape2::dcast(formula = as.formula(paste(if(!missing(station)) paste(station, "+"), plant_length_name, "+", rain_total_name, "~", plant_day_name)), data = prop_data_frame, value.var = "prop_success") - if(!missing(station)) f <- interaction(prop_table_unstacked[[station]], prop_table_unstacked[[plant_length_name]], lex.order = TRUE) - else f <- prop_table_unstacked[[plant_length_name]] - prop_table_split <- split(prop_table_unstacked, f) - return(prop_table_split) - } - } -} -) + + if (start_check %in% c("yes", "no")){ + prop_calc_from <- list("overall_cond") + names(prop_calc_from) <- crops_name + propor_table <- instat_calculation$new(function_exp="sum(overall_cond, na.rm = TRUE)/length(na.omit(overall_cond))", + save = 2, calculated_from = prop_calc_from, + manipulations = list(grouping), + type="summary", result_name = "prop_success", result_data_frame = "crop_prop") + prop_data_frame <- self$run_instat_calculation(propor_table, display = TRUE) + if(print_table) { + prop_data_frame$prop_success <- round(prop_data_frame$prop_success, 2) + prop_table_unstacked <- reshape2::dcast(formula = as.formula(paste(if(!missing(station)) paste(station, "+"), plant_length_name, "+", rain_total_name, "~", plant_day_name)), data = prop_data_frame, value.var = "prop_success") + if(!missing(station)) f <- interaction(prop_table_unstacked[[station]], prop_table_unstacked[[plant_length_name]], lex.order = TRUE) + else f <- prop_table_unstacked[[plant_length_name]] + prop_table_split <- split(prop_table_unstacked, f) + return(prop_table_split) + } + } else { + prop_calc_from_with_start <- list("overall_cond_with_start") + names(prop_calc_from_with_start) <- crops_name + propor_table_with_start <- instat_calculation$new(function_exp="sum(overall_cond_with_start, na.rm = TRUE)/length(na.omit(overall_cond_with_start))", + save = 2, calculated_from = prop_calc_from_with_start, + manipulations = list(grouping), + type="summary", result_name = "prop_success", result_data_frame = "crop_prop_with_start") + prop_data_frame_with_start <- self$run_instat_calculation(propor_table_with_start, display = TRUE) + + prop_calc_from_no_start <- list("overall_cond_no_start") + names(prop_calc_from_no_start) <- crops_name + propor_table_no_start <- instat_calculation$new(function_exp="sum(overall_cond_no_start, na.rm = TRUE)/length(na.omit(overall_cond_no_start))", + save = 2, calculated_from = prop_calc_from_no_start, + manipulations = list(grouping), + type="summary", result_name = "prop_success", result_data_frame = "crop_prop_no_start") + prop_data_frame_no_start <- self$run_instat_calculation(propor_table_no_start, display = TRUE) + + if(print_table) { + prop_data_frame_with_start$prop_success <- round(prop_data_frame_with_start$prop_success, 2) + prop_table_unstacked_with_start <- reshape2::dcast(formula = as.formula(paste(if(!missing(station)) paste(station, "+"), plant_length_name, "+", rain_total_name, "~", plant_day_name)), data = prop_data_frame_with_start, value.var = "prop_success") + if(!missing(station)) f <- interaction(prop_table_unstacked_with_start[[station]], prop_table_unstacked_with_start[[plant_length_name]], lex.order = TRUE) + else f <- prop_table_unstacked_with_start[[plant_length_name]] + prop_table_split_with_start <- split(prop_table_unstacked_with_start, f) + + prop_data_frame_no_start$prop_success <- round(prop_data_frame_no_start$prop_success, 2) + prop_table_unstacked_no_start <- reshape2::dcast(formula = as.formula(paste(if(!missing(station)) paste(station, "+"), plant_length_name, "+", rain_total_name, "~", plant_day_name)), data = prop_data_frame_no_start, value.var = "prop_success") + if(!missing(station)) f <- interaction(prop_table_unstacked_no_start[[station]], prop_table_unstacked_no_start[[plant_length_name]], lex.order = TRUE) + else f <- prop_table_unstacked_no_start[[plant_length_name]] + prop_table_split_no_start <- split(prop_table_unstacked_no_start, f) + + # Create an empty list to store the merged data + merged_list <- list() + + # Vectorize the addition of source indicators and merging of data frames + prop_table_split_with_start <- lapply(prop_table_split_with_start, function(df) { + df$source <- 'with start' + return(df) +}) #' Converting grid (wide) format daily climatic data into tidy (long format) data #' @param x Input data frame From 76a254437211d354f1380472c079e0e082e2f55c Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 5 Jul 2024 10:04:03 +0100 Subject: [PATCH 063/273] minor change on the design --- instat/dlgClimograph.Designer.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index bb0257f9662..7b986a0ce42 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -270,7 +270,7 @@ Partial Class dlgClimograph Me.ucrChkColourIdntity.Checked = False Me.ucrChkColourIdntity.Location = New System.Drawing.Point(12, 369) Me.ucrChkColourIdntity.Name = "ucrChkColourIdntity" - Me.ucrChkColourIdntity.Size = New System.Drawing.Size(98, 24) + Me.ucrChkColourIdntity.Size = New System.Drawing.Size(189, 24) Me.ucrChkColourIdntity.TabIndex = 98 ' 'ucrInputLegendPosition From 2b054b3f7e36c8aaa5c73415bdb05edd4da1abb2 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Fri, 5 Jul 2024 11:32:09 +0100 Subject: [PATCH 064/273] Update instat_object_R6.R --- instat/static/InstatObject/R/instat_object_R6.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index c1812c3d890..cb96b0786a4 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2055,7 +2055,7 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r is_station <- !missing(station) if(missing(year)) stop("Year column must be specified.") - by <- if(!is_station) year else c(year, station) + by <- ifelse(!is_station, year, c(year, station)) if(missing(season_data_name)) season_data_name <- data_name if(season_data_name != data_name) { From 64c053c67471900aad1d2c656e5618bc99333965 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 8 Jul 2024 11:17:56 +0300 Subject: [PATCH 065/273] changes --- instat/dlgPICSACrops.Designer.vb | 327 ++++++++++++++++++++----------- instat/dlgPICSACrops.vb | 85 ++++++-- 2 files changed, 281 insertions(+), 131 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index dee8add1de3..370aa0e0b7f 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -19,7 +19,7 @@ Partial Class dlgPICSACrops Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -36,7 +36,7 @@ Partial Class dlgPICSACrops 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.lblSelectedSet = New System.Windows.Forms.Label() Me.Label2 = New System.Windows.Forms.Label() @@ -46,16 +46,20 @@ Partial Class dlgPICSACrops Me.Label6 = New System.Windows.Forms.Label() Me.cmdOptions = New System.Windows.Forms.Button() Me.grpSeasonReceivers = New System.Windows.Forms.GroupBox() - Me.ucrReceiverStart = New instat.ucrReceiverSingle() - Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.grpCropDefinitions = New System.Windows.Forms.GroupBox() + Me.rdoBoth = New System.Windows.Forms.RadioButton() + Me.rdoNo = New System.Windows.Forms.RadioButton() + Me.rdoYes = New System.Windows.Forms.RadioButton() Me.lblPlantingDays = New System.Windows.Forms.Label() Me.lblCropLengthDays = New System.Windows.Forms.Label() Me.lblWaterAmounts = New System.Windows.Forms.Label() - Me.ucrChkRequirePlantingDays = New instat.ucrCheck() - Me.ucrInputCropLengths = New instat.ucrInputComboBox() - Me.ucrInputWaterAmounts = New instat.ucrInputComboBox() - Me.ucrInputPlantingDates = New instat.ucrInputComboBox() + Me.cmdInfillPlandingDay = New System.Windows.Forms.Button() + Me.cmdInfillCropLength = New System.Windows.Forms.Button() + Me.cmdInfillWater = New System.Windows.Forms.Button() + Me.ucrInputPlantingDates = New instat.ucrInputTextBox() + Me.ucrPnlStartCheck = New instat.UcrPanel() + Me.ucrReceiverStart = New instat.ucrReceiverSingle() + Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.ucrChkDataProp = New instat.ucrCheck() Me.ucrChkPrintDataProp = New instat.ucrCheck() Me.ucrReceiverRainfall = New instat.ucrReceiverSingle() @@ -64,6 +68,8 @@ Partial Class dlgPICSACrops Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrSelectorForCrops = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrInputWaterAmounts = New instat.ucrInputTextBox() + Me.ucrInputCropLengths = New instat.ucrInputTextBox() Me.grpSeasonReceivers.SuspendLayout() Me.grpCropDefinitions.SuspendLayout() Me.SuspendLayout() @@ -71,9 +77,10 @@ Partial Class dlgPICSACrops 'lblSelectedSet ' Me.lblSelectedSet.AutoSize = True - Me.lblSelectedSet.Location = New System.Drawing.Point(232, 21) + Me.lblSelectedSet.Location = New System.Drawing.Point(348, 32) + Me.lblSelectedSet.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSelectedSet.Name = "lblSelectedSet" - Me.lblSelectedSet.Size = New System.Drawing.Size(43, 13) + Me.lblSelectedSet.Size = New System.Drawing.Size(64, 20) Me.lblSelectedSet.TabIndex = 15 Me.lblSelectedSet.Tag = "" Me.lblSelectedSet.Text = "Station:" @@ -81,9 +88,10 @@ Partial Class dlgPICSACrops 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(365, 21) + Me.Label2.Location = New System.Drawing.Point(548, 32) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(32, 13) + Me.Label2.Size = New System.Drawing.Size(47, 20) Me.Label2.TabIndex = 21 Me.Label2.Tag = "" Me.Label2.Text = "Year:" @@ -91,9 +99,10 @@ Partial Class dlgPICSACrops 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(365, 66) + Me.Label3.Location = New System.Drawing.Point(548, 99) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(65, 13) + Me.Label3.Size = New System.Drawing.Size(95, 20) Me.Label3.TabIndex = 22 Me.Label3.Tag = "" Me.Label3.Text = "Day in Year:" @@ -101,9 +110,10 @@ Partial Class dlgPICSACrops 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(232, 66) + Me.lblRain.Location = New System.Drawing.Point(348, 99) + Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRain.Name = "lblRain" - Me.lblRain.Size = New System.Drawing.Size(32, 13) + Me.lblRain.Size = New System.Drawing.Size(46, 20) Me.lblRain.TabIndex = 23 Me.lblRain.Tag = "" Me.lblRain.Text = "Rain:" @@ -111,9 +121,10 @@ Partial Class dlgPICSACrops 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(6, 17) + Me.Label5.Location = New System.Drawing.Point(9, 26) + Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(32, 13) + Me.Label5.Size = New System.Drawing.Size(48, 20) Me.Label5.TabIndex = 24 Me.Label5.Tag = "" Me.Label5.Text = "Start:" @@ -121,9 +132,10 @@ Partial Class dlgPICSACrops 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(139, 19) + Me.Label6.Location = New System.Drawing.Point(208, 28) + Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(32, 13) + Me.Label6.Size = New System.Drawing.Size(46, 20) Me.Label6.TabIndex = 25 Me.Label6.Tag = "" Me.Label6.Text = "End :" @@ -131,9 +143,10 @@ Partial Class dlgPICSACrops 'cmdOptions ' Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOptions.Location = New System.Drawing.Point(368, 358) + Me.cmdOptions.Location = New System.Drawing.Point(552, 537) + Me.cmdOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(120, 25) + Me.cmdOptions.Size = New System.Drawing.Size(180, 38) Me.cmdOptions.TabIndex = 31 Me.cmdOptions.Tag = "Options" Me.cmdOptions.Text = "Options" @@ -145,151 +158,205 @@ Partial Class dlgPICSACrops Me.grpSeasonReceivers.Controls.Add(Me.ucrReceiverStart) Me.grpSeasonReceivers.Controls.Add(Me.Label6) Me.grpSeasonReceivers.Controls.Add(Me.ucrReceiverEnd) - Me.grpSeasonReceivers.Location = New System.Drawing.Point(226, 111) + Me.grpSeasonReceivers.Location = New System.Drawing.Point(339, 166) + Me.grpSeasonReceivers.Margin = New System.Windows.Forms.Padding(4) Me.grpSeasonReceivers.Name = "grpSeasonReceivers" - Me.grpSeasonReceivers.Size = New System.Drawing.Size(272, 66) + Me.grpSeasonReceivers.Padding = New System.Windows.Forms.Padding(4) + Me.grpSeasonReceivers.Size = New System.Drawing.Size(408, 99) Me.grpSeasonReceivers.TabIndex = 38 Me.grpSeasonReceivers.TabStop = False Me.grpSeasonReceivers.Text = "Season Dates" ' - 'ucrReceiverStart - ' - Me.ucrReceiverStart.AutoSize = True - Me.ucrReceiverStart.frmParent = Me - Me.ucrReceiverStart.Location = New System.Drawing.Point(10, 34) - Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStart.Name = "ucrReceiverStart" - Me.ucrReceiverStart.Selector = Nothing - Me.ucrReceiverStart.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverStart.strNcFilePath = "" - Me.ucrReceiverStart.TabIndex = 19 - Me.ucrReceiverStart.ucrSelector = Nothing - ' - 'ucrReceiverEnd - ' - Me.ucrReceiverEnd.AutoSize = True - Me.ucrReceiverEnd.frmParent = Me - Me.ucrReceiverEnd.Location = New System.Drawing.Point(142, 34) - Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEnd.Name = "ucrReceiverEnd" - Me.ucrReceiverEnd.Selector = Nothing - Me.ucrReceiverEnd.Size = New System.Drawing.Size(120, 22) - Me.ucrReceiverEnd.strNcFilePath = "" - Me.ucrReceiverEnd.TabIndex = 26 - Me.ucrReceiverEnd.ucrSelector = Nothing - ' 'grpCropDefinitions ' - Me.grpCropDefinitions.Controls.Add(Me.lblPlantingDays) - Me.grpCropDefinitions.Controls.Add(Me.lblCropLengthDays) - Me.grpCropDefinitions.Controls.Add(Me.lblWaterAmounts) - Me.grpCropDefinitions.Controls.Add(Me.ucrChkRequirePlantingDays) Me.grpCropDefinitions.Controls.Add(Me.ucrInputCropLengths) Me.grpCropDefinitions.Controls.Add(Me.ucrInputWaterAmounts) Me.grpCropDefinitions.Controls.Add(Me.ucrInputPlantingDates) - Me.grpCropDefinitions.Location = New System.Drawing.Point(6, 194) + Me.grpCropDefinitions.Controls.Add(Me.cmdInfillWater) + Me.grpCropDefinitions.Controls.Add(Me.cmdInfillCropLength) + Me.grpCropDefinitions.Controls.Add(Me.cmdInfillPlandingDay) + Me.grpCropDefinitions.Controls.Add(Me.rdoBoth) + Me.grpCropDefinitions.Controls.Add(Me.rdoNo) + Me.grpCropDefinitions.Controls.Add(Me.rdoYes) + Me.grpCropDefinitions.Controls.Add(Me.lblPlantingDays) + Me.grpCropDefinitions.Controls.Add(Me.lblCropLengthDays) + Me.grpCropDefinitions.Controls.Add(Me.lblWaterAmounts) + Me.grpCropDefinitions.Controls.Add(Me.ucrPnlStartCheck) + Me.grpCropDefinitions.Location = New System.Drawing.Point(9, 291) + Me.grpCropDefinitions.Margin = New System.Windows.Forms.Padding(4) Me.grpCropDefinitions.Name = "grpCropDefinitions" - Me.grpCropDefinitions.Size = New System.Drawing.Size(323, 158) + Me.grpCropDefinitions.Padding = New System.Windows.Forms.Padding(4) + Me.grpCropDefinitions.Size = New System.Drawing.Size(512, 237) Me.grpCropDefinitions.TabIndex = 39 Me.grpCropDefinitions.TabStop = False Me.grpCropDefinitions.Text = "Crop Definitions" ' + 'rdoBoth + ' + Me.rdoBoth.AutoSize = True + Me.rdoBoth.Location = New System.Drawing.Point(325, 37) + Me.rdoBoth.Name = "rdoBoth" + Me.rdoBoth.Size = New System.Drawing.Size(156, 24) + Me.rdoBoth.TabIndex = 44 + Me.rdoBoth.TabStop = True + Me.rdoBoth.Text = "Start Check:Both" + Me.rdoBoth.UseVisualStyleBackColor = True + ' + 'rdoNo + ' + Me.rdoNo.AutoSize = True + Me.rdoNo.Location = New System.Drawing.Point(176, 37) + Me.rdoNo.Name = "rdoNo" + Me.rdoNo.Size = New System.Drawing.Size(142, 24) + Me.rdoNo.TabIndex = 45 + Me.rdoNo.TabStop = True + Me.rdoNo.Text = "Start Check:No" + Me.rdoNo.UseVisualStyleBackColor = True + ' + 'rdoYes + ' + Me.rdoYes.AutoSize = True + Me.rdoYes.Location = New System.Drawing.Point(20, 37) + Me.rdoYes.Name = "rdoYes" + Me.rdoYes.Size = New System.Drawing.Size(150, 24) + Me.rdoYes.TabIndex = 43 + Me.rdoYes.TabStop = True + Me.rdoYes.Text = "Start Check:Yes" + Me.rdoYes.UseVisualStyleBackColor = True + ' 'lblPlantingDays ' Me.lblPlantingDays.AutoSize = True - Me.lblPlantingDays.Location = New System.Drawing.Point(6, 51) + Me.lblPlantingDays.Location = New System.Drawing.Point(4, 90) + Me.lblPlantingDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPlantingDays.Name = "lblPlantingDays" - Me.lblPlantingDays.Size = New System.Drawing.Size(81, 13) + Me.lblPlantingDays.Size = New System.Drawing.Size(120, 20) Me.lblPlantingDays.TabIndex = 42 Me.lblPlantingDays.Text = "Planting Day(s):" ' 'lblCropLengthDays ' Me.lblCropLengthDays.AutoSize = True - Me.lblCropLengthDays.Location = New System.Drawing.Point(6, 129) + Me.lblCropLengthDays.Location = New System.Drawing.Point(7, 200) + Me.lblCropLengthDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCropLengthDays.Name = "lblCropLengthDays" - Me.lblCropLengthDays.Size = New System.Drawing.Size(101, 13) + Me.lblCropLengthDays.Size = New System.Drawing.Size(151, 20) Me.lblCropLengthDays.TabIndex = 41 Me.lblCropLengthDays.Text = "Crop Length Day(s):" ' 'lblWaterAmounts ' Me.lblWaterAmounts.AutoSize = True - Me.lblWaterAmounts.Location = New System.Drawing.Point(6, 92) + Me.lblWaterAmounts.Location = New System.Drawing.Point(8, 146) + Me.lblWaterAmounts.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWaterAmounts.Name = "lblWaterAmounts" - Me.lblWaterAmounts.Size = New System.Drawing.Size(89, 13) + Me.lblWaterAmounts.Size = New System.Drawing.Size(134, 20) Me.lblWaterAmounts.TabIndex = 40 Me.lblWaterAmounts.Text = "Water Amount(s):" ' - 'ucrChkRequirePlantingDays + 'cmdInfillPlandingDay ' - Me.ucrChkRequirePlantingDays.AutoSize = True - Me.ucrChkRequirePlantingDays.Checked = False - Me.ucrChkRequirePlantingDays.Location = New System.Drawing.Point(6, 18) - Me.ucrChkRequirePlantingDays.Name = "ucrChkRequirePlantingDays" - Me.ucrChkRequirePlantingDays.Size = New System.Drawing.Size(286, 23) - Me.ucrChkRequirePlantingDays.TabIndex = 39 + Me.cmdInfillPlandingDay.Location = New System.Drawing.Point(131, 86) + Me.cmdInfillPlandingDay.Name = "cmdInfillPlandingDay" + Me.cmdInfillPlandingDay.Size = New System.Drawing.Size(140, 36) + Me.cmdInfillPlandingDay.TabIndex = 47 + Me.cmdInfillPlandingDay.Text = "Infill Planting Day" + Me.cmdInfillPlandingDay.UseVisualStyleBackColor = True ' - 'ucrInputCropLengths + 'cmdInfillCropLength ' - Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True - Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCropLengths.GetSetSelectedIndex = -1 - Me.ucrInputCropLengths.IsReadOnly = False - Me.ucrInputCropLengths.Location = New System.Drawing.Point(172, 126) - Me.ucrInputCropLengths.Name = "ucrInputCropLengths" - Me.ucrInputCropLengths.Size = New System.Drawing.Size(137, 21) - Me.ucrInputCropLengths.TabIndex = 38 + Me.cmdInfillCropLength.Location = New System.Drawing.Point(153, 192) + Me.cmdInfillCropLength.Name = "cmdInfillCropLength" + Me.cmdInfillCropLength.Size = New System.Drawing.Size(140, 36) + Me.cmdInfillCropLength.TabIndex = 48 + Me.cmdInfillCropLength.Text = "Infill Planting Day" + Me.cmdInfillCropLength.UseVisualStyleBackColor = True ' - 'ucrInputWaterAmounts + 'cmdInfillWater ' - Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True - Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 - Me.ucrInputWaterAmounts.IsReadOnly = False - Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(172, 89) - Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" - Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(137, 21) - Me.ucrInputWaterAmounts.TabIndex = 38 + Me.cmdInfillWater.Location = New System.Drawing.Point(138, 141) + Me.cmdInfillWater.Name = "cmdInfillWater" + Me.cmdInfillWater.Size = New System.Drawing.Size(156, 36) + Me.cmdInfillWater.TabIndex = 49 + Me.cmdInfillWater.Text = "Infill Water Amount" + Me.cmdInfillWater.UseVisualStyleBackColor = True ' 'ucrInputPlantingDates ' Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True - Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 + Me.ucrInputPlantingDates.AutoSize = True + Me.ucrInputPlantingDates.IsMultiline = False Me.ucrInputPlantingDates.IsReadOnly = False - Me.ucrInputPlantingDates.Location = New System.Drawing.Point(172, 51) + Me.ucrInputPlantingDates.Location = New System.Drawing.Point(286, 86) + Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" - Me.ucrInputPlantingDates.Size = New System.Drawing.Size(137, 21) - Me.ucrInputPlantingDates.TabIndex = 38 + Me.ucrInputPlantingDates.Size = New System.Drawing.Size(206, 32) + Me.ucrInputPlantingDates.TabIndex = 50 + ' + 'ucrPnlStartCheck + ' + Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlStartCheck.Location = New System.Drawing.Point(13, 25) + Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlStartCheck.Name = "ucrPnlStartCheck" + Me.ucrPnlStartCheck.Size = New System.Drawing.Size(476, 56) + Me.ucrPnlStartCheck.TabIndex = 46 + ' + 'ucrReceiverStart + ' + Me.ucrReceiverStart.AutoSize = True + Me.ucrReceiverStart.frmParent = Nothing + Me.ucrReceiverStart.Location = New System.Drawing.Point(15, 51) + Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStart.Name = "ucrReceiverStart" + Me.ucrReceiverStart.Selector = Nothing + Me.ucrReceiverStart.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverStart.strNcFilePath = "" + Me.ucrReceiverStart.TabIndex = 19 + Me.ucrReceiverStart.ucrSelector = Nothing + ' + 'ucrReceiverEnd + ' + Me.ucrReceiverEnd.AutoSize = True + Me.ucrReceiverEnd.frmParent = Nothing + Me.ucrReceiverEnd.Location = New System.Drawing.Point(213, 51) + Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEnd.Name = "ucrReceiverEnd" + Me.ucrReceiverEnd.Selector = Nothing + Me.ucrReceiverEnd.Size = New System.Drawing.Size(180, 33) + Me.ucrReceiverEnd.strNcFilePath = "" + Me.ucrReceiverEnd.TabIndex = 26 + Me.ucrReceiverEnd.ucrSelector = Nothing ' 'ucrChkDataProp ' Me.ucrChkDataProp.AutoSize = True Me.ucrChkDataProp.Checked = False - Me.ucrChkDataProp.Location = New System.Drawing.Point(10, 358) + Me.ucrChkDataProp.Location = New System.Drawing.Point(15, 537) + Me.ucrChkDataProp.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDataProp.Name = "ucrChkDataProp" - Me.ucrChkDataProp.Size = New System.Drawing.Size(172, 23) + Me.ucrChkDataProp.Size = New System.Drawing.Size(258, 34) Me.ucrChkDataProp.TabIndex = 37 ' 'ucrChkPrintDataProp ' Me.ucrChkPrintDataProp.AutoSize = True Me.ucrChkPrintDataProp.Checked = False - Me.ucrChkPrintDataProp.Location = New System.Drawing.Point(188, 358) + Me.ucrChkPrintDataProp.Location = New System.Drawing.Point(282, 537) + Me.ucrChkPrintDataProp.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkPrintDataProp.Name = "ucrChkPrintDataProp" - Me.ucrChkPrintDataProp.Size = New System.Drawing.Size(255, 23) + Me.ucrChkPrintDataProp.Size = New System.Drawing.Size(382, 34) Me.ucrChkPrintDataProp.TabIndex = 36 ' 'ucrReceiverRainfall ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(236, 81) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(354, 122) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing - Me.ucrReceiverRainfall.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRainfall.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverRainfall.strNcFilePath = "" Me.ucrReceiverRainfall.TabIndex = 17 Me.ucrReceiverRainfall.ucrSelector = Nothing @@ -298,11 +365,11 @@ Partial Class dlgPICSACrops ' Me.ucrReceiverDay.AutoSize = True Me.ucrReceiverDay.frmParent = Me - Me.ucrReceiverDay.Location = New System.Drawing.Point(368, 81) + Me.ucrReceiverDay.Location = New System.Drawing.Point(552, 122) Me.ucrReceiverDay.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDay.Name = "ucrReceiverDay" Me.ucrReceiverDay.Selector = Nothing - Me.ucrReceiverDay.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDay.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverDay.strNcFilePath = "" Me.ucrReceiverDay.TabIndex = 16 Me.ucrReceiverDay.ucrSelector = Nothing @@ -311,11 +378,11 @@ Partial Class dlgPICSACrops ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(368, 37) + Me.ucrReceiverYear.Location = New System.Drawing.Point(552, 56) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 3 Me.ucrReceiverYear.ucrSelector = Nothing @@ -324,11 +391,11 @@ Partial Class dlgPICSACrops ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(236, 37) + Me.ucrReceiverStation.Location = New System.Drawing.Point(354, 56) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverStation.strNcFilePath = "" Me.ucrReceiverStation.TabIndex = 2 Me.ucrReceiverStation.ucrSelector = Nothing @@ -339,27 +406,52 @@ Partial Class dlgPICSACrops Me.ucrSelectorForCrops.bDropUnusedFilterLevels = False Me.ucrSelectorForCrops.bShowHiddenColumns = False Me.ucrSelectorForCrops.bUseCurrentFilter = True - Me.ucrSelectorForCrops.Location = New System.Drawing.Point(6, 5) + Me.ucrSelectorForCrops.Location = New System.Drawing.Point(9, 8) Me.ucrSelectorForCrops.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCrops.Name = "ucrSelectorForCrops" - Me.ucrSelectorForCrops.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorForCrops.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorForCrops.TabIndex = 1 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 392) + Me.ucrBase.Location = New System.Drawing.Point(15, 588) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 0 ' + 'ucrInputWaterAmounts + ' + Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True + Me.ucrInputWaterAmounts.AutoSize = True + Me.ucrInputWaterAmounts.IsMultiline = False + Me.ucrInputWaterAmounts.IsReadOnly = False + Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(302, 142) + Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" + Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(206, 32) + Me.ucrInputWaterAmounts.TabIndex = 51 + ' + 'ucrInputCropLengths + ' + Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True + Me.ucrInputCropLengths.AutoSize = True + Me.ucrInputCropLengths.IsMultiline = False + Me.ucrInputCropLengths.IsReadOnly = False + Me.ucrInputCropLengths.Location = New System.Drawing.Point(299, 195) + Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputCropLengths.Name = "ucrInputCropLengths" + Me.ucrInputCropLengths.Size = New System.Drawing.Size(206, 32) + Me.ucrInputCropLengths.TabIndex = 52 + ' 'dlgPICSACrops ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(504, 449) + Me.ClientSize = New System.Drawing.Size(756, 674) Me.Controls.Add(Me.grpCropDefinitions) Me.Controls.Add(Me.grpSeasonReceivers) Me.Controls.Add(Me.ucrChkDataProp) @@ -376,6 +468,7 @@ Partial Class dlgPICSACrops Me.Controls.Add(Me.ucrSelectorForCrops) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgPICSACrops" @@ -407,13 +500,19 @@ Partial Class dlgPICSACrops Friend WithEvents cmdOptions As Button Friend WithEvents ucrChkPrintDataProp As ucrCheck Friend WithEvents ucrChkDataProp As ucrCheck - Friend WithEvents ucrInputPlantingDates As ucrInputComboBox - Friend WithEvents ucrInputWaterAmounts As ucrInputComboBox - Friend WithEvents ucrInputCropLengths As ucrInputComboBox Friend WithEvents grpSeasonReceivers As GroupBox Friend WithEvents grpCropDefinitions As GroupBox - Friend WithEvents ucrChkRequirePlantingDays As ucrCheck Friend WithEvents lblCropLengthDays As Label Friend WithEvents lblWaterAmounts As Label Friend WithEvents lblPlantingDays As Label + Friend WithEvents rdoNo As RadioButton + Friend WithEvents rdoBoth As RadioButton + Friend WithEvents rdoYes As RadioButton + Friend WithEvents ucrPnlStartCheck As UcrPanel + Friend WithEvents cmdInfillWater As Button + Friend WithEvents cmdInfillCropLength As Button + Friend WithEvents cmdInfillPlandingDay As Button + Friend WithEvents ucrInputPlantingDates As ucrInputTextBox + Friend WithEvents ucrInputWaterAmounts As ucrInputTextBox + Friend WithEvents ucrInputCropLengths As ucrInputTextBox End Class diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index b0c55f14f33..56375b4c30c 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -18,6 +18,7 @@ Imports instat.Translations Public Class dlgPICSACrops Private clsCropsFunction As New RFunction + Private clsDummyFunction As New RFunction Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private strCurrDataName As String = "" @@ -88,27 +89,35 @@ Public Class dlgPICSACrops ucrReceiverEnd.bAttachedToPrimaryDataFrame = False 'Planting date - ucrChkRequirePlantingDays.SetText("Require start day before planting day") - ucrChkRequirePlantingDays.SetParameter(New RParameter("start_check", 10), bNewChangeParameterValue:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") - ucrChkRequirePlantingDays.SetRDefault("TRUE") + 'ucrChkRequirePlantingDays.SetText("Require start day before planting day") + 'ucrChkRequirePlantingDays.SetParameter(New RParameter("start_check", 10), bNewChangeParameterValue:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") + 'ucrChkRequirePlantingDays.SetRDefault("TRUE") + + ucrPnlStartCheck.AddRadioButton(rdoYes) + ucrPnlStartCheck.AddRadioButton(rdoNo) + ucrPnlStartCheck.AddRadioButton(rdoBoth) + ucrPnlStartCheck.AddParameterValuesCondition(rdoYes, "check", "yes") + ucrPnlStartCheck.AddParameterValuesCondition(rdoNo, "check", "no") + ucrPnlStartCheck.AddParameterValuesCondition(rdoBoth, "check", "both") + ucrInputPlantingDates.SetParameter(New RParameter("plant_days", 5)) ucrInputPlantingDates.SetValidationTypeAsNumericList() - ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153"}) + 'ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153"}) ucrInputPlantingDates.AddQuotesIfUnrecognised = False ucrInputPlantingDates.bAllowNonConditionValues = True 'Planting Length ucrInputCropLengths.SetParameter(New RParameter("plant_lengths", 6)) ucrInputCropLengths.SetValidationTypeAsNumericList() - ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180"}) + 'ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180"}) ucrInputCropLengths.AddQuotesIfUnrecognised = False ucrInputCropLengths.bAllowNonConditionValues = True 'Water amount ucrInputWaterAmounts.SetParameter(New RParameter("rain_totals", 7)) ucrInputWaterAmounts.SetValidationTypeAsNumericList() - ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700"}) + 'ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700"}) ucrInputWaterAmounts.AddQuotesIfUnrecognised = False ucrInputWaterAmounts.bAllowNonConditionValues = True @@ -180,21 +189,24 @@ Public Class dlgPICSACrops Private Sub SetDefaults() clsCropsFunction = New RFunction - + clsDummyFunction = New RFunction 'Currently this must come before reset to ensure autofilling is done correctly 'Once autofilling is being triggered correctly this can go after Reset. ucrSelectorForCrops.Reset() ucrReceiverRainfall.SetMeAsReceiver() + clsDummyFunction.AddParameter("check", "yes", iPosition:=0) + + 'Crops Function clsCropsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$crops_definitions") ' Temp disabled until list working correctly 'clsCropsFunction.AddParameter("plant_days", "120") 'clsCropsFunction.AddParameter("plant_lengths", "120") 'clsCropsFunction.AddParameter("rain_totals", "600") - ucrInputPlantingDates.SetName("120") - ucrInputCropLengths.SetName("120") - ucrInputWaterAmounts.SetName("600") + 'ucrInputPlantingDates.SetName("120") + 'ucrInputCropLengths.SetName("120") + 'ucrInputWaterAmounts.SetName("600") clsCropsFunction.AddParameter("definition_props", "TRUE", iPosition:=11) clsCropsFunction.AddParameter("print_table", "TRUE", iPosition:=12) ucrBase.clsRsyntax.SetBaseRFunction(clsCropsFunction) @@ -222,8 +234,8 @@ Public Class dlgPICSACrops 'ucrInputPlantingDates.SetRCode(clsCropsFunction, bReset) 'ucrInputPlantingLengths.SetRCode(clsCropsFunction, bReset) 'ucrInputWaterAmounts.SetRCode(clsCropsFunction, bReset) - - ucrChkRequirePlantingDays.SetRCode(clsCropsFunction, bReset) + ucrPnlStartCheck.SetRCode(clsDummyFunction, bReset) + 'ucrChkRequirePlantingDays.SetRCode(clsCropsFunction, bReset) ucrChkDataProp.SetRCode(clsCropsFunction, bReset) ucrChkPrintDataProp.SetRCode(clsCropsFunction, bReset) End Sub @@ -242,14 +254,10 @@ Public Class dlgPICSACrops End If End Sub - Private Sub ucrReceiverYear_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverStart.ControlContentsChanged, ucrReceiverEnd.ControlContentsChanged, ucrReceiverDay.ControlContentsChanged, ucrInputPlantingDates.ControlContentsChanged, ucrInputCropLengths.ControlContentsChanged, ucrInputWaterAmounts.ControlContentsChanged + Private Sub ucrReceiverYear_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverStart.ControlContentsChanged, ucrReceiverEnd.ControlContentsChanged, ucrReceiverDay.ControlContentsChanged TestOkEnabled() End Sub - Private Sub ucrInputPlantingDates_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPlantingDates.ControlValueChanged - PlantingDaysParam() - End Sub - Private Sub ucrSelectorForCrops_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForCrops.ControlValueChanged If ucrSelectorForCrops.CurrentReceiver Is Nothing OrElse ucrSelectorForCrops.CurrentReceiver.bAttachedToPrimaryDataFrame Then clsCropsFunction.AddParameter("data_name", Chr(34) & ucrSelectorForCrops.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) @@ -266,6 +274,44 @@ Public Class dlgPICSACrops End If End Sub + Private Sub ucrPnlStartCheck_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStartCheck.ControlValueChanged + If rdoYes.Checked Then + clsCropsFunction.AddParameter("start_check", Chr(34) & "yes" & Chr(34), iPosition:=10) + ElseIf rdoNo.Checked Then + clsCropsFunction.AddParameter("start_check", Chr(34) & "no" & Chr(34), iPosition:=10) + Else + clsCropsFunction.AddParameter("start_check", Chr(34) & "both" & Chr(34), iPosition:=10) + End If + End Sub + + Private Sub cmdInfillPlandingDay_Click(sender As Object, e As EventArgs) Handles cmdInfillPlandingDay.Click + Dim lstLevels As New List(Of String) + + For i As Integer = 0 To 365 Step 5 + lstLevels.Add(i.ToString()) + Next + ucrInputPlantingDates.Text = String.Join(", ", lstLevels) + PlantingDaysParam() + End Sub + + Private Sub cmdInfillWater_Click(sender As Object, e As EventArgs) Handles cmdInfillWater.Click + Dim lstLevels As New List(Of String) + + For i As Integer = 0 To 2500 Step 25 + lstLevels.Add(i.ToString()) + Next + ucrInputWaterAmounts.Text = String.Join(", ", lstLevels) + End Sub + + Private Sub cmdInfillCropLength_Click(sender As Object, e As EventArgs) Handles cmdInfillCropLength.Click + Dim lstLevels As New List(Of String) + + For i As Integer = 0 To 365 Step 5 + lstLevels.Add(i.ToString()) + Next + ucrInputCropLengths.Text = String.Join(", ", lstLevels) + End Sub + Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged If ucrInputCropLengths.IsEmpty Then clsCropsFunction.RemoveParameterByName("plant_lengths") @@ -274,6 +320,11 @@ Public Class dlgPICSACrops End If End Sub + Private Sub ucrInputPlantingDates_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPlantingDates.ControlValueChanged + PlantingDaysParam() + + End Sub + Private Sub ucrInputWaterAmounts_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputWaterAmounts.ControlValueChanged If ucrInputWaterAmounts.IsEmpty Then clsCropsFunction.RemoveParameterByName("rain_totals") From 4343516188442ebc96a464eab642897962a2ac57 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 8 Jul 2024 14:31:49 +0300 Subject: [PATCH 066/273] changes --- instat/dlgPICSACrops.Designer.vb | 166 ++++++++++++------------------- instat/dlgPICSACrops.vb | 33 +----- 2 files changed, 68 insertions(+), 131 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index 370aa0e0b7f..ac4f6ae41d3 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -46,20 +46,18 @@ Partial Class dlgPICSACrops Me.Label6 = New System.Windows.Forms.Label() Me.cmdOptions = New System.Windows.Forms.Button() Me.grpSeasonReceivers = New System.Windows.Forms.GroupBox() + Me.ucrReceiverStart = New instat.ucrReceiverSingle() + Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.grpCropDefinitions = New System.Windows.Forms.GroupBox() + Me.ucrInputCropLengths = New instat.ucrInputComboBox() + Me.ucrInputPlantingDates = New instat.ucrInputComboBox() Me.rdoBoth = New System.Windows.Forms.RadioButton() Me.rdoNo = New System.Windows.Forms.RadioButton() Me.rdoYes = New System.Windows.Forms.RadioButton() Me.lblPlantingDays = New System.Windows.Forms.Label() Me.lblCropLengthDays = New System.Windows.Forms.Label() Me.lblWaterAmounts = New System.Windows.Forms.Label() - Me.cmdInfillPlandingDay = New System.Windows.Forms.Button() - Me.cmdInfillCropLength = New System.Windows.Forms.Button() - Me.cmdInfillWater = New System.Windows.Forms.Button() - Me.ucrInputPlantingDates = New instat.ucrInputTextBox() Me.ucrPnlStartCheck = New instat.UcrPanel() - Me.ucrReceiverStart = New instat.ucrReceiverSingle() - Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.ucrChkDataProp = New instat.ucrCheck() Me.ucrChkPrintDataProp = New instat.ucrCheck() Me.ucrReceiverRainfall = New instat.ucrReceiverSingle() @@ -68,8 +66,7 @@ Partial Class dlgPICSACrops Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrSelectorForCrops = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrInputWaterAmounts = New instat.ucrInputTextBox() - Me.ucrInputCropLengths = New instat.ucrInputTextBox() + Me.ucrInputWaterAmounts = New instat.ucrInputComboBox() Me.grpSeasonReceivers.SuspendLayout() Me.grpCropDefinitions.SuspendLayout() Me.SuspendLayout() @@ -167,14 +164,37 @@ Partial Class dlgPICSACrops Me.grpSeasonReceivers.TabStop = False Me.grpSeasonReceivers.Text = "Season Dates" ' + 'ucrReceiverStart + ' + Me.ucrReceiverStart.AutoSize = True + Me.ucrReceiverStart.frmParent = Me + Me.ucrReceiverStart.Location = New System.Drawing.Point(15, 51) + Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStart.Name = "ucrReceiverStart" + Me.ucrReceiverStart.Selector = Nothing + Me.ucrReceiverStart.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverStart.strNcFilePath = "" + Me.ucrReceiverStart.TabIndex = 19 + Me.ucrReceiverStart.ucrSelector = Nothing + ' + 'ucrReceiverEnd + ' + Me.ucrReceiverEnd.AutoSize = True + Me.ucrReceiverEnd.frmParent = Me + Me.ucrReceiverEnd.Location = New System.Drawing.Point(213, 51) + Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEnd.Name = "ucrReceiverEnd" + Me.ucrReceiverEnd.Selector = Nothing + Me.ucrReceiverEnd.Size = New System.Drawing.Size(180, 33) + Me.ucrReceiverEnd.strNcFilePath = "" + Me.ucrReceiverEnd.TabIndex = 26 + Me.ucrReceiverEnd.ucrSelector = Nothing + ' 'grpCropDefinitions ' - Me.grpCropDefinitions.Controls.Add(Me.ucrInputCropLengths) Me.grpCropDefinitions.Controls.Add(Me.ucrInputWaterAmounts) + Me.grpCropDefinitions.Controls.Add(Me.ucrInputCropLengths) Me.grpCropDefinitions.Controls.Add(Me.ucrInputPlantingDates) - Me.grpCropDefinitions.Controls.Add(Me.cmdInfillWater) - Me.grpCropDefinitions.Controls.Add(Me.cmdInfillCropLength) - Me.grpCropDefinitions.Controls.Add(Me.cmdInfillPlandingDay) Me.grpCropDefinitions.Controls.Add(Me.rdoBoth) Me.grpCropDefinitions.Controls.Add(Me.rdoNo) Me.grpCropDefinitions.Controls.Add(Me.rdoYes) @@ -186,11 +206,35 @@ Partial Class dlgPICSACrops Me.grpCropDefinitions.Margin = New System.Windows.Forms.Padding(4) Me.grpCropDefinitions.Name = "grpCropDefinitions" Me.grpCropDefinitions.Padding = New System.Windows.Forms.Padding(4) - Me.grpCropDefinitions.Size = New System.Drawing.Size(512, 237) + Me.grpCropDefinitions.Size = New System.Drawing.Size(486, 237) Me.grpCropDefinitions.TabIndex = 39 Me.grpCropDefinitions.TabStop = False Me.grpCropDefinitions.Text = "Crop Definitions" ' + 'ucrInputCropLengths + ' + Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True + Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputCropLengths.GetSetSelectedIndex = -1 + Me.ucrInputCropLengths.IsReadOnly = False + Me.ucrInputCropLengths.Location = New System.Drawing.Point(268, 188) + Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputCropLengths.Name = "ucrInputCropLengths" + Me.ucrInputCropLengths.Size = New System.Drawing.Size(206, 32) + Me.ucrInputCropLengths.TabIndex = 54 + ' + 'ucrInputPlantingDates + ' + Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True + Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 + Me.ucrInputPlantingDates.IsReadOnly = False + Me.ucrInputPlantingDates.Location = New System.Drawing.Point(268, 87) + Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" + Me.ucrInputPlantingDates.Size = New System.Drawing.Size(206, 32) + Me.ucrInputPlantingDates.TabIndex = 53 + ' 'rdoBoth ' Me.rdoBoth.AutoSize = True @@ -254,45 +298,6 @@ Partial Class dlgPICSACrops Me.lblWaterAmounts.TabIndex = 40 Me.lblWaterAmounts.Text = "Water Amount(s):" ' - 'cmdInfillPlandingDay - ' - Me.cmdInfillPlandingDay.Location = New System.Drawing.Point(131, 86) - Me.cmdInfillPlandingDay.Name = "cmdInfillPlandingDay" - Me.cmdInfillPlandingDay.Size = New System.Drawing.Size(140, 36) - Me.cmdInfillPlandingDay.TabIndex = 47 - Me.cmdInfillPlandingDay.Text = "Infill Planting Day" - Me.cmdInfillPlandingDay.UseVisualStyleBackColor = True - ' - 'cmdInfillCropLength - ' - Me.cmdInfillCropLength.Location = New System.Drawing.Point(153, 192) - Me.cmdInfillCropLength.Name = "cmdInfillCropLength" - Me.cmdInfillCropLength.Size = New System.Drawing.Size(140, 36) - Me.cmdInfillCropLength.TabIndex = 48 - Me.cmdInfillCropLength.Text = "Infill Planting Day" - Me.cmdInfillCropLength.UseVisualStyleBackColor = True - ' - 'cmdInfillWater - ' - Me.cmdInfillWater.Location = New System.Drawing.Point(138, 141) - Me.cmdInfillWater.Name = "cmdInfillWater" - Me.cmdInfillWater.Size = New System.Drawing.Size(156, 36) - Me.cmdInfillWater.TabIndex = 49 - Me.cmdInfillWater.Text = "Infill Water Amount" - Me.cmdInfillWater.UseVisualStyleBackColor = True - ' - 'ucrInputPlantingDates - ' - Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True - Me.ucrInputPlantingDates.AutoSize = True - Me.ucrInputPlantingDates.IsMultiline = False - Me.ucrInputPlantingDates.IsReadOnly = False - Me.ucrInputPlantingDates.Location = New System.Drawing.Point(286, 86) - Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" - Me.ucrInputPlantingDates.Size = New System.Drawing.Size(206, 32) - Me.ucrInputPlantingDates.TabIndex = 50 - ' 'ucrPnlStartCheck ' Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -302,32 +307,6 @@ Partial Class dlgPICSACrops Me.ucrPnlStartCheck.Size = New System.Drawing.Size(476, 56) Me.ucrPnlStartCheck.TabIndex = 46 ' - 'ucrReceiverStart - ' - Me.ucrReceiverStart.AutoSize = True - Me.ucrReceiverStart.frmParent = Nothing - Me.ucrReceiverStart.Location = New System.Drawing.Point(15, 51) - Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStart.Name = "ucrReceiverStart" - Me.ucrReceiverStart.Selector = Nothing - Me.ucrReceiverStart.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverStart.strNcFilePath = "" - Me.ucrReceiverStart.TabIndex = 19 - Me.ucrReceiverStart.ucrSelector = Nothing - ' - 'ucrReceiverEnd - ' - Me.ucrReceiverEnd.AutoSize = True - Me.ucrReceiverEnd.frmParent = Nothing - Me.ucrReceiverEnd.Location = New System.Drawing.Point(213, 51) - Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEnd.Name = "ucrReceiverEnd" - Me.ucrReceiverEnd.Selector = Nothing - Me.ucrReceiverEnd.Size = New System.Drawing.Size(180, 33) - Me.ucrReceiverEnd.strNcFilePath = "" - Me.ucrReceiverEnd.TabIndex = 26 - Me.ucrReceiverEnd.ucrSelector = Nothing - ' 'ucrChkDataProp ' Me.ucrChkDataProp.AutoSize = True @@ -425,26 +404,14 @@ Partial Class dlgPICSACrops 'ucrInputWaterAmounts ' Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True - Me.ucrInputWaterAmounts.AutoSize = True - Me.ucrInputWaterAmounts.IsMultiline = False + Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 Me.ucrInputWaterAmounts.IsReadOnly = False - Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(302, 142) - Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(268, 128) + Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(206, 32) - Me.ucrInputWaterAmounts.TabIndex = 51 - ' - 'ucrInputCropLengths - ' - Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True - Me.ucrInputCropLengths.AutoSize = True - Me.ucrInputCropLengths.IsMultiline = False - Me.ucrInputCropLengths.IsReadOnly = False - Me.ucrInputCropLengths.Location = New System.Drawing.Point(299, 195) - Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputCropLengths.Name = "ucrInputCropLengths" - Me.ucrInputCropLengths.Size = New System.Drawing.Size(206, 32) - Me.ucrInputCropLengths.TabIndex = 52 + Me.ucrInputWaterAmounts.TabIndex = 40 ' 'dlgPICSACrops ' @@ -509,10 +476,7 @@ Partial Class dlgPICSACrops Friend WithEvents rdoBoth As RadioButton Friend WithEvents rdoYes As RadioButton Friend WithEvents ucrPnlStartCheck As UcrPanel - Friend WithEvents cmdInfillWater As Button - Friend WithEvents cmdInfillCropLength As Button - Friend WithEvents cmdInfillPlandingDay As Button - Friend WithEvents ucrInputPlantingDates As ucrInputTextBox - Friend WithEvents ucrInputWaterAmounts As ucrInputTextBox - Friend WithEvents ucrInputCropLengths As ucrInputTextBox + Friend WithEvents ucrInputWaterAmounts As ucrInputComboBox + Friend WithEvents ucrInputCropLengths As ucrInputComboBox + Friend WithEvents ucrInputPlantingDates As ucrInputComboBox End Class diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index 56375b4c30c..d3ccb2a7df6 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -103,21 +103,21 @@ Public Class dlgPICSACrops ucrInputPlantingDates.SetParameter(New RParameter("plant_days", 5)) ucrInputPlantingDates.SetValidationTypeAsNumericList() - 'ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153"}) + ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153", "seq(0,50,10)"}) ucrInputPlantingDates.AddQuotesIfUnrecognised = False ucrInputPlantingDates.bAllowNonConditionValues = True 'Planting Length ucrInputCropLengths.SetParameter(New RParameter("plant_lengths", 6)) ucrInputCropLengths.SetValidationTypeAsNumericList() - 'ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180"}) + ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180", "seq(0,50,10)"}) ucrInputCropLengths.AddQuotesIfUnrecognised = False ucrInputCropLengths.bAllowNonConditionValues = True 'Water amount ucrInputWaterAmounts.SetParameter(New RParameter("rain_totals", 7)) ucrInputWaterAmounts.SetValidationTypeAsNumericList() - 'ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700"}) + ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700", "seq(0,200,10)"}) ucrInputWaterAmounts.AddQuotesIfUnrecognised = False ucrInputWaterAmounts.bAllowNonConditionValues = True @@ -284,33 +284,6 @@ Public Class dlgPICSACrops End If End Sub - Private Sub cmdInfillPlandingDay_Click(sender As Object, e As EventArgs) Handles cmdInfillPlandingDay.Click - Dim lstLevels As New List(Of String) - - For i As Integer = 0 To 365 Step 5 - lstLevels.Add(i.ToString()) - Next - ucrInputPlantingDates.Text = String.Join(", ", lstLevels) - PlantingDaysParam() - End Sub - - Private Sub cmdInfillWater_Click(sender As Object, e As EventArgs) Handles cmdInfillWater.Click - Dim lstLevels As New List(Of String) - - For i As Integer = 0 To 2500 Step 25 - lstLevels.Add(i.ToString()) - Next - ucrInputWaterAmounts.Text = String.Join(", ", lstLevels) - End Sub - - Private Sub cmdInfillCropLength_Click(sender As Object, e As EventArgs) Handles cmdInfillCropLength.Click - Dim lstLevels As New List(Of String) - - For i As Integer = 0 To 365 Step 5 - lstLevels.Add(i.ToString()) - Next - ucrInputCropLengths.Text = String.Join(", ", lstLevels) - End Sub Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged If ucrInputCropLengths.IsEmpty Then From 0e069f4b04c1f77508faba7d256efb6a8bf2c11c Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 9 Jul 2024 10:41:56 +0300 Subject: [PATCH 067/273] adding line end --- .../static/InstatObject/R/instat_object_R6.R | 83 ++++++++++--------- 1 file changed, 43 insertions(+), 40 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index cb96b0786a4..99c29232a38 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2046,7 +2046,6 @@ DataBook$set("public","get_variable_sets", function(data_name, set_names, force_ } ) - DataBook$set("public", "crops_definitions", function(data_name, year, station, rain, day, rain_totals, plant_days, plant_lengths, start_check = TRUE, season_data_name, start_day, end_day, definition_props = TRUE, print_table = TRUE) { plant_day_name <- "plant_day" plant_length_name <- "plant_length" @@ -2056,7 +2055,7 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r if(missing(year)) stop("Year column must be specified.") by <- ifelse(!is_station, year, c(year, station)) - + if(missing(season_data_name)) season_data_name <- data_name if(season_data_name != data_name) { season_by <- self$get_equivalent_columns(from_data_name = data_name, columns = by, to_data_name = season_data_name) @@ -2074,7 +2073,7 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r expand_list[[length(expand_list) + 1]] <- unique_station names_list[length(names_list) + 1] <- station } - + df <- setNames(expand.grid(expand_list), names_list) daily_data <- self$get_data_frame(data_name) @@ -2105,33 +2104,33 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r df$length_cond <- (df[[plant_day_name]] + df[[plant_length_name]] <= df[[end_day]]) # Rain total condition -# Create a column for the rain total actuals initialised with NA -df[["rain_total_actual"]] <- NA - -# Vectorise the conditions for each -for (i in 1:nrow(df)) { - # Create a condition to filter the daily data based on the year, day, and plant day/length - ind <- daily_data[[year]] == df[[year]][i] & - daily_data[[day]] >= df[[plant_day_name]][i] & - daily_data[[day]] < (df[[plant_day_name]][i] + df[[plant_length_name]][i]) - - if (is_station) { - ind <- ind & (daily_data[[station]] == df[[station]][i]) - } - - # Filter the daily data based on the condition - rain_values <- daily_data[[rain]][ind] - - # Calculate the sum of rain values and check conditions - sum_rain <- sum(rain_values, na.rm = TRUE) + # Create a column for the rain total actuals initialised with NA + df[["rain_total_actual"]] <- NA - if (length(rain_values) + 1 < df[[plant_length_name]][i] || (anyNA(rain_values) && sum_rain < df[[rain_total_name]][i])) { - sum_rain <- NA + # Vectorise the conditions for each + for (i in 1:nrow(df)) { + # Create a condition to filter the daily data based on the year, day, and plant day/length + ind <- daily_data[[year]] == df[[year]][i] & + daily_data[[day]] >= df[[plant_day_name]][i] & + daily_data[[day]] < (df[[plant_day_name]][i] + df[[plant_length_name]][i]) + + if (is_station) { + ind <- ind & (daily_data[[station]] == df[[station]][i]) + } + + # Filter the daily data based on the condition + rain_values <- daily_data[[rain]][ind] + + # Calculate the sum of rain values and check conditions + sum_rain <- sum(rain_values, na.rm = TRUE) + + if (length(rain_values) + 1 < df[[plant_length_name]][i] || (anyNA(rain_values) && sum_rain < df[[rain_total_name]][i])) { + sum_rain <- NA + } + + # Assign the calculated sum to the respective row in the result dataframe + df[["rain_total_actual"]][i] <- sum_rain } - - # Assign the calculated sum to the respective row in the result dataframe - df[["rain_total_actual"]][i] <- sum_rain -} df$rain_cond <- df[[rain_total_name]] <= df[["rain_total_actual"]] # All three conditions met @@ -2149,13 +2148,13 @@ for (i in 1:nrow(df)) { data_tables <- list(df) names(data_tables) <- crops_name self$import_data(data_tables = data_tables) - + if(season_data_name != data_name) { crops_by <- season_by names(crops_by) <- by self$add_link(crops_name, season_data_name, crops_by, keyed_link_label) } - + if(definition_props) { calc_from <- list() if(!missing(station)) calc_from[[length(calc_from) + 1]] <- station @@ -2185,17 +2184,17 @@ for (i in 1:nrow(df)) { prop_calc_from_with_start <- list("overall_cond_with_start") names(prop_calc_from_with_start) <- crops_name propor_table_with_start <- instat_calculation$new(function_exp="sum(overall_cond_with_start, na.rm = TRUE)/length(na.omit(overall_cond_with_start))", - save = 2, calculated_from = prop_calc_from_with_start, - manipulations = list(grouping), - type="summary", result_name = "prop_success", result_data_frame = "crop_prop_with_start") + save = 2, calculated_from = prop_calc_from_with_start, + manipulations = list(grouping), + type="summary", result_name = "prop_success", result_data_frame = "crop_prop_with_start") prop_data_frame_with_start <- self$run_instat_calculation(propor_table_with_start, display = TRUE) prop_calc_from_no_start <- list("overall_cond_no_start") names(prop_calc_from_no_start) <- crops_name propor_table_no_start <- instat_calculation$new(function_exp="sum(overall_cond_no_start, na.rm = TRUE)/length(na.omit(overall_cond_no_start))", - save = 2, calculated_from = prop_calc_from_no_start, - manipulations = list(grouping), - type="summary", result_name = "prop_success", result_data_frame = "crop_prop_no_start") + save = 2, calculated_from = prop_calc_from_no_start, + manipulations = list(grouping), + type="summary", result_name = "prop_success", result_data_frame = "crop_prop_no_start") prop_data_frame_no_start <- self$run_instat_calculation(propor_table_no_start, display = TRUE) if(print_table) { @@ -2210,14 +2209,18 @@ for (i in 1:nrow(df)) { if(!missing(station)) f <- interaction(prop_table_unstacked_no_start[[station]], prop_table_unstacked_no_start[[plant_length_name]], lex.order = TRUE) else f <- prop_table_unstacked_no_start[[plant_length_name]] prop_table_split_no_start <- split(prop_table_unstacked_no_start, f) - + # Create an empty list to store the merged data merged_list <- list() - + # Vectorize the addition of source indicators and merging of data frames prop_table_split_with_start <- lapply(prop_table_split_with_start, function(df) { - df$source <- 'with start' - return(df) + df$source <- 'with start' + return(df) + }) + } + } + } }) #' Converting grid (wide) format daily climatic data into tidy (long format) data From 9db28cc84acc3cdb46ae59d761f35fe545e96240 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 11 Jul 2024 16:04:06 +0300 Subject: [PATCH 068/273] more stub options --- .../Rows/ucrRowExpression.Designer.vb | 24 +++--- instat/UserTables/Rows/ucrRowExpression.vb | 33 ++++++++ instat/UserTables/Stub/ucrStubOptions.vb | 4 +- .../UserTables/Stub/ucrStubStyle.Designer.vb | 24 +++--- instat/UserTables/Stub/ucrStubStyle.vb | 83 ++++++++++++++++++- instat/UserTables/sdgTableRowExpression.vb | 22 +++++ 6 files changed, 162 insertions(+), 28 deletions(-) diff --git a/instat/UserTables/Rows/ucrRowExpression.Designer.vb b/instat/UserTables/Rows/ucrRowExpression.Designer.vb index ebbc50761ce..cc863448601 100644 --- a/instat/UserTables/Rows/ucrRowExpression.Designer.vb +++ b/instat/UserTables/Rows/ucrRowExpression.Designer.vb @@ -23,7 +23,7 @@ Partial Class ucrRowExpression _ Private Sub InitializeComponent() Me.btnSet = New System.Windows.Forms.Button() - Me.UcrInputRowExpression = New instat.ucrInputTextBox() + Me.ucrInputExpression = New instat.ucrInputTextBox() Me.SuspendLayout() ' 'btnSet @@ -37,23 +37,23 @@ Partial Class ucrRowExpression Me.btnSet.Text = "Set" Me.btnSet.UseVisualStyleBackColor = True ' - 'UcrInputRowExpression + 'ucrInputExpression ' - Me.UcrInputRowExpression.AddQuotesIfUnrecognised = True - Me.UcrInputRowExpression.AutoSize = True - Me.UcrInputRowExpression.IsMultiline = False - Me.UcrInputRowExpression.IsReadOnly = False - Me.UcrInputRowExpression.Location = New System.Drawing.Point(6, 4) - Me.UcrInputRowExpression.Name = "UcrInputRowExpression" - Me.UcrInputRowExpression.Size = New System.Drawing.Size(142, 21) - Me.UcrInputRowExpression.TabIndex = 340 + Me.ucrInputExpression.AddQuotesIfUnrecognised = True + Me.ucrInputExpression.AutoSize = True + Me.ucrInputExpression.IsMultiline = False + Me.ucrInputExpression.IsReadOnly = False + Me.ucrInputExpression.Location = New System.Drawing.Point(6, 4) + Me.ucrInputExpression.Name = "ucrInputExpression" + Me.ucrInputExpression.Size = New System.Drawing.Size(142, 21) + Me.ucrInputExpression.TabIndex = 340 ' 'ucrRowExpression ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.btnSet) - Me.Controls.Add(Me.UcrInputRowExpression) + Me.Controls.Add(Me.ucrInputExpression) Me.Name = "ucrRowExpression" Me.Size = New System.Drawing.Size(193, 26) Me.ResumeLayout(False) @@ -62,5 +62,5 @@ Partial Class ucrRowExpression End Sub Friend WithEvents btnSet As Button - Friend WithEvents UcrInputRowExpression As ucrInputTextBox + Friend WithEvents ucrInputExpression As ucrInputTextBox End Class diff --git a/instat/UserTables/Rows/ucrRowExpression.vb b/instat/UserTables/Rows/ucrRowExpression.vb index facc552f06b..da82f19a3fe 100644 --- a/instat/UserTables/Rows/ucrRowExpression.vb +++ b/instat/UserTables/Rows/ucrRowExpression.vb @@ -1,5 +1,38 @@ Public Class ucrRowExpression + + Private strDataFrameName As String + Private bFirstload As Boolean = True + + + Private Sub UcrInputRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + initialiseControl() + bFirstload = False + End If + End Sub + + Private Sub initialiseControl() + ucrInputExpression.SetParameter(New RParameter("rows", 0,)) + End Sub + + + Public Sub setup(strDataFrameName As String) + Me.strDataFrameName = strDataFrameName + End Sub + + 'Public Sub SetRCode(clsNewCodeStructure As RCodeStructure, Optional bReset As Boolean = False, Optional bUpdate As Boolean = True, Optional bCloneIfNeeded As Boolean = False) + ' ucrInputExpression.SetRCode(clsNewCodeStructure, bReset:=bReset, bUpdate:=bUpdate, bCloneIfNeeded:=bCloneIfNeeded) + 'End Sub + Private Sub btnSet_Click(sender As Object, e As EventArgs) Handles btnSet.Click + sdgTableRowExpression.Setup(strDataFrameName) sdgTableRowExpression.ShowDialog(Me.ParentForm) + ucrInputExpression.SetName(sdgTableRowExpression.GetRowExpression) + End Sub + + Public Sub SetValue(strValue As String) + ucrInputExpression.SetName(strValue) End Sub + + End Class diff --git a/instat/UserTables/Stub/ucrStubOptions.vb b/instat/UserTables/Stub/ucrStubOptions.vb index 6799b3a6c21..a247fe29c3b 100644 --- a/instat/UserTables/Stub/ucrStubOptions.vb +++ b/instat/UserTables/Stub/ucrStubOptions.vb @@ -28,7 +28,7 @@ Me.clsOperator = clsOperator ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) - ucrReceiverSingleGroupByCol.SetMeAsReceiver() + ucrReceiverSingleRowName.SetMeAsReceiver() ' The GT paramter should always be there. clsGtRFunction = clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsOperator).FirstOrDefault()?.clsArgumentCodeStructure @@ -40,7 +40,7 @@ clsStubHeadRFunction.SetRCommand("tab_stubhead") End If - Dim lstTabStyleForRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator) + SetRCode() End Sub diff --git a/instat/UserTables/Stub/ucrStubStyle.Designer.vb b/instat/UserTables/Stub/ucrStubStyle.Designer.vb index 9acd6745629..ed0ee68e9a8 100644 --- a/instat/UserTables/Stub/ucrStubStyle.Designer.vb +++ b/instat/UserTables/Stub/ucrStubStyle.Designer.vb @@ -24,7 +24,7 @@ Partial Class ucrStubStyle Private Sub InitializeComponent() Me.btnEnterStyle = New System.Windows.Forms.Button() Me.lblFormats = New System.Windows.Forms.Label() - Me.btnClearFormats = New System.Windows.Forms.Button() + Me.btnClearStyle = New System.Windows.Forms.Button() Me.dataGridFormats = New System.Windows.Forms.DataGridView() Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.Label1 = New System.Windows.Forms.Label() @@ -54,16 +54,16 @@ Partial Class ucrStubStyle Me.lblFormats.TabIndex = 338 Me.lblFormats.Text = "Styles:" ' - 'btnClearFormats + 'btnClearStyle ' - Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearFormats.Location = New System.Drawing.Point(290, 81) - Me.btnClearFormats.Name = "btnClearFormats" - Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) - Me.btnClearFormats.TabIndex = 337 - Me.btnClearFormats.Tag = "" - Me.btnClearFormats.Text = "Clear" - Me.btnClearFormats.UseVisualStyleBackColor = True + Me.btnClearStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearStyle.Location = New System.Drawing.Point(290, 81) + Me.btnClearStyle.Name = "btnClearStyle" + Me.btnClearStyle.Size = New System.Drawing.Size(75, 23) + Me.btnClearStyle.TabIndex = 337 + Me.btnClearStyle.Tag = "" + Me.btnClearStyle.Text = "Clear" + Me.btnClearStyle.UseVisualStyleBackColor = True ' 'dataGridFormats ' @@ -106,7 +106,7 @@ Partial Class ucrStubStyle Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrRowExpression) Me.Controls.Add(Me.lblFormats) - Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.btnClearStyle) Me.Controls.Add(Me.dataGridFormats) Me.Controls.Add(Me.btnEnterStyle) Me.Controls.Add(Me.Label1) @@ -120,7 +120,7 @@ Partial Class ucrStubStyle Friend WithEvents btnEnterStyle As Button Friend WithEvents lblFormats As Label - Friend WithEvents btnClearFormats As Button + Friend WithEvents btnClearStyle As Button Friend WithEvents dataGridFormats As DataGridView Friend WithEvents colStyles As DataGridViewTextBoxColumn Friend WithEvents Label1 As Label diff --git a/instat/UserTables/Stub/ucrStubStyle.vb b/instat/UserTables/Stub/ucrStubStyle.vb index ac1bcbd55f7..d98c4c1e3be 100644 --- a/instat/UserTables/Stub/ucrStubStyle.vb +++ b/instat/UserTables/Stub/ucrStubStyle.vb @@ -1,6 +1,85 @@ Public Class ucrStubStyle + Private clsOperator As New ROperator + Private bFirstload As Boolean = True - ' TODO. left here - ' use the row expressions control to get styles for the stub + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + If bFirstload Then + 'InitialiseControl() + bFirstload = False + End If + + Me.clsOperator = clsOperator + + ucrRowExpression.setup(strDataFrameName) + + Dim lstTabStyleForRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator) + + ' Clear and Set up the data grid with contents + dataGridFormats.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator)) + + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGridFormats.Rows.Add(row) + + Next + + 'ucrRowExpression.ucrInputExpression.con + End Sub + + 'Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrRowExpression.ucrInputExpression.ControlContentsChanged + ' btnEnterStyle.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputRows.IsEmpty + 'End Sub + + Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click + + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_body") + 'clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + 'clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrInputRows.GetText, iNewPosition:=1)) + + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + row.Cells(0).Value = clsTabStyleRFunction.Clone.ToScript + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGridFormats.Rows.Add(row) + + End Sub + + Private Sub btnClearStyle_Click(sender As Object, e As EventArgs) Handles btnClearStyle.Click + dataGridFormats.Rows.Clear() + End Sub + + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_body", clsOperator), clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) + End Sub End Class diff --git a/instat/UserTables/sdgTableRowExpression.vb b/instat/UserTables/sdgTableRowExpression.vb index c5c2a1a0015..829a340b589 100644 --- a/instat/UserTables/sdgTableRowExpression.vb +++ b/instat/UserTables/sdgTableRowExpression.vb @@ -1,5 +1,27 @@ Public Class sdgTableRowExpression + Private bFirstload As Boolean = True + Private Sub sdgTableRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load End Sub + + Public Sub Setup(strDataFrameName As String) + If bFirstload Then + 'InitialiseControl() + 'bFirstload = False + End If + + + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + + + End Sub + + ' TODO. In future this can be refactored to return an RFUnction + Public Function GetRowExpression() As String + Return "" + End Function End Class \ No newline at end of file From 3f33d9b04ee4ba819fd038f97890ed8cb90d29f1 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Fri, 12 Jul 2024 10:34:16 +0100 Subject: [PATCH 069/273] bug fix - reverting how we are storing "by" --- instat/static/InstatObject/R/instat_object_R6.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 99c29232a38..95062354be4 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2054,8 +2054,8 @@ DataBook$set("public", "crops_definitions", function(data_name, year, station, r is_station <- !missing(station) if(missing(year)) stop("Year column must be specified.") - by <- ifelse(!is_station, year, c(year, station)) - + if(!is_station) by <- year + else by <- c(year, station) if(missing(season_data_name)) season_data_name <- data_name if(season_data_name != data_name) { season_by <- self$get_equivalent_columns(from_data_name = data_name, columns = by, to_data_name = season_data_name) From 2f49dc347ab5c1bbdfff40af2bab763d9e40663e Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 15 Jul 2024 18:05:31 +0100 Subject: [PATCH 070/273] hange made --- instat/dlgClimograph.Designer.vb | 269 +++++++++++++++++--------- instat/dlgClimograph.resx | 3 + instat/dlgClimograph.vb | 320 ++++++++++++++++++++----------- 3 files changed, 389 insertions(+), 203 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index 7b986a0ce42..4c5558fc080 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -22,6 +22,7 @@ Partial Class dlgClimograph 'Ne la modifiez pas à l'aide de l'éditeur de code. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.lblAbsolute = New System.Windows.Forms.Label() Me.lblFacetBy = New System.Windows.Forms.Label() Me.lblRain = New System.Windows.Forms.Label() @@ -35,16 +36,25 @@ Partial Class dlgClimograph Me.lblElement1 = New System.Windows.Forms.Label() Me.lblElement2 = New System.Windows.Forms.Label() Me.lblMonthC = New System.Windows.Forms.Label() - Me.lblName = New System.Windows.Forms.Label() - Me.lblLabel = New System.Windows.Forms.Label() + Me.rdoViridis = New System.Windows.Forms.RadioButton() + Me.rdoPalette = New System.Windows.Forms.RadioButton() + Me.rdoSinglecolour = New System.Windows.Forms.RadioButton() + Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemBarchartOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemTmaxLineOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemTminLineOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemLayersOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.cmdOptions = New instat.ucrSplitButton() + Me.ucrInputPalette = New instat.ucrInputComboBox() + Me.ucrPnlColour = New instat.UcrPanel() + Me.ucrInputColourPalette = New instat.ucrInputComboBox() + Me.ucrChkColour = New instat.ucrCheck() + Me.ucrChkTile = New instat.ucrCheck() Me.ucrChkText = New instat.ucrCheck() Me.ucrChkRibbon = New instat.ucrCheck() - Me.ucrInputLabels = New instat.ucrInputTextBox() - Me.ucrInputName = New instat.ucrInputTextBox() - Me.ucrChkColourIdntity = New instat.ucrCheck() Me.ucrInputLegendPosition = New instat.ucrInputComboBox() Me.ucrChkLegend = New instat.ucrCheck() - Me.cmdOptions = New instat.ucrSplitButton() Me.ucrInputFacet = New instat.ucrInputComboBox() Me.ucrReceiverFacet = New instat.ucrReceiverSingle() Me.ucrReceiverRainC = New instat.ucrReceiverSingle() @@ -62,7 +72,7 @@ Partial Class dlgClimograph Me.ucrSave = New instat.ucrSave() Me.ucrReceiverMonth = New instat.ucrReceiverSingle() Me.ucrSelectorClimograph = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrChkTile = New instat.ucrCheck() + Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' 'lblAbsolute @@ -206,29 +216,144 @@ Partial Class dlgClimograph Me.lblMonthC.TabIndex = 87 Me.lblMonthC.Text = "Month:" ' - 'lblName + 'rdoViridis + ' + Me.rdoViridis.AutoSize = True + Me.rdoViridis.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoViridis.Location = New System.Drawing.Point(14, 379) + Me.rdoViridis.Name = "rdoViridis" + Me.rdoViridis.Size = New System.Drawing.Size(52, 17) + Me.rdoViridis.TabIndex = 123 + Me.rdoViridis.TabStop = True + Me.rdoViridis.Text = "Viridis" + Me.rdoViridis.UseVisualStyleBackColor = True + ' + 'rdoPalette + ' + Me.rdoPalette.AutoSize = True + Me.rdoPalette.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoPalette.Location = New System.Drawing.Point(14, 405) + Me.rdoPalette.Name = "rdoPalette" + Me.rdoPalette.Size = New System.Drawing.Size(58, 17) + Me.rdoPalette.TabIndex = 121 + Me.rdoPalette.TabStop = True + Me.rdoPalette.Text = "Palette" + Me.rdoPalette.UseVisualStyleBackColor = True + ' + 'rdoSinglecolour + ' + Me.rdoSinglecolour.AutoSize = True + Me.rdoSinglecolour.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoSinglecolour.Location = New System.Drawing.Point(14, 430) + Me.rdoSinglecolour.Name = "rdoSinglecolour" + Me.rdoSinglecolour.Size = New System.Drawing.Size(87, 17) + Me.rdoSinglecolour.TabIndex = 124 + Me.rdoSinglecolour.TabStop = True + Me.rdoSinglecolour.Text = "Single Colour" + Me.rdoSinglecolour.UseVisualStyleBackColor = True + ' + 'contextMenuStripOptions + ' + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTmaxLineOptions, Me.toolStripMenuItemTminLineOptions, Me.toolStripMenuItemLayersOptionsOptions}) + Me.contextMenuStripOptions.Name = "contextMenuStripOk" + Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 136) + ' + 'toolStripMenuItemPlotOptions + ' + Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" + Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemPlotOptions.Text = "Plot Options" + ' + 'toolStripMenuItemBarchartOptions + ' + Me.toolStripMenuItemBarchartOptions.Name = "toolStripMenuItemBarchartOptions" + Me.toolStripMenuItemBarchartOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemBarchartOptions.Text = "BarChart Options" + ' + 'toolStripMenuItemTmaxLineOptions + ' + Me.toolStripMenuItemTmaxLineOptions.Name = "toolStripMenuItemTmaxLineOptions" + Me.toolStripMenuItemTmaxLineOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemTmaxLineOptions.Text = "Line Options (Tmax)" + ' + 'toolStripMenuItemTminLineOptions + ' + Me.toolStripMenuItemTminLineOptions.Name = "toolStripMenuItemTminLineOptions" + Me.toolStripMenuItemTminLineOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemTminLineOptions.Text = "Line Options (Tmin)" + ' + 'toolStripMenuItemLayersOptionsOptions + ' + Me.toolStripMenuItemLayersOptionsOptions.Name = "toolStripMenuItemLayersOptionsOptions" + Me.toolStripMenuItemLayersOptionsOptions.Size = New System.Drawing.Size(180, 22) + Me.toolStripMenuItemLayersOptionsOptions.Text = "Layers Options" + ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.Location = New System.Drawing.Point(11, 234) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(148, 25) + Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.TabIndex = 126 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True ' - Me.lblName.AutoSize = True - Me.lblName.Location = New System.Drawing.Point(9, 399) - Me.lblName.Name = "lblName" - Me.lblName.Size = New System.Drawing.Size(38, 13) - Me.lblName.TabIndex = 100 - Me.lblName.Text = "Name:" + 'ucrInputPalette + ' + Me.ucrInputPalette.AddQuotesIfUnrecognised = True + Me.ucrInputPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPalette.GetSetSelectedIndex = -1 + Me.ucrInputPalette.IsReadOnly = False + Me.ucrInputPalette.Location = New System.Drawing.Point(136, 404) + Me.ucrInputPalette.Name = "ucrInputPalette" + Me.ucrInputPalette.Size = New System.Drawing.Size(63, 21) + Me.ucrInputPalette.TabIndex = 122 + ' + 'ucrPnlColour + ' + Me.ucrPnlColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlColour.Location = New System.Drawing.Point(11, 376) + Me.ucrPnlColour.Name = "ucrPnlColour" + Me.ucrPnlColour.Size = New System.Drawing.Size(92, 77) + Me.ucrPnlColour.TabIndex = 120 + ' + 'ucrInputColourPalette + ' + Me.ucrInputColourPalette.AddQuotesIfUnrecognised = True + Me.ucrInputColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputColourPalette.GetSetSelectedIndex = -1 + Me.ucrInputColourPalette.IsReadOnly = False + Me.ucrInputColourPalette.Location = New System.Drawing.Point(136, 377) + Me.ucrInputColourPalette.Name = "ucrInputColourPalette" + Me.ucrInputColourPalette.Size = New System.Drawing.Size(63, 21) + Me.ucrInputColourPalette.TabIndex = 119 + ' + 'ucrChkColour + ' + Me.ucrChkColour.AutoSize = True + Me.ucrChkColour.Checked = False + Me.ucrChkColour.Location = New System.Drawing.Point(14, 355) + Me.ucrChkColour.Name = "ucrChkColour" + Me.ucrChkColour.Size = New System.Drawing.Size(198, 24) + Me.ucrChkColour.TabIndex = 107 ' - 'lblLabel + 'ucrChkTile ' - Me.lblLabel.AutoSize = True - Me.lblLabel.Location = New System.Drawing.Point(190, 399) - Me.lblLabel.Name = "lblLabel" - Me.lblLabel.Size = New System.Drawing.Size(41, 13) - Me.lblLabel.TabIndex = 102 - Me.lblLabel.Text = "Labels:" + Me.ucrChkTile.AutoSize = True + Me.ucrChkTile.Checked = False + Me.ucrChkTile.Location = New System.Drawing.Point(14, 297) + Me.ucrChkTile.Name = "ucrChkTile" + Me.ucrChkTile.Size = New System.Drawing.Size(147, 24) + Me.ucrChkTile.TabIndex = 105 ' 'ucrChkText ' Me.ucrChkText.AutoSize = True Me.ucrChkText.Checked = False - Me.ucrChkText.Location = New System.Drawing.Point(12, 335) + Me.ucrChkText.Location = New System.Drawing.Point(14, 327) Me.ucrChkText.Name = "ucrChkText" Me.ucrChkText.Size = New System.Drawing.Size(98, 24) Me.ucrChkText.TabIndex = 104 @@ -237,49 +362,18 @@ Partial Class dlgClimograph ' Me.ucrChkRibbon.AutoSize = True Me.ucrChkRibbon.Checked = False - Me.ucrChkRibbon.Location = New System.Drawing.Point(12, 269) + Me.ucrChkRibbon.Location = New System.Drawing.Point(14, 269) Me.ucrChkRibbon.Name = "ucrChkRibbon" Me.ucrChkRibbon.Size = New System.Drawing.Size(147, 24) Me.ucrChkRibbon.TabIndex = 103 ' - 'ucrInputLabels - ' - Me.ucrInputLabels.AddQuotesIfUnrecognised = True - Me.ucrInputLabels.AutoSize = True - Me.ucrInputLabels.IsMultiline = False - Me.ucrInputLabels.IsReadOnly = False - Me.ucrInputLabels.Location = New System.Drawing.Point(243, 394) - Me.ucrInputLabels.Name = "ucrInputLabels" - Me.ucrInputLabels.Size = New System.Drawing.Size(117, 21) - Me.ucrInputLabels.TabIndex = 101 - ' - 'ucrInputName - ' - Me.ucrInputName.AddQuotesIfUnrecognised = True - Me.ucrInputName.AutoSize = True - Me.ucrInputName.IsMultiline = False - Me.ucrInputName.IsReadOnly = False - Me.ucrInputName.Location = New System.Drawing.Point(62, 394) - Me.ucrInputName.Name = "ucrInputName" - Me.ucrInputName.Size = New System.Drawing.Size(117, 21) - Me.ucrInputName.TabIndex = 99 - ' - 'ucrChkColourIdntity - ' - Me.ucrChkColourIdntity.AutoSize = True - Me.ucrChkColourIdntity.Checked = False - Me.ucrChkColourIdntity.Location = New System.Drawing.Point(12, 369) - Me.ucrChkColourIdntity.Name = "ucrChkColourIdntity" - Me.ucrChkColourIdntity.Size = New System.Drawing.Size(189, 24) - Me.ucrChkColourIdntity.TabIndex = 98 - ' 'ucrInputLegendPosition ' Me.ucrInputLegendPosition.AddQuotesIfUnrecognised = True Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(112, 424) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(115, 458) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) Me.ucrInputLegendPosition.TabIndex = 97 @@ -288,22 +382,11 @@ Partial Class dlgClimograph ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(12, 421) + Me.ucrChkLegend.Location = New System.Drawing.Point(14, 459) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 96 ' - 'cmdOptions - ' - Me.cmdOptions.AutoSize = True - Me.cmdOptions.Location = New System.Drawing.Point(11, 234) - Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(148, 25) - Me.cmdOptions.TabIndex = 95 - Me.cmdOptions.Tag = "Plot Options" - Me.cmdOptions.Text = "Plot Options" - Me.cmdOptions.UseVisualStyleBackColor = True - ' 'ucrInputFacet ' Me.ucrInputFacet.AddQuotesIfUnrecognised = True @@ -468,7 +551,7 @@ Partial Class dlgClimograph ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 480) + Me.ucrBase.Location = New System.Drawing.Point(12, 517) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 75 @@ -476,7 +559,7 @@ Partial Class dlgClimograph 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(12, 453) + Me.ucrSave.Location = New System.Drawing.Point(14, 490) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -507,31 +590,24 @@ Partial Class dlgClimograph Me.ucrSelectorClimograph.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorClimograph.TabIndex = 59 ' - 'ucrChkTile - ' - Me.ucrChkTile.AutoSize = True - Me.ucrChkTile.Checked = False - Me.ucrChkTile.Location = New System.Drawing.Point(11, 299) - Me.ucrChkTile.Name = "ucrChkTile" - Me.ucrChkTile.Size = New System.Drawing.Size(147, 24) - Me.ucrChkTile.TabIndex = 105 - ' 'dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(472, 543) + Me.ClientSize = New System.Drawing.Size(472, 568) + Me.Controls.Add(Me.cmdOptions) + Me.Controls.Add(Me.rdoSinglecolour) + Me.Controls.Add(Me.rdoViridis) + Me.Controls.Add(Me.ucrInputPalette) + Me.Controls.Add(Me.rdoPalette) + Me.Controls.Add(Me.ucrPnlColour) + Me.Controls.Add(Me.ucrInputColourPalette) + Me.Controls.Add(Me.ucrChkColour) Me.Controls.Add(Me.ucrChkTile) Me.Controls.Add(Me.ucrChkText) Me.Controls.Add(Me.ucrChkRibbon) - Me.Controls.Add(Me.lblLabel) - Me.Controls.Add(Me.ucrInputLabels) - Me.Controls.Add(Me.lblName) - Me.Controls.Add(Me.ucrInputName) - Me.Controls.Add(Me.ucrChkColourIdntity) Me.Controls.Add(Me.ucrInputLegendPosition) Me.Controls.Add(Me.ucrChkLegend) - Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrInputFacet) Me.Controls.Add(Me.ucrReceiverFacet) Me.Controls.Add(Me.lblFacet) @@ -568,6 +644,7 @@ Partial Class dlgClimograph Me.Name = "dlgClimograph" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Climograph" + Me.contextMenuStripOptions.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -603,15 +680,23 @@ Partial Class dlgClimograph Friend WithEvents lblElement2 As Label Friend WithEvents ucrReceiverMonthC As ucrReceiverSingle Friend WithEvents lblMonthC As Label - Friend WithEvents cmdOptions As ucrSplitButton Friend WithEvents ucrInputLegendPosition As ucrInputComboBox - Friend WithEvents ucrChkLegend As ucrCheck - Friend WithEvents ucrChkColourIdntity As ucrCheck - Friend WithEvents lblName As Label - Friend WithEvents ucrInputName As ucrInputTextBox - Friend WithEvents lblLabel As Label - Friend WithEvents ucrInputLabels As ucrInputTextBox Friend WithEvents ucrChkRibbon As ucrCheck Friend WithEvents ucrChkText As ucrCheck Friend WithEvents ucrChkTile As ucrCheck + Friend WithEvents ucrChkLegend As ucrCheck + Friend WithEvents rdoViridis As RadioButton + Friend WithEvents ucrInputPalette As ucrInputComboBox + Friend WithEvents rdoPalette As RadioButton + Friend WithEvents ucrPnlColour As UcrPanel + Friend WithEvents ucrInputColourPalette As ucrInputComboBox + Friend WithEvents ucrChkColour As ucrCheck + Friend WithEvents rdoSinglecolour As RadioButton + Friend WithEvents contextMenuStripOptions As ContextMenuStrip + Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem + Friend WithEvents toolStripMenuItemBarchartOptions As ToolStripMenuItem + Friend WithEvents toolStripMenuItemTmaxLineOptions As ToolStripMenuItem + Friend WithEvents toolStripMenuItemTminLineOptions As ToolStripMenuItem + Friend WithEvents toolStripMenuItemLayersOptionsOptions As ToolStripMenuItem + Friend WithEvents cmdOptions As ucrSplitButton End Class diff --git a/instat/dlgClimograph.resx b/instat/dlgClimograph.resx index 1af7de150c9..aae6333c398 100644 --- a/instat/dlgClimograph.resx +++ b/instat/dlgClimograph.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 6b8bff81d92..c8773243d01 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -45,6 +45,7 @@ Public Class dlgClimograph Private clsFacetFunction1 As New RFunction Private clsGroupByFunction1 As New RFunction Private bResetSubdialog As Boolean = True + Private bResetLineLayerSubdialog As Boolean = True Private clsCoordPolarFunction As New RFunction Private clsRFacetFunction As New RFunction Private clsAnnotateFunction As New RFunction @@ -61,9 +62,6 @@ Public Class dlgClimograph Private clsSecondaryAxisFunction As New RFunction Private clsSecondaryAxis1Function As New RFunction Private clsSecondaryAxis2Function As New RFunction - Private clsLenthFunction As New RFunction - Private clsUniqueFunction As New RFunction - Private clsSemicommaOperator As New ROperator Private dctThemeFunctions As New Dictionary(Of String, RFunction) Private clsXScalecontinuousFunction As New RFunction Private clsXScalediscreteFunction As New RFunction @@ -91,7 +89,7 @@ Public Class dlgClimograph Private clsMaxFunction As New RFunction Private clsMax1Function As New RFunction Private clsVectorFunction As New RFunction - Private clsGetObjectDataFunction As New RFunction + Private clsGetObjectDataFunction, clsColourPaletteFunction, clsLocalRaesFunction, clsFillBrewerFunction, clsScalefillDistillerFunction As New RFunction Private clsStarOperator As New ROperator Private clsStar1Operator As New ROperator Private clsDivideOperator As New ROperator @@ -126,6 +124,8 @@ Public Class dlgClimograph Private Sub InitialiseDialog() Dim dctLegendPosition As New Dictionary(Of String, String) + Dim dctColourPallette As New Dictionary(Of String, String) + Dim dctPalette As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 432 @@ -196,7 +196,7 @@ Public Class dlgClimograph ucrReceiverElement1.strSelectorHeading = "Variables" ucrReceiverElement1.SetLinkedDisplayControl(lblElement1) - ucrReceiverElement2.SetParameter(New RParameter("x", 5, False)) + ucrReceiverElement2.SetParameter(New RParameter("tmin", 5, False)) ucrReceiverElement2.SetParameterIsRFunction() ucrReceiverElement2.Selector = ucrSelectorClimograph ucrReceiverElement2.bWithQuotes = False @@ -234,16 +234,16 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkColourIdntity, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkColour, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkColourIdntity.SetText("Legend for Lines") - ucrChkColourIdntity.AddParameterValuesCondition(True, "checked", "True") - ucrChkColourIdntity.AddParameterValuesCondition(False, "checked", "False") - ucrChkColourIdntity.AddToLinkedControls({ucrInputName, ucrInputLabels}, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrInputName.SetValidationTypeAsList() - ucrInputName.SetLinkedDisplayControl(lblName) - ucrInputLabels.SetValidationTypeAsList() - ucrInputLabels.SetLinkedDisplayControl(lblLabel) + ucrPnlColour.AddRadioButton(rdoViridis) + ucrPnlColour.AddRadioButton(rdoPalette) + ucrPnlColour.AddRadioButton(rdoSinglecolour) + ucrPnlColour.AddParameterValuesCondition(rdoPalette, "Check", "palette") + ucrPnlColour.AddParameterValuesCondition(rdoViridis, "Check", "viridis") + ucrPnlColour.AddParameterValuesCondition(rdoSinglecolour, "Check", "single") + ucrPnlColour.AddToLinkedControls(ucrInputPalette, {rdoPalette}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Blues") + ucrPnlColour.AddToLinkedControls(ucrInputColourPalette, {rdoViridis}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Viridis") ucrChkLegend.SetText("Legend:") ucrChkLegend.AddToLinkedControls({ucrInputLegendPosition}, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") @@ -270,6 +270,61 @@ Public Class dlgClimograph ucrChkText.AddParameterValuesCondition(True, "checked", "True") ucrChkText.AddParameterValuesCondition(False, "checked", "False") + ucrInputPalette.SetParameter(New RParameter("palette", 10)) + ucrInputPalette.SetDropDownStyleAsNonEditable() + dctPalette.Add("Blues", Chr(34) & "Blues" & Chr(34)) + dctPalette.Add("Greens", Chr(34) & "Greens" & Chr(34)) + dctPalette.Add("Greys", Chr(34) & "Greys" & Chr(34)) + dctPalette.Add("Oranges", Chr(34) & "Oranges" & Chr(34)) + dctPalette.Add("Purples", Chr(34) & "Purples" & Chr(34)) + dctPalette.Add("Reds", Chr(34) & "Reds" & Chr(34)) + dctPalette.Add("BuGn", Chr(34) & "BuGn" & Chr(34)) + dctPalette.Add("BuPu", Chr(34) & "BuPu" & Chr(34)) + dctPalette.Add("GnBu", Chr(34) & "GnBu" & Chr(34)) + dctPalette.Add("OrRd", Chr(34) & "OrRd" & Chr(34)) + dctPalette.Add("PuBu", Chr(34) & "PuBu" & Chr(34)) + dctPalette.Add("PuBuGn", Chr(34) & "PuBuGn" & Chr(34)) + dctPalette.Add("PuRd", Chr(34) & "PuRd" & Chr(34)) + dctPalette.Add("RdPu", Chr(34) & "RdPu" & Chr(34)) + dctPalette.Add("YlGn", Chr(34) & "YlGn" & Chr(34)) + dctPalette.Add("YlGnBu", Chr(34) & "YlGnBu" & Chr(34)) + dctPalette.Add("YlOrBr", Chr(34) & "YlOrBr" & Chr(34)) + dctPalette.Add("YlOrRd", Chr(34) & "YlOrRd" & Chr(34)) + dctPalette.Add("Spectral", Chr(34) & "Spectral" & Chr(34)) + dctPalette.Add("BrBG", Chr(34) & "BrBG" & Chr(34)) + dctPalette.Add("PiYG", Chr(34) & "PiYG" & Chr(34)) + dctPalette.Add("PRGn", Chr(34) & "PRGn" & Chr(34)) + dctPalette.Add("PuOr", Chr(34) & "PuOr" & Chr(34)) + dctPalette.Add("RdBu", Chr(34) & "RdBu" & Chr(34)) + dctPalette.Add("RdGy", Chr(34) & "RdGy" & Chr(34)) + dctPalette.Add("RdYlBu", Chr(34) & "RdYlBu" & Chr(34)) + dctPalette.Add("RdYlGn", Chr(34) & "RdYlGn" & Chr(34)) + dctPalette.Add("Accent", Chr(34) & "Accent" & Chr(34)) + dctPalette.Add("Dark2", Chr(34) & "Dark2" & Chr(34)) + dctPalette.Add("Pastel1", Chr(34) & "Pastel1" & Chr(34)) + dctPalette.Add("Pastel2", Chr(34) & "Pastel2" & Chr(34)) + dctPalette.Add("Set1", Chr(34) & "Set1" & Chr(34)) + dctPalette.Add("Set2", Chr(34) & "Set2" & Chr(34)) + dctPalette.Add("Set3", Chr(34) & "Set3" & Chr(34)) + ucrInputPalette.SetItems(dctPalette) + + ucrInputColourPalette.SetParameter(New RParameter("option", 0)) + dctColourPallette.Add("viridis", Chr(34) & "viridis" & Chr(34)) + dctColourPallette.Add("magma", Chr(34) & "magma" & Chr(34)) + dctColourPallette.Add("inferno", Chr(34) & "inferno" & Chr(34)) + dctColourPallette.Add("plasma", Chr(34) & "plasma" & Chr(34)) + dctColourPallette.Add("cividis", Chr(34) & "cividis" & Chr(34)) + dctColourPallette.Add("mako", Chr(34) & "mako" & Chr(34)) + dctColourPallette.Add("rocket", Chr(34) & "rocket" & Chr(34)) + dctColourPallette.Add("turbo", Chr(34) & "turbo" & Chr(34)) + ucrInputColourPalette.SetItems(dctColourPallette) + ucrInputColourPalette.SetDropDownStyleAsNonEditable() + + ucrChkColour.SetText("Change Bars Colour") + ucrChkColour.AddParameterValuesCondition(True, "checked", "True") + ucrChkColour.AddParameterValuesCondition(False, "checked", "False") + ucrChkColour.AddToLinkedControls({ucrPnlColour}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrSave.SetPrefix("wl_graph") ucrSave.SetIsComboBox() ucrSave.SetSaveTypeAsGraph() @@ -308,8 +363,6 @@ Public Class dlgClimograph clsSecondaryAxisFunction = New RFunction clsSecondaryAxis1Function = New RFunction clsSecondaryAxis2Function = New RFunction - clsLenthFunction = New RFunction - clsUniqueFunction = New RFunction clsGeomTextBarFunction = New RFunction clsGeomTextTmaxFunction = New RFunction clsGeomTextTminFunction = New RFunction @@ -325,7 +378,6 @@ Public Class dlgClimograph clsRoundTmaxFunction = New RFunction clsRoundTminFunction = New RFunction clsGeomTileFunction = New RFunction - clsSemicommaOperator = New ROperator clsStarOperator = New ROperator clsStar1Operator = New ROperator clsDivideOperator = New ROperator @@ -341,10 +393,16 @@ Public Class dlgClimograph clsScaleycontinuousFunction = New RFunction clsLabFunction = New RFunction clsGetObjectDataFunction = New RFunction + clsColourPaletteFunction = New RFunction + clsScalefillDistillerFunction = New RFunction + clsFillBrewerFunction = New RFunction ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) ucrSave.Reset() + bResetSubdialog = True + bResetLineLayerSubdialog = True + ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True @@ -353,6 +411,7 @@ Public Class dlgClimograph ucrInputFacet.bUpdateRCodeFromControl = True clsDummyFunction.AddParameter("checked", "Climograph", iPosition:=0) + clsDummyFunction.AddParameter("Check", "viridis", iPosition:=1) clsBaseOperator.SetOperation("+") clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) @@ -404,15 +463,19 @@ Public Class dlgClimograph clsGeomLineFunction.SetRCommand("geom_line") clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) + clsGeomLineFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) clsGeomLineFunction1.SetRCommand("geom_line") clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) + clsGeomLineFunction1.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) clsGeomLineStarFunction.SetRCommand("geom_line") clsGeomLineStarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineStarFunction, iPosition:=0) + clsGeomLineStarFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) clsGeomLineStar1Function.SetRCommand("geom_line") clsGeomLineStar1Function.AddParameter("mapping", clsRFunctionParameter:=clsAesLineStar1Function, iPosition:=0) + clsGeomLineStar1Function.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) clsAesLineFunction.SetRCommand("aes") clsAesLineFunction.AddParameter("group", "1", iPosition:=1) @@ -439,15 +502,6 @@ Public Class dlgClimograph clsXScalediscreteFunction.SetRCommand("scale_x_discrete") clsXScalediscreteFunction.AddParameter("name", Chr(34) & "Month" & Chr(34), iPosition:=0) - clsSemicommaOperator.SetOperation(":") - clsSemicommaOperator.AddParameter("left", "1", iPosition:=0, bIncludeArgumentName:=False) - clsSemicommaOperator.AddParameter("right", clsRFunctionParameter:=clsLenthFunction, iPosition:=1, bIncludeArgumentName:=False) - - clsLenthFunction.SetRCommand("length") - clsLenthFunction.AddParameter("x", clsRFunctionParameter:=clsUniqueFunction, iPosition:=0, bIncludeArgumentName:=False) - - clsUniqueFunction.SetRCommand("unique") - clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) @@ -561,6 +615,15 @@ Public Class dlgClimograph clsLabFunction.SetRCommand("labs") + clsColourPaletteFunction.SetPackageName("viridis") + clsColourPaletteFunction.SetRCommand("scale_fill_viridis") + + clsScalefillDistillerFunction.SetPackageName("ggplot2") + clsScalefillDistillerFunction.SetRCommand("scale_fill_distiller") + + clsFillBrewerFunction.SetPackageName("ggplot2") + clsFillBrewerFunction.SetRCommand("scale_fill_brewer") + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -573,6 +636,7 @@ Public Class dlgClimograph clsXScaleDateFunction = GgplotDefaults.clsXScaleDateFunction.Clone() clsYScaleDateFunction = GgplotDefaults.clsYScaleDateFunction.Clone() clsThemeFunction = GgplotDefaults.clsDefaultThemeFunction.Clone() + clsLocalRaesFunction = GgplotDefaults.clsAesFunction.Clone() dctThemeFunctions = New Dictionary(Of String, RFunction)(GgplotDefaults.dctThemeFunctions) clsScaleFillViridisFunction = GgplotDefaults.clsScaleFillViridisFunction clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction @@ -590,7 +654,6 @@ Public Class dlgClimograph Private Sub SetRCodeForControls(bReset) ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - ucrReceiverMonthC.AddAdditionalCodeParameterPair(clsUniqueFunction, New RParameter("x", 0, False), iAdditionalPairNo:=1) ucrReceiverRainC.SetRCode(clsMaxFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) @@ -605,14 +668,13 @@ Public Class dlgClimograph If bReset Then ucrReceiverElement2.SetRCode(clsVectorFunction, bReset) ucrReceiverElement1.SetRCode(clsVectorFunction, bReset) - ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) + 'ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) - ucrChkColourIdntity.SetRCode(clsScalecolouridentityFunction, bReset) ucrChkRibbon.SetRCode(clsGeomRibbonFunction, bReset) ucrChkTile.SetRCode(clsGeomTileFunction, bReset) - ucrInputName.SetRCode(clsScalecolouridentityFunction, bReset) - ucrInputLabels.SetRCode(clsScalecolouridentityFunction, bReset) ucrChkText.SetRCode(clsBaseOperator, bReset) + ucrPnlColour.SetRCode(clsDummyFunction, bReset) + ucrChkColour.SetRCode(clsBaseOperator, bReset) End If End Sub @@ -660,7 +722,7 @@ Public Class dlgClimograph TestOKEnabled() End Sub - Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorClimograph, clsNewThemeFunction:=clsThemeFunction, @@ -681,6 +743,46 @@ Public Class dlgClimograph bResetSubdialog = False End Sub + Private Sub openSdgLayerOptions(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, + clsNewGlobalAesFunc:=clsNewAesFunction, clsNewLocalAes:=clsLocalRaesFunction, + bFixGeom:=True, ucrNewBaseSelector:=ucrSelectorClimograph, + bApplyAesGlobally:=True, bReset:=bResetLineLayerSubdialog) + sdgLayerOptions.ShowDialog() + bResetLineLayerSubdialog = False + 'Coming from the sdgLayerOptions, clsRaesFunction and others have been modified. + ' One then needs to display these modifications on the dlgScatteredPlot. + + 'The aesthetics parameters on the main dialog are repopulated as required. + For Each clsParam In clsNewAesFunction.clsParameters + If clsParam.strArgumentName = "x" Then + If clsParam.strArgumentValue = Chr(34) & Chr(34) Then + ucrReceiverMonthC.Clear() + Else + 'ucrReceiverMonthC.Add(clsParam.strArgumentValue) + End If + 'In the y case, the value stored in the clsReasFunction in the multiple variables + ' case is "value", however that one shouldn't be written in the multiple + ' variables receiver (otherwise it would stack all variables and the stack + ' ("value") itself!). + 'Warning: what if someone used the name value for one of it's variables + ' independently from the multiple variables method? Here if the receiver is + ' actually in single mode, the variable "value" will still be given back, which + ' throws the problem back to the creation of "value" in the multiple receiver case. + ElseIf clsParam.strArgumentName = "y" AndAlso clsParam.strArgumentValue <> "value" Then + 'Still might be in the case of bSingleVariable with mapping y="". + If clsParam.strArgumentValue = Chr(34) & Chr(34) Then + ucrReceiverRainC.Clear() + Else + ucrReceiverRainC.Add(clsParam.strArgumentValue) + End If + 'ElseIf clsParam.strArgumentName = "fill" Then + ' ucrReceiverMonthC.Add(clsParam.strArgumentValue) + End If + Next + TestOKEnabled() + End Sub + Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputFacet.ControlValueChanged If Not bUpdateComboOptions1 Then Exit Sub @@ -1036,10 +1138,6 @@ Public Class dlgClimograph AddRemoveTheme() End Sub - Private Sub ucrChkColourIdntity_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkColourIdntity.ControlValueChanged, ucrInputName.ControlValueChanged, ucrInputLabels.ControlValueChanged - AddRemoveGeomLines() - AddRemoveGeomLine1() - End Sub Private Sub AddRemoveGeomTextBar() If rdoClimograph.Checked Then @@ -1124,7 +1222,7 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("scale_x_discrete") End If Else - clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("geom_ribbon") clsBaseOperator.RemoveParameterByName("scale_x_discrete") End If Else @@ -1149,43 +1247,9 @@ Public Class dlgClimograph If Not ucrReceiverRainC.IsEmpty Then clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) - If ucrChkColourIdntity.Checked Then - clsAesLineStarFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) - Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") - End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) - Else - clsScalecolouridentityFunction.RemoveParameterByName("name") - End If - Else - clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLineStarFunction.RemoveParameterByName("colour") - End If Else clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) - If ucrChkColourIdntity.Checked Then - clsAesLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=3) - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) - Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") - End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) - Else - clsScalecolouridentityFunction.RemoveParameterByName("name") - End If - Else - clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLineFunction.RemoveParameterByName("colour") - End If End If Else clsBaseOperator.RemoveParameterByName("geom_line") @@ -1202,43 +1266,8 @@ Public Class dlgClimograph If Not ucrReceiverRainC.IsEmpty Then clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) - If ucrChkColourIdntity.Checked Then - clsAesLineStar1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) - Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") - End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) - Else - clsScalecolouridentityFunction.RemoveParameterByName("name") - End If - Else - clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLineStar1Function.RemoveParameterByName("colour") - End If Else clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) - If ucrChkColourIdntity.Checked Then - clsAesLine1Function.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=3) - clsBaseOperator.AddParameter("scale_colour_identity", clsRFunctionParameter:=clsScalecolouridentityFunction, iPosition:=13) - If Not ucrInputLabels.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("labels", ucrInputLabels.clsRList.ToScript(), iPosition:=2) - Else - clsScalecolouridentityFunction.RemoveParameterByName("labels") - End If - If Not ucrInputName.IsEmpty Then - clsScalecolouridentityFunction.AddParameter("name", Chr(34) & ucrInputName.GetText() & Chr(34), iPosition:=0) - Else - clsScalecolouridentityFunction.RemoveParameterByName("name") - End If - Else - clsBaseOperator.RemoveParameterByName("scale_colour_identity") - clsAesLine1Function.RemoveParameterByName("colour") - End If End If Else clsBaseOperator.RemoveParameterByName("geom_line1") @@ -1264,16 +1293,56 @@ Public Class dlgClimograph clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) clsBaseOperator.RemoveParameterByName("geom_tile") End If + If ucrChkColour.Checked Then + Dim clsAsnumericFunction As New RFunction + clsAsnumericFunction.SetRCommand("as.numeric") + clsAsnumericFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + If rdoViridis.Checked Then + clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsAsnumericFunction, iPosition:=3) + clsColourPaletteFunction.AddParameter("option", Chr(34) & ucrInputColourPalette.GetText() & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) + ElseIf rdoPalette.Checked Then + If Not ucrReceiverMonthC.IsEmpty Then + clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + If ucrReceiverMonthC.strCurrDataType = "factor" OrElse ucrReceiverMonthC.strCurrDataType = "ordered,factor" Then + clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=6) + Else + clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=6) + End If + End If + Else + clsBarAesFunction.AddParameter("fill", Chr(34) & "" & Chr(34), iPosition:=3) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + End If + Else + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + End If Else clsBarAesFunction.RemoveParameterByName("y") + clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + End If + Else clsBaseOperator.RemoveParameterByName("geom_tile") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("labs") - End If - Else - clsBaseOperator.RemoveParameterByName("geom_tile") clsBaseOperator.RemoveParameterByName("geom_bar") clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") End If End Sub @@ -1322,6 +1391,11 @@ Public Class dlgClimograph End Sub Private Sub ucrReceiverMonthC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthC.ControlValueChanged + If Not ucrReceiverMonthC.IsEmpty Then + clsBarAesFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=1) + Else + clsBarAesFunction.AddParameter("x", Chr(34) & "" & Chr(34), iPosition:=1) + End If AddRemoveGeomRibbon() AddRemoveGeomBar() End Sub @@ -1331,6 +1405,26 @@ Public Class dlgClimograph AddRemoveGeomRibbon() End Sub + + Private Sub toolStripMenuItemLayersOptionsOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemLayersOptionsOptions.Click + sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, + clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, + clsNewFacetFunction:=clsRFacetFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsBarAesFunction, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, + clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) + sdgPlots.tbpPlotsOptions.SelectedIndex = 1 + sdgPlots.ShowDialog() + sdgPlots.tbpPlotsOptions.SelectedIndex = 0 + sdgPlots.EnableLayersTab() + bResetSubdialog = False + AddRemoveGeomLines() + AddRemoveGeomLine1() + End Sub + + Private Sub toolStripMenuItemBarchartOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemBarchartOptions.Click + openSdgLayerOptions(clsGeomBarFunction, clsBarAesFunction) + End Sub + Private Sub ucrChkText_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkText.ControlValueChanged AddRemoveGeomTextBar() AddRemoveGeomTextTmax() @@ -1345,6 +1439,10 @@ Public Class dlgClimograph End If End Sub + Private Sub ucrPnlColour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlColour.ControlValueChanged, ucrChkColour.ControlValueChanged, ucrInputPalette.ControlValueChanged, ucrInputColourPalette.ControlValueChanged + AddRemoveGeomBar() + End Sub + Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged TestOKEnabled() End Sub From 2310b39f494e307c98ef52ec8da3799644d3f1ba Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 16 Jul 2024 10:53:06 +0100 Subject: [PATCH 071/273] Change made --- instat/dlgLinePlot.vb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index c5338de519e..5b4b60f649c 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -255,7 +255,6 @@ Public Class dlgLinePlot dctMethodOptions.Add("rlm", "MASS::rlm") ucrInputMethod.SetItems(dctMethodOptions) ucrInputMethod.SetDropDownStyleAsNonEditable() - ucrInputMethod.SetRDefault(Chr(34) & "loess" & Chr(34)) ucrNudSpan.SetParameter(New RParameter("span", 4)) ucrNudSpan.SetMinMax(0, Integer.MaxValue) @@ -425,7 +424,8 @@ Public Class dlgLinePlot ucrInputStation.SetDropDownStyleAsNonEditable() ucrPnlOptions.AddToLinkedControls({ucrChkPathOrStep, ucrChkWithSE, ucrChkLineofBestFit}, {rdoLine}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlOptions.AddToLinkedControls({ucrChkAddLine, ucrInputMethod, ucrInputFormula}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrChkAddLine, ucrInputFormula}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls(ucrInputMethod, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="loess") ucrPnlOptions.AddToLinkedControls({ucrChkAddSE, ucrChkFormula, ucrChkSpan}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="FALSE") ucrPnlOptions.AddToLinkedControls({ucrReceiverXEnd, ucrChkDumbbellColour, ucrChkDumbbellSize}, {rdoDumbbell}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddPoints}, {rdoLine, rdoSmoothing, rdoLinerange}, bNewLinkedHideIfParameterMissing:=True) @@ -539,6 +539,8 @@ Public Class dlgLinePlot clsGeomLineFunction.SetPackageName("ggplot2") clsGeomLineFunction.SetRCommand("geom_line") + clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) + clsGeomLineFunction.AddParameter("size", "0.8") clsAesLinerangeFunction.SetRCommand("aes") @@ -595,12 +597,15 @@ Public Class dlgLinePlot clsPathFunction.SetPackageName("ggplot2") clsPathFunction.SetRCommand("geom_path") + clsPathFunction.AddParameter("linemitre", "10") clsGeomStepFunction.SetPackageName("ggplot2") clsGeomStepFunction.SetRCommand("geom_step") clsGeomSmoothFunction.SetPackageName("ggplot2") clsGeomSmoothFunction.SetRCommand("geom_smooth") + clsGeomSmoothFunction.AddParameter("method", Chr(34) & "loess" & Chr(34), iPosition:=0) + clsGeomSmoothFunction.AddParameter("size", "1") clsGeomDumbbellFunction.SetPackageName("ggplot2") clsGeomDumbbellFunction.SetRCommand("geom_dumbbell") @@ -650,12 +655,10 @@ Public Class dlgLinePlot ucrFactorOptionalReceiver.SetRCode(clsRaesFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) ucrChkAddPoints.SetRCode(clsBaseOperator, bReset) - ucrChkAddLine.SetRCode(clsBaseOperator, bReset) ucrChkWithSE.SetRCode(clsGeomSmoothFunc, bReset) ucrChkAddSE.SetRCode(clsGeomSmoothFunction, bReset) ucrReceiverYMax.SetRCode(clsAesLinerangeFunction, bReset) ucrReceiverYMin.SetRCode(clsAesLinerangeFunction, bReset) - ucrInputMethod.SetRCode(clsGeomSmoothFunction, bReset) ucrNudSpan.SetRCode(clsGeomSmoothFunction, bReset) ucrFamilyInput.SetRCode(clsListFunction, bReset) ucrChkFormula.SetRCode(clsBaseOperator, bReset) @@ -667,11 +670,14 @@ Public Class dlgLinePlot ucrChkLegend.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) ucrInputLegendPosition.SetRCode(clsThemeFunction, bReset, bCloneIfNeeded:=True) If bReset Then + ucrInputMethod.SetRCode(clsGeomSmoothFunction, bReset) ucrChkRibbon.SetRCode(clsBaseOperator, bReset) ucrChkPathOrStep.SetRCode(clsBaseOperator, bReset) ucrPnlOptions.SetRCode(clsDummyFunction, bReset) ucrChkLineofBestFit.SetRCode(clsBaseOperator, bReset) ucrChkAddLineLineRange.SetRCode(clsBaseOperator, bReset) + ucrChkAddLine.SetRCode(clsBaseOperator, bReset) + ucrChkSpan.SetRCode(clsGeomSmoothFunction, bReset) End If SetGroupParam() End Sub @@ -875,14 +881,10 @@ Public Class dlgLinePlot End Sub Private Sub LineOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LineOptionsToolStripMenuItem.Click - clsGeomLineFunction.AddParameter("colour", Chr(34) & "blue" & Chr(34)) - clsGeomLineFunction.AddParameter("size", "0.8") openSdgLayerOptions(clsGeomLineFunction) End Sub Private Sub SmoothOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SmoothOptionsToolStripMenuItem.Click - clsGeomSmoothFunction.AddParameter("method", Chr(34) & "lm" & Chr(34), iPosition:=0) - clsGeomSmoothFunction.AddParameter("size", "1") openSdgLayerOptions(clsGeomSmoothFunction) End Sub @@ -891,7 +893,6 @@ Public Class dlgLinePlot End Sub Private Sub PathOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles PathOptionsToolStripMenuItem.Click - clsPathFunction.AddParameter("linemitre", "10") openSdgLayerOptions(clsPathFunction) End Sub From 22b399d3aa7cb34003e4485fb992d41383742e90 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 16 Jul 2024 16:56:46 +0300 Subject: [PATCH 072/273] changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 108 +++++++++---------- instat/dlgDescribeTwoVariable.vb | 124 ++++++++++++++++------ 2 files changed, 144 insertions(+), 88 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index e0234ea7e9f..6cc4feeec45 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,18 +60,17 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() - Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.rdoOCol = New System.Windows.Forms.RadioButton() Me.rdoOCell = New System.Windows.Forms.RadioButton() Me.rdoORow = New System.Windows.Forms.RadioButton() - Me.ucrpnlPercent = New instat.UcrPanel() Me.ucrReceiverPercentages = New instat.ucrReceiverSingle() + Me.ucrpnlPercent = New instat.UcrPanel() Me.ucrReceiverThreeVariableSecondFactor = New instat.ucrReceiverSingle() Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() - Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrBase = New instat.ucrButtons() @@ -86,6 +85,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkCorrelations = New instat.ucrCheck() Me.ucrChkLevSig = New instat.ucrCheck() Me.ucrChkOmitMissing = New instat.ucrCheck() + Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() Me.grpSummaries.SuspendLayout() Me.grpDisplay.SuspendLayout() Me.SuspendLayout() @@ -358,29 +358,6 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' - 'ucrReceiverColumns - ' - Me.ucrReceiverColumns.AutoSize = True - Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) - Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 - Me.ucrReceiverColumns.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) - Me.ucrChkDisplayAsPercentage.TabIndex = 54 - ' 'rdoOCol ' Me.rdoOCol.AutoSize = True @@ -414,15 +391,6 @@ Partial Class dlgDescribeTwoVariable Me.rdoORow.Text = "Row(%)" Me.rdoORow.UseVisualStyleBackColor = True ' - 'ucrpnlPercent - ' - Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 331) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 37) - Me.ucrpnlPercent.TabIndex = 43 - ' 'ucrReceiverPercentages ' Me.ucrReceiverPercentages.AutoSize = True @@ -436,6 +404,15 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing ' + 'ucrpnlPercent + ' + Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 331) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrpnlPercent.Name = "ucrpnlPercent" + Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 37) + Me.ucrpnlPercent.TabIndex = 43 + ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True @@ -462,19 +439,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing ' - 'ucrReceiverThreeVariableThirdVariable - ' - Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True - Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 306) - Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" - Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" - Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 - Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing - ' 'ucrReceiverFirstVars ' Me.ucrReceiverFirstVars.AutoSize = True @@ -497,6 +461,29 @@ Partial Class dlgDescribeTwoVariable Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Nothing + Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True @@ -580,7 +567,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkSummariesRowCol.AutoSize = True Me.ucrChkSummariesRowCol.Checked = False - Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(22, 506) + Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(23, 507) Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSummariesRowCol.Name = "ucrChkSummariesRowCol" Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) @@ -646,12 +633,28 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 ' + 'ucrReceiverThreeVariableThirdVariable + ' + Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True + Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 313) + Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" + Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" + Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 + Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing + ' 'dlgDescribeTwoVariable ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ClientSize = New System.Drawing.Size(723, 748) + Me.Controls.Add(Me.cmdSummaries) + Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) + Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) Me.Controls.Add(Me.rdoORow) Me.Controls.Add(Me.rdoOCell) @@ -663,7 +666,6 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrSaveTable) Me.Controls.Add(Me.grpDisplay) Me.Controls.Add(Me.ucrInputMarginName) - Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReorderSummary) Me.Controls.Add(Me.lblMarginName) Me.Controls.Add(Me.cmdFormatTable) @@ -677,12 +679,10 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.rdoSkim) Me.Controls.Add(Me.ucrPnlDescribe) Me.Controls.Add(Me.ucrReceiverSkimrGroupByFactor) - Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.lblSecondGroupByFactor) Me.Controls.Add(Me.lbSecondVariable) Me.Controls.Add(Me.lblFirstGroupByFactor) Me.Controls.Add(Me.lblThreeVariableSecondFactor) - Me.Controls.Add(Me.ucrChkSummariesRowCol) Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkDisplayMargins) Me.Controls.Add(Me.ucrChkSwapXYVar) @@ -690,7 +690,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.cmdMissingOptions) - Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) + Me.Controls.Add(Me.ucrChkSummariesRowCol) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 5d42d1e4ae1..074199cca9d 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -174,8 +174,6 @@ Public Class dlgDescribeTwoVariable ucrPnlDescribe.AddParameterValuesCondition(rdoSkim, "checked", "skim") ucrPnlDescribe.AddParameterValuesCondition(rdoThreeVariable, "checked", "three_variable") - rdoThreeVariable.Enabled = False - ucrpnlPercent.AddRadioButton(rdoOCol) ucrpnlPercent.AddRadioButton(rdoORow) ucrpnlPercent.AddRadioButton(rdoOCell) @@ -185,7 +183,7 @@ Public Class dlgDescribeTwoVariable ucrPnlDescribe.AddToLinkedControls({ucrReceiverSkimrGroupByFactor, ucrReceiverSecondSkimrGroupByFactor}, {rdoSkim}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableThirdVariable}, {rdoThreeVariable}, bNewLinkedHideIfParameterMissing:=True) - ucrPnlDescribe.AddToLinkedControls({ucrReceiverSecondTwoVariableFactor, ucrChkSummariesRowCol}, {rdoTwoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDescribe.AddToLinkedControls({ucrReceiverSecondTwoVariableFactor}, {rdoTwoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlDescribe.AddToLinkedControls({ucrReceiverThreeVariableSecondFactor}, {rdoThreeVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrpnlPercent.AddToLinkedControls({ucrReceiverPercentages}, {rdoORow}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -582,6 +580,14 @@ Public Class dlgDescribeTwoVariable Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "numeric" AndAlso strThirdVariableType = "numeric" End Function + Private Function IsFactorByNumericByFactor() As Boolean + Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "numeric" AndAlso strThirdVariableType = "categorical" + End Function + + Private Function IsFactorByFactorByNumeric() As Boolean + Return strFirstVariablesType = "categorical" AndAlso strSecondVariableType = "categorical" AndAlso strThirdVariableType = "numeric" + End Function + Private Sub ucrBaseDescribeTwoVar_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset SetDefaults() SetRCodeForControls(True) @@ -593,6 +599,10 @@ Public Class dlgDescribeTwoVariable If IsFactorByNumeric() Then sdgSummaries.SetRFunction(clsSummariesListFunction, clsSummaryTableFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) End If + ElseIf rdoThreeVariable.Checked Then + If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then + sdgSummaries.SetRFunction(clsSummariesListFunction, clsSummaryTableFunction, clsCombineFunction, ucrSelectorDescribeTwoVar, bResetSubdialog) + End If End If bResetSubdialog = False sdgSummaries.ShowDialog() @@ -626,19 +636,24 @@ Public Class dlgDescribeTwoVariable ucrChkCorrelations.Visible = IsNumericByNumeric() cmdMissingOptions.Visible = ucrChkOmitMissing.Checked - ElseIf rdoThreeVariable.Checked Then - ucrChkOmitMissing.Visible = IsFactorByNumeric() OrElse IsNumericByFactor() - Else - ucrChkOmitMissing.Visible = False - cmdMissingOptions.Visible = False + 'ElseIf rdoThreeVariable.Checked Then + ' ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() + 'Else + ' ucrChkOmitMissing.Visible = False + ' cmdMissingOptions.Visible = False End If If rdoThreeVariable.Checked Then - If IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then + If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then + ucrReorderSummary.Visible = True + cmdSummaries.Visible = True + Else ucrReorderSummary.Visible = False cmdSummaries.Visible = False End If - ucrChkDisplayMargins.Visible = IsFactorByFactorByFactor() - ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByFactor() + 'ucrChkDisplayMargins.Visible = IsFactorByFactorByFactor() + 'ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByFactor() + ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() + ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() End If End Sub @@ -697,16 +712,16 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 450) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) - ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + 'ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Table") - clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", - strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, - strRObjectFormatToAssignTo:=RObjectFormat.Html, - strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, - strObjectName:="last_table") + 'clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + ' strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + ' strRObjectFormatToAssignTo:=RObjectFormat.Html, + ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + ' strObjectName:="last_table") ElseIf IsFactorByFactor() Then ucrSaveTable.Visible = True cmdFormatTable.Visible = True @@ -761,20 +776,20 @@ Public Class dlgDescribeTwoVariable End If ElseIf rdoThreeVariable.Checked Then clsDummyFunction.AddParameter("checked", "three_variable", iPosition:=0) - ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) - ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) - ucrSaveTable.SetCheckBoxText("Save Table") + If IsFactorByFactorByFactor() Then cmdFormatTable.Visible = True - + ucrSaveTable.SetPrefix("frequency_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Store Table") ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, strRObjectFormatToAssignTo:=RObjectFormat.Html, strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, strObjectName:="last_table") - End If - If IsFactorByNumericByNumeric() Then + ElseIf IsFactorByNumericByNumeric() Then cmdFormatTable.Visible = False ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator4) clsGroupByPipeOperator4.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", @@ -782,22 +797,50 @@ Public Class dlgDescribeTwoVariable strRObjectFormatToAssignTo:=RObjectFormat.Html, strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, strObjectName:="last_table") - End If - If IsNumericByNumericByFactor() Then + ElseIf IsNumericByNumericByFactor() Then ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) cmdFormatTable.Visible = False - End If - If IsNumericByNumericByNumeric() Then + ElseIf IsNumericByNumericByNumeric() Then cmdFormatTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) - End If - If IsNumericByFactorByFactor() Then + ElseIf IsNumericByFactorByFactor() Then cmdFormatTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) - End If - If IsNumericByFactorByNumeric() Then + ElseIf IsNumericByFactorByNumeric() Then cmdFormatTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + ElseIf IsFactorByNumericByFactor Then + ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Save Table") + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") + ucrReorderSummary.Visible = True + cmdSummaries.Visible = True + ucrSaveTable.Visible = True + ucrChkSummariesRowCol.Visible = True + ucrSaveTable.Location = New Point(23, 450) + ElseIf IsFactorByFactorByNumeric Then + ucrReorderSummary.Visible = True + cmdSummaries.Visible = True + ucrSaveTable.Visible = True + ucrChkSummariesRowCol.Visible = True + ucrSaveTable.Location = New Point(23, 450) + ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + ucrSaveTable.SetPrefix("summary_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Save Table") + clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") End If ucrSaveTable.SetCheckBoxText("Store Table") End If @@ -912,8 +955,8 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = True cmdFormatTable.Location = New Point(326, 350) Else - ucrBase.Location = New Point(iUcrBaseXLocation, 385) - Me.Size = New Point(iDialogueXsize, 480) + ucrBase.Location = New Point(iUcrBaseXLocation, 470) + Me.Size = New Point(iDialogueXsize, 570) End If Else ucrBase.Location = New Point(iUcrBaseXLocation, 328) @@ -990,6 +1033,16 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.AddParameter("factors", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34)) clsPivotWiderFunction.AddParameter("names_from", ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text, iPosition:=0) + ElseIf IsFactorByFactorByNumeric Then + clsMapSummaryFunction.AddParameter(".x", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") + clsSummaryTableFunction.AddParameter("factors", ".x") + clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) + SummariesInRowsOrCols() + ElseIf IsFactorByNumericByFactor() Then + clsMapSummaryFunction.AddParameter(".x", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") + clsSummaryTableFunction.AddParameter("factors", ".x") + clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) + SummariesInRowsOrCols() Else clsPivotWiderFunction.AddParameter("names_from", Chr(39) & "summary-variable" & Chr(39), iPosition:=0) clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverFirstVars.GetVariableNames) @@ -1216,7 +1269,7 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) End If ElseIf rdoThreeVariable.Checked Then - If IsFactorByNumeric() Then + If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) ElseIf IsFactorByFactor() Then clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) @@ -1239,6 +1292,7 @@ Public Class dlgDescribeTwoVariable AddRemoveSecondAnovaParam() AddRemoveThirdAnovaParam() AddRemoveFirstAnova2Param() + FactorColumns() End Sub Private Sub ChangeSumaryLabelText() @@ -1418,6 +1472,7 @@ Public Class dlgDescribeTwoVariable AddRemoveSecondCorrParam() AddRemoveSecondAnovaParam() AddRemoveFirstAnova2Param() + FactorColumns() End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, @@ -1541,6 +1596,7 @@ Public Class dlgDescribeTwoVariable Private Sub ucrChkSummariesRowCol_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSummariesRowCol.ControlValueChanged ManageControlsVisibility() SummariesInRowsOrCols() + ChangeBaseRCode() End Sub Private Sub ucrChkCorrelations_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCorrelations.ControlValueChanged From 0e676ad7c477b3f98812fe016f28dca6d1053b94 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 16 Jul 2024 15:50:26 +0100 Subject: [PATCH 073/273] Change made --- instat/dlgClimograph.vb | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index c8773243d01..b0d06427bb9 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -653,7 +653,7 @@ Public Class dlgClimograph End Sub Private Sub SetRCodeForControls(bReset) - ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ' ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) ucrReceiverRainC.SetRCode(clsMaxFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) @@ -676,7 +676,6 @@ Public Class dlgClimograph ucrPnlColour.SetRCode(clsDummyFunction, bReset) ucrChkColour.SetRCode(clsBaseOperator, bReset) End If - End Sub Private Sub TestOKEnabled() @@ -699,6 +698,7 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName("geom_bar") ucrReceiverMonth.SetMeAsReceiver() + clsGgwalterliethFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) End If AutoFacetStation() @@ -725,7 +725,7 @@ Public Class dlgClimograph Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, - dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorClimograph, clsNewThemeFunction:=clsThemeFunction, + dctNewThemeFunctions:=dctThemeFunctions, ucrNewBaseSelector:=ucrSelectorClimograph, clsNewThemeFunction:=clsThemeFunction, clsNewGlobalAesFunction:=clsBarAesFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.ShowDialog() @@ -743,9 +743,9 @@ Public Class dlgClimograph bResetSubdialog = False End Sub - Private Sub openSdgLayerOptions(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) + Private Sub openSdgLayerOptions(clsNewGeomFunc As RFunction) sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, - clsNewGlobalAesFunc:=clsNewAesFunction, clsNewLocalAes:=clsLocalRaesFunction, + clsNewGlobalAesFunc:=clsBarAesFunction, clsNewLocalAes:=clsLocalRaesFunction, bFixGeom:=True, ucrNewBaseSelector:=ucrSelectorClimograph, bApplyAesGlobally:=True, bReset:=bResetLineLayerSubdialog) sdgLayerOptions.ShowDialog() @@ -754,7 +754,7 @@ Public Class dlgClimograph ' One then needs to display these modifications on the dlgScatteredPlot. 'The aesthetics parameters on the main dialog are repopulated as required. - For Each clsParam In clsNewAesFunction.clsParameters + For Each clsParam In clsBarAesFunction.clsParameters If clsParam.strArgumentName = "x" Then If clsParam.strArgumentValue = Chr(34) & Chr(34) Then ucrReceiverMonthC.Clear() @@ -1073,6 +1073,7 @@ Public Class dlgClimograph SetPipeAssignTo() SetPipeAssignTo1() AddRemoveGeomRibbon() + Dataframechange() End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -1403,8 +1404,17 @@ Public Class dlgClimograph Private Sub ucrSelectorClimograph_DataFrameChanged() Handles ucrSelectorClimograph.DataFrameChanged clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) AddRemoveGeomRibbon() + Dataframechange() End Sub + Private Sub Dataframechange() + If rdoWalterLieth.Checked Then + clsGgwalterliethFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + Else + clsBaseOperator.RemoveParameterByName("ggwalter_lieth") + End If + + End Sub Private Sub toolStripMenuItemLayersOptionsOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemLayersOptionsOptions.Click sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, @@ -1417,12 +1427,10 @@ Public Class dlgClimograph sdgPlots.tbpPlotsOptions.SelectedIndex = 0 sdgPlots.EnableLayersTab() bResetSubdialog = False - AddRemoveGeomLines() - AddRemoveGeomLine1() End Sub Private Sub toolStripMenuItemBarchartOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemBarchartOptions.Click - openSdgLayerOptions(clsGeomBarFunction, clsBarAesFunction) + openSdgLayerOptions(clsGeomBarFunction) End Sub Private Sub ucrChkText_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkText.ControlValueChanged From 01fe3fbe2826d3571e88e2cc8bc69a225351ec2f Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 17 Jul 2024 10:45:22 +0300 Subject: [PATCH 074/273] changes to the code --- instat/dlgDescribeTwoVariable.vb | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 074199cca9d..dc6cf376db6 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -779,6 +779,8 @@ Public Class dlgDescribeTwoVariable If IsFactorByFactorByFactor() Then cmdFormatTable.Visible = True + ucrSaveTable.Location = New Point(23, 341) + ucrSaveTable.Visible = True ucrSaveTable.SetPrefix("frequency_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") @@ -791,23 +793,23 @@ Public Class dlgDescribeTwoVariable strObjectName:="last_table") ElseIf IsFactorByNumericByNumeric() Then cmdFormatTable.Visible = False + ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator4) - clsGroupByPipeOperator4.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", - strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, - strRObjectFormatToAssignTo:=RObjectFormat.Html, - strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, - strObjectName:="last_table") ElseIf IsNumericByNumericByFactor() Then ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) cmdFormatTable.Visible = False + ucrSaveTable.Visible = False ElseIf IsNumericByNumericByNumeric() Then cmdFormatTable.Visible = False + ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByFactor() Then cmdFormatTable.Visible = False + ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsNumericByFactorByNumeric() Then cmdFormatTable.Visible = False + ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ElseIf IsFactorByNumericByFactor Then ucrSaveTable.SetPrefix("summary_table") @@ -824,13 +826,13 @@ Public Class dlgDescribeTwoVariable cmdSummaries.Visible = True ucrSaveTable.Visible = True ucrChkSummariesRowCol.Visible = True - ucrSaveTable.Location = New Point(23, 450) + ucrSaveTable.Location = New Point(23, 440) ElseIf IsFactorByFactorByNumeric Then ucrReorderSummary.Visible = True cmdSummaries.Visible = True ucrSaveTable.Visible = True ucrChkSummariesRowCol.Visible = True - ucrSaveTable.Location = New Point(23, 450) + ucrSaveTable.Location = New Point(23, 440) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) @@ -842,7 +844,6 @@ Public Class dlgDescribeTwoVariable strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, strObjectName:="last_table") End If - ucrSaveTable.SetCheckBoxText("Store Table") End If FactorColumns() End Sub @@ -954,9 +955,12 @@ Public Class dlgDescribeTwoVariable Me.Size = New Point(iDialogueXsize, 465) cmdFormatTable.Visible = True cmdFormatTable.Location = New Point(326, 350) - Else + ElseIf IsFactorByFactorByNumeric OrElse IsFactorByNumericByFactor Then ucrBase.Location = New Point(iUcrBaseXLocation, 470) Me.Size = New Point(iDialogueXsize, 570) + Else + ucrBase.Location = New Point(iUcrBaseXLocation, 328) + Me.Size = New Point(iDialogueXsize, 425) End If Else ucrBase.Location = New Point(iUcrBaseXLocation, 328) @@ -1331,8 +1335,12 @@ Public Class dlgDescribeTwoVariable strSummaryName = "ANOVA tables" ElseIf IsFactorByFactorByFactor() Then strSummaryName = "Frequency tables" - Else + ElseIf IsFactorByNumericByFactor Then strSummaryName = "Summary tables" + ElseIf IsFactorByFactorByNumeric Then + strSummaryName = "Summary tables" + Else + strSummaryName = "" End If End If If strSummaryName <> "" Then @@ -1473,6 +1481,8 @@ Public Class dlgDescribeTwoVariable AddRemoveSecondAnovaParam() AddRemoveFirstAnova2Param() FactorColumns() + ChangeLocations() + ChangeSumaryLabelText() End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, From 107bcca8c155e6bfc98b85db0afe078ba4ad7197 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 17 Jul 2024 11:07:09 +0300 Subject: [PATCH 075/273] changes --- instat/dlgDescribeTwoVariable.vb | 38 +++++++++++++++++--------------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index dc6cf376db6..07319609ac4 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -811,7 +811,7 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = False ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) - ElseIf IsFactorByNumericByFactor Then + ElseIf IsFactorByNumericByFactor OrElse IsFactorByFactorByNumeric Then ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") @@ -827,22 +827,22 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = True ucrChkSummariesRowCol.Visible = True ucrSaveTable.Location = New Point(23, 440) - ElseIf IsFactorByFactorByNumeric Then - ucrReorderSummary.Visible = True - cmdSummaries.Visible = True - ucrSaveTable.Visible = True - ucrChkSummariesRowCol.Visible = True - ucrSaveTable.Location = New Point(23, 440) - ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) - ucrSaveTable.SetPrefix("summary_table") - ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) - ucrSaveTable.SetAssignToIfUncheckedValue("last_table") - ucrSaveTable.SetCheckBoxText("Save Table") - clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", - strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, - strRObjectFormatToAssignTo:=RObjectFormat.Html, - strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, - strObjectName:="last_table") + 'ElseIf IsFactorByFactorByNumeric Then + ' ucrReorderSummary.Visible = True + ' cmdSummaries.Visible = True + ' ucrSaveTable.Visible = True + ' ucrChkSummariesRowCol.Visible = True + ' ucrSaveTable.Location = New Point(23, 440) + ' ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) + ' ucrSaveTable.SetPrefix("summary_table") + ' ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ' ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ' ucrSaveTable.SetCheckBoxText("Save Table") + ' clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + ' strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + ' strRObjectFormatToAssignTo:=RObjectFormat.Html, + ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + ' strObjectName:="last_table") End If End If FactorColumns() @@ -1256,6 +1256,7 @@ Public Class dlgDescribeTwoVariable FactorColumns() AddRemoveFrequencyParameters() AddingColumnFactor() + ChangeBaseRCode() End Sub Private Sub ucrSelectorDescribeTwoVar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDescribeTwoVar.ControlValueChanged @@ -1275,7 +1276,7 @@ Public Class dlgDescribeTwoVariable ElseIf rdoThreeVariable.Checked Then If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) - ElseIf IsFactorByFactor() Then + ElseIf IsFactorByFactorByFactor Then clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) End If End If @@ -1483,6 +1484,7 @@ Public Class dlgDescribeTwoVariable FactorColumns() ChangeLocations() ChangeSumaryLabelText() + ChangeBaseRCode() End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, From 41e4b5e1fd40bb5c822ec2984d63e14ed8191a84 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 17 Jul 2024 16:14:07 +0300 Subject: [PATCH 076/273] changes --- instat/dlgDescribeTwoVariable.vb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 07319609ac4..9bc98127d8a 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -351,19 +351,20 @@ Public Class dlgDescribeTwoVariable clsGroupByFunction.SetPackageName("dplyr") clsGroupByFunction.SetRCommand("group_by") - clsGroupByPipeOperator2.SetOperation("%>%") + clsGroupByPipeOperator2.SetOperation("%>%", bBracketsTemp:=False) clsGroupByPipeOperator2.AddParameter("left", clsROperatorParameter:=clsGroupByPipeOperatorData, iPosition:=0) clsGroupByPipeOperator2.AddParameter("right", clsRFunctionParameter:=clsGroupByFunction, iPosition:=1) - clsGroupByPipeOperator3.SetOperation("%>%") + clsGroupByPipeOperator3.SetOperation("%>%", bBracketsTemp:=False) clsGroupByPipeOperator3.AddParameter("left", clsROperatorParameter:=clsGroupByPipeOperator2, iPosition:=0) clsGroupByPipeOperator3.AddParameter("right", clsRFunctionParameter:=clsSummariseFunction, iPosition:=1) - clsGroupByPipeOperator4.SetOperation("%>%") + clsGroupByPipeOperator4.SetOperation("%>%", bBracketsTemp:=False) clsGroupByPipeOperator4.AddParameter("left", clsROperatorParameter:=clsGroupByPipeOperator3, iPosition:=0) clsGroupByPipeOperator4.AddParameter("right", clsRFunctionParameter:=clsgtFunction, iPosition:=1) clsGroupByPipeOperatorData.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + clsGroupByPipeOperatorData.bBrackets = False clsSummariseFunction.SetRCommand("summarise") clsSummariseFunction.AddParameter("cor", clsRFunctionParameter:=clsCorrFunction, bIncludeArgumentName:=False, iPosition:=0) @@ -795,6 +796,11 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = False ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator4) + clsGroupByPipeOperator4.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, + strObjectName:="last_table") ElseIf IsNumericByNumericByFactor() Then ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) cmdFormatTable.Visible = False @@ -982,7 +988,11 @@ Public Class dlgDescribeTwoVariable If ucrReceiverFirstVars.IsEmpty Then clsGroupByFunction.RemoveParameterByName("var") Else - clsGroupByFunction.AddParameter("var", ucrReceiverFirstVars.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + Dim lstControlVars As List(Of String) = ucrReceiverFirstVars.GetVariableNamesAsList() + Dim strControlVar As String = String.Join(",", lstControlVars) + + clsGroupByFunction.AddParameter("var", strControlVar, iPosition:=1, bIncludeArgumentName:=False) + End If End If End If From 4f42e533f7310762280830e8f5ebf46885507d48 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 17 Jul 2024 17:24:05 +0300 Subject: [PATCH 077/273] changes to the code --- instat/dlgDescribeTwoVariable.vb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 9bc98127d8a..433cd4fbd5a 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -503,6 +503,7 @@ Public Class dlgDescribeTwoVariable ucrSelectorDescribeTwoVar.AddAdditionalCodeParameterPair(clsSummaryTableFunction, ucrSelectorDescribeTwoVar.GetParameter(), iAdditionalPairNo:=1) ucrSaveTable.AddAdditionalRCode(clsJoiningPipeOperator, iAdditionalPairNo:=1) + ucrSaveTable.AddAdditionalRCode(clsGroupByPipeOperator4, iAdditionalPairNo:=2) ucrChkOmitMissing.SetRCode(clsSummaryTableFunction, bReset) ucrReceiverFirstVars.SetRCode(clsDummyFunction, bReset) @@ -794,7 +795,12 @@ Public Class dlgDescribeTwoVariable strObjectName:="last_table") ElseIf IsFactorByNumericByNumeric() Then cmdFormatTable.Visible = False - ucrSaveTable.Visible = False + ucrSaveTable.Visible = True + ucrSaveTable.Location = New Point(23, 300) + ucrSaveTable.SetPrefix("cor_table") + ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) + ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + ucrSaveTable.SetCheckBoxText("Store Cor") ucrBase.clsRsyntax.SetBaseROperator(clsGroupByPipeOperator4) clsGroupByPipeOperator4.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, @@ -967,6 +973,7 @@ Public Class dlgDescribeTwoVariable Else ucrBase.Location = New Point(iUcrBaseXLocation, 328) Me.Size = New Point(iDialogueXsize, 425) + End If Else ucrBase.Location = New Point(iUcrBaseXLocation, 328) From 6191143ba5e82667d9d8701186e48d665be73056 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 18 Jul 2024 11:09:24 +0100 Subject: [PATCH 078/273] change made --- instat/dlgClimograph.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index b0d06427bb9..706dc3f4e23 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -1268,6 +1268,7 @@ Public Class dlgClimograph clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) Else + clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) End If Else From a18448cd83f42451879e7b8e1d8b876460f46633 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 18 Jul 2024 14:24:02 +0300 Subject: [PATCH 079/273] changes to the code --- instat/dlgDescribeTwoVariable.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 433cd4fbd5a..3a9f8157a09 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -1051,16 +1051,16 @@ Public Class dlgDescribeTwoVariable If rdoThreeVariable.Checked Then clsSummaryOperator.AddParameter("col_factor", clsRFunctionParameter:=clsPivotWiderFunction, iPosition:=1) If IsFactorByFactorByFactor() Then - clsSummaryTableFunction.AddParameter("factors", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") - clsSummaryTableFunction.AddParameter("columns_to_summarise", Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34)) - clsPivotWiderFunction.AddParameter("names_from", ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text, iPosition:=0) + clsSummaryTableFunction.AddParameter("factors", "c(" & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & "," & ".x" & ")") + clsSummaryTableFunction.AddParameter("columns_to_summarise", ".x") + clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) ElseIf IsFactorByFactorByNumeric Then - clsMapSummaryFunction.AddParameter(".x", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames & ")") + clsMapSummaryFunction.AddParameter(".x", "c(" & ucrReceiverFirstVars.GetVariableNames.Replace("c(", "").Replace(")", "") & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames.Replace("c(", "").Replace(")", "") & ")") clsSummaryTableFunction.AddParameter("factors", ".x") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) SummariesInRowsOrCols() ElseIf IsFactorByNumericByFactor() Then - clsMapSummaryFunction.AddParameter(".x", "c(" & Chr(34) & ucrReceiverFirstVars.lstSelectedVariables.Items(0).Text & Chr(34) & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")") + clsMapSummaryFunction.AddParameter(".x", "c(" & ucrReceiverFirstVars.GetVariableNames.Replace("c(", "").Replace(")", "") & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames.Replace("c(", "").Replace(")", "") & ")") clsSummaryTableFunction.AddParameter("factors", ".x") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableSecondFactor.GetVariableNames) SummariesInRowsOrCols() From bbfb8a441c310001529d3950a72b5ce69fe101b0 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 19 Jul 2024 11:16:01 +0100 Subject: [PATCH 080/273] Change made --- instat/dlgLinePlot.vb | 6 +++++- instat/ucrGeom.vb | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 5b4b60f649c..68609714cc8 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -881,7 +881,11 @@ Public Class dlgLinePlot End Sub Private Sub LineOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LineOptionsToolStripMenuItem.Click - openSdgLayerOptions(clsGeomLineFunction) + If rdoLine.Checked Then + openSdgLayerOptions(clsGeomLineFunction) + Else + openSdgLayerOptions(clsGeomLineFunc) + End If End Sub Private Sub SmoothOptionsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles SmoothOptionsToolStripMenuItem.Click diff --git a/instat/ucrGeom.vb b/instat/ucrGeom.vb index 4728c91cea1..14e65e832f2 100644 --- a/instat/ucrGeom.vb +++ b/instat/ucrGeom.vb @@ -1372,7 +1372,7 @@ Public Class ucrGeom clsgeom_line.SetGeomName("geom_line") 'x and y are mandatory, but these are autofilled by "" when no variable is mapped. "Partially mandatory" - clsgeom_line.AddAesParameter("x", strIncludedDataTypes:={"factor", "numeric"}) + clsgeom_line.AddAesParameter("x", strIncludedDataTypes:={"factor", "numeric", "Date"}) clsgeom_line.AddAesParameter("y", strIncludedDataTypes:={"factor", "numeric"}) 'Optional clsgeom_line.AddAesParameter("alpha", strIncludedDataTypes:={"numeric", "factor"}) From 8be67f429e0662032d7024449d1e32b4ab0145b9 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 23 Jul 2024 17:16:39 +0100 Subject: [PATCH 081/273] Change made --- instat/dlgClimograph.Designer.vb | 38 ++++--- instat/dlgClimograph.vb | 183 +++++++++++++++++++++++++++++-- 2 files changed, 198 insertions(+), 23 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index 4c5558fc080..e4f9a752db7 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -45,6 +45,7 @@ Partial Class dlgClimograph Me.toolStripMenuItemTmaxLineOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTminLineOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemLayersOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.ucrChkBar = New instat.ucrCheck() Me.cmdOptions = New instat.ucrSplitButton() Me.ucrInputPalette = New instat.ucrInputComboBox() Me.ucrPnlColour = New instat.UcrPanel() @@ -220,7 +221,7 @@ Partial Class dlgClimograph ' Me.rdoViridis.AutoSize = True Me.rdoViridis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoViridis.Location = New System.Drawing.Point(14, 379) + Me.rdoViridis.Location = New System.Drawing.Point(14, 410) Me.rdoViridis.Name = "rdoViridis" Me.rdoViridis.Size = New System.Drawing.Size(52, 17) Me.rdoViridis.TabIndex = 123 @@ -232,7 +233,7 @@ Partial Class dlgClimograph ' Me.rdoPalette.AutoSize = True Me.rdoPalette.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPalette.Location = New System.Drawing.Point(14, 405) + Me.rdoPalette.Location = New System.Drawing.Point(14, 436) Me.rdoPalette.Name = "rdoPalette" Me.rdoPalette.Size = New System.Drawing.Size(58, 17) Me.rdoPalette.TabIndex = 121 @@ -244,7 +245,7 @@ Partial Class dlgClimograph ' Me.rdoSinglecolour.AutoSize = True Me.rdoSinglecolour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSinglecolour.Location = New System.Drawing.Point(14, 430) + Me.rdoSinglecolour.Location = New System.Drawing.Point(14, 461) Me.rdoSinglecolour.Name = "rdoSinglecolour" Me.rdoSinglecolour.Size = New System.Drawing.Size(87, 17) Me.rdoSinglecolour.TabIndex = 124 @@ -256,7 +257,7 @@ Partial Class dlgClimograph ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTmaxLineOptions, Me.toolStripMenuItemTminLineOptions, Me.toolStripMenuItemLayersOptionsOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 136) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 114) ' 'toolStripMenuItemPlotOptions ' @@ -288,6 +289,15 @@ Partial Class dlgClimograph Me.toolStripMenuItemLayersOptionsOptions.Size = New System.Drawing.Size(180, 22) Me.toolStripMenuItemLayersOptionsOptions.Text = "Layers Options" ' + 'ucrChkBar + ' + Me.ucrChkBar.AutoSize = True + Me.ucrChkBar.Checked = False + Me.ucrChkBar.Location = New System.Drawing.Point(14, 353) + Me.ucrChkBar.Name = "ucrChkBar" + Me.ucrChkBar.Size = New System.Drawing.Size(214, 24) + Me.ucrChkBar.TabIndex = 127 + ' 'cmdOptions ' Me.cmdOptions.AutoSize = True @@ -307,7 +317,7 @@ Partial Class dlgClimograph Me.ucrInputPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPalette.GetSetSelectedIndex = -1 Me.ucrInputPalette.IsReadOnly = False - Me.ucrInputPalette.Location = New System.Drawing.Point(136, 404) + Me.ucrInputPalette.Location = New System.Drawing.Point(136, 435) Me.ucrInputPalette.Name = "ucrInputPalette" Me.ucrInputPalette.Size = New System.Drawing.Size(63, 21) Me.ucrInputPalette.TabIndex = 122 @@ -315,7 +325,7 @@ Partial Class dlgClimograph 'ucrPnlColour ' Me.ucrPnlColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlColour.Location = New System.Drawing.Point(11, 376) + Me.ucrPnlColour.Location = New System.Drawing.Point(11, 407) Me.ucrPnlColour.Name = "ucrPnlColour" Me.ucrPnlColour.Size = New System.Drawing.Size(92, 77) Me.ucrPnlColour.TabIndex = 120 @@ -326,7 +336,7 @@ Partial Class dlgClimograph Me.ucrInputColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputColourPalette.GetSetSelectedIndex = -1 Me.ucrInputColourPalette.IsReadOnly = False - Me.ucrInputColourPalette.Location = New System.Drawing.Point(136, 377) + Me.ucrInputColourPalette.Location = New System.Drawing.Point(136, 408) Me.ucrInputColourPalette.Name = "ucrInputColourPalette" Me.ucrInputColourPalette.Size = New System.Drawing.Size(63, 21) Me.ucrInputColourPalette.TabIndex = 119 @@ -335,7 +345,7 @@ Partial Class dlgClimograph ' Me.ucrChkColour.AutoSize = True Me.ucrChkColour.Checked = False - Me.ucrChkColour.Location = New System.Drawing.Point(14, 355) + Me.ucrChkColour.Location = New System.Drawing.Point(14, 386) Me.ucrChkColour.Name = "ucrChkColour" Me.ucrChkColour.Size = New System.Drawing.Size(198, 24) Me.ucrChkColour.TabIndex = 107 @@ -373,7 +383,7 @@ Partial Class dlgClimograph Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(115, 458) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(115, 489) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) Me.ucrInputLegendPosition.TabIndex = 97 @@ -382,7 +392,7 @@ Partial Class dlgClimograph ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(14, 459) + Me.ucrChkLegend.Location = New System.Drawing.Point(14, 490) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 96 @@ -551,7 +561,7 @@ Partial Class dlgClimograph ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 517) + Me.ucrBase.Location = New System.Drawing.Point(12, 548) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 75 @@ -559,7 +569,7 @@ Partial Class dlgClimograph 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(14, 490) + Me.ucrSave.Location = New System.Drawing.Point(14, 521) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -594,7 +604,8 @@ Partial Class dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(472, 568) + Me.ClientSize = New System.Drawing.Size(472, 608) + Me.Controls.Add(Me.ucrChkBar) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.rdoSinglecolour) Me.Controls.Add(Me.rdoViridis) @@ -699,4 +710,5 @@ Partial Class dlgClimograph Friend WithEvents toolStripMenuItemTminLineOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemLayersOptionsOptions As ToolStripMenuItem Friend WithEvents cmdOptions As ucrSplitButton + Friend WithEvents ucrChkBar As ucrCheck End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 706dc3f4e23..466023ed7fa 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -78,6 +78,10 @@ Public Class dlgClimograph Private clsGeomTextTmaxStarFunction As New RFunction Private clsGeomTextTminStarFunction As New RFunction Private clsRoundBarFunction As New RFunction + Private clsGeomBarTmaxFunction As New RFunction + Private clsAesTmaxBarFunction As New RFunction + Private clsAesTminBarFunction As New RFunction + Private clsGeomBarTminFunction As New RFunction Private clsRoundTmaxFunction As New RFunction Private clsRoundTminFunction As New RFunction Private clsAesGeomTextBarFunction As New RFunction @@ -106,7 +110,7 @@ Public Class dlgClimograph Private bUpdatingParameters As Boolean = False Private bUpdateComboOptions1 As Boolean = True Private bUpdatingParameters1 As Boolean = False - Private strScale As String = "Scale_Factor" + Private strScale As String = "scale_Factor" Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -270,6 +274,10 @@ Public Class dlgClimograph ucrChkText.AddParameterValuesCondition(True, "checked", "True") ucrChkText.AddParameterValuesCondition(False, "checked", "False") + ucrChkBar.SetText("Add Bars For Temperature") + ucrChkBar.AddParameterValuesCondition(True, "checked", "True") + ucrChkBar.AddParameterValuesCondition(False, "checked", "False") + ucrInputPalette.SetParameter(New RParameter("palette", 10)) ucrInputPalette.SetDropDownStyleAsNonEditable() dctPalette.Add("Blues", Chr(34) & "Blues" & Chr(34)) @@ -396,6 +404,10 @@ Public Class dlgClimograph clsColourPaletteFunction = New RFunction clsScalefillDistillerFunction = New RFunction clsFillBrewerFunction = New RFunction + clsGeomBarTminFunction = New RFunction + clsGeomBarTmaxFunction = New RFunction + clsAesTmaxBarFunction = New RFunction + clsAesTminBarFunction = New RFunction ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) @@ -461,6 +473,18 @@ Public Class dlgClimograph clsGeomBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) clsGeomBarFunction.AddParameter("alpha", "0.5", iPosition:=2) + clsGeomBarTmaxFunction.SetRCommand("geom_bar") + clsGeomBarTmaxFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomBarTmaxFunction.AddParameter("fill", "red", iPosition:=2) + + clsAesTmaxBarFunction.SetRCommand("aes") + + clsGeomBarTminFunction.SetRCommand("geom_bar") + clsGeomBarTminFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsGeomBarTminFunction.AddParameter("fill", "blue", iPosition:=2) + + clsAesTminBarFunction.SetRCommand("aes") + clsGeomLineFunction.SetRCommand("geom_line") clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) clsGeomLineFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) @@ -675,6 +699,7 @@ Public Class dlgClimograph ucrChkText.SetRCode(clsBaseOperator, bReset) ucrPnlColour.SetRCode(clsDummyFunction, bReset) ucrChkColour.SetRCode(clsBaseOperator, bReset) + ucrChkBar.SetRCode(clsBaseOperator, bReset) End If End Sub @@ -1331,15 +1356,15 @@ Public Class dlgClimograph End If Else clsBarAesFunction.RemoveParameterByName("y") - clsBaseOperator.RemoveParameterByName("geom_tile") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("labs") - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - End If - Else clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_tile") clsBaseOperator.RemoveParameterByName("geom_bar") clsBaseOperator.RemoveParameterByName("labs") clsBaseOperator.RemoveParameterByName("palette") @@ -1425,9 +1450,9 @@ Public Class dlgClimograph clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) sdgPlots.tbpPlotsOptions.SelectedIndex = 1 sdgPlots.ShowDialog() - sdgPlots.tbpPlotsOptions.SelectedIndex = 0 sdgPlots.EnableLayersTab() bResetSubdialog = False + AddRemoveSecondaryAxis() End Sub Private Sub toolStripMenuItemBarchartOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemBarchartOptions.Click @@ -1440,6 +1465,144 @@ Public Class dlgClimograph AddRemoveGeomTextTmin() End Sub + Private Sub EnableTemBar() + ucrChkBar.Enabled = Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty + End Sub + + Private Sub AddRemoveTemBars() + If rdoClimograph.Checked Then + If ucrChkBar.Checked Then + If ucrReceiverRainC.IsEmpty Then + clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsGeomBarTmaxFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction, iPosition:=0) + clsGeomBarTminFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsGeomBarTminFunction, iPosition:=2) + Else + Dim strTemBar As String = "Tem" + Dim strRainBar As String = "Rain" + Dim clsPlus1Operator, clsPlus2Operator, clsPlus3Operator, clsPlus4Operator, clsPlus5Operator As New ROperator + Dim clsPlus6Operator, clsPlus7Operator, clsPlus8Operator, clsPlus9Operator As New ROperator + Dim clsRainBarFunction, clsTmaxBarFunction, clsTminBarFunction, clsLabsRainFunction, clsLabsTempFunction As New RFunction + Dim clsRainBarTextFunction, clsTmaxBarTextFunction, clsTminBarTextFunction, clsRainGgplotFunction, clsTemGgplotFunction As New RFunction + Dim clsAesTmaxBarFunction, clsAesTminBarFunction, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction + Dim clsAesRainBarTextFunction, clsAesTmaxBarTextFunction, clsAesTminBarTextFunction, clsRainRoundFunction, clsTmaxRoundFunction, clsTminRoundFunction As New RFunction + + clsPlus1Operator.SetOperation("+") + clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus1Operator.SetAssignTo(strRainBar) + + clsPlus2Operator.SetOperation("+") + clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsPlus3Operator.SetOperation("+") + clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsRainGgplotFunction.SetRCommand("ggplot") + clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsAesRainGgplotFunction.SetRCommand("aes") + clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) + + clsRainBarFunction.SetRCommand("geom_bar") + clsRainBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=0) + clsRainBarFunction.AddParameter("alpha", "0.5", iPosition:=1) + clsRainBarFunction.AddParameter("fill", Chr(34) & "purple" & Chr(34), iPosition:=2) + + clsRainBarTextFunction.SetRCommand("geom_text") + clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) + clsRainBarTextFunction.AddParameter("vjust", "-0.5", iPosition:=1) + clsRainBarTextFunction.AddParameter("size", "3", iPosition:=2) + + clsRainRoundFunction.SetRCommand("round") + clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsRainRoundFunction.AddParameter("y", "1", bIncludeArgumentName:=False) + + clsLabsRainFunction.SetRCommand("scale_y_continuous") + clsLabsRainFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsLabsRainFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecAxisRainFunction, iPosition:=1) + + clsSecAxisRainFunction.SetRCommand("sec.axis") + clsSecAxisRainFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) + clsSecAxisRainFunction.AddParameter("name", Chr(34) & "Rainfall (inches)" & Chr(34), iPosition:=1) + + clsPlus4Operator.SetOperation("+") + clsPlus4Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus4Operator.AddParameter("right", clsROperatorParameter:=clsPlus5Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsPlus5Operator.SetOperation("+") + clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsPlus6Operator.SetOperation("+") + clsPlus6Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsTemGgplotFunction.SetRCommand("ggplot") + clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsAesTemGgplotFunction.SetRCommand("aes") + clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + + clsTmaxBarFunction.SetRCommand("geom_bar") + clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsTmaxBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsTmaxBarFunction.AddParameter("fill", Chr(34) & "red" & Chr(34), iPosition:=2) + + clsAesTmaxBarFunction.SetRCommand("aes") + clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + + clsTminBarFunction.SetRCommand("geom_bar") + clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsTminBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsTminBarFunction.AddParameter("fill", Chr(34) & "red" & Chr(34), iPosition:=2) + + clsAesTminBarFunction.SetRCommand("aes") + clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + + clsPlus7Operator.SetOperation("+") + clsPlus7Operator.AddParameter("left",, iPosition:=0, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("right",, iPosition:=1, bIncludeArgumentName:=False) + + clsPlus8Operator.SetOperation("+") + clsPlus8Operator.AddParameter("left",, iPosition:=0, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("right",, iPosition:=1, bIncludeArgumentName:=False) + + clsPlus9Operator.SetOperation("+") + clsPlus9Operator.AddParameter("left",, iPosition:=0, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("right",, iPosition:=1, bIncludeArgumentName:=False) + + clsTmaxBarFunction.SetRCommand("geom_bar") + clsTminBarFunction.SetRCommand("geom_bar") + clsRainBarTextFunction.SetRCommand("geom_text") + clsTmaxBarTextFunction.SetRCommand("geom_text") + clsTminBarTextFunction.SetRCommand("geom_text") + clsLabsRainFunction.SetRCommand("labs") + clsLabsTempFunction.SetRCommand("labs") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_bar1") + clsBaseOperator.RemoveParameterByName("geom_bar1") + End If + Else + clsBaseOperator.RemoveParameterByName("geom_bar1") + clsBaseOperator.RemoveParameterByName("geom_bar1") + End If + End Sub + + Private Sub ucrChkBar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBar.ControlValueChanged + AddRemoveTemBars() + EnableTemBar() + End Sub + Private Sub ucrSave_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlValueChanged If ucrSave.ucrChkSave.Checked Then clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & ucrSave.GetText & Chr(34), iPosition:=1) From f662591a2359a06d7c2af3c1d19275a9d37f7aed Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 25 Jul 2024 12:01:19 +0300 Subject: [PATCH 082/273] Added stub style functionality --- instat/UserTables/Rows/ucrRowExpression.vb | 31 ++++++++----- instat/UserTables/Stub/ucrStub.vb | 3 +- .../Stub/ucrStubOptions.Designer.vb | 8 ++-- instat/UserTables/Stub/ucrStubOptions.vb | 12 ++---- instat/UserTables/Stub/ucrStubStyle.vb | 21 ++++----- .../sdgTableRowExpression.Designer.vb | 43 ++++++++++--------- instat/UserTables/sdgTableRowExpression.vb | 19 ++++---- 7 files changed, 70 insertions(+), 67 deletions(-) diff --git a/instat/UserTables/Rows/ucrRowExpression.vb b/instat/UserTables/Rows/ucrRowExpression.vb index da82f19a3fe..bfdf183b75f 100644 --- a/instat/UserTables/Rows/ucrRowExpression.vb +++ b/instat/UserTables/Rows/ucrRowExpression.vb @@ -5,15 +5,15 @@ Private Sub UcrInputRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load - If bFirstload Then - initialiseControl() - bFirstload = False - End If + 'If bFirstload Then + ' initialiseControl() + ' bFirstload = False + 'End If End Sub - Private Sub initialiseControl() - ucrInputExpression.SetParameter(New RParameter("rows", 0,)) - End Sub + 'Private Sub initialiseControl() + ' ucrInputExpression.SetParameter(New RParameter("rows", 0,)) + 'End Sub Public Sub setup(strDataFrameName As String) @@ -27,12 +27,21 @@ Private Sub btnSet_Click(sender As Object, e As EventArgs) Handles btnSet.Click sdgTableRowExpression.Setup(strDataFrameName) sdgTableRowExpression.ShowDialog(Me.ParentForm) - ucrInputExpression.SetName(sdgTableRowExpression.GetRowExpression) + ucrInputExpression.SetName(sdgTableRowExpression.GetRowExpression()) End Sub - Public Sub SetValue(strValue As String) - ucrInputExpression.SetName(strValue) - End Sub + 'Public Sub SetValue(strValue As String) + ' ucrInputExpression.SetName(strValue) + 'End Sub + + + Public Function IsEmpty() As Boolean + Return ucrInputExpression.IsEmpty() + End Function + + Public Function GetValue() As String + Return ucrInputExpression.GetText() + End Function End Class diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb index 3135659e71c..2378d97fee5 100644 --- a/instat/UserTables/Stub/ucrStub.vb +++ b/instat/UserTables/Stub/ucrStub.vb @@ -21,6 +21,7 @@ Public Class ucrStub End If ucrStubOptions.Setup(strDataFrameName, clsOperator) + ucrStubStyle.Setup(strDataFrameName, clsOperator) End Sub @@ -34,7 +35,7 @@ Public Class ucrStub Public Sub SetValuesToOperator() ucrStubOptions.SetValuesToOperator() - + ucrStubStyle.SetValuesToOperator() End Sub diff --git a/instat/UserTables/Stub/ucrStubOptions.Designer.vb b/instat/UserTables/Stub/ucrStubOptions.Designer.vb index 415a5ae96f6..7f8eec498f3 100644 --- a/instat/UserTables/Stub/ucrStubOptions.Designer.vb +++ b/instat/UserTables/Stub/ucrStubOptions.Designer.vb @@ -41,7 +41,7 @@ Partial Class ucrStubOptions Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 298 + Me.ucrSelectorCols.TabIndex = 1 ' 'ucrInputStubHead ' @@ -52,7 +52,7 @@ Partial Class ucrStubOptions Me.ucrInputStubHead.Location = New System.Drawing.Point(256, 122) Me.ucrInputStubHead.Name = "ucrInputStubHead" Me.ucrInputStubHead.Size = New System.Drawing.Size(142, 21) - Me.ucrInputStubHead.TabIndex = 297 + Me.ucrInputStubHead.TabIndex = 4 ' 'lblStubHeadLabel ' @@ -84,7 +84,7 @@ Partial Class ucrStubOptions Me.ucrReceiverSingleRowName.Selector = Nothing Me.ucrReceiverSingleRowName.Size = New System.Drawing.Size(142, 20) Me.ucrReceiverSingleRowName.strNcFilePath = "" - Me.ucrReceiverSingleRowName.TabIndex = 294 + Me.ucrReceiverSingleRowName.TabIndex = 2 Me.ucrReceiverSingleRowName.ucrSelector = Nothing ' 'lblGroupByCol @@ -107,7 +107,7 @@ Partial Class ucrStubOptions Me.ucrReceiverSingleGroupByCol.Selector = Nothing Me.ucrReceiverSingleGroupByCol.Size = New System.Drawing.Size(142, 20) Me.ucrReceiverSingleGroupByCol.strNcFilePath = "" - Me.ucrReceiverSingleGroupByCol.TabIndex = 292 + Me.ucrReceiverSingleGroupByCol.TabIndex = 3 Me.ucrReceiverSingleGroupByCol.ucrSelector = Nothing ' 'ucrStubOptions diff --git a/instat/UserTables/Stub/ucrStubOptions.vb b/instat/UserTables/Stub/ucrStubOptions.vb index a247fe29c3b..88d400cc444 100644 --- a/instat/UserTables/Stub/ucrStubOptions.vb +++ b/instat/UserTables/Stub/ucrStubOptions.vb @@ -4,6 +4,8 @@ Private bFirstload As Boolean = True Private Sub initialiseDialog() + + ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) ucrReceiverSingleRowName.SetParameterIsString() ucrReceiverSingleRowName.Selector = ucrSelectorCols @@ -40,24 +42,16 @@ clsStubHeadRFunction.SetRCommand("tab_stubhead") End If - - SetRCode() End Sub Private Sub SetRCode() - ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) ucrReceiverSingleRowName.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) + ucrReceiverSingleGroupByCol.SetRCode(clsGtRFunction, True, bCloneIfNeeded:=True) ucrInputStubHead.SetRCode(clsStubHeadRFunction, True, bCloneIfNeeded:=True) End Sub - Private Sub ucrInputStubHead_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStubHead.ControlValueChanged - 'clsStubHeadRFunction.AddParameter("label", strParameterValue:=clsTablesUtils.GetStringValue(ucrInputStubHead.GetValue(), True)) - - - End Sub - Private Sub btnStyle_Click(sender As Object, e As EventArgs) Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm, clsStubStyleRFunction) If clsListStyleRFunction Is Nothing Then diff --git a/instat/UserTables/Stub/ucrStubStyle.vb b/instat/UserTables/Stub/ucrStubStyle.vb index d98c4c1e3be..63df524732c 100644 --- a/instat/UserTables/Stub/ucrStubStyle.vb +++ b/instat/UserTables/Stub/ucrStubStyle.vb @@ -12,8 +12,6 @@ ucrRowExpression.setup(strDataFrameName) - Dim lstTabStyleForRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator) - ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator)) @@ -34,14 +32,8 @@ dataGridFormats.Rows.Add(row) Next - - 'ucrRowExpression.ucrInputExpression.con End Sub - 'Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrRowExpression.ucrInputExpression.ControlContentsChanged - ' btnEnterStyle.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputRows.IsEmpty - 'End Sub - Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) @@ -51,14 +43,16 @@ Dim clsLocationsRFunction As New RFunction clsLocationsRFunction.SetPackageName("gt") - clsLocationsRFunction.SetRCommand("cells_body") - 'clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) - 'clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrInputRows.GetText, iNewPosition:=1)) + clsLocationsRFunction.SetRCommand("cells_stub") + + If Not ucrRowExpression.IsEmpty Then + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetValue(), iNewPosition:=1)) + End If Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + Dim clsRParam As New RParameter(strParameterName:="tab_style_stub_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) ' Create row and its cells Dim row As New DataGridViewRow @@ -78,8 +72,9 @@ End Sub Public Sub SetValuesToOperator() - clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_body", clsOperator), clsOperator) + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator), clsOperator) clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) End Sub + End Class diff --git a/instat/UserTables/sdgTableRowExpression.Designer.vb b/instat/UserTables/sdgTableRowExpression.Designer.vb index fd5443d5887..39bf2f045ab 100644 --- a/instat/UserTables/sdgTableRowExpression.Designer.vb +++ b/instat/UserTables/sdgTableRowExpression.Designer.vb @@ -27,8 +27,8 @@ Partial Class sdgTableRowExpression Me.lblExpression = New System.Windows.Forms.Label() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() - Me.ucrInputExpression = New instat.ucrInputTextBox() Me.btnAddCondition = New System.Windows.Forms.Button() + Me.ucrReceiverExpression = New instat.ucrReceiverExpression() Me.SuspendLayout() ' 'cboCondition @@ -36,7 +36,7 @@ Partial Class sdgTableRowExpression Me.cboCondition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboCondition.FormattingEnabled = True Me.cboCondition.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) - Me.cboCondition.Location = New System.Drawing.Point(5, 221) + Me.cboCondition.Location = New System.Drawing.Point(240, 25) Me.cboCondition.Name = "cboCondition" Me.cboCondition.Size = New System.Drawing.Size(148, 21) Me.cboCondition.TabIndex = 285 @@ -45,7 +45,7 @@ Partial Class sdgTableRowExpression ' Me.lblCondition.AutoSize = True Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(12, 204) + Me.lblCondition.Location = New System.Drawing.Point(237, 9) Me.lblCondition.Name = "lblCondition" Me.lblCondition.Size = New System.Drawing.Size(54, 13) Me.lblCondition.TabIndex = 284 @@ -55,7 +55,7 @@ Partial Class sdgTableRowExpression ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(237, 95) + Me.lblExpression.Location = New System.Drawing.Point(237, 102) Me.lblExpression.Name = "lblExpression" Me.lblExpression.Size = New System.Drawing.Size(61, 13) Me.lblExpression.TabIndex = 283 @@ -76,39 +76,40 @@ Partial Class sdgTableRowExpression 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(103, 271) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(106, 220) Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) Me.ucrSdgBaseButtons.TabIndex = 344 ' - 'ucrInputExpression - ' - Me.ucrInputExpression.AddQuotesIfUnrecognised = True - Me.ucrInputExpression.AutoSize = True - Me.ucrInputExpression.IsMultiline = False - Me.ucrInputExpression.IsReadOnly = False - Me.ucrInputExpression.Location = New System.Drawing.Point(240, 111) - Me.ucrInputExpression.Name = "ucrInputExpression" - Me.ucrInputExpression.Size = New System.Drawing.Size(177, 23) - Me.ucrInputExpression.TabIndex = 345 - ' 'btnAddCondition ' - Me.btnAddCondition.Location = New System.Drawing.Point(158, 219) + Me.btnAddCondition.Location = New System.Drawing.Point(387, 23) Me.btnAddCondition.Name = "btnAddCondition" - Me.btnAddCondition.Size = New System.Drawing.Size(75, 23) + Me.btnAddCondition.Size = New System.Drawing.Size(65, 23) Me.btnAddCondition.TabIndex = 346 Me.btnAddCondition.Text = "Add" Me.btnAddCondition.UseVisualStyleBackColor = True ' + 'ucrReceiverExpression + ' + Me.ucrReceiverExpression.AutoSize = True + Me.ucrReceiverExpression.frmParent = Me + Me.ucrReceiverExpression.Location = New System.Drawing.Point(240, 118) + Me.ucrReceiverExpression.Name = "ucrReceiverExpression" + Me.ucrReceiverExpression.Selector = Nothing + Me.ucrReceiverExpression.Size = New System.Drawing.Size(177, 29) + Me.ucrReceiverExpression.strNcFilePath = "" + Me.ucrReceiverExpression.TabIndex = 347 + Me.ucrReceiverExpression.ucrSelector = Nothing + ' 'sdgTableRowExpression ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(423, 304) + Me.ClientSize = New System.Drawing.Size(456, 258) + Me.Controls.Add(Me.ucrReceiverExpression) Me.Controls.Add(Me.btnAddCondition) - Me.Controls.Add(Me.ucrInputExpression) Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.cboCondition) Me.Controls.Add(Me.lblCondition) @@ -127,6 +128,6 @@ Partial Class sdgTableRowExpression Friend WithEvents lblExpression As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue - Friend WithEvents ucrInputExpression As ucrInputTextBox Friend WithEvents btnAddCondition As Button + Friend WithEvents ucrReceiverExpression As ucrReceiverExpression End Class diff --git a/instat/UserTables/sdgTableRowExpression.vb b/instat/UserTables/sdgTableRowExpression.vb index 829a340b589..c46c7d71ec0 100644 --- a/instat/UserTables/sdgTableRowExpression.vb +++ b/instat/UserTables/sdgTableRowExpression.vb @@ -1,27 +1,30 @@ Public Class sdgTableRowExpression Private bFirstload As Boolean = True - Private Sub sdgTableRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load - + Private Sub InitialiseControl() + ucrReceiverExpression.Selector = ucrSelectorCols End Sub Public Sub Setup(strDataFrameName As String) If bFirstload Then - 'InitialiseControl() - 'bFirstload = False + InitialiseControl() + bFirstload = False End If - ' Set up the selector ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) - - + ucrReceiverExpression.SetMeAsReceiver() + ucrReceiverExpression.ResetText() End Sub ' TODO. In future this can be refactored to return an RFUnction Public Function GetRowExpression() As String - Return "" + Return ucrReceiverExpression.GetText() End Function + + Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click + ucrReceiverExpression.AddToReceiverAtCursorPosition(cboCondition.Text) + End Sub End Class \ No newline at end of file From b695424a7e6b58719ef8c3c025220365cad43f57 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 25 Jul 2024 14:14:32 +0100 Subject: [PATCH 083/273] Change made --- instat/dlgClimograph.vb | 344 +++++++++++++++++++++++++++------------- 1 file changed, 231 insertions(+), 113 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 466023ed7fa..a37de5004d7 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -54,7 +54,6 @@ Public Class dlgClimograph Private clsYScaleDateFunction As New RFunction Private clsScaleFillViridisFunction As New RFunction Private clsScaleColourViridisFunction As New RFunction - Private clsScalecolouridentityFunction As New RFunction Private clsLabsFunction As New RFunction Private clsLabFunction As New RFunction Private clsXlabFunction As New RFunction @@ -110,6 +109,14 @@ Public Class dlgClimograph Private bUpdatingParameters As Boolean = False Private bUpdateComboOptions1 As Boolean = True Private bUpdatingParameters1 As Boolean = False + Private strTemBar As String = "Tem" + Private strRainBar As String = "Rain" + Private clsPlus1Operator, clsPlus2Operator, clsPlus3Operator, clsPlus5Operator As New ROperator + Private clsPlus6Operator, clsPlus7Operator, clsPlus8Operator, clsPlus9Operator As New ROperator + Private clsRainBarFunction, clsTmaxBarFunction, clsTminBarFunction, clsLabsRainFunction, clsLabsTempFunction As New RFunction + Private clsRainBarTextFunction, clsTmaxBarTextFunction, clsTminBarTextFunction, clsRainGgplotFunction, clsTemGgplotFunction As New RFunction + Private clsAesTmaxBarFunction1, clsAesTminBarFunction1, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction + Private clsAesRainBarTextFunction, clsPlotGridFunction, clsAesTmaxBarTextFunction, clsAesTminBarTextFunction, clsRainRoundFunction, clsTmaxRoundFunction, clsTminRoundFunction As New RFunction Private strScale As String = "scale_Factor" Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -238,7 +245,7 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkColour, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkColour, ucrChkBar, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColour.AddRadioButton(rdoViridis) ucrPnlColour.AddRadioButton(rdoPalette) @@ -367,7 +374,6 @@ Public Class dlgClimograph clsRggplotFunction = New RFunction clsBarAesFunction = New RFunction clsFacetFunction1 = New RFunction - clsScalecolouridentityFunction = New RFunction clsSecondaryAxisFunction = New RFunction clsSecondaryAxis1Function = New RFunction clsSecondaryAxis2Function = New RFunction @@ -408,6 +414,37 @@ Public Class dlgClimograph clsGeomBarTmaxFunction = New RFunction clsAesTmaxBarFunction = New RFunction clsAesTminBarFunction = New RFunction + clsPlus1Operator = New ROperator + clsPlus2Operator = New ROperator + clsPlus3Operator = New ROperator + clsPlus5Operator = New ROperator + clsPlus6Operator = New ROperator + clsPlus7Operator = New ROperator + clsPlus8Operator = New ROperator + clsPlus9Operator = New ROperator + clsRainBarFunction = New RFunction + clsTmaxBarFunction = New RFunction + clsTminBarFunction = New RFunction + clsLabsRainFunction = New RFunction + clsLabsTempFunction = New RFunction + clsRainBarTextFunction = New RFunction + clsTmaxBarTextFunction = New RFunction + clsTminBarTextFunction = New RFunction + clsRainGgplotFunction = New RFunction + clsTemGgplotFunction = New RFunction + clsAesTmaxBarFunction1 = New RFunction + clsAesTminBarFunction1 = New RFunction + clsAesTemGgplotFunction = New RFunction + clsAesRainGgplotFunction = New RFunction + clsSecAxisRainFunction = New RFunction + clsSecAxisTemFunction = New RFunction + clsAesRainBarTextFunction = New RFunction + clsAesTmaxBarTextFunction = New RFunction + clsAesTminBarTextFunction = New RFunction + clsRainRoundFunction = New RFunction + clsTmaxRoundFunction = New RFunction + clsTminRoundFunction = New RFunction + clsPlotGridFunction = New RFunction ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) @@ -526,9 +563,6 @@ Public Class dlgClimograph clsXScalediscreteFunction.SetRCommand("scale_x_discrete") clsXScalediscreteFunction.AddParameter("name", Chr(34) & "Month" & Chr(34), iPosition:=0) - clsScalecolouridentityFunction.SetRCommand("scale_colour_identity") - clsScalecolouridentityFunction.AddParameter("guide", Chr(34) & "legend" & Chr(34), iPosition:=1) - clsGeomRibbonFunction.SetRCommand("geom_ribbon") clsGeomRibbonFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesGeomRibbonFunction, iPosition:=0, bIncludeArgumentName:=False) clsGeomRibbonFunction.AddParameter("fill", Chr(34) & "#000000" & Chr(34), iPosition:=1) @@ -648,6 +682,108 @@ Public Class dlgClimograph clsFillBrewerFunction.SetPackageName("ggplot2") clsFillBrewerFunction.SetRCommand("scale_fill_brewer") + clsPlus1Operator.SetOperation("+") + clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus1Operator.SetAssignTo(strRainBar) + + clsPlus2Operator.SetOperation("+") + clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsPlus3Operator.SetOperation("+") + clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsRainGgplotFunction.SetRCommand("ggplot") + 'clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + 'clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsAesRainGgplotFunction.SetRCommand("aes") + 'clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + 'clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) + + clsRainBarFunction.SetRCommand("geom_bar") + clsRainBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=0) + clsRainBarFunction.AddParameter("alpha", "0.5", iPosition:=1) + clsRainBarFunction.AddParameter("fill", Chr(34) & "purple" & Chr(34), iPosition:=2) + + clsRainBarTextFunction.SetRCommand("geom_text") + 'clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + 'clsRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) + clsRainBarTextFunction.AddParameter("size", "3", iPosition:=2) + + clsRainRoundFunction.SetRCommand("round") + 'clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsRainRoundFunction.AddParameter("y", "1", bIncludeArgumentName:=False) + + clsAesRainBarTextFunction.SetRCommand("aes") + + clsLabsRainFunction.SetRCommand("scale_y_continuous") + clsLabsRainFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) + clsLabsRainFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecAxisRainFunction, iPosition:=1) + + clsSecAxisRainFunction.SetRCommand("sec.axis") + clsSecAxisRainFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) + clsSecAxisRainFunction.AddParameter("name", Chr(34) & "Rainfall (inches)" & Chr(34), iPosition:=1) + + clsPlus5Operator.SetOperation("+") + clsPlus5Operator.SetAssignTo(strTemBar) + + clsPlus6Operator.SetOperation("+") + + clsPlus7Operator.SetOperation("+") + + clsPlus8Operator.SetOperation("+") + + clsPlus9Operator.SetOperation("+") + + clsTemGgplotFunction.SetRCommand("ggplot") + + clsAesTemGgplotFunction.SetRCommand("aes") + + clsTmaxBarFunction.SetRCommand("geom_bar") + clsTmaxBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsTmaxBarFunction.AddParameter("fill", Chr(34) & "red" & Chr(34), iPosition:=2) + + clsAesTmaxBarFunction1.SetRCommand("aes") + + clsTminBarFunction.SetRCommand("geom_bar") + clsTminBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) + clsTminBarFunction.AddParameter("fill", Chr(34) & "blue" & Chr(34), iPosition:=2) + + clsAesTminBarFunction1.SetRCommand("aes") + + clsTmaxBarTextFunction.SetRCommand("geom_text") + clsTmaxBarTextFunction.AddParameter("size", Chr(34) & "red" & Chr(34)) + + clsAesTmaxBarTextFunction.SetRCommand("aes") + + clsTmaxRoundFunction.SetRCommand("round") + clsTmaxRoundFunction.AddParameter("y", "1", iPosition:=1, bIncludeArgumentName:=False) + + clsTminBarTextFunction.SetRCommand("geom_text") + clsTminBarTextFunction.AddParameter("size", Chr(34) & "blue" & Chr(34)) + + clsAesTminBarTextFunction.SetRCommand("aes") + + clsTminRoundFunction.SetRCommand("round") + clsTminRoundFunction.AddParameter("y", "1", iPosition:=1, bIncludeArgumentName:=False) + + clsLabsTempFunction.SetRCommand("scale_y_continuous") + clsLabsTempFunction.AddParameter("name", Chr(34) & "Temperature (C)" & Chr(34), iPosition:=0) + clsLabsTempFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecAxisTemFunction, iPosition:=1) + + clsSecAxisTemFunction.SetRCommand("sec.axis") + clsSecAxisTemFunction.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) + clsSecAxisTemFunction.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) + + clsPlotGridFunction.SetPackageName("cowplot") + clsPlotGridFunction.SetRCommand("plot_grid") + clsPlotGridFunction.AddParameter("x", strTemBar, iPosition:=0, bIncludeArgumentName:=False) + clsPlotGridFunction.AddParameter("y", strRainBar, iPosition:=1, bIncludeArgumentName:=False) + clsPlotGridFunction.AddParameter("ncol", "1", iPosition:=2) + clsLabsFunction = GgplotDefaults.clsDefaultLabs.Clone() clsXlabFunction = GgplotDefaults.clsXlabTitleFunction.Clone() clsYlabFunction = GgplotDefaults.clsYlabTitleFunction.Clone() @@ -719,8 +855,8 @@ Public Class dlgClimograph ucrReceiverMonthC.SetMeAsReceiver() clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - Else - clsBaseOperator.RemoveParameterByName("ggplot") + Else + clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName("geom_bar") ucrReceiverMonth.SetMeAsReceiver() clsGgwalterliethFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) @@ -738,6 +874,9 @@ Public Class dlgClimograph AddRemoveGeomTextTmax() AddRemoveGeomTextTmin() EnableTileAndRibbon() + EnableTemBar() + AddRemoveTemBars() + ChangeBaseOperator() End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -1099,6 +1238,7 @@ Public Class dlgClimograph SetPipeAssignTo1() AddRemoveGeomRibbon() Dataframechange() + AddRemoveTemBars() End Sub Private Sub GetParameterValue(clsOperator As ROperator) @@ -1150,6 +1290,8 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmax() EnableTileAndRibbon() + EnableTemBar() + AddRemoveTemBars() End Sub Private Sub AddRemoveTheme() @@ -1282,7 +1424,6 @@ Public Class dlgClimograph End If Else clsBaseOperator.RemoveParameterByName("geom_line") - clsBaseOperator.RemoveParameterByName("scale_colour_identity") End If End Sub @@ -1300,7 +1441,6 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("geom_line1") End If Else - clsBaseOperator.RemoveParameterByName("scale_colour_identity") clsBaseOperator.RemoveParameterByName("geom_line1") End If End Sub @@ -1403,6 +1543,8 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmin() EnableTileAndRibbon() + EnableTemBar() + AddRemoveTemBars() End Sub Private Sub ucrReceiverRainC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainC.ControlValueChanged @@ -1415,6 +1557,7 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmin() AddRemoveGeomTextTmax() + AddRemoveTemBars() End Sub Private Sub ucrReceiverMonthC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthC.ControlValueChanged @@ -1425,6 +1568,7 @@ Public Class dlgClimograph End If AddRemoveGeomRibbon() AddRemoveGeomBar() + AddRemoveTemBars() End Sub Private Sub ucrSelectorClimograph_DataFrameChanged() Handles ucrSelectorClimograph.DataFrameChanged @@ -1472,6 +1616,20 @@ Public Class dlgClimograph Private Sub AddRemoveTemBars() If rdoClimograph.Checked Then If ucrChkBar.Checked Then + clsBaseOperator.RemoveParameterByName("geom_text") + clsBaseOperator.RemoveParameterByName("geom_text1") + clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("geom_line1") + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_text2") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("scale_x_discrete") + clsBaseOperator.RemoveParameterByName("scale_y_continuous") If ucrReceiverRainC.IsEmpty Then clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) @@ -1480,127 +1638,87 @@ Public Class dlgClimograph clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=1) clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsGeomBarTminFunction, iPosition:=2) Else - Dim strTemBar As String = "Tem" - Dim strRainBar As String = "Rain" - Dim clsPlus1Operator, clsPlus2Operator, clsPlus3Operator, clsPlus4Operator, clsPlus5Operator As New ROperator - Dim clsPlus6Operator, clsPlus7Operator, clsPlus8Operator, clsPlus9Operator As New ROperator - Dim clsRainBarFunction, clsTmaxBarFunction, clsTminBarFunction, clsLabsRainFunction, clsLabsTempFunction As New RFunction - Dim clsRainBarTextFunction, clsTmaxBarTextFunction, clsTminBarTextFunction, clsRainGgplotFunction, clsTemGgplotFunction As New RFunction - Dim clsAesTmaxBarFunction, clsAesTminBarFunction, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction - Dim clsAesRainBarTextFunction, clsAesTmaxBarTextFunction, clsAesTminBarTextFunction, clsRainRoundFunction, clsTmaxRoundFunction, clsTminRoundFunction As New RFunction - - clsPlus1Operator.SetOperation("+") - clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) - clsPlus1Operator.SetAssignTo(strRainBar) - - clsPlus2Operator.SetOperation("+") - clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) - - clsPlus3Operator.SetOperation("+") - clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) - - clsRainGgplotFunction.SetRCommand("ggplot") - clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) - clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) - - clsAesRainGgplotFunction.SetRCommand("aes") clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) - - clsRainBarFunction.SetRCommand("geom_bar") - clsRainBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=0) - clsRainBarFunction.AddParameter("alpha", "0.5", iPosition:=1) - clsRainBarFunction.AddParameter("fill", Chr(34) & "purple" & Chr(34), iPosition:=2) - - clsRainBarTextFunction.SetRCommand("geom_text") - clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) - clsRainBarTextFunction.AddParameter("vjust", "-0.5", iPosition:=1) - clsRainBarTextFunction.AddParameter("size", "3", iPosition:=2) - - clsRainRoundFunction.SetRCommand("round") + clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsRainRoundFunction.AddParameter("y", "1", bIncludeArgumentName:=False) - - clsLabsRainFunction.SetRCommand("scale_y_continuous") - clsLabsRainFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) - clsLabsRainFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecAxisRainFunction, iPosition:=1) - - clsSecAxisRainFunction.SetRCommand("sec.axis") - clsSecAxisRainFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) - clsSecAxisRainFunction.AddParameter("name", Chr(34) & "Rainfall (inches)" & Chr(34), iPosition:=1) - - clsPlus4Operator.SetOperation("+") - clsPlus4Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus4Operator.AddParameter("right", clsROperatorParameter:=clsPlus5Operator, iPosition:=1, bIncludeArgumentName:=False) - - clsPlus5Operator.SetOperation("+") - clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) - - clsPlus6Operator.SetOperation("+") - clsPlus6Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) + clsAesRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) + clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) - clsTemGgplotFunction.SetRCommand("ggplot") - clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) 'clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) - clsAesTemGgplotFunction.SetRCommand("aes") - clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - - clsTmaxBarFunction.SetRCommand("geom_bar") - clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsTmaxBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) - clsTmaxBarFunction.AddParameter("fill", Chr(34) & "red" & Chr(34), iPosition:=2) - - clsAesTmaxBarFunction.SetRCommand("aes") - clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - - clsTminBarFunction.SetRCommand("geom_bar") - clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsTminBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=1) - clsTminBarFunction.AddParameter("fill", Chr(34) & "red" & Chr(34), iPosition:=2) - - clsAesTminBarFunction.SetRCommand("aes") - clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - - clsPlus7Operator.SetOperation("+") - clsPlus7Operator.AddParameter("left",, iPosition:=0, bIncludeArgumentName:=False) - clsPlus7Operator.AddParameter("right",, iPosition:=1, bIncludeArgumentName:=False) - - clsPlus8Operator.SetOperation("+") - clsPlus8Operator.AddParameter("left",, iPosition:=0, bIncludeArgumentName:=False) - clsPlus8Operator.AddParameter("right",, iPosition:=1, bIncludeArgumentName:=False) - - clsPlus9Operator.SetOperation("+") - clsPlus9Operator.AddParameter("left",, iPosition:=0, bIncludeArgumentName:=False) - clsPlus9Operator.AddParameter("right",, iPosition:=1, bIncludeArgumentName:=False) - - clsTmaxBarFunction.SetRCommand("geom_bar") - clsTminBarFunction.SetRCommand("geom_bar") - clsRainBarTextFunction.SetRCommand("geom_text") - clsTmaxBarTextFunction.SetRCommand("geom_text") - clsTminBarTextFunction.SetRCommand("geom_text") - clsLabsRainFunction.SetRCommand("labs") - clsLabsTempFunction.SetRCommand("labs") + clsAesTmaxBarFunction1.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction1, iPosition:=0, bIncludeArgumentName:=False) + + clsAesTminBarFunction1.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction1, iPosition:=0, bIncludeArgumentName:=False) + + clsTmaxRoundFunction.AddParameter("x", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTmaxBarTextFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsAesTmaxBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTmaxRoundFunction, iPosition:=1) + clsTmaxBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsTminRoundFunction.AddParameter("x", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTminBarTextFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesTminBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTminRoundFunction, iPosition:=1) + clsTminBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("right", clsRFunctionParameter:=clsLabsTempFunction, iPosition:=1, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("right", clsROperatorParameter:=clsPlus9Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("right", clsROperatorParameter:=clsPlus8Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) End If Else clsBaseOperator.RemoveParameterByName("geom_bar1") - clsBaseOperator.RemoveParameterByName("geom_bar1") + clsBaseOperator.RemoveParameterByName("geom_bar2") + clsBaseOperator.RemoveParameterByName("plot_grid") End If Else clsBaseOperator.RemoveParameterByName("geom_bar1") - clsBaseOperator.RemoveParameterByName("geom_bar1") + clsBaseOperator.RemoveParameterByName("geom_bar2") + clsBaseOperator.RemoveParameterByName("plot_grid") + End If + End Sub + + Private Sub ChangeBaseOperator() + If rdoClimograph.Checked Then + clsBaseOperator.RemoveParameterByName("ggplot") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("plot_grid") + clsBaseOperator.RemoveParameterByName("ggwalter_lieth") + If ucrChkBar.Checked Then + clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) + Else + clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + End If + Else + clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) + clsBaseOperator.RemoveParameterByName("ggplot") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("plot_grid") End If End Sub Private Sub ucrChkBar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBar.ControlValueChanged AddRemoveTemBars() EnableTemBar() + ChangeBaseOperator() End Sub Private Sub ucrSave_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlValueChanged From ef87037e0b5272be823db8bd2a54a27b1860a091 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Fri, 26 Jul 2024 16:30:30 +0300 Subject: [PATCH 084/273] added styling to column spanners cleaned up code --- .../Cells/Formats/ucrCellFormats.Designer.vb | 90 ++++----- .../Cells/Formats/ucrCellFormats.vb | 16 +- .../Cells/Styles/ucrCellStyles.Designer.vb | 140 +++++++------ .../Cells/Styles/ucrCellStyles.resx | 3 + .../UserTables/Cells/Styles/ucrCellStyles.vb | 34 ++-- .../Columns/ucrColumnFootNote.Designer.vb | 72 +++---- .../UserTables/Columns/ucrColumnFootNote.vb | 50 ++--- .../Columns/ucrColumnLabels.Designer.vb | 52 ++--- .../UserTables/Columns/ucrColumnLabels.resx | 12 -- instat/UserTables/Columns/ucrColumnLabels.vb | 62 +++--- .../Columns/ucrColumnNanoPlots.Designer.vb | 29 +++ .../UserTables/Columns/ucrColumnNanoPlots.vb | 10 + .../Columns/ucrColumnSpanners.Designer.vb | 111 +++++----- .../UserTables/Columns/ucrColumnSpanners.resx | 5 +- .../UserTables/Columns/ucrColumnSpanners.vb | 119 +++++++---- .../Columns/ucrColumnStyles.Designer.vb | 149 ++++++++++++++ .../UserTables/Columns/ucrColumnStyles.resx | 123 +++++++++++ instat/UserTables/Columns/ucrColumnStyles.vb | 93 +++++++++ .../UserTables/Columns/ucrColumns.Designer.vb | 191 +++++++++--------- instat/UserTables/Columns/ucrColumns.vb | 30 ++- .../Others/ucrOtherStyles.Designer.vb | 137 +++++++++++++ instat/UserTables/Others/ucrOtherStyles.resx | 126 ++++++++++++ instat/UserTables/Others/ucrOtherStyles.vb | 94 +++++++++ .../Rows/ucrRowExpression.Designer.vb | 22 +- instat/UserTables/Rows/ucrRowExpression.vb | 57 ++++-- .../UserTables/Rows/ucrRowGroup.Designer.vb | 59 +++--- instat/UserTables/Rows/ucrRowGroup.vb | 28 ++- .../SourceNotes/ucrSourceNotes.Designer.vb | 32 +-- .../SourceNotes/ucrSourceNotes.resx | 3 - .../UserTables/SourceNotes/ucrSourceNotes.vb | 84 ++------ .../UserTables/Stub/ucrStubStyle.Designer.vb | 14 +- instat/UserTables/Stub/ucrStubStyle.vb | 9 +- instat/UserTables/clsTablesUtils.vb | 2 - instat/UserTables/sdgTableOptions.Designer.vb | 183 +++++++++-------- instat/UserTables/sdgTableOptions.vb | 137 ++----------- instat/UserTables/sdgTableRowExpression.vb | 22 +- instat/instat.vbproj | 24 +++ 37 files changed, 1581 insertions(+), 843 deletions(-) create mode 100644 instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb create mode 100644 instat/UserTables/Columns/ucrColumnNanoPlots.vb create mode 100644 instat/UserTables/Columns/ucrColumnStyles.Designer.vb create mode 100644 instat/UserTables/Columns/ucrColumnStyles.resx create mode 100644 instat/UserTables/Columns/ucrColumnStyles.vb create mode 100644 instat/UserTables/Others/ucrOtherStyles.Designer.vb create mode 100644 instat/UserTables/Others/ucrOtherStyles.resx create mode 100644 instat/UserTables/Others/ucrOtherStyles.vb diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb index ce76e58fb55..52d896963b5 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb @@ -26,16 +26,16 @@ Partial Class ucrCellFormats Me.btnClearFormats = New System.Windows.Forms.Button() Me.btnEnterFormat = New System.Windows.Forms.Button() Me.dataGridFormats = New System.Windows.Forms.DataGridView() - Me.lblRowExpression = New System.Windows.Forms.Label() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblColumns = New System.Windows.Forms.Label() Me.cboSelectFormat = New System.Windows.Forms.ComboBox() Me.Label2 = New System.Windows.Forms.Label() Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() - Me.ucrInputRows = New instat.ucrInputTextBox() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ucrRowExpression = New instat.ucrRowExpression() + Me.Label1 = New System.Windows.Forms.Label() CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -83,15 +83,26 @@ Partial Class ucrCellFormats Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) Me.dataGridFormats.TabIndex = 307 ' - 'lblRowExpression + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Format" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.Width = 64 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Column(s)" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.Width = 78 + ' + 'colRow ' - Me.lblRowExpression.AutoSize = True - Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowExpression.Location = New System.Drawing.Point(231, 140) - Me.lblRowExpression.Name = "lblRowExpression" - Me.lblRowExpression.Size = New System.Drawing.Size(134, 13) - Me.lblRowExpression.TabIndex = 320 - Me.lblRowExpression.Text = "Row Expression (Optional):" + Me.colRow.HeaderText = "Row(s)" + Me.colRow.Name = "colRow" ' 'lblColumns ' @@ -99,9 +110,9 @@ Partial Class ucrCellFormats Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.lblColumns.Location = New System.Drawing.Point(237, 60) Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) + Me.lblColumns.Size = New System.Drawing.Size(56, 13) Me.lblColumns.TabIndex = 310 - Me.lblColumns.Text = "Column:" + Me.lblColumns.Text = "Column(s):" ' 'cboSelectFormat ' @@ -136,17 +147,6 @@ Partial Class ucrCellFormats Me.ucrReceiverMultipleCols.TabIndex = 317 Me.ucrReceiverMultipleCols.ucrSelector = Nothing ' - 'ucrInputRows - ' - Me.ucrInputRows.AddQuotesIfUnrecognised = True - Me.ucrInputRows.AutoSize = True - Me.ucrInputRows.IsMultiline = False - Me.ucrInputRows.IsReadOnly = False - Me.ucrInputRows.Location = New System.Drawing.Point(234, 156) - Me.ucrInputRows.Name = "ucrInputRows" - Me.ucrInputRows.Size = New System.Drawing.Size(137, 21) - Me.ucrInputRows.TabIndex = 319 - ' 'ucrSelectorCols ' Me.ucrSelectorCols.AutoSize = True @@ -159,36 +159,32 @@ Partial Class ucrCellFormats Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 308 ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Format" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 64 - ' - 'colLabel + 'ucrRowExpression ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Column(s)" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 78 + Me.ucrRowExpression.Location = New System.Drawing.Point(234, 158) + Me.ucrRowExpression.Name = "ucrRowExpression" + Me.ucrRowExpression.Size = New System.Drawing.Size(193, 25) + Me.ucrRowExpression.TabIndex = 334 ' - 'colRow + 'Label1 ' - Me.colRow.HeaderText = "Row(s)" - Me.colRow.Name = "colRow" + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(236, 142) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(134, 13) + Me.Label1.TabIndex = 333 + Me.Label1.Text = "Row Expression (Optional):" ' 'ucrCellFormats ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrRowExpression) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.cboSelectFormat) - Me.Controls.Add(Me.lblRowExpression) Me.Controls.Add(Me.ucrReceiverMultipleCols) - Me.Controls.Add(Me.ucrInputRows) Me.Controls.Add(Me.lblFormats) Me.Controls.Add(Me.btnClearFormats) Me.Controls.Add(Me.lblColumns) @@ -206,8 +202,6 @@ Partial Class ucrCellFormats Friend WithEvents btnClearFormats As Button Friend WithEvents btnEnterFormat As Button Friend WithEvents dataGridFormats As DataGridView - Friend WithEvents ucrInputRows As ucrInputTextBox - Friend WithEvents lblRowExpression As Label Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents lblColumns As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove @@ -216,4 +210,6 @@ Partial Class ucrCellFormats Friend WithEvents colCodnition As DataGridViewTextBoxColumn Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colRow As DataGridViewTextBoxColumn + Friend WithEvents ucrRowExpression As ucrRowExpression + Friend WithEvents Label1 As Label End Class diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb index b6dfddc374c..468ba4b5260 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -29,11 +29,6 @@ End Sub - Public Sub SetValuesToOperator() - clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) - clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) - End Sub - Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) For Each clsRParam As RParameter In lstRParams @@ -87,7 +82,7 @@ AddFormatParameterToGrid(clsFormatRFunction) ucrReceiverMultipleCols.Clear() - ucrInputRows.SetName("") + ucrRowExpression.Clear() End Sub @@ -95,13 +90,13 @@ Private Sub AddFormatParameterToGrid(clsFormatRFunction As RFunction) Dim strColumnsExpression As String = ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False) - Dim strRowsExpression As String = ucrInputRows.GetText + Dim strRowsExpression As String = ucrRowExpression.GetText ' Add columns parameter clsFormatRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strColumnsExpression, iNewPosition:=0)) ' Add rows as paramater if present - If Not ucrInputRows.IsEmpty Then + If Not ucrRowExpression.IsEmpty Then clsFormatRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strRowsExpression, iNewPosition:=1)) End If @@ -143,4 +138,9 @@ ucrReceiverMultipleCols.SetMeAsReceiver() End Sub + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) + End Sub + End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb index 7171cf101b5..574d86ef133 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb @@ -23,15 +23,15 @@ Partial Class ucrCellStyles _ Private Sub InitializeComponent() Me.lblRowExpression = New System.Windows.Forms.Label() - Me.ucrInputRows = New instat.ucrInputTextBox() Me.lblFormats = New System.Windows.Forms.Label() Me.btnClearFormats = New System.Windows.Forms.Button() - Me.lblColumns = New System.Windows.Forms.Label() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGridFormats = New System.Windows.Forms.DataGridView() - Me.btnEnterStyle = New System.Windows.Forms.Button() - Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.btnEnterStyle = New System.Windows.Forms.Button() + Me.Label1 = New System.Windows.Forms.Label() + Me.ucrRowExpression = New instat.ucrRowExpression() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -39,28 +39,17 @@ Partial Class ucrCellStyles ' Me.lblRowExpression.AutoSize = True Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowExpression.Location = New System.Drawing.Point(239, 53) + Me.lblRowExpression.Location = New System.Drawing.Point(237, 86) Me.lblRowExpression.Name = "lblRowExpression" - Me.lblRowExpression.Size = New System.Drawing.Size(86, 13) + Me.lblRowExpression.Size = New System.Drawing.Size(134, 13) Me.lblRowExpression.TabIndex = 329 - Me.lblRowExpression.Text = "Row Expression:" - ' - 'ucrInputRows - ' - Me.ucrInputRows.AddQuotesIfUnrecognised = True - Me.ucrInputRows.AutoSize = True - Me.ucrInputRows.IsMultiline = False - Me.ucrInputRows.IsReadOnly = False - Me.ucrInputRows.Location = New System.Drawing.Point(242, 69) - Me.ucrInputRows.Name = "ucrInputRows" - Me.ucrInputRows.Size = New System.Drawing.Size(137, 21) - Me.ucrInputRows.TabIndex = 328 + Me.lblRowExpression.Text = "Row Expression (Optional):" ' 'lblFormats ' Me.lblFormats.AutoSize = True Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFormats.Location = New System.Drawing.Point(239, 134) + Me.lblFormats.Location = New System.Drawing.Point(236, 166) Me.lblFormats.Name = "lblFormats" Me.lblFormats.Size = New System.Drawing.Size(38, 13) Me.lblFormats.TabIndex = 326 @@ -69,94 +58,101 @@ Partial Class ucrCellStyles 'btnClearFormats ' Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearFormats.Location = New System.Drawing.Point(523, 125) + Me.btnClearFormats.Location = New System.Drawing.Point(475, 157) Me.btnClearFormats.Name = "btnClearFormats" Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) - Me.btnClearFormats.TabIndex = 325 + Me.btnClearFormats.TabIndex = 5 Me.btnClearFormats.Tag = "" Me.btnClearFormats.Text = "Clear" Me.btnClearFormats.UseVisualStyleBackColor = True ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(245, 7) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) - Me.lblColumns.TabIndex = 324 - Me.lblColumns.Text = "Column:" - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(7, 7) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 322 - ' 'dataGridFormats ' Me.dataGridFormats.AllowUserToAddRows = False Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) - Me.dataGridFormats.Location = New System.Drawing.Point(242, 151) + Me.dataGridFormats.Location = New System.Drawing.Point(239, 183) Me.dataGridFormats.Name = "dataGridFormats" Me.dataGridFormats.RowHeadersWidth = 62 - Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) - Me.dataGridFormats.TabIndex = 321 + Me.dataGridFormats.Size = New System.Drawing.Size(315, 73) + Me.dataGridFormats.TabIndex = 6 + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Style Expressions" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" ' 'btnEnterStyle ' Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEnterStyle.Location = New System.Drawing.Point(242, 101) + Me.btnEnterStyle.Location = New System.Drawing.Point(239, 133) Me.btnEnterStyle.Name = "btnEnterStyle" Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) - Me.btnEnterStyle.TabIndex = 323 + Me.btnEnterStyle.TabIndex = 4 Me.btnEnterStyle.Tag = "" Me.btnEnterStyle.Text = "Enter Style" Me.btnEnterStyle.UseVisualStyleBackColor = True ' - 'ucrReceiverSingleCol + 'Label1 ' - Me.ucrReceiverSingleCol.AutoSize = True - Me.ucrReceiverSingleCol.frmParent = Nothing - Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(242, 20) - Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" - Me.ucrReceiverSingleCol.Selector = Nothing - Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverSingleCol.strNcFilePath = "" - Me.ucrReceiverSingleCol.TabIndex = 330 - Me.ucrReceiverSingleCol.ucrSelector = Nothing + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(239, 7) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(56, 13) + Me.Label1.TabIndex = 331 + Me.Label1.Text = "Column(s):" ' - 'colStyles + 'ucrRowExpression ' - Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colStyles.HeaderText = "Style Expressions" - Me.colStyles.MinimumWidth = 8 - Me.colStyles.Name = "colStyles" + Me.ucrRowExpression.Location = New System.Drawing.Point(234, 104) + Me.ucrRowExpression.Name = "ucrRowExpression" + Me.ucrRowExpression.Size = New System.Drawing.Size(124, 26) + Me.ucrRowExpression.TabIndex = 332 + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(236, 23) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 55) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 2 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(7, 7) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 1 ' 'ucrCellStyles ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrReceiverSingleCol) + Me.Controls.Add(Me.ucrRowExpression) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblRowExpression) - Me.Controls.Add(Me.ucrInputRows) Me.Controls.Add(Me.lblFormats) Me.Controls.Add(Me.btnClearFormats) - Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.btnEnterStyle) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridFormats) Me.Name = "ucrCellStyles" - Me.Size = New System.Drawing.Size(609, 231) + Me.Size = New System.Drawing.Size(557, 259) CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -164,13 +160,13 @@ Partial Class ucrCellStyles End Sub Friend WithEvents lblRowExpression As Label - Friend WithEvents ucrInputRows As ucrInputTextBox Friend WithEvents lblFormats As Label Friend WithEvents btnClearFormats As Button - Friend WithEvents lblColumns As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents dataGridFormats As DataGridView Friend WithEvents btnEnterStyle As Button - Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle Friend WithEvents colStyles As DataGridViewTextBoxColumn + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents Label1 As Label + Friend WithEvents ucrRowExpression As ucrRowExpression End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.resx b/instat/UserTables/Cells/Styles/ucrCellStyles.resx index d937ee32b35..a249bebae7f 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.resx +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.resx @@ -120,4 +120,7 @@ True + + True + \ No newline at end of file diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.vb index e44443f600c..2b53e8fc9b2 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.vb @@ -2,9 +2,16 @@ Private clsOperator As New ROperator Private bFirstload As Boolean = True + Private Sub ucrCellStyles_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + End Sub + Private Sub InitialiseControl() - ucrReceiverSingleCol.Selector = ucrSelectorCols - ucrReceiverSingleCol.SetMeAsReceiver() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -21,13 +28,10 @@ ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_body", clsOperator)) - End Sub Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) - For Each clsRParam As RParameter In lstRParams - ' Create a new row that represents the tab_style() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridFormats) @@ -36,16 +40,14 @@ ' Tag and add the tab_style() parameter function contents as a row row.Tag = clsRParam dataGridFormats.Rows.Add(row) - Next End Sub - Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRows.ControlContentsChanged, ucrReceiverSingleCol.ControlContentsChanged - btnEnterStyle.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputRows.IsEmpty + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged + btnEnterStyle.Enabled = Not ucrReceiverMultipleCols.IsEmpty End Sub Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click - Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) If clsListStyleRFunction Is Nothing Then Exit Sub @@ -54,25 +56,23 @@ Dim clsLocationsRFunction As New RFunction clsLocationsRFunction.SetPackageName("gt") clsLocationsRFunction.SetRCommand("cells_body") - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrInputRows.GetText, iNewPosition:=1)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + If Not ucrRowExpression.IsEmpty Then + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetText(), iNewPosition:=1)) + End If Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) - ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_style_cells_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) - ' Create row and its cells Dim row As New DataGridViewRow row.CreateCells(dataGridFormats) row.Cells(0).Value = clsTabStyleRFunction.Clone.ToScript - ' Tag the row with the parameter - row.Tag = clsRParam + ' Create parameter with unique name and tag the row with the parameter + row.Tag = New RParameter(strParameterName:="tab_style_cells_body_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) ' Add it to grid dataGridFormats.Rows.Add(row) - End Sub Private Sub btnClearFormats_Click(sender As Object, e As EventArgs) Handles btnClearFormats.Click diff --git a/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb b/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb index 468016ceba0..d6474b517a6 100644 --- a/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb @@ -24,14 +24,14 @@ Partial Class ucrColumnFootNote Private Sub InitializeComponent() Me.lblFooteNotes = New System.Windows.Forms.Label() Me.btnClear = New System.Windows.Forms.Button() - Me.lblColumns = New System.Windows.Forms.Label() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGrid = New System.Windows.Forms.DataGridView() Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblFootNote = New System.Windows.Forms.Label() Me.ucrTxtFootNote = New instat.ucrInputTextBox() - Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.btnAdd = New System.Windows.Forms.Button() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.Label1 = New System.Windows.Forms.Label() CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -39,7 +39,7 @@ Partial Class ucrColumnFootNote ' Me.lblFooteNotes.AutoSize = True Me.lblFooteNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFooteNotes.Location = New System.Drawing.Point(231, 125) + Me.lblFooteNotes.Location = New System.Drawing.Point(231, 196) Me.lblFooteNotes.Name = "lblFooteNotes" Me.lblFooteNotes.Size = New System.Drawing.Size(62, 13) Me.lblFooteNotes.TabIndex = 347 @@ -48,7 +48,7 @@ Partial Class ucrColumnFootNote 'btnClear ' Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClear.Location = New System.Drawing.Point(515, 116) + Me.btnClear.Location = New System.Drawing.Point(515, 188) Me.btnClear.Name = "btnClear" Me.btnClear.Size = New System.Drawing.Size(75, 23) Me.btnClear.TabIndex = 346 @@ -56,16 +56,6 @@ Partial Class ucrColumnFootNote Me.btnClear.Text = "Clear" Me.btnClear.UseVisualStyleBackColor = True ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(241, 4) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) - Me.lblColumns.TabIndex = 345 - Me.lblColumns.Text = "Column:" - ' 'ucrSelectorCols ' Me.ucrSelectorCols.AutoSize = True @@ -83,7 +73,7 @@ Partial Class ucrColumnFootNote Me.dataGrid.AllowUserToAddRows = False Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) - Me.dataGrid.Location = New System.Drawing.Point(234, 142) + Me.dataGrid.Location = New System.Drawing.Point(234, 213) Me.dataGrid.Name = "dataGrid" Me.dataGrid.RowHeadersWidth = 62 Me.dataGrid.Size = New System.Drawing.Size(361, 73) @@ -100,7 +90,7 @@ Partial Class ucrColumnFootNote ' Me.lblFootNote.AutoSize = True Me.lblFootNote.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFootNote.Location = New System.Drawing.Point(241, 45) + Me.lblFootNote.Location = New System.Drawing.Point(241, 118) Me.lblFootNote.Name = "lblFootNote" Me.lblFootNote.Size = New System.Drawing.Size(81, 13) Me.lblFootNote.TabIndex = 352 @@ -112,29 +102,16 @@ Partial Class ucrColumnFootNote Me.ucrTxtFootNote.AutoSize = True Me.ucrTxtFootNote.IsMultiline = False Me.ucrTxtFootNote.IsReadOnly = False - Me.ucrTxtFootNote.Location = New System.Drawing.Point(239, 61) + Me.ucrTxtFootNote.Location = New System.Drawing.Point(239, 134) Me.ucrTxtFootNote.Name = "ucrTxtFootNote" Me.ucrTxtFootNote.Size = New System.Drawing.Size(136, 21) Me.ucrTxtFootNote.TabIndex = 351 ' - 'ucrReceiverSingleCol - ' - Me.ucrReceiverSingleCol.AutoSize = True - Me.ucrReceiverSingleCol.frmParent = Nothing - Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(239, 18) - Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" - Me.ucrReceiverSingleCol.Selector = Nothing - Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverSingleCol.strNcFilePath = "" - Me.ucrReceiverSingleCol.TabIndex = 350 - Me.ucrReceiverSingleCol.ucrSelector = Nothing - ' 'btnAdd ' Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAdd.Location = New System.Drawing.Point(239, 89) + Me.btnAdd.Location = New System.Drawing.Point(239, 162) Me.btnAdd.Name = "btnAdd" Me.btnAdd.Size = New System.Drawing.Size(83, 23) Me.btnAdd.TabIndex = 344 @@ -142,21 +119,44 @@ Partial Class ucrColumnFootNote Me.btnAdd.Text = "Add" Me.btnAdd.UseVisualStyleBackColor = True ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(239, 24) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 80) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 353 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(242, 8) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(56, 13) + Me.Label1.TabIndex = 354 + Me.Label1.Text = "Column(s):" + ' 'ucrColumnFootNote ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.lblFooteNotes) Me.Controls.Add(Me.btnClear) - Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGrid) Me.Controls.Add(Me.lblFootNote) Me.Controls.Add(Me.ucrTxtFootNote) - Me.Controls.Add(Me.ucrReceiverSingleCol) Me.Controls.Add(Me.btnAdd) Me.Name = "ucrColumnFootNote" - Me.Size = New System.Drawing.Size(599, 220) + Me.Size = New System.Drawing.Size(600, 289) CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -165,12 +165,12 @@ Partial Class ucrColumnFootNote Friend WithEvents lblFooteNotes As Label Friend WithEvents btnClear As Button - Friend WithEvents lblColumns As Label Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents dataGrid As DataGridView Friend WithEvents colStyles As DataGridViewTextBoxColumn Friend WithEvents lblFootNote As Label Friend WithEvents ucrTxtFootNote As ucrInputTextBox - Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle Friend WithEvents btnAdd As Button + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents Label1 As Label End Class diff --git a/instat/UserTables/Columns/ucrColumnFootNote.vb b/instat/UserTables/Columns/ucrColumnFootNote.vb index 1152f09785d..2f07fed5d1c 100644 --- a/instat/UserTables/Columns/ucrColumnFootNote.vb +++ b/instat/UserTables/Columns/ucrColumnFootNote.vb @@ -2,17 +2,19 @@ Private clsOperator As New ROperator Private bFirstload As Boolean = True - Private Sub InitialiseControl() - ucrReceiverSingleCol.Selector = ucrSelectorCols - ucrReceiverSingleCol.SetMeAsReceiver() - End Sub - - Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + Private Sub ucrColumnFootNote_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseControl() bFirstload = False End If + End Sub + Private Sub InitialiseControl() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) Me.clsOperator = clsOperator ' Set up the selector @@ -21,24 +23,11 @@ ' Clear and Set up the data grid with contents dataGrid.Rows.Clear() SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_column_labels", clsOperator)) - - End Sub - - Public Sub SetValuesToOperator() - ' Remove any previous cell footers - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_column_labels", clsOperator) - For Each clsRParam As RParameter In lstRParams - clsOperator.RemoveParameter(clsRParam) - Next - - ' Add new changes - clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) End Sub Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) For Each clsRParam As RParameter In lstRParams - ' Create a new row that represents the tab_style() parameters Dim row As New DataGridViewRow row.CreateCells(dataGrid) @@ -47,12 +36,11 @@ ' Tag and add the tab_style() parameter function contents as a row row.Tag = clsRParam dataGrid.Rows.Add(row) - Next End Sub - Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSingleCol.ControlContentsChanged - btnAdd.Enabled = Not ucrReceiverSingleCol.IsEmpty + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged + btnAdd.Enabled = Not ucrReceiverMultipleCols.IsEmpty End Sub Private Sub btnAdd_Click(sender As Object, e As EventArgs) Handles btnAdd.Click @@ -60,10 +48,9 @@ Dim clsTabFootNoteRFunction As New RFunction Dim clsLocationsRFunction As New RFunction - clsLocationsRFunction.SetPackageName("gt") clsLocationsRFunction.SetRCommand("cells_column_labels") - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) clsTabFootNoteRFunction.SetPackageName("gt") clsTabFootNoteRFunction.SetRCommand("tab_footnote") @@ -71,7 +58,7 @@ clsTabFootNoteRFunction.AddParameter(strParameterName:="locations", clsRFunctionParameter:=clsLocationsRFunction, iPosition:=1) ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_footnote_columns_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) + Dim clsRParam As New RParameter(strParameterName:="tab_footnote_columns_labels_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsTabFootNoteRFunction, bNewIncludeArgumentName:=False) ' Create row and its cells Dim row As New DataGridViewRow @@ -84,10 +71,23 @@ ' Add it to grid dataGrid.Rows.Add(row) + ucrReceiverMultipleCols.Clear() + ucrTxtFootNote.SetName("") End Sub Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click dataGrid.Rows.Clear() End Sub + Public Sub SetValuesToOperator() + ' Remove any previous cell footers + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_footnote"}, "locations", "cells_column_labels", clsOperator) + For Each clsRParam As RParameter In lstRParams + clsOperator.RemoveParameter(clsRParam) + Next + + ' Add new changes + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) + End Sub + End Class diff --git a/instat/UserTables/Columns/ucrColumnLabels.Designer.vb b/instat/UserTables/Columns/ucrColumnLabels.Designer.vb index 2f571311c77..e1dc857a503 100644 --- a/instat/UserTables/Columns/ucrColumnLabels.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnLabels.Designer.vb @@ -23,9 +23,6 @@ Partial Class ucrColumnLabels _ Private Sub InitializeComponent() Me.dataGridColLabels = New System.Windows.Forms.DataGridView() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.ucrInputColLabel = New instat.ucrInputTextBox() Me.lblCondition = New System.Windows.Forms.Label() Me.lblColLabels = New System.Windows.Forms.Label() @@ -34,6 +31,8 @@ Partial Class ucrColumnLabels Me.btnAddLabel = New System.Windows.Forms.Button() Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridColLabels, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -41,37 +40,13 @@ Partial Class ucrColumnLabels ' Me.dataGridColLabels.AllowUserToAddRows = False Me.dataGridColLabels.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridColLabels.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) + Me.dataGridColLabels.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition}) Me.dataGridColLabels.Location = New System.Drawing.Point(230, 159) Me.dataGridColLabels.Name = "dataGridColLabels" Me.dataGridColLabels.RowHeadersWidth = 62 - Me.dataGridColLabels.Size = New System.Drawing.Size(339, 95) + Me.dataGridColLabels.Size = New System.Drawing.Size(266, 95) Me.dataGridColLabels.TabIndex = 309 ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colLabel.HeaderText = "Column" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colCodnition.HeaderText = "Label" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - ' - 'colFormat - ' - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.ReadOnly = True - Me.colFormat.Text = "Format" - Me.colFormat.UseColumnTextForButtonValue = True - Me.colFormat.Width = 99 - ' 'ucrInputColLabel ' Me.ucrInputColLabel.AddQuotesIfUnrecognised = True @@ -106,7 +81,7 @@ Partial Class ucrColumnLabels 'btnClearLabels ' Me.btnClearLabels.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearLabels.Location = New System.Drawing.Point(490, 135) + Me.btnClearLabels.Location = New System.Drawing.Point(414, 135) Me.btnClearLabels.Name = "btnClearLabels" Me.btnClearLabels.Size = New System.Drawing.Size(79, 23) Me.btnClearLabels.TabIndex = 314 @@ -161,6 +136,20 @@ Partial Class ucrColumnLabels Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 310 ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colLabel.HeaderText = "Column" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colCodnition.HeaderText = "Label" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + ' 'ucrColumnLabels ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -175,7 +164,7 @@ Partial Class ucrColumnLabels Me.Controls.Add(Me.ucrReceiverSingleCol) Me.Controls.Add(Me.ucrSelectorCols) Me.Name = "ucrColumnLabels" - Me.Size = New System.Drawing.Size(575, 257) + Me.Size = New System.Drawing.Size(499, 257) CType(Me.dataGridColLabels, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -193,5 +182,4 @@ Partial Class ucrColumnLabels Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colFormat As DataGridViewButtonColumn End Class diff --git a/instat/UserTables/Columns/ucrColumnLabels.resx b/instat/UserTables/Columns/ucrColumnLabels.resx index 191e2e6453d..f5ee602f97b 100644 --- a/instat/UserTables/Columns/ucrColumnLabels.resx +++ b/instat/UserTables/Columns/ucrColumnLabels.resx @@ -123,16 +123,4 @@ True - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnLabels.vb b/instat/UserTables/Columns/ucrColumnLabels.vb index d608f9989e7..cc4b5d2bcfa 100644 --- a/instat/UserTables/Columns/ucrColumnLabels.vb +++ b/instat/UserTables/Columns/ucrColumnLabels.vb @@ -3,7 +3,6 @@ Public Class ucrColumnLabels Private clsOperator As New ROperator - Private clsColsLabelRParameter As New RParameter Private bFirstload As Boolean = True Private Sub InitialiseDialog() @@ -22,26 +21,18 @@ Public Class ucrColumnLabels ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) dataGridColLabels.Rows.Clear() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"cols_label"}, clsOperator) If lstRParams.Count > 0 Then - clsColsLabelRParameter = lstRParams(0) - Else - Dim clsColsLabelRFunction As New RFunction - clsColsLabelRFunction.SetPackageName("gt") - clsColsLabelRFunction.SetRCommand("cols_label") - clsColsLabelRParameter = New RParameter(strParameterName:="cols_label_param", strParamValue:=clsColsLabelRFunction, bNewIncludeArgumentName:=False) + For Each clsColLabelRParam As RParameter In lstRParams(0).clsArgumentCodeStructure.clsParameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridColLabels) + row.Cells(0).Value = clsColLabelRParam.strArgumentName + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsColLabelRParam.strArgumentValue, False) + row.Tag = clsColLabelRParam + dataGridColLabels.Rows.Add(row) + Next End If - For Each clsColLabelRParam As RParameter In clsColsLabelRParameter.clsArgumentCodeStructure.clsParameters - Dim row As New DataGridViewRow - row.CreateCells(dataGridColLabels) - row.Cells(0).Value = clsColLabelRParam.strArgumentName - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsColLabelRParam.strArgumentValue, False) - row.Tag = clsColLabelRParam - dataGridColLabels.Rows.Add(row) - Next - End Sub Private Sub btnAddLabel_Click(sender As Object, e As EventArgs) Handles btnAddLabel.Click @@ -49,21 +40,20 @@ Public Class ucrColumnLabels Dim strColumnName As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) Dim strColumnLabel As String = ucrInputColLabel.GetValue() - Dim clsRParam As New RParameter(strParameterName:=clsTablesUtils.GetStringValue(strColumnName, False), strParamValue:=clsTablesUtils.GetStringValue(strColumnLabel, True), iNewPosition:=0) - - clsColsLabelRParameter.clsArgumentCodeStructure.AddParameter(clsRParam) - + Dim clsRParam As New RParameter(strParameterName:=clsTablesUtils.GetStringValue(strColumnName, False), strParamValue:=clsTablesUtils.GetStringValue(strColumnLabel, True)) Dim row As DataGridViewRow = Nothing + + ' Update column label if column exists For Each existingRow As DataGridViewRow In dataGridColLabels.Rows If existingRow.Cells(0).Value = strColumnName Then row = existingRow - row.Cells(0).Value = strColumnName row.Cells(1).Value = strColumnLabel row.Tag = clsRParam + Exit For End If Next - + ' If column does not exist then add new column label If row Is Nothing Then row = New DataGridViewRow row.CreateCells(dataGridColLabels) @@ -73,10 +63,6 @@ Public Class ucrColumnLabels dataGridColLabels.Rows.Add(row) End If - - ' Add/update cols label parameter to the operator - clsOperator.AddParameter(clsColsLabelRParameter) - ' Clear controls ucrReceiverSingleCol.Clear() ucrInputColLabel.SetName("") @@ -84,7 +70,6 @@ Public Class ucrColumnLabels End Sub Private Sub btnClearLabels_Click(sender As Object, e As EventArgs) Handles btnClearLabels.Click - clsOperator.RemoveParameter(clsColsLabelRParameter) dataGridColLabels.Rows.Clear() End Sub @@ -93,4 +78,25 @@ Public Class ucrColumnLabels btnAddLabel.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputColLabel.IsEmpty End Sub + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"cols_label"}, clsOperator) + + If dataGridColLabels.Rows.Count = 0 Then + Exit Sub + End If + + Dim clsColsLabelRFunction As New RFunction + clsColsLabelRFunction.SetPackageName("gt") + clsColsLabelRFunction.SetRCommand("cols_label") + + For index As Integer = 0 To dataGridColLabels.Rows.Count - 1 + If dataGridColLabels.Rows.Item(index).Tag IsNot Nothing Then + Dim clsRParam As RParameter = dataGridColLabels.Rows.Item(index).Tag + clsColsLabelRFunction.AddParameter(clsRParam) + End If + Next + + clsOperator.AddParameter(New RParameter(strParameterName:="cols_label_param", strParamValue:=clsColsLabelRFunction, bNewIncludeArgumentName:=False)) + End Sub + End Class diff --git a/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb b/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb new file mode 100644 index 00000000000..e0ac67e5751 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb @@ -0,0 +1,29 @@ + _ +Partial Class ucrColumnNanoPlots + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + components = New System.ComponentModel.Container() + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + End Sub + +End Class diff --git a/instat/UserTables/Columns/ucrColumnNanoPlots.vb b/instat/UserTables/Columns/ucrColumnNanoPlots.vb new file mode 100644 index 00000000000..2803d52feb2 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnNanoPlots.vb @@ -0,0 +1,10 @@ +Public Class ucrColumnNanoPlots + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + + End Sub + Public Sub SetValuesToOperator() + + End Sub + +End Class diff --git a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb index a04156ee21d..3c17ade50da 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb @@ -27,15 +27,15 @@ Partial Class ucrColumnSpanners Me.lblColumns = New System.Windows.Forms.Label() Me.btnAddColSpanner = New System.Windows.Forms.Button() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() - Me.dataGrid = New System.Windows.Forms.DataGridView() - Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colSpanners = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.dataGridColSpanners = New System.Windows.Forms.DataGridView() Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() Me.lblColSpanner = New System.Windows.Forms.Label() Me.ucrInputColSpanner = New instat.ucrInputTextBox() - CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).BeginInit() + Me.btnStyle = New System.Windows.Forms.Button() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colSpanners = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + CType(Me.dataGridColSpanners, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'lblSpanners @@ -52,7 +52,7 @@ Partial Class ucrColumnSpanners ' Me.btnClearSpanners.Enabled = False Me.btnClearSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearSpanners.Location = New System.Drawing.Point(534, 162) + Me.btnClearSpanners.Location = New System.Drawing.Point(476, 162) Me.btnClearSpanners.Name = "btnClearSpanners" Me.btnClearSpanners.Size = New System.Drawing.Size(75, 23) Me.btnClearSpanners.TabIndex = 295 @@ -94,46 +94,17 @@ Partial Class ucrColumnSpanners Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorCols.TabIndex = 290 ' - 'dataGrid - ' - Me.dataGrid.AllowUserToAddRows = False - Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colSpanners, Me.colFormat}) - Me.dataGrid.Location = New System.Drawing.Point(240, 188) - Me.dataGrid.Name = "dataGrid" - Me.dataGrid.RowHeadersWidth = 62 - Me.dataGrid.Size = New System.Drawing.Size(369, 73) - Me.dataGrid.TabIndex = 289 - ' - 'colId - ' - Me.colId.HeaderText = "ID" - Me.colId.Name = "colId" - Me.colId.ReadOnly = True - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 58 - ' - 'colSpanners - ' - Me.colSpanners.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colSpanners.HeaderText = "Column(s)" - Me.colSpanners.MinimumWidth = 8 - Me.colSpanners.Name = "colSpanners" - Me.colSpanners.Width = 78 - ' - 'colFormat + 'dataGridColSpanners ' - Me.colFormat.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.Width = 8 + Me.dataGridColSpanners.AllowUserToAddRows = False + Me.dataGridColSpanners.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridColSpanners.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colSpanners, Me.colStyleExpression}) + Me.dataGridColSpanners.Location = New System.Drawing.Point(240, 188) + Me.dataGridColSpanners.Name = "dataGridColSpanners" + Me.dataGridColSpanners.ReadOnly = True + Me.dataGridColSpanners.RowHeadersWidth = 62 + Me.dataGridColSpanners.Size = New System.Drawing.Size(311, 73) + Me.dataGridColSpanners.TabIndex = 289 ' 'ucrReceiverMultipleCols ' @@ -169,10 +140,46 @@ Partial Class ucrColumnSpanners Me.ucrInputColSpanner.Size = New System.Drawing.Size(117, 21) Me.ucrInputColSpanner.TabIndex = 307 ' + 'btnStyle + ' + Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnStyle.Location = New System.Drawing.Point(366, 109) + Me.btnStyle.Name = "btnStyle" + Me.btnStyle.Size = New System.Drawing.Size(49, 23) + Me.btnStyle.TabIndex = 308 + Me.btnStyle.Tag = "" + Me.btnStyle.Text = "Style" + Me.btnStyle.UseVisualStyleBackColor = True + ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 60 + ' + 'colSpanners + ' + Me.colSpanners.HeaderText = "Column(s)" + Me.colSpanners.MinimumWidth = 8 + Me.colSpanners.Name = "colSpanners" + Me.colSpanners.ReadOnly = True + Me.colSpanners.Width = 90 + ' + 'colStyleExpression + ' + Me.colStyleExpression.HeaderText = "Style" + Me.colStyleExpression.Name = "colStyleExpression" + Me.colStyleExpression.ReadOnly = True + Me.colStyleExpression.Width = 90 + ' 'ucrColumnSpanners ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btnStyle) Me.Controls.Add(Me.ucrInputColSpanner) Me.Controls.Add(Me.lblColSpanner) Me.Controls.Add(Me.ucrReceiverMultipleCols) @@ -181,10 +188,10 @@ Partial Class ucrColumnSpanners Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.btnAddColSpanner) Me.Controls.Add(Me.ucrSelectorCols) - Me.Controls.Add(Me.dataGrid) + Me.Controls.Add(Me.dataGridColSpanners) Me.Name = "ucrColumnSpanners" - Me.Size = New System.Drawing.Size(612, 265) - CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() + Me.Size = New System.Drawing.Size(554, 265) + CType(Me.dataGridColSpanners, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -194,12 +201,12 @@ Partial Class ucrColumnSpanners Friend WithEvents lblColumns As Label Friend WithEvents btnAddColSpanner As Button Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove - Friend WithEvents dataGrid As DataGridView + Friend WithEvents dataGridColSpanners As DataGridView Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple Friend WithEvents lblColSpanner As Label Friend WithEvents ucrInputColSpanner As ucrInputTextBox - Friend WithEvents colId As DataGridViewTextBoxColumn + Friend WithEvents btnStyle As Button Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colSpanners As DataGridViewTextBoxColumn - Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents colStyleExpression As DataGridViewTextBoxColumn End Class diff --git a/instat/UserTables/Columns/ucrColumnSpanners.resx b/instat/UserTables/Columns/ucrColumnSpanners.resx index 0bab4cc3f3c..9efce73ddc6 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.resx +++ b/instat/UserTables/Columns/ucrColumnSpanners.resx @@ -117,16 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True - True True - + True \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnSpanners.vb b/instat/UserTables/Columns/ucrColumnSpanners.vb index 5c4676dd144..d2d85bfcb1c 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.vb @@ -1,6 +1,8 @@ -Public Class ucrColumnSpanners +Imports unvell.ReoGrid.IO.OpenXML.Schema - Private clsOperator As New ROperator +Public Class ucrColumnSpanners + + Private clsOperator As ROperator Private bFirstload As Boolean = True Private Sub InitialiseDialog() @@ -17,39 +19,64 @@ Me.clsOperator = clsOperator ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) - dataGrid.Rows.Clear() + dataGridColSpanners.Rows.Clear() - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_spanner"}, clsOperator) + ' Note, the sequence of these 2 functions matters + SetupTabSpannersInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_spanner"}, clsOperator)) + SetupTabSpannersStylesInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_column_spanners", clsOperator)) - For Each clsRParam As RParameter In lstRParams + End Sub + Private Sub SetupTabSpannersInDataGrid(lstRParams As List(Of RParameter)) + For Each clsRParam As RParameter In lstRParams Dim clsTabSpannerRFunction As RFunction = clsRParam.clsArgumentCodeStructure - Dim row As New DataGridViewRow - row.CreateCells(dataGrid) - + row.CreateCells(dataGridColSpanners) For Each clsTabSpannerRParam As RParameter In clsTabSpannerRFunction.clsParameters - If clsTabSpannerRParam.strArgumentName = "id" Then + If clsTabSpannerRParam.strArgumentName = "label" Then row.Cells(0).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) - ElseIf clsTabSpannerRParam.strArgumentName = "label" Then - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) ElseIf clsTabSpannerRParam.strArgumentName = "columns" Then - row.Cells(2).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsTabSpannerRParam.strArgumentValue, False) End If Next + Dim arrParams(2) As RParameter + arrParams(0) = clsRParam + row.Tag = arrParams + dataGridColSpanners.Rows.Add(row) + Next + End Sub - row.Tag = clsRParam - dataGrid.Rows.Add(row) - + Private Sub SetupTabSpannersStylesInDataGrid(lstRParams As List(Of RParameter)) + For Each clsRParam As RParameter In lstRParams + Dim clsTabStyleRFunction As RFunction = clsRParam.clsArgumentCodeStructure + ' Get spanner Id + Dim strArgumentValueSpannerId As String = clsTabStyleRFunction.GetParameter("locations").clsArgumentCodeStructure.GetParameter("spanners").strArgumentValue + For index As Integer = 0 To dataGridColSpanners.Rows.Count - 1 + Dim row As DataGridViewRow = dataGridColSpanners.Rows(index) + Dim lstParams() As RParameter = row.Tag + If strArgumentValueSpannerId = lstParams(0).clsArgumentCodeStructure.GetParameter("id").strArgumentValue Then + row.Cells(2).Value = clsTabStyleRFunction.Clone().ToScript + lstParams(1) = clsRParam + row.Tag = lstParams + Exit For + End If + Next Next + End Sub + Private Sub btnStyle_Click(sender As Object, e As EventArgs) Handles btnStyle.Click + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + ucrInputColSpanner.Tag = clsListStyleRFunction End Sub Private Sub btnAddColSpanner_Click(sender As Object, e As EventArgs) Handles btnAddColSpanner.Click - Dim strSpannerLabel As String = ucrInputColSpanner.GetValue() Dim strSpannerId As String = strSpannerLabel.Replace(" ", String.Empty) Dim strSpannerColsRFunction As String = mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False) + Dim strSpannerStyleExpression As String = "" Dim clsTabSpannerRFunction As New RFunction clsTabSpannerRFunction.SetPackageName("gt") @@ -58,37 +85,59 @@ clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=strSpannerColsRFunction, iNewPosition:=1)) clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) - ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_spanner_param" & (dataGrid.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) + Dim arrParams(2) As RParameter - Dim row As New DataGridViewRow - row.CreateCells(dataGrid) + ' Add add the spanner parameter as the first element + arrParams(0) = New RParameter(strParameterName:="tab_column_spanner_param" & (dataGridColSpanners.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) + + ' Add the spanner style as the second element + If ucrInputColSpanner.Tag IsNot Nothing Then + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_column_spanners") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="spanners", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=0)) + + Dim clsListStyleRFunction As RFunction = ucrInputColSpanner.Tag + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) - row.Cells(0).Value = strSpannerId - row.Cells(1).Value = strSpannerLabel - row.Cells(2).Value = strSpannerColsRFunction + strSpannerStyleExpression = clsTabStyleRFunction.Clone.ToScript - row.Tag = clsRParam - dataGrid.Rows.Add(row) + arrParams(1) = New RParameter(strParameterName:="tab_style_cells_column_spanner_param" & (dataGridColSpanners.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + End If - ' Add to parameter - clsOperator.AddParameter(clsRParam) + Dim row As New DataGridViewRow + row.CreateCells(dataGridColSpanners) + row.Cells(0).Value = strSpannerLabel + row.Cells(1).Value = strSpannerColsRFunction + row.Cells(2).Value = strSpannerStyleExpression + ' Tag the array of parameters + row.Tag = arrParams + dataGridColSpanners.Rows.Add(row) ucrReceiverMultipleCols.Clear() ucrInputColSpanner.SetName("") + ucrInputColSpanner.Tag = Nothing + End Sub + Private Sub ucrColSpanner_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged, ucrInputColSpanner.ControlContentsChanged + btnAddColSpanner.Enabled = Not ucrReceiverMultipleCols.IsEmpty AndAlso Not ucrInputColSpanner.IsEmpty End Sub - Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearSpanners.Click - For index As Integer = 0 To dataGrid.Rows.Count - 1 - clsOperator.RemoveParameter(dataGrid.Rows(index).Tag) - Next - dataGrid.Rows.Clear() + Private Sub btnClearSpanners_Click(sender As Object, e As EventArgs) Handles btnClearSpanners.Click + dataGridColSpanners.Rows.Clear() End Sub - Private Sub ucrColSpanner_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged, ucrInputColSpanner.ControlContentsChanged - btnAddColSpanner.Enabled = Not ucrReceiverMultipleCols.IsEmpty AndAlso Not ucrInputColSpanner.IsEmpty - End Sub + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_spanner"}, clsOperator), clsOperator) + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_column_spanners", clsOperator), clsOperator) + For index As Integer = 0 To dataGridColSpanners.Rows.Count - 1 + Dim lstParams() As RParameter = dataGridColSpanners.Rows(index).Tag + clsOperator.AddParameter(lstParams(0)) + If lstParams(1) IsNot Nothing Then + clsOperator.AddParameter(lstParams(1)) + End If + Next + End Sub End Class diff --git a/instat/UserTables/Columns/ucrColumnStyles.Designer.vb b/instat/UserTables/Columns/ucrColumnStyles.Designer.vb new file mode 100644 index 00000000000..049fc16592d --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnStyles.Designer.vb @@ -0,0 +1,149 @@ + _ +Partial Class ucrColumnStyles + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.lblFormats = New System.Windows.Forms.Label() + Me.btnClearFormats = New System.Windows.Forms.Button() + Me.dataGridFormats = New System.Windows.Forms.DataGridView() + Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.Label1 = New System.Windows.Forms.Label() + Me.btnEnterStyle = New System.Windows.Forms.Button() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'lblFormats + ' + Me.lblFormats.AutoSize = True + Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFormats.Location = New System.Drawing.Point(234, 149) + Me.lblFormats.Name = "lblFormats" + Me.lblFormats.Size = New System.Drawing.Size(38, 13) + Me.lblFormats.TabIndex = 338 + Me.lblFormats.Text = "Styles:" + ' + 'btnClearFormats + ' + Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearFormats.Location = New System.Drawing.Point(473, 140) + Me.btnClearFormats.Name = "btnClearFormats" + Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) + Me.btnClearFormats.TabIndex = 336 + Me.btnClearFormats.Tag = "" + Me.btnClearFormats.Text = "Clear" + Me.btnClearFormats.UseVisualStyleBackColor = True + ' + 'dataGridFormats + ' + Me.dataGridFormats.AllowUserToAddRows = False + Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) + Me.dataGridFormats.Location = New System.Drawing.Point(237, 166) + Me.dataGridFormats.Name = "dataGridFormats" + Me.dataGridFormats.RowHeadersWidth = 62 + Me.dataGridFormats.Size = New System.Drawing.Size(315, 73) + Me.dataGridFormats.TabIndex = 337 + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Style Expressions" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(234, 21) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 80) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 334 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.Label1.Location = New System.Drawing.Point(237, 5) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(56, 13) + Me.Label1.TabIndex = 340 + Me.Label1.Text = "Column(s):" + ' + 'btnEnterStyle + ' + Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnEnterStyle.Location = New System.Drawing.Point(237, 110) + Me.btnEnterStyle.Name = "btnEnterStyle" + Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) + Me.btnEnterStyle.TabIndex = 335 + Me.btnEnterStyle.Tag = "" + Me.btnEnterStyle.Text = "Enter Style" + Me.btnEnterStyle.UseVisualStyleBackColor = True + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(5, 5) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.TabIndex = 333 + ' + 'ucrColumnStyles + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblFormats) + Me.Controls.Add(Me.btnClearFormats) + Me.Controls.Add(Me.dataGridFormats) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.btnEnterStyle) + Me.Controls.Add(Me.ucrSelectorCols) + Me.Name = "ucrColumnStyles" + Me.Size = New System.Drawing.Size(556, 243) + CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents lblFormats As Label + Friend WithEvents btnClearFormats As Button + Friend WithEvents dataGridFormats As DataGridView + Friend WithEvents colStyles As DataGridViewTextBoxColumn + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents Label1 As Label + Friend WithEvents btnEnterStyle As Button + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove +End Class diff --git a/instat/UserTables/Columns/ucrColumnStyles.resx b/instat/UserTables/Columns/ucrColumnStyles.resx new file mode 100644 index 00000000000..d937ee32b35 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnStyles.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnStyles.vb b/instat/UserTables/Columns/ucrColumnStyles.vb new file mode 100644 index 00000000000..fcfe94dd33b --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnStyles.vb @@ -0,0 +1,93 @@ +Public Class ucrColumnStyles + + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub ucrColumnStyles_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + End Sub + + Private Sub InitialiseControl() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + + + Me.clsOperator = clsOperator + + ' Set up the selector + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + + ' Clear and Set up the data grid with contents + dataGridFormats.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_column_labels", clsOperator)) + + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) + + For Each clsRParam As RParameter In lstRParams + + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + row.Cells(0).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGridFormats.Rows.Add(row) + + Next + End Sub + + Private Sub ucrInputControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged + btnEnterStyle.Enabled = Not ucrReceiverMultipleCols.IsEmpty + End Sub + + Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click + + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_column_labels") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_style_column_label_param" & (dataGridFormats.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + + ' Create row and its cells + Dim row As New DataGridViewRow + row.CreateCells(dataGridFormats) + row.Cells(0).Value = clsTabStyleRFunction.Clone.ToScript + + ' Tag the row with the parameter + row.Tag = clsRParam + + ' Add it to grid + dataGridFormats.Rows.Add(row) + + ucrReceiverMultipleCols.Clear() + End Sub + + Private Sub btnClearFormats_Click(sender As Object, e As EventArgs) Handles btnClearFormats.Click + dataGridFormats.Rows.Clear() + End Sub + + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_column_labels", clsOperator), clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) + End Sub + + +End Class diff --git a/instat/UserTables/Columns/ucrColumns.Designer.vb b/instat/UserTables/Columns/ucrColumns.Designer.vb index ab0458587a2..c59d2dff065 100644 --- a/instat/UserTables/Columns/ucrColumns.Designer.vb +++ b/instat/UserTables/Columns/ucrColumns.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class ucrColumns Inherits System.Windows.Forms.UserControl 'UserControl overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,20 +20,21 @@ Partial Class ucrColumns 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.rdoColSpanners = New System.Windows.Forms.RadioButton() Me.rdoColLabel = New System.Windows.Forms.RadioButton() - Me.ucrColumnLabels = New instat.ucrColumnLabels() - Me.ucrColumnSpanners = New instat.ucrColumnSpanners() - Me.ucrPnlCols = New instat.UcrPanel() Me.rdoColFootNotes = New System.Windows.Forms.RadioButton() - Me.ucrColumnFootNote = New instat.ucrColumnFootNote() Me.rdoColWidth = New System.Windows.Forms.RadioButton() - Me.ucrColumnWidth = New instat.ucrColumnWidth() Me.rdoColNanoPlot = New System.Windows.Forms.RadioButton() - Me.rdoColHide = New System.Windows.Forms.RadioButton() - Me.rdoColStyle = New System.Windows.Forms.RadioButton() + Me.ucrColumnSpanners = New instat.ucrColumnSpanners() + Me.ucrColumnLabels = New instat.ucrColumnLabels() + Me.ucrColumnFootNote = New instat.ucrColumnFootNote() + Me.ucrColumnWidth = New instat.ucrColumnWidth() + Me.ucrPnlCols = New instat.UcrPanel() + Me.ucrColumnNanoPlots = New instat.ucrColumnNanoPlots() + Me.rdoColStyles = New System.Windows.Forms.RadioButton() + Me.ucrColumnStyles = New instat.ucrColumnStyles() Me.SuspendLayout() ' 'rdoColSpanners @@ -48,7 +49,7 @@ Partial Class ucrColumns Me.rdoColSpanners.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColSpanners.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColSpanners.Location = New System.Drawing.Point(546, 3) + Me.rdoColSpanners.Location = New System.Drawing.Point(419, 3) Me.rdoColSpanners.Name = "rdoColSpanners" Me.rdoColSpanners.Size = New System.Drawing.Size(91, 29) Me.rdoColSpanners.TabIndex = 294 @@ -68,7 +69,7 @@ Partial Class ucrColumns Me.rdoColLabel.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColLabel.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColLabel.Location = New System.Drawing.Point(12, 3) + Me.rdoColLabel.Location = New System.Drawing.Point(65, 3) Me.rdoColLabel.Name = "rdoColLabel" Me.rdoColLabel.Size = New System.Drawing.Size(91, 29) Me.rdoColLabel.TabIndex = 296 @@ -76,28 +77,6 @@ Partial Class ucrColumns Me.rdoColLabel.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoColLabel.UseVisualStyleBackColor = True ' - 'ucrColumnLabels - ' - Me.ucrColumnLabels.Location = New System.Drawing.Point(13, 42) - Me.ucrColumnLabels.Name = "ucrColumnLabels" - Me.ucrColumnLabels.Size = New System.Drawing.Size(575, 262) - Me.ucrColumnLabels.TabIndex = 297 - ' - 'ucrColumnSpanners - ' - Me.ucrColumnSpanners.Location = New System.Drawing.Point(6, 40) - Me.ucrColumnSpanners.Name = "ucrColumnSpanners" - Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 266) - Me.ucrColumnSpanners.TabIndex = 295 - ' - 'ucrPnlCols - ' - Me.ucrPnlCols.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlCols.Location = New System.Drawing.Point(3, 3) - Me.ucrPnlCols.Name = "ucrPnlCols" - Me.ucrPnlCols.Size = New System.Drawing.Size(634, 29) - Me.ucrPnlCols.TabIndex = 289 - ' 'rdoColFootNotes ' Me.rdoColFootNotes.Appearance = System.Windows.Forms.Appearance.Button @@ -110,7 +89,7 @@ Partial Class ucrColumns Me.rdoColFootNotes.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColFootNotes.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColFootNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColFootNotes.Location = New System.Drawing.Point(367, 3) + Me.rdoColFootNotes.Location = New System.Drawing.Point(330, 3) Me.rdoColFootNotes.Name = "rdoColFootNotes" Me.rdoColFootNotes.Size = New System.Drawing.Size(91, 29) Me.rdoColFootNotes.TabIndex = 298 @@ -118,13 +97,6 @@ Partial Class ucrColumns Me.rdoColFootNotes.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoColFootNotes.UseVisualStyleBackColor = True ' - 'ucrColumnFootNote - ' - Me.ucrColumnFootNote.Location = New System.Drawing.Point(7, 37) - Me.ucrColumnFootNote.Name = "ucrColumnFootNote" - Me.ucrColumnFootNote.Size = New System.Drawing.Size(599, 220) - Me.ucrColumnFootNote.TabIndex = 299 - ' 'rdoColWidth ' Me.rdoColWidth.Appearance = System.Windows.Forms.Appearance.Button @@ -137,7 +109,7 @@ Partial Class ucrColumns Me.rdoColWidth.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColWidth.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColWidth.Location = New System.Drawing.Point(101, 3) + Me.rdoColWidth.Location = New System.Drawing.Point(154, 3) Me.rdoColWidth.Name = "rdoColWidth" Me.rdoColWidth.Size = New System.Drawing.Size(91, 29) Me.rdoColWidth.TabIndex = 300 @@ -145,13 +117,6 @@ Partial Class ucrColumns Me.rdoColWidth.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoColWidth.UseVisualStyleBackColor = True ' - 'ucrColumnWidth - ' - Me.ucrColumnWidth.Location = New System.Drawing.Point(5, 37) - Me.ucrColumnWidth.Name = "ucrColumnWidth" - Me.ucrColumnWidth.Size = New System.Drawing.Size(613, 267) - Me.ucrColumnWidth.TabIndex = 301 - ' 'rdoColNanoPlot ' Me.rdoColNanoPlot.Appearance = System.Windows.Forms.Appearance.Button @@ -164,7 +129,7 @@ Partial Class ucrColumns Me.rdoColNanoPlot.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoColNanoPlot.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoColNanoPlot.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColNanoPlot.Location = New System.Drawing.Point(278, 3) + Me.rdoColNanoPlot.Location = New System.Drawing.Point(508, 3) Me.rdoColNanoPlot.Name = "rdoColNanoPlot" Me.rdoColNanoPlot.Size = New System.Drawing.Size(91, 29) Me.rdoColNanoPlot.TabIndex = 303 @@ -172,55 +137,82 @@ Partial Class ucrColumns Me.rdoColNanoPlot.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoColNanoPlot.UseVisualStyleBackColor = True ' - 'rdoColHide - ' - Me.rdoColHide.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoColHide.BackColor = System.Drawing.SystemColors.Control - Me.rdoColHide.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoColHide.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoColHide.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoColHide.FlatAppearance.BorderSize = 2 - Me.rdoColHide.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoColHide.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoColHide.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoColHide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColHide.Location = New System.Drawing.Point(189, 3) - Me.rdoColHide.Name = "rdoColHide" - Me.rdoColHide.Size = New System.Drawing.Size(91, 29) - Me.rdoColHide.TabIndex = 302 - Me.rdoColHide.Text = "Hide" - Me.rdoColHide.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoColHide.UseVisualStyleBackColor = True - ' - 'rdoColStyle - ' - Me.rdoColStyle.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoColStyle.BackColor = System.Drawing.SystemColors.Control - Me.rdoColStyle.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoColStyle.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoColStyle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoColStyle.FlatAppearance.BorderSize = 2 - Me.rdoColStyle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoColStyle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoColStyle.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoColStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoColStyle.Location = New System.Drawing.Point(456, 3) - Me.rdoColStyle.Name = "rdoColStyle" - Me.rdoColStyle.Size = New System.Drawing.Size(91, 29) - Me.rdoColStyle.TabIndex = 304 - Me.rdoColStyle.Text = "Style" - Me.rdoColStyle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoColStyle.UseVisualStyleBackColor = True + 'ucrColumnSpanners + ' + Me.ucrColumnSpanners.Location = New System.Drawing.Point(6, 40) + Me.ucrColumnSpanners.Name = "ucrColumnSpanners" + Me.ucrColumnSpanners.Size = New System.Drawing.Size(615, 266) + Me.ucrColumnSpanners.TabIndex = 295 + ' + 'ucrColumnLabels + ' + Me.ucrColumnLabels.Location = New System.Drawing.Point(13, 42) + Me.ucrColumnLabels.Name = "ucrColumnLabels" + Me.ucrColumnLabels.Size = New System.Drawing.Size(575, 262) + Me.ucrColumnLabels.TabIndex = 297 + ' + 'ucrColumnFootNote + ' + Me.ucrColumnFootNote.Location = New System.Drawing.Point(7, 37) + Me.ucrColumnFootNote.Name = "ucrColumnFootNote" + Me.ucrColumnFootNote.Size = New System.Drawing.Size(599, 292) + Me.ucrColumnFootNote.TabIndex = 299 + ' + 'ucrColumnWidth + ' + Me.ucrColumnWidth.Location = New System.Drawing.Point(5, 37) + Me.ucrColumnWidth.Name = "ucrColumnWidth" + Me.ucrColumnWidth.Size = New System.Drawing.Size(613, 267) + Me.ucrColumnWidth.TabIndex = 301 + ' + 'ucrPnlCols + ' + Me.ucrPnlCols.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlCols.Location = New System.Drawing.Point(8, 3) + Me.ucrPnlCols.Name = "ucrPnlCols" + Me.ucrPnlCols.Size = New System.Drawing.Size(634, 29) + Me.ucrPnlCols.TabIndex = 289 + ' + 'ucrColumnNanoPlots + ' + Me.ucrColumnNanoPlots.Location = New System.Drawing.Point(8, 42) + Me.ucrColumnNanoPlots.Name = "ucrColumnNanoPlots" + Me.ucrColumnNanoPlots.Size = New System.Drawing.Size(623, 262) + Me.ucrColumnNanoPlots.TabIndex = 304 + ' + 'rdoColStyles + ' + Me.rdoColStyles.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoColStyles.BackColor = System.Drawing.SystemColors.Control + Me.rdoColStyles.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None + Me.rdoColStyles.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColStyles.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColStyles.FlatAppearance.BorderSize = 2 + Me.rdoColStyles.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoColStyles.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoColStyles.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoColStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoColStyles.Location = New System.Drawing.Point(243, 3) + Me.rdoColStyles.Name = "rdoColStyles" + Me.rdoColStyles.Size = New System.Drawing.Size(91, 29) + Me.rdoColStyles.TabIndex = 305 + Me.rdoColStyles.Text = "Styles" + Me.rdoColStyles.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoColStyles.UseVisualStyleBackColor = True + ' + 'ucrColumnStyles + ' + Me.ucrColumnStyles.Location = New System.Drawing.Point(8, 42) + Me.ucrColumnStyles.Name = "ucrColumnStyles" + Me.ucrColumnStyles.Size = New System.Drawing.Size(556, 262) + Me.ucrColumnStyles.TabIndex = 306 ' 'ucrColumns ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.rdoColStyle) + Me.Controls.Add(Me.rdoColStyles) Me.Controls.Add(Me.rdoColNanoPlot) - Me.Controls.Add(Me.rdoColHide) - Me.Controls.Add(Me.ucrColumnSpanners) - Me.Controls.Add(Me.ucrColumnLabels) Me.Controls.Add(Me.ucrColumnFootNote) Me.Controls.Add(Me.ucrColumnWidth) Me.Controls.Add(Me.rdoColWidth) @@ -228,8 +220,12 @@ Partial Class ucrColumns Me.Controls.Add(Me.rdoColLabel) Me.Controls.Add(Me.rdoColSpanners) Me.Controls.Add(Me.ucrPnlCols) + Me.Controls.Add(Me.ucrColumnNanoPlots) + Me.Controls.Add(Me.ucrColumnStyles) + Me.Controls.Add(Me.ucrColumnSpanners) + Me.Controls.Add(Me.ucrColumnLabels) Me.Name = "ucrColumns" - Me.Size = New System.Drawing.Size(651, 309) + Me.Size = New System.Drawing.Size(651, 332) Me.ResumeLayout(False) End Sub @@ -243,6 +239,7 @@ Partial Class ucrColumns Friend WithEvents rdoColWidth As RadioButton Friend WithEvents ucrColumnWidth As ucrColumnWidth Friend WithEvents rdoColNanoPlot As RadioButton - Friend WithEvents rdoColHide As RadioButton - Friend WithEvents rdoColStyle As RadioButton + Friend WithEvents ucrColumnNanoPlots As ucrColumnNanoPlots + Friend WithEvents rdoColStyles As RadioButton + Friend WithEvents ucrColumnStyles As ucrColumnStyles End Class diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb index b28a0ad2743..3aef44aa9df 100644 --- a/instat/UserTables/Columns/ucrColumns.vb +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -1,41 +1,51 @@ Public Class ucrColumns Private bFirstload As Boolean = True + + + + Private Sub ucrColumns_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + End Sub + Private Sub InitialiseDialog() ucrPnlCols.AddRadioButton(rdoColLabel) + ucrPnlCols.AddRadioButton(rdoColStyles) ucrPnlCols.AddRadioButton(rdoColWidth) - ucrPnlCols.AddRadioButton(rdoColHide) - ucrPnlCols.AddRadioButton(rdoColNanoPlot) ucrPnlCols.AddRadioButton(rdoColFootNotes) - ucrPnlCols.AddRadioButton(rdoColStyle) ucrPnlCols.AddRadioButton(rdoColSpanners) + ucrPnlCols.AddRadioButton(rdoColNanoPlot) rdoColLabel.Checked = True End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If bFirstload Then - InitialiseDialog() - bFirstload = False - End If - ucrColumnLabels.Setup(strDataFrameName, clsOperator) + ucrColumnStyles.Setup(strDataFrameName, clsOperator) ucrColumnWidth.Setup(strDataFrameName, clsOperator) ucrColumnFootNote.Setup(strDataFrameName, clsOperator) ucrColumnSpanners.Setup(strDataFrameName, clsOperator) + ucrColumnNanoPlots.Setup(strDataFrameName, clsOperator) End Sub Private Sub ucrPnlCols_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlCols.ControlValueChanged ucrColumnLabels.Visible = rdoColLabel.Checked + ucrColumnStyles.Visible = rdoColStyles.Checked ucrColumnWidth.Visible = rdoColWidth.Checked ucrColumnFootNote.Visible = rdoColFootNotes.Checked ucrColumnSpanners.Visible = rdoColSpanners.Checked + ucrColumnNanoPlots.Visible = rdoColNanoPlot.Checked End Sub Public Sub SetValuesToOperator() - 'ucrColumnLabels.SetValuesToOperator() + ucrColumnLabels.SetValuesToOperator() + ucrColumnStyles.SetValuesToOperator() ucrColumnWidth.SetValuesToOperator() ucrColumnFootNote.SetValuesToOperator() - 'ucrColumnSpanners.SetValuesToOperator() + ucrColumnSpanners.SetValuesToOperator() + ucrColumnNanoPlots.SetValuesToOperator() End Sub End Class diff --git a/instat/UserTables/Others/ucrOtherStyles.Designer.vb b/instat/UserTables/Others/ucrOtherStyles.Designer.vb new file mode 100644 index 00000000000..a86909180fc --- /dev/null +++ b/instat/UserTables/Others/ucrOtherStyles.Designer.vb @@ -0,0 +1,137 @@ + _ +Partial Class ucrOtherStyles + Inherits System.Windows.Forms.UserControl + + 'UserControl overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.cboLocation = New System.Windows.Forms.ComboBox() + Me.lblLocation = New System.Windows.Forms.Label() + Me.lblFormats = New System.Windows.Forms.Label() + Me.btnClearStyles = New System.Windows.Forms.Button() + Me.btnEnterStyle = New System.Windows.Forms.Button() + Me.dataGridStyles = New System.Windows.Forms.DataGridView() + Me.colLocation = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colStyles = New System.Windows.Forms.DataGridViewTextBoxColumn() + CType(Me.dataGridStyles, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'cboLocation + ' + Me.cboLocation.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList + Me.cboLocation.FormattingEnabled = True + Me.cboLocation.Items.AddRange(New Object() {"Foot Notes", "Souce Notes"}) + Me.cboLocation.Location = New System.Drawing.Point(7, 20) + Me.cboLocation.Name = "cboLocation" + Me.cboLocation.Size = New System.Drawing.Size(127, 21) + Me.cboLocation.TabIndex = 311 + ' + 'lblLocation + ' + Me.lblLocation.AutoSize = True + Me.lblLocation.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblLocation.Location = New System.Drawing.Point(5, 3) + Me.lblLocation.Name = "lblLocation" + Me.lblLocation.Size = New System.Drawing.Size(84, 13) + Me.lblLocation.TabIndex = 310 + Me.lblLocation.Text = "Select Location:" + ' + 'lblFormats + ' + Me.lblFormats.AutoSize = True + Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblFormats.Location = New System.Drawing.Point(5, 83) + Me.lblFormats.Name = "lblFormats" + Me.lblFormats.Size = New System.Drawing.Size(38, 13) + Me.lblFormats.TabIndex = 330 + Me.lblFormats.Text = "Styles:" + ' + 'btnClearStyles + ' + Me.btnClearStyles.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearStyles.Location = New System.Drawing.Point(244, 74) + Me.btnClearStyles.Name = "btnClearStyles" + Me.btnClearStyles.Size = New System.Drawing.Size(75, 23) + Me.btnClearStyles.TabIndex = 328 + Me.btnClearStyles.Tag = "" + Me.btnClearStyles.Text = "Clear" + Me.btnClearStyles.UseVisualStyleBackColor = True + ' + 'btnEnterStyle + ' + Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnEnterStyle.Location = New System.Drawing.Point(8, 50) + Me.btnEnterStyle.Name = "btnEnterStyle" + Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) + Me.btnEnterStyle.TabIndex = 327 + Me.btnEnterStyle.Tag = "" + Me.btnEnterStyle.Text = "Enter Style" + Me.btnEnterStyle.UseVisualStyleBackColor = True + ' + 'dataGridStyles + ' + Me.dataGridStyles.AllowUserToAddRows = False + Me.dataGridStyles.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridStyles.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLocation, Me.colStyles}) + Me.dataGridStyles.Location = New System.Drawing.Point(8, 100) + Me.dataGridStyles.Name = "dataGridStyles" + Me.dataGridStyles.RowHeadersWidth = 62 + Me.dataGridStyles.Size = New System.Drawing.Size(315, 73) + Me.dataGridStyles.TabIndex = 329 + ' + 'colLocation + ' + Me.colLocation.HeaderText = "Location" + Me.colLocation.Name = "colLocation" + ' + 'colStyles + ' + Me.colStyles.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill + Me.colStyles.HeaderText = "Style Expressions" + Me.colStyles.MinimumWidth = 8 + Me.colStyles.Name = "colStyles" + ' + 'ucrOtherStyles + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblFormats) + Me.Controls.Add(Me.btnClearStyles) + Me.Controls.Add(Me.btnEnterStyle) + Me.Controls.Add(Me.dataGridStyles) + Me.Controls.Add(Me.cboLocation) + Me.Controls.Add(Me.lblLocation) + Me.Name = "ucrOtherStyles" + Me.Size = New System.Drawing.Size(326, 179) + CType(Me.dataGridStyles, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + Friend WithEvents cboLocation As ComboBox + Friend WithEvents lblLocation As Label + Friend WithEvents lblFormats As Label + Friend WithEvents btnClearStyles As Button + Friend WithEvents btnEnterStyle As Button + Friend WithEvents dataGridStyles As DataGridView + Friend WithEvents colLocation As DataGridViewTextBoxColumn + Friend WithEvents colStyles As DataGridViewTextBoxColumn +End Class diff --git a/instat/UserTables/Others/ucrOtherStyles.resx b/instat/UserTables/Others/ucrOtherStyles.resx new file mode 100644 index 00000000000..57eb4184f91 --- /dev/null +++ b/instat/UserTables/Others/ucrOtherStyles.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + \ No newline at end of file diff --git a/instat/UserTables/Others/ucrOtherStyles.vb b/instat/UserTables/Others/ucrOtherStyles.vb new file mode 100644 index 00000000000..1835dc7e969 --- /dev/null +++ b/instat/UserTables/Others/ucrOtherStyles.vb @@ -0,0 +1,94 @@ +Public Class ucrOtherStyles + Private clsOperator As New ROperator + Private bFirstload As Boolean = True + + Private Sub ucrOtherStyles_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + End Sub + + Private Sub InitialiseControl() + cboLocation.SelectedIndex = 0 + End Sub + + Public Sub Setup(clsOperator As ROperator) + Me.clsOperator = clsOperator + + ' Clear and Set up the data grid with contents + dataGridStyles.Rows.Clear() + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_footnotes", clsOperator), "Foot Notes") + SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_source_notes", clsOperator), "Souce Notes") + End Sub + + Private Sub SetupDataGrid(lstRParams As List(Of RParameter), strLocation As String) + For Each clsRParam As RParameter In lstRParams + ' Create a new row that represents the tab_style() parameters + Dim row As New DataGridViewRow + row.CreateCells(dataGridStyles) + row.Cells(0).Value = strLocation + row.Cells(1).Value = clsRParam.clsArgumentCodeStructure.Clone.ToScript + + ' Tag and add the tab_style() parameter function contents as a row + row.Tag = clsRParam + dataGridStyles.Rows.Add(row) + Next + End Sub + + Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click + + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + + If cboLocation.Text = "Foot Notes" Then + clsLocationsRFunction.SetRCommand("cells_footnotes") + + ElseIf cboLocation.Text = "Souce Notes" Then + clsLocationsRFunction.SetRCommand("cells_source_notes") + Else + Exit Sub + End If + + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) + + ' Create parameter with unique name + Dim clsRParam As New RParameter(strParameterName:="tab_style_others_param" & (dataGridStyles.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + Dim row As DataGridViewRow = Nothing + + ' Update location style if it exists + For Each existingRow As DataGridViewRow In dataGridStyles.Rows + If existingRow.Cells(0).Value = cboLocation.Text Then + row = existingRow + row.Cells(1).Value = clsTabStyleRFunction.Clone.ToScript + row.Tag = clsRParam + Exit For + End If + Next + + ' If it does not exist then add new column label + If row Is Nothing Then + row = New DataGridViewRow + row.CreateCells(dataGridStyles) + row.Cells(0).Value = cboLocation.Text + row.Cells(1).Value = clsTabStyleRFunction.Clone.ToScript + row.Tag = clsRParam + dataGridStyles.Rows.Add(row) + End If + End Sub + + Private Sub btnClearStyle_Click(sender As Object, e As EventArgs) Handles btnClearStyles.Click + dataGridStyles.Rows.Clear() + End Sub + + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_footnotes", clsOperator), clsOperator) + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_source_notes", clsOperator), clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridStyles, clsOperator) + End Sub +End Class diff --git a/instat/UserTables/Rows/ucrRowExpression.Designer.vb b/instat/UserTables/Rows/ucrRowExpression.Designer.vb index cc863448601..b071abd1f57 100644 --- a/instat/UserTables/Rows/ucrRowExpression.Designer.vb +++ b/instat/UserTables/Rows/ucrRowExpression.Designer.vb @@ -22,45 +22,31 @@ Partial Class ucrRowExpression 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.btnSet = New System.Windows.Forms.Button() Me.ucrInputExpression = New instat.ucrInputTextBox() Me.SuspendLayout() ' - 'btnSet - ' - Me.btnSet.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnSet.Location = New System.Drawing.Point(148, 2) - Me.btnSet.Name = "btnSet" - Me.btnSet.Size = New System.Drawing.Size(44, 23) - Me.btnSet.TabIndex = 341 - Me.btnSet.Tag = "" - Me.btnSet.Text = "Set" - Me.btnSet.UseVisualStyleBackColor = True - ' 'ucrInputExpression ' Me.ucrInputExpression.AddQuotesIfUnrecognised = True Me.ucrInputExpression.AutoSize = True + Me.ucrInputExpression.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrInputExpression.IsMultiline = False Me.ucrInputExpression.IsReadOnly = False - Me.ucrInputExpression.Location = New System.Drawing.Point(6, 4) + Me.ucrInputExpression.Location = New System.Drawing.Point(0, 0) Me.ucrInputExpression.Name = "ucrInputExpression" - Me.ucrInputExpression.Size = New System.Drawing.Size(142, 21) + Me.ucrInputExpression.Size = New System.Drawing.Size(146, 21) Me.ucrInputExpression.TabIndex = 340 ' 'ucrRowExpression ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.btnSet) Me.Controls.Add(Me.ucrInputExpression) Me.Name = "ucrRowExpression" - Me.Size = New System.Drawing.Size(193, 26) + Me.Size = New System.Drawing.Size(146, 21) Me.ResumeLayout(False) Me.PerformLayout() End Sub - - Friend WithEvents btnSet As Button Friend WithEvents ucrInputExpression As ucrInputTextBox End Class diff --git a/instat/UserTables/Rows/ucrRowExpression.vb b/instat/UserTables/Rows/ucrRowExpression.vb index bfdf183b75f..6fba2c328e4 100644 --- a/instat/UserTables/Rows/ucrRowExpression.vb +++ b/instat/UserTables/Rows/ucrRowExpression.vb @@ -5,43 +5,62 @@ Private Sub UcrInputRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load - 'If bFirstload Then - ' initialiseControl() - ' bFirstload = False - 'End If + If bFirstload Then + InitialiseControl() + bFirstload = False + End If End Sub - 'Private Sub initialiseControl() - ' ucrInputExpression.SetParameter(New RParameter("rows", 0,)) - 'End Sub + Private Sub InitialiseControl() + Dim btnOptions As New Button + 'add the button to the comment textbox first + ucrInputExpression.txtInput.Controls.Clear() + ucrInputExpression.txtInput.Controls.Add(btnOptions) + 'then set the button properties + btnOptions.Text = ":::" 'temp. This will be shown as centered ... An image as below commended code is preferred + 'btn.Image = Image.FromFile("C:\patowhiz\3dots.png") + btnOptions.Size = New Size(25, ucrInputExpression.txtInput.ClientSize.Height + 2) + btnOptions.TextAlign = ContentAlignment.TopCenter + btnOptions.FlatStyle = FlatStyle.Standard + btnOptions.FlatAppearance.BorderSize = 0 + btnOptions.Cursor = Cursors.Default + btnOptions.Dock = DockStyle.Right + 'btnOptions.BackColor = Parent.BackColor + btnOptions.UseVisualStyleBackColor = True + + 'set the btn event handler + AddHandler btnOptions.Click, Sub() + sdgTableRowExpression.Setup(strDataFrameName) + sdgTableRowExpression.ShowDialog(Me.ParentForm) + If sdgTableRowExpression.bUserClickedReturn Then + ucrInputExpression.SetName(sdgTableRowExpression.GetUserInputRowExpression()) + End If + End Sub + + End Sub Public Sub setup(strDataFrameName As String) Me.strDataFrameName = strDataFrameName End Sub - 'Public Sub SetRCode(clsNewCodeStructure As RCodeStructure, Optional bReset As Boolean = False, Optional bUpdate As Boolean = True, Optional bCloneIfNeeded As Boolean = False) - ' ucrInputExpression.SetRCode(clsNewCodeStructure, bReset:=bReset, bUpdate:=bUpdate, bCloneIfNeeded:=bCloneIfNeeded) - 'End Sub - - Private Sub btnSet_Click(sender As Object, e As EventArgs) Handles btnSet.Click + Private Sub btnSet_Click(sender As Object, e As EventArgs) sdgTableRowExpression.Setup(strDataFrameName) sdgTableRowExpression.ShowDialog(Me.ParentForm) - ucrInputExpression.SetName(sdgTableRowExpression.GetRowExpression()) + ucrInputExpression.SetName(sdgTableRowExpression.GetUserInputRowExpression()) End Sub - 'Public Sub SetValue(strValue As String) - ' ucrInputExpression.SetName(strValue) - 'End Sub - - Public Function IsEmpty() As Boolean Return ucrInputExpression.IsEmpty() End Function - Public Function GetValue() As String + Public Function GetText() As String Return ucrInputExpression.GetText() End Function + Public Sub Clear() + ucrInputExpression.SetName("") + End Sub + End Class diff --git a/instat/UserTables/Rows/ucrRowGroup.Designer.vb b/instat/UserTables/Rows/ucrRowGroup.Designer.vb index db9f534f46b..a4c9ec2e5bb 100644 --- a/instat/UserTables/Rows/ucrRowGroup.Designer.vb +++ b/instat/UserTables/Rows/ucrRowGroup.Designer.vb @@ -23,9 +23,6 @@ Partial Class ucrRowGroup Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.btnClearGroups = New System.Windows.Forms.Button() Me.lblColumns = New System.Windows.Forms.Label() Me.btnAddCondition = New System.Windows.Forms.Button() @@ -37,6 +34,9 @@ Partial Class ucrRowGroup Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrInputGroupLabel = New instat.ucrInputTextBox() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -47,34 +47,11 @@ Partial Class ucrRowGroup Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) Me.dataGridGroups.Location = New System.Drawing.Point(229, 204) Me.dataGridGroups.Name = "dataGridGroups" + Me.dataGridGroups.ReadOnly = True Me.dataGridGroups.RowHeadersWidth = 62 Me.dataGridGroups.Size = New System.Drawing.Size(323, 95) Me.dataGridGroups.TabIndex = 11 ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - ' - 'colFormat - ' - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.ReadOnly = True - Me.colFormat.Text = "Format" - Me.colFormat.UseColumnTextForButtonValue = True - Me.colFormat.Width = 99 - ' 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -192,6 +169,32 @@ Partial Class ucrRowGroup Me.ucrInputGroupLabel.Size = New System.Drawing.Size(120, 21) Me.ucrInputGroupLabel.TabIndex = 308 ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 80 + ' + 'colCodnition + ' + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.ReadOnly = True + Me.colCodnition.Width = 90 + ' + 'colFormat + ' + Me.colFormat.HeaderText = "" + Me.colFormat.MinimumWidth = 8 + Me.colFormat.Name = "colFormat" + Me.colFormat.ReadOnly = True + Me.colFormat.Text = "Style" + Me.colFormat.UseColumnTextForButtonValue = True + Me.colFormat.Width = 55 + ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -227,8 +230,8 @@ Partial Class ucrRowGroup Friend WithEvents cboConditionOperator As ComboBox Friend WithEvents cboConditionValue As ComboBox Friend WithEvents lblCondition As Label + Friend WithEvents ucrInputGroupLabel As ucrInputTextBox Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colCodnition As DataGridViewTextBoxColumn Friend WithEvents colFormat As DataGridViewButtonColumn - Friend WithEvents ucrInputGroupLabel As ucrInputTextBox End Class diff --git a/instat/UserTables/Rows/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb index f52bf5286f0..8c6fd61d46e 100644 --- a/instat/UserTables/Rows/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -81,13 +81,6 @@ End Sub - Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearGroups.Click - For index As Integer = 0 To dataGridGroups.Rows.Count - 1 - clsOperator.RemoveParameter(dataGridGroups.Rows(index).Tag) - Next - dataGridGroups.Rows.Clear() - End Sub - Private Sub conditionValue_TextChanged(sender As Object, e As EventArgs) Handles cboConditionValue.TextChanged, cboConditionOperator.TextChanged EnableDisableAddConditionButton() End Sub @@ -99,4 +92,25 @@ Private Sub EnableDisableAddConditionButton() btnAddCondition.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) End Sub + + Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearGroups.Click + For index As Integer = 0 To dataGridGroups.Rows.Count - 1 + clsOperator.RemoveParameter(dataGridGroups.Rows(index).Tag) + Next + dataGridGroups.Rows.Clear() + End Sub + + Private Sub dataGridGroups_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridGroups.CellClick + If 1 = 1 Then + Exit Sub + End If + + ' Ignore clicks that are not from button cells. + If e.ColumnIndex <> 1 Then + Exit Sub + End If + + + End Sub + End Class diff --git a/instat/UserTables/SourceNotes/ucrSourceNotes.Designer.vb b/instat/UserTables/SourceNotes/ucrSourceNotes.Designer.vb index 559937de4c0..6519d25a573 100644 --- a/instat/UserTables/SourceNotes/ucrSourceNotes.Designer.vb +++ b/instat/UserTables/SourceNotes/ucrSourceNotes.Designer.vb @@ -24,20 +24,18 @@ Partial Class ucrSourceNotes Private Sub InitializeComponent() Me.dataGridSourceNotes = New System.Windows.Forms.DataGridView() Me.DataGridViewTextBoxColumn1 = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colSourceNoteFormat = New System.Windows.Forms.DataGridViewButtonColumn() Me.lblSourceNotes = New System.Windows.Forms.Label() + Me.btnClearNotes = New System.Windows.Forms.Button() CType(Me.dataGridSourceNotes, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'dataGridSourceNotes ' - Me.dataGridSourceNotes.AllowUserToAddRows = False - Me.dataGridSourceNotes.AllowUserToDeleteRows = False Me.dataGridSourceNotes.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.dataGridSourceNotes.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1, Me.colSourceNoteFormat}) + Me.dataGridSourceNotes.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.DataGridViewTextBoxColumn1}) Me.dataGridSourceNotes.Location = New System.Drawing.Point(3, 23) Me.dataGridSourceNotes.Name = "dataGridSourceNotes" Me.dataGridSourceNotes.RowHeadersWidth = 62 @@ -51,15 +49,6 @@ Partial Class ucrSourceNotes Me.DataGridViewTextBoxColumn1.MinimumWidth = 8 Me.DataGridViewTextBoxColumn1.Name = "DataGridViewTextBoxColumn1" ' - 'colSourceNoteFormat - ' - Me.colSourceNoteFormat.HeaderText = "" - Me.colSourceNoteFormat.Name = "colSourceNoteFormat" - Me.colSourceNoteFormat.ReadOnly = True - Me.colSourceNoteFormat.Text = "Format" - Me.colSourceNoteFormat.UseColumnTextForButtonValue = True - Me.colSourceNoteFormat.Width = 55 - ' 'lblSourceNotes ' Me.lblSourceNotes.AutoSize = True @@ -69,10 +58,23 @@ Partial Class ucrSourceNotes Me.lblSourceNotes.TabIndex = 8 Me.lblSourceNotes.Text = "Source notes:" ' + 'btnClearNotes + ' + Me.btnClearNotes.Enabled = False + Me.btnClearNotes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearNotes.Location = New System.Drawing.Point(392, 0) + Me.btnClearNotes.Name = "btnClearNotes" + Me.btnClearNotes.Size = New System.Drawing.Size(75, 23) + Me.btnClearNotes.TabIndex = 296 + Me.btnClearNotes.Tag = "" + Me.btnClearNotes.Text = "Clear" + Me.btnClearNotes.UseVisualStyleBackColor = True + ' 'ucrSourceNotes ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btnClearNotes) Me.Controls.Add(Me.dataGridSourceNotes) Me.Controls.Add(Me.lblSourceNotes) Me.Name = "ucrSourceNotes" @@ -84,7 +86,7 @@ Partial Class ucrSourceNotes End Sub Friend WithEvents dataGridSourceNotes As DataGridView - Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn - Friend WithEvents colSourceNoteFormat As DataGridViewButtonColumn Friend WithEvents lblSourceNotes As Label + Friend WithEvents DataGridViewTextBoxColumn1 As DataGridViewTextBoxColumn + Friend WithEvents btnClearNotes As Button End Class diff --git a/instat/UserTables/SourceNotes/ucrSourceNotes.resx b/instat/UserTables/SourceNotes/ucrSourceNotes.resx index fa97e058f74..228caedf30a 100644 --- a/instat/UserTables/SourceNotes/ucrSourceNotes.resx +++ b/instat/UserTables/SourceNotes/ucrSourceNotes.resx @@ -120,7 +120,4 @@ True - - True - \ No newline at end of file diff --git a/instat/UserTables/SourceNotes/ucrSourceNotes.vb b/instat/UserTables/SourceNotes/ucrSourceNotes.vb index e8080d12aee..afdb4018770 100644 --- a/instat/UserTables/SourceNotes/ucrSourceNotes.vb +++ b/instat/UserTables/SourceNotes/ucrSourceNotes.vb @@ -1,51 +1,33 @@  Public Class ucrSourceNotes - Private clsOperator As New ROperator + Private clsOperator As ROperator Public Sub Setup(clsOperator As ROperator) - Me.clsOperator = clsOperator dataGridSourceNotes.Rows.Clear() - Dim lstsourceNotesRFunctions As List(Of RFunction) = clsTablesUtils.FindRFunctionsWithRCommand("tab_source_note", clsOperator) - - For Each clsSourceNoteRFunct As RFunction In lstsourceNotesRFunctions - - ' Create a new row that represents the tab_footnote() parameters + Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_source_note"}, clsOperator) + For Each clsRParam As RParameter In lstRParams + Dim clsTabSourceNotesRFunction As RFunction = clsRParam.clsArgumentCodeStructure Dim row As New DataGridViewRow row.CreateCells(dataGridSourceNotes) - - For Each clsFootNoteRParam As RParameter In clsSourceNoteRFunct.clsParameters - If clsFootNoteRParam.strArgumentName = "source_note" Then - ' Set the foot note text - row.Cells(0).Value = clsTablesUtils.GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) + For Each clsTabSourceNoteRParam As RParameter In clsTabSourceNotesRFunction.clsParameters + If clsTabSourceNoteRParam.strArgumentName = "source_note" Then + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsTabSourceNoteRParam.strArgumentValue, False) End If Next - - ' Tag and add the tab_footnote() function contents as a row - row.Tag = clsSourceNoteRFunct + row.Tag = clsRParam dataGridSourceNotes.Rows.Add(row) - Next ' Always add a place holder row for new foot note dataGridSourceNotes.Rows.Add() - End Sub - Private Sub dataGridNotes_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridSourceNotes.CellClick - - ' Ignore clicks that are not from button cells. - If e.ColumnIndex <> 1 Then - Exit Sub - End If - - Dim clsNoteRFunction As RFunction = dataGridSourceNotes.Rows.Item(e.RowIndex).Tag - If clsNoteRFunction IsNot Nothing Then - clsTablesUtils.ShowTextFormatSubDialog(Me.ParentForm, clsNoteRFunction.GetParameter("source_note").clsArgumentCodeStructure) - End If - + Private Sub btnClearNotes_Click(sender As Object, e As EventArgs) Handles btnClearNotes.Click + dataGridSourceNotes.Rows.Clear() + dataGridSourceNotes.Rows.Add() End Sub Private Sub dataGridNotes_CellEndEdit(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridSourceNotes.CellEndEdit @@ -58,41 +40,13 @@ Public Class ucrSourceNotes Exit Sub End If - ' Get existing note function if it exists - Dim clsNoteRFunction As RFunction = row.Tag - - ' Get the prevous style parameter to retain any format options previously done - Dim clsStyleParam As RParameter = Nothing - If clsNoteRFunction IsNot Nothing Then - clsStyleParam = clsNoteRFunction.GetParameter("source_note").clsArgumentCodeStructure.GetParameter("style") - End If - - '-------------------------------------- - ' Recreate the footer function - Dim clsNewNoteRFunction As New RFunction - clsNewNoteRFunction.SetPackageName("gt") - clsNewNoteRFunction.SetRCommand("tab_source_note") - - Dim clsNoteTextRFunction As RFunction = clsTablesUtils.GetNewHtmlSpanRFunction() - clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=clsTablesUtils.GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) - - ' Add the previous style if it exists - If clsStyleParam IsNot Nothing Then - clsNoteTextRFunction.AddParameter(clsStyleParam) - End If - - ' Add the foot note text parameter to the footer R function - clsNewNoteRFunction.AddParameter(New RParameter(strParameterName:="source_note", strParamValue:=clsNoteTextRFunction, iNewPosition:=0)) - '-------------------------------------- + Dim clsTabSourceNoteRParam As New RFunction + clsTabSourceNoteRParam.SetPackageName("gt") + clsTabSourceNoteRParam.SetRCommand("tab_source_note") + clsTabSourceNoteRParam.AddParameter(New RParameter(strParameterName:="source_note", strParamValue:=clsTablesUtils.GetStringValue(strNoteTextValue, True), iNewPosition:=0)) - ' Overwrite the tag with the new foot function - row.Tag = clsNewNoteRFunction - - ' Remove all the tab source notes R Functions - clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"tab_source_note"}, clsOperator) - - ' Add all the tab source note RFunctions - clsTablesUtils.SetGridTagsInOperator(dataGridSourceNotes, "tab_source_note", clsOperator) + ' Overwrite the tag with the new unique parameter + row.Tag = New RParameter(strParameterName:="tab_source_note_param" & (dataGridSourceNotes.Rows.Count + 1), strParamValue:=clsTabSourceNoteRParam, bNewIncludeArgumentName:=False) ' If last row then add new empty row If e.RowIndex = dataGridSourceNotes.Rows.Count - 1 Then @@ -100,4 +54,8 @@ Public Class ucrSourceNotes End If End Sub + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_source_note"}, clsOperator), clsOperator) + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridSourceNotes, clsOperator) + End Sub End Class diff --git a/instat/UserTables/Stub/ucrStubStyle.Designer.vb b/instat/UserTables/Stub/ucrStubStyle.Designer.vb index ed0ee68e9a8..7db09228c98 100644 --- a/instat/UserTables/Stub/ucrStubStyle.Designer.vb +++ b/instat/UserTables/Stub/ucrStubStyle.Designer.vb @@ -36,7 +36,7 @@ Partial Class ucrStubStyle ' Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEnterStyle.Location = New System.Drawing.Point(8, 59) + Me.btnEnterStyle.Location = New System.Drawing.Point(8, 54) Me.btnEnterStyle.Name = "btnEnterStyle" Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) Me.btnEnterStyle.TabIndex = 335 @@ -48,7 +48,7 @@ Partial Class ucrStubStyle ' Me.lblFormats.AutoSize = True Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFormats.Location = New System.Drawing.Point(6, 90) + Me.lblFormats.Location = New System.Drawing.Point(6, 85) Me.lblFormats.Name = "lblFormats" Me.lblFormats.Size = New System.Drawing.Size(38, 13) Me.lblFormats.TabIndex = 338 @@ -57,7 +57,7 @@ Partial Class ucrStubStyle 'btnClearStyle ' Me.btnClearStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearStyle.Location = New System.Drawing.Point(290, 81) + Me.btnClearStyle.Location = New System.Drawing.Point(290, 76) Me.btnClearStyle.Name = "btnClearStyle" Me.btnClearStyle.Size = New System.Drawing.Size(75, 23) Me.btnClearStyle.TabIndex = 337 @@ -70,7 +70,7 @@ Partial Class ucrStubStyle Me.dataGridFormats.AllowUserToAddRows = False Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) - Me.dataGridFormats.Location = New System.Drawing.Point(8, 107) + Me.dataGridFormats.Location = New System.Drawing.Point(8, 102) Me.dataGridFormats.Name = "dataGridFormats" Me.dataGridFormats.RowHeadersWidth = 62 Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) @@ -95,9 +95,9 @@ Partial Class ucrStubStyle ' 'ucrRowExpression ' - Me.ucrRowExpression.Location = New System.Drawing.Point(8, 20) + Me.ucrRowExpression.Location = New System.Drawing.Point(3, 20) Me.ucrRowExpression.Name = "ucrRowExpression" - Me.ucrRowExpression.Size = New System.Drawing.Size(193, 26) + Me.ucrRowExpression.Size = New System.Drawing.Size(134, 26) Me.ucrRowExpression.TabIndex = 339 ' 'ucrStubStyle @@ -111,7 +111,7 @@ Partial Class ucrStubStyle Me.Controls.Add(Me.btnEnterStyle) Me.Controls.Add(Me.Label1) Me.Name = "ucrStubStyle" - Me.Size = New System.Drawing.Size(372, 186) + Me.Size = New System.Drawing.Size(372, 177) CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Stub/ucrStubStyle.vb b/instat/UserTables/Stub/ucrStubStyle.vb index 63df524732c..97b56f81f9e 100644 --- a/instat/UserTables/Stub/ucrStubStyle.vb +++ b/instat/UserTables/Stub/ucrStubStyle.vb @@ -15,13 +15,10 @@ ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator)) - End Sub Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) - For Each clsRParam As RParameter In lstRParams - ' Create a new row that represents the tab_style() parameters Dim row As New DataGridViewRow row.CreateCells(dataGridFormats) @@ -30,7 +27,6 @@ ' Tag and add the tab_style() parameter function contents as a row row.Tag = clsRParam dataGridFormats.Rows.Add(row) - Next End Sub @@ -46,7 +42,7 @@ clsLocationsRFunction.SetRCommand("cells_stub") If Not ucrRowExpression.IsEmpty Then - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetValue(), iNewPosition:=1)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetText(), iNewPosition:=1)) End If Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) @@ -64,7 +60,6 @@ ' Add it to grid dataGridFormats.Rows.Add(row) - End Sub Private Sub btnClearStyle_Click(sender As Object, e As EventArgs) Handles btnClearStyle.Click @@ -75,6 +70,4 @@ clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_stub", clsOperator), clsOperator) clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) End Sub - - End Class diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index ec2981c3dbc..f29633afb04 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -91,14 +91,12 @@ Public Class clsTablesUtils End Sub Public Shared Sub AddGridRowTagsRParamsToROperator(dataGrid As DataGridView, clsOperator As ROperator) - For index As Integer = 0 To dataGrid.Rows.Count - 1 If dataGrid.Rows.Item(index).Tag IsNot Nothing Then Dim clsRParam As RParameter = dataGrid.Rows.Item(index).Tag clsOperator.AddParameter(clsRParam) End If Next - End Sub ''' diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index 3ba79742503..cf5fcd4c456 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -24,24 +24,26 @@ Partial Class sdgTableOptions Private Sub InitializeComponent() Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() - Me.ucrHeader = New instat.ucrHeader() Me.tbpStub = New System.Windows.Forms.TabPage() - Me.ucrStub = New instat.ucrStub() Me.tbpColumns = New System.Windows.Forms.TabPage() - Me.ucrColumns = New instat.ucrColumns() Me.tbpRows = New System.Windows.Forms.TabPage() - Me.ucrRows = New instat.ucrRows() Me.tbpCells = New System.Windows.Forms.TabPage() - Me.ucrCells = New instat.ucrCells() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() - Me.ucrSourceNotes = New instat.ucrSourceNotes() Me.tbpThemes = New System.Windows.Forms.TabPage() - Me.ucrCboSelectThemes = New instat.ucrInputComboBox() Me.btnManualTheme = New System.Windows.Forms.Button() Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() - Me.ucrPnlThemesPanel = New instat.UcrPanel() + Me.tbpOtherStyles = New System.Windows.Forms.TabPage() Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() + Me.ucrHeader = New instat.ucrHeader() + Me.ucrStub = New instat.ucrStub() + Me.ucrColumns = New instat.ucrColumns() + Me.ucrRows = New instat.ucrRows() + Me.ucrCells = New instat.ucrCells() + Me.ucrSourceNotes = New instat.ucrSourceNotes() + Me.ucrCboSelectThemes = New instat.ucrInputComboBox() + Me.ucrPnlThemesPanel = New instat.UcrPanel() + Me.ucrOtherStyles = New instat.ucrOtherStyles() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpStub.SuspendLayout() @@ -50,6 +52,7 @@ Partial Class sdgTableOptions Me.tbpCells.SuspendLayout() Me.tbpSourceNotes.SuspendLayout() Me.tbpThemes.SuspendLayout() + Me.tbpOtherStyles.SuspendLayout() Me.SuspendLayout() ' 'tbpFormatOptions @@ -61,10 +64,11 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Controls.Add(Me.tbpCells) Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) + Me.tbpFormatOptions.Controls.Add(Me.tbpOtherStyles) Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 395) + Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 400) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader @@ -73,104 +77,61 @@ Partial Class sdgTableOptions Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(648, 369) + Me.tbpHeader.Size = New System.Drawing.Size(648, 374) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' - 'ucrHeader - ' - Me.ucrHeader.Location = New System.Drawing.Point(7, 6) - Me.ucrHeader.Name = "ucrHeader" - Me.ucrHeader.Size = New System.Drawing.Size(303, 266) - Me.ucrHeader.TabIndex = 16 - ' 'tbpStub ' Me.tbpStub.Controls.Add(Me.ucrStub) Me.tbpStub.Location = New System.Drawing.Point(4, 22) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(648, 369) + Me.tbpStub.Size = New System.Drawing.Size(648, 374) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True ' - 'ucrStub - ' - Me.ucrStub.Location = New System.Drawing.Point(7, 7) - Me.ucrStub.Name = "ucrStub" - Me.ucrStub.Size = New System.Drawing.Size(425, 258) - Me.ucrStub.TabIndex = 0 - ' 'tbpColumns ' Me.tbpColumns.Controls.Add(Me.ucrColumns) Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(648, 369) + Me.tbpColumns.Size = New System.Drawing.Size(648, 374) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True ' - 'ucrColumns - ' - Me.ucrColumns.Location = New System.Drawing.Point(5, 6) - Me.ucrColumns.Name = "ucrColumns" - Me.ucrColumns.Size = New System.Drawing.Size(632, 344) - Me.ucrColumns.TabIndex = 0 - ' 'tbpRows ' Me.tbpRows.Controls.Add(Me.ucrRows) Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(648, 369) + Me.tbpRows.Size = New System.Drawing.Size(648, 374) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True ' - 'ucrRows - ' - Me.ucrRows.Location = New System.Drawing.Point(7, 9) - Me.ucrRows.Name = "ucrRows" - Me.ucrRows.Size = New System.Drawing.Size(600, 345) - Me.ucrRows.TabIndex = 0 - ' 'tbpCells ' Me.tbpCells.Controls.Add(Me.ucrCells) Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(648, 369) + Me.tbpCells.Size = New System.Drawing.Size(648, 374) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True ' - 'ucrCells - ' - Me.ucrCells.Location = New System.Drawing.Point(8, 8) - Me.ucrCells.Name = "ucrCells" - Me.ucrCells.Size = New System.Drawing.Size(644, 360) - Me.ucrCells.TabIndex = 6 - ' 'tbpSourceNotes ' Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 369) + Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 374) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' - 'ucrSourceNotes - ' - Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) - Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSourceNotes.Name = "ucrSourceNotes" - Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) - Me.ucrSourceNotes.TabIndex = 0 - ' 'tbpThemes ' Me.tbpThemes.Controls.Add(Me.ucrCboSelectThemes) @@ -180,23 +141,11 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(648, 369) + Me.tbpThemes.Size = New System.Drawing.Size(648, 374) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True ' - 'ucrCboSelectThemes - ' - Me.ucrCboSelectThemes.AddQuotesIfUnrecognised = True - Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 - Me.ucrCboSelectThemes.IsReadOnly = False - Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" - Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) - Me.ucrCboSelectThemes.TabIndex = 3 - ' 'btnManualTheme ' Me.btnManualTheme.Location = New System.Drawing.Point(157, 59) @@ -228,6 +177,81 @@ Partial Class sdgTableOptions Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True ' + 'tbpOtherStyles + ' + Me.tbpOtherStyles.Controls.Add(Me.ucrOtherStyles) + Me.tbpOtherStyles.Location = New System.Drawing.Point(4, 22) + Me.tbpOtherStyles.Name = "tbpOtherStyles" + Me.tbpOtherStyles.Padding = New System.Windows.Forms.Padding(3) + Me.tbpOtherStyles.Size = New System.Drawing.Size(648, 374) + Me.tbpOtherStyles.TabIndex = 10 + Me.tbpOtherStyles.Text = "Other Styles" + Me.tbpOtherStyles.UseVisualStyleBackColor = True + ' + 'ucrSdgBaseButtons + ' + Me.ucrSdgBaseButtons.AutoSize = True + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 410) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.TabIndex = 343 + ' + 'ucrHeader + ' + Me.ucrHeader.Location = New System.Drawing.Point(7, 6) + Me.ucrHeader.Name = "ucrHeader" + Me.ucrHeader.Size = New System.Drawing.Size(303, 266) + Me.ucrHeader.TabIndex = 16 + ' + 'ucrStub + ' + Me.ucrStub.Location = New System.Drawing.Point(7, 7) + Me.ucrStub.Name = "ucrStub" + Me.ucrStub.Size = New System.Drawing.Size(425, 258) + Me.ucrStub.TabIndex = 0 + ' + 'ucrColumns + ' + Me.ucrColumns.Location = New System.Drawing.Point(5, 6) + Me.ucrColumns.Name = "ucrColumns" + Me.ucrColumns.Size = New System.Drawing.Size(632, 360) + Me.ucrColumns.TabIndex = 0 + ' + 'ucrRows + ' + Me.ucrRows.Location = New System.Drawing.Point(7, 9) + Me.ucrRows.Name = "ucrRows" + Me.ucrRows.Size = New System.Drawing.Size(600, 345) + Me.ucrRows.TabIndex = 0 + ' + 'ucrCells + ' + Me.ucrCells.Location = New System.Drawing.Point(8, 8) + Me.ucrCells.Name = "ucrCells" + Me.ucrCells.Size = New System.Drawing.Size(644, 360) + Me.ucrCells.TabIndex = 6 + ' + 'ucrSourceNotes + ' + Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) + Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSourceNotes.Name = "ucrSourceNotes" + Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) + Me.ucrSourceNotes.TabIndex = 0 + ' + 'ucrCboSelectThemes + ' + Me.ucrCboSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 + Me.ucrCboSelectThemes.IsReadOnly = False + Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" + Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) + Me.ucrCboSelectThemes.TabIndex = 3 + ' 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -237,20 +261,18 @@ Partial Class sdgTableOptions Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) Me.ucrPnlThemesPanel.TabIndex = 4 ' - 'ucrSdgBaseButtons + 'ucrOtherStyles ' - Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 401) - Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) - Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" - Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) - Me.ucrSdgBaseButtons.TabIndex = 343 + Me.ucrOtherStyles.Location = New System.Drawing.Point(8, 7) + Me.ucrOtherStyles.Name = "ucrOtherStyles" + Me.ucrOtherStyles.Size = New System.Drawing.Size(326, 179) + Me.ucrOtherStyles.TabIndex = 0 ' 'sdgTableOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(661, 437) + Me.ClientSize = New System.Drawing.Size(661, 443) Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.tbpFormatOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow @@ -266,6 +288,7 @@ Partial Class sdgTableOptions Me.tbpSourceNotes.ResumeLayout(False) Me.tbpThemes.ResumeLayout(False) Me.tbpThemes.PerformLayout() + Me.tbpOtherStyles.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -290,4 +313,6 @@ Partial Class sdgTableOptions Friend WithEvents ucrStub As ucrStub Friend WithEvents ucrCells As ucrCells Friend WithEvents ucrSdgBaseButtons As ucrButtonsSubdialogue + Friend WithEvents tbpOtherStyles As TabPage + Friend WithEvents ucrOtherStyles As ucrOtherStyles End Class diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index f5d86e1e9ab..6986266ee5e 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -23,10 +23,14 @@ Public Class sdgTableOptions Private bFirstload As Boolean = True Private Sub sdgTableOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If autoTranslate(Me) End Sub - Private Sub initialiseDialog() + Private Sub InitialiseDialog() ucrPnlThemesPanel.AddRadioButton(rdoSelectTheme) ucrPnlThemesPanel.AddRadioButton(rdoManualTheme) @@ -46,10 +50,6 @@ Public Class sdgTableOptions Exit Sub End If - If bFirstload Then - initialiseDialog() - bFirstload = False - End If clsOperator = clsNewOperator @@ -58,9 +58,10 @@ Public Class sdgTableOptions ucrRows.Setup(strDataFrameName, clsOperator) ucrColumns.Setup(strDataFrameName, clsOperator) ucrCells.Setup(strDataFrameName, clsOperator) - SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator) ucrSourceNotes.Setup(clsOperator) - SetupThemeRFunctionsInOperatorOnNew(clsOperator) + ucrOtherStyles.Setup(clsOperator) + + SetupTheme(clsOperator) End Sub Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn @@ -68,107 +69,19 @@ Public Class sdgTableOptions ucrStub.SetValuesToOperator() ucrColumns.SetValuesToOperator() ucrCells.SetValuesToOperator() - SetThemesInOperatorOnReturn(clsOperator) - End Sub - - - - - - - '----------------------------------------- - ' FOOTER CONTROLS - - Private Sub SetupFooterNotesRFunctionsInOperatorOnNew(clsOperator As ROperator) - 'SetFooterGridContents(clsOperator, dataGridHeaderFooterNotes) - 'SetFooterGridContents(clsOperator, dataGridCellFooterNotes) - End Sub - - Private Sub SetFooterGridContents(clsOperator As ROperator, dataGridFooterNotes As DataGridView) - dataGridFooterNotes.Rows.Clear() - - For Each clsFootNoteFunctRParam As RParameter In clsOperator.clsParameters - If clsFootNoteFunctRParam.strArgumentName.Contains("tab_footnote") Then - ' Create a new row that represents the tab_footnote() parameters - Dim row As New DataGridViewRow - row.CreateCells(dataGridFooterNotes) - - Dim clsFooterRFunction As RFunction = clsFootNoteFunctRParam.clsArgumentCodeStructure - - For Each clsFootNoteRParam As RParameter In clsFooterRFunction.clsParameters - - If clsFootNoteRParam.strArgumentName = "footnote" Then - ' Set the foot note text - row.Cells(0).Value = GetStringValue(clsFootNoteRParam.clsArgumentCodeStructure.clsParameters(0).strArgumentValue, False) - ElseIf clsFootNoteRParam.strArgumentName = "locations" Then - ' todo go through the location function - Dim clsFooterLocationNoteRFunction As RFunction = clsFootNoteRParam.clsArgumentCodeStructure - - 'If clsFooterLocationNoteRFunction.strRCommand = "cells_body" AndAlso dataGridFooterNotes Is dataGridCellFooterNotes Then - ' For Each clsFootNoteLocationRParam As RParameter In clsFooterLocationNoteRFunction.clsParameters - ' If clsFootNoteLocationRParam.strArgumentName = "columns" Then - ' row.Cells(1).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - ' ElseIf clsFootNoteLocationRParam.strArgumentName = "rows" Then - ' row.Cells(2).Value = GetStringValue(clsFootNoteLocationRParam.strArgumentValue, False) - ' End If - ' Next - 'End If - End If - - ' Tag and add the tab_footnote() function contents as a row - ' Check if second cell has a value - If row.Cells(1).Value IsNot Nothing Then - row.Tag = clsFooterRFunction - dataGridFooterNotes.Rows.Add(row) - End If - - - Next - - End If - Next - - ' Always add a place holder row for new foot note - dataGridFooterNotes.Rows.Add() - + ucrSourceNotes.SetValuesToOperator() + ucrOtherStyles.SetValuesToOperator() + SetThemeValuesOnReturn(clsOperator) End Sub - - Private Function SetupAndGetNewNoteRFunction(clsPossibleNoteRFunction As RFunction, strNoteRCommand As String, strRNoteTextParameterName As String, strNoteTextValue As String) As RFunction - Dim clsNewNoteRFunction As RFunction = clsPossibleNoteRFunction - ' Get the prevous style parameter to retain any format options previously done - Dim clsStyleParam As RParameter - If clsNewNoteRFunction IsNot Nothing Then - clsStyleParam = clsNewNoteRFunction.GetParameter(strRNoteTextParameterName).clsArgumentCodeStructure.GetParameter("style") - Else - clsStyleParam = New RParameter(strParameterName:="style", strParamValue:=clsTablesUtils.GetNewHtmlStyleRFunction(), iNewPosition:=1) - End If - - - ' Recreate the footer function - clsNewNoteRFunction = New RFunction - clsNewNoteRFunction.SetPackageName("gt") - clsNewNoteRFunction.SetRCommand(strNoteRCommand) - - Dim clsNoteTextRFunction As RFunction = clsTablesUtils.GetNewHtmlSpanRFunction() - clsNoteTextRFunction.AddParameter(New RParameter(strParameterName:="", strParamValue:=GetStringValue(strNoteTextValue, True), iNewPosition:=0, bNewIncludeArgumentName:=False)) - clsNoteTextRFunction.AddParameter(clsStyleParam) ' Add the style parameter for formating - - ' Add the foot note text parameter to the footer R function - clsNewNoteRFunction.AddParameter(New RParameter(strParameterName:=strRNoteTextParameterName, strParamValue:=clsNoteTextRFunction, iNewPosition:=0)) - Return clsNewNoteRFunction - End Function - - '----------------------------------------- - '----------------------------------------- ' Themes - Private Sub SetupThemeRFunctionsInOperatorOnNew(clsOperator As ROperator) + Private Sub SetupTheme(clsOperator As ROperator) clsThemeRFunction = New RFunction - ' Uncheck then the select radio button to orces the panel to raise it ControlValueChanged event + ' Uncheck then the check radio button to forces the panel to raise its ControlValueChanged event rdoSelectTheme.Checked = False rdoSelectTheme.Checked = True @@ -187,15 +100,6 @@ Public Class sdgTableOptions End Sub - Private Sub SetThemesInOperatorOnReturn(clsOperator As ROperator) - ' Set the themes parameter if there was a theme selected - If clsThemeRFunction IsNot Nothing AndAlso Not String.IsNullOrEmpty(clsThemeRFunction.strRCommand) Then - clsOperator.AddParameter("theme_format", clsRFunctionParameter:=clsThemeRFunction) - Else - clsOperator.RemoveParameterByName("theme_format") - End If - End Sub - Private Sub ucrPnlThemes_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlThemesPanel.ControlValueChanged ucrCboSelectThemes.Visible = False btnManualTheme.Visible = False @@ -245,15 +149,16 @@ Public Class sdgTableOptions sdgSummaryThemes.SetRCode(bReset:=True, clsNewThemesTabOption:=clsThemeRFunction) sdgSummaryThemes.ShowDialog(Me) End Sub - '----------------------------------------- - '----------------------------------------- - Private Function GetStringValue(str As String, bwithQuotes As Boolean) As String - If String.IsNullOrEmpty(str) Then - str = "" + Private Sub SetThemeValuesOnReturn(clsOperator As ROperator) + ' Set the themes parameter if there was a theme selected + If clsThemeRFunction IsNot Nothing AndAlso Not String.IsNullOrEmpty(clsThemeRFunction.strRCommand) Then + clsOperator.AddParameter("theme_format", clsRFunctionParameter:=clsThemeRFunction) + Else + clsOperator.RemoveParameterByName("theme_format") End If - Return If(bwithQuotes, """" & str & """", str.Replace("""", "")) - End Function + End Sub + '----------------------------------------- End Class \ No newline at end of file diff --git a/instat/UserTables/sdgTableRowExpression.vb b/instat/UserTables/sdgTableRowExpression.vb index c46c7d71ec0..9a45cce5a1c 100644 --- a/instat/UserTables/sdgTableRowExpression.vb +++ b/instat/UserTables/sdgTableRowExpression.vb @@ -1,8 +1,19 @@ Public Class sdgTableRowExpression Private bFirstload As Boolean = True + Public bUserClickedReturn As Boolean = False + + Private Sub sdgTableRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + + bUserClickedReturn = False + End Sub Private Sub InitialiseControl() ucrReceiverExpression.Selector = ucrSelectorCols + ucrReceiverExpression.SetMeAsReceiver() End Sub Public Sub Setup(strDataFrameName As String) @@ -14,17 +25,22 @@ ' Set up the selector ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) - ucrReceiverExpression.SetMeAsReceiver() - ucrReceiverExpression.ResetText() + ucrReceiverExpression.Clear() End Sub ' TODO. In future this can be refactored to return an RFUnction - Public Function GetRowExpression() As String + Public Function GetUserInputRowExpression() As String Return ucrReceiverExpression.GetText() End Function Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click ucrReceiverExpression.AddToReceiverAtCursorPosition(cboCondition.Text) End Sub + + Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn + bUserClickedReturn = True + End Sub + + End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 2d821c83cbe..e7cdb7605de 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -410,6 +410,18 @@ UserControl + + ucrColumnNanoPlots.vb + + + UserControl + + + ucrColumnStyles.vb + + + UserControl + ucrColumnWidth.vb @@ -422,6 +434,12 @@ Form + + ucrOtherStyles.vb + + + UserControl + ucrRowExpression.vb @@ -3411,12 +3429,18 @@ ucrColumnFootNote.vb + + ucrColumnStyles.vb + ucrColumnWidth.vb dlgGeneralTable.vb + + ucrOtherStyles.vb + ucrRowExpression.vb From 68ba2b3833034b13464dcdc5a77860d9d0dcd513 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 29 Jul 2024 02:17:15 +0300 Subject: [PATCH 085/273] changes to spanners, formats and styles --- .../Cells/Formats/ucrCellFormats.Designer.vb | 60 ++++++++++--------- .../Cells/Styles/ucrCellStyles.Designer.vb | 10 ++-- .../Columns/ucrColumnSpanners.Designer.vb | 2 +- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb index 52d896963b5..50da2a9ebce 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.Designer.vb @@ -26,9 +26,6 @@ Partial Class ucrCellFormats Me.btnClearFormats = New System.Windows.Forms.Button() Me.btnEnterFormat = New System.Windows.Forms.Button() Me.dataGridFormats = New System.Windows.Forms.DataGridView() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.lblColumns = New System.Windows.Forms.Label() Me.cboSelectFormat = New System.Windows.Forms.ComboBox() Me.Label2 = New System.Windows.Forms.Label() @@ -36,6 +33,9 @@ Partial Class ucrCellFormats Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrRowExpression = New instat.ucrRowExpression() Me.Label1 = New System.Windows.Forms.Label() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colRow = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -79,31 +79,11 @@ Partial Class ucrCellFormats Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colCodnition, Me.colLabel, Me.colRow}) Me.dataGridFormats.Location = New System.Drawing.Point(234, 237) Me.dataGridFormats.Name = "dataGridFormats" + Me.dataGridFormats.ReadOnly = True Me.dataGridFormats.RowHeadersWidth = 62 Me.dataGridFormats.Size = New System.Drawing.Size(361, 73) Me.dataGridFormats.TabIndex = 307 ' - 'colCodnition - ' - Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colCodnition.HeaderText = "Format" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.Width = 64 - ' - 'colLabel - ' - Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells - Me.colLabel.HeaderText = "Column(s)" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.Width = 78 - ' - 'colRow - ' - Me.colRow.HeaderText = "Row(s)" - Me.colRow.Name = "colRow" - ' 'lblColumns ' Me.lblColumns.AutoSize = True @@ -142,7 +122,7 @@ Partial Class ucrCellFormats Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 55) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(132, 55) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 317 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -163,7 +143,7 @@ Partial Class ucrCellFormats ' Me.ucrRowExpression.Location = New System.Drawing.Point(234, 158) Me.ucrRowExpression.Name = "ucrRowExpression" - Me.ucrRowExpression.Size = New System.Drawing.Size(193, 25) + Me.ucrRowExpression.Size = New System.Drawing.Size(132, 25) Me.ucrRowExpression.TabIndex = 334 ' 'Label1 @@ -176,6 +156,30 @@ Partial Class ucrCellFormats Me.Label1.TabIndex = 333 Me.Label1.Text = "Row Expression (Optional):" ' + 'colCodnition + ' + Me.colCodnition.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colCodnition.HeaderText = "Format" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.ReadOnly = True + Me.colCodnition.Width = 64 + ' + 'colLabel + ' + Me.colLabel.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.DisplayedCells + Me.colLabel.HeaderText = "Column(s)" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 78 + ' + 'colRow + ' + Me.colRow.HeaderText = "Row Expression" + Me.colRow.Name = "colRow" + Me.colRow.ReadOnly = True + ' 'ucrCellFormats ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -207,9 +211,9 @@ Partial Class ucrCellFormats Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents cboSelectFormat As ComboBox Friend WithEvents Label2 As Label + Friend WithEvents ucrRowExpression As ucrRowExpression + Friend WithEvents Label1 As Label Friend WithEvents colCodnition As DataGridViewTextBoxColumn Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colRow As DataGridViewTextBoxColumn - Friend WithEvents ucrRowExpression As ucrRowExpression - Friend WithEvents Label1 As Label End Class diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb index 574d86ef133..0a131aa8302 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb @@ -39,7 +39,7 @@ Partial Class ucrCellStyles ' Me.lblRowExpression.AutoSize = True Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowExpression.Location = New System.Drawing.Point(237, 86) + Me.lblRowExpression.Location = New System.Drawing.Point(245, 86) Me.lblRowExpression.Name = "lblRowExpression" Me.lblRowExpression.Size = New System.Drawing.Size(134, 13) Me.lblRowExpression.TabIndex = 329 @@ -88,7 +88,7 @@ Partial Class ucrCellStyles ' Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEnterStyle.Location = New System.Drawing.Point(239, 133) + Me.btnEnterStyle.Location = New System.Drawing.Point(244, 136) Me.btnEnterStyle.Name = "btnEnterStyle" Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) Me.btnEnterStyle.TabIndex = 4 @@ -100,7 +100,7 @@ Partial Class ucrCellStyles ' Me.Label1.AutoSize = True Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(239, 7) + Me.Label1.Location = New System.Drawing.Point(246, 7) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(56, 13) Me.Label1.TabIndex = 331 @@ -108,7 +108,7 @@ Partial Class ucrCellStyles ' 'ucrRowExpression ' - Me.ucrRowExpression.Location = New System.Drawing.Point(234, 104) + Me.ucrRowExpression.Location = New System.Drawing.Point(246, 103) Me.ucrRowExpression.Name = "ucrRowExpression" Me.ucrRowExpression.Size = New System.Drawing.Size(124, 26) Me.ucrRowExpression.TabIndex = 332 @@ -117,7 +117,7 @@ Partial Class ucrCellStyles ' Me.ucrReceiverMultipleCols.AutoSize = True Me.ucrReceiverMultipleCols.frmParent = Nothing - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(236, 23) + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(244, 23) Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing diff --git a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb index 3c17ade50da..ed4db379dcd 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb @@ -170,7 +170,7 @@ Partial Class ucrColumnSpanners ' 'colStyleExpression ' - Me.colStyleExpression.HeaderText = "Style" + Me.colStyleExpression.HeaderText = "Style Expression" Me.colStyleExpression.Name = "colStyleExpression" Me.colStyleExpression.ReadOnly = True Me.colStyleExpression.Width = 90 From 91c887bab4801616b0e01debb5836b4e46ce5a13 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 29 Jul 2024 14:58:13 +0300 Subject: [PATCH 086/273] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 52 +++++++++---------- instat/dlgDescribeTwoVariable.vb | 63 +++++++++++++++++++---- 2 files changed, 79 insertions(+), 36 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 6cc4feeec45..7663e9c6357 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,6 +60,8 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.rdoOCol = New System.Windows.Forms.RadioButton() Me.rdoOCell = New System.Windows.Forms.RadioButton() Me.rdoORow = New System.Windows.Forms.RadioButton() @@ -69,8 +71,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() - Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrBase = New instat.ucrButtons() @@ -358,6 +358,29 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Me + Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' 'rdoOCol ' Me.rdoOCol.AutoSize = True @@ -461,29 +484,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' - 'ucrReceiverColumns - ' - Me.ucrReceiverColumns.AutoSize = True - Me.ucrReceiverColumns.frmParent = Nothing - Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) - Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 - Me.ucrReceiverColumns.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) - Me.ucrChkDisplayAsPercentage.TabIndex = 54 - ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True @@ -685,12 +685,12 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.lblThreeVariableSecondFactor) Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkDisplayMargins) - Me.Controls.Add(Me.ucrChkSwapXYVar) Me.Controls.Add(Me.ucrChkCorrelations) Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.cmdMissingOptions) Me.Controls.Add(Me.ucrChkSummariesRowCol) + Me.Controls.Add(Me.ucrChkSwapXYVar) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 3a9f8157a09..5c10188b463 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -652,6 +652,7 @@ Public Class dlgDescribeTwoVariable ucrReorderSummary.Visible = False cmdSummaries.Visible = False End If + ucrChkSwapXYVar.Visible = IsNumericByNumericByNumeric() OrElse IsNumericByNumericByFactor() 'ucrChkDisplayMargins.Visible = IsFactorByFactorByFactor() 'ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByFactor() ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() @@ -743,6 +744,7 @@ Public Class dlgDescribeTwoVariable strObjectName:="last_table") ElseIf IsFactorByNumeric() Then ucrBase.clsRsyntax.RemoveFromAfterCodes(clsRCorrelationFunction) + If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) @@ -808,9 +810,17 @@ Public Class dlgDescribeTwoVariable strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, strObjectName:="last_table") ElseIf IsNumericByNumericByFactor() Then - ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) cmdFormatTable.Visible = False ucrSaveTable.Visible = False + ucrChkMeans.Visible = True + ucrChkLevSig.Visible = True + If ucrChkSwapXYVar.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) + clsDummyFunction.AddParameter("var", "True", iPosition:=5) + Else + clsDummyFunction.AddParameter("var", "False", iPosition:=5) + ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) + End If ElseIf IsNumericByNumericByNumeric() Then cmdFormatTable.Visible = False ucrSaveTable.Visible = False @@ -959,15 +969,17 @@ Public Class dlgDescribeTwoVariable Me.Size = New Point(iDialogueXsize, 425) End If ElseIf rdoThreeVariable.Checked Then + If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then - ucrBase.Location = New Point(iUcrBaseXLocation, 328) - Me.Size = New Point(iDialogueXsize, 425) + ucrBase.Location = New Point(iUcrBaseXLocation, 353) + ucrChkSwapXYVar.Location = New Point(300, 320) + Me.Size = New Point(iDialogueXsize, 450) ElseIf IsFactorByFactorByFactor() Then ucrBase.Location = New Point(iUcrBaseXLocation, 370) Me.Size = New Point(iDialogueXsize, 465) cmdFormatTable.Visible = True cmdFormatTable.Location = New Point(326, 350) - ElseIf IsFactorByFactorByNumeric OrElse IsFactorByNumericByFactor Then + ElseIf IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then ucrBase.Location = New Point(iUcrBaseXLocation, 470) Me.Size = New Point(iDialogueXsize, 570) Else @@ -1074,12 +1086,23 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveFirstAnova2Param() If rdoThreeVariable.Checked Then - If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then - If ucrReceiverFirstVars.IsEmpty Then + If ucrReceiverFirstVars.IsEmpty Then + If IsNumericByNumericByFactor() Then + If ucrChkSwapXYVar.Checked Then + clsYlist2Operator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsYlistOperator.RemoveParameterByName("cols") + Else + clsYlistOperator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) + clsYlist2Operator.RemoveParameterByName("cols") + End If + ElseIf IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then clsYlistOperator.RemoveParameterByName("cols") Else clsYlistOperator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) End If + Else + clsYlist2Operator.RemoveParameterByName("cols") + clsYlistOperator.RemoveParameterByName("cols") End If ElseIf rdoTwoVariable.Checked Then If IsNumericByNumeric() Then @@ -1125,12 +1148,26 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveSecondAnovaParam() If rdoThreeVariable.Checked Then - If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then - If ucrReceiverThreeVariableSecondFactor.IsEmpty Then - clsCombineAnova2Function.RemoveParameterByName("x") - Else + If ucrReceiverThreeVariableSecondFactor.IsEmpty Then + If IsNumericByNumericByFactor() Then + If ucrChkSwapXYVar.Checked Then + clsCombineSwapAnova2Table.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + clsCombineAnova2Function.RemoveParameterByName("x") + Else + clsCombineAnova2Function.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + clsCombineSwapAnova2Table.RemoveParameterByName("x") + + End If + ElseIf IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then clsCombineAnova2Function.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + + Else + clsCombineAnova2Function.RemoveParameterByName("x") + clsCombineSwapAnova2Table.RemoveParameterByName("x") End If + Else + clsCombineAnova2Function.RemoveParameterByName("x") + clsCombineSwapAnova2Table.RemoveParameterByName("x") End If ElseIf rdoTwoVariable.Checked Then If IsNumericByNumeric() Then @@ -1168,6 +1205,9 @@ Public Class dlgDescribeTwoVariable Else clsCombineAnova2Function.AddParameter("x", ucrReceiverSecondTwoVariableFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) End If + Else + clsCombineSwapAnova2Table.RemoveParameterByName("x") + clsCombineAnova2Function.RemoveParameterByName("x") End If End If @@ -1502,6 +1542,7 @@ Public Class dlgDescribeTwoVariable ChangeLocations() ChangeSumaryLabelText() ChangeBaseRCode() + ManageControlsVisibility() End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, @@ -1637,6 +1678,8 @@ Public Class dlgDescribeTwoVariable AddRemoveSecondAnovaParam() ChangeBaseRCode() ChangeSumaryLabelText() + ManageControlsVisibility() + ChangeLocations() End Sub Private Sub AddingColumnFactor() From ead8824dfd51202d2222da9f07a0fef686cb951e Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 30 Jul 2024 10:12:01 +0300 Subject: [PATCH 087/273] changes --- instat/dlgPICSACrops.Designer.vb | 140 +++++++++++++++---------------- instat/dlgPICSACrops.vb | 39 ++++----- 2 files changed, 87 insertions(+), 92 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index ac4f6ae41d3..34a7dc95109 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -46,18 +46,19 @@ Partial Class dlgPICSACrops Me.Label6 = New System.Windows.Forms.Label() Me.cmdOptions = New System.Windows.Forms.Button() Me.grpSeasonReceivers = New System.Windows.Forms.GroupBox() - Me.ucrReceiverStart = New instat.ucrReceiverSingle() - Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.grpCropDefinitions = New System.Windows.Forms.GroupBox() - Me.ucrInputCropLengths = New instat.ucrInputComboBox() - Me.ucrInputPlantingDates = New instat.ucrInputComboBox() Me.rdoBoth = New System.Windows.Forms.RadioButton() Me.rdoNo = New System.Windows.Forms.RadioButton() Me.rdoYes = New System.Windows.Forms.RadioButton() Me.lblPlantingDays = New System.Windows.Forms.Label() Me.lblCropLengthDays = New System.Windows.Forms.Label() Me.lblWaterAmounts = New System.Windows.Forms.Label() + Me.ucrInputCropLengths = New instat.ucrInputComboBox() + Me.ucrInputWaterAmounts = New instat.ucrInputComboBox() + Me.ucrInputPlantingDates = New instat.ucrInputComboBox() Me.ucrPnlStartCheck = New instat.UcrPanel() + Me.ucrReceiverStart = New instat.ucrReceiverSingle() + Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.ucrChkDataProp = New instat.ucrCheck() Me.ucrChkPrintDataProp = New instat.ucrCheck() Me.ucrReceiverRainfall = New instat.ucrReceiverSingle() @@ -66,7 +67,6 @@ Partial Class dlgPICSACrops Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrSelectorForCrops = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() - Me.ucrInputWaterAmounts = New instat.ucrInputComboBox() Me.grpSeasonReceivers.SuspendLayout() Me.grpCropDefinitions.SuspendLayout() Me.SuspendLayout() @@ -164,36 +164,10 @@ Partial Class dlgPICSACrops Me.grpSeasonReceivers.TabStop = False Me.grpSeasonReceivers.Text = "Season Dates" ' - 'ucrReceiverStart - ' - Me.ucrReceiverStart.AutoSize = True - Me.ucrReceiverStart.frmParent = Me - Me.ucrReceiverStart.Location = New System.Drawing.Point(15, 51) - Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStart.Name = "ucrReceiverStart" - Me.ucrReceiverStart.Selector = Nothing - Me.ucrReceiverStart.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverStart.strNcFilePath = "" - Me.ucrReceiverStart.TabIndex = 19 - Me.ucrReceiverStart.ucrSelector = Nothing - ' - 'ucrReceiverEnd - ' - Me.ucrReceiverEnd.AutoSize = True - Me.ucrReceiverEnd.frmParent = Me - Me.ucrReceiverEnd.Location = New System.Drawing.Point(213, 51) - Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEnd.Name = "ucrReceiverEnd" - Me.ucrReceiverEnd.Selector = Nothing - Me.ucrReceiverEnd.Size = New System.Drawing.Size(180, 33) - Me.ucrReceiverEnd.strNcFilePath = "" - Me.ucrReceiverEnd.TabIndex = 26 - Me.ucrReceiverEnd.ucrSelector = Nothing - ' 'grpCropDefinitions ' - Me.grpCropDefinitions.Controls.Add(Me.ucrInputWaterAmounts) Me.grpCropDefinitions.Controls.Add(Me.ucrInputCropLengths) + Me.grpCropDefinitions.Controls.Add(Me.ucrInputWaterAmounts) Me.grpCropDefinitions.Controls.Add(Me.ucrInputPlantingDates) Me.grpCropDefinitions.Controls.Add(Me.rdoBoth) Me.grpCropDefinitions.Controls.Add(Me.rdoNo) @@ -211,30 +185,6 @@ Partial Class dlgPICSACrops Me.grpCropDefinitions.TabStop = False Me.grpCropDefinitions.Text = "Crop Definitions" ' - 'ucrInputCropLengths - ' - Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True - Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCropLengths.GetSetSelectedIndex = -1 - Me.ucrInputCropLengths.IsReadOnly = False - Me.ucrInputCropLengths.Location = New System.Drawing.Point(268, 188) - Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputCropLengths.Name = "ucrInputCropLengths" - Me.ucrInputCropLengths.Size = New System.Drawing.Size(206, 32) - Me.ucrInputCropLengths.TabIndex = 54 - ' - 'ucrInputPlantingDates - ' - Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True - Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 - Me.ucrInputPlantingDates.IsReadOnly = False - Me.ucrInputPlantingDates.Location = New System.Drawing.Point(268, 87) - Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" - Me.ucrInputPlantingDates.Size = New System.Drawing.Size(206, 32) - Me.ucrInputPlantingDates.TabIndex = 53 - ' 'rdoBoth ' Me.rdoBoth.AutoSize = True @@ -291,13 +241,49 @@ Partial Class dlgPICSACrops 'lblWaterAmounts ' Me.lblWaterAmounts.AutoSize = True - Me.lblWaterAmounts.Location = New System.Drawing.Point(8, 146) + Me.lblWaterAmounts.Location = New System.Drawing.Point(8, 142) Me.lblWaterAmounts.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWaterAmounts.Name = "lblWaterAmounts" Me.lblWaterAmounts.Size = New System.Drawing.Size(134, 20) Me.lblWaterAmounts.TabIndex = 40 Me.lblWaterAmounts.Text = "Water Amount(s):" ' + 'ucrInputCropLengths + ' + Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True + Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputCropLengths.GetSetSelectedIndex = -1 + Me.ucrInputCropLengths.IsReadOnly = False + Me.ucrInputCropLengths.Location = New System.Drawing.Point(267, 194) + Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputCropLengths.Name = "ucrInputCropLengths" + Me.ucrInputCropLengths.Size = New System.Drawing.Size(206, 32) + Me.ucrInputCropLengths.TabIndex = 55 + ' + 'ucrInputWaterAmounts + ' + Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True + Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 + Me.ucrInputWaterAmounts.IsReadOnly = False + Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(268, 138) + Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" + Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(206, 32) + Me.ucrInputWaterAmounts.TabIndex = 40 + ' + 'ucrInputPlantingDates + ' + Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True + Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 + Me.ucrInputPlantingDates.IsReadOnly = False + Me.ucrInputPlantingDates.Location = New System.Drawing.Point(268, 87) + Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" + Me.ucrInputPlantingDates.Size = New System.Drawing.Size(206, 32) + Me.ucrInputPlantingDates.TabIndex = 53 + ' 'ucrPnlStartCheck ' Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -307,6 +293,32 @@ Partial Class dlgPICSACrops Me.ucrPnlStartCheck.Size = New System.Drawing.Size(476, 56) Me.ucrPnlStartCheck.TabIndex = 46 ' + 'ucrReceiverStart + ' + Me.ucrReceiverStart.AutoSize = True + Me.ucrReceiverStart.frmParent = Nothing + Me.ucrReceiverStart.Location = New System.Drawing.Point(15, 51) + Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStart.Name = "ucrReceiverStart" + Me.ucrReceiverStart.Selector = Nothing + Me.ucrReceiverStart.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverStart.strNcFilePath = "" + Me.ucrReceiverStart.TabIndex = 19 + Me.ucrReceiverStart.ucrSelector = Nothing + ' + 'ucrReceiverEnd + ' + Me.ucrReceiverEnd.AutoSize = True + Me.ucrReceiverEnd.frmParent = Nothing + Me.ucrReceiverEnd.Location = New System.Drawing.Point(213, 51) + Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEnd.Name = "ucrReceiverEnd" + Me.ucrReceiverEnd.Selector = Nothing + Me.ucrReceiverEnd.Size = New System.Drawing.Size(180, 33) + Me.ucrReceiverEnd.strNcFilePath = "" + Me.ucrReceiverEnd.TabIndex = 26 + Me.ucrReceiverEnd.ucrSelector = Nothing + ' 'ucrChkDataProp ' Me.ucrChkDataProp.AutoSize = True @@ -401,18 +413,6 @@ Partial Class dlgPICSACrops Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 0 ' - 'ucrInputWaterAmounts - ' - Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True - Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 - Me.ucrInputWaterAmounts.IsReadOnly = False - Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(268, 128) - Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" - Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(206, 32) - Me.ucrInputWaterAmounts.TabIndex = 40 - ' 'dlgPICSACrops ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) @@ -477,6 +477,6 @@ Partial Class dlgPICSACrops Friend WithEvents rdoYes As RadioButton Friend WithEvents ucrPnlStartCheck As UcrPanel Friend WithEvents ucrInputWaterAmounts As ucrInputComboBox - Friend WithEvents ucrInputCropLengths As ucrInputComboBox Friend WithEvents ucrInputPlantingDates As ucrInputComboBox + Friend WithEvents ucrInputCropLengths As ucrInputComboBox End Class diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index d3ccb2a7df6..5c1a4d24e8b 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -100,26 +100,19 @@ Public Class dlgPICSACrops ucrPnlStartCheck.AddParameterValuesCondition(rdoNo, "check", "no") ucrPnlStartCheck.AddParameterValuesCondition(rdoBoth, "check", "both") - ucrInputPlantingDates.SetParameter(New RParameter("plant_days", 5)) - ucrInputPlantingDates.SetValidationTypeAsNumericList() - ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153", "seq(0,50,10)"}) + ucrInputPlantingDates.SetItems({"120", "seq(80, 120, 10)", "Seq(92, 152, 30)", "seq(300,370,5)"}) ucrInputPlantingDates.AddQuotesIfUnrecognised = False - ucrInputPlantingDates.bAllowNonConditionValues = True 'Planting Length ucrInputCropLengths.SetParameter(New RParameter("plant_lengths", 6)) - ucrInputCropLengths.SetValidationTypeAsNumericList() - ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180", "seq(0,50,10)"}) + ucrInputCropLengths.SetItems({"120", "seq(50,220,5)", "seq(60,160,5)", "seq(70,220,5)"}) ucrInputCropLengths.AddQuotesIfUnrecognised = False - ucrInputCropLengths.bAllowNonConditionValues = True 'Water amount ucrInputWaterAmounts.SetParameter(New RParameter("rain_totals", 7)) - ucrInputWaterAmounts.SetValidationTypeAsNumericList() - ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700", "seq(0,200,10)"}) + ucrInputWaterAmounts.SetItems({"600", "seq(200,675,25)", "seq(200,750,5)", "seq(0,750,25)"}) ucrInputWaterAmounts.AddQuotesIfUnrecognised = False - ucrInputWaterAmounts.bAllowNonConditionValues = True 'Planting Date Panel 'ucrPnlPlantingDate.SetParameter(New RParameter("planting_days", clsCropsFunction, 5)) @@ -197,16 +190,15 @@ Public Class dlgPICSACrops clsDummyFunction.AddParameter("check", "yes", iPosition:=0) - 'Crops Function clsCropsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$crops_definitions") ' Temp disabled until list working correctly - 'clsCropsFunction.AddParameter("plant_days", "120") - 'clsCropsFunction.AddParameter("plant_lengths", "120") - 'clsCropsFunction.AddParameter("rain_totals", "600") - 'ucrInputPlantingDates.SetName("120") - 'ucrInputCropLengths.SetName("120") - 'ucrInputWaterAmounts.SetName("600") + clsCropsFunction.AddParameter("plant_days", "120") + clsCropsFunction.AddParameter("plant_lengths", "120") + clsCropsFunction.AddParameter("rain_totals", "600") + ucrInputPlantingDates.SetName("120") + ucrInputCropLengths.SetName("120") + ucrInputWaterAmounts.SetName("600") clsCropsFunction.AddParameter("definition_props", "TRUE", iPosition:=11) clsCropsFunction.AddParameter("print_table", "TRUE", iPosition:=12) ucrBase.clsRsyntax.SetBaseRFunction(clsCropsFunction) @@ -254,7 +246,8 @@ Public Class dlgPICSACrops End If End Sub - Private Sub ucrReceiverYear_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverStart.ControlContentsChanged, ucrReceiverEnd.ControlContentsChanged, ucrReceiverDay.ControlContentsChanged + Private Sub ucrReceiverYear_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlContentsChanged, ucrReceiverRainfall.ControlContentsChanged, ucrReceiverStart.ControlContentsChanged, ucrReceiverEnd.ControlContentsChanged, ucrReceiverDay.ControlContentsChanged, + ucrInputCropLengths.ControlContentsChanged, ucrInputPlantingDates.ControlContentsChanged, ucrInputWaterAmounts.ControlContentsChanged TestOkEnabled() End Sub @@ -270,26 +263,28 @@ Public Class dlgPICSACrops If ucrInputPlantingDates.IsEmpty Then clsCropsFunction.RemoveParameterByName("plant_days") Else - clsCropsFunction.AddParameter("plant_days", "c(" & ucrInputPlantingDates.GetText() & ")", iPosition:=5) + clsCropsFunction.AddParameter("plant_days", ucrInputPlantingDates.GetText(), iPosition:=5) End If End Sub Private Sub ucrPnlStartCheck_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStartCheck.ControlValueChanged If rdoYes.Checked Then clsCropsFunction.AddParameter("start_check", Chr(34) & "yes" & Chr(34), iPosition:=10) + clsDummyFunction.AddParameter("check", "yes", iPosition:=0) ElseIf rdoNo.Checked Then clsCropsFunction.AddParameter("start_check", Chr(34) & "no" & Chr(34), iPosition:=10) + clsDummyFunction.AddParameter("check", "no", iPosition:=0) Else clsCropsFunction.AddParameter("start_check", Chr(34) & "both" & Chr(34), iPosition:=10) + clsDummyFunction.AddParameter("check", "both", iPosition:=0) End If End Sub - Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged If ucrInputCropLengths.IsEmpty Then clsCropsFunction.RemoveParameterByName("plant_lengths") Else - clsCropsFunction.AddParameter("plant_lengths", "c(" & ucrInputCropLengths.GetText() & ")", iPosition:=6) + clsCropsFunction.AddParameter("plant_lengths", ucrInputCropLengths.GetText(), iPosition:=6) End If End Sub @@ -302,7 +297,7 @@ Public Class dlgPICSACrops If ucrInputWaterAmounts.IsEmpty Then clsCropsFunction.RemoveParameterByName("rain_totals") Else - clsCropsFunction.AddParameter("rain_totals", "c(" & ucrInputWaterAmounts.GetText() & ")", iPosition:=7) + clsCropsFunction.AddParameter("rain_totals", ucrInputWaterAmounts.GetText(), iPosition:=7) End If End Sub End Class \ No newline at end of file From 8f5f841c2ba199bd667c30e16f25807557e6e9ee Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 31 Jul 2024 09:11:05 +0300 Subject: [PATCH 088/273] changes --- instat/dlgDescribeTwoVariable.vb | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 5c10188b463..ee8a907e85f 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -1086,7 +1086,7 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveFirstAnova2Param() If rdoThreeVariable.Checked Then - If ucrReceiverFirstVars.IsEmpty Then + If Not ucrReceiverFirstVars.IsEmpty Then If IsNumericByNumericByFactor() Then If ucrChkSwapXYVar.Checked Then clsYlist2Operator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) @@ -1096,8 +1096,6 @@ Public Class dlgDescribeTwoVariable clsYlist2Operator.RemoveParameterByName("cols") End If ElseIf IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then - clsYlistOperator.RemoveParameterByName("cols") - Else clsYlistOperator.AddParameter("cols", ucrReceiverFirstVars.GetVariableNames(True), iPosition:=0, bIncludeArgumentName:=False) End If Else @@ -1148,14 +1146,17 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveSecondAnovaParam() If rdoThreeVariable.Checked Then - If ucrReceiverThreeVariableSecondFactor.IsEmpty Then + If Not ucrReceiverThreeVariableSecondFactor.IsEmpty Then If IsNumericByNumericByFactor() Then If ucrChkSwapXYVar.Checked Then - clsCombineSwapAnova2Table.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) + clsCombineSwapAnova2Table.AddParameter("x", ".x", bIncludeArgumentName:=False) + clsRAnovaSwapTable2Funtion.AddParameter("x_col_names", "c(" & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & ")", iPosition:=2) + clsCombineAnova2Function.RemoveParameterByName("x") Else clsCombineAnova2Function.AddParameter("x", ucrReceiverThreeVariableSecondFactor.GetVariableNames(True), iPosition:=1, bIncludeArgumentName:=False) clsCombineSwapAnova2Table.RemoveParameterByName("x") + clsRAnovaSwapTable2Funtion.AddParameter("x_col_names", ".x", iPosition:=2) End If ElseIf IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then @@ -1215,12 +1216,22 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveThirdAnovaParam() If rdoThreeVariable.Checked Then - If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then - If ucrReceiverThreeVariableThirdVariable.IsEmpty Then - clsCombineAnova2Function.RemoveParameterByName("y") - Else + If Not ucrReceiverThreeVariableThirdVariable.IsEmpty Then + 'If IsNumericByNumericByFactor() Then + ' ' If ucrChkSwapXYVar.Checked Then + ' ' clsCombineSwapAnova2Table.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) + ' ' Else + ' ' clsCombineAnova2Function.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) + + ' ' End If + If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then clsCombineAnova2Function.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) + Else + clsCombineAnova2Function.RemoveParameterByName("y") + End If + Else + clsCombineAnova2Function.RemoveParameterByName("y") End If End If End Sub @@ -1543,6 +1554,7 @@ Public Class dlgDescribeTwoVariable ChangeSumaryLabelText() ChangeBaseRCode() ManageControlsVisibility() + AddRemoveThirdAnovaParam() End Sub Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFirstVars.ControlContentsChanged, @@ -1680,6 +1692,7 @@ Public Class dlgDescribeTwoVariable ChangeSumaryLabelText() ManageControlsVisibility() ChangeLocations() + AddRemoveThirdAnovaParam() End Sub Private Sub AddingColumnFactor() From 9462617c7e74d14e3ce6f63e9833d23689e19240 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 31 Jul 2024 14:39:45 +0300 Subject: [PATCH 089/273] bug fixes in adding columns --- instat/static/InstatObject/R/data_object_R6.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 8ab9363348a..fec9f351bf3 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -712,7 +712,7 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, if(require_correct_length) stop("Length of new column must be divisible by the length of the data frame") else curr_col <- rep(curr_col, length.out = self$get_data_frame_length()) } - if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name[i]) + if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name) else curr_col_name = col_name[[i]] curr_col_name <- make.names(iconv(curr_col_name, to = "ASCII//TRANSLIT", sub = ".")) new_col_names <- c(new_col_names, curr_col_name) From fa3126602b0cad4c3b387274ac2a64ebefdb6f42 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 1 Aug 2024 10:29:49 +0300 Subject: [PATCH 090/273] Added styling of group label and changed the control designed --- .../Cells/Formats/ucrCellFormats.vb | 1 + .../Cells/Styles/ucrCellStyles.Designer.vb | 48 +++-- .../Cells/Styles/ucrCellStyles.resx | 3 - .../UserTables/Cells/Styles/ucrCellStyles.vb | 1 + .../Columns/ucrColumnSpanners.Designer.vb | 106 ++++++----- .../UserTables/Columns/ucrColumnSpanners.vb | 1 - instat/UserTables/Rows/ucrRowExpression.vb | 12 +- .../UserTables/Rows/ucrRowGroup.Designer.vb | 179 +++++++----------- instat/UserTables/Rows/ucrRowGroup.resx | 2 +- instat/UserTables/Rows/ucrRowGroup.vb | 176 ++++++++++------- instat/UserTables/Rows/ucrRows.vb | 4 + instat/UserTables/Stub/ucrStubStyle.vb | 2 +- instat/UserTables/dlgGeneralTable.vb | 12 +- instat/UserTables/sdgTableOptions.vb | 1 + .../sdgTableRowExpression.Designer.vb | 46 +++-- instat/UserTables/sdgTableRowExpression.vb | 4 +- 16 files changed, 320 insertions(+), 278 deletions(-) diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb index 468ba4b5260..82c9d9d4fa7 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -22,6 +22,7 @@ ' Set up the selector ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) ucrReceiverMultipleCols.SetMeAsReceiver() + ucrRowExpression.Setup(strDataFrameName) ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb index 0a131aa8302..90378b40f8c 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.Designer.vb @@ -39,9 +39,10 @@ Partial Class ucrCellStyles ' Me.lblRowExpression.AutoSize = True Me.lblRowExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowExpression.Location = New System.Drawing.Point(245, 86) + Me.lblRowExpression.Location = New System.Drawing.Point(368, 132) + Me.lblRowExpression.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowExpression.Name = "lblRowExpression" - Me.lblRowExpression.Size = New System.Drawing.Size(134, 13) + Me.lblRowExpression.Size = New System.Drawing.Size(200, 20) Me.lblRowExpression.TabIndex = 329 Me.lblRowExpression.Text = "Row Expression (Optional):" ' @@ -49,18 +50,20 @@ Partial Class ucrCellStyles ' Me.lblFormats.AutoSize = True Me.lblFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFormats.Location = New System.Drawing.Point(236, 166) + Me.lblFormats.Location = New System.Drawing.Point(354, 255) + Me.lblFormats.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFormats.Name = "lblFormats" - Me.lblFormats.Size = New System.Drawing.Size(38, 13) + Me.lblFormats.Size = New System.Drawing.Size(56, 20) Me.lblFormats.TabIndex = 326 Me.lblFormats.Text = "Styles:" ' 'btnClearFormats ' Me.btnClearFormats.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearFormats.Location = New System.Drawing.Point(475, 157) + Me.btnClearFormats.Location = New System.Drawing.Point(712, 242) + Me.btnClearFormats.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnClearFormats.Name = "btnClearFormats" - Me.btnClearFormats.Size = New System.Drawing.Size(75, 23) + Me.btnClearFormats.Size = New System.Drawing.Size(112, 35) Me.btnClearFormats.TabIndex = 5 Me.btnClearFormats.Tag = "" Me.btnClearFormats.Text = "Clear" @@ -71,10 +74,11 @@ Partial Class ucrCellStyles Me.dataGridFormats.AllowUserToAddRows = False Me.dataGridFormats.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridFormats.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colStyles}) - Me.dataGridFormats.Location = New System.Drawing.Point(239, 183) + Me.dataGridFormats.Location = New System.Drawing.Point(358, 282) + Me.dataGridFormats.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridFormats.Name = "dataGridFormats" Me.dataGridFormats.RowHeadersWidth = 62 - Me.dataGridFormats.Size = New System.Drawing.Size(315, 73) + Me.dataGridFormats.Size = New System.Drawing.Size(472, 112) Me.dataGridFormats.TabIndex = 6 ' 'colStyles @@ -88,9 +92,10 @@ Partial Class ucrCellStyles ' Me.btnEnterStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnEnterStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnEnterStyle.Location = New System.Drawing.Point(244, 136) + Me.btnEnterStyle.Location = New System.Drawing.Point(366, 209) + Me.btnEnterStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnEnterStyle.Name = "btnEnterStyle" - Me.btnEnterStyle.Size = New System.Drawing.Size(126, 23) + Me.btnEnterStyle.Size = New System.Drawing.Size(189, 35) Me.btnEnterStyle.TabIndex = 4 Me.btnEnterStyle.Tag = "" Me.btnEnterStyle.Text = "Enter Style" @@ -100,28 +105,30 @@ Partial Class ucrCellStyles ' Me.Label1.AutoSize = True Me.Label1.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.Label1.Location = New System.Drawing.Point(246, 7) + Me.Label1.Location = New System.Drawing.Point(369, 11) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(56, 13) + Me.Label1.Size = New System.Drawing.Size(85, 20) Me.Label1.TabIndex = 331 Me.Label1.Text = "Column(s):" ' 'ucrRowExpression ' - Me.ucrRowExpression.Location = New System.Drawing.Point(246, 103) + Me.ucrRowExpression.Location = New System.Drawing.Point(366, 158) + Me.ucrRowExpression.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrRowExpression.Name = "ucrRowExpression" - Me.ucrRowExpression.Size = New System.Drawing.Size(124, 26) + Me.ucrRowExpression.Size = New System.Drawing.Size(186, 38) Me.ucrRowExpression.TabIndex = 332 ' 'ucrReceiverMultipleCols ' Me.ucrReceiverMultipleCols.AutoSize = True Me.ucrReceiverMultipleCols.frmParent = Nothing - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(244, 23) + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(366, 35) Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 55) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(180, 85) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 2 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -132,15 +139,15 @@ Partial Class ucrCellStyles Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(7, 7) + Me.ucrSelectorCols.Location = New System.Drawing.Point(10, 11) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorCols.TabIndex = 1 ' 'ucrCellStyles ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrRowExpression) Me.Controls.Add(Me.ucrReceiverMultipleCols) @@ -151,8 +158,9 @@ Partial Class ucrCellStyles Me.Controls.Add(Me.btnEnterStyle) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridFormats) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrCellStyles" - Me.Size = New System.Drawing.Size(557, 259) + Me.Size = New System.Drawing.Size(836, 398) CType(Me.dataGridFormats, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.resx b/instat/UserTables/Cells/Styles/ucrCellStyles.resx index a249bebae7f..d937ee32b35 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.resx +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.resx @@ -120,7 +120,4 @@ True - - True - \ No newline at end of file diff --git a/instat/UserTables/Cells/Styles/ucrCellStyles.vb b/instat/UserTables/Cells/Styles/ucrCellStyles.vb index 2b53e8fc9b2..08a22c9f5c6 100644 --- a/instat/UserTables/Cells/Styles/ucrCellStyles.vb +++ b/instat/UserTables/Cells/Styles/ucrCellStyles.vb @@ -24,6 +24,7 @@ ' Set up the selector ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + ucrRowExpression.Setup(strDataFrameName) ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() diff --git a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb index ed4db379dcd..3e520389ae1 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb @@ -28,13 +28,13 @@ Partial Class ucrColumnSpanners Me.btnAddColSpanner = New System.Windows.Forms.Button() Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.dataGridColSpanners = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colSpanners = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() Me.lblColSpanner = New System.Windows.Forms.Label() Me.ucrInputColSpanner = New instat.ucrInputTextBox() Me.btnStyle = New System.Windows.Forms.Button() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colSpanners = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridColSpanners, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -42,9 +42,10 @@ Partial Class ucrColumnSpanners ' Me.lblSpanners.AutoSize = True Me.lblSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSpanners.Location = New System.Drawing.Point(245, 171) + Me.lblSpanners.Location = New System.Drawing.Point(368, 263) + Me.lblSpanners.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSpanners.Name = "lblSpanners" - Me.lblSpanners.Size = New System.Drawing.Size(93, 13) + Me.lblSpanners.Size = New System.Drawing.Size(140, 20) Me.lblSpanners.TabIndex = 297 Me.lblSpanners.Text = "Column Spanners:" ' @@ -52,9 +53,10 @@ Partial Class ucrColumnSpanners ' Me.btnClearSpanners.Enabled = False Me.btnClearSpanners.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearSpanners.Location = New System.Drawing.Point(476, 162) + Me.btnClearSpanners.Location = New System.Drawing.Point(714, 249) + Me.btnClearSpanners.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnClearSpanners.Name = "btnClearSpanners" - Me.btnClearSpanners.Size = New System.Drawing.Size(75, 23) + Me.btnClearSpanners.Size = New System.Drawing.Size(112, 35) Me.btnClearSpanners.TabIndex = 295 Me.btnClearSpanners.Tag = "" Me.btnClearSpanners.Text = "Clear" @@ -64,9 +66,10 @@ Partial Class ucrColumnSpanners ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(242, 5) + Me.lblColumns.Location = New System.Drawing.Point(363, 8) + Me.lblColumns.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(56, 13) + Me.lblColumns.Size = New System.Drawing.Size(85, 20) Me.lblColumns.TabIndex = 294 Me.lblColumns.Text = "Column(s):" ' @@ -74,9 +77,10 @@ Partial Class ucrColumnSpanners ' Me.btnAddColSpanner.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddColSpanner.Location = New System.Drawing.Point(243, 138) + Me.btnAddColSpanner.Location = New System.Drawing.Point(364, 212) + Me.btnAddColSpanner.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnAddColSpanner.Name = "btnAddColSpanner" - Me.btnAddColSpanner.Size = New System.Drawing.Size(88, 23) + Me.btnAddColSpanner.Size = New System.Drawing.Size(132, 35) Me.btnAddColSpanner.TabIndex = 292 Me.btnAddColSpanner.Tag = "" Me.btnAddColSpanner.Text = "Add" @@ -88,10 +92,10 @@ Partial Class ucrColumnSpanners Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 5) + Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 8) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorCols.TabIndex = 290 ' 'dataGridColSpanners @@ -99,22 +103,47 @@ Partial Class ucrColumnSpanners Me.dataGridColSpanners.AllowUserToAddRows = False Me.dataGridColSpanners.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGridColSpanners.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colSpanners, Me.colStyleExpression}) - Me.dataGridColSpanners.Location = New System.Drawing.Point(240, 188) + Me.dataGridColSpanners.Location = New System.Drawing.Point(360, 289) + Me.dataGridColSpanners.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridColSpanners.Name = "dataGridColSpanners" Me.dataGridColSpanners.ReadOnly = True Me.dataGridColSpanners.RowHeadersWidth = 62 - Me.dataGridColSpanners.Size = New System.Drawing.Size(311, 73) + Me.dataGridColSpanners.Size = New System.Drawing.Size(466, 112) Me.dataGridColSpanners.TabIndex = 289 ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 60 + ' + 'colSpanners + ' + Me.colSpanners.HeaderText = "Column(s)" + Me.colSpanners.MinimumWidth = 8 + Me.colSpanners.Name = "colSpanners" + Me.colSpanners.ReadOnly = True + Me.colSpanners.Width = 90 + ' + 'colStyleExpression + ' + Me.colStyleExpression.HeaderText = "Style Expression" + Me.colStyleExpression.MinimumWidth = 8 + Me.colStyleExpression.Name = "colStyleExpression" + Me.colStyleExpression.ReadOnly = True + Me.colStyleExpression.Width = 90 + ' 'ucrReceiverMultipleCols ' Me.ucrReceiverMultipleCols.AutoSize = True Me.ucrReceiverMultipleCols.frmParent = Nothing - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(240, 21) + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(360, 32) Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 64) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(180, 98) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 299 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -123,9 +152,10 @@ Partial Class ucrColumnSpanners ' Me.lblColSpanner.AutoSize = True Me.lblColSpanner.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColSpanner.Location = New System.Drawing.Point(245, 94) + Me.lblColSpanner.Location = New System.Drawing.Point(368, 145) + Me.lblColSpanner.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColSpanner.Name = "lblColSpanner" - Me.lblColSpanner.Size = New System.Drawing.Size(79, 13) + Me.lblColSpanner.Size = New System.Drawing.Size(117, 20) Me.lblColSpanner.TabIndex = 301 Me.lblColSpanner.Text = "Spanner Label:" ' @@ -135,49 +165,28 @@ Partial Class ucrColumnSpanners Me.ucrInputColSpanner.AutoSize = True Me.ucrInputColSpanner.IsMultiline = False Me.ucrInputColSpanner.IsReadOnly = False - Me.ucrInputColSpanner.Location = New System.Drawing.Point(243, 111) + Me.ucrInputColSpanner.Location = New System.Drawing.Point(364, 171) + Me.ucrInputColSpanner.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputColSpanner.Name = "ucrInputColSpanner" - Me.ucrInputColSpanner.Size = New System.Drawing.Size(117, 21) + Me.ucrInputColSpanner.Size = New System.Drawing.Size(176, 32) Me.ucrInputColSpanner.TabIndex = 307 ' 'btnStyle ' Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnStyle.Location = New System.Drawing.Point(366, 109) + Me.btnStyle.Location = New System.Drawing.Point(549, 165) + Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnStyle.Name = "btnStyle" - Me.btnStyle.Size = New System.Drawing.Size(49, 23) + Me.btnStyle.Size = New System.Drawing.Size(74, 35) Me.btnStyle.TabIndex = 308 Me.btnStyle.Tag = "" Me.btnStyle.Text = "Style" Me.btnStyle.UseVisualStyleBackColor = True ' - 'colLabel - ' - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.ReadOnly = True - Me.colLabel.Width = 60 - ' - 'colSpanners - ' - Me.colSpanners.HeaderText = "Column(s)" - Me.colSpanners.MinimumWidth = 8 - Me.colSpanners.Name = "colSpanners" - Me.colSpanners.ReadOnly = True - Me.colSpanners.Width = 90 - ' - 'colStyleExpression - ' - Me.colStyleExpression.HeaderText = "Style Expression" - Me.colStyleExpression.Name = "colStyleExpression" - Me.colStyleExpression.ReadOnly = True - Me.colStyleExpression.Width = 90 - ' 'ucrColumnSpanners ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.btnStyle) Me.Controls.Add(Me.ucrInputColSpanner) @@ -189,8 +198,9 @@ Partial Class ucrColumnSpanners Me.Controls.Add(Me.btnAddColSpanner) Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridColSpanners) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrColumnSpanners" - Me.Size = New System.Drawing.Size(554, 265) + Me.Size = New System.Drawing.Size(831, 408) CType(Me.dataGridColSpanners, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Columns/ucrColumnSpanners.vb b/instat/UserTables/Columns/ucrColumnSpanners.vb index d2d85bfcb1c..c671d10eb34 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.vb @@ -127,7 +127,6 @@ Public Class ucrColumnSpanners dataGridColSpanners.Rows.Clear() End Sub - Public Sub SetValuesToOperator() clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_spanner"}, clsOperator), clsOperator) clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_column_spanners", clsOperator), clsOperator) diff --git a/instat/UserTables/Rows/ucrRowExpression.vb b/instat/UserTables/Rows/ucrRowExpression.vb index 6fba2c328e4..9ec18061b7a 100644 --- a/instat/UserTables/Rows/ucrRowExpression.vb +++ b/instat/UserTables/Rows/ucrRowExpression.vb @@ -1,5 +1,6 @@ Public Class ucrRowExpression + Public Event ControlContentsChanged(ucrChangedControl As ucrCore) Private strDataFrameName As String Private bFirstload As Boolean = True @@ -40,15 +41,10 @@ End Sub - Public Sub setup(strDataFrameName As String) + Public Sub Setup(strDataFrameName As String) Me.strDataFrameName = strDataFrameName End Sub - Private Sub btnSet_Click(sender As Object, e As EventArgs) - sdgTableRowExpression.Setup(strDataFrameName) - sdgTableRowExpression.ShowDialog(Me.ParentForm) - ucrInputExpression.SetName(sdgTableRowExpression.GetUserInputRowExpression()) - End Sub Public Function IsEmpty() As Boolean Return ucrInputExpression.IsEmpty() @@ -62,5 +58,7 @@ ucrInputExpression.SetName("") End Sub - + Private Sub ucrInputExpression_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputExpression.ControlContentsChanged + RaiseEvent ControlContentsChanged(ucrChangedControl) + End Sub End Class diff --git a/instat/UserTables/Rows/ucrRowGroup.Designer.vb b/instat/UserTables/Rows/ucrRowGroup.Designer.vb index a4c9ec2e5bb..4b7b32db0ba 100644 --- a/instat/UserTables/Rows/ucrRowGroup.Designer.vb +++ b/instat/UserTables/Rows/ucrRowGroup.Designer.vb @@ -24,19 +24,16 @@ Partial Class ucrRowGroup Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() Me.btnClearGroups = New System.Windows.Forms.Button() - Me.lblColumns = New System.Windows.Forms.Label() Me.btnAddCondition = New System.Windows.Forms.Button() Me.lblGroups = New System.Windows.Forms.Label() - Me.lblGroupCondition = New System.Windows.Forms.Label() - Me.cboConditionOperator = New System.Windows.Forms.ComboBox() - Me.cboConditionValue = New System.Windows.Forms.ComboBox() Me.lblCondition = New System.Windows.Forms.Label() - Me.ucrReceiverSingleCol = New instat.ucrReceiverSingle() - Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrInputGroupLabel = New instat.ucrInputTextBox() + Me.btnStyle = New System.Windows.Forms.Button() + Me.ucrRowExpression = New instat.ucrRowExpression() + Me.lblGroupExpression = New System.Windows.Forms.Label() Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colFormat = New System.Windows.Forms.DataGridViewButtonColumn() + Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -44,42 +41,35 @@ Partial Class ucrRowGroup ' Me.dataGridGroups.AllowUserToAddRows = False Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colFormat}) - Me.dataGridGroups.Location = New System.Drawing.Point(229, 204) + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colStyleExpression}) + Me.dataGridGroups.Location = New System.Drawing.Point(12, 249) + Me.dataGridGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridGroups.Name = "dataGridGroups" Me.dataGridGroups.ReadOnly = True Me.dataGridGroups.RowHeadersWidth = 62 - Me.dataGridGroups.Size = New System.Drawing.Size(323, 95) + Me.dataGridGroups.Size = New System.Drawing.Size(484, 146) Me.dataGridGroups.TabIndex = 11 ' 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearGroups.Location = New System.Drawing.Point(467, 175) + Me.btnClearGroups.Location = New System.Drawing.Point(368, 204) + Me.btnClearGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnClearGroups.Name = "btnClearGroups" - Me.btnClearGroups.Size = New System.Drawing.Size(79, 23) + Me.btnClearGroups.Size = New System.Drawing.Size(118, 35) Me.btnClearGroups.TabIndex = 30 Me.btnClearGroups.Tag = "" Me.btnClearGroups.Text = "Clear" Me.btnClearGroups.UseVisualStyleBackColor = True ' - 'lblColumns - ' - Me.lblColumns.AutoSize = True - Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(224, 11) - Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(45, 13) - Me.lblColumns.TabIndex = 28 - Me.lblColumns.Text = "Column:" - ' 'btnAddCondition ' Me.btnAddCondition.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddCondition.Location = New System.Drawing.Point(230, 153) + Me.btnAddCondition.Location = New System.Drawing.Point(13, 170) + Me.btnAddCondition.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnAddCondition.Name = "btnAddCondition" - Me.btnAddCondition.Size = New System.Drawing.Size(96, 23) + Me.btnAddCondition.Size = New System.Drawing.Size(144, 35) Me.btnAddCondition.TabIndex = 25 Me.btnAddCondition.Tag = "" Me.btnAddCondition.Text = "Add" @@ -89,93 +79,75 @@ Partial Class ucrRowGroup ' Me.lblGroups.AutoSize = True Me.lblGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroups.Location = New System.Drawing.Point(226, 185) + Me.lblGroups.Location = New System.Drawing.Point(7, 220) + Me.lblGroups.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblGroups.Name = "lblGroups" - Me.lblGroups.Size = New System.Drawing.Size(44, 13) + Me.lblGroups.Size = New System.Drawing.Size(66, 20) Me.lblGroups.TabIndex = 32 Me.lblGroups.Text = "Groups:" ' - 'lblGroupCondition - ' - Me.lblGroupCondition.AutoSize = True - Me.lblGroupCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblGroupCondition.Location = New System.Drawing.Point(227, 109) - Me.lblGroupCondition.Name = "lblGroupCondition" - Me.lblGroupCondition.Size = New System.Drawing.Size(86, 13) - Me.lblGroupCondition.TabIndex = 33 - Me.lblGroupCondition.Text = "Group Condition:" - ' - 'cboConditionOperator - ' - Me.cboConditionOperator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList - Me.cboConditionOperator.FormattingEnabled = True - Me.cboConditionOperator.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) - Me.cboConditionOperator.Location = New System.Drawing.Point(229, 126) - Me.cboConditionOperator.Name = "cboConditionOperator" - Me.cboConditionOperator.Size = New System.Drawing.Size(78, 21) - Me.cboConditionOperator.TabIndex = 279 - ' - 'cboConditionValue - ' - Me.cboConditionValue.FormattingEnabled = True - Me.cboConditionValue.Location = New System.Drawing.Point(313, 126) - Me.cboConditionValue.Name = "cboConditionValue" - Me.cboConditionValue.Size = New System.Drawing.Size(106, 21) - Me.cboConditionValue.TabIndex = 280 - ' 'lblCondition ' Me.lblCondition.AutoSize = True Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(227, 58) + Me.lblCondition.Location = New System.Drawing.Point(9, 8) + Me.lblCondition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCondition.Name = "lblCondition" - Me.lblCondition.Size = New System.Drawing.Size(68, 13) + Me.lblCondition.Size = New System.Drawing.Size(101, 20) Me.lblCondition.TabIndex = 282 Me.lblCondition.Text = "Group Label:" ' - 'ucrReceiverSingleCol - ' - Me.ucrReceiverSingleCol.AutoSize = True - Me.ucrReceiverSingleCol.frmParent = Nothing - Me.ucrReceiverSingleCol.Location = New System.Drawing.Point(226, 27) - Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" - Me.ucrReceiverSingleCol.Selector = Nothing - Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 21) - Me.ucrReceiverSingleCol.strNcFilePath = "" - Me.ucrReceiverSingleCol.TabIndex = 24 - Me.ucrReceiverSingleCol.ucrSelector = Nothing - ' - 'ucrSelectorCols - ' - Me.ucrSelectorCols.AutoSize = True - Me.ucrSelectorCols.bDropUnusedFilterLevels = False - Me.ucrSelectorCols.bShowHiddenColumns = False - Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(3, 5) - Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorCols.TabIndex = 23 - ' 'ucrInputGroupLabel ' Me.ucrInputGroupLabel.AddQuotesIfUnrecognised = True Me.ucrInputGroupLabel.AutoSize = True Me.ucrInputGroupLabel.IsMultiline = False Me.ucrInputGroupLabel.IsReadOnly = False - Me.ucrInputGroupLabel.Location = New System.Drawing.Point(226, 75) + Me.ucrInputGroupLabel.Location = New System.Drawing.Point(8, 34) + Me.ucrInputGroupLabel.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputGroupLabel.Name = "ucrInputGroupLabel" - Me.ucrInputGroupLabel.Size = New System.Drawing.Size(120, 21) + Me.ucrInputGroupLabel.Size = New System.Drawing.Size(180, 32) Me.ucrInputGroupLabel.TabIndex = 308 ' + 'btnStyle + ' + Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnStyle.Location = New System.Drawing.Point(210, 99) + Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnStyle.Name = "btnStyle" + Me.btnStyle.Size = New System.Drawing.Size(74, 35) + Me.btnStyle.TabIndex = 309 + Me.btnStyle.Tag = "" + Me.btnStyle.Text = "Style" + Me.btnStyle.UseVisualStyleBackColor = True + ' + 'ucrRowExpression + ' + Me.ucrRowExpression.Location = New System.Drawing.Point(13, 108) + Me.ucrRowExpression.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrRowExpression.Name = "ucrRowExpression" + Me.ucrRowExpression.Size = New System.Drawing.Size(186, 38) + Me.ucrRowExpression.TabIndex = 333 + ' + 'lblGroupExpression + ' + Me.lblGroupExpression.AutoSize = True + Me.lblGroupExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupExpression.Location = New System.Drawing.Point(9, 80) + Me.lblGroupExpression.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblGroupExpression.Name = "lblGroupExpression" + Me.lblGroupExpression.Size = New System.Drawing.Size(129, 20) + Me.lblGroupExpression.TabIndex = 334 + Me.lblGroupExpression.Text = "Group Condition:" + ' 'colLabel ' Me.colLabel.HeaderText = "Label" Me.colLabel.MinimumWidth = 8 Me.colLabel.Name = "colLabel" Me.colLabel.ReadOnly = True - Me.colLabel.Width = 80 + Me.colLabel.Width = 70 ' 'colCodnition ' @@ -185,34 +157,30 @@ Partial Class ucrRowGroup Me.colCodnition.ReadOnly = True Me.colCodnition.Width = 90 ' - 'colFormat + 'colStyleExpression ' - Me.colFormat.HeaderText = "" - Me.colFormat.MinimumWidth = 8 - Me.colFormat.Name = "colFormat" - Me.colFormat.ReadOnly = True - Me.colFormat.Text = "Style" - Me.colFormat.UseColumnTextForButtonValue = True - Me.colFormat.Width = 55 + Me.colStyleExpression.HeaderText = "Style Expression" + Me.colStyleExpression.MinimumWidth = 8 + Me.colStyleExpression.Name = "colStyleExpression" + Me.colStyleExpression.ReadOnly = True + Me.colStyleExpression.Width = 90 ' 'ucrRowGroup ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblGroupExpression) + Me.Controls.Add(Me.ucrRowExpression) + Me.Controls.Add(Me.btnStyle) Me.Controls.Add(Me.ucrInputGroupLabel) Me.Controls.Add(Me.lblCondition) - Me.Controls.Add(Me.cboConditionValue) - Me.Controls.Add(Me.cboConditionOperator) - Me.Controls.Add(Me.lblGroupCondition) Me.Controls.Add(Me.lblGroups) Me.Controls.Add(Me.btnClearGroups) - Me.Controls.Add(Me.lblColumns) Me.Controls.Add(Me.btnAddCondition) - Me.Controls.Add(Me.ucrReceiverSingleCol) - Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.dataGridGroups) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrRowGroup" - Me.Size = New System.Drawing.Size(557, 301) + Me.Size = New System.Drawing.Size(507, 403) CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -220,18 +188,15 @@ Partial Class ucrRowGroup End Sub Friend WithEvents dataGridGroups As DataGridView - Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove Friend WithEvents btnClearGroups As Button - Friend WithEvents lblColumns As Label Friend WithEvents btnAddCondition As Button - Friend WithEvents ucrReceiverSingleCol As ucrReceiverSingle Friend WithEvents lblGroups As Label - Friend WithEvents lblGroupCondition As Label - Friend WithEvents cboConditionOperator As ComboBox - Friend WithEvents cboConditionValue As ComboBox Friend WithEvents lblCondition As Label Friend WithEvents ucrInputGroupLabel As ucrInputTextBox + Friend WithEvents btnStyle As Button + Friend WithEvents ucrRowExpression As ucrRowExpression + Friend WithEvents lblGroupExpression As Label Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colFormat As DataGridViewButtonColumn + Friend WithEvents colStyleExpression As DataGridViewTextBoxColumn End Class diff --git a/instat/UserTables/Rows/ucrRowGroup.resx b/instat/UserTables/Rows/ucrRowGroup.resx index f4b4b7d5a34..9a01250ba65 100644 --- a/instat/UserTables/Rows/ucrRowGroup.resx +++ b/instat/UserTables/Rows/ucrRowGroup.resx @@ -123,7 +123,7 @@ True - + True \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb index 8c6fd61d46e..018be6b3540 100644 --- a/instat/UserTables/Rows/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -3,114 +3,160 @@ Private clsOperator As New ROperator Private bFirstload As Boolean = True - Private Sub InitialiseDialog() - ucrReceiverSingleCol.Selector = ucrSelectorCols - ucrReceiverSingleCol.SetMeAsReceiver() - End Sub + 'Private Sub InitialiseDialog() + ' ucrReceiverSingleCol.Selector = ucrSelectorCols + ' ucrReceiverSingleCol.SetMeAsReceiver() + 'End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If bFirstload Then - InitialiseDialog() - bFirstload = False - End If + 'If bFirstload Then + ' InitialiseDialog() + ' bFirstload = False + 'End If Me.clsOperator = clsOperator - ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + ucrRowExpression.Setup(strDataFrameName) dataGridGroups.Rows.Clear() + ' Note, the sequence of these 2 functions matters + SetupTabRowGroupInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator)) + SetupTabRowGroupStylesInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_row_groups", clsOperator)) - Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator) - For Each clsRParam As RParameter In lstRParams + 'Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator) - Dim clsTabRowGroupRFunction As RFunction = clsRParam.clsArgumentCodeStructure + 'For Each clsRParam As RParameter In lstRParams + + ' Dim clsTabRowGroupRFunction As RFunction = clsRParam.clsArgumentCodeStructure + + ' ' Create a new row that represents the tab_footnote() parameters + ' Dim row As New DataGridViewRow + ' row.CreateCells(dataGridGroups) - ' Create a new row that represents the tab_footnote() parameters + ' For Each clsRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters + ' If clsRowGroupRParam.strArgumentName = "label" Then + ' row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + ' ElseIf clsRowGroupRParam.strArgumentName = "rows" Then + ' row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + ' End If + ' Next + + ' ' Tag and add the tab_row_group() parameter function contents as a row + ' row.Tag = clsRParam + ' dataGridGroups.Rows.Add(row) + 'Next + End Sub + + Private Sub SetupTabRowGroupInDataGrid(lstRParams As List(Of RParameter)) + For Each clsRParam As RParameter In lstRParams + Dim clsTabRowGroupRFunction As RFunction = clsRParam.clsArgumentCodeStructure Dim row As New DataGridViewRow row.CreateCells(dataGridGroups) - - For Each clsRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters - If clsRowGroupRParam.strArgumentName = "label" Then - row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) - ElseIf clsRowGroupRParam.strArgumentName = "rows" Then - row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) + For Each clsTabRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters + If clsTabRowGroupRParam.strArgumentName = "label" Then + row.Cells(0).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) + ElseIf clsTabRowGroupRParam.strArgumentName = "rows" Then + row.Cells(1).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) End If Next - - ' Tag and add the tab_row_group() parameter function contents as a row - row.Tag = clsRParam + Dim arrParams(2) As RParameter + arrParams(0) = clsRParam + row.Tag = arrParams dataGridGroups.Rows.Add(row) + Next + End Sub + Private Sub SetupTabRowGroupStylesInDataGrid(lstRParams As List(Of RParameter)) + For Each clsRParam As RParameter In lstRParams + Dim clsTabStyleRFunction As RFunction = clsRParam.clsArgumentCodeStructure + ' Get spanner Id + Dim strArgumentValueSpannerId As String = clsTabStyleRFunction.GetParameter("locations").clsArgumentCodeStructure.GetParameter("groups").strArgumentValue + For index As Integer = 0 To dataGridGroups.Rows.Count - 1 + Dim row As DataGridViewRow = dataGridGroups.Rows(index) + Dim lstParams() As RParameter = row.Tag + If strArgumentValueSpannerId = lstParams(0).clsArgumentCodeStructure.GetParameter("id").strArgumentValue Then + row.Cells(2).Value = clsTabStyleRFunction.Clone().ToScript + lstParams(1) = clsRParam + row.Tag = lstParams + Exit For + End If + Next Next + End Sub + Private Sub btnStyle_Click(sender As Object, e As EventArgs) Handles btnStyle.Click + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + ucrRowExpression.Tag = clsListStyleRFunction End Sub Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click - - Dim strGroupLabel As String = ucrInputGroupLabel.GetValue() - Dim strConditionValue As String = If(cboConditionOperator.Text <> "Expression" AndAlso Not IsNumeric(cboConditionValue.Text), clsTablesUtils.GetStringValue(cboConditionValue.Text, True), cboConditionValue.Text) - Dim strCondition As String = ucrReceiverSingleCol.GetVariableNames(bWithQuotes:=False) & " " & cboConditionOperator.Text & " " & strConditionValue + Dim strGroupId As String = ucrInputGroupLabel.GetText().Replace(" ", String.Empty) + Dim strGroupStyleExpression As String = "" Dim clsTabRowGroupRFunction As New RFunction clsTabRowGroupRFunction.SetPackageName("gt") clsTabRowGroupRFunction.SetRCommand("tab_row_group") - clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="label", strParamValue:=clsTablesUtils.GetStringValue(strGroupLabel, True), iNewPosition:=0)) - clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=strCondition, iNewPosition:=1)) - clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strGroupLabel.Replace(" ", String.Empty), True), iNewPosition:=2)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="label", strParamValue:=clsTablesUtils.GetStringValue(ucrInputGroupLabel.GetText(), True), iNewPosition:=0)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetText(), iNewPosition:=1)) + clsTabRowGroupRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strGroupId, True), iNewPosition:=2)) - ' Create parameter with unique name - Dim clsRParam As New RParameter(strParameterName:="tab_row_group_param" & (dataGridGroups.Rows.Count + 1), strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) + Dim arrParams(2) As RParameter - Dim row As New DataGridViewRow - row.CreateCells(dataGridGroups) + ' Add add the group parameter as the first element + arrParams(0) = New RParameter(strParameterName:="tab_row_group_param" & (dataGridGroups.Rows.Count + 1), strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) - row.Cells(0).Value = strGroupLabel - row.Cells(1).Value = strCondition + ' Add the group style as the second element + If ucrRowExpression.Tag IsNot Nothing Then + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_row_groups") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=clsTablesUtils.GetStringValue(strGroupId, True), iNewPosition:=0)) - ' Tag and add the tab_row_group() parameter function contents as a row - row.Tag = clsRParam - dataGridGroups.Rows.Add(row) + Dim clsListStyleRFunction As RFunction = ucrRowExpression.Tag + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) - ' Add to parameter - clsOperator.AddParameter(clsRParam) + strGroupStyleExpression = clsTabStyleRFunction.Clone.ToScript - ucrReceiverSingleCol.Clear() - ucrInputGroupLabel.SetName("") - cboConditionValue.Text = "" + arrParams(1) = New RParameter(strParameterName:="tab_style_cells_row_groups_param" & (dataGridGroups.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + End If - End Sub + Dim row As New DataGridViewRow + row.CreateCells(dataGridGroups) - Private Sub conditionValue_TextChanged(sender As Object, e As EventArgs) Handles cboConditionValue.TextChanged, cboConditionOperator.TextChanged - EnableDisableAddConditionButton() - End Sub + row.Cells(0).Value = ucrInputGroupLabel.GetText() + row.Cells(1).Value = ucrRowExpression.GetText() + row.Cells(2).Value = strGroupStyleExpression + ' Tag the array of parameters + row.Tag = arrParams + dataGridGroups.Rows.Add(row) - Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSingleCol.ControlContentsChanged, ucrInputGroupLabel.ControlContentsChanged - EnableDisableAddConditionButton() + ucrInputGroupLabel.SetName("") + ucrRowExpression.Clear() + ucrRowExpression.Tag = Nothing End Sub - Private Sub EnableDisableAddConditionButton() - btnAddCondition.Enabled = Not ucrReceiverSingleCol.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty AndAlso Not String.IsNullOrWhiteSpace(cboConditionValue.Text) AndAlso Not String.IsNullOrWhiteSpace(cboConditionOperator.Text) + Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrRowExpression.ControlContentsChanged, ucrInputGroupLabel.ControlContentsChanged + btnAddCondition.Enabled = Not ucrRowExpression.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty End Sub Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearGroups.Click - For index As Integer = 0 To dataGridGroups.Rows.Count - 1 - clsOperator.RemoveParameter(dataGridGroups.Rows(index).Tag) - Next dataGridGroups.Rows.Clear() End Sub - Private Sub dataGridGroups_CellClick(sender As Object, e As DataGridViewCellEventArgs) Handles dataGridGroups.CellClick - If 1 = 1 Then - Exit Sub - End If - - ' Ignore clicks that are not from button cells. - If e.ColumnIndex <> 1 Then - Exit Sub - End If - + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator), clsOperator) + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_row_groups", clsOperator), clsOperator) + For index As Integer = 0 To dataGridGroups.Rows.Count - 1 + Dim lstParams() As RParameter = dataGridGroups.Rows(index).Tag + clsOperator.AddParameter(lstParams(0)) + If lstParams(1) IsNot Nothing Then + clsOperator.AddParameter(lstParams(1)) + End If + Next End Sub - End Class diff --git a/instat/UserTables/Rows/ucrRows.vb b/instat/UserTables/Rows/ucrRows.vb index c8880166a4d..996ae4a19b4 100644 --- a/instat/UserTables/Rows/ucrRows.vb +++ b/instat/UserTables/Rows/ucrRows.vb @@ -19,4 +19,8 @@ ucrRowGroups.Visible = rdoRowsGroups.Checked End Sub + Public Sub SetValuesToOperator() + ucrRowGroups.SetValuesToOperator() + End Sub + End Class diff --git a/instat/UserTables/Stub/ucrStubStyle.vb b/instat/UserTables/Stub/ucrStubStyle.vb index 97b56f81f9e..af18602bb68 100644 --- a/instat/UserTables/Stub/ucrStubStyle.vb +++ b/instat/UserTables/Stub/ucrStubStyle.vb @@ -10,7 +10,7 @@ Me.clsOperator = clsOperator - ucrRowExpression.setup(strDataFrameName) + ucrRowExpression.Setup(strDataFrameName) ' Clear and Set up the data grid with contents dataGridFormats.Rows.Clear() diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 2706570ec3f..5dac4efb956 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -52,12 +52,14 @@ Public Class dlgGeneralTable ucrNudPreview.Minimum = 6 ucrNudPreview.SetRDefault(6) - ucrSaveTable.SetPrefix("table") + ucrSaveTable.SetPrefix("presentation_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetDataFrameSelector(ucrSelectorCols.ucrAvailableDataFrames) ucrSaveTable.SetIsComboBox() - ucrSaveTable.SetCheckBoxText("Save Table") + ucrSaveTable.SetCheckBoxText("Store Table") ucrSaveTable.SetAssignToIfUncheckedValue("last_table") + + ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False End Sub @@ -82,6 +84,12 @@ Public Class dlgGeneralTable clsGtRFunction.SetRCommand("gt") clsBaseOperator.AddParameter(strParameterName:="gt", clsRFunctionParameter:=clsGtRFunction, iPosition:=2, bIncludeArgumentName:=False) + clsBaseOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", + strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, + strRObjectFormatToAssignTo:=RObjectFormat.Html, + strRDataFrameNameToAddObjectTo:=ucrSelectorCols.strCurrentDataFrame, + strObjectName:="last_table") + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) End Sub diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 6986266ee5e..9d3d175627c 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -68,6 +68,7 @@ Public Class sdgTableOptions ucrHeader.SetValuesToOperator() ucrStub.SetValuesToOperator() ucrColumns.SetValuesToOperator() + ucrRows.SetValuesToOperator() ucrCells.SetValuesToOperator() ucrSourceNotes.SetValuesToOperator() ucrOtherStyles.SetValuesToOperator() diff --git a/instat/UserTables/sdgTableRowExpression.Designer.vb b/instat/UserTables/sdgTableRowExpression.Designer.vb index 39bf2f045ab..45e15079c89 100644 --- a/instat/UserTables/sdgTableRowExpression.Designer.vb +++ b/instat/UserTables/sdgTableRowExpression.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class sdgTableRowExpression Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class sdgTableRowExpression 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.cboCondition = New System.Windows.Forms.ComboBox() Me.lblCondition = New System.Windows.Forms.Label() @@ -36,18 +36,20 @@ Partial Class sdgTableRowExpression Me.cboCondition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList Me.cboCondition.FormattingEnabled = True Me.cboCondition.Items.AddRange(New Object() {"==", "<", "<=", ">", ">=", "!=", "Expression"}) - Me.cboCondition.Location = New System.Drawing.Point(240, 25) + Me.cboCondition.Location = New System.Drawing.Point(360, 38) + Me.cboCondition.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cboCondition.Name = "cboCondition" - Me.cboCondition.Size = New System.Drawing.Size(148, 21) + Me.cboCondition.Size = New System.Drawing.Size(220, 28) Me.cboCondition.TabIndex = 285 ' 'lblCondition ' Me.lblCondition.AutoSize = True Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(237, 9) + Me.lblCondition.Location = New System.Drawing.Point(356, 14) + Me.lblCondition.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCondition.Name = "lblCondition" - Me.lblCondition.Size = New System.Drawing.Size(54, 13) + Me.lblCondition.Size = New System.Drawing.Size(80, 20) Me.lblCondition.TabIndex = 284 Me.lblCondition.Text = "Condition:" ' @@ -55,9 +57,10 @@ Partial Class sdgTableRowExpression ' Me.lblExpression.AutoSize = True Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExpression.Location = New System.Drawing.Point(237, 102) + Me.lblExpression.Location = New System.Drawing.Point(356, 157) + Me.lblExpression.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExpression.Name = "lblExpression" - Me.lblExpression.Size = New System.Drawing.Size(61, 13) + Me.lblExpression.Size = New System.Drawing.Size(91, 20) Me.lblExpression.TabIndex = 283 Me.lblExpression.Text = "Expression:" ' @@ -67,26 +70,27 @@ Partial Class sdgTableRowExpression Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(5, 4) + Me.ucrSelectorCols.Location = New System.Drawing.Point(8, 6) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorCols.TabIndex = 281 ' 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(106, 220) - Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(159, 338) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(6) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" - Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(336, 46) Me.ucrSdgBaseButtons.TabIndex = 344 ' 'btnAddCondition ' - Me.btnAddCondition.Location = New System.Drawing.Point(387, 23) + Me.btnAddCondition.Location = New System.Drawing.Point(580, 35) + Me.btnAddCondition.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnAddCondition.Name = "btnAddCondition" - Me.btnAddCondition.Size = New System.Drawing.Size(65, 23) + Me.btnAddCondition.Size = New System.Drawing.Size(98, 35) Me.btnAddCondition.TabIndex = 346 Me.btnAddCondition.Text = "Add" Me.btnAddCondition.UseVisualStyleBackColor = True @@ -95,19 +99,20 @@ Partial Class sdgTableRowExpression ' Me.ucrReceiverExpression.AutoSize = True Me.ucrReceiverExpression.frmParent = Me - Me.ucrReceiverExpression.Location = New System.Drawing.Point(240, 118) + Me.ucrReceiverExpression.Location = New System.Drawing.Point(360, 182) + Me.ucrReceiverExpression.Margin = New System.Windows.Forms.Padding(9) Me.ucrReceiverExpression.Name = "ucrReceiverExpression" Me.ucrReceiverExpression.Selector = Nothing - Me.ucrReceiverExpression.Size = New System.Drawing.Size(177, 29) + Me.ucrReceiverExpression.Size = New System.Drawing.Size(266, 45) Me.ucrReceiverExpression.strNcFilePath = "" Me.ucrReceiverExpression.TabIndex = 347 Me.ucrReceiverExpression.ucrSelector = Nothing ' 'sdgTableRowExpression ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(456, 258) + Me.ClientSize = New System.Drawing.Size(684, 397) Me.Controls.Add(Me.ucrReceiverExpression) Me.Controls.Add(Me.btnAddCondition) Me.Controls.Add(Me.ucrSdgBaseButtons) @@ -116,6 +121,7 @@ Partial Class sdgTableRowExpression Me.Controls.Add(Me.lblExpression) Me.Controls.Add(Me.ucrSelectorCols) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgTableRowExpression" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Set Expression" diff --git a/instat/UserTables/sdgTableRowExpression.vb b/instat/UserTables/sdgTableRowExpression.vb index 9a45cce5a1c..b115b6333ec 100644 --- a/instat/UserTables/sdgTableRowExpression.vb +++ b/instat/UserTables/sdgTableRowExpression.vb @@ -29,7 +29,7 @@ End Sub - ' TODO. In future this can be refactored to return an RFUnction + ' TODO. In future this can be refactored to return an RFunction Public Function GetUserInputRowExpression() As String Return ucrReceiverExpression.GetText() End Function @@ -41,6 +41,4 @@ Private Sub ucrSdgBaseButtons_ClickReturn(sender As Object, e As EventArgs) Handles ucrSdgBaseButtons.ClickReturn bUserClickedReturn = True End Sub - - End Class \ No newline at end of file From 9eff7a19d2a9ba646229756d63f9541b9f8d6fc8 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 1 Aug 2024 10:43:36 +0300 Subject: [PATCH 091/273] code cleaning --- .../Columns/ucrColumnSpanners.Designer.vb | 2 +- instat/UserTables/Rows/ucrRowExpression.vb | 3 -- instat/UserTables/Rows/ucrRowGroup.vb | 35 ------------------- 3 files changed, 1 insertion(+), 39 deletions(-) diff --git a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb index 3e520389ae1..671a01ee140 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.Designer.vb @@ -175,7 +175,7 @@ Partial Class ucrColumnSpanners ' Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnStyle.Location = New System.Drawing.Point(549, 165) + Me.btnStyle.Location = New System.Drawing.Point(549, 166) Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnStyle.Name = "btnStyle" Me.btnStyle.Size = New System.Drawing.Size(74, 35) diff --git a/instat/UserTables/Rows/ucrRowExpression.vb b/instat/UserTables/Rows/ucrRowExpression.vb index 9ec18061b7a..8965ad550fb 100644 --- a/instat/UserTables/Rows/ucrRowExpression.vb +++ b/instat/UserTables/Rows/ucrRowExpression.vb @@ -4,7 +4,6 @@ Private strDataFrameName As String Private bFirstload As Boolean = True - Private Sub UcrInputRowExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseControl() @@ -38,14 +37,12 @@ ucrInputExpression.SetName(sdgTableRowExpression.GetUserInputRowExpression()) End If End Sub - End Sub Public Sub Setup(strDataFrameName As String) Me.strDataFrameName = strDataFrameName End Sub - Public Function IsEmpty() As Boolean Return ucrInputExpression.IsEmpty() End Function diff --git a/instat/UserTables/Rows/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb index 018be6b3540..b7a2b323346 100644 --- a/instat/UserTables/Rows/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -1,19 +1,8 @@ Public Class ucrRowGroup Private clsOperator As New ROperator - Private bFirstload As Boolean = True - - 'Private Sub InitialiseDialog() - ' ucrReceiverSingleCol.Selector = ucrSelectorCols - ' ucrReceiverSingleCol.SetMeAsReceiver() - 'End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - 'If bFirstload Then - ' InitialiseDialog() - ' bFirstload = False - 'End If - Me.clsOperator = clsOperator ucrRowExpression.Setup(strDataFrameName) @@ -22,30 +11,6 @@ ' Note, the sequence of these 2 functions matters SetupTabRowGroupInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator)) SetupTabRowGroupStylesInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_row_groups", clsOperator)) - - - 'Dim lstRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRCommand({"tab_row_group"}, clsOperator) - - 'For Each clsRParam As RParameter In lstRParams - - ' Dim clsTabRowGroupRFunction As RFunction = clsRParam.clsArgumentCodeStructure - - ' ' Create a new row that represents the tab_footnote() parameters - ' Dim row As New DataGridViewRow - ' row.CreateCells(dataGridGroups) - - ' For Each clsRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters - ' If clsRowGroupRParam.strArgumentName = "label" Then - ' row.Cells(0).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) - ' ElseIf clsRowGroupRParam.strArgumentName = "rows" Then - ' row.Cells(1).Value = clsTablesUtils.GetStringValue(clsRowGroupRParam.strArgumentValue, False) - ' End If - ' Next - - ' ' Tag and add the tab_row_group() parameter function contents as a row - ' row.Tag = clsRParam - ' dataGridGroups.Rows.Add(row) - 'Next End Sub Private Sub SetupTabRowGroupInDataGrid(lstRParams As List(Of RParameter)) From bfe58e9567a25726e475d1213a8be2d294192c4b Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 1 Aug 2024 13:32:01 +0300 Subject: [PATCH 092/273] initial row summaries designs --- .../UserTables/Rows/ucrRowSummary.Designer.vb | 218 +++++++++++++++++- instat/UserTables/Rows/ucrRowSummary.resx | 9 + instat/UserTables/Rows/ucrRowSummary.vb | 10 + instat/UserTables/Rows/ucrRows.Designer.vb | 46 ++-- instat/UserTables/Rows/ucrRows.vb | 3 + 5 files changed, 269 insertions(+), 17 deletions(-) diff --git a/instat/UserTables/Rows/ucrRowSummary.Designer.vb b/instat/UserTables/Rows/ucrRowSummary.Designer.vb index 266e1ffe684..eb191ee1886 100644 --- a/instat/UserTables/Rows/ucrRowSummary.Designer.vb +++ b/instat/UserTables/Rows/ucrRowSummary.Designer.vb @@ -22,16 +22,230 @@ Partial Class ucrRowSummary 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.dataGridSummaries = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.btnStyle = New System.Windows.Forms.Button() + Me.lblSummaryTypes = New System.Windows.Forms.Label() + Me.lblSummaries = New System.Windows.Forms.Label() + Me.btnClearSummaries = New System.Windows.Forms.Button() + Me.btnAddSummaries = New System.Windows.Forms.Button() + Me.lblSummaryLabel = New System.Windows.Forms.Label() + Me.lblReplaceWith = New System.Windows.Forms.Label() + Me.UcrInputTextBox2 = New instat.ucrInputTextBox() + Me.UcrInputComboBox1 = New instat.ucrInputComboBox() + Me.UcrInputTextBox1 = New instat.ucrInputTextBox() + Me.btnFormat = New System.Windows.Forms.Button() + CType(Me.dataGridSummaries, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'dataGridSummaries + ' + Me.dataGridSummaries.AllowUserToAddRows = False + Me.dataGridSummaries.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize + Me.dataGridSummaries.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colStyleExpression}) + Me.dataGridSummaries.Location = New System.Drawing.Point(4, 320) + Me.dataGridSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.dataGridSummaries.Name = "dataGridSummaries" + Me.dataGridSummaries.ReadOnly = True + Me.dataGridSummaries.RowHeadersWidth = 62 + Me.dataGridSummaries.Size = New System.Drawing.Size(484, 146) + Me.dataGridSummaries.TabIndex = 335 + ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 70 + ' + 'colCodnition + ' + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.ReadOnly = True + Me.colCodnition.Width = 90 + ' + 'colStyleExpression + ' + Me.colStyleExpression.HeaderText = "Style Expression" + Me.colStyleExpression.MinimumWidth = 8 + Me.colStyleExpression.Name = "colStyleExpression" + Me.colStyleExpression.ReadOnly = True + Me.colStyleExpression.Width = 90 + ' + 'btnStyle + ' + Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnStyle.Location = New System.Drawing.Point(154, 158) + Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnStyle.Name = "btnStyle" + Me.btnStyle.Size = New System.Drawing.Size(126, 35) + Me.btnStyle.TabIndex = 341 + Me.btnStyle.Tag = "" + Me.btnStyle.Text = "Style" + Me.btnStyle.UseVisualStyleBackColor = True + ' + 'lblSummaryTypes + ' + Me.lblSummaryTypes.AutoSize = True + Me.lblSummaryTypes.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSummaryTypes.Location = New System.Drawing.Point(11, 9) + Me.lblSummaryTypes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummaryTypes.Name = "lblSummaryTypes" + Me.lblSummaryTypes.Size = New System.Drawing.Size(118, 20) + Me.lblSummaryTypes.TabIndex = 339 + Me.lblSummaryTypes.Text = "Summary Type:" + ' + 'lblSummaries + ' + Me.lblSummaries.AutoSize = True + Me.lblSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSummaries.Location = New System.Drawing.Point(6, 295) + Me.lblSummaries.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummaries.Name = "lblSummaries" + Me.lblSummaries.Size = New System.Drawing.Size(93, 20) + Me.lblSummaries.TabIndex = 338 + Me.lblSummaries.Text = "Summaries:" + ' + 'btnClearSummaries + ' + Me.btnClearSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnClearSummaries.Location = New System.Drawing.Point(366, 271) + Me.btnClearSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnClearSummaries.Name = "btnClearSummaries" + Me.btnClearSummaries.Size = New System.Drawing.Size(118, 35) + Me.btnClearSummaries.TabIndex = 337 + Me.btnClearSummaries.Tag = "" + Me.btnClearSummaries.Text = "Clear" + Me.btnClearSummaries.UseVisualStyleBackColor = True + ' + 'btnAddSummaries + ' + Me.btnAddSummaries.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnAddSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnAddSummaries.Location = New System.Drawing.Point(10, 246) + Me.btnAddSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnAddSummaries.Name = "btnAddSummaries" + Me.btnAddSummaries.Size = New System.Drawing.Size(144, 35) + Me.btnAddSummaries.TabIndex = 336 + Me.btnAddSummaries.Tag = "" + Me.btnAddSummaries.Text = "Add" + Me.btnAddSummaries.UseVisualStyleBackColor = True + ' + 'lblSummaryLabel + ' + Me.lblSummaryLabel.AutoSize = True + Me.lblSummaryLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSummaryLabel.Location = New System.Drawing.Point(11, 81) + Me.lblSummaryLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummaryLabel.Name = "lblSummaryLabel" + Me.lblSummaryLabel.Size = New System.Drawing.Size(123, 20) + Me.lblSummaryLabel.TabIndex = 342 + Me.lblSummaryLabel.Text = "Summary Label:" + ' + 'lblReplaceWith + ' + Me.lblReplaceWith.AutoSize = True + Me.lblReplaceWith.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblReplaceWith.Location = New System.Drawing.Point(255, 9) + Me.lblReplaceWith.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblReplaceWith.Name = "lblReplaceWith" + Me.lblReplaceWith.Size = New System.Drawing.Size(130, 20) + Me.lblReplaceWith.TabIndex = 346 + Me.lblReplaceWith.Text = "Replace NA with:" + ' + 'UcrInputTextBox2 + ' + Me.UcrInputTextBox2.AddQuotesIfUnrecognised = True + Me.UcrInputTextBox2.AutoSize = True + Me.UcrInputTextBox2.IsMultiline = False + Me.UcrInputTextBox2.IsReadOnly = False + Me.UcrInputTextBox2.Location = New System.Drawing.Point(254, 35) + Me.UcrInputTextBox2.Margin = New System.Windows.Forms.Padding(14) + Me.UcrInputTextBox2.Name = "UcrInputTextBox2" + Me.UcrInputTextBox2.Size = New System.Drawing.Size(180, 32) + Me.UcrInputTextBox2.TabIndex = 347 + ' + 'UcrInputComboBox1 + ' + Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True + Me.UcrInputComboBox1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.UcrInputComboBox1.GetSetSelectedIndex = -1 + Me.UcrInputComboBox1.IsReadOnly = False + Me.UcrInputComboBox1.Location = New System.Drawing.Point(14, 32) + Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.UcrInputComboBox1.Name = "UcrInputComboBox1" + Me.UcrInputComboBox1.Size = New System.Drawing.Size(176, 40) + Me.UcrInputComboBox1.TabIndex = 345 + ' + 'UcrInputTextBox1 + ' + Me.UcrInputTextBox1.AddQuotesIfUnrecognised = True + Me.UcrInputTextBox1.AutoSize = True + Me.UcrInputTextBox1.IsMultiline = False + Me.UcrInputTextBox1.IsReadOnly = False + Me.UcrInputTextBox1.Location = New System.Drawing.Point(10, 107) + Me.UcrInputTextBox1.Margin = New System.Windows.Forms.Padding(14) + Me.UcrInputTextBox1.Name = "UcrInputTextBox1" + Me.UcrInputTextBox1.Size = New System.Drawing.Size(180, 32) + Me.UcrInputTextBox1.TabIndex = 343 + ' + 'btnFormat + ' + Me.btnFormat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) + Me.btnFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.btnFormat.Location = New System.Drawing.Point(10, 158) + Me.btnFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnFormat.Name = "btnFormat" + Me.btnFormat.Size = New System.Drawing.Size(136, 35) + Me.btnFormat.TabIndex = 348 + Me.btnFormat.Tag = "" + Me.btnFormat.Text = "Format" + Me.btnFormat.UseVisualStyleBackColor = True + ' 'ucrRowSummary ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.btnFormat) + Me.Controls.Add(Me.UcrInputTextBox2) + Me.Controls.Add(Me.lblReplaceWith) + Me.Controls.Add(Me.UcrInputComboBox1) + Me.Controls.Add(Me.UcrInputTextBox1) + Me.Controls.Add(Me.lblSummaryLabel) + Me.Controls.Add(Me.dataGridSummaries) + Me.Controls.Add(Me.btnStyle) + Me.Controls.Add(Me.lblSummaryTypes) + Me.Controls.Add(Me.lblSummaries) + Me.Controls.Add(Me.btnClearSummaries) + Me.Controls.Add(Me.btnAddSummaries) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrRowSummary" - Me.Size = New System.Drawing.Size(671, 355) + Me.Size = New System.Drawing.Size(530, 471) + CType(Me.dataGridSummaries, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() End Sub + Friend WithEvents dataGridSummaries As DataGridView + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colCodnition As DataGridViewTextBoxColumn + Friend WithEvents colStyleExpression As DataGridViewTextBoxColumn + Friend WithEvents btnStyle As Button + Friend WithEvents lblSummaryTypes As Label + Friend WithEvents lblSummaries As Label + Friend WithEvents btnClearSummaries As Button + Friend WithEvents btnAddSummaries As Button + Friend WithEvents UcrInputTextBox1 As ucrInputTextBox + Friend WithEvents lblSummaryLabel As Label + Friend WithEvents UcrInputComboBox1 As ucrInputComboBox + Friend WithEvents UcrInputTextBox2 As ucrInputTextBox + Friend WithEvents lblReplaceWith As Label + Friend WithEvents btnFormat As Button End Class diff --git a/instat/UserTables/Rows/ucrRowSummary.resx b/instat/UserTables/Rows/ucrRowSummary.resx index 1af7de150c9..9a01250ba65 100644 --- a/instat/UserTables/Rows/ucrRowSummary.resx +++ b/instat/UserTables/Rows/ucrRowSummary.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb index b0eb1db4031..942dc7ad42b 100644 --- a/instat/UserTables/Rows/ucrRowSummary.vb +++ b/instat/UserTables/Rows/ucrRowSummary.vb @@ -1,3 +1,13 @@ Public Class ucrRowSummary + Private Sub ucrRowSummary_Load(sender As Object, e As EventArgs) Handles MyBase.Load + End Sub + + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) + + End Sub + + Public Sub SetValuesToOperator() + + End Sub End Class diff --git a/instat/UserTables/Rows/ucrRows.Designer.vb b/instat/UserTables/Rows/ucrRows.Designer.vb index 3ed882bb06f..6133394eb46 100644 --- a/instat/UserTables/Rows/ucrRows.Designer.vb +++ b/instat/UserTables/Rows/ucrRows.Designer.vb @@ -24,8 +24,9 @@ Partial Class ucrRows Private Sub InitializeComponent() Me.rdoRowsGroups = New System.Windows.Forms.RadioButton() Me.rdoRowsSummaries = New System.Windows.Forms.RadioButton() - Me.ucrPnlRows = New instat.UcrPanel() Me.ucrRowGroups = New instat.ucrRowGroup() + Me.ucrPnlRows = New instat.UcrPanel() + Me.ucrRowSummary = New instat.ucrRowSummary() Me.SuspendLayout() ' 'rdoRowsGroups @@ -40,9 +41,10 @@ Partial Class ucrRows Me.rdoRowsGroups.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsGroups.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsGroups.Location = New System.Drawing.Point(203, 3) + Me.rdoRowsGroups.Location = New System.Drawing.Point(159, 5) + Me.rdoRowsGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoRowsGroups.Name = "rdoRowsGroups" - Me.rdoRowsGroups.Size = New System.Drawing.Size(91, 29) + Me.rdoRowsGroups.Size = New System.Drawing.Size(136, 45) Me.rdoRowsGroups.TabIndex = 280 Me.rdoRowsGroups.Text = "Groups" Me.rdoRowsGroups.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -60,39 +62,52 @@ Partial Class ucrRows Me.rdoRowsSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsSummaries.Location = New System.Drawing.Point(292, 3) + Me.rdoRowsSummaries.Location = New System.Drawing.Point(293, 5) + Me.rdoRowsSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoRowsSummaries.Name = "rdoRowsSummaries" - Me.rdoRowsSummaries.Size = New System.Drawing.Size(91, 29) + Me.rdoRowsSummaries.Size = New System.Drawing.Size(136, 45) Me.rdoRowsSummaries.TabIndex = 281 Me.rdoRowsSummaries.Text = "Summaries" Me.rdoRowsSummaries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoRowsSummaries.UseVisualStyleBackColor = True ' + 'ucrRowGroups + ' + Me.ucrRowGroups.Location = New System.Drawing.Point(4, 58) + Me.ucrRowGroups.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrRowGroups.Name = "ucrRowGroups" + Me.ucrRowGroups.Size = New System.Drawing.Size(789, 428) + Me.ucrRowGroups.TabIndex = 283 + ' 'ucrPnlRows ' Me.ucrPnlRows.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlRows.Location = New System.Drawing.Point(178, 3) + Me.ucrPnlRows.Location = New System.Drawing.Point(24, 5) + Me.ucrPnlRows.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlRows.Name = "ucrPnlRows" - Me.ucrPnlRows.Size = New System.Drawing.Size(232, 29) + Me.ucrPnlRows.Size = New System.Drawing.Size(591, 45) Me.ucrPnlRows.TabIndex = 279 ' - 'ucrRowGroups + 'ucrRowSummary ' - Me.ucrRowGroups.Location = New System.Drawing.Point(3, 38) - Me.ucrRowGroups.Name = "ucrRowGroups" - Me.ucrRowGroups.Size = New System.Drawing.Size(577, 306) - Me.ucrRowGroups.TabIndex = 283 + Me.ucrRowSummary.Location = New System.Drawing.Point(4, 64) + Me.ucrRowSummary.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrRowSummary.Name = "ucrRowSummary" + Me.ucrRowSummary.Size = New System.Drawing.Size(789, 484) + Me.ucrRowSummary.TabIndex = 284 ' 'ucrRows ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrRowGroups) + Me.Controls.Add(Me.ucrRowSummary) Me.Controls.Add(Me.rdoRowsGroups) Me.Controls.Add(Me.rdoRowsSummaries) Me.Controls.Add(Me.ucrPnlRows) + Me.Controls.Add(Me.ucrRowGroups) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrRows" - Me.Size = New System.Drawing.Size(583, 340) + Me.Size = New System.Drawing.Size(843, 567) Me.ResumeLayout(False) End Sub @@ -100,4 +115,5 @@ Partial Class ucrRows Friend WithEvents rdoRowsSummaries As RadioButton Friend WithEvents ucrPnlRows As UcrPanel Friend WithEvents ucrRowGroups As ucrRowGroup + Friend WithEvents ucrRowSummary As ucrRowSummary End Class diff --git a/instat/UserTables/Rows/ucrRows.vb b/instat/UserTables/Rows/ucrRows.vb index 996ae4a19b4..a3e5f47ac55 100644 --- a/instat/UserTables/Rows/ucrRows.vb +++ b/instat/UserTables/Rows/ucrRows.vb @@ -13,14 +13,17 @@ bFirstload = False End If ucrRowGroups.Setup(strDataFrameName, clsOperator) + ucrRowSummary.Setup(strDataFrameName, clsOperator) End Sub Private Sub ucrPnlRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRows.ControlValueChanged ucrRowGroups.Visible = rdoRowsGroups.Checked + ucrRowSummary.Visible = rdoRowsSummaries.Checked End Sub Public Sub SetValuesToOperator() ucrRowGroups.SetValuesToOperator() + ucrRowSummary.SetValuesToOperator() End Sub End Class From 721abfb47def1406df029dc4ccdb3f1f4419605a Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 1 Aug 2024 19:26:38 +0300 Subject: [PATCH 093/273] row summaries design additions --- .../UserTables/Rows/ucrRowSummary.Designer.vb | 281 ++++++++++++------ instat/UserTables/Rows/ucrRowSummary.resx | 6 +- instat/UserTables/Rows/ucrRowSummary.vb | 39 +++ instat/UserTables/Rows/ucrRows.Designer.vb | 32 +- instat/UserTables/sdgTableOptions.Designer.vb | 241 ++++++++------- 5 files changed, 380 insertions(+), 219 deletions(-) diff --git a/instat/UserTables/Rows/ucrRowSummary.Designer.vb b/instat/UserTables/Rows/ucrRowSummary.Designer.vb index eb191ee1886..ee29dc22b88 100644 --- a/instat/UserTables/Rows/ucrRowSummary.Designer.vb +++ b/instat/UserTables/Rows/ucrRowSummary.Designer.vb @@ -23,9 +23,6 @@ Partial Class ucrRowSummary _ Private Sub InitializeComponent() Me.dataGridSummaries = New System.Windows.Forms.DataGridView() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.btnStyle = New System.Windows.Forms.Button() Me.lblSummaryTypes = New System.Windows.Forms.Label() Me.lblSummaries = New System.Windows.Forms.Label() @@ -33,10 +30,20 @@ Partial Class ucrRowSummary Me.btnAddSummaries = New System.Windows.Forms.Button() Me.lblSummaryLabel = New System.Windows.Forms.Label() Me.lblReplaceWith = New System.Windows.Forms.Label() - Me.UcrInputTextBox2 = New instat.ucrInputTextBox() - Me.UcrInputComboBox1 = New instat.ucrInputComboBox() - Me.UcrInputTextBox1 = New instat.ucrInputTextBox() Me.btnFormat = New System.Windows.Forms.Button() + Me.lblColumns = New System.Windows.Forms.Label() + Me.lblGroupId = New System.Windows.Forms.Label() + Me.lblSide = New System.Windows.Forms.Label() + Me.colType = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.ucrCboSide = New instat.ucrInputComboBox() + Me.ucrTxtGroupId = New instat.ucrInputTextBox() + Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() + Me.ucrSelectorCols = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrTxtReplaceNa = New instat.ucrInputTextBox() + Me.ucrCboSummaryType = New instat.ucrInputComboBox() + Me.ucrTxtSummaryLabel = New instat.ucrInputTextBox() CType(Me.dataGridSummaries, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -44,44 +51,20 @@ Partial Class ucrRowSummary ' Me.dataGridSummaries.AllowUserToAddRows = False Me.dataGridSummaries.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSummaries.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colStyleExpression}) - Me.dataGridSummaries.Location = New System.Drawing.Point(4, 320) + Me.dataGridSummaries.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colType, Me.colLabel, Me.colExpression}) + Me.dataGridSummaries.Location = New System.Drawing.Point(360, 451) Me.dataGridSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridSummaries.Name = "dataGridSummaries" Me.dataGridSummaries.ReadOnly = True Me.dataGridSummaries.RowHeadersWidth = 62 - Me.dataGridSummaries.Size = New System.Drawing.Size(484, 146) + Me.dataGridSummaries.Size = New System.Drawing.Size(522, 120) Me.dataGridSummaries.TabIndex = 335 ' - 'colLabel - ' - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.ReadOnly = True - Me.colLabel.Width = 70 - ' - 'colCodnition - ' - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.ReadOnly = True - Me.colCodnition.Width = 90 - ' - 'colStyleExpression - ' - Me.colStyleExpression.HeaderText = "Style Expression" - Me.colStyleExpression.MinimumWidth = 8 - Me.colStyleExpression.Name = "colStyleExpression" - Me.colStyleExpression.ReadOnly = True - Me.colStyleExpression.Width = 90 - ' 'btnStyle ' Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnStyle.Location = New System.Drawing.Point(154, 158) + Me.btnStyle.Location = New System.Drawing.Point(738, 301) Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnStyle.Name = "btnStyle" Me.btnStyle.Size = New System.Drawing.Size(126, 35) @@ -94,7 +77,7 @@ Partial Class ucrRowSummary ' Me.lblSummaryTypes.AutoSize = True Me.lblSummaryTypes.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryTypes.Location = New System.Drawing.Point(11, 9) + Me.lblSummaryTypes.Location = New System.Drawing.Point(356, 144) Me.lblSummaryTypes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryTypes.Name = "lblSummaryTypes" Me.lblSummaryTypes.Size = New System.Drawing.Size(118, 20) @@ -105,7 +88,7 @@ Partial Class ucrRowSummary ' Me.lblSummaries.AutoSize = True Me.lblSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaries.Location = New System.Drawing.Point(6, 295) + Me.lblSummaries.Location = New System.Drawing.Point(362, 426) Me.lblSummaries.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaries.Name = "lblSummaries" Me.lblSummaries.Size = New System.Drawing.Size(93, 20) @@ -115,7 +98,7 @@ Partial Class ucrRowSummary 'btnClearSummaries ' Me.btnClearSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClearSummaries.Location = New System.Drawing.Point(366, 271) + Me.btnClearSummaries.Location = New System.Drawing.Point(758, 410) Me.btnClearSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnClearSummaries.Name = "btnClearSummaries" Me.btnClearSummaries.Size = New System.Drawing.Size(118, 35) @@ -128,7 +111,7 @@ Partial Class ucrRowSummary ' Me.btnAddSummaries.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddSummaries.Location = New System.Drawing.Point(10, 246) + Me.btnAddSummaries.Location = New System.Drawing.Point(363, 377) Me.btnAddSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnAddSummaries.Name = "btnAddSummaries" Me.btnAddSummaries.Size = New System.Drawing.Size(144, 35) @@ -141,7 +124,7 @@ Partial Class ucrRowSummary ' Me.lblSummaryLabel.AutoSize = True Me.lblSummaryLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryLabel.Location = New System.Drawing.Point(11, 81) + Me.lblSummaryLabel.Location = New System.Drawing.Point(362, 216) Me.lblSummaryLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryLabel.Name = "lblSummaryLabel" Me.lblSummaryLabel.Size = New System.Drawing.Size(123, 20) @@ -152,54 +135,18 @@ Partial Class ucrRowSummary ' Me.lblReplaceWith.AutoSize = True Me.lblReplaceWith.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblReplaceWith.Location = New System.Drawing.Point(255, 9) + Me.lblReplaceWith.Location = New System.Drawing.Point(590, 144) Me.lblReplaceWith.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblReplaceWith.Name = "lblReplaceWith" - Me.lblReplaceWith.Size = New System.Drawing.Size(130, 20) + Me.lblReplaceWith.Size = New System.Drawing.Size(203, 20) Me.lblReplaceWith.TabIndex = 346 - Me.lblReplaceWith.Text = "Replace NA with:" - ' - 'UcrInputTextBox2 - ' - Me.UcrInputTextBox2.AddQuotesIfUnrecognised = True - Me.UcrInputTextBox2.AutoSize = True - Me.UcrInputTextBox2.IsMultiline = False - Me.UcrInputTextBox2.IsReadOnly = False - Me.UcrInputTextBox2.Location = New System.Drawing.Point(254, 35) - Me.UcrInputTextBox2.Margin = New System.Windows.Forms.Padding(14) - Me.UcrInputTextBox2.Name = "UcrInputTextBox2" - Me.UcrInputTextBox2.Size = New System.Drawing.Size(180, 32) - Me.UcrInputTextBox2.TabIndex = 347 - ' - 'UcrInputComboBox1 - ' - Me.UcrInputComboBox1.AddQuotesIfUnrecognised = True - Me.UcrInputComboBox1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.UcrInputComboBox1.GetSetSelectedIndex = -1 - Me.UcrInputComboBox1.IsReadOnly = False - Me.UcrInputComboBox1.Location = New System.Drawing.Point(14, 32) - Me.UcrInputComboBox1.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.UcrInputComboBox1.Name = "UcrInputComboBox1" - Me.UcrInputComboBox1.Size = New System.Drawing.Size(176, 40) - Me.UcrInputComboBox1.TabIndex = 345 - ' - 'UcrInputTextBox1 - ' - Me.UcrInputTextBox1.AddQuotesIfUnrecognised = True - Me.UcrInputTextBox1.AutoSize = True - Me.UcrInputTextBox1.IsMultiline = False - Me.UcrInputTextBox1.IsReadOnly = False - Me.UcrInputTextBox1.Location = New System.Drawing.Point(10, 107) - Me.UcrInputTextBox1.Margin = New System.Windows.Forms.Padding(14) - Me.UcrInputTextBox1.Name = "UcrInputTextBox1" - Me.UcrInputTextBox1.Size = New System.Drawing.Size(180, 32) - Me.UcrInputTextBox1.TabIndex = 343 + Me.lblReplaceWith.Text = "Replace NA with (Optional):" ' 'btnFormat ' Me.btnFormat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnFormat.Location = New System.Drawing.Point(10, 158) + Me.btnFormat.Location = New System.Drawing.Point(594, 301) Me.btnFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnFormat.Name = "btnFormat" Me.btnFormat.Size = New System.Drawing.Size(136, 35) @@ -208,15 +155,164 @@ Partial Class ucrRowSummary Me.btnFormat.Text = "Format" Me.btnFormat.UseVisualStyleBackColor = True ' + 'lblColumns + ' + Me.lblColumns.AutoSize = True + Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblColumns.Location = New System.Drawing.Point(362, 13) + Me.lblColumns.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblColumns.Name = "lblColumns" + Me.lblColumns.Size = New System.Drawing.Size(85, 20) + Me.lblColumns.TabIndex = 350 + Me.lblColumns.Text = "Column(s):" + ' + 'lblGroupId + ' + Me.lblGroupId.AutoSize = True + Me.lblGroupId.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblGroupId.Location = New System.Drawing.Point(590, 216) + Me.lblGroupId.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblGroupId.Name = "lblGroupId" + Me.lblGroupId.Size = New System.Drawing.Size(152, 20) + Me.lblGroupId.TabIndex = 352 + Me.lblGroupId.Text = "Group ID (Optional):" + ' + 'lblSide + ' + Me.lblSide.AutoSize = True + Me.lblSide.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSide.Location = New System.Drawing.Point(362, 288) + Me.lblSide.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSide.Name = "lblSide" + Me.lblSide.Size = New System.Drawing.Size(45, 20) + Me.lblSide.TabIndex = 354 + Me.lblSide.Text = "Side:" + ' + 'colType + ' + Me.colType.HeaderText = "Type" + Me.colType.MinimumWidth = 8 + Me.colType.Name = "colType" + Me.colType.ReadOnly = True + Me.colType.Width = 70 + ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 70 + ' + 'colExpression + ' + Me.colExpression.HeaderText = "Expression" + Me.colExpression.MinimumWidth = 8 + Me.colExpression.Name = "colExpression" + Me.colExpression.ReadOnly = True + Me.colExpression.Width = 90 + ' + 'ucrCboSide + ' + Me.ucrCboSide.AddQuotesIfUnrecognised = True + Me.ucrCboSide.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSide.GetSetSelectedIndex = -1 + Me.ucrCboSide.IsReadOnly = False + Me.ucrCboSide.Location = New System.Drawing.Point(359, 309) + Me.ucrCboSide.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrCboSide.Name = "ucrCboSide" + Me.ucrCboSide.Size = New System.Drawing.Size(176, 40) + Me.ucrCboSide.TabIndex = 355 + ' + 'ucrTxtGroupId + ' + Me.ucrTxtGroupId.AddQuotesIfUnrecognised = True + Me.ucrTxtGroupId.AutoSize = True + Me.ucrTxtGroupId.IsMultiline = False + Me.ucrTxtGroupId.IsReadOnly = False + Me.ucrTxtGroupId.Location = New System.Drawing.Point(594, 242) + Me.ucrTxtGroupId.Margin = New System.Windows.Forms.Padding(14) + Me.ucrTxtGroupId.Name = "ucrTxtGroupId" + Me.ucrTxtGroupId.Size = New System.Drawing.Size(180, 32) + Me.ucrTxtGroupId.TabIndex = 353 + ' + 'ucrReceiverMultipleCols + ' + Me.ucrReceiverMultipleCols.AutoSize = True + Me.ucrReceiverMultipleCols.frmParent = Nothing + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(359, 38) + Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" + Me.ucrReceiverMultipleCols.Selector = Nothing + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(198, 85) + Me.ucrReceiverMultipleCols.strNcFilePath = "" + Me.ucrReceiverMultipleCols.TabIndex = 351 + Me.ucrReceiverMultipleCols.ucrSelector = Nothing + ' + 'ucrSelectorCols + ' + Me.ucrSelectorCols.AutoSize = True + Me.ucrSelectorCols.bDropUnusedFilterLevels = False + Me.ucrSelectorCols.bShowHiddenColumns = False + Me.ucrSelectorCols.bUseCurrentFilter = True + Me.ucrSelectorCols.Location = New System.Drawing.Point(9, 7) + Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorCols.Name = "ucrSelectorCols" + Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) + Me.ucrSelectorCols.TabIndex = 349 + ' + 'ucrTxtReplaceNa + ' + Me.ucrTxtReplaceNa.AddQuotesIfUnrecognised = True + Me.ucrTxtReplaceNa.AutoSize = True + Me.ucrTxtReplaceNa.IsMultiline = False + Me.ucrTxtReplaceNa.IsReadOnly = False + Me.ucrTxtReplaceNa.Location = New System.Drawing.Point(594, 167) + Me.ucrTxtReplaceNa.Margin = New System.Windows.Forms.Padding(14) + Me.ucrTxtReplaceNa.Name = "ucrTxtReplaceNa" + Me.ucrTxtReplaceNa.Size = New System.Drawing.Size(180, 32) + Me.ucrTxtReplaceNa.TabIndex = 347 + ' + 'ucrCboSummaryType + ' + Me.ucrCboSummaryType.AddQuotesIfUnrecognised = True + Me.ucrCboSummaryType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSummaryType.GetSetSelectedIndex = -1 + Me.ucrCboSummaryType.IsReadOnly = False + Me.ucrCboSummaryType.Location = New System.Drawing.Point(359, 167) + Me.ucrCboSummaryType.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrCboSummaryType.Name = "ucrCboSummaryType" + Me.ucrCboSummaryType.Size = New System.Drawing.Size(176, 40) + Me.ucrCboSummaryType.TabIndex = 345 + ' + 'ucrTxtSummaryLabel + ' + Me.ucrTxtSummaryLabel.AddQuotesIfUnrecognised = True + Me.ucrTxtSummaryLabel.AutoSize = True + Me.ucrTxtSummaryLabel.IsMultiline = False + Me.ucrTxtSummaryLabel.IsReadOnly = False + Me.ucrTxtSummaryLabel.Location = New System.Drawing.Point(360, 242) + Me.ucrTxtSummaryLabel.Margin = New System.Windows.Forms.Padding(14) + Me.ucrTxtSummaryLabel.Name = "ucrTxtSummaryLabel" + Me.ucrTxtSummaryLabel.Size = New System.Drawing.Size(180, 32) + Me.ucrTxtSummaryLabel.TabIndex = 343 + ' 'ucrRowSummary ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.ucrCboSide) + Me.Controls.Add(Me.lblSide) + Me.Controls.Add(Me.ucrTxtGroupId) + Me.Controls.Add(Me.lblGroupId) + Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Controls.Add(Me.lblColumns) + Me.Controls.Add(Me.ucrSelectorCols) Me.Controls.Add(Me.btnFormat) - Me.Controls.Add(Me.UcrInputTextBox2) + Me.Controls.Add(Me.ucrTxtReplaceNa) Me.Controls.Add(Me.lblReplaceWith) - Me.Controls.Add(Me.UcrInputComboBox1) - Me.Controls.Add(Me.UcrInputTextBox1) + Me.Controls.Add(Me.ucrCboSummaryType) + Me.Controls.Add(Me.ucrTxtSummaryLabel) Me.Controls.Add(Me.lblSummaryLabel) Me.Controls.Add(Me.dataGridSummaries) Me.Controls.Add(Me.btnStyle) @@ -226,7 +322,7 @@ Partial Class ucrRowSummary Me.Controls.Add(Me.btnAddSummaries) Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrRowSummary" - Me.Size = New System.Drawing.Size(530, 471) + Me.Size = New System.Drawing.Size(890, 576) CType(Me.dataGridSummaries, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -234,18 +330,25 @@ Partial Class ucrRowSummary End Sub Friend WithEvents dataGridSummaries As DataGridView - Friend WithEvents colLabel As DataGridViewTextBoxColumn - Friend WithEvents colCodnition As DataGridViewTextBoxColumn - Friend WithEvents colStyleExpression As DataGridViewTextBoxColumn Friend WithEvents btnStyle As Button Friend WithEvents lblSummaryTypes As Label Friend WithEvents lblSummaries As Label Friend WithEvents btnClearSummaries As Button Friend WithEvents btnAddSummaries As Button - Friend WithEvents UcrInputTextBox1 As ucrInputTextBox + Friend WithEvents ucrTxtSummaryLabel As ucrInputTextBox Friend WithEvents lblSummaryLabel As Label - Friend WithEvents UcrInputComboBox1 As ucrInputComboBox - Friend WithEvents UcrInputTextBox2 As ucrInputTextBox + Friend WithEvents ucrCboSummaryType As ucrInputComboBox + Friend WithEvents ucrTxtReplaceNa As ucrInputTextBox Friend WithEvents lblReplaceWith As Label Friend WithEvents btnFormat As Button + Friend WithEvents ucrReceiverMultipleCols As ucrReceiverMultiple + Friend WithEvents lblColumns As Label + Friend WithEvents ucrSelectorCols As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrTxtGroupId As ucrInputTextBox + Friend WithEvents lblGroupId As Label + Friend WithEvents lblSide As Label + Friend WithEvents ucrCboSide As ucrInputComboBox + Friend WithEvents colType As DataGridViewTextBoxColumn + Friend WithEvents colLabel As DataGridViewTextBoxColumn + Friend WithEvents colExpression As DataGridViewTextBoxColumn End Class diff --git a/instat/UserTables/Rows/ucrRowSummary.resx b/instat/UserTables/Rows/ucrRowSummary.resx index 9a01250ba65..866a5eff3e1 100644 --- a/instat/UserTables/Rows/ucrRowSummary.resx +++ b/instat/UserTables/Rows/ucrRowSummary.resx @@ -117,13 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + True - + True - + True \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb index 942dc7ad42b..7347b7832e1 100644 --- a/instat/UserTables/Rows/ucrRowSummary.vb +++ b/instat/UserTables/Rows/ucrRowSummary.vb @@ -10,4 +10,43 @@ Public Sub SetValuesToOperator() End Sub + + Private Sub btnAddSummaries_Click(sender As Object, e As EventArgs) Handles btnAddSummaries.Click + + End Sub + + Private Sub btnFormat_Click(sender As Object, e As EventArgs) Handles btnFormat.Click + sdgCellFormatNumberOptions.ShowDialog(Me.ParentForm) + Dim clsFormatRFunction As RFunction = sdgCellFormatNumberOptions.GetNewUserInputAsRFunction() + + If clsFormatRFunction Is Nothing Then + btnFormat.Tag = clsFormatRFunction + End If + + End Sub + + Private Sub btnStyle_Click(sender As Object, e As EventArgs) Handles btnStyle.Click + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_summary") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + 'If Not ucrRowExpression.IsEmpty Then + ' clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetText(), iNewPosition:=1)) + 'End If + + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) + + btnStyle.Tag = clsTabStyleRFunction + + + End Sub + + Private Sub btnClearSummaries_Click(sender As Object, e As EventArgs) Handles btnClearSummaries.Click + dataGridSummaries.Rows.Clear() + End Sub End Class diff --git a/instat/UserTables/Rows/ucrRows.Designer.vb b/instat/UserTables/Rows/ucrRows.Designer.vb index 6133394eb46..443747332c0 100644 --- a/instat/UserTables/Rows/ucrRows.Designer.vb +++ b/instat/UserTables/Rows/ucrRows.Designer.vb @@ -24,9 +24,9 @@ Partial Class ucrRows Private Sub InitializeComponent() Me.rdoRowsGroups = New System.Windows.Forms.RadioButton() Me.rdoRowsSummaries = New System.Windows.Forms.RadioButton() - Me.ucrRowGroups = New instat.ucrRowGroup() Me.ucrPnlRows = New instat.UcrPanel() Me.ucrRowSummary = New instat.ucrRowSummary() + Me.ucrRowGroups = New instat.ucrRowGroup() Me.SuspendLayout() ' 'rdoRowsGroups @@ -41,7 +41,7 @@ Partial Class ucrRows Me.rdoRowsGroups.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsGroups.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsGroups.Location = New System.Drawing.Point(159, 5) + Me.rdoRowsGroups.Location = New System.Drawing.Point(267, 5) Me.rdoRowsGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoRowsGroups.Name = "rdoRowsGroups" Me.rdoRowsGroups.Size = New System.Drawing.Size(136, 45) @@ -62,7 +62,7 @@ Partial Class ucrRows Me.rdoRowsSummaries.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRowsSummaries.ForeColor = System.Drawing.SystemColors.ActiveCaptionText Me.rdoRowsSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRowsSummaries.Location = New System.Drawing.Point(293, 5) + Me.rdoRowsSummaries.Location = New System.Drawing.Point(401, 5) Me.rdoRowsSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoRowsSummaries.Name = "rdoRowsSummaries" Me.rdoRowsSummaries.Size = New System.Drawing.Size(136, 45) @@ -71,43 +71,43 @@ Partial Class ucrRows Me.rdoRowsSummaries.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoRowsSummaries.UseVisualStyleBackColor = True ' - 'ucrRowGroups - ' - Me.ucrRowGroups.Location = New System.Drawing.Point(4, 58) - Me.ucrRowGroups.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrRowGroups.Name = "ucrRowGroups" - Me.ucrRowGroups.Size = New System.Drawing.Size(789, 428) - Me.ucrRowGroups.TabIndex = 283 - ' 'ucrPnlRows ' Me.ucrPnlRows.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlRows.Location = New System.Drawing.Point(24, 5) Me.ucrPnlRows.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlRows.Name = "ucrPnlRows" - Me.ucrPnlRows.Size = New System.Drawing.Size(591, 45) + Me.ucrPnlRows.Size = New System.Drawing.Size(821, 45) Me.ucrPnlRows.TabIndex = 279 ' 'ucrRowSummary ' - Me.ucrRowSummary.Location = New System.Drawing.Point(4, 64) + Me.ucrRowSummary.Location = New System.Drawing.Point(8, 64) Me.ucrRowSummary.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrRowSummary.Name = "ucrRowSummary" - Me.ucrRowSummary.Size = New System.Drawing.Size(789, 484) + Me.ucrRowSummary.Size = New System.Drawing.Size(900, 588) Me.ucrRowSummary.TabIndex = 284 ' + 'ucrRowGroups + ' + Me.ucrRowGroups.Location = New System.Drawing.Point(4, 58) + Me.ucrRowGroups.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrRowGroups.Name = "ucrRowGroups" + Me.ucrRowGroups.Size = New System.Drawing.Size(575, 411) + Me.ucrRowGroups.TabIndex = 283 + ' 'ucrRows ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.Controls.Add(Me.ucrRowSummary) Me.Controls.Add(Me.rdoRowsGroups) Me.Controls.Add(Me.rdoRowsSummaries) Me.Controls.Add(Me.ucrPnlRows) Me.Controls.Add(Me.ucrRowGroups) + Me.Controls.Add(Me.ucrRowSummary) Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrRows" - Me.Size = New System.Drawing.Size(843, 567) + Me.Size = New System.Drawing.Size(993, 667) Me.ResumeLayout(False) End Sub diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index cf5fcd4c456..af45e52407c 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -24,26 +24,26 @@ Partial Class sdgTableOptions Private Sub InitializeComponent() Me.tbpFormatOptions = New System.Windows.Forms.TabControl() Me.tbpHeader = New System.Windows.Forms.TabPage() + Me.ucrHeader = New instat.ucrHeader() Me.tbpStub = New System.Windows.Forms.TabPage() + Me.ucrStub = New instat.ucrStub() Me.tbpColumns = New System.Windows.Forms.TabPage() + Me.ucrColumns = New instat.ucrColumns() Me.tbpRows = New System.Windows.Forms.TabPage() + Me.ucrRows = New instat.ucrRows() Me.tbpCells = New System.Windows.Forms.TabPage() + Me.ucrCells = New instat.ucrCells() Me.tbpSourceNotes = New System.Windows.Forms.TabPage() + Me.ucrSourceNotes = New instat.ucrSourceNotes() Me.tbpThemes = New System.Windows.Forms.TabPage() + Me.ucrCboSelectThemes = New instat.ucrInputComboBox() Me.btnManualTheme = New System.Windows.Forms.Button() Me.rdoSelectTheme = New System.Windows.Forms.RadioButton() Me.rdoManualTheme = New System.Windows.Forms.RadioButton() - Me.tbpOtherStyles = New System.Windows.Forms.TabPage() - Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() - Me.ucrHeader = New instat.ucrHeader() - Me.ucrStub = New instat.ucrStub() - Me.ucrColumns = New instat.ucrColumns() - Me.ucrRows = New instat.ucrRows() - Me.ucrCells = New instat.ucrCells() - Me.ucrSourceNotes = New instat.ucrSourceNotes() - Me.ucrCboSelectThemes = New instat.ucrInputComboBox() Me.ucrPnlThemesPanel = New instat.UcrPanel() + Me.tbpOtherStyles = New System.Windows.Forms.TabPage() Me.ucrOtherStyles = New instat.ucrOtherStyles() + Me.ucrSdgBaseButtons = New instat.ucrButtonsSubdialogue() Me.tbpFormatOptions.SuspendLayout() Me.tbpHeader.SuspendLayout() Me.tbpStub.SuspendLayout() @@ -65,73 +65,128 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) Me.tbpFormatOptions.Controls.Add(Me.tbpOtherStyles) - Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) + Me.tbpFormatOptions.Location = New System.Drawing.Point(4, 8) + Me.tbpFormatOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 400) + Me.tbpFormatOptions.Size = New System.Drawing.Size(984, 703) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader ' Me.tbpHeader.Controls.Add(Me.ucrHeader) - Me.tbpHeader.Location = New System.Drawing.Point(4, 22) + Me.tbpHeader.Location = New System.Drawing.Point(4, 29) + Me.tbpHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpHeader.Name = "tbpHeader" - Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) - Me.tbpHeader.Size = New System.Drawing.Size(648, 374) + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpHeader.Size = New System.Drawing.Size(976, 582) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' + 'ucrHeader + ' + Me.ucrHeader.Location = New System.Drawing.Point(10, 9) + Me.ucrHeader.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrHeader.Name = "ucrHeader" + Me.ucrHeader.Size = New System.Drawing.Size(454, 409) + Me.ucrHeader.TabIndex = 16 + ' 'tbpStub ' Me.tbpStub.Controls.Add(Me.ucrStub) - Me.tbpStub.Location = New System.Drawing.Point(4, 22) + Me.tbpStub.Location = New System.Drawing.Point(4, 29) + Me.tbpStub.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(648, 374) + Me.tbpStub.Size = New System.Drawing.Size(976, 582) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True ' + 'ucrStub + ' + Me.ucrStub.Location = New System.Drawing.Point(10, 11) + Me.ucrStub.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrStub.Name = "ucrStub" + Me.ucrStub.Size = New System.Drawing.Size(638, 397) + Me.ucrStub.TabIndex = 0 + ' 'tbpColumns ' Me.tbpColumns.Controls.Add(Me.ucrColumns) - Me.tbpColumns.Location = New System.Drawing.Point(4, 22) + Me.tbpColumns.Location = New System.Drawing.Point(4, 29) + Me.tbpColumns.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(648, 374) + Me.tbpColumns.Size = New System.Drawing.Size(976, 582) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True ' + 'ucrColumns + ' + Me.ucrColumns.Location = New System.Drawing.Point(8, 9) + Me.ucrColumns.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumns.Name = "ucrColumns" + Me.ucrColumns.Size = New System.Drawing.Size(948, 554) + Me.ucrColumns.TabIndex = 0 + ' 'tbpRows ' Me.tbpRows.Controls.Add(Me.ucrRows) - Me.tbpRows.Location = New System.Drawing.Point(4, 22) + Me.tbpRows.Location = New System.Drawing.Point(4, 29) + Me.tbpRows.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(648, 374) + Me.tbpRows.Size = New System.Drawing.Size(976, 670) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True ' + 'ucrRows + ' + Me.ucrRows.Location = New System.Drawing.Point(10, 14) + Me.ucrRows.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrRows.Name = "ucrRows" + Me.ucrRows.Size = New System.Drawing.Size(900, 648) + Me.ucrRows.TabIndex = 0 + ' 'tbpCells ' Me.tbpCells.Controls.Add(Me.ucrCells) - Me.tbpCells.Location = New System.Drawing.Point(4, 22) + Me.tbpCells.Location = New System.Drawing.Point(4, 29) + Me.tbpCells.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(648, 374) + Me.tbpCells.Size = New System.Drawing.Size(976, 582) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True ' + 'ucrCells + ' + Me.ucrCells.Location = New System.Drawing.Point(12, 12) + Me.ucrCells.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrCells.Name = "ucrCells" + Me.ucrCells.Size = New System.Drawing.Size(966, 554) + Me.ucrCells.TabIndex = 6 + ' 'tbpSourceNotes ' Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) - Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 29) + Me.tbpSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 374) + Me.tbpSourceNotes.Size = New System.Drawing.Size(976, 582) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' + 'ucrSourceNotes + ' + Me.ucrSourceNotes.Location = New System.Drawing.Point(10, 11) + Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSourceNotes.Name = "ucrSourceNotes" + Me.ucrSourceNotes.Size = New System.Drawing.Size(872, 292) + Me.ucrSourceNotes.TabIndex = 0 + ' 'tbpThemes ' Me.tbpThemes.Controls.Add(Me.ucrCboSelectThemes) @@ -139,18 +194,32 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) - Me.tbpThemes.Location = New System.Drawing.Point(4, 22) + Me.tbpThemes.Location = New System.Drawing.Point(4, 29) + Me.tbpThemes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(648, 374) + Me.tbpThemes.Size = New System.Drawing.Size(976, 582) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True ' + 'ucrCboSelectThemes + ' + Me.ucrCboSelectThemes.AddQuotesIfUnrecognised = True + Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 + Me.ucrCboSelectThemes.IsReadOnly = False + Me.ucrCboSelectThemes.Location = New System.Drawing.Point(236, 45) + Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" + Me.ucrCboSelectThemes.Size = New System.Drawing.Size(252, 32) + Me.ucrCboSelectThemes.TabIndex = 3 + ' 'btnManualTheme ' - Me.btnManualTheme.Location = New System.Drawing.Point(157, 59) + Me.btnManualTheme.Location = New System.Drawing.Point(236, 91) + Me.btnManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnManualTheme.Name = "btnManualTheme" - Me.btnManualTheme.Size = New System.Drawing.Size(168, 21) + Me.btnManualTheme.Size = New System.Drawing.Size(252, 32) Me.btnManualTheme.TabIndex = 2 Me.btnManualTheme.Text = "Custom Theme" Me.btnManualTheme.UseVisualStyleBackColor = True @@ -159,9 +228,10 @@ Partial Class sdgTableOptions ' Me.rdoSelectTheme.AutoSize = True Me.rdoSelectTheme.Checked = True - Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) + Me.rdoSelectTheme.Location = New System.Drawing.Point(33, 48) + Me.rdoSelectTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoSelectTheme.Name = "rdoSelectTheme" - Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) + Me.rdoSelectTheme.Size = New System.Drawing.Size(132, 24) Me.rdoSelectTheme.TabIndex = 0 Me.rdoSelectTheme.TabStop = True Me.rdoSelectTheme.Text = "Select Theme" @@ -170,112 +240,61 @@ Partial Class sdgTableOptions 'rdoManualTheme ' Me.rdoManualTheme.AutoSize = True - Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) + Me.rdoManualTheme.Location = New System.Drawing.Point(33, 94) + Me.rdoManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rdoManualTheme.Name = "rdoManualTheme" - Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) + Me.rdoManualTheme.Size = New System.Drawing.Size(139, 24) Me.rdoManualTheme.TabIndex = 1 Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True ' + 'ucrPnlThemesPanel + ' + Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(18, 25) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(524, 108) + Me.ucrPnlThemesPanel.TabIndex = 4 + ' 'tbpOtherStyles ' Me.tbpOtherStyles.Controls.Add(Me.ucrOtherStyles) - Me.tbpOtherStyles.Location = New System.Drawing.Point(4, 22) + Me.tbpOtherStyles.Location = New System.Drawing.Point(4, 29) + Me.tbpOtherStyles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.tbpOtherStyles.Name = "tbpOtherStyles" - Me.tbpOtherStyles.Padding = New System.Windows.Forms.Padding(3) - Me.tbpOtherStyles.Size = New System.Drawing.Size(648, 374) + Me.tbpOtherStyles.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpOtherStyles.Size = New System.Drawing.Size(976, 582) Me.tbpOtherStyles.TabIndex = 10 Me.tbpOtherStyles.Text = "Other Styles" Me.tbpOtherStyles.UseVisualStyleBackColor = True ' + 'ucrOtherStyles + ' + Me.ucrOtherStyles.Location = New System.Drawing.Point(12, 11) + Me.ucrOtherStyles.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOtherStyles.Name = "ucrOtherStyles" + Me.ucrOtherStyles.Size = New System.Drawing.Size(489, 275) + Me.ucrOtherStyles.TabIndex = 0 + ' 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 410) - Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(300, 716) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" - Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(336, 46) Me.ucrSdgBaseButtons.TabIndex = 343 ' - 'ucrHeader - ' - Me.ucrHeader.Location = New System.Drawing.Point(7, 6) - Me.ucrHeader.Name = "ucrHeader" - Me.ucrHeader.Size = New System.Drawing.Size(303, 266) - Me.ucrHeader.TabIndex = 16 - ' - 'ucrStub - ' - Me.ucrStub.Location = New System.Drawing.Point(7, 7) - Me.ucrStub.Name = "ucrStub" - Me.ucrStub.Size = New System.Drawing.Size(425, 258) - Me.ucrStub.TabIndex = 0 - ' - 'ucrColumns - ' - Me.ucrColumns.Location = New System.Drawing.Point(5, 6) - Me.ucrColumns.Name = "ucrColumns" - Me.ucrColumns.Size = New System.Drawing.Size(632, 360) - Me.ucrColumns.TabIndex = 0 - ' - 'ucrRows - ' - Me.ucrRows.Location = New System.Drawing.Point(7, 9) - Me.ucrRows.Name = "ucrRows" - Me.ucrRows.Size = New System.Drawing.Size(600, 345) - Me.ucrRows.TabIndex = 0 - ' - 'ucrCells - ' - Me.ucrCells.Location = New System.Drawing.Point(8, 8) - Me.ucrCells.Name = "ucrCells" - Me.ucrCells.Size = New System.Drawing.Size(644, 360) - Me.ucrCells.TabIndex = 6 - ' - 'ucrSourceNotes - ' - Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) - Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSourceNotes.Name = "ucrSourceNotes" - Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) - Me.ucrSourceNotes.TabIndex = 0 - ' - 'ucrCboSelectThemes - ' - Me.ucrCboSelectThemes.AddQuotesIfUnrecognised = True - Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 - Me.ucrCboSelectThemes.IsReadOnly = False - Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) - Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" - Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) - Me.ucrCboSelectThemes.TabIndex = 3 - ' - 'ucrPnlThemesPanel - ' - Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) - Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" - Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) - Me.ucrPnlThemesPanel.TabIndex = 4 - ' - 'ucrOtherStyles - ' - Me.ucrOtherStyles.Location = New System.Drawing.Point(8, 7) - Me.ucrOtherStyles.Name = "ucrOtherStyles" - Me.ucrOtherStyles.Size = New System.Drawing.Size(326, 179) - Me.ucrOtherStyles.TabIndex = 0 - ' 'sdgTableOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(661, 443) + Me.ClientSize = New System.Drawing.Size(992, 769) Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.tbpFormatOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgTableOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Table Options" From 5f4587248048000ab0dc46944eef01a8f5ddc657 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 5 Aug 2024 10:13:12 +0300 Subject: [PATCH 094/273] mor row summary changes --- .../UserTables/Columns/ucrColumnSpanners.vb | 2 +- .../UserTables/Rows/ucrRowSummary.Designer.vb | 4 +- instat/UserTables/Rows/ucrRowSummary.resx | 9 +++ instat/UserTables/Rows/ucrRowSummary.vb | 74 ++++++++++++++++++- 4 files changed, 85 insertions(+), 4 deletions(-) diff --git a/instat/UserTables/Columns/ucrColumnSpanners.vb b/instat/UserTables/Columns/ucrColumnSpanners.vb index c671d10eb34..dfae2666d48 100644 --- a/instat/UserTables/Columns/ucrColumnSpanners.vb +++ b/instat/UserTables/Columns/ucrColumnSpanners.vb @@ -73,7 +73,7 @@ Public Class ucrColumnSpanners End Sub Private Sub btnAddColSpanner_Click(sender As Object, e As EventArgs) Handles btnAddColSpanner.Click - Dim strSpannerLabel As String = ucrInputColSpanner.GetValue() + Dim strSpannerLabel As String = ucrInputColSpanner.GetText() Dim strSpannerId As String = strSpannerLabel.Replace(" ", String.Empty) Dim strSpannerColsRFunction As String = mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False) Dim strSpannerStyleExpression As String = "" diff --git a/instat/UserTables/Rows/ucrRowSummary.Designer.vb b/instat/UserTables/Rows/ucrRowSummary.Designer.vb index ee29dc22b88..0f80a49baf6 100644 --- a/instat/UserTables/Rows/ucrRowSummary.Designer.vb +++ b/instat/UserTables/Rows/ucrRowSummary.Designer.vb @@ -111,7 +111,7 @@ Partial Class ucrRowSummary ' Me.btnAddSummaries.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAddSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAddSummaries.Location = New System.Drawing.Point(363, 377) + Me.btnAddSummaries.Location = New System.Drawing.Point(359, 373) Me.btnAddSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnAddSummaries.Name = "btnAddSummaries" Me.btnAddSummaries.Size = New System.Drawing.Size(144, 35) @@ -267,7 +267,7 @@ Partial Class ucrRowSummary Me.ucrTxtReplaceNa.AutoSize = True Me.ucrTxtReplaceNa.IsMultiline = False Me.ucrTxtReplaceNa.IsReadOnly = False - Me.ucrTxtReplaceNa.Location = New System.Drawing.Point(594, 167) + Me.ucrTxtReplaceNa.Location = New System.Drawing.Point(594, 170) Me.ucrTxtReplaceNa.Margin = New System.Windows.Forms.Padding(14) Me.ucrTxtReplaceNa.Name = "ucrTxtReplaceNa" Me.ucrTxtReplaceNa.Size = New System.Drawing.Size(180, 32) diff --git a/instat/UserTables/Rows/ucrRowSummary.resx b/instat/UserTables/Rows/ucrRowSummary.resx index 866a5eff3e1..103adcb6e9d 100644 --- a/instat/UserTables/Rows/ucrRowSummary.resx +++ b/instat/UserTables/Rows/ucrRowSummary.resx @@ -126,4 +126,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb index 7347b7832e1..9ef4cd56f96 100644 --- a/instat/UserTables/Rows/ucrRowSummary.vb +++ b/instat/UserTables/Rows/ucrRowSummary.vb @@ -1,10 +1,32 @@ Public Class ucrRowSummary + + Private bFirstLoad As Boolean = True + Private dctSummaryTypes, dctSides As New Dictionary(Of String, String) + Private Sub ucrRowSummary_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + End Sub + + Private Sub InitialiseDialog() + dctSummaryTypes.Add("Minimum", "min") + dctSummaryTypes.Add("Maximum", "max") + dctSummaryTypes.Add("Mean", "mean") + dctSummaryTypes.Add("Median", "median") + dctSummaryTypes.Add("Standard Deviation", "sd") + dctSummaryTypes.Add("Sum", "sum") + ucrCboSummaryType.SetItems(dctSummaryTypes, bSetConditions:=False) + ucrCboSummaryType.SetDropDownStyleAsNonEditable() End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If End Sub Public Sub SetValuesToOperator() @@ -12,7 +34,57 @@ End Sub Private Sub btnAddSummaries_Click(sender As Object, e As EventArgs) Handles btnAddSummaries.Click + Dim strSpannerLabel As String = ucrTxtGroupId.GetValue() + Dim strSpannerId As String = strSpannerLabel.Replace(" ", String.Empty) + Dim strSpannerColsRFunction As String = mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False) + Dim strSpannerStyleExpression As String = "" + + Dim clsTabSpannerRFunction As New RFunction + clsTabSpannerRFunction.SetPackageName("gt") + clsTabSpannerRFunction.SetRCommand("summary_rows") + + If Not ucrTxtGroupId.IsEmpty Then + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=clsTablesUtils.GetStringValue(ucrTxtGroupId.GetText, True), iNewPosition:=0)) + End If + + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False), iNewPosition:=1)) + + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="fns", strParamValue:=clsTablesUtils.GetStringValue(strSpannerLabel, True), iNewPosition:=0)) + + clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) + + Dim arrParams(2) As RParameter + + ' Add add the spanner parameter as the first element + arrParams(0) = New RParameter(strParameterName:="tab_column_spanner_param" & (dataGridSummaries.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) + + ' Add the spanner style as the second element + If btnStyle.Tag IsNot Nothing Then + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_column_spanners") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="spanners", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=0)) + + Dim clsListStyleRFunction As RFunction = btnStyle.Tag + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) + + strSpannerStyleExpression = clsTabStyleRFunction.Clone.ToScript + + arrParams(1) = New RParameter(strParameterName:="tab_style_cells_column_spanner_param" & (dataGridSummaries.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + End If + Dim row As New DataGridViewRow + row.CreateCells(dataGridSummaries) + row.Cells(0).Value = strSpannerLabel + row.Cells(1).Value = strSpannerColsRFunction + row.Cells(2).Value = strSpannerStyleExpression + ' Tag the array of parameters + row.Tag = arrParams + dataGridSummaries.Rows.Add(row) + + ucrReceiverMultipleCols.Clear() + 'ucrInputColSpanner.SetName("") + ' ucrInputColSpanner.Tag = Nothing End Sub Private Sub btnFormat_Click(sender As Object, e As EventArgs) Handles btnFormat.Click From 7cb36f63ba4e58f9bd3aeb8acde35e09adedf118 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 6 Aug 2024 12:37:13 +0300 Subject: [PATCH 095/273] changes to the code --- instat/dlgPICSACrops.Designer.vb | 264 +++++++++++++++---------------- instat/dlgPICSACrops.vb | 48 ++++-- 2 files changed, 157 insertions(+), 155 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index 34a7dc95109..341be114e8b 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -46,19 +46,19 @@ Partial Class dlgPICSACrops Me.Label6 = New System.Windows.Forms.Label() Me.cmdOptions = New System.Windows.Forms.Button() Me.grpSeasonReceivers = New System.Windows.Forms.GroupBox() + Me.ucrReceiverStart = New instat.ucrReceiverSingle() + Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.grpCropDefinitions = New System.Windows.Forms.GroupBox() + Me.ucrInputCropLengths = New instat.ucrInputComboBox() + Me.ucrInputWaterAmounts = New instat.ucrInputComboBox() + Me.ucrInputPlantingDates = New instat.ucrInputComboBox() Me.rdoBoth = New System.Windows.Forms.RadioButton() Me.rdoNo = New System.Windows.Forms.RadioButton() Me.rdoYes = New System.Windows.Forms.RadioButton() Me.lblPlantingDays = New System.Windows.Forms.Label() Me.lblCropLengthDays = New System.Windows.Forms.Label() Me.lblWaterAmounts = New System.Windows.Forms.Label() - Me.ucrInputCropLengths = New instat.ucrInputComboBox() - Me.ucrInputWaterAmounts = New instat.ucrInputComboBox() - Me.ucrInputPlantingDates = New instat.ucrInputComboBox() Me.ucrPnlStartCheck = New instat.UcrPanel() - Me.ucrReceiverStart = New instat.ucrReceiverSingle() - Me.ucrReceiverEnd = New instat.ucrReceiverSingle() Me.ucrChkDataProp = New instat.ucrCheck() Me.ucrChkPrintDataProp = New instat.ucrCheck() Me.ucrReceiverRainfall = New instat.ucrReceiverSingle() @@ -74,10 +74,9 @@ Partial Class dlgPICSACrops 'lblSelectedSet ' Me.lblSelectedSet.AutoSize = True - Me.lblSelectedSet.Location = New System.Drawing.Point(348, 32) - Me.lblSelectedSet.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSelectedSet.Location = New System.Drawing.Point(232, 21) Me.lblSelectedSet.Name = "lblSelectedSet" - Me.lblSelectedSet.Size = New System.Drawing.Size(64, 20) + Me.lblSelectedSet.Size = New System.Drawing.Size(43, 13) Me.lblSelectedSet.TabIndex = 15 Me.lblSelectedSet.Tag = "" Me.lblSelectedSet.Text = "Station:" @@ -85,10 +84,9 @@ Partial Class dlgPICSACrops 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(548, 32) - Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label2.Location = New System.Drawing.Point(365, 21) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(47, 20) + Me.Label2.Size = New System.Drawing.Size(32, 13) Me.Label2.TabIndex = 21 Me.Label2.Tag = "" Me.Label2.Text = "Year:" @@ -96,10 +94,9 @@ Partial Class dlgPICSACrops 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(548, 99) - Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label3.Location = New System.Drawing.Point(365, 66) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(95, 20) + Me.Label3.Size = New System.Drawing.Size(65, 13) Me.Label3.TabIndex = 22 Me.Label3.Tag = "" Me.Label3.Text = "Day in Year:" @@ -107,10 +104,9 @@ Partial Class dlgPICSACrops 'lblRain ' Me.lblRain.AutoSize = True - Me.lblRain.Location = New System.Drawing.Point(348, 99) - Me.lblRain.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblRain.Location = New System.Drawing.Point(232, 66) Me.lblRain.Name = "lblRain" - Me.lblRain.Size = New System.Drawing.Size(46, 20) + Me.lblRain.Size = New System.Drawing.Size(32, 13) Me.lblRain.TabIndex = 23 Me.lblRain.Tag = "" Me.lblRain.Text = "Rain:" @@ -118,10 +114,9 @@ Partial Class dlgPICSACrops 'Label5 ' Me.Label5.AutoSize = True - Me.Label5.Location = New System.Drawing.Point(9, 26) - Me.Label5.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label5.Location = New System.Drawing.Point(6, 17) Me.Label5.Name = "Label5" - Me.Label5.Size = New System.Drawing.Size(48, 20) + Me.Label5.Size = New System.Drawing.Size(32, 13) Me.Label5.TabIndex = 24 Me.Label5.Tag = "" Me.Label5.Text = "Start:" @@ -129,10 +124,9 @@ Partial Class dlgPICSACrops 'Label6 ' Me.Label6.AutoSize = True - Me.Label6.Location = New System.Drawing.Point(208, 28) - Me.Label6.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label6.Location = New System.Drawing.Point(139, 19) Me.Label6.Name = "Label6" - Me.Label6.Size = New System.Drawing.Size(46, 20) + Me.Label6.Size = New System.Drawing.Size(32, 13) Me.Label6.TabIndex = 25 Me.Label6.Tag = "" Me.Label6.Text = "End :" @@ -140,10 +134,9 @@ Partial Class dlgPICSACrops 'cmdOptions ' Me.cmdOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOptions.Location = New System.Drawing.Point(552, 537) - Me.cmdOptions.Margin = New System.Windows.Forms.Padding(4) + Me.cmdOptions.Location = New System.Drawing.Point(368, 358) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(180, 38) + Me.cmdOptions.Size = New System.Drawing.Size(120, 25) Me.cmdOptions.TabIndex = 31 Me.cmdOptions.Tag = "Options" Me.cmdOptions.Text = "Options" @@ -155,15 +148,39 @@ Partial Class dlgPICSACrops Me.grpSeasonReceivers.Controls.Add(Me.ucrReceiverStart) Me.grpSeasonReceivers.Controls.Add(Me.Label6) Me.grpSeasonReceivers.Controls.Add(Me.ucrReceiverEnd) - Me.grpSeasonReceivers.Location = New System.Drawing.Point(339, 166) - Me.grpSeasonReceivers.Margin = New System.Windows.Forms.Padding(4) + Me.grpSeasonReceivers.Location = New System.Drawing.Point(226, 111) Me.grpSeasonReceivers.Name = "grpSeasonReceivers" - Me.grpSeasonReceivers.Padding = New System.Windows.Forms.Padding(4) - Me.grpSeasonReceivers.Size = New System.Drawing.Size(408, 99) + Me.grpSeasonReceivers.Size = New System.Drawing.Size(272, 66) Me.grpSeasonReceivers.TabIndex = 38 Me.grpSeasonReceivers.TabStop = False Me.grpSeasonReceivers.Text = "Season Dates" ' + 'ucrReceiverStart + ' + Me.ucrReceiverStart.AutoSize = True + Me.ucrReceiverStart.frmParent = Me + Me.ucrReceiverStart.Location = New System.Drawing.Point(10, 34) + Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStart.Name = "ucrReceiverStart" + Me.ucrReceiverStart.Selector = Nothing + Me.ucrReceiverStart.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStart.strNcFilePath = "" + Me.ucrReceiverStart.TabIndex = 19 + Me.ucrReceiverStart.ucrSelector = Nothing + ' + 'ucrReceiverEnd + ' + Me.ucrReceiverEnd.AutoSize = True + Me.ucrReceiverEnd.frmParent = Me + Me.ucrReceiverEnd.Location = New System.Drawing.Point(142, 34) + Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEnd.Name = "ucrReceiverEnd" + Me.ucrReceiverEnd.Selector = Nothing + Me.ucrReceiverEnd.Size = New System.Drawing.Size(120, 22) + Me.ucrReceiverEnd.strNcFilePath = "" + Me.ucrReceiverEnd.TabIndex = 26 + Me.ucrReceiverEnd.ucrSelector = Nothing + ' 'grpCropDefinitions ' Me.grpCropDefinitions.Controls.Add(Me.ucrInputCropLengths) @@ -176,43 +193,80 @@ Partial Class dlgPICSACrops Me.grpCropDefinitions.Controls.Add(Me.lblCropLengthDays) Me.grpCropDefinitions.Controls.Add(Me.lblWaterAmounts) Me.grpCropDefinitions.Controls.Add(Me.ucrPnlStartCheck) - Me.grpCropDefinitions.Location = New System.Drawing.Point(9, 291) - Me.grpCropDefinitions.Margin = New System.Windows.Forms.Padding(4) + Me.grpCropDefinitions.Location = New System.Drawing.Point(6, 194) Me.grpCropDefinitions.Name = "grpCropDefinitions" - Me.grpCropDefinitions.Padding = New System.Windows.Forms.Padding(4) - Me.grpCropDefinitions.Size = New System.Drawing.Size(486, 237) + Me.grpCropDefinitions.Size = New System.Drawing.Size(269, 158) Me.grpCropDefinitions.TabIndex = 39 Me.grpCropDefinitions.TabStop = False Me.grpCropDefinitions.Text = "Crop Definitions" ' + 'ucrInputCropLengths + ' + Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True + Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputCropLengths.GetSetSelectedIndex = -1 + Me.ucrInputCropLengths.IsReadOnly = False + Me.ucrInputCropLengths.Location = New System.Drawing.Point(120, 129) + Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrInputCropLengths.Name = "ucrInputCropLengths" + Me.ucrInputCropLengths.Size = New System.Drawing.Size(137, 21) + Me.ucrInputCropLengths.TabIndex = 55 + ' + 'ucrInputWaterAmounts + ' + Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True + Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 + Me.ucrInputWaterAmounts.IsReadOnly = False + Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(121, 92) + Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" + Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(137, 21) + Me.ucrInputWaterAmounts.TabIndex = 40 + ' + 'ucrInputPlantingDates + ' + Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True + Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 + Me.ucrInputPlantingDates.IsReadOnly = False + Me.ucrInputPlantingDates.Location = New System.Drawing.Point(121, 58) + Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" + Me.ucrInputPlantingDates.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPlantingDates.TabIndex = 53 + ' 'rdoBoth ' Me.rdoBoth.AutoSize = True - Me.rdoBoth.Location = New System.Drawing.Point(325, 37) + Me.rdoBoth.Location = New System.Drawing.Point(165, 25) + Me.rdoBoth.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoBoth.Name = "rdoBoth" - Me.rdoBoth.Size = New System.Drawing.Size(156, 24) + Me.rdoBoth.Size = New System.Drawing.Size(47, 17) Me.rdoBoth.TabIndex = 44 Me.rdoBoth.TabStop = True - Me.rdoBoth.Text = "Start Check:Both" + Me.rdoBoth.Text = "Both" Me.rdoBoth.UseVisualStyleBackColor = True ' 'rdoNo ' Me.rdoNo.AutoSize = True - Me.rdoNo.Location = New System.Drawing.Point(176, 37) + Me.rdoNo.Location = New System.Drawing.Point(117, 25) + Me.rdoNo.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoNo.Name = "rdoNo" - Me.rdoNo.Size = New System.Drawing.Size(142, 24) + Me.rdoNo.Size = New System.Drawing.Size(39, 17) Me.rdoNo.TabIndex = 45 Me.rdoNo.TabStop = True - Me.rdoNo.Text = "Start Check:No" + Me.rdoNo.Text = "No" Me.rdoNo.UseVisualStyleBackColor = True ' 'rdoYes ' Me.rdoYes.AutoSize = True - Me.rdoYes.Location = New System.Drawing.Point(20, 37) + Me.rdoYes.Location = New System.Drawing.Point(13, 25) + Me.rdoYes.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.rdoYes.Name = "rdoYes" - Me.rdoYes.Size = New System.Drawing.Size(150, 24) + Me.rdoYes.Size = New System.Drawing.Size(102, 17) Me.rdoYes.TabIndex = 43 Me.rdoYes.TabStop = True Me.rdoYes.Text = "Start Check:Yes" @@ -221,133 +275,68 @@ Partial Class dlgPICSACrops 'lblPlantingDays ' Me.lblPlantingDays.AutoSize = True - Me.lblPlantingDays.Location = New System.Drawing.Point(4, 90) - Me.lblPlantingDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblPlantingDays.Location = New System.Drawing.Point(3, 60) Me.lblPlantingDays.Name = "lblPlantingDays" - Me.lblPlantingDays.Size = New System.Drawing.Size(120, 20) + Me.lblPlantingDays.Size = New System.Drawing.Size(81, 13) Me.lblPlantingDays.TabIndex = 42 Me.lblPlantingDays.Text = "Planting Day(s):" ' 'lblCropLengthDays ' Me.lblCropLengthDays.AutoSize = True - Me.lblCropLengthDays.Location = New System.Drawing.Point(7, 200) - Me.lblCropLengthDays.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblCropLengthDays.Location = New System.Drawing.Point(5, 133) Me.lblCropLengthDays.Name = "lblCropLengthDays" - Me.lblCropLengthDays.Size = New System.Drawing.Size(151, 20) + Me.lblCropLengthDays.Size = New System.Drawing.Size(101, 13) Me.lblCropLengthDays.TabIndex = 41 Me.lblCropLengthDays.Text = "Crop Length Day(s):" ' 'lblWaterAmounts ' Me.lblWaterAmounts.AutoSize = True - Me.lblWaterAmounts.Location = New System.Drawing.Point(8, 142) - Me.lblWaterAmounts.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblWaterAmounts.Location = New System.Drawing.Point(5, 95) Me.lblWaterAmounts.Name = "lblWaterAmounts" - Me.lblWaterAmounts.Size = New System.Drawing.Size(134, 20) + Me.lblWaterAmounts.Size = New System.Drawing.Size(89, 13) Me.lblWaterAmounts.TabIndex = 40 Me.lblWaterAmounts.Text = "Water Amount(s):" ' - 'ucrInputCropLengths - ' - Me.ucrInputCropLengths.AddQuotesIfUnrecognised = True - Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCropLengths.GetSetSelectedIndex = -1 - Me.ucrInputCropLengths.IsReadOnly = False - Me.ucrInputCropLengths.Location = New System.Drawing.Point(267, 194) - Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputCropLengths.Name = "ucrInputCropLengths" - Me.ucrInputCropLengths.Size = New System.Drawing.Size(206, 32) - Me.ucrInputCropLengths.TabIndex = 55 - ' - 'ucrInputWaterAmounts - ' - Me.ucrInputWaterAmounts.AddQuotesIfUnrecognised = True - Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 - Me.ucrInputWaterAmounts.IsReadOnly = False - Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(268, 138) - Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" - Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(206, 32) - Me.ucrInputWaterAmounts.TabIndex = 40 - ' - 'ucrInputPlantingDates - ' - Me.ucrInputPlantingDates.AddQuotesIfUnrecognised = True - Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 - Me.ucrInputPlantingDates.IsReadOnly = False - Me.ucrInputPlantingDates.Location = New System.Drawing.Point(268, 87) - Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(14) - Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" - Me.ucrInputPlantingDates.Size = New System.Drawing.Size(206, 32) - Me.ucrInputPlantingDates.TabIndex = 53 - ' 'ucrPnlStartCheck ' Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlStartCheck.Location = New System.Drawing.Point(13, 25) - Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlStartCheck.Location = New System.Drawing.Point(9, 17) + Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlStartCheck.Name = "ucrPnlStartCheck" - Me.ucrPnlStartCheck.Size = New System.Drawing.Size(476, 56) + Me.ucrPnlStartCheck.Size = New System.Drawing.Size(236, 37) Me.ucrPnlStartCheck.TabIndex = 46 ' - 'ucrReceiverStart - ' - Me.ucrReceiverStart.AutoSize = True - Me.ucrReceiverStart.frmParent = Nothing - Me.ucrReceiverStart.Location = New System.Drawing.Point(15, 51) - Me.ucrReceiverStart.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStart.Name = "ucrReceiverStart" - Me.ucrReceiverStart.Selector = Nothing - Me.ucrReceiverStart.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverStart.strNcFilePath = "" - Me.ucrReceiverStart.TabIndex = 19 - Me.ucrReceiverStart.ucrSelector = Nothing - ' - 'ucrReceiverEnd - ' - Me.ucrReceiverEnd.AutoSize = True - Me.ucrReceiverEnd.frmParent = Nothing - Me.ucrReceiverEnd.Location = New System.Drawing.Point(213, 51) - Me.ucrReceiverEnd.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEnd.Name = "ucrReceiverEnd" - Me.ucrReceiverEnd.Selector = Nothing - Me.ucrReceiverEnd.Size = New System.Drawing.Size(180, 33) - Me.ucrReceiverEnd.strNcFilePath = "" - Me.ucrReceiverEnd.TabIndex = 26 - Me.ucrReceiverEnd.ucrSelector = Nothing - ' 'ucrChkDataProp ' Me.ucrChkDataProp.AutoSize = True Me.ucrChkDataProp.Checked = False - Me.ucrChkDataProp.Location = New System.Drawing.Point(15, 537) - Me.ucrChkDataProp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkDataProp.Location = New System.Drawing.Point(10, 358) + Me.ucrChkDataProp.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkDataProp.Name = "ucrChkDataProp" - Me.ucrChkDataProp.Size = New System.Drawing.Size(258, 34) + Me.ucrChkDataProp.Size = New System.Drawing.Size(172, 23) Me.ucrChkDataProp.TabIndex = 37 ' 'ucrChkPrintDataProp ' Me.ucrChkPrintDataProp.AutoSize = True Me.ucrChkPrintDataProp.Checked = False - Me.ucrChkPrintDataProp.Location = New System.Drawing.Point(282, 537) - Me.ucrChkPrintDataProp.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkPrintDataProp.Location = New System.Drawing.Point(188, 358) + Me.ucrChkPrintDataProp.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkPrintDataProp.Name = "ucrChkPrintDataProp" - Me.ucrChkPrintDataProp.Size = New System.Drawing.Size(382, 34) + Me.ucrChkPrintDataProp.Size = New System.Drawing.Size(255, 23) Me.ucrChkPrintDataProp.TabIndex = 36 ' 'ucrReceiverRainfall ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(354, 122) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(236, 81) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing - Me.ucrReceiverRainfall.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverRainfall.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverRainfall.strNcFilePath = "" Me.ucrReceiverRainfall.TabIndex = 17 Me.ucrReceiverRainfall.ucrSelector = Nothing @@ -356,11 +345,11 @@ Partial Class dlgPICSACrops ' Me.ucrReceiverDay.AutoSize = True Me.ucrReceiverDay.frmParent = Me - Me.ucrReceiverDay.Location = New System.Drawing.Point(552, 122) + Me.ucrReceiverDay.Location = New System.Drawing.Point(368, 81) Me.ucrReceiverDay.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDay.Name = "ucrReceiverDay" Me.ucrReceiverDay.Selector = Nothing - Me.ucrReceiverDay.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverDay.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverDay.strNcFilePath = "" Me.ucrReceiverDay.TabIndex = 16 Me.ucrReceiverDay.ucrSelector = Nothing @@ -369,11 +358,11 @@ Partial Class dlgPICSACrops ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(552, 56) + Me.ucrReceiverYear.Location = New System.Drawing.Point(368, 37) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverYear.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverYear.strNcFilePath = "" Me.ucrReceiverYear.TabIndex = 3 Me.ucrReceiverYear.ucrSelector = Nothing @@ -382,11 +371,11 @@ Partial Class dlgPICSACrops ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(354, 56) + Me.ucrReceiverStation.Location = New System.Drawing.Point(236, 37) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverStation.strNcFilePath = "" Me.ucrReceiverStation.TabIndex = 2 Me.ucrReceiverStation.ucrSelector = Nothing @@ -397,28 +386,28 @@ Partial Class dlgPICSACrops Me.ucrSelectorForCrops.bDropUnusedFilterLevels = False Me.ucrSelectorForCrops.bShowHiddenColumns = False Me.ucrSelectorForCrops.bUseCurrentFilter = True - Me.ucrSelectorForCrops.Location = New System.Drawing.Point(9, 8) + Me.ucrSelectorForCrops.Location = New System.Drawing.Point(6, 5) Me.ucrSelectorForCrops.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForCrops.Name = "ucrSelectorForCrops" - Me.ucrSelectorForCrops.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorForCrops.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorForCrops.TabIndex = 1 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(15, 588) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(10, 392) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 0 ' 'dlgPICSACrops ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(756, 674) + Me.ClientSize = New System.Drawing.Size(504, 449) Me.Controls.Add(Me.grpCropDefinitions) Me.Controls.Add(Me.grpSeasonReceivers) Me.Controls.Add(Me.ucrChkDataProp) @@ -435,7 +424,6 @@ Partial Class dlgPICSACrops Me.Controls.Add(Me.ucrSelectorForCrops) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgPICSACrops" diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index 5c1a4d24e8b..5b4f2e2185f 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -19,6 +19,7 @@ Imports instat.Translations Public Class dlgPICSACrops Private clsCropsFunction As New RFunction Private clsDummyFunction As New RFunction + Private clsSequenceFunction, clsSequencewaterFunction, clsSequencePlantingFunction As New RFunction Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private strCurrDataName As String = "" @@ -39,7 +40,6 @@ Public Class dlgPICSACrops Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 480 - ' Sub dialog not yet created. cmdOptions.Visible = False @@ -101,18 +101,21 @@ Public Class dlgPICSACrops ucrPnlStartCheck.AddParameterValuesCondition(rdoBoth, "check", "both") ucrInputPlantingDates.SetParameter(New RParameter("plant_days", 5)) - ucrInputPlantingDates.SetItems({"120", "seq(80, 120, 10)", "Seq(92, 152, 30)", "seq(300,370,5)"}) + ucrInputPlantingDates.SetItems({"0,30,5", "80, 120, 10", "92, 152, 30", "300,370,5"}) ucrInputPlantingDates.AddQuotesIfUnrecognised = False + ucrInputPlantingDates.SetValidationTypeAsNumericList() 'Planting Length ucrInputCropLengths.SetParameter(New RParameter("plant_lengths", 6)) - ucrInputCropLengths.SetItems({"120", "seq(50,220,5)", "seq(60,160,5)", "seq(70,220,5)"}) + ucrInputCropLengths.SetItems({"0,30,5", "50,220,5", "60,160,5", "70,220,5"}) ucrInputCropLengths.AddQuotesIfUnrecognised = False + ucrInputCropLengths.SetValidationTypeAsNumericList() 'Water amount ucrInputWaterAmounts.SetParameter(New RParameter("rain_totals", 7)) - ucrInputWaterAmounts.SetItems({"600", "seq(200,675,25)", "seq(200,750,5)", "seq(0,750,25)"}) + ucrInputWaterAmounts.SetItems({"0,125, 5", "200,675,25", "200,750,5", "0,750,25"}) ucrInputWaterAmounts.AddQuotesIfUnrecognised = False + ucrInputWaterAmounts.SetValidationTypeAsNumericList() 'Planting Date Panel 'ucrPnlPlantingDate.SetParameter(New RParameter("planting_days", clsCropsFunction, 5)) @@ -183,6 +186,9 @@ Public Class dlgPICSACrops Private Sub SetDefaults() clsCropsFunction = New RFunction clsDummyFunction = New RFunction + clsSequenceFunction = New RFunction + clsSequencePlantingFunction = New RFunction + clsSequencewaterFunction = New RFunction 'Currently this must come before reset to ensure autofilling is done correctly 'Once autofilling is being triggered correctly this can go after Reset. ucrSelectorForCrops.Reset() @@ -192,13 +198,16 @@ Public Class dlgPICSACrops 'Crops Function clsCropsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$crops_definitions") + + clsSequenceFunction.SetRCommand("seq") + clsSequencePlantingFunction.SetRCommand("seq") + clsSequencewaterFunction.SetRCommand("seq") + ' Temp disabled until list working correctly - clsCropsFunction.AddParameter("plant_days", "120") - clsCropsFunction.AddParameter("plant_lengths", "120") - clsCropsFunction.AddParameter("rain_totals", "600") - ucrInputPlantingDates.SetName("120") - ucrInputCropLengths.SetName("120") - ucrInputWaterAmounts.SetName("600") + + ucrInputPlantingDates.SetName("0,30,5") + ucrInputCropLengths.SetName("0,30,5") + ucrInputWaterAmounts.SetName("0,125, 5") clsCropsFunction.AddParameter("definition_props", "TRUE", iPosition:=11) clsCropsFunction.AddParameter("print_table", "TRUE", iPosition:=12) ucrBase.clsRsyntax.SetBaseRFunction(clsCropsFunction) @@ -223,9 +232,9 @@ Public Class dlgPICSACrops ucrReceiverEnd.SetRCode(clsCropsFunction, bReset) ' Disabled as list validation not working correctly with reading/writing controls - 'ucrInputPlantingDates.SetRCode(clsCropsFunction, bReset) - 'ucrInputPlantingLengths.SetRCode(clsCropsFunction, bReset) - 'ucrInputWaterAmounts.SetRCode(clsCropsFunction, bReset) + 'ucrInputPlantingDates.SetRCode(clsSequenceFunction, bReset) + 'ucrInputCropLengths.SetRCode(clsSequenceFunction, bReset) + 'ucrInputWaterAmounts.SetRCode(clsSequenceFunction, bReset) ucrPnlStartCheck.SetRCode(clsDummyFunction, bReset) 'ucrChkRequirePlantingDays.SetRCode(clsCropsFunction, bReset) ucrChkDataProp.SetRCode(clsCropsFunction, bReset) @@ -261,9 +270,11 @@ Public Class dlgPICSACrops Private Sub PlantingDaysParam() If ucrInputPlantingDates.IsEmpty Then + clsSequencePlantingFunction.RemoveParameterByName("plant") clsCropsFunction.RemoveParameterByName("plant_days") Else - clsCropsFunction.AddParameter("plant_days", ucrInputPlantingDates.GetText(), iPosition:=5) + clsSequencePlantingFunction.AddParameter("plant", ucrInputPlantingDates.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) End If End Sub @@ -283,21 +294,24 @@ Public Class dlgPICSACrops Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged If ucrInputCropLengths.IsEmpty Then clsCropsFunction.RemoveParameterByName("plant_lengths") + clsSequenceFunction.RemoveParameterByName("lengths") Else - clsCropsFunction.AddParameter("plant_lengths", ucrInputCropLengths.GetText(), iPosition:=6) + clsSequenceFunction.AddParameter("lengths", ucrInputCropLengths.GetText(), iPosition:=6, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("plant_lengths", clsRFunctionParameter:=clsSequenceFunction, iPosition:=6) End If End Sub Private Sub ucrInputPlantingDates_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputPlantingDates.ControlValueChanged PlantingDaysParam() - End Sub Private Sub ucrInputWaterAmounts_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputWaterAmounts.ControlValueChanged If ucrInputWaterAmounts.IsEmpty Then clsCropsFunction.RemoveParameterByName("rain_totals") + clsSequencewaterFunction.RemoveParameterByName("totals") Else - clsCropsFunction.AddParameter("rain_totals", ucrInputWaterAmounts.GetText(), iPosition:=7) + clsSequencewaterFunction.AddParameter("totals", ucrInputWaterAmounts.GetText(), iPosition:=7, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("rain_totals", clsRFunctionParameter:=clsSequencewaterFunction, iPosition:=7) End If End Sub End Class \ No newline at end of file From 15de6fdde87e5af2668eb0f7f949e0ab49a96844 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 6 Aug 2024 10:49:20 +0100 Subject: [PATCH 096/273] Change made --- instat/dlgClimograph.Designer.vb | 176 ++++++++++++++++---- instat/dlgClimograph.vb | 270 +++++++++++++++++-------------- 2 files changed, 300 insertions(+), 146 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index e4f9a752db7..87bf220421f 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -45,7 +45,15 @@ Partial Class dlgClimograph Me.toolStripMenuItemTmaxLineOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTminLineOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemLayersOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.ucrChkBar = New instat.ucrCheck() + Me.rdoClimateBars = New System.Windows.Forms.RadioButton() + Me.lblRainBar = New System.Windows.Forms.Label() + Me.lblElement1Bar = New System.Windows.Forms.Label() + Me.lblElement2Bar = New System.Windows.Forms.Label() + Me.lblMonthBar = New System.Windows.Forms.Label() + Me.ucrReceiverRainBar = New instat.ucrReceiverSingle() + Me.ucrReceiverElement1Bar = New instat.ucrReceiverSingle() + Me.ucrReceiverElement2Bar = New instat.ucrReceiverSingle() + Me.ucrReceiverMonthBar = New instat.ucrReceiverSingle() Me.cmdOptions = New instat.ucrSplitButton() Me.ucrInputPalette = New instat.ucrInputComboBox() Me.ucrPnlColour = New instat.UcrPanel() @@ -132,7 +140,7 @@ Partial Class dlgClimograph Me.rdoClimograph.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoClimograph.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoClimograph.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoClimograph.Location = New System.Drawing.Point(149, 10) + Me.rdoClimograph.Location = New System.Drawing.Point(107, 10) Me.rdoClimograph.Name = "rdoClimograph" Me.rdoClimograph.Size = New System.Drawing.Size(79, 28) Me.rdoClimograph.TabIndex = 62 @@ -151,7 +159,7 @@ Partial Class dlgClimograph Me.rdoWalterLieth.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoWalterLieth.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoWalterLieth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoWalterLieth.Location = New System.Drawing.Point(227, 10) + Me.rdoWalterLieth.Location = New System.Drawing.Point(185, 10) Me.rdoWalterLieth.Name = "rdoWalterLieth" Me.rdoWalterLieth.Size = New System.Drawing.Size(80, 28) Me.rdoWalterLieth.TabIndex = 61 @@ -221,7 +229,7 @@ Partial Class dlgClimograph ' Me.rdoViridis.AutoSize = True Me.rdoViridis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoViridis.Location = New System.Drawing.Point(14, 410) + Me.rdoViridis.Location = New System.Drawing.Point(14, 382) Me.rdoViridis.Name = "rdoViridis" Me.rdoViridis.Size = New System.Drawing.Size(52, 17) Me.rdoViridis.TabIndex = 123 @@ -233,7 +241,7 @@ Partial Class dlgClimograph ' Me.rdoPalette.AutoSize = True Me.rdoPalette.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoPalette.Location = New System.Drawing.Point(14, 436) + Me.rdoPalette.Location = New System.Drawing.Point(14, 408) Me.rdoPalette.Name = "rdoPalette" Me.rdoPalette.Size = New System.Drawing.Size(58, 17) Me.rdoPalette.TabIndex = 121 @@ -245,7 +253,7 @@ Partial Class dlgClimograph ' Me.rdoSinglecolour.AutoSize = True Me.rdoSinglecolour.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSinglecolour.Location = New System.Drawing.Point(14, 461) + Me.rdoSinglecolour.Location = New System.Drawing.Point(14, 433) Me.rdoSinglecolour.Name = "rdoSinglecolour" Me.rdoSinglecolour.Size = New System.Drawing.Size(87, 17) Me.rdoSinglecolour.TabIndex = 124 @@ -289,14 +297,112 @@ Partial Class dlgClimograph Me.toolStripMenuItemLayersOptionsOptions.Size = New System.Drawing.Size(180, 22) Me.toolStripMenuItemLayersOptionsOptions.Text = "Layers Options" ' - 'ucrChkBar - ' - Me.ucrChkBar.AutoSize = True - Me.ucrChkBar.Checked = False - Me.ucrChkBar.Location = New System.Drawing.Point(14, 353) - Me.ucrChkBar.Name = "ucrChkBar" - Me.ucrChkBar.Size = New System.Drawing.Size(214, 24) - Me.ucrChkBar.TabIndex = 127 + 'rdoClimateBars + ' + Me.rdoClimateBars.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoClimateBars.BackColor = System.Drawing.SystemColors.Control + Me.rdoClimateBars.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoClimateBars.FlatAppearance.BorderSize = 2 + Me.rdoClimateBars.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoClimateBars.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoClimateBars.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoClimateBars.Location = New System.Drawing.Point(263, 10) + Me.rdoClimateBars.Name = "rdoClimateBars" + Me.rdoClimateBars.Size = New System.Drawing.Size(91, 28) + Me.rdoClimateBars.TabIndex = 128 + Me.rdoClimateBars.TabStop = True + Me.rdoClimateBars.Tag = "" + Me.rdoClimateBars.Text = "Climate Charts" + Me.rdoClimateBars.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoClimateBars.UseVisualStyleBackColor = False + ' + 'lblRainBar + ' + Me.lblRainBar.AutoSize = True + Me.lblRainBar.Location = New System.Drawing.Point(267, 134) + Me.lblRainBar.Name = "lblRainBar" + Me.lblRainBar.Size = New System.Drawing.Size(48, 13) + Me.lblRainBar.TabIndex = 134 + Me.lblRainBar.Text = "RainFall:" + ' + 'lblElement1Bar + ' + Me.lblElement1Bar.AutoSize = True + Me.lblElement1Bar.Location = New System.Drawing.Point(267, 177) + Me.lblElement1Bar.Name = "lblElement1Bar" + Me.lblElement1Bar.Size = New System.Drawing.Size(90, 13) + Me.lblElement1Bar.TabIndex = 136 + Me.lblElement1Bar.Text = "Element1 (TMax):" + ' + 'lblElement2Bar + ' + Me.lblElement2Bar.AutoSize = True + Me.lblElement2Bar.Location = New System.Drawing.Point(267, 218) + Me.lblElement2Bar.Name = "lblElement2Bar" + Me.lblElement2Bar.Size = New System.Drawing.Size(87, 13) + Me.lblElement2Bar.TabIndex = 138 + Me.lblElement2Bar.Text = "Element2 (TMin):" + ' + 'lblMonthBar + ' + Me.lblMonthBar.AutoSize = True + Me.lblMonthBar.Location = New System.Drawing.Point(267, 93) + Me.lblMonthBar.Name = "lblMonthBar" + Me.lblMonthBar.Size = New System.Drawing.Size(40, 13) + Me.lblMonthBar.TabIndex = 132 + Me.lblMonthBar.Text = "Month:" + ' + 'ucrReceiverRainBar + ' + Me.ucrReceiverRainBar.AutoSize = True + Me.ucrReceiverRainBar.frmParent = Me + Me.ucrReceiverRainBar.Location = New System.Drawing.Point(267, 150) + Me.ucrReceiverRainBar.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRainBar.Name = "ucrReceiverRainBar" + Me.ucrReceiverRainBar.Selector = Nothing + Me.ucrReceiverRainBar.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRainBar.strNcFilePath = "" + Me.ucrReceiverRainBar.TabIndex = 135 + Me.ucrReceiverRainBar.ucrSelector = Nothing + ' + 'ucrReceiverElement1Bar + ' + Me.ucrReceiverElement1Bar.AutoSize = True + Me.ucrReceiverElement1Bar.frmParent = Me + Me.ucrReceiverElement1Bar.Location = New System.Drawing.Point(267, 193) + Me.ucrReceiverElement1Bar.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElement1Bar.Name = "ucrReceiverElement1Bar" + Me.ucrReceiverElement1Bar.Selector = Nothing + Me.ucrReceiverElement1Bar.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverElement1Bar.strNcFilePath = "" + Me.ucrReceiverElement1Bar.TabIndex = 137 + Me.ucrReceiverElement1Bar.ucrSelector = Nothing + ' + 'ucrReceiverElement2Bar + ' + Me.ucrReceiverElement2Bar.AutoSize = True + Me.ucrReceiverElement2Bar.frmParent = Me + Me.ucrReceiverElement2Bar.Location = New System.Drawing.Point(267, 234) + Me.ucrReceiverElement2Bar.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElement2Bar.Name = "ucrReceiverElement2Bar" + Me.ucrReceiverElement2Bar.Selector = Nothing + Me.ucrReceiverElement2Bar.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverElement2Bar.strNcFilePath = "" + Me.ucrReceiverElement2Bar.TabIndex = 139 + Me.ucrReceiverElement2Bar.ucrSelector = Nothing + ' + 'ucrReceiverMonthBar + ' + Me.ucrReceiverMonthBar.AutoSize = True + Me.ucrReceiverMonthBar.frmParent = Me + Me.ucrReceiverMonthBar.Location = New System.Drawing.Point(267, 109) + Me.ucrReceiverMonthBar.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverMonthBar.Name = "ucrReceiverMonthBar" + Me.ucrReceiverMonthBar.Selector = Nothing + Me.ucrReceiverMonthBar.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverMonthBar.strNcFilePath = "" + Me.ucrReceiverMonthBar.TabIndex = 133 + Me.ucrReceiverMonthBar.ucrSelector = Nothing ' 'cmdOptions ' @@ -317,7 +423,7 @@ Partial Class dlgClimograph Me.ucrInputPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPalette.GetSetSelectedIndex = -1 Me.ucrInputPalette.IsReadOnly = False - Me.ucrInputPalette.Location = New System.Drawing.Point(136, 435) + Me.ucrInputPalette.Location = New System.Drawing.Point(136, 407) Me.ucrInputPalette.Name = "ucrInputPalette" Me.ucrInputPalette.Size = New System.Drawing.Size(63, 21) Me.ucrInputPalette.TabIndex = 122 @@ -325,7 +431,7 @@ Partial Class dlgClimograph 'ucrPnlColour ' Me.ucrPnlColour.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlColour.Location = New System.Drawing.Point(11, 407) + Me.ucrPnlColour.Location = New System.Drawing.Point(11, 379) Me.ucrPnlColour.Name = "ucrPnlColour" Me.ucrPnlColour.Size = New System.Drawing.Size(92, 77) Me.ucrPnlColour.TabIndex = 120 @@ -336,7 +442,7 @@ Partial Class dlgClimograph Me.ucrInputColourPalette.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputColourPalette.GetSetSelectedIndex = -1 Me.ucrInputColourPalette.IsReadOnly = False - Me.ucrInputColourPalette.Location = New System.Drawing.Point(136, 408) + Me.ucrInputColourPalette.Location = New System.Drawing.Point(136, 380) Me.ucrInputColourPalette.Name = "ucrInputColourPalette" Me.ucrInputColourPalette.Size = New System.Drawing.Size(63, 21) Me.ucrInputColourPalette.TabIndex = 119 @@ -345,7 +451,7 @@ Partial Class dlgClimograph ' Me.ucrChkColour.AutoSize = True Me.ucrChkColour.Checked = False - Me.ucrChkColour.Location = New System.Drawing.Point(14, 386) + Me.ucrChkColour.Location = New System.Drawing.Point(14, 358) Me.ucrChkColour.Name = "ucrChkColour" Me.ucrChkColour.Size = New System.Drawing.Size(198, 24) Me.ucrChkColour.TabIndex = 107 @@ -383,7 +489,7 @@ Partial Class dlgClimograph Me.ucrInputLegendPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLegendPosition.GetSetSelectedIndex = -1 Me.ucrInputLegendPosition.IsReadOnly = False - Me.ucrInputLegendPosition.Location = New System.Drawing.Point(115, 489) + Me.ucrInputLegendPosition.Location = New System.Drawing.Point(115, 461) Me.ucrInputLegendPosition.Name = "ucrInputLegendPosition" Me.ucrInputLegendPosition.Size = New System.Drawing.Size(112, 21) Me.ucrInputLegendPosition.TabIndex = 97 @@ -392,7 +498,7 @@ Partial Class dlgClimograph ' Me.ucrChkLegend.AutoSize = True Me.ucrChkLegend.Checked = False - Me.ucrChkLegend.Location = New System.Drawing.Point(14, 490) + Me.ucrChkLegend.Location = New System.Drawing.Point(14, 462) Me.ucrChkLegend.Name = "ucrChkLegend" Me.ucrChkLegend.Size = New System.Drawing.Size(98, 24) Me.ucrChkLegend.TabIndex = 96 @@ -552,16 +658,16 @@ Partial Class dlgClimograph 'ucrPnlClimograph ' Me.ucrPnlClimograph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlClimograph.Location = New System.Drawing.Point(107, 5) + Me.ucrPnlClimograph.Location = New System.Drawing.Point(92, 5) Me.ucrPnlClimograph.Name = "ucrPnlClimograph" - Me.ucrPnlClimograph.Size = New System.Drawing.Size(236, 41) + Me.ucrPnlClimograph.Size = New System.Drawing.Size(295, 41) Me.ucrPnlClimograph.TabIndex = 60 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(12, 548) + Me.ucrBase.Location = New System.Drawing.Point(12, 520) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 75 @@ -569,7 +675,7 @@ Partial Class dlgClimograph 'ucrSave ' Me.ucrSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSave.Location = New System.Drawing.Point(14, 521) + Me.ucrSave.Location = New System.Drawing.Point(14, 493) Me.ucrSave.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSave.Name = "ucrSave" Me.ucrSave.Size = New System.Drawing.Size(282, 24) @@ -604,8 +710,16 @@ Partial Class dlgClimograph ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(472, 608) - Me.Controls.Add(Me.ucrChkBar) + Me.ClientSize = New System.Drawing.Size(472, 578) + Me.Controls.Add(Me.ucrReceiverRainBar) + Me.Controls.Add(Me.lblRainBar) + Me.Controls.Add(Me.ucrReceiverElement1Bar) + Me.Controls.Add(Me.lblElement1Bar) + Me.Controls.Add(Me.ucrReceiverElement2Bar) + Me.Controls.Add(Me.lblElement2Bar) + Me.Controls.Add(Me.ucrReceiverMonthBar) + Me.Controls.Add(Me.lblMonthBar) + Me.Controls.Add(Me.rdoClimateBars) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.rdoSinglecolour) Me.Controls.Add(Me.rdoViridis) @@ -710,5 +824,13 @@ Partial Class dlgClimograph Friend WithEvents toolStripMenuItemTminLineOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemLayersOptionsOptions As ToolStripMenuItem Friend WithEvents cmdOptions As ucrSplitButton - Friend WithEvents ucrChkBar As ucrCheck + Friend WithEvents rdoClimateBars As RadioButton + Friend WithEvents ucrReceiverRainBar As ucrReceiverSingle + Friend WithEvents lblRainBar As Label + Friend WithEvents ucrReceiverElement1Bar As ucrReceiverSingle + Friend WithEvents lblElement1Bar As Label + Friend WithEvents ucrReceiverElement2Bar As ucrReceiverSingle + Friend WithEvents lblElement2Bar As Label + Friend WithEvents ucrReceiverMonthBar As ucrReceiverSingle + Friend WithEvents lblMonthBar As Label End Class diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index a37de5004d7..ddd45a529ba 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -145,8 +145,10 @@ Public Class dlgClimograph ucrPnlClimograph.AddRadioButton(rdoClimograph) ucrPnlClimograph.AddRadioButton(rdoWalterLieth) + ucrPnlClimograph.AddRadioButton(rdoClimateBars) ucrPnlClimograph.AddParameterValuesCondition(rdoWalterLieth, "checked", "WalterLieth") ucrPnlClimograph.AddParameterValuesCondition(rdoClimograph, "checked", "Climograph") + ucrPnlClimograph.AddParameterValuesCondition(rdoClimateBars, "checked", "climate Charts") ucrReceiverMonth.SetParameter(New RParameter("month", 1)) ucrReceiverMonth.SetParameterIsString() @@ -165,6 +167,15 @@ Public Class dlgClimograph ucrReceiverMonthC.strSelectorHeading = "Month Variables" ucrReceiverMonthC.SetLinkedDisplayControl(lblMonthC) + ucrReceiverMonthBar.SetParameter(New RParameter("x", 2)) + ucrReceiverMonthBar.SetParameterIsRFunction() + ucrReceiverMonthBar.Selector = ucrSelectorClimograph + ucrReceiverMonthBar.bWithQuotes = False + ucrReceiverMonthBar.SetClimaticType("month") + ucrReceiverMonthBar.bAutoFill = True + ucrReceiverMonthBar.strSelectorHeading = "Month Variables" + ucrReceiverMonthBar.SetLinkedDisplayControl(lblMonthBar) + ucrReceiverRain.SetParameter(New RParameter("p_mes", 3)) ucrReceiverRain.SetParameterIsString() ucrReceiverRain.Selector = ucrSelectorClimograph @@ -182,6 +193,15 @@ Public Class dlgClimograph ucrReceiverRainC.strSelectorHeading = "Rain Variables" ucrReceiverRainC.SetLinkedDisplayControl(lblRainC) + ucrReceiverRainBar.SetParameter(New RParameter("y", 1)) + ucrReceiverRainBar.SetParameterIsRFunction() + ucrReceiverRainBar.Selector = ucrSelectorClimograph + ucrReceiverRainBar.bWithQuotes = False + ucrReceiverRainBar.SetClimaticType("rain") + ucrReceiverRainBar.bAutoFill = True + ucrReceiverRainBar.strSelectorHeading = "Rain Variables" + ucrReceiverRainBar.SetLinkedDisplayControl(lblRainBar) + ucrReceiverMaxtem.SetParameter(New RParameter("tm_max", 4)) ucrReceiverMaxtem.SetParameterIsString() ucrReceiverMaxtem.Selector = ucrSelectorClimograph @@ -207,6 +227,15 @@ Public Class dlgClimograph ucrReceiverElement1.strSelectorHeading = "Variables" ucrReceiverElement1.SetLinkedDisplayControl(lblElement1) + ucrReceiverElement1Bar.SetParameter(New RParameter("y", 4, False)) + ucrReceiverElement1Bar.SetParameterIsRFunction() + ucrReceiverElement1Bar.Selector = ucrSelectorClimograph + ucrReceiverElement1Bar.bWithQuotes = False + ucrReceiverElement1Bar.SetClimaticType("temp_max") + ucrReceiverElement1Bar.bAutoFill = True + ucrReceiverElement1Bar.strSelectorHeading = "Variables" + ucrReceiverElement1Bar.SetLinkedDisplayControl(lblElement1Bar) + ucrReceiverElement2.SetParameter(New RParameter("tmin", 5, False)) ucrReceiverElement2.SetParameterIsRFunction() ucrReceiverElement2.Selector = ucrSelectorClimograph @@ -216,6 +245,15 @@ Public Class dlgClimograph ucrReceiverElement2.strSelectorHeading = "Variables" ucrReceiverElement2.SetLinkedDisplayControl(lblElement2) + ucrReceiverElement2Bar.SetParameter(New RParameter("tmin", 5, False)) + ucrReceiverElement2Bar.SetParameterIsRFunction() + ucrReceiverElement2Bar.Selector = ucrSelectorClimograph + ucrReceiverElement2Bar.bWithQuotes = False + ucrReceiverElement2Bar.SetClimaticType("temp_min") + ucrReceiverElement2Bar.bAutoFill = True + ucrReceiverElement2Bar.strSelectorHeading = "Variables" + ucrReceiverElement2Bar.SetLinkedDisplayControl(lblElement2Bar) + ucr1stFactorReceiver.SetParameter(New RParameter("var1")) ucr1stFactorReceiver.Selector = ucrSelectorClimograph ucr1stFactorReceiver.SetIncludedDataTypes({"factor"}) @@ -245,7 +283,9 @@ Public Class dlgClimograph ucrReceiverAbsolute.SetLinkedDisplayControl(lblAbsolute) ucrPnlClimograph.AddToLinkedControls({ucr1stFactorReceiver, ucrReceiverAbsolute, ucrReceiverMintemp, ucrReceiverMonth, ucrReceiverMaxtem, ucrReceiverRain, ucrInputStation}, {rdoWalterLieth}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrChkColour, ucrChkBar, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrInputFacet, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrChkColour, ucrChkTile, ucrChkLegend, ucrReceiverElement2, ucrReceiverElement1, ucrReceiverMonthC, ucrReceiverRainC, ucrChkRibbon, ucrChkText}, {rdoClimograph}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverElement2Bar, ucrReceiverElement1Bar, ucrReceiverMonthBar, ucrReceiverRainBar}, {rdoClimateBars}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlClimograph.AddToLinkedControls({ucrReceiverFacet, ucrInputFacet}, {rdoClimograph, rdoClimateBars}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlColour.AddRadioButton(rdoViridis) ucrPnlColour.AddRadioButton(rdoPalette) @@ -281,10 +321,6 @@ Public Class dlgClimograph ucrChkText.AddParameterValuesCondition(True, "checked", "True") ucrChkText.AddParameterValuesCondition(False, "checked", "False") - ucrChkBar.SetText("Add Bars For Temperature") - ucrChkBar.AddParameterValuesCondition(True, "checked", "True") - ucrChkBar.AddParameterValuesCondition(False, "checked", "False") - ucrInputPalette.SetParameter(New RParameter("palette", 10)) ucrInputPalette.SetDropDownStyleAsNonEditable() dctPalette.Add("Blues", Chr(34) & "Blues" & Chr(34)) @@ -723,7 +759,7 @@ Public Class dlgClimograph clsLabsRainFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) clsLabsRainFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecAxisRainFunction, iPosition:=1) - clsSecAxisRainFunction.SetRCommand("sec.axis") + clsSecAxisRainFunction.SetRCommand("sec_axis") clsSecAxisRainFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) clsSecAxisRainFunction.AddParameter("name", Chr(34) & "Rainfall (inches)" & Chr(34), iPosition:=1) @@ -755,7 +791,7 @@ Public Class dlgClimograph clsAesTminBarFunction1.SetRCommand("aes") clsTmaxBarTextFunction.SetRCommand("geom_text") - clsTmaxBarTextFunction.AddParameter("size", Chr(34) & "red" & Chr(34)) + clsTmaxBarTextFunction.AddParameter("size", "3", iPosition:=2) clsAesTmaxBarTextFunction.SetRCommand("aes") @@ -763,7 +799,7 @@ Public Class dlgClimograph clsTmaxRoundFunction.AddParameter("y", "1", iPosition:=1, bIncludeArgumentName:=False) clsTminBarTextFunction.SetRCommand("geom_text") - clsTminBarTextFunction.AddParameter("size", Chr(34) & "blue" & Chr(34)) + clsTminBarTextFunction.AddParameter("size", "3", iPosition:=2) clsAesTminBarTextFunction.SetRCommand("aes") @@ -774,7 +810,7 @@ Public Class dlgClimograph clsLabsTempFunction.AddParameter("name", Chr(34) & "Temperature (C)" & Chr(34), iPosition:=0) clsLabsTempFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecAxisTemFunction, iPosition:=1) - clsSecAxisTemFunction.SetRCommand("sec.axis") + clsSecAxisTemFunction.SetRCommand("sec_axis") clsSecAxisTemFunction.AddParameter("x", "~.*32", iPosition:=0, bIncludeArgumentName:=False) clsSecAxisTemFunction.AddParameter("name", Chr(34) & "Temperature (F)" & Chr(34), iPosition:=1) @@ -810,10 +846,14 @@ Public Class dlgClimograph ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) End Sub Private Sub SetRCodeForControls(bReset) - ' ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) + 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrReceiverRainC.SetRCode(clsMaxFunction, bReset) ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) @@ -835,7 +875,6 @@ Public Class dlgClimograph ucrChkText.SetRCode(clsBaseOperator, bReset) ucrPnlColour.SetRCode(clsDummyFunction, bReset) ucrChkColour.SetRCode(clsBaseOperator, bReset) - ucrChkBar.SetRCode(clsBaseOperator, bReset) End If End Sub @@ -844,6 +883,8 @@ Public Class dlgClimograph ucrBase.OKEnabled(True) ElseIf rdoWalterLieth.Checked AndAlso ((Not ucrReceiverAbsolute.IsEmpty AndAlso Not ucrReceiverMaxtem.IsEmpty AndAlso Not ucrReceiverMintemp.IsEmpty AndAlso Not ucrReceiverMonth.IsEmpty AndAlso Not ucrReceiverRain.IsEmpty) OrElse Not ucrSave.IsComplete) Then ucrBase.OKEnabled(True) + ElseIf rdoClimateBars.Checked AndAlso Not ucrReceiverMonthBar.IsEmpty AndAlso ((Not ucrReceiverElement1Bar.IsEmpty AndAlso Not ucrReceiverElement2Bar.IsEmpty OrElse Not ucrReceiverRainBar.IsEmpty) OrElse Not ucrSave.IsComplete) Then + ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If @@ -855,12 +896,19 @@ Public Class dlgClimograph ucrReceiverMonthC.SetMeAsReceiver() clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - Else - clsBaseOperator.RemoveParameterByName("ggplot") + ElseIf rdoWalterLieth.Checked Then + clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName("geom_bar") ucrReceiverMonth.SetMeAsReceiver() clsGgwalterliethFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) + Else + clsBaseOperator.RemoveParameterByName("ggwalter_lieth") + clsBaseOperator.RemoveParameterByName("ggplot") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) + 'ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) + 'ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) End If AutoFacetStation() AddRemoveFacetClimograph() @@ -874,9 +922,7 @@ Public Class dlgClimograph AddRemoveGeomTextTmax() AddRemoveGeomTextTmin() EnableTileAndRibbon() - EnableTemBar() AddRemoveTemBars() - ChangeBaseOperator() End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -1241,6 +1287,10 @@ Public Class dlgClimograph AddRemoveTemBars() End Sub + Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStation.ControlValueChanged + + End Sub + Private Sub GetParameterValue(clsOperator As ROperator) Dim i As Integer = 0 For Each clsTempParam As RParameter In clsOperator.clsParameters @@ -1276,6 +1326,10 @@ Public Class dlgClimograph SetPipeAssignTo() End Sub + Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputFacet.ControlValueChanged + + End Sub + Private Sub SetPipeAssignTo() If ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text <> "" AndAlso clsPipeOperator.clsParameters.Count > 1 Then clsPipeOperator.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) @@ -1290,7 +1344,6 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmax() EnableTileAndRibbon() - EnableTemBar() AddRemoveTemBars() End Sub @@ -1543,7 +1596,6 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmin() EnableTileAndRibbon() - EnableTemBar() AddRemoveTemBars() End Sub @@ -1609,82 +1661,73 @@ Public Class dlgClimograph AddRemoveGeomTextTmin() End Sub - Private Sub EnableTemBar() - ucrChkBar.Enabled = Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty - End Sub - Private Sub AddRemoveTemBars() - If rdoClimograph.Checked Then - If ucrChkBar.Checked Then - clsBaseOperator.RemoveParameterByName("geom_text") - clsBaseOperator.RemoveParameterByName("geom_text1") - clsBaseOperator.RemoveParameterByName("geom_tile") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("labs") - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - clsBaseOperator.RemoveParameterByName("geom_line1") - clsBaseOperator.RemoveParameterByName("geom_line") - clsBaseOperator.RemoveParameterByName("geom_text2") - clsBaseOperator.RemoveParameterByName("geom_ribbon") - clsBaseOperator.RemoveParameterByName("scale_x_discrete") - clsBaseOperator.RemoveParameterByName("scale_y_continuous") - If ucrReceiverRainC.IsEmpty Then - clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsGeomBarTmaxFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction, iPosition:=0) - clsGeomBarTminFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=1) - clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsGeomBarTminFunction, iPosition:=2) - Else - clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) - clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) - clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) - clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) - clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) - clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) - clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) - - clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) 'clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) - clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) - - clsAesTmaxBarFunction1.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction1, iPosition:=0, bIncludeArgumentName:=False) - - clsAesTminBarFunction1.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction1, iPosition:=0, bIncludeArgumentName:=False) - - clsTmaxRoundFunction.AddParameter("x", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesTmaxBarTextFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsAesTmaxBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTmaxRoundFunction, iPosition:=1) - clsTmaxBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - - clsTminRoundFunction.AddParameter("x", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesTminBarTextFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsAesTminBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTminRoundFunction, iPosition:=1) - clsTminBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus9Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus9Operator.AddParameter("right", clsRFunctionParameter:=clsLabsTempFunction, iPosition:=1, bIncludeArgumentName:=False) - clsPlus8Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus8Operator.AddParameter("right", clsROperatorParameter:=clsPlus9Operator, iPosition:=1, bIncludeArgumentName:=False) - clsPlus7Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus7Operator.AddParameter("right", clsROperatorParameter:=clsPlus8Operator, iPosition:=1, bIncludeArgumentName:=False) - clsPlus6Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) - clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) - End If + If rdoClimateBars.Checked Then + clsBaseOperator.RemoveParameterByName("geom_text") + clsBaseOperator.RemoveParameterByName("geom_text1") + clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBaseOperator.RemoveParameterByName("geom_line1") + clsBaseOperator.RemoveParameterByName("geom_line") + clsBaseOperator.RemoveParameterByName("geom_text2") + clsBaseOperator.RemoveParameterByName("geom_ribbon") + clsBaseOperator.RemoveParameterByName("scale_x_discrete") + clsBaseOperator.RemoveParameterByName("scale_y_continuous") + If ucrReceiverRainC.IsEmpty Then + clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsGeomBarTmaxFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction, iPosition:=0) + clsGeomBarTminFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction, iPosition:=0) + clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsGeomBarTminFunction, iPosition:=2) Else - clsBaseOperator.RemoveParameterByName("geom_bar1") - clsBaseOperator.RemoveParameterByName("geom_bar2") - clsBaseOperator.RemoveParameterByName("plot_grid") + clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) + clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) + clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsAesTmaxBarFunction1.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction1, iPosition:=0, bIncludeArgumentName:=False) + + clsAesTminBarFunction1.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction1, iPosition:=0, bIncludeArgumentName:=False) + + clsTmaxRoundFunction.AddParameter("x", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTmaxBarTextFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsAesTmaxBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTmaxRoundFunction, iPosition:=1) + clsTmaxBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsTminRoundFunction.AddParameter("x", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTminBarTextFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesTminBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTminRoundFunction, iPosition:=1) + clsTminBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("right", clsRFunctionParameter:=clsLabsTempFunction, iPosition:=1, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("right", clsROperatorParameter:=clsPlus9Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("right", clsROperatorParameter:=clsPlus8Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) End If Else clsBaseOperator.RemoveParameterByName("geom_bar1") @@ -1693,33 +1736,22 @@ Public Class dlgClimograph End If End Sub - Private Sub ChangeBaseOperator() - If rdoClimograph.Checked Then - clsBaseOperator.RemoveParameterByName("ggplot") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("plot_grid") - clsBaseOperator.RemoveParameterByName("ggwalter_lieth") - If ucrChkBar.Checked Then - clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) - ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) - ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) - Else - clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - End If - Else - clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) - clsBaseOperator.RemoveParameterByName("ggplot") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("plot_grid") - End If - End Sub - - Private Sub ucrChkBar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkBar.ControlValueChanged - AddRemoveTemBars() - EnableTemBar() - ChangeBaseOperator() - End Sub + 'Private Sub ChangeBaseOperator() + ' If rdoClimograph.Checked Then + ' clsBaseOperator.RemoveParameterByName("ggplot") + ' clsBaseOperator.RemoveParameterByName("geom_bar") + ' clsBaseOperator.RemoveParameterByName("plot_grid") + ' clsBaseOperator.RemoveParameterByName("ggwalter_lieth") + ' clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) + ' ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) + ' ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) + ' Else + ' clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) + ' clsBaseOperator.RemoveParameterByName("ggplot") + ' clsBaseOperator.RemoveParameterByName("geom_bar") + ' clsBaseOperator.RemoveParameterByName("plot_grid") + ' End If + 'End Sub Private Sub ucrSave_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlValueChanged If ucrSave.ucrChkSave.Checked Then @@ -1733,7 +1765,7 @@ Public Class dlgClimograph AddRemoveGeomBar() End Sub - Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged + Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged, ucrReceiverElement1Bar.ControlContentsChanged, ucrReceiverElement2Bar.ControlContentsChanged, ucrReceiverMonthBar.ControlContentsChanged, ucrReceiverRainBar.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file From fe0e393bbb2b5d14b6eaff11a7f4bc12a5ecba17 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 6 Aug 2024 16:20:41 +0100 Subject: [PATCH 097/273] Change made --- instat/dlgClimograph.vb | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index ddd45a529ba..42827887f54 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -92,7 +92,7 @@ Public Class dlgClimograph Private clsMaxFunction As New RFunction Private clsMax1Function As New RFunction Private clsVectorFunction As New RFunction - Private clsGetObjectDataFunction, clsColourPaletteFunction, clsLocalRaesFunction, clsFillBrewerFunction, clsScalefillDistillerFunction As New RFunction + Private clsGetObjectDataFunction, clsGetDataFrameFunction, clsColourPaletteFunction, clsLocalRaesFunction, clsFillBrewerFunction, clsScalefillDistillerFunction As New RFunction Private clsStarOperator As New ROperator Private clsStar1Operator As New ROperator Private clsDivideOperator As New ROperator @@ -481,6 +481,7 @@ Public Class dlgClimograph clsTmaxRoundFunction = New RFunction clsTminRoundFunction = New RFunction clsPlotGridFunction = New RFunction + clsGetDataFrameFunction = New RFunction ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) @@ -838,6 +839,10 @@ Public Class dlgClimograph clsScaleColourViridisFunction = GgplotDefaults.clsScaleColorViridisFunction clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction + clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") + 'clsGetDataFrameFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.strCurrentDataFrame & Chr(34), iPosition:=0, bIncludeArgumentName:=False) + 'clsGetDataFrameFunction.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + clsGetObjectDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsGetObjectDataFunction.AddParameter("as_file", "TRUE", iPosition:=2) @@ -846,8 +851,7 @@ Public Class dlgClimograph ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction, iPosition:=0) - ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) - ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) + ucrBase.clsRsyntax.AddToBeforeCodes(clsGetDataFrameFunction, iPosition:=0) End Sub Private Sub SetRCodeForControls(bReset) @@ -856,7 +860,7 @@ Public Class dlgClimograph 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrReceiverRainC.SetRCode(clsMaxFunction, bReset) - ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) + 'ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverRain.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverMintemp.SetRCode(clsGgwalterliethFunction, bReset) @@ -892,11 +896,15 @@ Public Class dlgClimograph Private Sub ucrPnlClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlValueChanged If rdoClimograph.Checked Then + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus1Operator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus5Operator) clsBaseOperator.RemoveParameterByName("ggwalter_lieth") ucrReceiverMonthC.SetMeAsReceiver() clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) ElseIf rdoWalterLieth.Checked Then + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus1Operator) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus5Operator) clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName("geom_bar") ucrReceiverMonth.SetMeAsReceiver() @@ -907,8 +915,8 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName("geom_bar") clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) - 'ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) - 'ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) End If AutoFacetStation() AddRemoveFacetClimograph() @@ -1279,6 +1287,9 @@ Public Class dlgClimograph End Sub Private Sub ucrSelectorClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorClimograph.ControlValueChanged + clsGetDataFrameFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.strCurrentDataFrame & Chr(34), iPosition:=0) + clsGetDataFrameFunction.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) + clsRggplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) AutoFacetStation() SetPipeAssignTo() SetPipeAssignTo1() From 6c162f444d3d048ea93ac318e7f95f7301ab5097 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 7 Aug 2024 16:41:07 +0300 Subject: [PATCH 098/273] minor code change --- instat/static/InstatObject/R/data_object_R6.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index fec9f351bf3..64bf2546137 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -712,8 +712,9 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, if(require_correct_length) stop("Length of new column must be divisible by the length of the data frame") else curr_col <- rep(curr_col, length.out = self$get_data_frame_length()) } + if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name) - else curr_col_name = col_name[[i]] + else curr_col_name = col_name curr_col_name <- make.names(iconv(curr_col_name, to = "ASCII//TRANSLIT", sub = ".")) new_col_names <- c(new_col_names, curr_col_name) if(curr_col_name %in% self$get_column_names()) { From 979e91a77f293c46f042941c47c4d233fc871f57 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 7 Aug 2024 17:43:24 +0300 Subject: [PATCH 099/273] more summary changes --- .../Columns/ucrColumnWidth.Designer.vb | 49 +++-- instat/UserTables/Columns/ucrColumnWidth.vb | 30 ++- .../UserTables/Rows/ucrRowGroup.Designer.vb | 54 ++--- instat/UserTables/Rows/ucrRowGroup.vb | 21 +- .../UserTables/Rows/ucrRowSummary.Designer.vb | 68 +++--- instat/UserTables/Rows/ucrRowSummary.resx | 6 - instat/UserTables/Rows/ucrRowSummary.vb | 198 +++++++++++++----- 7 files changed, 257 insertions(+), 169 deletions(-) diff --git a/instat/UserTables/Columns/ucrColumnWidth.Designer.vb b/instat/UserTables/Columns/ucrColumnWidth.Designer.vb index 9b80946b34f..263cfcd421c 100644 --- a/instat/UserTables/Columns/ucrColumnWidth.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnWidth.Designer.vb @@ -39,18 +39,20 @@ Partial Class ucrColumnWidth ' Me.lblColumnWidths.AutoSize = True Me.lblColumnWidths.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumnWidths.Location = New System.Drawing.Point(245, 171) + Me.lblColumnWidths.Location = New System.Drawing.Point(368, 263) + Me.lblColumnWidths.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColumnWidths.Name = "lblColumnWidths" - Me.lblColumnWidths.Size = New System.Drawing.Size(81, 13) + Me.lblColumnWidths.Size = New System.Drawing.Size(120, 20) Me.lblColumnWidths.TabIndex = 313 Me.lblColumnWidths.Text = "Column Widths:" ' 'btnClear ' Me.btnClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnClear.Location = New System.Drawing.Point(534, 162) + Me.btnClear.Location = New System.Drawing.Point(801, 249) + Me.btnClear.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnClear.Name = "btnClear" - Me.btnClear.Size = New System.Drawing.Size(75, 23) + Me.btnClear.Size = New System.Drawing.Size(112, 35) Me.btnClear.TabIndex = 312 Me.btnClear.Tag = "" Me.btnClear.Text = "Clear" @@ -60,9 +62,10 @@ Partial Class ucrColumnWidth ' Me.lblColumns.AutoSize = True Me.lblColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumns.Location = New System.Drawing.Point(242, 5) + Me.lblColumns.Location = New System.Drawing.Point(363, 8) + Me.lblColumns.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColumns.Name = "lblColumns" - Me.lblColumns.Size = New System.Drawing.Size(56, 13) + Me.lblColumns.Size = New System.Drawing.Size(85, 20) Me.lblColumns.TabIndex = 311 Me.lblColumns.Text = "Column(s):" ' @@ -70,9 +73,10 @@ Partial Class ucrColumnWidth ' Me.btnAdd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnAdd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnAdd.Location = New System.Drawing.Point(243, 138) + Me.btnAdd.Location = New System.Drawing.Point(364, 212) + Me.btnAdd.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnAdd.Name = "btnAdd" - Me.btnAdd.Size = New System.Drawing.Size(88, 23) + Me.btnAdd.Size = New System.Drawing.Size(132, 35) Me.btnAdd.TabIndex = 310 Me.btnAdd.Tag = "" Me.btnAdd.Text = "Add" @@ -84,10 +88,10 @@ Partial Class ucrColumnWidth Me.ucrSelectorCols.bDropUnusedFilterLevels = False Me.ucrSelectorCols.bShowHiddenColumns = False Me.ucrSelectorCols.bUseCurrentFilter = True - Me.ucrSelectorCols.Location = New System.Drawing.Point(4, 5) + Me.ucrSelectorCols.Location = New System.Drawing.Point(6, 8) Me.ucrSelectorCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorCols.Name = "ucrSelectorCols" - Me.ucrSelectorCols.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorCols.Size = New System.Drawing.Size(320, 282) Me.ucrSelectorCols.TabIndex = 309 ' 'dataGrid @@ -95,16 +99,18 @@ Partial Class ucrColumnWidth Me.dataGrid.AllowUserToAddRows = False Me.dataGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize Me.dataGrid.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colWidthExpression}) - Me.dataGrid.Location = New System.Drawing.Point(240, 188) + Me.dataGrid.Location = New System.Drawing.Point(360, 289) + Me.dataGrid.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGrid.Name = "dataGrid" Me.dataGrid.RowHeadersWidth = 62 - Me.dataGrid.Size = New System.Drawing.Size(369, 73) + Me.dataGrid.Size = New System.Drawing.Size(554, 112) Me.dataGrid.TabIndex = 308 ' 'colWidthExpression ' Me.colWidthExpression.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill Me.colWidthExpression.HeaderText = "Width Expression" + Me.colWidthExpression.MinimumWidth = 8 Me.colWidthExpression.Name = "colWidthExpression" Me.colWidthExpression.ReadOnly = True ' @@ -112,9 +118,10 @@ Partial Class ucrColumnWidth ' Me.lblColWidth.AutoSize = True Me.lblColWidth.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColWidth.Location = New System.Drawing.Point(245, 94) + Me.lblColWidth.Location = New System.Drawing.Point(368, 145) + Me.lblColWidth.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColWidth.Name = "lblColWidth" - Me.lblColWidth.Size = New System.Drawing.Size(38, 13) + Me.lblColWidth.Size = New System.Drawing.Size(54, 20) Me.lblColWidth.TabIndex = 315 Me.lblColWidth.Text = "Width:" ' @@ -122,11 +129,11 @@ Partial Class ucrColumnWidth ' Me.ucrReceiverMultipleCols.AutoSize = True Me.ucrReceiverMultipleCols.frmParent = Nothing - Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(240, 21) + Me.ucrReceiverMultipleCols.Location = New System.Drawing.Point(360, 32) Me.ucrReceiverMultipleCols.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverMultipleCols.Name = "ucrReceiverMultipleCols" Me.ucrReceiverMultipleCols.Selector = Nothing - Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(120, 64) + Me.ucrReceiverMultipleCols.Size = New System.Drawing.Size(180, 98) Me.ucrReceiverMultipleCols.strNcFilePath = "" Me.ucrReceiverMultipleCols.TabIndex = 314 Me.ucrReceiverMultipleCols.ucrSelector = Nothing @@ -136,17 +143,18 @@ Partial Class ucrColumnWidth Me.ucrNudWidth.AutoSize = True Me.ucrNudWidth.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWidth.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWidth.Location = New System.Drawing.Point(246, 110) + Me.ucrNudWidth.Location = New System.Drawing.Point(369, 169) + Me.ucrNudWidth.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrNudWidth.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWidth.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWidth.Name = "ucrNudWidth" - Me.ucrNudWidth.Size = New System.Drawing.Size(50, 20) + Me.ucrNudWidth.Size = New System.Drawing.Size(75, 31) Me.ucrNudWidth.TabIndex = 318 Me.ucrNudWidth.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'ucrColumnWidth ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.ucrNudWidth) Me.Controls.Add(Me.lblColumnWidths) @@ -157,8 +165,9 @@ Partial Class ucrColumnWidth Me.Controls.Add(Me.dataGrid) Me.Controls.Add(Me.lblColWidth) Me.Controls.Add(Me.ucrReceiverMultipleCols) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "ucrColumnWidth" - Me.Size = New System.Drawing.Size(613, 267) + Me.Size = New System.Drawing.Size(920, 411) CType(Me.dataGrid, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/Columns/ucrColumnWidth.vb b/instat/UserTables/Columns/ucrColumnWidth.vb index e8e244d82f7..9b6ecb92e3f 100644 --- a/instat/UserTables/Columns/ucrColumnWidth.vb +++ b/instat/UserTables/Columns/ucrColumnWidth.vb @@ -3,6 +3,13 @@ Private clsOperator As New ROperator Private bFirstload As Boolean = True + Private Sub ucrColumnWidth_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseControl() + bFirstload = False + End If + End Sub + Private Sub InitialiseControl() ucrReceiverMultipleCols.Selector = ucrSelectorCols ucrReceiverMultipleCols.SetMeAsReceiver() @@ -12,11 +19,6 @@ End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If bFirstload Then - InitialiseControl() - bFirstload = False - End If - Me.clsOperator = clsOperator ' Set up the selector @@ -25,21 +27,10 @@ ' Clear and Set up the data grid with contents dataGrid.Rows.Clear() SetupDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"cols_width"}, clsOperator)) - - End Sub - - Public Sub SetValuesToOperator() - ' Remove any previous col widths - clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"cols_width"}, clsOperator) - - ' Add new changes - clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) End Sub Private Sub SetupDataGrid(lstRParams As List(Of RParameter)) - For Each clsRParam As RParameter In lstRParams - ' Create a new row that represents the tab_style() parameters Dim row As New DataGridViewRow row.CreateCells(dataGrid) @@ -48,7 +39,6 @@ ' Tag and add the tab_style() parameter function contents as a row row.Tag = clsRParam dataGrid.Rows.Add(row) - Next End Sub @@ -83,5 +73,11 @@ dataGrid.Rows.Clear() End Sub + Public Sub SetValuesToOperator() + ' Remove any previous col widths + clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"cols_width"}, clsOperator) + ' Add new changes + clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGrid, clsOperator) + End Sub End Class diff --git a/instat/UserTables/Rows/ucrRowGroup.Designer.vb b/instat/UserTables/Rows/ucrRowGroup.Designer.vb index 4b7b32db0ba..e9d02bfc06c 100644 --- a/instat/UserTables/Rows/ucrRowGroup.Designer.vb +++ b/instat/UserTables/Rows/ucrRowGroup.Designer.vb @@ -23,6 +23,9 @@ Partial Class ucrRowGroup Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.btnClearGroups = New System.Windows.Forms.Button() Me.btnAddCondition = New System.Windows.Forms.Button() Me.lblGroups = New System.Windows.Forms.Label() @@ -31,9 +34,6 @@ Partial Class ucrRowGroup Me.btnStyle = New System.Windows.Forms.Button() Me.ucrRowExpression = New instat.ucrRowExpression() Me.lblGroupExpression = New System.Windows.Forms.Label() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -50,6 +50,30 @@ Partial Class ucrRowGroup Me.dataGridGroups.Size = New System.Drawing.Size(484, 146) Me.dataGridGroups.TabIndex = 11 ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 70 + ' + 'colCodnition + ' + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.ReadOnly = True + Me.colCodnition.Width = 90 + ' + 'colStyleExpression + ' + Me.colStyleExpression.HeaderText = "Style Expression" + Me.colStyleExpression.MinimumWidth = 8 + Me.colStyleExpression.Name = "colStyleExpression" + Me.colStyleExpression.ReadOnly = True + Me.colStyleExpression.Width = 90 + ' 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -141,30 +165,6 @@ Partial Class ucrRowGroup Me.lblGroupExpression.TabIndex = 334 Me.lblGroupExpression.Text = "Group Condition:" ' - 'colLabel - ' - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.ReadOnly = True - Me.colLabel.Width = 70 - ' - 'colCodnition - ' - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.ReadOnly = True - Me.colCodnition.Width = 90 - ' - 'colStyleExpression - ' - Me.colStyleExpression.HeaderText = "Style Expression" - Me.colStyleExpression.MinimumWidth = 8 - Me.colStyleExpression.Name = "colStyleExpression" - Me.colStyleExpression.ReadOnly = True - Me.colStyleExpression.Width = 90 - ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) diff --git a/instat/UserTables/Rows/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb index b7a2b323346..e3e5782bb70 100644 --- a/instat/UserTables/Rows/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -1,7 +1,19 @@ Public Class ucrRowGroup + Private bFirstLoad As Boolean = True Private clsOperator As New ROperator + Private Sub ucrRowGroup_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstLoad Then + InitialiseDialog() + bFirstLoad = False + End If + End Sub + + Private Sub InitialiseDialog() + btnStyle.Tag = Nothing + End Sub + Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) Me.clsOperator = clsOperator @@ -55,7 +67,7 @@ If clsListStyleRFunction Is Nothing Then Exit Sub End If - ucrRowExpression.Tag = clsListStyleRFunction + btnStyle.Tag = clsListStyleRFunction End Sub Private Sub btnAddCondition_Click(sender As Object, e As EventArgs) Handles btnAddCondition.Click @@ -75,13 +87,13 @@ arrParams(0) = New RParameter(strParameterName:="tab_row_group_param" & (dataGridGroups.Rows.Count + 1), strParamValue:=clsTabRowGroupRFunction, bNewIncludeArgumentName:=False) ' Add the group style as the second element - If ucrRowExpression.Tag IsNot Nothing Then + If btnStyle.Tag IsNot Nothing Then Dim clsLocationsRFunction As New RFunction clsLocationsRFunction.SetPackageName("gt") clsLocationsRFunction.SetRCommand("cells_row_groups") clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=clsTablesUtils.GetStringValue(strGroupId, True), iNewPosition:=0)) - Dim clsListStyleRFunction As RFunction = ucrRowExpression.Tag + Dim clsListStyleRFunction As RFunction = btnStyle.Tag Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) strGroupStyleExpression = clsTabStyleRFunction.Clone.ToScript @@ -101,11 +113,12 @@ ucrInputGroupLabel.SetName("") ucrRowExpression.Clear() - ucrRowExpression.Tag = Nothing + btnStyle.Tag = Nothing End Sub Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrRowExpression.ControlContentsChanged, ucrInputGroupLabel.ControlContentsChanged btnAddCondition.Enabled = Not ucrRowExpression.IsEmpty AndAlso Not ucrInputGroupLabel.IsEmpty + btnStyle.Enabled = btnAddCondition.Enabled End Sub Private Sub btnClearGroups_Click(sender As Object, e As EventArgs) Handles btnClearGroups.Click diff --git a/instat/UserTables/Rows/ucrRowSummary.Designer.vb b/instat/UserTables/Rows/ucrRowSummary.Designer.vb index 0f80a49baf6..183662f3adc 100644 --- a/instat/UserTables/Rows/ucrRowSummary.Designer.vb +++ b/instat/UserTables/Rows/ucrRowSummary.Designer.vb @@ -23,6 +23,8 @@ Partial Class ucrRowSummary _ Private Sub InitializeComponent() Me.dataGridSummaries = New System.Windows.Forms.DataGridView() + Me.colType = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.btnStyle = New System.Windows.Forms.Button() Me.lblSummaryTypes = New System.Windows.Forms.Label() Me.lblSummaries = New System.Windows.Forms.Label() @@ -34,9 +36,6 @@ Partial Class ucrRowSummary Me.lblColumns = New System.Windows.Forms.Label() Me.lblGroupId = New System.Windows.Forms.Label() Me.lblSide = New System.Windows.Forms.Label() - Me.colType = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.ucrCboSide = New instat.ucrInputComboBox() Me.ucrTxtGroupId = New instat.ucrInputTextBox() Me.ucrReceiverMultipleCols = New instat.ucrReceiverMultiple() @@ -51,7 +50,7 @@ Partial Class ucrRowSummary ' Me.dataGridSummaries.AllowUserToAddRows = False Me.dataGridSummaries.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridSummaries.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colType, Me.colLabel, Me.colExpression}) + Me.dataGridSummaries.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colType, Me.colExpression}) Me.dataGridSummaries.Location = New System.Drawing.Point(360, 451) Me.dataGridSummaries.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridSummaries.Name = "dataGridSummaries" @@ -60,11 +59,27 @@ Partial Class ucrRowSummary Me.dataGridSummaries.Size = New System.Drawing.Size(522, 120) Me.dataGridSummaries.TabIndex = 335 ' + 'colType + ' + Me.colType.HeaderText = "Summary Expression" + Me.colType.MinimumWidth = 8 + Me.colType.Name = "colType" + Me.colType.ReadOnly = True + Me.colType.Width = 90 + ' + 'colExpression + ' + Me.colExpression.HeaderText = "Style Expression" + Me.colExpression.MinimumWidth = 8 + Me.colExpression.Name = "colExpression" + Me.colExpression.ReadOnly = True + Me.colExpression.Width = 90 + ' 'btnStyle ' Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnStyle.Location = New System.Drawing.Point(738, 301) + Me.btnStyle.Location = New System.Drawing.Point(740, 303) Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnStyle.Name = "btnStyle" Me.btnStyle.Size = New System.Drawing.Size(126, 35) @@ -124,12 +139,12 @@ Partial Class ucrRowSummary ' Me.lblSummaryLabel.AutoSize = True Me.lblSummaryLabel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryLabel.Location = New System.Drawing.Point(362, 216) + Me.lblSummaryLabel.Location = New System.Drawing.Point(355, 286) Me.lblSummaryLabel.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryLabel.Name = "lblSummaryLabel" - Me.lblSummaryLabel.Size = New System.Drawing.Size(123, 20) + Me.lblSummaryLabel.Size = New System.Drawing.Size(196, 20) Me.lblSummaryLabel.TabIndex = 342 - Me.lblSummaryLabel.Text = "Summary Label:" + Me.lblSummaryLabel.Text = "Summary Label (Optional):" ' 'lblReplaceWith ' @@ -146,7 +161,7 @@ Partial Class ucrRowSummary ' Me.btnFormat.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnFormat.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnFormat.Location = New System.Drawing.Point(594, 301) + Me.btnFormat.Location = New System.Drawing.Point(594, 304) Me.btnFormat.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnFormat.Name = "btnFormat" Me.btnFormat.Size = New System.Drawing.Size(136, 35) @@ -181,44 +196,20 @@ Partial Class ucrRowSummary ' Me.lblSide.AutoSize = True Me.lblSide.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSide.Location = New System.Drawing.Point(362, 288) + Me.lblSide.Location = New System.Drawing.Point(361, 216) Me.lblSide.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSide.Name = "lblSide" Me.lblSide.Size = New System.Drawing.Size(45, 20) Me.lblSide.TabIndex = 354 Me.lblSide.Text = "Side:" ' - 'colType - ' - Me.colType.HeaderText = "Type" - Me.colType.MinimumWidth = 8 - Me.colType.Name = "colType" - Me.colType.ReadOnly = True - Me.colType.Width = 70 - ' - 'colLabel - ' - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.ReadOnly = True - Me.colLabel.Width = 70 - ' - 'colExpression - ' - Me.colExpression.HeaderText = "Expression" - Me.colExpression.MinimumWidth = 8 - Me.colExpression.Name = "colExpression" - Me.colExpression.ReadOnly = True - Me.colExpression.Width = 90 - ' 'ucrCboSide ' Me.ucrCboSide.AddQuotesIfUnrecognised = True Me.ucrCboSide.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboSide.GetSetSelectedIndex = -1 Me.ucrCboSide.IsReadOnly = False - Me.ucrCboSide.Location = New System.Drawing.Point(359, 309) + Me.ucrCboSide.Location = New System.Drawing.Point(359, 237) Me.ucrCboSide.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrCboSide.Name = "ucrCboSide" Me.ucrCboSide.Size = New System.Drawing.Size(176, 40) @@ -230,7 +221,7 @@ Partial Class ucrRowSummary Me.ucrTxtGroupId.AutoSize = True Me.ucrTxtGroupId.IsMultiline = False Me.ucrTxtGroupId.IsReadOnly = False - Me.ucrTxtGroupId.Location = New System.Drawing.Point(594, 242) + Me.ucrTxtGroupId.Location = New System.Drawing.Point(594, 240) Me.ucrTxtGroupId.Margin = New System.Windows.Forms.Padding(14) Me.ucrTxtGroupId.Name = "ucrTxtGroupId" Me.ucrTxtGroupId.Size = New System.Drawing.Size(180, 32) @@ -267,7 +258,7 @@ Partial Class ucrRowSummary Me.ucrTxtReplaceNa.AutoSize = True Me.ucrTxtReplaceNa.IsMultiline = False Me.ucrTxtReplaceNa.IsReadOnly = False - Me.ucrTxtReplaceNa.Location = New System.Drawing.Point(594, 170) + Me.ucrTxtReplaceNa.Location = New System.Drawing.Point(594, 166) Me.ucrTxtReplaceNa.Margin = New System.Windows.Forms.Padding(14) Me.ucrTxtReplaceNa.Name = "ucrTxtReplaceNa" Me.ucrTxtReplaceNa.Size = New System.Drawing.Size(180, 32) @@ -291,7 +282,7 @@ Partial Class ucrRowSummary Me.ucrTxtSummaryLabel.AutoSize = True Me.ucrTxtSummaryLabel.IsMultiline = False Me.ucrTxtSummaryLabel.IsReadOnly = False - Me.ucrTxtSummaryLabel.Location = New System.Drawing.Point(360, 242) + Me.ucrTxtSummaryLabel.Location = New System.Drawing.Point(360, 312) Me.ucrTxtSummaryLabel.Margin = New System.Windows.Forms.Padding(14) Me.ucrTxtSummaryLabel.Name = "ucrTxtSummaryLabel" Me.ucrTxtSummaryLabel.Size = New System.Drawing.Size(180, 32) @@ -349,6 +340,5 @@ Partial Class ucrRowSummary Friend WithEvents lblSide As Label Friend WithEvents ucrCboSide As ucrInputComboBox Friend WithEvents colType As DataGridViewTextBoxColumn - Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colExpression As DataGridViewTextBoxColumn End Class diff --git a/instat/UserTables/Rows/ucrRowSummary.resx b/instat/UserTables/Rows/ucrRowSummary.resx index 103adcb6e9d..3ebed4eaa8f 100644 --- a/instat/UserTables/Rows/ucrRowSummary.resx +++ b/instat/UserTables/Rows/ucrRowSummary.resx @@ -120,18 +120,12 @@ True - - True - True True - - True - True diff --git a/instat/UserTables/Rows/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb index 9ef4cd56f96..b3ccaf447c5 100644 --- a/instat/UserTables/Rows/ucrRowSummary.vb +++ b/instat/UserTables/Rows/ucrRowSummary.vb @@ -1,6 +1,7 @@ Public Class ucrRowSummary Private bFirstLoad As Boolean = True + Private clsOperator As New ROperator Private dctSummaryTypes, dctSides As New Dictionary(Of String, String) Private Sub ucrRowSummary_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -11,6 +12,9 @@ End Sub Private Sub InitialiseDialog() + ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetMeAsReceiver() + dctSummaryTypes.Add("Minimum", "min") dctSummaryTypes.Add("Maximum", "max") dctSummaryTypes.Add("Mean", "mean") @@ -19,18 +23,107 @@ dctSummaryTypes.Add("Sum", "sum") ucrCboSummaryType.SetItems(dctSummaryTypes, bSetConditions:=False) ucrCboSummaryType.SetDropDownStyleAsNonEditable() + ucrCboSummaryType.GetSetSelectedIndex = 0 + + dctSides.Add("Bottom", "bottom") + dctSides.Add("Top", "top") + ucrCboSide.SetItems(dctSides, bSetConditions:=False) + ucrCboSide.SetDropDownStyleAsNonEditable() + ucrCboSide.GetSetSelectedIndex = 0 + + btnFormat.Tag = Nothing + btnStyle.Tag = Nothing End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If bFirstLoad Then - InitialiseDialog() - bFirstLoad = False + Me.clsOperator = clsOperator + + ucrSelectorCols.SetDataframe(strDataFrameName, bEnableDataframe:=False) + dataGridSummaries.Rows.Clear() + + ' Note, the sequence of these 2 functions matters + SetupSummaryRowInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRCommand({"summary_rows"}, clsOperator)) + SetupSummaryRowStylesInDataGrid(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_summary", clsOperator)) + End Sub + + Private Sub SetupSummaryRowInDataGrid(lstRParams As List(Of RParameter)) + For Each clsRParam As RParameter In lstRParams + Dim clsTabSummaryRowRFunction As RFunction = clsRParam.clsArgumentCodeStructure + Dim row As New DataGridViewRow + row.CreateCells(dataGridSummaries) + row.Cells(0).Value = clsTabSummaryRowRFunction.Clone.ToScript + + ' TODO. In future we could get the individual parameters + + 'For Each clsTabRowGroupRParam As RParameter In clsTabSummaryRowRFunction.clsParameters + ' If clsTabRowGroupRParam.strArgumentName = "fns" Then + ' row.Cells(0).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) + ' ElseIf clsTabRowGroupRParam.strArgumentName = "fms" Then + ' row.Cells(1).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) + ' End If + 'Next + Dim arrParams(2) As RParameter + arrParams(0) = clsRParam + row.Tag = arrParams + dataGridSummaries.Rows.Add(row) + Next + End Sub + + Private Sub SetupSummaryRowStylesInDataGrid(lstRParams As List(Of RParameter)) + For Each clsRParam As RParameter In lstRParams + Dim clsTabStyleRFunction As RFunction = clsRParam.clsArgumentCodeStructure + ' Get spanner Id + Dim iRowId As Integer + If Not Integer.TryParse(clsTabStyleRFunction.GetParameter("locations").clsArgumentCodeStructure.GetParameter("row").strArgumentValue, iRowId) Then + Continue For + End If + + + For index As Integer = 0 To dataGridSummaries.Rows.Count - 1 + Dim row As DataGridViewRow = dataGridSummaries.Rows(index) + Dim lstParams() As RParameter = row.Tag + + ' As of 2024/08/07 the gt summary_rows R function doesn't have a unique identifier like row groups. + ' So just use the data gridview index to show the style expressions + If index + 1 = iRowId Then + row.Cells(1).Value = clsTabStyleRFunction.Clone().ToScript + lstParams(1) = clsRParam + row.Tag = lstParams + Exit For + End If + Next + Next + End Sub + + Private Sub btnFormat_Click(sender As Object, e As EventArgs) Handles btnFormat.Click + sdgCellFormatNumberOptions.ShowDialog(Me.ParentForm) + Dim clsFormatRFunction As RFunction = sdgCellFormatNumberOptions.GetNewUserInputAsRFunction() + + If clsFormatRFunction IsNot Nothing Then + btnFormat.Tag = clsFormatRFunction End If + End Sub - Public Sub SetValuesToOperator() + Private Sub btnStyle_Click(sender As Object, e As EventArgs) Handles btnStyle.Click + Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) + If clsListStyleRFunction Is Nothing Then + Exit Sub + End If + + Dim clsLocationsRFunction As New RFunction + clsLocationsRFunction.SetPackageName("gt") + clsLocationsRFunction.SetRCommand("cells_summary") + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + + Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) + + btnStyle.Tag = clsTabStyleRFunction + End Sub + Private Sub conditionValue_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleCols.ControlContentsChanged + btnAddSummaries.Enabled = Not ucrReceiverMultipleCols.IsEmpty End Sub Private Sub btnAddSummaries_Click(sender As Object, e As EventArgs) Handles btnAddSummaries.Click @@ -39,86 +132,79 @@ Dim strSpannerColsRFunction As String = mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False) Dim strSpannerStyleExpression As String = "" - Dim clsTabSpannerRFunction As New RFunction - clsTabSpannerRFunction.SetPackageName("gt") - clsTabSpannerRFunction.SetRCommand("summary_rows") + Dim clsSummaryRowsRFunction As New RFunction + clsSummaryRowsRFunction.SetPackageName("gt") + clsSummaryRowsRFunction.SetRCommand("summary_rows") + If Not ucrTxtGroupId.IsEmpty Then - clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=clsTablesUtils.GetStringValue(ucrTxtGroupId.GetText, True), iNewPosition:=0)) + clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=Chr(34) & ucrTxtGroupId.GetText & Chr(34), iNewPosition:=0)) End If - clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False), iNewPosition:=1)) + clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="fns", strParamValue:=GetFnParameters(), iNewPosition:=1)) + clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=mdlCoreControl.GetRVector(ucrReceiverMultipleCols.GetVariableNamesList(bWithQuotes:=False), bOnlyIfMultipleElement:=False), iNewPosition:=2)) - clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="fns", strParamValue:=clsTablesUtils.GetStringValue(strSpannerLabel, True), iNewPosition:=0)) + If btnFormat.Tag IsNot Nothing Then + Dim clsFormatRFunction As RFunction = btnFormat.Tag + clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="fmt", strParamValue:=clsFormatRFunction, iNewPosition:=3)) + End If - clsTabSpannerRFunction.AddParameter(New RParameter(strParameterName:="id", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=2)) + clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="side", strParamValue:=Chr(34) & dctSides.Item(ucrCboSide.GetText) & Chr(34), iNewPosition:=4)) + + If Not ucrTxtReplaceNa.IsEmpty Then + clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="missing_text", strParamValue:=Chr(34) & ucrTxtReplaceNa.GetText & Chr(34), iNewPosition:=0)) + End If Dim arrParams(2) As RParameter ' Add add the spanner parameter as the first element - arrParams(0) = New RParameter(strParameterName:="tab_column_spanner_param" & (dataGridSummaries.Rows.Count + 1), strParamValue:=clsTabSpannerRFunction, bNewIncludeArgumentName:=False) + arrParams(0) = New RParameter(strParameterName:="summary_rows_param" & (dataGridSummaries.Rows.Count + 1), strParamValue:=clsSummaryRowsRFunction, bNewIncludeArgumentName:=False) ' Add the spanner style as the second element If btnStyle.Tag IsNot Nothing Then - Dim clsLocationsRFunction As New RFunction - clsLocationsRFunction.SetPackageName("gt") - clsLocationsRFunction.SetRCommand("cells_column_spanners") - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="spanners", strParamValue:=clsTablesUtils.GetStringValue(strSpannerId, True), iNewPosition:=0)) - - Dim clsListStyleRFunction As RFunction = btnStyle.Tag - Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) - + Dim clsTabStyleRFunction As RFunction = btnStyle.Tag strSpannerStyleExpression = clsTabStyleRFunction.Clone.ToScript - - arrParams(1) = New RParameter(strParameterName:="tab_style_cells_column_spanner_param" & (dataGridSummaries.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) + arrParams(1) = New RParameter(strParameterName:="tab_style_cells_summary_param" & (dataGridSummaries.Rows.Count + 1), strParamValue:=clsTabStyleRFunction, bNewIncludeArgumentName:=False) End If Dim row As New DataGridViewRow row.CreateCells(dataGridSummaries) - row.Cells(0).Value = strSpannerLabel - row.Cells(1).Value = strSpannerColsRFunction - row.Cells(2).Value = strSpannerStyleExpression + row.Cells(0).Value = clsSummaryRowsRFunction.Clone.ToScript + row.Cells(1).Value = strSpannerStyleExpression ' Tag the array of parameters row.Tag = arrParams dataGridSummaries.Rows.Add(row) ucrReceiverMultipleCols.Clear() - 'ucrInputColSpanner.SetName("") - ' ucrInputColSpanner.Tag = Nothing - End Sub - - Private Sub btnFormat_Click(sender As Object, e As EventArgs) Handles btnFormat.Click - sdgCellFormatNumberOptions.ShowDialog(Me.ParentForm) - Dim clsFormatRFunction As RFunction = sdgCellFormatNumberOptions.GetNewUserInputAsRFunction() - - If clsFormatRFunction Is Nothing Then - btnFormat.Tag = clsFormatRFunction - End If - + ucrTxtGroupId.SetName("") + ucrTxtSummaryLabel.SetName("") + btnFormat.Tag = Nothing + btnStyle.Tag = Nothing End Sub - Private Sub btnStyle_Click(sender As Object, e As EventArgs) Handles btnStyle.Click - Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) - If clsListStyleRFunction Is Nothing Then - Exit Sub + Private Function GetFnParameters() As String + Dim strFnType As String = dctSummaryTypes.Item(ucrCboSummaryType.GetText) + Dim strFnParams As String = "id = " & Chr(34) & strFnType & Chr(34) & ", fn = " & Chr(34) & strFnType & Chr(34) + If Not ucrTxtSummaryLabel.IsEmpty Then + strFnParams = strFnParams & ", label = " & Chr(34) & ucrCboSummaryType.GetText & Chr(34) End If - - Dim clsLocationsRFunction As New RFunction - clsLocationsRFunction.SetPackageName("gt") - clsLocationsRFunction.SetRCommand("cells_summary") - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) - 'If Not ucrRowExpression.IsEmpty Then - ' clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="rows", strParamValue:=ucrRowExpression.GetText(), iNewPosition:=1)) - 'End If - - Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) - - btnStyle.Tag = clsTabStyleRFunction - - - End Sub + Return "list(" & strFnParams & ")" + End Function Private Sub btnClearSummaries_Click(sender As Object, e As EventArgs) Handles btnClearSummaries.Click dataGridSummaries.Rows.Clear() End Sub + + Public Sub SetValuesToOperator() + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRCommand({"summary_rows"}, clsOperator), clsOperator) + clsTablesUtils.RemoveRParams(clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_summary", clsOperator), clsOperator) + + For index As Integer = 0 To dataGridSummaries.Rows.Count - 1 + Dim lstParams() As RParameter = dataGridSummaries.Rows(index).Tag + clsOperator.AddParameter(lstParams(0)) + If lstParams(1) IsNot Nothing Then + clsOperator.AddParameter(lstParams(1)) + End If + Next + End Sub End Class From d6d3281266d8e27e885a17050017354def8d51e1 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 8 Aug 2024 09:38:46 +0300 Subject: [PATCH 100/273] Finished row summary feature --- .../UserTables/Rows/ucrRowGroup.Designer.vb | 68 +++++++++++-------- instat/UserTables/Rows/ucrRowGroup.resx | 3 + instat/UserTables/Rows/ucrRowGroup.vb | 14 ++-- .../UserTables/Rows/ucrRowSummary.Designer.vb | 36 +++++----- instat/UserTables/Rows/ucrRowSummary.resx | 6 -- instat/UserTables/Rows/ucrRowSummary.vb | 27 +++++++- instat/UserTables/Rows/ucrRows.vb | 13 ++-- 7 files changed, 101 insertions(+), 66 deletions(-) diff --git a/instat/UserTables/Rows/ucrRowGroup.Designer.vb b/instat/UserTables/Rows/ucrRowGroup.Designer.vb index e9d02bfc06c..187eb8e2181 100644 --- a/instat/UserTables/Rows/ucrRowGroup.Designer.vb +++ b/instat/UserTables/Rows/ucrRowGroup.Designer.vb @@ -23,9 +23,6 @@ Partial Class ucrRowGroup Private Sub InitializeComponent() Me.dataGridGroups = New System.Windows.Forms.DataGridView() - Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.btnClearGroups = New System.Windows.Forms.Button() Me.btnAddCondition = New System.Windows.Forms.Button() Me.lblGroups = New System.Windows.Forms.Label() @@ -34,6 +31,10 @@ Partial Class ucrRowGroup Me.btnStyle = New System.Windows.Forms.Button() Me.ucrRowExpression = New instat.ucrRowExpression() Me.lblGroupExpression = New System.Windows.Forms.Label() + Me.colId = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colLabel = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colCodnition = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colStyleExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridGroups, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -41,7 +42,7 @@ Partial Class ucrRowGroup ' Me.dataGridGroups.AllowUserToAddRows = False Me.dataGridGroups.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize - Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colLabel, Me.colCodnition, Me.colStyleExpression}) + Me.dataGridGroups.Columns.AddRange(New System.Windows.Forms.DataGridViewColumn() {Me.colId, Me.colLabel, Me.colCodnition, Me.colStyleExpression}) Me.dataGridGroups.Location = New System.Drawing.Point(12, 249) Me.dataGridGroups.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.dataGridGroups.Name = "dataGridGroups" @@ -50,30 +51,6 @@ Partial Class ucrRowGroup Me.dataGridGroups.Size = New System.Drawing.Size(484, 146) Me.dataGridGroups.TabIndex = 11 ' - 'colLabel - ' - Me.colLabel.HeaderText = "Label" - Me.colLabel.MinimumWidth = 8 - Me.colLabel.Name = "colLabel" - Me.colLabel.ReadOnly = True - Me.colLabel.Width = 70 - ' - 'colCodnition - ' - Me.colCodnition.HeaderText = "Condition" - Me.colCodnition.MinimumWidth = 8 - Me.colCodnition.Name = "colCodnition" - Me.colCodnition.ReadOnly = True - Me.colCodnition.Width = 90 - ' - 'colStyleExpression - ' - Me.colStyleExpression.HeaderText = "Style Expression" - Me.colStyleExpression.MinimumWidth = 8 - Me.colStyleExpression.Name = "colStyleExpression" - Me.colStyleExpression.ReadOnly = True - Me.colStyleExpression.Width = 90 - ' 'btnClearGroups ' Me.btnClearGroups.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -137,7 +114,7 @@ Partial Class ucrRowGroup ' Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.btnStyle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.btnStyle.Location = New System.Drawing.Point(210, 99) + Me.btnStyle.Location = New System.Drawing.Point(210, 101) Me.btnStyle.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.btnStyle.Name = "btnStyle" Me.btnStyle.Size = New System.Drawing.Size(74, 35) @@ -165,6 +142,38 @@ Partial Class ucrRowGroup Me.lblGroupExpression.TabIndex = 334 Me.lblGroupExpression.Text = "Group Condition:" ' + 'colId + ' + Me.colId.HeaderText = "Id" + Me.colId.MinimumWidth = 8 + Me.colId.Name = "colId" + Me.colId.ReadOnly = True + Me.colId.Width = 70 + ' + 'colLabel + ' + Me.colLabel.HeaderText = "Label" + Me.colLabel.MinimumWidth = 8 + Me.colLabel.Name = "colLabel" + Me.colLabel.ReadOnly = True + Me.colLabel.Width = 70 + ' + 'colCodnition + ' + Me.colCodnition.HeaderText = "Condition" + Me.colCodnition.MinimumWidth = 8 + Me.colCodnition.Name = "colCodnition" + Me.colCodnition.ReadOnly = True + Me.colCodnition.Width = 90 + ' + 'colStyleExpression + ' + Me.colStyleExpression.HeaderText = "Style Expression" + Me.colStyleExpression.MinimumWidth = 8 + Me.colStyleExpression.Name = "colStyleExpression" + Me.colStyleExpression.ReadOnly = True + Me.colStyleExpression.Width = 90 + ' 'ucrRowGroup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) @@ -196,6 +205,7 @@ Partial Class ucrRowGroup Friend WithEvents btnStyle As Button Friend WithEvents ucrRowExpression As ucrRowExpression Friend WithEvents lblGroupExpression As Label + Friend WithEvents colId As DataGridViewTextBoxColumn Friend WithEvents colLabel As DataGridViewTextBoxColumn Friend WithEvents colCodnition As DataGridViewTextBoxColumn Friend WithEvents colStyleExpression As DataGridViewTextBoxColumn diff --git a/instat/UserTables/Rows/ucrRowGroup.resx b/instat/UserTables/Rows/ucrRowGroup.resx index 9a01250ba65..7703172b4e8 100644 --- a/instat/UserTables/Rows/ucrRowGroup.resx +++ b/instat/UserTables/Rows/ucrRowGroup.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + True diff --git a/instat/UserTables/Rows/ucrRowGroup.vb b/instat/UserTables/Rows/ucrRowGroup.vb index e3e5782bb70..9bded35fffa 100644 --- a/instat/UserTables/Rows/ucrRowGroup.vb +++ b/instat/UserTables/Rows/ucrRowGroup.vb @@ -31,10 +31,12 @@ Dim row As New DataGridViewRow row.CreateCells(dataGridGroups) For Each clsTabRowGroupRParam As RParameter In clsTabRowGroupRFunction.clsParameters - If clsTabRowGroupRParam.strArgumentName = "label" Then + If clsTabRowGroupRParam.strArgumentName = "id" Then row.Cells(0).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) - ElseIf clsTabRowGroupRParam.strArgumentName = "rows" Then + ElseIf clsTabRowGroupRParam.strArgumentName = "label" Then row.Cells(1).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) + ElseIf clsTabRowGroupRParam.strArgumentName = "rows" Then + row.Cells(2).Value = clsTablesUtils.GetStringValue(clsTabRowGroupRParam.strArgumentValue, False) End If Next Dim arrParams(2) As RParameter @@ -103,10 +105,10 @@ Dim row As New DataGridViewRow row.CreateCells(dataGridGroups) - - row.Cells(0).Value = ucrInputGroupLabel.GetText() - row.Cells(1).Value = ucrRowExpression.GetText() - row.Cells(2).Value = strGroupStyleExpression + row.Cells(0).Value = strGroupId + row.Cells(1).Value = ucrInputGroupLabel.GetText() + row.Cells(2).Value = ucrRowExpression.GetText() + row.Cells(3).Value = strGroupStyleExpression ' Tag the array of parameters row.Tag = arrParams dataGridGroups.Rows.Add(row) diff --git a/instat/UserTables/Rows/ucrRowSummary.Designer.vb b/instat/UserTables/Rows/ucrRowSummary.Designer.vb index 183662f3adc..7ef44d485d4 100644 --- a/instat/UserTables/Rows/ucrRowSummary.Designer.vb +++ b/instat/UserTables/Rows/ucrRowSummary.Designer.vb @@ -23,8 +23,6 @@ Partial Class ucrRowSummary _ Private Sub InitializeComponent() Me.dataGridSummaries = New System.Windows.Forms.DataGridView() - Me.colType = New System.Windows.Forms.DataGridViewTextBoxColumn() - Me.colExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() Me.btnStyle = New System.Windows.Forms.Button() Me.lblSummaryTypes = New System.Windows.Forms.Label() Me.lblSummaries = New System.Windows.Forms.Label() @@ -43,6 +41,8 @@ Partial Class ucrRowSummary Me.ucrTxtReplaceNa = New instat.ucrInputTextBox() Me.ucrCboSummaryType = New instat.ucrInputComboBox() Me.ucrTxtSummaryLabel = New instat.ucrInputTextBox() + Me.colType = New System.Windows.Forms.DataGridViewTextBoxColumn() + Me.colExpression = New System.Windows.Forms.DataGridViewTextBoxColumn() CType(Me.dataGridSummaries, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -59,22 +59,6 @@ Partial Class ucrRowSummary Me.dataGridSummaries.Size = New System.Drawing.Size(522, 120) Me.dataGridSummaries.TabIndex = 335 ' - 'colType - ' - Me.colType.HeaderText = "Summary Expression" - Me.colType.MinimumWidth = 8 - Me.colType.Name = "colType" - Me.colType.ReadOnly = True - Me.colType.Width = 90 - ' - 'colExpression - ' - Me.colExpression.HeaderText = "Style Expression" - Me.colExpression.MinimumWidth = 8 - Me.colExpression.Name = "colExpression" - Me.colExpression.ReadOnly = True - Me.colExpression.Width = 90 - ' 'btnStyle ' Me.btnStyle.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) @@ -288,6 +272,22 @@ Partial Class ucrRowSummary Me.ucrTxtSummaryLabel.Size = New System.Drawing.Size(180, 32) Me.ucrTxtSummaryLabel.TabIndex = 343 ' + 'colType + ' + Me.colType.HeaderText = "Summary Expression" + Me.colType.MinimumWidth = 8 + Me.colType.Name = "colType" + Me.colType.ReadOnly = True + Me.colType.Width = 150 + ' + 'colExpression + ' + Me.colExpression.HeaderText = "Style Expression" + Me.colExpression.MinimumWidth = 8 + Me.colExpression.Name = "colExpression" + Me.colExpression.ReadOnly = True + Me.colExpression.Width = 150 + ' 'ucrRowSummary ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) diff --git a/instat/UserTables/Rows/ucrRowSummary.resx b/instat/UserTables/Rows/ucrRowSummary.resx index 3ebed4eaa8f..0f42d579fc9 100644 --- a/instat/UserTables/Rows/ucrRowSummary.resx +++ b/instat/UserTables/Rows/ucrRowSummary.resx @@ -123,10 +123,4 @@ True - - True - - - True - \ No newline at end of file diff --git a/instat/UserTables/Rows/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb index b3ccaf447c5..689d8db5e7b 100644 --- a/instat/UserTables/Rows/ucrRowSummary.vb +++ b/instat/UserTables/Rows/ucrRowSummary.vb @@ -13,6 +13,7 @@ Private Sub InitialiseDialog() ucrReceiverMultipleCols.Selector = ucrSelectorCols + ucrReceiverMultipleCols.SetDataType("numeric", bStrict:=True) ucrReceiverMultipleCols.SetMeAsReceiver() dctSummaryTypes.Add("Minimum", "min") @@ -34,6 +35,15 @@ btnFormat.Tag = Nothing btnStyle.Tag = Nothing + ' TODO. Disabled due to error thrwon when using data book. See comments inside GetFnParameters() + lblSummaryLabel.Enabled = False + ucrTxtSummaryLabel.Enabled = False + + ' TODO. Disabled until R is upgraded + lblSide.Enabled = False + ucrCboSide.Enabled = False + btnFormat.Enabled = False + btnStyle.Enabled = False End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) @@ -115,7 +125,12 @@ Dim clsLocationsRFunction As New RFunction clsLocationsRFunction.SetPackageName("gt") clsLocationsRFunction.SetRCommand("cells_summary") - clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=0)) + + If Not ucrTxtGroupId.IsEmpty Then + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="groups", strParamValue:=Chr(34) & ucrTxtGroupId.GetText & Chr(34), iNewPosition:=0)) + End If + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="columns", strParamValue:=ucrReceiverMultipleCols.GetVariableNames(bWithQuotes:=False), iNewPosition:=1)) + clsLocationsRFunction.AddParameter(New RParameter(strParameterName:="row", strParamValue:=dataGridSummaries.Rows.Count + 1, iNewPosition:=2)) Dim clsTabStyleRFunction As RFunction = clsTablesUtils.GetNewStyleRFunction(clsListStyleRFunction, clsLocationsRFunction) @@ -149,7 +164,8 @@ clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="fmt", strParamValue:=clsFormatRFunction, iNewPosition:=3)) End If - clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="side", strParamValue:=Chr(34) & dctSides.Item(ucrCboSide.GetText) & Chr(34), iNewPosition:=4)) + 'TODO. Commented out until R-Instat R is upgraded + 'clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="side", strParamValue:=Chr(34) & dctSides.Item(ucrCboSide.GetText) & Chr(34), iNewPosition:=4)) If Not ucrTxtReplaceNa.IsEmpty Then clsSummaryRowsRFunction.AddParameter(New RParameter(strParameterName:="missing_text", strParamValue:=Chr(34) & ucrTxtReplaceNa.GetText & Chr(34), iNewPosition:=0)) @@ -183,12 +199,17 @@ End Sub Private Function GetFnParameters() As String + ' TODO. As of 08/08/2024, GT example like list(fn = "min", label = "Minimum", id = "min") throws an error when exeuted in R-Instat + ' TODO. Investigate why the error why is thrown when using the databook + Dim strFnType As String = dctSummaryTypes.Item(ucrCboSummaryType.GetText) Dim strFnParams As String = "id = " & Chr(34) & strFnType & Chr(34) & ", fn = " & Chr(34) & strFnType & Chr(34) If Not ucrTxtSummaryLabel.IsEmpty Then strFnParams = strFnParams & ", label = " & Chr(34) & ucrCboSummaryType.GetText & Chr(34) End If - Return "list(" & strFnParams & ")" + ' TODO. Commented out due to error thrown + 'Return "list(" & strFnParams & ")" + Return Chr(34) & strFnType & Chr(34) End Function Private Sub btnClearSummaries_Click(sender As Object, e As EventArgs) Handles btnClearSummaries.Click diff --git a/instat/UserTables/Rows/ucrRows.vb b/instat/UserTables/Rows/ucrRows.vb index a3e5f47ac55..52581f9623c 100644 --- a/instat/UserTables/Rows/ucrRows.vb +++ b/instat/UserTables/Rows/ucrRows.vb @@ -1,6 +1,14 @@ Public Class ucrRows Private bFirstload As Boolean = True + + Private Sub ucrRows_Load(sender As Object, e As EventArgs) Handles MyBase.Load + If bFirstload Then + InitialiseDialog() + bFirstload = False + End If + End Sub + Private Sub InitialiseDialog() ucrPnlRows.AddRadioButton(rdoRowsGroups) ucrPnlRows.AddRadioButton(rdoRowsSummaries) @@ -8,10 +16,6 @@ End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If bFirstload Then - InitialiseDialog() - bFirstload = False - End If ucrRowGroups.Setup(strDataFrameName, clsOperator) ucrRowSummary.Setup(strDataFrameName, clsOperator) End Sub @@ -26,4 +30,5 @@ ucrRowSummary.SetValuesToOperator() End Sub + End Class From b39ba1bab000d632d9701ba89a76b4b7f132dd31 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 8 Aug 2024 10:02:36 +0300 Subject: [PATCH 101/273] disabled nanoplots --- .../Cells/Formats/ucrCellFormats.vb | 1 - .../Columns/ucrColumnNanoPlots.Designer.vb | 10 +- .../Columns/ucrColumnNanoPlots.resx | 120 ++++++++++++++++++ .../UserTables/Columns/ucrColumnNanoPlots.vb | 3 + instat/UserTables/Columns/ucrColumns.vb | 6 +- instat/instat.vbproj | 3 + 6 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 instat/UserTables/Columns/ucrColumnNanoPlots.resx diff --git a/instat/UserTables/Cells/Formats/ucrCellFormats.vb b/instat/UserTables/Cells/Formats/ucrCellFormats.vb index 82c9d9d4fa7..8a1ecd9ed70 100644 --- a/instat/UserTables/Cells/Formats/ucrCellFormats.vb +++ b/instat/UserTables/Cells/Formats/ucrCellFormats.vb @@ -143,5 +143,4 @@ clsTablesUtils.RemoveRFunctionsParamsWithRCommand({"fmt", "fmt_units", "fmt_number", "fmt_currency"}, clsOperator) clsTablesUtils.AddGridRowTagsRParamsToROperator(dataGridFormats, clsOperator) End Sub - End Class diff --git a/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb b/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb index e0ac67e5751..f0182c43b02 100644 --- a/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnNanoPlots.Designer.vb @@ -22,8 +22,16 @@ Partial Class ucrColumnNanoPlots 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - components = New System.ComponentModel.Container() + Me.SuspendLayout() + ' + 'ucrColumnNanoPlots + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Name = "ucrColumnNanoPlots" + Me.Size = New System.Drawing.Size(648, 470) + Me.ResumeLayout(False) + End Sub End Class diff --git a/instat/UserTables/Columns/ucrColumnNanoPlots.resx b/instat/UserTables/Columns/ucrColumnNanoPlots.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/UserTables/Columns/ucrColumnNanoPlots.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnNanoPlots.vb b/instat/UserTables/Columns/ucrColumnNanoPlots.vb index 2803d52feb2..4870a201ea9 100644 --- a/instat/UserTables/Columns/ucrColumnNanoPlots.vb +++ b/instat/UserTables/Columns/ucrColumnNanoPlots.vb @@ -7,4 +7,7 @@ End Sub + Private Sub ucrColumnNanoPlots_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub End Class diff --git a/instat/UserTables/Columns/ucrColumns.vb b/instat/UserTables/Columns/ucrColumns.vb index 3aef44aa9df..b3c7824fde1 100644 --- a/instat/UserTables/Columns/ucrColumns.vb +++ b/instat/UserTables/Columns/ucrColumns.vb @@ -17,7 +17,11 @@ ucrPnlCols.AddRadioButton(rdoColWidth) ucrPnlCols.AddRadioButton(rdoColFootNotes) ucrPnlCols.AddRadioButton(rdoColSpanners) - ucrPnlCols.AddRadioButton(rdoColNanoPlot) + + ' TODO. Nonplots disabled until R is upgraded + 'ucrPnlCols.AddRadioButton(rdoColNanoPlot) + rdoColNanoPlot.Enabled = False + rdoColLabel.Checked = True End Sub diff --git a/instat/instat.vbproj b/instat/instat.vbproj index e7cdb7605de..3a6a7b6ed65 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -3429,6 +3429,9 @@ ucrColumnFootNote.vb + + ucrColumnNanoPlots.vb + ucrColumnStyles.vb From 51c0c52dc612872d95ddb31dc682135fb925400c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Thu, 8 Aug 2024 10:08:18 +0300 Subject: [PATCH 102/273] deleted styling through html --- instat/UserTables/clsTablesUtils.vb | 60 --- .../sdgTableOptionsTextFormat.Designer.vb | 374 ------------------ .../UserTables/sdgTableOptionsTextFormat.resx | 120 ------ .../UserTables/sdgTableOptionsTextFormat.vb | 131 ------ instat/instat.vbproj | 9 - 5 files changed, 694 deletions(-) delete mode 100644 instat/UserTables/sdgTableOptionsTextFormat.Designer.vb delete mode 100644 instat/UserTables/sdgTableOptionsTextFormat.resx delete mode 100644 instat/UserTables/sdgTableOptionsTextFormat.vb diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index f29633afb04..7bdb8eae968 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -2,30 +2,6 @@ Public Class clsTablesUtils - 'TODO. Delete - Public Shared Function GetNewHtmlSpanRFunction() As RFunction - Dim clsHtmlDivRFunction As New RFunction - clsHtmlDivRFunction.SetPackageName("htmltools") - clsHtmlDivRFunction.SetRCommand("tags$span") - Return clsHtmlDivRFunction - End Function - - 'TODO. Delete - Public Shared Function GetNewHtmlStyleRFunction() As RFunction - Dim clsStyleRFunction As New RFunction - clsStyleRFunction.SetPackageName("htmltools") - clsStyleRFunction.SetRCommand("css") - Return clsStyleRFunction - End Function - - Public Shared Sub ShowTextFormatSubDialog(owner As Form, clsHtmlTagRFunction As RFunction) - If Not clsHtmlTagRFunction.ContainsParameter("style") Then - clsHtmlTagRFunction.AddParameter(strParameterName:="style", clsRFunctionParameter:=GetNewHtmlStyleRFunction(), iPosition:=1) - End If - sdgTableOptionsTextFormat.Setup(clsHtmlTagRFunction.GetParameter("style").clsArgumentCodeStructure) - sdgTableOptionsTextFormat.ShowDialog(owner) - End Sub - Public Shared Function ShowStyleSubDialog(owner As Form, Optional clsListStyleRFunction As RFunction = Nothing) As RFunction If clsListStyleRFunction IsNot Nothing AndAlso clsListStyleRFunction.ContainsParameter("style") Then sdgTableStyles.Setup(clsListStyleRFunction.GetParameter("style").clsArgumentCodeStructure) @@ -126,42 +102,6 @@ Public Class clsTablesUtils Return lstRFunctionsParamsFound End Function - - - - - ' TODO. Delete - Private Shared Sub RemoveParameterFromOperator(strParameterNames() As String, clsOperator As ROperator) - ' Remove all the previous footer parameters first - Dim lstParams As New List(Of RParameter) - For Each clsRParam As RParameter In clsOperator.clsParameters - If strParameterNames.Contains(clsRParam.strArgumentName) Then - lstParams.Add(clsRParam) - End If - Next - For Each clsRParam As RParameter In lstParams - clsOperator.RemoveParameter(clsRParam) - Next - End Sub - - - 'TODO. Delete - Public Shared Sub SetGridTagsInOperator(dataGrid As DataGridView, strParameterName As String, clsOperator As ROperator) - - If dataGrid.Rows.Count = 0 Then - Exit Sub - End If - - ' Then add the new footer parameters - For index As Integer = 0 To dataGrid.Rows.Count - 1 - Dim clsFooterRFunction As RFunction = dataGrid.Rows.Item(index).Tag - If clsFooterRFunction IsNot Nothing Then - clsOperator.AddParameter(strParameterName & index, clsRFunctionParameter:=clsFooterRFunction, bIncludeArgumentName:=False) - End If - Next - - End Sub - Public Shared Function GetStringValue(str As String, bwithQuotes As Boolean) As String If String.IsNullOrEmpty(str) Then str = "" diff --git a/instat/UserTables/sdgTableOptionsTextFormat.Designer.vb b/instat/UserTables/sdgTableOptionsTextFormat.Designer.vb deleted file mode 100644 index c59cececd1c..00000000000 --- a/instat/UserTables/sdgTableOptionsTextFormat.Designer.vb +++ /dev/null @@ -1,374 +0,0 @@ - _ -Partial Class sdgTableOptionsTextFormat - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. - _ - Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try - End Sub - - 'Required by the Windows Form Designer - Private components As System.ComponentModel.IContainer - - 'NOTE: The following procedure is required by the Windows Form Designer - 'It can be modified using the Windows Form Designer. - 'Do not modify it using the code editor. - _ - Private Sub InitializeComponent() - Me.lblFontFamily = New System.Windows.Forms.Label() - Me.lblFontStyle = New System.Windows.Forms.Label() - Me.lblFontSize = New System.Windows.Forms.Label() - Me.lblUnderlineColor = New System.Windows.Forms.Label() - Me.lblUnderlineStyle = New System.Windows.Forms.Label() - Me.lblAlignHorizontal = New System.Windows.Forms.Label() - Me.GroupBox1 = New System.Windows.Forms.GroupBox() - Me.ucrTxtFontSize = New instat.ucrInputTextBox() - Me.ucrCboFontWeight = New instat.ucrInputComboBox() - Me.lblFontWeight = New System.Windows.Forms.Label() - Me.ucrCboFontStyle = New instat.ucrInputComboBox() - Me.ucrCboFontFamily = New instat.ucrInputComboBox() - Me.GroupBox2 = New System.Windows.Forms.GroupBox() - Me.lblUnderlineType = New System.Windows.Forms.Label() - Me.ucrCboUnderlineType = New instat.ucrInputComboBox() - Me.ucrCboUnderLineColor = New instat.ucrColors() - Me.ucrCboUnderlineStyle = New instat.ucrInputComboBox() - Me.GroupBox3 = New System.Windows.Forms.GroupBox() - Me.ucrCboAlignHorizontal = New instat.ucrInputComboBox() - Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() - Me.GroupBox4 = New System.Windows.Forms.GroupBox() - Me.ucrCboColorBackground = New instat.ucrColors() - Me.ucrCboColorText = New instat.ucrColors() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - Me.GroupBox1.SuspendLayout() - Me.GroupBox2.SuspendLayout() - Me.GroupBox3.SuspendLayout() - Me.GroupBox4.SuspendLayout() - Me.SuspendLayout() - ' - 'lblFontFamily - ' - Me.lblFontFamily.AutoSize = True - Me.lblFontFamily.Location = New System.Drawing.Point(6, 19) - Me.lblFontFamily.Name = "lblFontFamily" - Me.lblFontFamily.Size = New System.Drawing.Size(69, 13) - Me.lblFontFamily.TabIndex = 6 - Me.lblFontFamily.Text = "Type (family):" - ' - 'lblFontStyle - ' - Me.lblFontStyle.AutoSize = True - Me.lblFontStyle.Location = New System.Drawing.Point(151, 19) - Me.lblFontStyle.Name = "lblFontStyle" - Me.lblFontStyle.Size = New System.Drawing.Size(33, 13) - Me.lblFontStyle.TabIndex = 8 - Me.lblFontStyle.Text = "Style:" - ' - 'lblFontSize - ' - Me.lblFontSize.AutoSize = True - Me.lblFontSize.Location = New System.Drawing.Point(444, 19) - Me.lblFontSize.Name = "lblFontSize" - Me.lblFontSize.Size = New System.Drawing.Size(30, 13) - Me.lblFontSize.TabIndex = 10 - Me.lblFontSize.Text = "Size:" - ' - 'lblUnderlineColor - ' - Me.lblUnderlineColor.AutoSize = True - Me.lblUnderlineColor.Location = New System.Drawing.Point(300, 16) - Me.lblUnderlineColor.Name = "lblUnderlineColor" - Me.lblUnderlineColor.Size = New System.Drawing.Size(34, 13) - Me.lblUnderlineColor.TabIndex = 16 - Me.lblUnderlineColor.Text = "Color:" - ' - 'lblUnderlineStyle - ' - Me.lblUnderlineStyle.AutoSize = True - Me.lblUnderlineStyle.Location = New System.Drawing.Point(151, 16) - Me.lblUnderlineStyle.Name = "lblUnderlineStyle" - Me.lblUnderlineStyle.Size = New System.Drawing.Size(33, 13) - Me.lblUnderlineStyle.TabIndex = 14 - Me.lblUnderlineStyle.Text = "Style:" - ' - 'lblAlignHorizontal - ' - Me.lblAlignHorizontal.AutoSize = True - Me.lblAlignHorizontal.Location = New System.Drawing.Point(6, 20) - Me.lblAlignHorizontal.Name = "lblAlignHorizontal" - Me.lblAlignHorizontal.Size = New System.Drawing.Size(57, 13) - Me.lblAlignHorizontal.TabIndex = 18 - Me.lblAlignHorizontal.Text = "Horizontal:" - ' - 'GroupBox1 - ' - Me.GroupBox1.Controls.Add(Me.ucrTxtFontSize) - Me.GroupBox1.Controls.Add(Me.ucrCboFontWeight) - Me.GroupBox1.Controls.Add(Me.lblFontWeight) - Me.GroupBox1.Controls.Add(Me.lblFontFamily) - Me.GroupBox1.Controls.Add(Me.ucrCboFontStyle) - Me.GroupBox1.Controls.Add(Me.ucrCboFontFamily) - Me.GroupBox1.Controls.Add(Me.lblFontStyle) - Me.GroupBox1.Controls.Add(Me.lblFontSize) - Me.GroupBox1.Location = New System.Drawing.Point(7, 7) - Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(594, 68) - Me.GroupBox1.TabIndex = 21 - Me.GroupBox1.TabStop = False - Me.GroupBox1.Text = "Font" - ' - 'ucrTxtFontSize - ' - Me.ucrTxtFontSize.AddQuotesIfUnrecognised = True - Me.ucrTxtFontSize.AutoSize = True - Me.ucrTxtFontSize.IsMultiline = False - Me.ucrTxtFontSize.IsReadOnly = False - Me.ucrTxtFontSize.Location = New System.Drawing.Point(447, 35) - Me.ucrTxtFontSize.Name = "ucrTxtFontSize" - Me.ucrTxtFontSize.Size = New System.Drawing.Size(137, 21) - Me.ucrTxtFontSize.TabIndex = 15 - ' - 'ucrCboFontWeight - ' - Me.ucrCboFontWeight.AddQuotesIfUnrecognised = True - Me.ucrCboFontWeight.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontWeight.GetSetSelectedIndex = -1 - Me.ucrCboFontWeight.IsReadOnly = False - Me.ucrCboFontWeight.Location = New System.Drawing.Point(300, 35) - Me.ucrCboFontWeight.Name = "ucrCboFontWeight" - Me.ucrCboFontWeight.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontWeight.TabIndex = 13 - ' - 'lblFontWeight - ' - Me.lblFontWeight.AutoSize = True - Me.lblFontWeight.Location = New System.Drawing.Point(297, 19) - Me.lblFontWeight.Name = "lblFontWeight" - Me.lblFontWeight.Size = New System.Drawing.Size(44, 13) - Me.lblFontWeight.TabIndex = 14 - Me.lblFontWeight.Text = "Weight:" - ' - 'ucrCboFontStyle - ' - Me.ucrCboFontStyle.AddQuotesIfUnrecognised = True - Me.ucrCboFontStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontStyle.GetSetSelectedIndex = -1 - Me.ucrCboFontStyle.IsReadOnly = False - Me.ucrCboFontStyle.Location = New System.Drawing.Point(154, 35) - Me.ucrCboFontStyle.Name = "ucrCboFontStyle" - Me.ucrCboFontStyle.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontStyle.TabIndex = 7 - ' - 'ucrCboFontFamily - ' - Me.ucrCboFontFamily.AddQuotesIfUnrecognised = True - Me.ucrCboFontFamily.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboFontFamily.GetSetSelectedIndex = -1 - Me.ucrCboFontFamily.IsReadOnly = False - Me.ucrCboFontFamily.Location = New System.Drawing.Point(9, 35) - Me.ucrCboFontFamily.Name = "ucrCboFontFamily" - Me.ucrCboFontFamily.Size = New System.Drawing.Size(137, 21) - Me.ucrCboFontFamily.TabIndex = 5 - ' - 'GroupBox2 - ' - Me.GroupBox2.Controls.Add(Me.lblUnderlineType) - Me.GroupBox2.Controls.Add(Me.ucrCboUnderlineType) - Me.GroupBox2.Controls.Add(Me.ucrCboUnderLineColor) - Me.GroupBox2.Controls.Add(Me.lblUnderlineStyle) - Me.GroupBox2.Controls.Add(Me.ucrCboUnderlineStyle) - Me.GroupBox2.Controls.Add(Me.lblUnderlineColor) - Me.GroupBox2.Location = New System.Drawing.Point(7, 168) - Me.GroupBox2.Name = "GroupBox2" - Me.GroupBox2.Size = New System.Drawing.Size(594, 68) - Me.GroupBox2.TabIndex = 22 - Me.GroupBox2.TabStop = False - Me.GroupBox2.Text = "Underline" - ' - 'lblUnderlineType - ' - Me.lblUnderlineType.AutoSize = True - Me.lblUnderlineType.Location = New System.Drawing.Point(6, 16) - Me.lblUnderlineType.Name = "lblUnderlineType" - Me.lblUnderlineType.Size = New System.Drawing.Size(34, 13) - Me.lblUnderlineType.TabIndex = 21 - Me.lblUnderlineType.Text = "Type:" - ' - 'ucrCboUnderlineType - ' - Me.ucrCboUnderlineType.AddQuotesIfUnrecognised = True - Me.ucrCboUnderlineType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderlineType.GetSetSelectedIndex = -1 - Me.ucrCboUnderlineType.IsReadOnly = False - Me.ucrCboUnderlineType.Location = New System.Drawing.Point(9, 32) - Me.ucrCboUnderlineType.Name = "ucrCboUnderlineType" - Me.ucrCboUnderlineType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderlineType.TabIndex = 20 - ' - 'ucrCboUnderLineColor - ' - Me.ucrCboUnderLineColor.AddQuotesIfUnrecognised = True - Me.ucrCboUnderLineColor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderLineColor.GetSetSelectedIndex = -1 - Me.ucrCboUnderLineColor.IsReadOnly = False - Me.ucrCboUnderLineColor.Location = New System.Drawing.Point(302, 32) - Me.ucrCboUnderLineColor.Name = "ucrCboUnderLineColor" - Me.ucrCboUnderLineColor.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderLineColor.TabIndex = 19 - ' - 'ucrCboUnderlineStyle - ' - Me.ucrCboUnderlineStyle.AddQuotesIfUnrecognised = True - Me.ucrCboUnderlineStyle.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboUnderlineStyle.GetSetSelectedIndex = -1 - Me.ucrCboUnderlineStyle.IsReadOnly = False - Me.ucrCboUnderlineStyle.Location = New System.Drawing.Point(154, 32) - Me.ucrCboUnderlineStyle.Name = "ucrCboUnderlineStyle" - Me.ucrCboUnderlineStyle.Size = New System.Drawing.Size(137, 21) - Me.ucrCboUnderlineStyle.TabIndex = 13 - ' - 'GroupBox3 - ' - Me.GroupBox3.Controls.Add(Me.lblAlignHorizontal) - Me.GroupBox3.Controls.Add(Me.ucrCboAlignHorizontal) - Me.GroupBox3.Enabled = False - Me.GroupBox3.Location = New System.Drawing.Point(7, 250) - Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(594, 65) - Me.GroupBox3.TabIndex = 23 - Me.GroupBox3.TabStop = False - Me.GroupBox3.Text = "Alignment" - ' - 'ucrCboAlignHorizontal - ' - Me.ucrCboAlignHorizontal.AddQuotesIfUnrecognised = True - Me.ucrCboAlignHorizontal.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboAlignHorizontal.GetSetSelectedIndex = -1 - Me.ucrCboAlignHorizontal.IsReadOnly = False - Me.ucrCboAlignHorizontal.Location = New System.Drawing.Point(9, 36) - Me.ucrCboAlignHorizontal.Name = "ucrCboAlignHorizontal" - Me.ucrCboAlignHorizontal.Size = New System.Drawing.Size(137, 21) - Me.ucrCboAlignHorizontal.TabIndex = 17 - ' - 'ucrBaseSubdialog - ' - Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(220, 338) - Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4) - Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" - Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 29) - Me.ucrBaseSubdialog.TabIndex = 4 - ' - 'GroupBox4 - ' - Me.GroupBox4.Controls.Add(Me.ucrCboColorBackground) - Me.GroupBox4.Controls.Add(Me.ucrCboColorText) - Me.GroupBox4.Controls.Add(Me.Label1) - Me.GroupBox4.Controls.Add(Me.Label2) - Me.GroupBox4.Location = New System.Drawing.Point(7, 85) - Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(594, 68) - Me.GroupBox4.TabIndex = 24 - Me.GroupBox4.TabStop = False - Me.GroupBox4.Text = "Colour" - ' - 'ucrCboColorBackground - ' - Me.ucrCboColorBackground.AddQuotesIfUnrecognised = True - Me.ucrCboColorBackground.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboColorBackground.GetSetSelectedIndex = -1 - Me.ucrCboColorBackground.IsReadOnly = False - Me.ucrCboColorBackground.Location = New System.Drawing.Point(157, 37) - Me.ucrCboColorBackground.Name = "ucrCboColorBackground" - Me.ucrCboColorBackground.Size = New System.Drawing.Size(137, 21) - Me.ucrCboColorBackground.TabIndex = 18 - ' - 'ucrCboColorText - ' - Me.ucrCboColorText.AddQuotesIfUnrecognised = True - Me.ucrCboColorText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboColorText.GetSetSelectedIndex = -1 - Me.ucrCboColorText.IsReadOnly = False - Me.ucrCboColorText.Location = New System.Drawing.Point(9, 37) - Me.ucrCboColorText.Name = "ucrCboColorText" - Me.ucrCboColorText.Size = New System.Drawing.Size(137, 21) - Me.ucrCboColorText.TabIndex = 17 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(6, 21) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(31, 13) - Me.Label1.TabIndex = 14 - Me.Label1.Text = "Text:" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(155, 21) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(68, 13) - Me.Label2.TabIndex = 16 - Me.Label2.Text = "Background:" - ' - 'sdgTableOptionsTextFormat - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(608, 372) - Me.Controls.Add(Me.GroupBox4) - Me.Controls.Add(Me.GroupBox3) - Me.Controls.Add(Me.GroupBox2) - Me.Controls.Add(Me.GroupBox1) - Me.Controls.Add(Me.ucrBaseSubdialog) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Name = "sdgTableOptionsTextFormat" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent - Me.Text = "Text Format" - Me.GroupBox1.ResumeLayout(False) - Me.GroupBox1.PerformLayout() - Me.GroupBox2.ResumeLayout(False) - Me.GroupBox2.PerformLayout() - Me.GroupBox3.ResumeLayout(False) - Me.GroupBox3.PerformLayout() - Me.GroupBox4.ResumeLayout(False) - Me.GroupBox4.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue - Friend WithEvents ucrCboFontFamily As ucrInputComboBox - Friend WithEvents lblFontFamily As Label - Friend WithEvents lblFontStyle As Label - Friend WithEvents ucrCboFontStyle As ucrInputComboBox - Friend WithEvents lblFontSize As Label - Friend WithEvents lblUnderlineColor As Label - Friend WithEvents lblUnderlineStyle As Label - Friend WithEvents ucrCboUnderlineStyle As ucrInputComboBox - Friend WithEvents lblAlignHorizontal As Label - Friend WithEvents ucrCboAlignHorizontal As ucrInputComboBox - Friend WithEvents GroupBox1 As GroupBox - Friend WithEvents GroupBox2 As GroupBox - Friend WithEvents GroupBox3 As GroupBox - Friend WithEvents ucrCboFontWeight As ucrInputComboBox - Friend WithEvents lblFontWeight As Label - Friend WithEvents ucrTxtFontSize As ucrInputTextBox - Friend WithEvents GroupBox4 As GroupBox - Friend WithEvents ucrCboColorText As ucrColors - Friend WithEvents Label1 As Label - Friend WithEvents Label2 As Label - Friend WithEvents ucrCboColorBackground As ucrColors - Friend WithEvents ucrCboUnderLineColor As ucrColors - Friend WithEvents lblUnderlineType As Label - Friend WithEvents ucrCboUnderlineType As ucrInputComboBox -End Class diff --git a/instat/UserTables/sdgTableOptionsTextFormat.resx b/instat/UserTables/sdgTableOptionsTextFormat.resx deleted file mode 100644 index 1af7de150c9..00000000000 --- a/instat/UserTables/sdgTableOptionsTextFormat.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/instat/UserTables/sdgTableOptionsTextFormat.vb b/instat/UserTables/sdgTableOptionsTextFormat.vb deleted file mode 100644 index fc16f1b984a..00000000000 --- a/instat/UserTables/sdgTableOptionsTextFormat.vb +++ /dev/null @@ -1,131 +0,0 @@ -Imports instat.Translations -Public Class sdgTableOptionsTextFormat - - Private bFirstload As Boolean = True - - Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load - autoTranslate(Me) - End Sub - - Private Sub InitialiseDialog() - Dim dctFontFamily As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Arial (sans-serif)", Chr(34) & "Arial, sans-serif" & Chr(34)}, - {"Verdana (sans-serif)", Chr(34) & "Verdana, sans-serif" & Chr(34)}, - {"Tahoma", Chr(34) & "Tahoma, sans-serif" & Chr(34)}, - {"Trebuchet MS", Chr(34) & "'Trebuchet MS', sans-serif" & Chr(34)}, - {"Times New Roman (serif)", Chr(34) & "'Times New Roman', serif" & Chr(34)}, - {"Georgia (serif)", Chr(34) & "Georgia, serif" & Chr(34)}, - {"Garamond (serif)", Chr(34) & "Garamond, serif" & Chr(34)} - } - ucrCboFontFamily.SetDropDownStyleAsNonEditable() - ucrCboFontFamily.SetParameter(New RParameter("font.family")) - ucrCboFontFamily.SetItems(dctFontFamily) - ucrCboFontFamily.SetRDefault("NULL") - - Dim dctFontStyle As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Normal", Chr(34) & "normal" & Chr(34)}, - {"Italic", Chr(34) & "italic" & Chr(34)}, - {"Oblique", Chr(34) & "oblique" & Chr(34)} - } - - ucrCboFontStyle.SetDropDownStyleAsNonEditable() - ucrCboFontStyle.SetParameter(New RParameter("font.style")) - ucrCboFontStyle.SetItems(dctFontStyle) - ucrCboFontStyle.SetRDefault("NULL") - - - Dim dctFontWeight As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Normal", Chr(34) & "normal" & Chr(34)}, - {"Lighter", Chr(34) & "lighter" & Chr(34)}, - {"Bold", Chr(34) & "bold" & Chr(34)} - } - - ucrCboFontWeight.SetDropDownStyleAsNonEditable() - ucrCboFontWeight.SetParameter(New RParameter("font.weight")) - ucrCboFontWeight.SetItems(dctFontWeight) - ucrCboFontWeight.SetRDefault("NULL") - - ucrTxtFontSize.SetParameter(New RParameter("font.size")) - ucrTxtFontSize.SetRDefault(Chr(34) & "" & Chr(34)) - - ucrCboColorText.SetDropDownStyleAsNonEditable() - ucrCboColorText.SetParameter(New RParameter("color")) - ucrCboColorText.SetColours() - ucrCboColorText.SetRDefault("NULL") - - ucrCboColorBackground.SetDropDownStyleAsNonEditable() - ucrCboColorBackground.SetParameter(New RParameter("background.color")) - ucrCboColorBackground.SetColours() - ucrCboColorBackground.SetRDefault("NULL") - - Dim dctUnderlineType As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Underline", Chr(34) & "underline" & Chr(34)}, - {"Overline", Chr(34) & "overline" & Chr(34)}, - {"Underline Overline", Chr(34) & "underline overline" & Chr(34)}, - {"Line-through", Chr(34) & "line-through" & Chr(34)} - } - ucrCboUnderlineType.SetDropDownStyleAsNonEditable() - ucrCboUnderlineType.SetParameter(New RParameter("text.decoration.line")) - ucrCboUnderlineType.SetItems(dctUnderlineType) - ucrCboUnderlineType.SetRDefault("NULL") - - Dim dctUnderlineStyle As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Solid", Chr(34) & "solid" & Chr(34)}, - {"Double", Chr(34) & "double" & Chr(34)}, - {"Dotted", Chr(34) & "dotted" & Chr(34)}, - {"Dashed", Chr(34) & "dashed" & Chr(34)}, - {"Wavy", Chr(34) & "wavy" & Chr(34)} - } - ucrCboUnderlineStyle.SetDropDownStyleAsNonEditable() - ucrCboUnderlineStyle.SetParameter(New RParameter("text.decoration.style")) - ucrCboUnderlineStyle.SetItems(dctUnderlineStyle) - ucrCboUnderlineStyle.SetRDefault("NULL") - - ucrCboUnderLineColor.SetDropDownStyleAsNonEditable() - ucrCboUnderLineColor.SetParameter(New RParameter("text.decoration.color")) - ucrCboUnderLineColor.SetColours() - ucrCboUnderLineColor.SetRDefault("NULL") - - - Dim dctAlign As New Dictionary(Of String, String) From { - {"Default", "NULL"}, - {"Center", Chr(34) & "center" & Chr(34)}, - {"Left", Chr(34) & "left" & Chr(34)}, - {"Right", Chr(34) & "right" & Chr(34)}, - {"Justify", Chr(34) & "justify" & Chr(34)} - } - ucrCboAlignHorizontal.SetDropDownStyleAsNonEditable() - ucrCboAlignHorizontal.SetParameter(New RParameter("text.align")) - ucrCboAlignHorizontal.SetItems(dctAlign) - ucrCboAlignHorizontal.SetRDefault("NULL") - - End Sub - - Public Sub Setup(clsNewStyleRFunction As RFunction) - - If bFirstload Then - InitialiseDialog() - bFirstload = False - End If - - ucrCboFontFamily.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboFontStyle.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboFontWeight.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrTxtFontSize.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - - ucrCboColorText.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboColorBackground.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - - ucrCboUnderlineType.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboUnderlineStyle.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrCboUnderLineColor.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - - ucrCboAlignHorizontal.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) - End Sub - -End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 3a6a7b6ed65..a79aa114c8b 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -446,12 +446,6 @@ UserControl - - sdgTableOptionsTextFormat.vb - - - Form - sdgTableOptions.vb @@ -3447,9 +3441,6 @@ ucrRowExpression.vb - - sdgTableOptionsTextFormat.vb - sdgTableOptions.vb From f2b5d3e9f71b9bac3f76395b5a66a5094dbdc2c4 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 8 Aug 2024 13:49:41 +0100 Subject: [PATCH 103/273] Change made --- instat/dlgClimograph.vb | 159 +++++++++++++++++++++++++--------------- 1 file changed, 100 insertions(+), 59 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 42827887f54..59d50540b4f 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -112,7 +112,7 @@ Public Class dlgClimograph Private strTemBar As String = "Tem" Private strRainBar As String = "Rain" Private clsPlus1Operator, clsPlus2Operator, clsPlus3Operator, clsPlus5Operator As New ROperator - Private clsPlus6Operator, clsPlus7Operator, clsPlus8Operator, clsPlus9Operator As New ROperator + Private clsPlus6Operator, clsPlus7Operator, clsPlus8Operator, clsPlus9Operator, clsPlus10Operator, clsPlus11Operator As New ROperator Private clsRainBarFunction, clsTmaxBarFunction, clsTminBarFunction, clsLabsRainFunction, clsLabsTempFunction As New RFunction Private clsRainBarTextFunction, clsTmaxBarTextFunction, clsTminBarTextFunction, clsRainGgplotFunction, clsTemGgplotFunction As New RFunction Private clsAesTmaxBarFunction1, clsAesTminBarFunction1, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction @@ -131,6 +131,7 @@ Public Class dlgClimograph bReset = False TestOKEnabled() autoTranslate(Me) + DialogueSize() End Sub Private Sub InitialiseDialog() @@ -382,6 +383,7 @@ Public Class dlgClimograph ucrSave.SetCheckBoxText("Store Graph") ucrSave.SetDataFrameSelector(ucrSelectorClimograph.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") + DialogueSize() End Sub Private Sub SetDefaults() @@ -482,6 +484,8 @@ Public Class dlgClimograph clsTminRoundFunction = New RFunction clsPlotGridFunction = New RFunction clsGetDataFrameFunction = New RFunction + clsPlus10Operator = New ROperator + clsPlus11Operator = New ROperator ucrSelectorClimograph.Reset() ucrSelectorClimograph.SetGgplotFunction(clsBaseOperator) @@ -733,12 +737,8 @@ Public Class dlgClimograph clsPlus3Operator.AddParameter("right", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=1, bIncludeArgumentName:=False) clsRainGgplotFunction.SetRCommand("ggplot") - 'clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) - 'clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) clsAesRainGgplotFunction.SetRCommand("aes") - 'clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - 'clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) clsRainBarFunction.SetRCommand("geom_bar") clsRainBarFunction.AddParameter("stat", Chr(34) & "identity" & Chr(34), iPosition:=0) @@ -746,12 +746,9 @@ Public Class dlgClimograph clsRainBarFunction.AddParameter("fill", Chr(34) & "purple" & Chr(34), iPosition:=2) clsRainBarTextFunction.SetRCommand("geom_text") - 'clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - 'clsRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) clsRainBarTextFunction.AddParameter("size", "3", iPosition:=2) clsRainRoundFunction.SetRCommand("round") - 'clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsRainRoundFunction.AddParameter("y", "1", bIncludeArgumentName:=False) clsAesRainBarTextFunction.SetRCommand("aes") @@ -775,6 +772,10 @@ Public Class dlgClimograph clsPlus9Operator.SetOperation("+") + clsPlus10Operator.SetOperation("+") + + clsPlus11Operator.SetOperation("+") + clsTemGgplotFunction.SetRCommand("ggplot") clsAesTemGgplotFunction.SetRCommand("aes") @@ -840,8 +841,6 @@ Public Class dlgClimograph clsAnnotateFunction = GgplotDefaults.clsAnnotateFunction clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") - 'clsGetDataFrameFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.strCurrentDataFrame & Chr(34), iPosition:=0, bIncludeArgumentName:=False) - 'clsGetDataFrameFunction.SetAssignTo(ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text) clsGetObjectDataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_object_data") clsGetObjectDataFunction.AddParameter("data_name", Chr(34) & ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) @@ -855,12 +854,7 @@ Public Class dlgClimograph End Sub Private Sub SetRCodeForControls(bReset) - 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) - 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) - 'ucrSelectorClimograph.AddAdditionalCodeParameterPair(clsGgwalterliethFunction, New RParameter("data", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) - ucrReceiverRainC.SetRCode(clsMaxFunction, bReset) - 'ucrSelectorClimograph.SetRCode(clsRggplotFunction, bReset) ucrReceiverMonth.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverRain.SetRCode(clsGgwalterliethFunction, bReset) ucrReceiverMintemp.SetRCode(clsGgwalterliethFunction, bReset) @@ -872,7 +866,6 @@ Public Class dlgClimograph If bReset Then ucrReceiverElement2.SetRCode(clsVectorFunction, bReset) ucrReceiverElement1.SetRCode(clsVectorFunction, bReset) - 'ucrReceiverMonthC.SetRCode(clsBarAesFunction, bReset) ucrPnlClimograph.SetRCode(clsDummyFunction, bReset) ucrChkRibbon.SetRCode(clsGeomRibbonFunction, bReset) ucrChkTile.SetRCode(clsGeomTileFunction, bReset) @@ -895,7 +888,9 @@ Public Class dlgClimograph End Sub Private Sub ucrPnlClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlValueChanged + DialogueSize() If rdoClimograph.Checked Then + cmdOptions.Visible = True ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus1Operator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus5Operator) clsBaseOperator.RemoveParameterByName("ggwalter_lieth") @@ -903,6 +898,7 @@ Public Class dlgClimograph clsBaseOperator.AddParameter("ggplot", clsRFunctionParameter:=clsRggplotFunction, iPosition:=0) clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) ElseIf rdoWalterLieth.Checked Then + cmdOptions.Visible = False ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus1Operator) ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus5Operator) clsBaseOperator.RemoveParameterByName("ggplot") @@ -911,9 +907,12 @@ Public Class dlgClimograph clsGgwalterliethFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) Else + cmdOptions.Visible = False clsBaseOperator.RemoveParameterByName("ggwalter_lieth") clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("facets") + clsBaseOperator.RemoveParameterByName("facets1") clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) @@ -976,8 +975,6 @@ Public Class dlgClimograph If clsParam.strArgumentName = "x" Then If clsParam.strArgumentValue = Chr(34) & Chr(34) Then ucrReceiverMonthC.Clear() - Else - 'ucrReceiverMonthC.Add(clsParam.strArgumentValue) End If 'In the y case, the value stored in the clsReasFunction in the multiple variables ' case is "value", however that one shouldn't be written in the multiple @@ -994,8 +991,6 @@ Public Class dlgClimograph Else ucrReceiverRainC.Add(clsParam.strArgumentValue) End If - 'ElseIf clsParam.strArgumentName = "fill" Then - ' ucrReceiverMonthC.Add(clsParam.strArgumentValue) End If Next TestOKEnabled() @@ -1102,6 +1097,8 @@ Public Class dlgClimograph Else clsBaseOperator.RemoveParameterByName("facets") End If + ElseIf rdoClimateBars.Checked Then + AddRemoveTemBars() Else clsBaseOperator.RemoveParameterByName("facets") End If @@ -1110,6 +1107,7 @@ Public Class dlgClimograph AddRemoveFacetClimograph() AddRemoveFacets1() AddRemoveGroupBy1() + 'AddRemoveTemBars() End Sub Private Sub GetParameterValue1(clsOperator As ROperator) @@ -1355,7 +1353,6 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmax() EnableTileAndRibbon() - AddRemoveTemBars() End Sub Private Sub AddRemoveTheme() @@ -1620,7 +1617,6 @@ Public Class dlgClimograph AddRemoveGeomRibbon() AddRemoveGeomTextTmin() AddRemoveGeomTextTmax() - AddRemoveTemBars() End Sub Private Sub ucrReceiverMonthC_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMonthC.ControlValueChanged @@ -1631,7 +1627,6 @@ Public Class dlgClimograph End If AddRemoveGeomRibbon() AddRemoveGeomBar() - AddRemoveTemBars() End Sub Private Sub ucrSelectorClimograph_DataFrameChanged() Handles ucrSelectorClimograph.DataFrameChanged @@ -1688,19 +1683,67 @@ Public Class dlgClimograph clsBaseOperator.RemoveParameterByName("geom_ribbon") clsBaseOperator.RemoveParameterByName("scale_x_discrete") clsBaseOperator.RemoveParameterByName("scale_y_continuous") - If ucrReceiverRainC.IsEmpty Then - clsAesTmaxBarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsAesTminBarFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsGeomBarTmaxFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction, iPosition:=0) - clsGeomBarTminFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction, iPosition:=0) - clsBaseOperator.AddParameter("geom_bar1", clsRFunctionParameter:=clsGeomBarTmaxFunction, iPosition:=1) - clsBaseOperator.AddParameter("geom_bar2", clsRFunctionParameter:=clsGeomBarTminFunction, iPosition:=2) + clsBaseOperator.RemoveParameterByName("facets") + clsBaseOperator.RemoveParameterByName("facets1") + If Not ucrReceiverFacet.IsEmpty Then + clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthBar.GetVariableNames(False), iPosition:=0) + clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainBar.GetVariableNames(False), iPosition:=1) + clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsRainRoundFunction.AddParameter("x", ucrReceiverRainBar.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) + clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsPlus10Operator.AddParameter("left", clsRFunctionParameter:=clsLabsRainFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus10Operator.AddParameter("right", clsRFunctionParameter:=clsFacetFunction1, iPosition:=1, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus3Operator.AddParameter("right", clsROperatorParameter:=clsPlus10Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus2Operator.AddParameter("right", clsROperatorParameter:=clsPlus3Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) + + clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthBar.GetVariableNames(False), iPosition:=0) + clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) + clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) + + clsAesTmaxBarFunction1.AddParameter("y", ucrReceiverElement1Bar.GetVariableNames(False), iPosition:=0) + clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction1, iPosition:=0, bIncludeArgumentName:=False) + + clsAesTminBarFunction1.AddParameter("y", "-" & ucrReceiverElement2Bar.GetVariableNames(False), iPosition:=0) + clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction1, iPosition:=0, bIncludeArgumentName:=False) + + clsTmaxRoundFunction.AddParameter("x", ucrReceiverElement1Bar.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTmaxBarTextFunction.AddParameter("y", ucrReceiverElement1Bar.GetVariableNames(False), iPosition:=0) + clsAesTmaxBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTmaxRoundFunction, iPosition:=1) + clsTmaxBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsTminRoundFunction.AddParameter("x", ucrReceiverElement2Bar.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTminBarTextFunction.AddParameter("y", "-" & ucrReceiverElement2Bar.GetVariableNames(False), iPosition:=0) + clsAesTminBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTminRoundFunction, iPosition:=1) + clsTminBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsPlus11Operator.AddParameter("left", clsRFunctionParameter:=clsLabsTempFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus11Operator.AddParameter("right", clsRFunctionParameter:=clsFacetFunction1, iPosition:=1, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus9Operator.AddParameter("right", clsROperatorParameter:=clsPlus11Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus8Operator.AddParameter("right", clsROperatorParameter:=clsPlus9Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus7Operator.AddParameter("right", clsROperatorParameter:=clsPlus8Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("left", clsRFunctionParameter:=clsTmaxBarFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) + Else - clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=1) + clsAesRainGgplotFunction.AddParameter("x", ucrReceiverMonthBar.GetVariableNames(False), iPosition:=0) + clsAesRainGgplotFunction.AddParameter("y", ucrReceiverRainBar.GetVariableNames(False), iPosition:=1) clsRainGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsRainGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) - clsRainRoundFunction.AddParameter("x", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsRainRoundFunction.AddParameter("x", ucrReceiverRainBar.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsAesRainBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsRainRoundFunction, iPosition:=0) clsRainBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus3Operator.AddParameter("left", clsRFunctionParameter:=clsRainBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) @@ -1710,23 +1753,23 @@ Public Class dlgClimograph clsPlus1Operator.AddParameter("left", clsRFunctionParameter:=clsRainGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus1Operator.AddParameter("right", clsROperatorParameter:=clsPlus2Operator, iPosition:=1, bIncludeArgumentName:=False) - clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsAesTemGgplotFunction.AddParameter("x", ucrReceiverMonthBar.GetVariableNames(False), iPosition:=0) clsTemGgplotFunction.AddParameter("data", ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, iPosition:=0) clsTemGgplotFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTemGgplotFunction, iPosition:=1, bIncludeArgumentName:=False) - clsAesTmaxBarFunction1.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsAesTmaxBarFunction1.AddParameter("y", ucrReceiverElement1Bar.GetVariableNames(False), iPosition:=0) clsTmaxBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarFunction1, iPosition:=0, bIncludeArgumentName:=False) - clsAesTminBarFunction1.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesTminBarFunction1.AddParameter("y", "-" & ucrReceiverElement2Bar.GetVariableNames(False), iPosition:=0) clsTminBarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarFunction1, iPosition:=0, bIncludeArgumentName:=False) - clsTmaxRoundFunction.AddParameter("x", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesTmaxBarTextFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsTmaxRoundFunction.AddParameter("x", ucrReceiverElement1Bar.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTmaxBarTextFunction.AddParameter("y", ucrReceiverElement1Bar.GetVariableNames(False), iPosition:=0) clsAesTmaxBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTmaxRoundFunction, iPosition:=1) clsTmaxBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTmaxBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) - clsTminRoundFunction.AddParameter("x", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesTminBarTextFunction.AddParameter("y", "-" & ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsTminRoundFunction.AddParameter("x", ucrReceiverElement2Bar.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesTminBarTextFunction.AddParameter("y", "-" & ucrReceiverElement2Bar.GetVariableNames(False), iPosition:=0) clsAesTminBarTextFunction.AddParameter("label", clsRFunctionParameter:=clsTminRoundFunction, iPosition:=1) clsTminBarTextFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus9Operator.AddParameter("left", clsRFunctionParameter:=clsTminBarTextFunction, iPosition:=0, bIncludeArgumentName:=False) @@ -1739,31 +1782,13 @@ Public Class dlgClimograph clsPlus6Operator.AddParameter("right", clsROperatorParameter:=clsPlus7Operator, iPosition:=1, bIncludeArgumentName:=False) clsPlus5Operator.AddParameter("left", clsRFunctionParameter:=clsTemGgplotFunction, iPosition:=0, bIncludeArgumentName:=False) clsPlus5Operator.AddParameter("right", clsROperatorParameter:=clsPlus6Operator, iPosition:=1, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) End If Else - clsBaseOperator.RemoveParameterByName("geom_bar1") - clsBaseOperator.RemoveParameterByName("geom_bar2") clsBaseOperator.RemoveParameterByName("plot_grid") End If End Sub - 'Private Sub ChangeBaseOperator() - ' If rdoClimograph.Checked Then - ' clsBaseOperator.RemoveParameterByName("ggplot") - ' clsBaseOperator.RemoveParameterByName("geom_bar") - ' clsBaseOperator.RemoveParameterByName("plot_grid") - ' clsBaseOperator.RemoveParameterByName("ggwalter_lieth") - ' clsBaseOperator.AddParameter("plot_grid", clsRFunctionParameter:=clsPlotGridFunction, iPosition:=0) - ' ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus1Operator, iPosition:=1) - ' ucrBase.clsRsyntax.AddToBeforeCodes(clsPlus5Operator, iPosition:=2) - ' Else - ' clsBaseOperator.AddParameter("ggwalter_lieth", clsRFunctionParameter:=clsGgwalterliethFunction, iPosition:=0) - ' clsBaseOperator.RemoveParameterByName("ggplot") - ' clsBaseOperator.RemoveParameterByName("geom_bar") - ' clsBaseOperator.RemoveParameterByName("plot_grid") - ' End If - 'End Sub - Private Sub ucrSave_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSave.ControlValueChanged If ucrSave.ucrChkSave.Checked Then clsGetObjectDataFunction.AddParameter("object_name", Chr(34) & ucrSave.GetText & Chr(34), iPosition:=1) @@ -1776,7 +1801,23 @@ Public Class dlgClimograph AddRemoveGeomBar() End Sub + Private Sub DialogueSize() + If rdoClimograph.Checked Then + Me.Size = New Size(488, 617) + Me.ucrSave.Location = New Point(14, 493) + Me.ucrBase.Location = New Point(12, 520) + Else + Me.Size = New Size(488, 417) + Me.ucrSave.Location = New Point(14, 293) + Me.ucrBase.Location = New Point(12, 320) + End If + End Sub + Private Sub AllControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlContentsChanged, ucrReceiverRain.ControlContentsChanged, ucrReceiverAbsolute.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrReceiverMaxtem.ControlContentsChanged, ucrReceiverMintemp.ControlContentsChanged, ucrSave.ControlContentsChanged, ucrReceiverElement1.ControlContentsChanged, ucrReceiverElement2.ControlContentsChanged, ucrReceiverMonthC.ControlContentsChanged, ucrReceiverRainC.ControlContentsChanged, ucrReceiverElement1Bar.ControlContentsChanged, ucrReceiverElement2Bar.ControlContentsChanged, ucrReceiverMonthBar.ControlContentsChanged, ucrReceiverRainBar.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrReceiverElement1Bar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement1Bar.ControlValueChanged, ucrReceiverMonthBar.ControlValueChanged, ucrReceiverRainBar.ControlValueChanged, ucrReceiverElement2Bar.ControlValueChanged + AddRemoveTemBars() + End Sub End Class \ No newline at end of file From a8b3d3a02d2fbb363359e2ad1f2800072144c612 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 9 Aug 2024 09:33:18 +0300 Subject: [PATCH 104/273] changes to the code --- instat/dlgPICSACrops.vb | 94 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 84 insertions(+), 10 deletions(-) diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index 5b4f2e2185f..a4ac63c7ba1 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -269,12 +269,36 @@ Public Class dlgPICSACrops End Sub Private Sub PlantingDaysParam() + 'If ucrInputPlantingDates.IsEmpty Then + ' clsSequencePlantingFunction.RemoveParameterByName("plant") + ' clsCropsFunction.RemoveParameterByName("plant_days") + 'Else + ' clsSequencePlantingFunction.AddParameter("plant", ucrInputPlantingDates.GetText(), iPosition:=5, bIncludeArgumentName:=False) + ' clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + 'End If If ucrInputPlantingDates.IsEmpty Then clsSequencePlantingFunction.RemoveParameterByName("plant") clsCropsFunction.RemoveParameterByName("plant_days") Else - clsSequencePlantingFunction.AddParameter("plant", ucrInputPlantingDates.GetText(), iPosition:=5, bIncludeArgumentName:=False) - clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + Dim plantingDates As String() = ucrInputPlantingDates.GetText().Split(","c) + + If plantingDates.Length = 3 Then + Dim first As Integer = Integer.Parse(plantingDates(0).Trim()) + Dim second As Integer = Integer.Parse(plantingDates(1).Trim()) + Dim third As Integer = Integer.Parse(plantingDates(2).Trim()) + + If third < second Then + ' Assume a sequence and run the sequence function + clsSequencePlantingFunction.AddParameter("plant", ucrInputPlantingDates.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + Else + ' List the values as provided + clsCropsFunction.AddParameter("plant_days", ucrInputPlantingDates.GetText(), iPosition:=5) + End If + Else + ' List the values as provided + clsCropsFunction.AddParameter("plant_days", ucrInputPlantingDates.GetText(), iPosition:=5) + End If End If End Sub @@ -292,12 +316,37 @@ Public Class dlgPICSACrops End Sub Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged + 'If ucrInputCropLengths.IsEmpty Then + ' clsCropsFunction.RemoveParameterByName("plant_lengths") + ' clsSequenceFunction.RemoveParameterByName("lengths") + 'Else + ' clsSequenceFunction.AddParameter("lengths", ucrInputCropLengths.GetText(), iPosition:=6, bIncludeArgumentName:=False) + ' clsCropsFunction.AddParameter("plant_lengths", clsRFunctionParameter:=clsSequenceFunction, iPosition:=6) + 'End If + If ucrInputCropLengths.IsEmpty Then - clsCropsFunction.RemoveParameterByName("plant_lengths") - clsSequenceFunction.RemoveParameterByName("lengths") + clsSequencePlantingFunction.RemoveParameterByName("plant") + clsCropsFunction.RemoveParameterByName("plant_days") Else - clsSequenceFunction.AddParameter("lengths", ucrInputCropLengths.GetText(), iPosition:=6, bIncludeArgumentName:=False) - clsCropsFunction.AddParameter("plant_lengths", clsRFunctionParameter:=clsSequenceFunction, iPosition:=6) + Dim plantingDates As String() = ucrInputCropLengths.GetText().Split(","c) + + If plantingDates.Length = 3 Then + Dim first As Integer = Integer.Parse(plantingDates(0).Trim()) + Dim second As Integer = Integer.Parse(plantingDates(1).Trim()) + Dim third As Integer = Integer.Parse(plantingDates(2).Trim()) + + If third < second Then + ' Assume a sequence and run the sequence function + clsSequencePlantingFunction.AddParameter("plant", ucrInputCropLengths.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + Else + ' List the values as provided + clsCropsFunction.AddParameter("plant_days", ucrInputCropLengths.GetText(), iPosition:=5) + End If + Else + ' List the values as provided + clsCropsFunction.AddParameter("plant_days", ucrInputCropLengths.GetText(), iPosition:=5) + End If End If End Sub @@ -306,12 +355,37 @@ Public Class dlgPICSACrops End Sub Private Sub ucrInputWaterAmounts_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputWaterAmounts.ControlValueChanged + 'If ucrInputWaterAmounts.IsEmpty Then + ' clsCropsFunction.RemoveParameterByName("rain_totals") + ' clsSequencewaterFunction.RemoveParameterByName("totals") + 'Else + ' clsSequencewaterFunction.AddParameter("totals", ucrInputWaterAmounts.GetText(), iPosition:=7, bIncludeArgumentName:=False) + ' clsCropsFunction.AddParameter("rain_totals", clsRFunctionParameter:=clsSequencewaterFunction, iPosition:=7) + 'End If + If ucrInputWaterAmounts.IsEmpty Then - clsCropsFunction.RemoveParameterByName("rain_totals") - clsSequencewaterFunction.RemoveParameterByName("totals") + clsSequencePlantingFunction.RemoveParameterByName("plant") + clsCropsFunction.RemoveParameterByName("plant_days") Else - clsSequencewaterFunction.AddParameter("totals", ucrInputWaterAmounts.GetText(), iPosition:=7, bIncludeArgumentName:=False) - clsCropsFunction.AddParameter("rain_totals", clsRFunctionParameter:=clsSequencewaterFunction, iPosition:=7) + Dim plantingDates As String() = ucrInputWaterAmounts.GetText().Split(","c) + + If plantingDates.Length = 3 Then + Dim first As Integer = Integer.Parse(plantingDates(0).Trim()) + Dim second As Integer = Integer.Parse(plantingDates(1).Trim()) + Dim third As Integer = Integer.Parse(plantingDates(2).Trim()) + + If third < second Then + ' Assume a sequence and run the sequence function + clsSequencePlantingFunction.AddParameter("plant", ucrInputWaterAmounts.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + Else + ' List the values as provided + clsCropsFunction.AddParameter("plant_days", ucrInputWaterAmounts.GetText(), iPosition:=5) + End If + Else + ' List the values as provided + clsCropsFunction.AddParameter("plant_days", ucrInputWaterAmounts.GetText(), iPosition:=5) + End If End If End Sub End Class \ No newline at end of file From 39e5917dc95d1b388dbc16c238446be02cb62306 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 9 Aug 2024 13:22:25 +0300 Subject: [PATCH 105/273] changes to the code --- instat/dlgPICSACrops.Designer.vb | 38 ++++++++--------- instat/dlgPICSACrops.vb | 71 ++++++++++++-------------------- 2 files changed, 46 insertions(+), 63 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index 341be114e8b..14c3d80dd14 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -207,7 +207,7 @@ Partial Class dlgPICSACrops Me.ucrInputCropLengths.GetSetSelectedIndex = -1 Me.ucrInputCropLengths.IsReadOnly = False Me.ucrInputCropLengths.Location = New System.Drawing.Point(120, 129) - Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputCropLengths.Name = "ucrInputCropLengths" Me.ucrInputCropLengths.Size = New System.Drawing.Size(137, 21) Me.ucrInputCropLengths.TabIndex = 55 @@ -219,7 +219,7 @@ Partial Class dlgPICSACrops Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 Me.ucrInputWaterAmounts.IsReadOnly = False Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(121, 92) - Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(137, 21) Me.ucrInputWaterAmounts.TabIndex = 40 @@ -231,7 +231,7 @@ Partial Class dlgPICSACrops Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 Me.ucrInputPlantingDates.IsReadOnly = False Me.ucrInputPlantingDates.Location = New System.Drawing.Point(121, 58) - Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" Me.ucrInputPlantingDates.Size = New System.Drawing.Size(137, 21) Me.ucrInputPlantingDates.TabIndex = 53 @@ -239,37 +239,37 @@ Partial Class dlgPICSACrops 'rdoBoth ' Me.rdoBoth.AutoSize = True - Me.rdoBoth.Location = New System.Drawing.Point(165, 25) - Me.rdoBoth.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.rdoBoth.Location = New System.Drawing.Point(195, 25) + Me.rdoBoth.Margin = New System.Windows.Forms.Padding(2) Me.rdoBoth.Name = "rdoBoth" - Me.rdoBoth.Size = New System.Drawing.Size(47, 17) + Me.rdoBoth.Size = New System.Drawing.Size(58, 17) Me.rdoBoth.TabIndex = 44 Me.rdoBoth.TabStop = True - Me.rdoBoth.Text = "Both" + Me.rdoBoth.Text = "O Both" Me.rdoBoth.UseVisualStyleBackColor = True ' 'rdoNo ' Me.rdoNo.AutoSize = True - Me.rdoNo.Location = New System.Drawing.Point(117, 25) - Me.rdoNo.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.rdoNo.Location = New System.Drawing.Point(137, 25) + Me.rdoNo.Margin = New System.Windows.Forms.Padding(2) Me.rdoNo.Name = "rdoNo" - Me.rdoNo.Size = New System.Drawing.Size(39, 17) + Me.rdoNo.Size = New System.Drawing.Size(50, 17) Me.rdoNo.TabIndex = 45 Me.rdoNo.TabStop = True - Me.rdoNo.Text = "No" + Me.rdoNo.Text = "O No" Me.rdoNo.UseVisualStyleBackColor = True ' 'rdoYes ' Me.rdoYes.AutoSize = True Me.rdoYes.Location = New System.Drawing.Point(13, 25) - Me.rdoYes.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) + Me.rdoYes.Margin = New System.Windows.Forms.Padding(2) Me.rdoYes.Name = "rdoYes" - Me.rdoYes.Size = New System.Drawing.Size(102, 17) + Me.rdoYes.Size = New System.Drawing.Size(120, 17) Me.rdoYes.TabIndex = 43 Me.rdoYes.TabStop = True - Me.rdoYes.Text = "Start Check:Yes" + Me.rdoYes.Text = "Include Start: O Yes" Me.rdoYes.UseVisualStyleBackColor = True ' 'lblPlantingDays @@ -303,9 +303,9 @@ Partial Class dlgPICSACrops ' Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlStartCheck.Location = New System.Drawing.Point(9, 17) - Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlStartCheck.Name = "ucrPnlStartCheck" - Me.ucrPnlStartCheck.Size = New System.Drawing.Size(236, 37) + Me.ucrPnlStartCheck.Size = New System.Drawing.Size(248, 37) Me.ucrPnlStartCheck.TabIndex = 46 ' 'ucrChkDataProp @@ -313,7 +313,7 @@ Partial Class dlgPICSACrops Me.ucrChkDataProp.AutoSize = True Me.ucrChkDataProp.Checked = False Me.ucrChkDataProp.Location = New System.Drawing.Point(10, 358) - Me.ucrChkDataProp.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDataProp.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkDataProp.Name = "ucrChkDataProp" Me.ucrChkDataProp.Size = New System.Drawing.Size(172, 23) Me.ucrChkDataProp.TabIndex = 37 @@ -323,7 +323,7 @@ Partial Class dlgPICSACrops Me.ucrChkPrintDataProp.AutoSize = True Me.ucrChkPrintDataProp.Checked = False Me.ucrChkPrintDataProp.Location = New System.Drawing.Point(188, 358) - Me.ucrChkPrintDataProp.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkPrintDataProp.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkPrintDataProp.Name = "ucrChkPrintDataProp" Me.ucrChkPrintDataProp.Size = New System.Drawing.Size(255, 23) Me.ucrChkPrintDataProp.TabIndex = 36 @@ -397,7 +397,7 @@ Partial Class dlgPICSACrops Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(10, 392) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 0 diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index a4ac63c7ba1..ecb80facc7a 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -101,21 +101,24 @@ Public Class dlgPICSACrops ucrPnlStartCheck.AddParameterValuesCondition(rdoBoth, "check", "both") ucrInputPlantingDates.SetParameter(New RParameter("plant_days", 5)) - ucrInputPlantingDates.SetItems({"0,30,5", "80, 120, 10", "92, 152, 30", "300,370,5"}) - ucrInputPlantingDates.AddQuotesIfUnrecognised = False ucrInputPlantingDates.SetValidationTypeAsNumericList() + ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153", "300, 370, 5"}) + ucrInputPlantingDates.AddQuotesIfUnrecognised = False + ucrInputPlantingDates.bAllowNonConditionValues = True 'Planting Length ucrInputCropLengths.SetParameter(New RParameter("plant_lengths", 6)) - ucrInputCropLengths.SetItems({"0,30,5", "50,220,5", "60,160,5", "70,220,5"}) - ucrInputCropLengths.AddQuotesIfUnrecognised = False ucrInputCropLengths.SetValidationTypeAsNumericList() + ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180", "50, 220, 5", "60, 160, 5"}) + ucrInputCropLengths.AddQuotesIfUnrecognised = False + ucrInputCropLengths.bAllowNonConditionValues = True 'Water amount ucrInputWaterAmounts.SetParameter(New RParameter("rain_totals", 7)) - ucrInputWaterAmounts.SetItems({"0,125, 5", "200,675,25", "200,750,5", "0,750,25"}) - ucrInputWaterAmounts.AddQuotesIfUnrecognised = False ucrInputWaterAmounts.SetValidationTypeAsNumericList() + ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700", "200, 750, 25", "200, 675, 25"}) + ucrInputWaterAmounts.AddQuotesIfUnrecognised = False + ucrInputWaterAmounts.bAllowNonConditionValues = True 'Planting Date Panel 'ucrPnlPlantingDate.SetParameter(New RParameter("planting_days", clsCropsFunction, 5)) @@ -205,9 +208,9 @@ Public Class dlgPICSACrops ' Temp disabled until list working correctly - ucrInputPlantingDates.SetName("0,30,5") - ucrInputCropLengths.SetName("0,30,5") - ucrInputWaterAmounts.SetName("0,125, 5") + ucrInputPlantingDates.SetName("120") + ucrInputCropLengths.SetName("120") + ucrInputWaterAmounts.SetName("600") clsCropsFunction.AddParameter("definition_props", "TRUE", iPosition:=11) clsCropsFunction.AddParameter("print_table", "TRUE", iPosition:=12) ucrBase.clsRsyntax.SetBaseRFunction(clsCropsFunction) @@ -269,13 +272,6 @@ Public Class dlgPICSACrops End Sub Private Sub PlantingDaysParam() - 'If ucrInputPlantingDates.IsEmpty Then - ' clsSequencePlantingFunction.RemoveParameterByName("plant") - ' clsCropsFunction.RemoveParameterByName("plant_days") - 'Else - ' clsSequencePlantingFunction.AddParameter("plant", ucrInputPlantingDates.GetText(), iPosition:=5, bIncludeArgumentName:=False) - ' clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) - 'End If If ucrInputPlantingDates.IsEmpty Then clsSequencePlantingFunction.RemoveParameterByName("plant") clsCropsFunction.RemoveParameterByName("plant_days") @@ -293,11 +289,11 @@ Public Class dlgPICSACrops clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", ucrInputPlantingDates.GetText(), iPosition:=5) + clsCropsFunction.AddParameter("plant_days", "c(" & ucrInputPlantingDates.GetText() & ")", iPosition:=5) End If Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", ucrInputPlantingDates.GetText(), iPosition:=5) + clsCropsFunction.AddParameter("plant_days", "c(" & ucrInputPlantingDates.GetText() & ")", iPosition:=5) End If End If End Sub @@ -316,17 +312,10 @@ Public Class dlgPICSACrops End Sub Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged - 'If ucrInputCropLengths.IsEmpty Then - ' clsCropsFunction.RemoveParameterByName("plant_lengths") - ' clsSequenceFunction.RemoveParameterByName("lengths") - 'Else - ' clsSequenceFunction.AddParameter("lengths", ucrInputCropLengths.GetText(), iPosition:=6, bIncludeArgumentName:=False) - ' clsCropsFunction.AddParameter("plant_lengths", clsRFunctionParameter:=clsSequenceFunction, iPosition:=6) - 'End If If ucrInputCropLengths.IsEmpty Then - clsSequencePlantingFunction.RemoveParameterByName("plant") - clsCropsFunction.RemoveParameterByName("plant_days") + clsSequenceFunction.RemoveParameterByName("plant") + clsCropsFunction.RemoveParameterByName("plant_lengths") Else Dim plantingDates As String() = ucrInputCropLengths.GetText().Split(","c) @@ -337,15 +326,15 @@ Public Class dlgPICSACrops If third < second Then ' Assume a sequence and run the sequence function - clsSequencePlantingFunction.AddParameter("plant", ucrInputCropLengths.GetText(), iPosition:=5, bIncludeArgumentName:=False) - clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + clsSequenceFunction.AddParameter("plant", ucrInputCropLengths.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("plant_lengths", clsRFunctionParameter:=clsSequenceFunction) Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", ucrInputCropLengths.GetText(), iPosition:=5) + clsCropsFunction.AddParameter("plant_lengths", "c(" & ucrInputCropLengths.GetText() & ")", iPosition:=6) End If Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", ucrInputCropLengths.GetText(), iPosition:=5) + clsCropsFunction.AddParameter("plant_lengths", "c(" & ucrInputCropLengths.GetText() & ")", iPosition:=6) End If End If End Sub @@ -355,17 +344,10 @@ Public Class dlgPICSACrops End Sub Private Sub ucrInputWaterAmounts_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputWaterAmounts.ControlValueChanged - 'If ucrInputWaterAmounts.IsEmpty Then - ' clsCropsFunction.RemoveParameterByName("rain_totals") - ' clsSequencewaterFunction.RemoveParameterByName("totals") - 'Else - ' clsSequencewaterFunction.AddParameter("totals", ucrInputWaterAmounts.GetText(), iPosition:=7, bIncludeArgumentName:=False) - ' clsCropsFunction.AddParameter("rain_totals", clsRFunctionParameter:=clsSequencewaterFunction, iPosition:=7) - 'End If If ucrInputWaterAmounts.IsEmpty Then - clsSequencePlantingFunction.RemoveParameterByName("plant") - clsCropsFunction.RemoveParameterByName("plant_days") + clsCropsFunction.RemoveParameterByName("rain_totals") + clsSequencewaterFunction.RemoveParameterByName("totals") Else Dim plantingDates As String() = ucrInputWaterAmounts.GetText().Split(","c) @@ -376,16 +358,17 @@ Public Class dlgPICSACrops If third < second Then ' Assume a sequence and run the sequence function - clsSequencePlantingFunction.AddParameter("plant", ucrInputWaterAmounts.GetText(), iPosition:=5, bIncludeArgumentName:=False) - clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) + clsSequencewaterFunction.AddParameter("totals", ucrInputWaterAmounts.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsCropsFunction.AddParameter("rain_totals", clsRFunctionParameter:=clsSequencewaterFunction) Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", ucrInputWaterAmounts.GetText(), iPosition:=5) + clsCropsFunction.AddParameter("rain_totals", "c(" & ucrInputWaterAmounts.GetText() & ")", iPosition:=7) End If Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", ucrInputWaterAmounts.GetText(), iPosition:=5) + clsCropsFunction.AddParameter("rain_totals", "c(" & ucrInputWaterAmounts.GetText() & ")", iPosition:=7) End If End If End Sub + End Class \ No newline at end of file From ea8870e71d36b97c723e33fbde4f14cbb8375f3f Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 9 Aug 2024 13:26:19 +0300 Subject: [PATCH 106/273] changes --- instat/dlgPICSACrops.vb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index ecb80facc7a..20bb231f79e 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -88,11 +88,6 @@ Public Class dlgPICSACrops ucrReceiverEnd.SetDataType("numeric") ucrReceiverEnd.bAttachedToPrimaryDataFrame = False - 'Planting date - 'ucrChkRequirePlantingDays.SetText("Require start day before planting day") - 'ucrChkRequirePlantingDays.SetParameter(New RParameter("start_check", 10), bNewChangeParameterValue:=True, strNewValueIfChecked:="TRUE", strNewValueIfUnchecked:="FALSE") - 'ucrChkRequirePlantingDays.SetRDefault("TRUE") - ucrPnlStartCheck.AddRadioButton(rdoYes) ucrPnlStartCheck.AddRadioButton(rdoNo) ucrPnlStartCheck.AddRadioButton(rdoBoth) From 9548bef8d835857f05f50208990e665e0386fabe Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 12 Aug 2024 10:51:08 +0300 Subject: [PATCH 107/273] changes to the code --- instat/dlgPICSACrops.Designer.vb | 12 ++++++------ instat/dlgPICSACrops.vb | 13 +++++-------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index 14c3d80dd14..95cb89faef0 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -242,10 +242,10 @@ Partial Class dlgPICSACrops Me.rdoBoth.Location = New System.Drawing.Point(195, 25) Me.rdoBoth.Margin = New System.Windows.Forms.Padding(2) Me.rdoBoth.Name = "rdoBoth" - Me.rdoBoth.Size = New System.Drawing.Size(58, 17) + Me.rdoBoth.Size = New System.Drawing.Size(47, 17) Me.rdoBoth.TabIndex = 44 Me.rdoBoth.TabStop = True - Me.rdoBoth.Text = "O Both" + Me.rdoBoth.Text = "Both" Me.rdoBoth.UseVisualStyleBackColor = True ' 'rdoNo @@ -254,10 +254,10 @@ Partial Class dlgPICSACrops Me.rdoNo.Location = New System.Drawing.Point(137, 25) Me.rdoNo.Margin = New System.Windows.Forms.Padding(2) Me.rdoNo.Name = "rdoNo" - Me.rdoNo.Size = New System.Drawing.Size(50, 17) + Me.rdoNo.Size = New System.Drawing.Size(39, 17) Me.rdoNo.TabIndex = 45 Me.rdoNo.TabStop = True - Me.rdoNo.Text = "O No" + Me.rdoNo.Text = "No" Me.rdoNo.UseVisualStyleBackColor = True ' 'rdoYes @@ -266,10 +266,10 @@ Partial Class dlgPICSACrops Me.rdoYes.Location = New System.Drawing.Point(13, 25) Me.rdoYes.Margin = New System.Windows.Forms.Padding(2) Me.rdoYes.Name = "rdoYes" - Me.rdoYes.Size = New System.Drawing.Size(120, 17) + Me.rdoYes.Size = New System.Drawing.Size(109, 17) Me.rdoYes.TabIndex = 43 Me.rdoYes.TabStop = True - Me.rdoYes.Text = "Include Start: O Yes" + Me.rdoYes.Text = "Include Start: Yes" Me.rdoYes.UseVisualStyleBackColor = True ' 'lblPlantingDays diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index 20bb231f79e..c2c796c8147 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -97,21 +97,21 @@ Public Class dlgPICSACrops ucrInputPlantingDates.SetParameter(New RParameter("plant_days", 5)) ucrInputPlantingDates.SetValidationTypeAsNumericList() - ucrInputPlantingDates.SetItems({"120", "80, 90, 100, 110, 120", "92, 122, 153", "300, 370, 5"}) + ucrInputPlantingDates.SetItems({"160", "80, 90, 100, 110, 120", "92, 122, 153", "124, 184, 10", "92, 152, 15"}) ucrInputPlantingDates.AddQuotesIfUnrecognised = False ucrInputPlantingDates.bAllowNonConditionValues = True 'Planting Length ucrInputCropLengths.SetParameter(New RParameter("plant_lengths", 6)) ucrInputCropLengths.SetValidationTypeAsNumericList() - ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180", "50, 220, 5", "60, 160, 5"}) + ucrInputCropLengths.SetItems({"120", "100, 110, 120, 130, 140", "80, 90, 100, 110", "120, 150, 180", "60, 120, 10"}) ucrInputCropLengths.AddQuotesIfUnrecognised = False ucrInputCropLengths.bAllowNonConditionValues = True 'Water amount ucrInputWaterAmounts.SetParameter(New RParameter("rain_totals", 7)) ucrInputWaterAmounts.SetValidationTypeAsNumericList() - ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700", "200, 750, 25", "200, 675, 25"}) + ucrInputWaterAmounts.SetItems({"600", "300, 400, 500, 600, 700", "300, 500, 700", "200, 600, 50", "500, 700, 25"}) ucrInputWaterAmounts.AddQuotesIfUnrecognised = False ucrInputWaterAmounts.bAllowNonConditionValues = True @@ -192,7 +192,7 @@ Public Class dlgPICSACrops ucrSelectorForCrops.Reset() ucrReceiverRainfall.SetMeAsReceiver() - clsDummyFunction.AddParameter("check", "yes", iPosition:=0) + clsDummyFunction.AddParameter("check", "both", iPosition:=0) 'Crops Function clsCropsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$crops_definitions") @@ -203,7 +203,7 @@ Public Class dlgPICSACrops ' Temp disabled until list working correctly - ucrInputPlantingDates.SetName("120") + ucrInputPlantingDates.SetName("160") ucrInputCropLengths.SetName("120") ucrInputWaterAmounts.SetName("600") clsCropsFunction.AddParameter("definition_props", "TRUE", iPosition:=11) @@ -230,9 +230,6 @@ Public Class dlgPICSACrops ucrReceiverEnd.SetRCode(clsCropsFunction, bReset) ' Disabled as list validation not working correctly with reading/writing controls - 'ucrInputPlantingDates.SetRCode(clsSequenceFunction, bReset) - 'ucrInputCropLengths.SetRCode(clsSequenceFunction, bReset) - 'ucrInputWaterAmounts.SetRCode(clsSequenceFunction, bReset) ucrPnlStartCheck.SetRCode(clsDummyFunction, bReset) 'ucrChkRequirePlantingDays.SetRCode(clsCropsFunction, bReset) ucrChkDataProp.SetRCode(clsCropsFunction, bReset) From 0ee879fe6316b17f1adb9c73e40cd42f7567a11c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 13 Aug 2024 11:35:20 +0300 Subject: [PATCH 108/273] changes to the code --- instat/dlgPICSACrops.Designer.vb | 36 ++++++++++++++++---------------- instat/dlgPICSACrops.vb | 13 ++++++++---- 2 files changed, 27 insertions(+), 22 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index 95cb89faef0..e1dcba4091b 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -195,7 +195,7 @@ Partial Class dlgPICSACrops Me.grpCropDefinitions.Controls.Add(Me.ucrPnlStartCheck) Me.grpCropDefinitions.Location = New System.Drawing.Point(6, 194) Me.grpCropDefinitions.Name = "grpCropDefinitions" - Me.grpCropDefinitions.Size = New System.Drawing.Size(269, 158) + Me.grpCropDefinitions.Size = New System.Drawing.Size(341, 158) Me.grpCropDefinitions.TabIndex = 39 Me.grpCropDefinitions.TabStop = False Me.grpCropDefinitions.Text = "Crop Definitions" @@ -206,10 +206,10 @@ Partial Class dlgPICSACrops Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputCropLengths.GetSetSelectedIndex = -1 Me.ucrInputCropLengths.IsReadOnly = False - Me.ucrInputCropLengths.Location = New System.Drawing.Point(120, 129) + Me.ucrInputCropLengths.Location = New System.Drawing.Point(154, 129) Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputCropLengths.Name = "ucrInputCropLengths" - Me.ucrInputCropLengths.Size = New System.Drawing.Size(137, 21) + Me.ucrInputCropLengths.Size = New System.Drawing.Size(170, 21) Me.ucrInputCropLengths.TabIndex = 55 ' 'ucrInputWaterAmounts @@ -218,10 +218,10 @@ Partial Class dlgPICSACrops Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 Me.ucrInputWaterAmounts.IsReadOnly = False - Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(121, 92) + Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(155, 92) Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" - Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(137, 21) + Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(169, 21) Me.ucrInputWaterAmounts.TabIndex = 40 ' 'ucrInputPlantingDates @@ -230,46 +230,46 @@ Partial Class dlgPICSACrops Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 Me.ucrInputPlantingDates.IsReadOnly = False - Me.ucrInputPlantingDates.Location = New System.Drawing.Point(121, 58) + Me.ucrInputPlantingDates.Location = New System.Drawing.Point(155, 58) Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" - Me.ucrInputPlantingDates.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPlantingDates.Size = New System.Drawing.Size(169, 21) Me.ucrInputPlantingDates.TabIndex = 53 ' 'rdoBoth ' Me.rdoBoth.AutoSize = True - Me.rdoBoth.Location = New System.Drawing.Point(195, 25) + Me.rdoBoth.Location = New System.Drawing.Point(214, 25) Me.rdoBoth.Margin = New System.Windows.Forms.Padding(2) Me.rdoBoth.Name = "rdoBoth" - Me.rdoBoth.Size = New System.Drawing.Size(47, 17) + Me.rdoBoth.Size = New System.Drawing.Size(110, 17) Me.rdoBoth.TabIndex = 44 Me.rdoBoth.TabStop = True - Me.rdoBoth.Text = "Both" + Me.rdoBoth.Text = "Include Start:Both" Me.rdoBoth.UseVisualStyleBackColor = True ' 'rdoNo ' Me.rdoNo.AutoSize = True - Me.rdoNo.Location = New System.Drawing.Point(137, 25) + Me.rdoNo.Location = New System.Drawing.Point(111, 25) Me.rdoNo.Margin = New System.Windows.Forms.Padding(2) Me.rdoNo.Name = "rdoNo" - Me.rdoNo.Size = New System.Drawing.Size(39, 17) + Me.rdoNo.Size = New System.Drawing.Size(102, 17) Me.rdoNo.TabIndex = 45 Me.rdoNo.TabStop = True - Me.rdoNo.Text = "No" + Me.rdoNo.Text = "Include Start:No" Me.rdoNo.UseVisualStyleBackColor = True ' 'rdoYes ' Me.rdoYes.AutoSize = True - Me.rdoYes.Location = New System.Drawing.Point(13, 25) + Me.rdoYes.Location = New System.Drawing.Point(5, 25) Me.rdoYes.Margin = New System.Windows.Forms.Padding(2) Me.rdoYes.Name = "rdoYes" - Me.rdoYes.Size = New System.Drawing.Size(109, 17) + Me.rdoYes.Size = New System.Drawing.Size(106, 17) Me.rdoYes.TabIndex = 43 Me.rdoYes.TabStop = True - Me.rdoYes.Text = "Include Start: Yes" + Me.rdoYes.Text = "Include Start:Yes" Me.rdoYes.UseVisualStyleBackColor = True ' 'lblPlantingDays @@ -302,10 +302,10 @@ Partial Class dlgPICSACrops 'ucrPnlStartCheck ' Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlStartCheck.Location = New System.Drawing.Point(9, 17) + Me.ucrPnlStartCheck.Location = New System.Drawing.Point(4, 17) Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlStartCheck.Name = "ucrPnlStartCheck" - Me.ucrPnlStartCheck.Size = New System.Drawing.Size(248, 37) + Me.ucrPnlStartCheck.Size = New System.Drawing.Size(320, 37) Me.ucrPnlStartCheck.TabIndex = 46 ' 'ucrChkDataProp diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index c2c796c8147..5813216d3d0 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -211,6 +211,7 @@ Public Class dlgPICSACrops ucrBase.clsRsyntax.SetBaseRFunction(clsCropsFunction) ucrBase.clsRsyntax.iCallType = 2 TestOkEnabled() + AddingStartCheckParm() End Sub Public Sub SetRCodeForControls(bReset As Boolean) @@ -230,10 +231,13 @@ Public Class dlgPICSACrops ucrReceiverEnd.SetRCode(clsCropsFunction, bReset) ' Disabled as list validation not working correctly with reading/writing controls - ucrPnlStartCheck.SetRCode(clsDummyFunction, bReset) 'ucrChkRequirePlantingDays.SetRCode(clsCropsFunction, bReset) ucrChkDataProp.SetRCode(clsCropsFunction, bReset) ucrChkPrintDataProp.SetRCode(clsCropsFunction, bReset) + If bReset Then + ucrPnlStartCheck.SetRCode(clsDummyFunction, bReset) + End If + AddingStartCheckParm() End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -291,15 +295,16 @@ Public Class dlgPICSACrops End Sub Private Sub ucrPnlStartCheck_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStartCheck.ControlValueChanged + AddingStartCheckParm() + End Sub + + Private Sub AddingStartCheckParm() If rdoYes.Checked Then clsCropsFunction.AddParameter("start_check", Chr(34) & "yes" & Chr(34), iPosition:=10) - clsDummyFunction.AddParameter("check", "yes", iPosition:=0) ElseIf rdoNo.Checked Then clsCropsFunction.AddParameter("start_check", Chr(34) & "no" & Chr(34), iPosition:=10) - clsDummyFunction.AddParameter("check", "no", iPosition:=0) Else clsCropsFunction.AddParameter("start_check", Chr(34) & "both" & Chr(34), iPosition:=10) - clsDummyFunction.AddParameter("check", "both", iPosition:=0) End If End Sub From 72f6a20a97b3ba539f866e477fafa1a68705709b Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 14 Aug 2024 13:13:45 +0300 Subject: [PATCH 109/273] changes --- instat/dlgPICSACrops.Designer.vb | 42 ++++++++++++++++++++------------ instat/dlgPICSACrops.vb | 23 +++++++++-------- 2 files changed, 40 insertions(+), 25 deletions(-) diff --git a/instat/dlgPICSACrops.Designer.vb b/instat/dlgPICSACrops.Designer.vb index e1dcba4091b..e787f1db1b8 100644 --- a/instat/dlgPICSACrops.Designer.vb +++ b/instat/dlgPICSACrops.Designer.vb @@ -67,6 +67,7 @@ Partial Class dlgPICSACrops Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrSelectorForCrops = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.lblStarts = New System.Windows.Forms.Label() Me.grpSeasonReceivers.SuspendLayout() Me.grpCropDefinitions.SuspendLayout() Me.SuspendLayout() @@ -183,6 +184,7 @@ Partial Class dlgPICSACrops ' 'grpCropDefinitions ' + Me.grpCropDefinitions.Controls.Add(Me.lblStarts) Me.grpCropDefinitions.Controls.Add(Me.ucrInputCropLengths) Me.grpCropDefinitions.Controls.Add(Me.ucrInputWaterAmounts) Me.grpCropDefinitions.Controls.Add(Me.ucrInputPlantingDates) @@ -195,7 +197,7 @@ Partial Class dlgPICSACrops Me.grpCropDefinitions.Controls.Add(Me.ucrPnlStartCheck) Me.grpCropDefinitions.Location = New System.Drawing.Point(6, 194) Me.grpCropDefinitions.Name = "grpCropDefinitions" - Me.grpCropDefinitions.Size = New System.Drawing.Size(341, 158) + Me.grpCropDefinitions.Size = New System.Drawing.Size(292, 158) Me.grpCropDefinitions.TabIndex = 39 Me.grpCropDefinitions.TabStop = False Me.grpCropDefinitions.Text = "Crop Definitions" @@ -206,7 +208,7 @@ Partial Class dlgPICSACrops Me.ucrInputCropLengths.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputCropLengths.GetSetSelectedIndex = -1 Me.ucrInputCropLengths.IsReadOnly = False - Me.ucrInputCropLengths.Location = New System.Drawing.Point(154, 129) + Me.ucrInputCropLengths.Location = New System.Drawing.Point(106, 129) Me.ucrInputCropLengths.Margin = New System.Windows.Forms.Padding(6) Me.ucrInputCropLengths.Name = "ucrInputCropLengths" Me.ucrInputCropLengths.Size = New System.Drawing.Size(170, 21) @@ -218,7 +220,7 @@ Partial Class dlgPICSACrops Me.ucrInputWaterAmounts.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputWaterAmounts.GetSetSelectedIndex = -1 Me.ucrInputWaterAmounts.IsReadOnly = False - Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(155, 92) + Me.ucrInputWaterAmounts.Location = New System.Drawing.Point(107, 92) Me.ucrInputWaterAmounts.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputWaterAmounts.Name = "ucrInputWaterAmounts" Me.ucrInputWaterAmounts.Size = New System.Drawing.Size(169, 21) @@ -230,7 +232,7 @@ Partial Class dlgPICSACrops Me.ucrInputPlantingDates.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPlantingDates.GetSetSelectedIndex = -1 Me.ucrInputPlantingDates.IsReadOnly = False - Me.ucrInputPlantingDates.Location = New System.Drawing.Point(155, 58) + Me.ucrInputPlantingDates.Location = New System.Drawing.Point(107, 58) Me.ucrInputPlantingDates.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputPlantingDates.Name = "ucrInputPlantingDates" Me.ucrInputPlantingDates.Size = New System.Drawing.Size(169, 21) @@ -239,37 +241,37 @@ Partial Class dlgPICSACrops 'rdoBoth ' Me.rdoBoth.AutoSize = True - Me.rdoBoth.Location = New System.Drawing.Point(214, 25) + Me.rdoBoth.Location = New System.Drawing.Point(225, 25) Me.rdoBoth.Margin = New System.Windows.Forms.Padding(2) Me.rdoBoth.Name = "rdoBoth" - Me.rdoBoth.Size = New System.Drawing.Size(110, 17) + Me.rdoBoth.Size = New System.Drawing.Size(47, 17) Me.rdoBoth.TabIndex = 44 Me.rdoBoth.TabStop = True - Me.rdoBoth.Text = "Include Start:Both" + Me.rdoBoth.Text = "Both" Me.rdoBoth.UseVisualStyleBackColor = True ' 'rdoNo ' Me.rdoNo.AutoSize = True - Me.rdoNo.Location = New System.Drawing.Point(111, 25) + Me.rdoNo.Location = New System.Drawing.Point(153, 25) Me.rdoNo.Margin = New System.Windows.Forms.Padding(2) Me.rdoNo.Name = "rdoNo" - Me.rdoNo.Size = New System.Drawing.Size(102, 17) + Me.rdoNo.Size = New System.Drawing.Size(39, 17) Me.rdoNo.TabIndex = 45 Me.rdoNo.TabStop = True - Me.rdoNo.Text = "Include Start:No" + Me.rdoNo.Text = "No" Me.rdoNo.UseVisualStyleBackColor = True ' 'rdoYes ' Me.rdoYes.AutoSize = True - Me.rdoYes.Location = New System.Drawing.Point(5, 25) + Me.rdoYes.Location = New System.Drawing.Point(81, 25) Me.rdoYes.Margin = New System.Windows.Forms.Padding(2) Me.rdoYes.Name = "rdoYes" - Me.rdoYes.Size = New System.Drawing.Size(106, 17) + Me.rdoYes.Size = New System.Drawing.Size(43, 17) Me.rdoYes.TabIndex = 43 Me.rdoYes.TabStop = True - Me.rdoYes.Text = "Include Start:Yes" + Me.rdoYes.Text = "Yes" Me.rdoYes.UseVisualStyleBackColor = True ' 'lblPlantingDays @@ -302,10 +304,10 @@ Partial Class dlgPICSACrops 'ucrPnlStartCheck ' Me.ucrPnlStartCheck.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlStartCheck.Location = New System.Drawing.Point(4, 17) + Me.ucrPnlStartCheck.Location = New System.Drawing.Point(75, 14) Me.ucrPnlStartCheck.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlStartCheck.Name = "ucrPnlStartCheck" - Me.ucrPnlStartCheck.Size = New System.Drawing.Size(320, 37) + Me.ucrPnlStartCheck.Size = New System.Drawing.Size(201, 37) Me.ucrPnlStartCheck.TabIndex = 46 ' 'ucrChkDataProp @@ -402,6 +404,15 @@ Partial Class dlgPICSACrops Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 0 ' + 'lblStarts + ' + Me.lblStarts.AutoSize = True + Me.lblStarts.Location = New System.Drawing.Point(6, 27) + Me.lblStarts.Name = "lblStarts" + Me.lblStarts.Size = New System.Drawing.Size(70, 13) + Me.lblStarts.TabIndex = 56 + Me.lblStarts.Text = "Include Start:" + ' 'dlgPICSACrops ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -467,4 +478,5 @@ Partial Class dlgPICSACrops Friend WithEvents ucrInputWaterAmounts As ucrInputComboBox Friend WithEvents ucrInputPlantingDates As ucrInputComboBox Friend WithEvents ucrInputCropLengths As ucrInputComboBox + Friend WithEvents lblStarts As Label End Class diff --git a/instat/dlgPICSACrops.vb b/instat/dlgPICSACrops.vb index 5813216d3d0..a340b3716cc 100644 --- a/instat/dlgPICSACrops.vb +++ b/instat/dlgPICSACrops.vb @@ -231,7 +231,6 @@ Public Class dlgPICSACrops ucrReceiverEnd.SetRCode(clsCropsFunction, bReset) ' Disabled as list validation not working correctly with reading/writing controls - 'ucrChkRequirePlantingDays.SetRCode(clsCropsFunction, bReset) ucrChkDataProp.SetRCode(clsCropsFunction, bReset) ucrChkPrintDataProp.SetRCode(clsCropsFunction, bReset) If bReset Then @@ -268,6 +267,8 @@ Public Class dlgPICSACrops End Sub Private Sub PlantingDaysParam() + Dim strPlantingDates As String = ucrInputPlantingDates.GetText + If ucrInputPlantingDates.IsEmpty Then clsSequencePlantingFunction.RemoveParameterByName("plant") clsCropsFunction.RemoveParameterByName("plant_days") @@ -281,15 +282,15 @@ Public Class dlgPICSACrops If third < second Then ' Assume a sequence and run the sequence function - clsSequencePlantingFunction.AddParameter("plant", ucrInputPlantingDates.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsSequencePlantingFunction.AddParameter("plant", strPlantingDates, iPosition:=5, bIncludeArgumentName:=False) clsCropsFunction.AddParameter("plant_days", clsRFunctionParameter:=clsSequencePlantingFunction) Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", "c(" & ucrInputPlantingDates.GetText() & ")", iPosition:=5) + clsCropsFunction.AddParameter("plant_days", "c(" & strPlantingDates & ")", iPosition:=5) End If Else ' List the values as provided - clsCropsFunction.AddParameter("plant_days", "c(" & ucrInputPlantingDates.GetText() & ")", iPosition:=5) + clsCropsFunction.AddParameter("plant_days", "c(" & strPlantingDates & ")", iPosition:=5) End If End If End Sub @@ -309,6 +310,7 @@ Public Class dlgPICSACrops End Sub Private Sub ucrInputCropLengths_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputCropLengths.ControlValueChanged + Dim strCropLengths As String = ucrInputCropLengths.GetText If ucrInputCropLengths.IsEmpty Then clsSequenceFunction.RemoveParameterByName("plant") @@ -323,15 +325,15 @@ Public Class dlgPICSACrops If third < second Then ' Assume a sequence and run the sequence function - clsSequenceFunction.AddParameter("plant", ucrInputCropLengths.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsSequenceFunction.AddParameter("plant", strCropLengths, iPosition:=5, bIncludeArgumentName:=False) clsCropsFunction.AddParameter("plant_lengths", clsRFunctionParameter:=clsSequenceFunction) Else ' List the values as provided - clsCropsFunction.AddParameter("plant_lengths", "c(" & ucrInputCropLengths.GetText() & ")", iPosition:=6) + clsCropsFunction.AddParameter("plant_lengths", "c(" & strCropLengths & ")", iPosition:=6) End If Else ' List the values as provided - clsCropsFunction.AddParameter("plant_lengths", "c(" & ucrInputCropLengths.GetText() & ")", iPosition:=6) + clsCropsFunction.AddParameter("plant_lengths", "c(" & strCropLengths & ")", iPosition:=6) End If End If End Sub @@ -341,6 +343,7 @@ Public Class dlgPICSACrops End Sub Private Sub ucrInputWaterAmounts_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputWaterAmounts.ControlValueChanged + Dim strWaterAmounts As String = ucrInputWaterAmounts.GetText If ucrInputWaterAmounts.IsEmpty Then clsCropsFunction.RemoveParameterByName("rain_totals") @@ -355,15 +358,15 @@ Public Class dlgPICSACrops If third < second Then ' Assume a sequence and run the sequence function - clsSequencewaterFunction.AddParameter("totals", ucrInputWaterAmounts.GetText(), iPosition:=5, bIncludeArgumentName:=False) + clsSequencewaterFunction.AddParameter("totals", strWaterAmounts, iPosition:=5, bIncludeArgumentName:=False) clsCropsFunction.AddParameter("rain_totals", clsRFunctionParameter:=clsSequencewaterFunction) Else ' List the values as provided - clsCropsFunction.AddParameter("rain_totals", "c(" & ucrInputWaterAmounts.GetText() & ")", iPosition:=7) + clsCropsFunction.AddParameter("rain_totals", "c(" & strWaterAmounts & ")", iPosition:=7) End If Else ' List the values as provided - clsCropsFunction.AddParameter("rain_totals", "c(" & ucrInputWaterAmounts.GetText() & ")", iPosition:=7) + clsCropsFunction.AddParameter("rain_totals", "c(" & strWaterAmounts & ")", iPosition:=7) End If End If End Sub From 053e51e4b9f716bedf45c367b1f06dde0220c09d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Fri, 16 Aug 2024 13:20:55 +0100 Subject: [PATCH 110/273] Change made --- instat/dlgClimograph.Designer.vb | 2 +- instat/dlgClimograph.vb | 83 ++++++++++++++++++++++++++++---- 2 files changed, 74 insertions(+), 11 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index 87bf220421f..ec5cbe84f22 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -265,7 +265,7 @@ Partial Class dlgClimograph ' Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTmaxLineOptions, Me.toolStripMenuItemTminLineOptions, Me.toolStripMenuItemLayersOptionsOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 114) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 136) ' 'toolStripMenuItemPlotOptions ' diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 59d50540b4f..edcb6bcbdb5 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -583,15 +583,15 @@ Public Class dlgClimograph clsAesLineFunction.AddParameter("group", "1", iPosition:=1) clsAesLineStarFunction.SetRCommand("aes") - clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=0) - clsAesLineStarFunction.AddParameter("group", "1", iPosition:=1) + 'clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) + clsAesLineStarFunction.AddParameter("group", "1", iPosition:=2) clsAesLine1Function.SetRCommand("aes") clsAesLine1Function.AddParameter("group", "1", iPosition:=1) clsAesLineStar1Function.SetRCommand("aes") - clsAesLineStar1Function.AddParameter("group", "1", iPosition:=1) - clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=0) + clsAesLineStar1Function.AddParameter("group", "1", iPosition:=2) + clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=1) clsSecondaryAxisFunction.SetRCommand("sec_axis") clsSecondaryAxisFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) @@ -848,6 +848,8 @@ Public Class dlgClimograph clsBaseOperator.SetAssignTo("last_graph", strTempDataframe:=ucrSelectorClimograph.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempGraph:="last_graph") + ucrBase.clsRsyntax.ClearCodes() + ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) ucrBase.clsRsyntax.AddToAfterCodes(clsGetObjectDataFunction, iPosition:=0) ucrBase.clsRsyntax.AddToBeforeCodes(clsGetDataFrameFunction, iPosition:=0) @@ -994,6 +996,46 @@ Public Class dlgClimograph End If Next TestOKEnabled() + AddRemoveGeomBar() + End Sub + + Private Sub openSdgLayerOptionstmax(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, + clsNewGlobalAesFunc:=clsNewAesFunction, clsNewLocalAes:=clsLocalRaesFunction, + bFixGeom:=True, ucrNewBaseSelector:=ucrSelectorClimograph, + bApplyAesGlobally:=False, bReset:=bResetLineLayerSubdialog) + sdgLayerOptions.ShowDialog() + bResetLineLayerSubdialog = False + 'Coming from the sdgLayerOptions, clsRaesFunction and others have been modified. + ' One then needs to display these modifications on the dlgScatteredPlot. + + 'The aesthetics parameters on the main dialog are repopulated as required. + For Each clsParam In clsNewAesFunction.clsParameters + If clsParam.strArgumentName = "x" Then + If clsParam.strArgumentValue = Chr(34) & Chr(34) Then + ucrReceiverMonthC.Clear() + End If + 'In the y case, the value stored in the clsReasFunction in the multiple variables + ' case is "value", however that one shouldn't be written in the multiple + ' variables receiver (otherwise it would stack all variables and the stack + ' ("value") itself!). + 'Warning: what if someone used the name value for one of it's variables + ' independently from the multiple variables method? Here if the receiver is + ' actually in single mode, the variable "value" will still be given back, which + ' throws the problem back to the creation of "value" in the multiple receiver case. + ElseIf clsParam.strArgumentName = "y" AndAlso clsParam.strArgumentValue <> "value" Then + 'Still might be in the case of bSingleVariable with mapping y="". + If clsParam.strArgumentValue = Chr(34) & Chr(34) Then + ' ucrReceiverElement1.Clear() + 'Else + ucrReceiverElement1.Add(clsParam.strArgumentValue) + End If + End If + Next + TestOKEnabled() + 'AddRemoveGeomLines() + 'AddRemoveGeomBar() + 'AddRemoveSecondaryAxis() End Sub Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputFacet.ControlValueChanged @@ -1296,10 +1338,6 @@ Public Class dlgClimograph AddRemoveTemBars() End Sub - Private Sub ucrInput_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputStation.ControlValueChanged - - End Sub - Private Sub GetParameterValue(clsOperator As ROperator) Dim i As Integer = 0 For Each clsTempParam As RParameter In clsOperator.clsParameters @@ -1475,10 +1513,13 @@ Public Class dlgClimograph If Not ucrReceiverElement1.IsEmpty Then If Not ucrReceiverRainC.IsEmpty Then clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLineStarFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) Else - clsAesLineFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineFunction, iPosition:=4) + clsAesLineStarFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsAesLineStarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) End If Else clsBaseOperator.RemoveParameterByName("geom_line") @@ -1492,6 +1533,7 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If Not ucrReceiverElement2.IsEmpty Then If Not ucrReceiverRainC.IsEmpty Then + clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) Else @@ -1627,6 +1669,8 @@ Public Class dlgClimograph End If AddRemoveGeomRibbon() AddRemoveGeomBar() + AddRemoveGeomLines() + AddRemoveGeomLine1() End Sub Private Sub ucrSelectorClimograph_DataFrameChanged() Handles ucrSelectorClimograph.DataFrameChanged @@ -1655,12 +1699,31 @@ Public Class dlgClimograph sdgPlots.EnableLayersTab() bResetSubdialog = False AddRemoveSecondaryAxis() + 'AddRemoveGeomLines() + 'AddRemoveGeomBar() End Sub Private Sub toolStripMenuItemBarchartOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemBarchartOptions.Click openSdgLayerOptions(clsGeomBarFunction) End Sub + 'Private Sub toolStripMenuItemTminLineOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTminLineOptions.Click + ' If Not ucrReceiverRainC.IsEmpty Then + ' openSdgLayerOptions(clsGeomLineStar1Function, clsAesLineStar1Function) + ' Else + ' openSdgLayerOptions(clsGeomLineFunction1, clsAesLine1Function) + ' End If + 'End Sub + + Private Sub toolStripMenuItemTmaxLineOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTmaxLineOptions.Click + openSdgLayerOptionstmax(clsGeomLineStarFunction, clsAesLineStarFunction) + 'If Not ucrReceiverRainC.IsEmpty Then + 'clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + 'clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) + + AddRemoveGeomLines() + End Sub + Private Sub ucrChkText_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkText.ControlValueChanged AddRemoveGeomTextBar() AddRemoveGeomTextTmax() From 5e670184882cc87125d8cd5e8629bf0445716172 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 17 Aug 2024 13:06:16 +0300 Subject: [PATCH 111/273] effectively fixed the bug in adding multipl columns --- instat/static/InstatObject/R/data_object_R6.R | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 64bf2546137..d27d47ca427 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -693,9 +693,9 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, } } - if(length(col_name) != num_cols) { + if(length(col_name) != num_cols && (num_cols == 1 || length(col_name) == 1)) { use_col_name_as_prefix = TRUE - } + } else use_col_name_as_prefix = FALSE replaced <- FALSE previous_length = self$get_column_count() @@ -712,9 +712,10 @@ DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, if(require_correct_length) stop("Length of new column must be divisible by the length of the data frame") else curr_col <- rep(curr_col, length.out = self$get_data_frame_length()) } - +print(use_col_name_as_prefix) if(use_col_name_as_prefix) curr_col_name = self$get_next_default_column_name(col_name) - else curr_col_name = col_name + else curr_col_name = col_name[i] + curr_col_name <- make.names(iconv(curr_col_name, to = "ASCII//TRANSLIT", sub = ".")) new_col_names <- c(new_col_names, curr_col_name) if(curr_col_name %in% self$get_column_names()) { From 3a465f5cee201ba8e7a6eceb3879e1d6b39780d6 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 27 Aug 2024 15:48:32 +0100 Subject: [PATCH 112/273] Change made --- instat/dlgClimograph.Designer.vb | 12 +--- instat/dlgClimograph.vb | 102 +++++++++---------------------- 2 files changed, 32 insertions(+), 82 deletions(-) diff --git a/instat/dlgClimograph.Designer.vb b/instat/dlgClimograph.Designer.vb index ec5cbe84f22..1e7a8f54281 100644 --- a/instat/dlgClimograph.Designer.vb +++ b/instat/dlgClimograph.Designer.vb @@ -44,7 +44,6 @@ Partial Class dlgClimograph Me.toolStripMenuItemBarchartOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTmaxLineOptions = New System.Windows.Forms.ToolStripMenuItem() Me.toolStripMenuItemTminLineOptions = New System.Windows.Forms.ToolStripMenuItem() - Me.toolStripMenuItemLayersOptionsOptions = New System.Windows.Forms.ToolStripMenuItem() Me.rdoClimateBars = New System.Windows.Forms.RadioButton() Me.lblRainBar = New System.Windows.Forms.Label() Me.lblElement1Bar = New System.Windows.Forms.Label() @@ -263,9 +262,9 @@ Partial Class dlgClimograph ' 'contextMenuStripOptions ' - Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTmaxLineOptions, Me.toolStripMenuItemTminLineOptions, Me.toolStripMenuItemLayersOptionsOptions}) + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemBarchartOptions, Me.toolStripMenuItemTmaxLineOptions, Me.toolStripMenuItemTminLineOptions}) Me.contextMenuStripOptions.Name = "contextMenuStripOk" - Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 136) + Me.contextMenuStripOptions.Size = New System.Drawing.Size(181, 114) ' 'toolStripMenuItemPlotOptions ' @@ -291,12 +290,6 @@ Partial Class dlgClimograph Me.toolStripMenuItemTminLineOptions.Size = New System.Drawing.Size(180, 22) Me.toolStripMenuItemTminLineOptions.Text = "Line Options (Tmin)" ' - 'toolStripMenuItemLayersOptionsOptions - ' - Me.toolStripMenuItemLayersOptionsOptions.Name = "toolStripMenuItemLayersOptionsOptions" - Me.toolStripMenuItemLayersOptionsOptions.Size = New System.Drawing.Size(180, 22) - Me.toolStripMenuItemLayersOptionsOptions.Text = "Layers Options" - ' 'rdoClimateBars ' Me.rdoClimateBars.Appearance = System.Windows.Forms.Appearance.Button @@ -822,7 +815,6 @@ Partial Class dlgClimograph Friend WithEvents toolStripMenuItemBarchartOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemTmaxLineOptions As ToolStripMenuItem Friend WithEvents toolStripMenuItemTminLineOptions As ToolStripMenuItem - Friend WithEvents toolStripMenuItemLayersOptionsOptions As ToolStripMenuItem Friend WithEvents cmdOptions As ucrSplitButton Friend WithEvents rdoClimateBars As RadioButton Friend WithEvents ucrReceiverRainBar As ucrReceiverSingle diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index edcb6bcbdb5..acd9f455840 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -32,15 +32,11 @@ Public Class dlgClimograph Private clsFacetFunction As New RFunction Private clsGroupByFunction As New RFunction Private clsGeomBarFunction As New RFunction - Private clsGeomLineFunction As New RFunction Private clsGeomLineStarFunction As New RFunction Private clsGeomLineStar1Function As New RFunction - Private clsGeomLineFunction1 As New RFunction Private clsRggplotFunction As New RFunction Private clsBarAesFunction As New RFunction - Private clsAesLineFunction As New RFunction Private clsAesLineStarFunction As New RFunction - Private clsAesLine1Function As New RFunction Private clsAesLineStar1Function As New RFunction Private clsFacetFunction1 As New RFunction Private clsGroupByFunction1 As New RFunction @@ -401,13 +397,9 @@ Public Class dlgClimograph clsAesGeomRibbonFunction = New RFunction clsAesGeomRibbon1Function = New RFunction clsGeomBarFunction = New RFunction - clsGeomLineFunction = New RFunction - clsGeomLineFunction1 = New RFunction clsGeomLineStarFunction = New RFunction clsGeomLineStar1Function = New RFunction - clsAesLineFunction = New RFunction clsAesLineStarFunction = New RFunction - clsAesLine1Function = New RFunction clsAesLineStar1Function = New RFunction clsRggplotFunction = New RFunction clsBarAesFunction = New RFunction @@ -493,7 +485,6 @@ Public Class dlgClimograph bResetSubdialog = True bResetLineLayerSubdialog = True - ucrInputStation.SetName(strFacetWrap) ucrInputStation.bUpdateRCodeFromControl = True @@ -563,14 +554,6 @@ Public Class dlgClimograph clsAesTminBarFunction.SetRCommand("aes") - clsGeomLineFunction.SetRCommand("geom_line") - clsGeomLineFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineFunction, iPosition:=0) - clsGeomLineFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) - - clsGeomLineFunction1.SetRCommand("geom_line") - clsGeomLineFunction1.AddParameter("mapping", clsRFunctionParameter:=clsAesLine1Function, iPosition:=0) - clsGeomLineFunction1.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) - clsGeomLineStarFunction.SetRCommand("geom_line") clsGeomLineStarFunction.AddParameter("mapping", clsRFunctionParameter:=clsAesLineStarFunction, iPosition:=0) clsGeomLineStarFunction.AddParameter("colour", Chr(34) & "red" & Chr(34), iPosition:=1) @@ -579,19 +562,11 @@ Public Class dlgClimograph clsGeomLineStar1Function.AddParameter("mapping", clsRFunctionParameter:=clsAesLineStar1Function, iPosition:=0) clsGeomLineStar1Function.AddParameter("colour", Chr(34) & "blue" & Chr(34), iPosition:=1) - clsAesLineFunction.SetRCommand("aes") - clsAesLineFunction.AddParameter("group", "1", iPosition:=1) - clsAesLineStarFunction.SetRCommand("aes") - 'clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) clsAesLineStarFunction.AddParameter("group", "1", iPosition:=2) - clsAesLine1Function.SetRCommand("aes") - clsAesLine1Function.AddParameter("group", "1", iPosition:=1) - clsAesLineStar1Function.SetRCommand("aes") clsAesLineStar1Function.AddParameter("group", "1", iPosition:=2) - clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=1) clsSecondaryAxisFunction.SetRCommand("sec_axis") clsSecondaryAxisFunction.AddParameter("x", "~.*0.0393701", iPosition:=0, bIncludeArgumentName:=False) @@ -1001,7 +976,7 @@ Public Class dlgClimograph Private Sub openSdgLayerOptionstmax(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, - clsNewGlobalAesFunc:=clsNewAesFunction, clsNewLocalAes:=clsLocalRaesFunction, + clsNewGlobalAesFunc:=clsLocalRaesFunction, clsNewLocalAes:=clsNewAesFunction, bFixGeom:=True, ucrNewBaseSelector:=ucrSelectorClimograph, bApplyAesGlobally:=False, bReset:=bResetLineLayerSubdialog) sdgLayerOptions.ShowDialog() @@ -1015,27 +990,30 @@ Public Class dlgClimograph If clsParam.strArgumentValue = Chr(34) & Chr(34) Then ucrReceiverMonthC.Clear() End If - 'In the y case, the value stored in the clsReasFunction in the multiple variables - ' case is "value", however that one shouldn't be written in the multiple - ' variables receiver (otherwise it would stack all variables and the stack - ' ("value") itself!). - 'Warning: what if someone used the name value for one of it's variables - ' independently from the multiple variables method? Here if the receiver is - ' actually in single mode, the variable "value" will still be given back, which - ' throws the problem back to the creation of "value" in the multiple receiver case. ElseIf clsParam.strArgumentName = "y" AndAlso clsParam.strArgumentValue <> "value" Then - 'Still might be in the case of bSingleVariable with mapping y="". + ucrReceiverElement1.Add(clsParam.strArgumentValue) + End If + Next + TestOKEnabled() + End Sub + + Private Sub openSdgLayerOptionstmin(clsNewGeomFunc As RFunction, clsNewAesFunction As RFunction) + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsNewGeomFunc, + clsNewGlobalAesFunc:=clsLocalRaesFunction, clsNewLocalAes:=clsNewAesFunction, + bFixGeom:=True, ucrNewBaseSelector:=ucrSelectorClimograph, + bApplyAesGlobally:=False, bReset:=bResetLineLayerSubdialog) + sdgLayerOptions.ShowDialog() + bResetLineLayerSubdialog = False + For Each clsParam In clsNewAesFunction.clsParameters + If clsParam.strArgumentName = "x" Then If clsParam.strArgumentValue = Chr(34) & Chr(34) Then - ' ucrReceiverElement1.Clear() - 'Else - ucrReceiverElement1.Add(clsParam.strArgumentValue) + ucrReceiverMonthC.Clear() End If + ElseIf clsParam.strArgumentName = "y" AndAlso clsParam.strArgumentValue <> "value" Then + ucrReceiverElement2.Add(clsParam.strArgumentValue) End If Next TestOKEnabled() - 'AddRemoveGeomLines() - 'AddRemoveGeomBar() - 'AddRemoveSecondaryAxis() End Sub Private Sub ucrInputFacet_ControlValueChanged(ucrChangedControl As ucrInputComboBox) Handles ucrInputFacet.ControlValueChanged @@ -1149,7 +1127,6 @@ Public Class dlgClimograph AddRemoveFacetClimograph() AddRemoveFacets1() AddRemoveGroupBy1() - 'AddRemoveTemBars() End Sub Private Sub GetParameterValue1(clsOperator As ROperator) @@ -1533,12 +1510,14 @@ Public Class dlgClimograph If rdoClimograph.Checked Then If Not ucrReceiverElement2.IsEmpty Then If Not ucrReceiverRainC.IsEmpty Then - clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=1) + clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) Else - clsAesLine1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineFunction1, iPosition:=4) + clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + clsAesLineStar1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) End If Else clsBaseOperator.RemoveParameterByName("geom_line1") @@ -1685,42 +1664,21 @@ Public Class dlgClimograph Else clsBaseOperator.RemoveParameterByName("ggwalter_lieth") End If - - End Sub - - Private Sub toolStripMenuItemLayersOptionsOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemLayersOptionsOptions.Click - sdgPlots.SetRCode(clsNewOperator:=ucrBase.clsRsyntax.clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, - clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewLabsFunction:=clsLabsFunction, clsNewXLabsTitleFunction:=clsXlabFunction, clsNewYLabTitleFunction:=clsYlabFunction, - clsNewFacetFunction:=clsRFacetFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewGlobalAesFunction:=clsBarAesFunction, - clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, ucrNewBaseSelector:=sdgLayerOptions.ucrGeomWithAes.ucrGeomWithAesSelector, clsNewAnnotateFunction:=clsAnnotateFunction, - clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewFacetVariablesOperator:=clsFacetVariablesOperator, bReset:=bResetSubdialog) - sdgPlots.tbpPlotsOptions.SelectedIndex = 1 - sdgPlots.ShowDialog() - sdgPlots.EnableLayersTab() - bResetSubdialog = False - AddRemoveSecondaryAxis() - 'AddRemoveGeomLines() - 'AddRemoveGeomBar() End Sub Private Sub toolStripMenuItemBarchartOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemBarchartOptions.Click openSdgLayerOptions(clsGeomBarFunction) End Sub - 'Private Sub toolStripMenuItemTminLineOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTminLineOptions.Click - ' If Not ucrReceiverRainC.IsEmpty Then - ' openSdgLayerOptions(clsGeomLineStar1Function, clsAesLineStar1Function) - ' Else - ' openSdgLayerOptions(clsGeomLineFunction1, clsAesLine1Function) - ' End If - 'End Sub + Private Sub toolStripMenuItemTminLineOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTminLineOptions.Click + openSdgLayerOptionstmin(clsGeomLineStar1Function, clsAesLineStar1Function) + clsAesLineStar1Function.AddParameter("group", "1", iPosition:=2) + AddRemoveGeomLine1() + End Sub Private Sub toolStripMenuItemTmaxLineOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemTmaxLineOptions.Click openSdgLayerOptionstmax(clsGeomLineStarFunction, clsAesLineStarFunction) - 'If Not ucrReceiverRainC.IsEmpty Then - 'clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - 'clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) - + clsAesLineStarFunction.AddParameter("group", "1", iPosition:=2) AddRemoveGeomLines() End Sub From 920aa5ef7972d3672dc2f3e3ddfd92de6b600e98 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 28 Aug 2024 13:29:18 +0300 Subject: [PATCH 113/273] changes --- instat/dlgExportToClimsoft.Designer.vb | 230 ++++++++++++++++--------- instat/dlgExportToClimsoft.vb | 70 ++++++-- 2 files changed, 209 insertions(+), 91 deletions(-) diff --git a/instat/dlgExportToClimsoft.Designer.vb b/instat/dlgExportToClimsoft.Designer.vb index 5e3e78b822a..cf0ff235bbb 100644 --- a/instat/dlgExportToClimsoft.Designer.vb +++ b/instat/dlgExportToClimsoft.Designer.vb @@ -25,7 +25,6 @@ Partial Class dlgExportToClimsoft Me.lblElement = New System.Windows.Forms.Label() Me.lblDate = New System.Windows.Forms.Label() Me.lblHour = New System.Windows.Forms.Label() - Me.lblLevel = New System.Windows.Forms.Label() Me.lblStation = New System.Windows.Forms.Label() Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() @@ -34,76 +33,77 @@ Partial Class dlgExportToClimsoft Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrSaveNewDataFrame = New instat.ucrSave() Me.ucrChkNewDataFrame = New instat.ucrCheck() - Me.ucrInputLevel = New instat.ucrInputTextBox() Me.ucrInputHour = New instat.ucrInputTextBox() Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverElements = New instat.ucrReceiverMultiple() Me.ucrReceiverDate = New instat.ucrReceiverSingle() Me.ucrSelectorImportToClimsoft = New instat.ucrSelectorByDataFrameAddRemove() + Me.rdoHourly = New System.Windows.Forms.RadioButton() + Me.rdoDaily = New System.Windows.Forms.RadioButton() + Me.ucrPnlDailyHourly = New instat.UcrPanel() + Me.ucrReceiverStationID = New instat.ucrReceiverSingle() + Me.lblStationID = New System.Windows.Forms.Label() Me.SuspendLayout() ' 'lblElement ' Me.lblElement.AutoSize = True - Me.lblElement.Location = New System.Drawing.Point(278, 189) + Me.lblElement.Location = New System.Drawing.Point(417, 325) + Me.lblElement.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblElement.Name = "lblElement" - Me.lblElement.Size = New System.Drawing.Size(53, 13) - Me.lblElement.TabIndex = 10 + Me.lblElement.Size = New System.Drawing.Size(80, 20) + Me.lblElement.TabIndex = 12 Me.lblElement.Text = "Elements:" ' 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(278, 56) + Me.lblDate.Location = New System.Drawing.Point(417, 197) + Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(33, 13) - Me.lblDate.TabIndex = 11 + Me.lblDate.Size = New System.Drawing.Size(48, 20) + Me.lblDate.TabIndex = 8 Me.lblDate.Text = "Date:" ' 'lblHour ' Me.lblHour.AutoSize = True - Me.lblHour.Location = New System.Drawing.Point(278, 100) + Me.lblHour.Location = New System.Drawing.Point(417, 261) + Me.lblHour.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHour.Name = "lblHour" - Me.lblHour.Size = New System.Drawing.Size(33, 13) - Me.lblHour.TabIndex = 20 + Me.lblHour.Size = New System.Drawing.Size(48, 20) + Me.lblHour.TabIndex = 10 Me.lblHour.Text = "Hour:" ' - 'lblLevel - ' - Me.lblLevel.AutoSize = True - Me.lblLevel.Location = New System.Drawing.Point(278, 144) - Me.lblLevel.Name = "lblLevel" - Me.lblLevel.Size = New System.Drawing.Size(36, 13) - Me.lblLevel.TabIndex = 21 - Me.lblLevel.Text = "Level:" - ' 'lblStation ' Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(278, 15) + Me.lblStation.Location = New System.Drawing.Point(417, 73) + Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 69 + Me.lblStation.Size = New System.Drawing.Size(64, 20) + Me.lblStation.TabIndex = 4 Me.lblStation.Text = "Station:" ' 'lblExport ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(9, 377) + Me.lblExport.Location = New System.Drawing.Point(14, 566) + Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExport.Name = "lblExport" - Me.lblExport.Size = New System.Drawing.Size(59, 13) - Me.lblExport.TabIndex = 71 + Me.lblExport.Size = New System.Drawing.Size(88, 20) + Me.lblExport.TabIndex = 17 Me.lblExport.Text = "Export File:" ' 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(326, 372) + Me.cmdBrowse.Location = New System.Drawing.Point(489, 558) + Me.cmdBrowse.Margin = New System.Windows.Forms.Padding(4) Me.cmdBrowse.Name = "cmdBrowse" - Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) - Me.cmdBrowse.TabIndex = 73 + Me.cmdBrowse.Size = New System.Drawing.Size(120, 34) + Me.cmdBrowse.TabIndex = 19 Me.cmdBrowse.Text = "Browse" Me.cmdBrowse.UseVisualStyleBackColor = True ' @@ -111,10 +111,11 @@ Partial Class dlgExportToClimsoft ' Me.ucrChkExportDataFrame.AutoSize = True Me.ucrChkExportDataFrame.Checked = False - Me.ucrChkExportDataFrame.Location = New System.Drawing.Point(9, 306) + Me.ucrChkExportDataFrame.Location = New System.Drawing.Point(14, 459) + Me.ucrChkExportDataFrame.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkExportDataFrame.Name = "ucrChkExportDataFrame" - Me.ucrChkExportDataFrame.Size = New System.Drawing.Size(266, 23) - Me.ucrChkExportDataFrame.TabIndex = 74 + Me.ucrChkExportDataFrame.Size = New System.Drawing.Size(399, 34) + Me.ucrChkExportDataFrame.TabIndex = 15 ' 'ucrInputExportFile ' @@ -122,53 +123,43 @@ Partial Class dlgExportToClimsoft Me.ucrInputExportFile.AutoSize = True Me.ucrInputExportFile.IsMultiline = False Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 373) - Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputExportFile.Location = New System.Drawing.Point(213, 560) + Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputExportFile.Name = "ucrInputExportFile" - Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) - Me.ucrInputExportFile.TabIndex = 72 + Me.ucrInputExportFile.Size = New System.Drawing.Size(273, 32) + Me.ucrInputExportFile.TabIndex = 18 ' 'ucrReceiverStation ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(278, 33) + Me.ucrReceiverStation.Location = New System.Drawing.Point(417, 101) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 70 + Me.ucrReceiverStation.TabIndex = 5 Me.ucrReceiverStation.ucrSelector = Nothing ' 'ucrSaveNewDataFrame ' Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(9, 338) - Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(14, 513) + Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" - Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(348, 24) - Me.ucrSaveNewDataFrame.TabIndex = 68 + Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(522, 36) + Me.ucrSaveNewDataFrame.TabIndex = 16 ' 'ucrChkNewDataFrame ' Me.ucrChkNewDataFrame.AutoSize = True Me.ucrChkNewDataFrame.Checked = False - Me.ucrChkNewDataFrame.Location = New System.Drawing.Point(9, 277) + Me.ucrChkNewDataFrame.Location = New System.Drawing.Point(14, 416) + Me.ucrChkNewDataFrame.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkNewDataFrame.Name = "ucrChkNewDataFrame" - Me.ucrChkNewDataFrame.Size = New System.Drawing.Size(266, 23) - Me.ucrChkNewDataFrame.TabIndex = 22 - ' - 'ucrInputLevel - ' - Me.ucrInputLevel.AddQuotesIfUnrecognised = True - Me.ucrInputLevel.AutoSize = True - Me.ucrInputLevel.IsMultiline = False - Me.ucrInputLevel.IsReadOnly = False - Me.ucrInputLevel.Location = New System.Drawing.Point(278, 162) - Me.ucrInputLevel.Name = "ucrInputLevel" - Me.ucrInputLevel.Size = New System.Drawing.Size(119, 21) - Me.ucrInputLevel.TabIndex = 19 + Me.ucrChkNewDataFrame.Size = New System.Drawing.Size(399, 34) + Me.ucrChkNewDataFrame.TabIndex = 14 ' 'ucrInputHour ' @@ -176,45 +167,46 @@ Partial Class dlgExportToClimsoft Me.ucrInputHour.AutoSize = True Me.ucrInputHour.IsMultiline = False Me.ucrInputHour.IsReadOnly = False - Me.ucrInputHour.Location = New System.Drawing.Point(278, 119) + Me.ucrInputHour.Location = New System.Drawing.Point(417, 287) + Me.ucrInputHour.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputHour.Name = "ucrInputHour" - Me.ucrInputHour.Size = New System.Drawing.Size(119, 21) - Me.ucrInputHour.TabIndex = 18 + Me.ucrInputHour.Size = New System.Drawing.Size(178, 32) + Me.ucrInputHour.TabIndex = 11 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 403) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrBase.Location = New System.Drawing.Point(10, 604) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 17 + Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.TabIndex = 20 ' 'ucrReceiverElements ' Me.ucrReceiverElements.AutoSize = True Me.ucrReceiverElements.frmParent = Me - Me.ucrReceiverElements.Location = New System.Drawing.Point(278, 209) + Me.ucrReceiverElements.Location = New System.Drawing.Point(417, 355) Me.ucrReceiverElements.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverElements.Name = "ucrReceiverElements" Me.ucrReceiverElements.Selector = Nothing - Me.ucrReceiverElements.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverElements.Size = New System.Drawing.Size(180, 150) Me.ucrReceiverElements.strNcFilePath = "" - Me.ucrReceiverElements.TabIndex = 6 + Me.ucrReceiverElements.TabIndex = 13 Me.ucrReceiverElements.ucrSelector = Nothing ' 'ucrReceiverDate ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(278, 74) + Me.ucrReceiverDate.Location = New System.Drawing.Point(417, 222) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDate.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 5 + Me.ucrReceiverDate.TabIndex = 9 Me.ucrReceiverDate.ucrSelector = Nothing ' 'ucrSelectorImportToClimsoft @@ -223,18 +215,95 @@ Partial Class dlgExportToClimsoft Me.ucrSelectorImportToClimsoft.bDropUnusedFilterLevels = False Me.ucrSelectorImportToClimsoft.bShowHiddenColumns = False Me.ucrSelectorImportToClimsoft.bUseCurrentFilter = True - Me.ucrSelectorImportToClimsoft.Location = New System.Drawing.Point(9, 10) + Me.ucrSelectorImportToClimsoft.Location = New System.Drawing.Point(14, 78) Me.ucrSelectorImportToClimsoft.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorImportToClimsoft.Name = "ucrSelectorImportToClimsoft" - Me.ucrSelectorImportToClimsoft.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorImportToClimsoft.TabIndex = 1 + Me.ucrSelectorImportToClimsoft.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorImportToClimsoft.TabIndex = 3 + ' + 'rdoHourly + ' + Me.rdoHourly.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoHourly.BackColor = System.Drawing.SystemColors.Control + Me.rdoHourly.Enabled = False + Me.rdoHourly.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoHourly.FlatAppearance.BorderSize = 2 + Me.rdoHourly.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoHourly.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoHourly.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoHourly.Location = New System.Drawing.Point(285, 12) + Me.rdoHourly.Margin = New System.Windows.Forms.Padding(4) + Me.rdoHourly.Name = "rdoHourly" + Me.rdoHourly.Size = New System.Drawing.Size(136, 42) + Me.rdoHourly.TabIndex = 2 + Me.rdoHourly.TabStop = True + Me.rdoHourly.Tag = "Frequency" + Me.rdoHourly.Text = "Hourly" + Me.rdoHourly.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoHourly.UseVisualStyleBackColor = False + ' + 'rdoDaily + ' + Me.rdoDaily.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoDaily.BackColor = System.Drawing.SystemColors.Control + Me.rdoDaily.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDaily.FlatAppearance.BorderSize = 2 + Me.rdoDaily.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDaily.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoDaily.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoDaily.Location = New System.Drawing.Point(151, 12) + Me.rdoDaily.Margin = New System.Windows.Forms.Padding(4) + Me.rdoDaily.Name = "rdoDaily" + Me.rdoDaily.Size = New System.Drawing.Size(136, 42) + Me.rdoDaily.TabIndex = 1 + Me.rdoDaily.TabStop = True + Me.rdoDaily.Tag = "Frequency" + Me.rdoDaily.Text = "Daily" + Me.rdoDaily.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoDaily.UseVisualStyleBackColor = False + ' + 'ucrPnlDailyHourly + ' + Me.ucrPnlDailyHourly.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlDailyHourly.Location = New System.Drawing.Point(136, 12) + Me.ucrPnlDailyHourly.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlDailyHourly.Name = "ucrPnlDailyHourly" + Me.ucrPnlDailyHourly.Size = New System.Drawing.Size(310, 42) + Me.ucrPnlDailyHourly.TabIndex = 0 + ' + 'ucrReceiverStationID + ' + Me.ucrReceiverStationID.AutoSize = True + Me.ucrReceiverStationID.frmParent = Me + Me.ucrReceiverStationID.Location = New System.Drawing.Point(414, 167) + Me.ucrReceiverStationID.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationID.Name = "ucrReceiverStationID" + Me.ucrReceiverStationID.Selector = Nothing + Me.ucrReceiverStationID.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverStationID.strNcFilePath = "" + Me.ucrReceiverStationID.TabIndex = 7 + Me.ucrReceiverStationID.ucrSelector = Nothing + ' + 'lblStationID + ' + Me.lblStationID.AutoSize = True + Me.lblStationID.Location = New System.Drawing.Point(419, 141) + Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationID.Name = "lblStationID" + Me.lblStationID.Size = New System.Drawing.Size(85, 20) + Me.lblStationID.TabIndex = 6 + Me.lblStationID.Text = "Station ID:" ' 'dlgExportToClimsoft ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(417, 460) + Me.ClientSize = New System.Drawing.Size(626, 690) + Me.Controls.Add(Me.lblStationID) + Me.Controls.Add(Me.ucrReceiverStationID) + Me.Controls.Add(Me.rdoDaily) + Me.Controls.Add(Me.rdoHourly) Me.Controls.Add(Me.ucrChkExportDataFrame) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdBrowse) @@ -243,9 +312,7 @@ Partial Class dlgExportToClimsoft Me.Controls.Add(Me.lblStation) Me.Controls.Add(Me.ucrSaveNewDataFrame) Me.Controls.Add(Me.ucrChkNewDataFrame) - Me.Controls.Add(Me.lblLevel) Me.Controls.Add(Me.lblHour) - Me.Controls.Add(Me.ucrInputLevel) Me.Controls.Add(Me.ucrInputHour) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.lblDate) @@ -253,7 +320,9 @@ Partial Class dlgExportToClimsoft Me.Controls.Add(Me.ucrReceiverElements) Me.Controls.Add(Me.ucrReceiverDate) Me.Controls.Add(Me.ucrSelectorImportToClimsoft) + Me.Controls.Add(Me.ucrPnlDailyHourly) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "dlgExportToClimsoft" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Export For Climsoft" @@ -268,9 +337,7 @@ Partial Class dlgExportToClimsoft Friend WithEvents lblElement As Label Friend WithEvents lblDate As Label Friend WithEvents ucrBase As ucrButtons - Friend WithEvents lblLevel As Label Friend WithEvents lblHour As Label - Friend WithEvents ucrInputLevel As ucrInputTextBox Friend WithEvents ucrInputHour As ucrInputTextBox Friend WithEvents ucrChkNewDataFrame As ucrCheck Friend WithEvents ucrSaveNewDataFrame As ucrSave @@ -280,4 +347,9 @@ Partial Class dlgExportToClimsoft Friend WithEvents cmdBrowse As Button Friend WithEvents ucrInputExportFile As ucrInputTextBox Friend WithEvents ucrChkExportDataFrame As ucrCheck + Friend WithEvents rdoDaily As RadioButton + Friend WithEvents rdoHourly As RadioButton + Friend WithEvents ucrPnlDailyHourly As UcrPanel + Friend WithEvents lblStationID As Label + Friend WithEvents ucrReceiverStationID As ucrReceiverSingle End Class diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 91876cd7eaf..3946732a6dd 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -20,7 +20,7 @@ Imports instat.Translations Public Class dlgExportToClimsoft Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction As New RFunction + Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsFormatFunction, clsPosixctFunction As New RFunction Private clsPipeOperator As New ROperator Private Sub dlgExportToClimsoft_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -52,11 +52,18 @@ Public Class dlgExportToClimsoft ucrReceiverDate.Selector = ucrSelectorImportToClimsoft ucrReceiverDate.bAutoFill = True + ucrPnlDailyHourly.AddRadioButton(rdoDaily) + ucrPnlDailyHourly.AddRadioButton(rdoHourly) + ucrPnlDailyHourly.AddParameterValuesCondition(rdoDaily, "checked", "daily") + ucrPnlDailyHourly.AddParameterValuesCondition(rdoHourly, "checked", "hourly") + ucrInputHour.SetParameter(New RParameter("hour", 3)) ucrInputHour.SetLinkedDisplayControl(lblHour) - ucrInputLevel.SetParameter(New RParameter("level", 4)) - ucrInputLevel.SetLinkedDisplayControl(lblLevel) + ucrReceiverStationID.SetParameter(New RParameter("station_id", 4)) + ucrReceiverStationID.SetParameterIsRFunction() + ucrReceiverStationID.SetLinkedDisplayControl(lblStationID) + ucrReceiverStationID.Selector = ucrSelectorImportToClimsoft ucrReceiverElements.SetParameter(New RParameter("element", 5, bNewIncludeArgumentName:=False)) ucrReceiverElements.SetParameterIsRFunction() @@ -89,6 +96,8 @@ Public Class dlgExportToClimsoft clsCurrentNewColumnFunction = New RFunction clsMutateFunction = New RFunction clsExportClimsoftFunction = New RFunction + clsPasteFunction = New RFunction + clsSprintfFunction = New RFunction clsPipeOperator = New ROperator ucrSelectorImportToClimsoft.Reset() @@ -97,10 +106,18 @@ Public Class dlgExportToClimsoft clsDummyFunction.AddParameter("dataframe", "True", iPosition:=0) clsDummyFunction.AddParameter("export", "False", iPosition:=1) + clsDummyFunction.AddParameter("checked", "daily", iPosition:=2) + + clsPosixctFunction.SetRCommand("as.POSIXct") + clsPosixctFunction.AddParameter("x", clsRFunctionParameter:=clsPasteFunction, bIncludeArgumentName:=False, iPosition:=0) + clsPosixctFunction.AddParameter("format", Chr(34) & "%Y-%m-%d %H:%M:%S" & Chr(34), iPosition:=1) + + clsFormatFunction.SetRCommand("format") + clsFormatFunction.AddParameter("posix", clsRFunctionParameter:=clsPosixctFunction, bIncludeArgumentName:=False, iPosition:=0) + clsFormatFunction.AddParameter("yhs", Chr(34) & "%Y-%m-%d %H:%M:%S" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) clsDataFrameFunction.SetRCommand("data.frame") - clsDataFrameFunction.AddParameter("hour", 6, iPosition:=3) - clsDataFrameFunction.AddParameter("level", "surface", iPosition:=4) + clsDataFrameFunction.AddParameter("date_time", clsRFunctionParameter:=clsFormatFunction, iPosition:=0) clsDataFrameFunction.AddParameter("x", "columns", iPosition:=5, bIncludeArgumentName:=False) clsPipeOperator.SetOperation("%>%") @@ -114,18 +131,27 @@ Public Class dlgExportToClimsoft clsExportClimsoftFunction.SetRCommand("export") clsExportClimsoftFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) + clsPasteFunction.SetRCommand("paste") + clsPasteFunction.SetAssignTo("date1") + + clsSprintfFunction.SetRCommand("sprintf") + clsSprintfFunction.AddParameter("hour", 6, iPosition:=1) + + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) - ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) + ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsPasteFunction, iPosition:=1) DataFrameAssignTo() End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverDate.SetRCode(clsDataFrameFunction, bReset) - ucrInputHour.SetRCode(clsDataFrameFunction, bReset) - ucrInputLevel.SetRCode(clsDataFrameFunction, bReset) + ucrReceiverDate.SetRCode(clsPasteFunction, bReset) + ucrInputHour.SetRCode(clsSprintfFunction, bReset) + ucrReceiverStationID.SetRCode(clsDataFrameFunction, bReset) ucrSaveNewDataFrame.SetRCode(clsPipeOperator, bReset) ucrInputExportFile.SetRCode(clsExportClimsoftFunction, bReset) + ucrPnlDailyHourly.SetRCode(clsDummyFunction, bReset) If bReset Then ucrChkExportDataFrame.SetRCode(clsDummyFunction, bReset) ucrChkNewDataFrame.SetRCode(clsDummyFunction, bReset) @@ -135,7 +161,7 @@ Public Class dlgExportToClimsoft Private Sub TestOkEnabled() ucrBase.OKEnabled(Not ucrReceiverDate.IsEmpty _ AndAlso Not ucrReceiverElements.IsEmpty _ - AndAlso Not ucrReceiverStation.IsEmpty + AndAlso (Not ucrReceiverStation.IsEmpty OrElse Not ucrReceiverStationID.IsEmpty) ) If ucrChkNewDataFrame.Checked And Not ucrSaveNewDataFrame.IsComplete Then ucrBase.OKEnabled(False) @@ -245,8 +271,8 @@ Public Class dlgExportToClimsoft End Sub Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElements.ControlContentsChanged, - ucrReceiverDate.ControlContentsChanged, ucrReceiverStation.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, ucrInputLevel.ControlContentsChanged, - ucrInputLevel.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged + ucrReceiverDate.ControlContentsChanged, ucrReceiverStation.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, + ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged TestOkEnabled() End Sub @@ -256,4 +282,24 @@ Public Class dlgExportToClimsoft End If SettingBaseFunction() End Sub + + Private Sub ucrInputHour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHour.ControlValueChanged + If Not ucrInputHour.IsEmpty Then + clsSprintfFunction.AddParameter("format", Chr(34) & "%02d:00:00" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsSprintfFunction.AddParameter("hour", ucrInputHour.GetText, bIncludeArgumentName:=False, iPosition:=1) + + Else + clsSprintfFunction.RemoveParameterByName("format") + clsSprintfFunction.RemoveParameterByName("hour") + End If + End Sub + + Private Sub ucrReceiverDate_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDate.ControlValueChanged + If Not ucrReceiverDate.IsEmpty Then + clsPasteFunction.AddParameter("date_time", clsRFunctionParameter:=clsSprintfFunction, iPosition:=3, bIncludeArgumentName:=False) + Else + clsPasteFunction.RemoveParameterByName("date") + clsPasteFunction.RemoveParameterByName("date_time") + End If + End Sub End Class \ No newline at end of file From 268cb3823c96099cf106ba2a28c67d7ec8567422 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 4 Sep 2024 09:42:36 +0100 Subject: [PATCH 114/273] Added drop parameter on Start and End of rain --- instat/dlgEndOfRainsSeason.vb | 16 ++++++++++++---- instat/dlgStartofRains.vb | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 8 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 2067cedc683..205815734a4 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -29,7 +29,7 @@ Public Class dlgEndOfRainsSeason #Region "general_code_structures" ' General - Private clsRunCalculation As New RFunction + Private clsRunCalculation, clsListCalFunction, clsDummyFunction As New RFunction Private clsFirstOrLastFunction As New RFunction ' Group by @@ -243,8 +243,8 @@ Public Class dlgEndOfRainsSeason ucrInputEndRainDoy.SetValidationTypeAsRVariable() ucrInputEndRainDoy.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) - ucrChkEndofRainsDate.AddParameterPresentCondition(True, "sub2") - ucrChkEndofRainsDate.AddParameterPresentCondition(False, "sub2", False) + ucrChkEndofRainsDate.AddParameterValuesCondition(True, "sub2", "True") + ucrChkEndofRainsDate.AddParameterValuesCondition(False, "sub2", "False") ucrChkEndofRainsDate.SetText("Date") ucrInputEndofRainsDate.SetParameter(New RParameter("result_name", 2)) @@ -363,6 +363,7 @@ Public Class dlgEndOfRainsSeason #Region "clear_code_structures" ' General clsRunCalculation.Clear() + clsListCalFunction.Clear() clsFirstOrLastFunction.Clear() ' Group by @@ -498,6 +499,9 @@ Public Class dlgEndOfRainsSeason ucrNudCapacity.SetText("100") ucrNudWBLessThan.SetText("0.5") + clsDummyFunction = New RFunction + clsDummyFunction.AddParameter("sub2", "True", iPosition:=0) + ' Group by clsGroupByStationYearCalc.SetRCommand("instat_calculation$new") clsGroupByStationYearCalc.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) @@ -644,9 +648,13 @@ Public Class dlgEndOfRainsSeason clsEndRainsCombinationSubCalcList.SetRCommand("list") clsEndRainsCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsEndRainsLastDoySummaryCalc, bIncludeArgumentName:=False, iPosition:=0) + clsListCalFunction.SetRCommand("list") + clsListCalFunction.AddParameter("drop", "FALSE", iPosition:=0) + clsRunCalculation.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation") clsRunCalculation.AddParameter("display", "FALSE") clsRunCalculation.AddParameter("calc", clsRFunctionParameter:=clsEndRainsCombinationCalc) + clsRunCalculation.AddParameter("param_list", clsRFunctionParameter:=clsListCalFunction, iPosition:=2) ucrBase.clsRsyntax.SetBaseRFunction(clsRunCalculation) #End Region @@ -958,7 +966,7 @@ Public Class dlgEndOfRainsSeason ucrNudAmount.SetRCode(clsEndRainsRollSumRainConditionOperator, bReset) ucrNudTotalOverDays.SetRCode(clsRollSumRainFunction, bReset) ucrChkEndofRainsDoy.SetRCode(clsEndRainsCombinationSubCalcList, bReset) - ucrChkEndofRainsDate.SetRCode(clsEndRainsCombinationSubCalcList, bReset) + ucrChkEndofRainsDate.SetRCode(clsDummyFunction, bReset) ucrChkEndofRainsOccurence.SetRCode(clsEndRainsCombinationSubCalcList, bReset) ucrPnlEndOfRainsAndSeasons.SetRCode(clsFirstOrLastFunction, bReset) End Sub diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 8717e3e6506..ea6a26c25f2 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class dlgStartofRains - Private clsCalcRainDay, clsCalcStartDOY, clsCalcStartDate, clsCombinationCalc, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private clsCalcRainDay, clsCalcStartDOY, clsDummyFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction Private clsDayFromAndToOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction @@ -244,8 +244,8 @@ Public Class dlgStartofRains ucrChkAsDoy.AddParameterPresentCondition(False, "sub1", False) ucrChkAsDoy.SetText("Day of Year") - ucrChkAsDate.AddParameterPresentCondition(True, "sub2", True) - ucrChkAsDate.AddParameterPresentCondition(False, "sub2", False) + ucrChkAsDate.AddParameterValuesCondition(True, "sub2", "True") + ucrChkAsDate.AddParameterValuesCondition(False, "sub2", "False") ucrChkAsDate.SetText("Date") ucrChkStatus.AddParameterPresentCondition(True, "sub3", True) @@ -279,6 +279,7 @@ Public Class dlgStartofRains clsCombinedList.Clear() clsCombinationCalc.Clear() clsListSubCalc.Clear() + clsListCalFunction.Clear() clsCombinationSubCalcList.Clear() clsSpellsFunction.Clear() @@ -354,6 +355,9 @@ Public Class dlgStartofRains clsDayFilterCalcFromList.SetRCommand("list") clsDayFilterCalcFromConvert.AddParameter("x", clsRFunctionParameter:=clsDayFilterCalcFromList, iPosition:=0) + clsDummyFunction = New RFunction + clsDummyFunction.AddParameter("sub2", "True", iPosition:=0) + 'Day From and To clsDayFromAndTo.SetRCommand("instat_calculation$new") clsDayFromAndTo.AddParameter("type", Chr(34) & "filter" & Chr(34), iPosition:=0) @@ -708,9 +712,13 @@ Public Class dlgStartofRains clsListSubCalc.AddParameter("sub1", iPosition:=0, clsRFunctionParameter:=clsCalcStartDOY, bIncludeArgumentName:=False) 'Run Calculations + clsListCalFunction.SetRCommand("list") + clsListCalFunction.AddParameter("drop", "FALSE", iPosition:=0) + clsApplyInstatFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation") clsApplyInstatFunction.AddParameter("display", "FALSE", iPosition:=1) clsApplyInstatFunction.AddParameter("calc", clsRFunctionParameter:=clsCombinationCalc, iPosition:=0) + clsApplyInstatFunction.AddParameter("param_list", clsRFunctionParameter:=clsListCalFunction, iPosition:=2) 'Base Function ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatFunction) @@ -736,7 +744,7 @@ Public Class dlgStartofRains ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) ucrChkAsDoy.SetRCode(clsCombinationSubCalcList, bReset) ucrChkStatus.SetRCode(clsCombinationSubCalcList, bReset) - ucrChkAsDate.SetRCode(clsCombinationSubCalcList, bReset) + ucrChkAsDate.SetRCode(clsDummyFunction, bReset) ucrInputThreshold.SetRCode(clsRainDayOperator, bReset) ucrReceiverDate.SetRCode(clsFirstDate, bReset) From c1095b77a174762996e263475cc1e305c64bd02a Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 9 Sep 2024 13:37:29 +0300 Subject: [PATCH 115/273] changes to the code --- instat/dlgRPackages.Designer.vb | 35 ++++++++++++++++++++--------- instat/dlgRPackages.vb | 39 ++++++++++++++++++++++++++------- 2 files changed, 56 insertions(+), 18 deletions(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index b62f5844fc6..3593fd73b0d 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -32,13 +32,14 @@ Partial Class dlgInstallRPackage Me.ucrPnlRPackages = New instat.UcrPanel() Me.ucrInputMessage = New instat.ucrInputTextBox() Me.ucrInputRepositoryName = New instat.ucrInputTextBox() + Me.ucrInputPackage = New instat.ucrInputComboBox() Me.SuspendLayout() ' 'cmdCheck ' Me.cmdCheck.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdCheck.Location = New System.Drawing.Point(18, 150) - Me.cmdCheck.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCheck.Margin = New System.Windows.Forms.Padding(4) Me.cmdCheck.Name = "cmdCheck" Me.cmdCheck.Size = New System.Drawing.Size(112, 33) Me.cmdCheck.TabIndex = 7 @@ -66,7 +67,7 @@ Partial Class dlgInstallRPackage Me.rdoCRAN.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoCRAN.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoCRAN.Location = New System.Drawing.Point(206, 9) - Me.rdoCRAN.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoCRAN.Margin = New System.Windows.Forms.Padding(4) Me.rdoCRAN.Name = "rdoCRAN" Me.rdoCRAN.Size = New System.Drawing.Size(136, 42) Me.rdoCRAN.TabIndex = 1 @@ -86,7 +87,7 @@ Partial Class dlgInstallRPackage Me.rdoRPackage.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoRPackage.Location = New System.Drawing.Point(338, 9) - Me.rdoRPackage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoRPackage.Margin = New System.Windows.Forms.Padding(4) Me.rdoRPackage.Name = "rdoRPackage" Me.rdoRPackage.Size = New System.Drawing.Size(136, 42) Me.rdoRPackage.TabIndex = 2 @@ -112,7 +113,7 @@ Partial Class dlgInstallRPackage Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(15, 199) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 9 @@ -124,7 +125,7 @@ Partial Class dlgInstallRPackage Me.ucrInputTextBoxRPackage.IsMultiline = False Me.ucrInputTextBoxRPackage.IsReadOnly = False Me.ucrInputTextBoxRPackage.Location = New System.Drawing.Point(151, 66) - Me.ucrInputTextBoxRPackage.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputTextBoxRPackage.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputTextBoxRPackage.Name = "ucrInputTextBoxRPackage" Me.ucrInputTextBoxRPackage.Size = New System.Drawing.Size(296, 33) Me.ucrInputTextBoxRPackage.TabIndex = 4 @@ -133,7 +134,7 @@ Partial Class dlgInstallRPackage ' Me.ucrPnlRPackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlRPackages.Location = New System.Drawing.Point(174, 8) - Me.ucrPnlRPackages.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlRPackages.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlRPackages.Name = "ucrPnlRPackages" Me.ucrPnlRPackages.Size = New System.Drawing.Size(339, 51) Me.ucrPnlRPackages.TabIndex = 0 @@ -145,7 +146,7 @@ Partial Class dlgInstallRPackage Me.ucrInputMessage.IsMultiline = False Me.ucrInputMessage.IsReadOnly = True Me.ucrInputMessage.Location = New System.Drawing.Point(151, 150) - Me.ucrInputMessage.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputMessage.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputMessage.Name = "ucrInputMessage" Me.ucrInputMessage.Size = New System.Drawing.Size(475, 33) Me.ucrInputMessage.TabIndex = 8 @@ -157,11 +158,23 @@ Partial Class dlgInstallRPackage Me.ucrInputRepositoryName.IsMultiline = False Me.ucrInputRepositoryName.IsReadOnly = False Me.ucrInputRepositoryName.Location = New System.Drawing.Point(151, 105) - Me.ucrInputRepositoryName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputRepositoryName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputRepositoryName.Name = "ucrInputRepositoryName" - Me.ucrInputRepositoryName.Size = New System.Drawing.Size(296, 33) + Me.ucrInputRepositoryName.Size = New System.Drawing.Size(346, 33) Me.ucrInputRepositoryName.TabIndex = 6 ' + 'ucrInputPackage + ' + Me.ucrInputPackage.AddQuotesIfUnrecognised = True + Me.ucrInputPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputPackage.GetSetSelectedIndex = -1 + Me.ucrInputPackage.IsReadOnly = False + Me.ucrInputPackage.Location = New System.Drawing.Point(151, 61) + Me.ucrInputPackage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputPackage.Name = "ucrInputPackage" + Me.ucrInputPackage.Size = New System.Drawing.Size(323, 32) + Me.ucrInputPackage.TabIndex = 10 + ' 'dlgInstallRPackage ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) @@ -178,8 +191,9 @@ Partial Class dlgInstallRPackage Me.Controls.Add(Me.lblRepository) Me.Controls.Add(Me.cmdCheck) Me.Controls.Add(Me.ucrInputMessage) + Me.Controls.Add(Me.ucrInputPackage) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgInstallRPackage" @@ -199,4 +213,5 @@ Partial Class dlgInstallRPackage Friend WithEvents rdoRPackage As RadioButton Friend WithEvents lblRepository As Label Friend WithEvents ucrInputRepositoryName As ucrInputTextBox + Friend WithEvents ucrInputPackage As ucrInputComboBox End Class diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 2ea21aa60af..7945d6d3aba 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -26,20 +26,35 @@ Public Class dlgInstallRPackage End Sub Private Sub InitialiseDialog() + Dim dctPackages As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 592 ucrBase.clsRsyntax.iCallType = 2 ucrInputTextBoxRPackage.SetParameter(New RParameter("pkgs", 1)) ucrPnlRPackages.AddRadioButton(rdoCRAN) ucrPnlRPackages.AddRadioButton(rdoRPackage) - ucrInputRepositoryName.SetLinkedDisplayControl(lblRepository) + ucrInputPackage.SetParameter(New RParameter("pkgs", 1)) + dctPackages.Add(" ", Chr(34) & " " & Chr(34)) + dctPackages.Add("rpicsa", Chr(34) & "rpicsa" & Chr(34)) + dctPackages.Add("epicsawrap", Chr(34) & "epicsawrap" & Chr(34)) + dctPackages.Add("cdms.products", Chr(34) & "cdms.products" & Chr(34)) + dctPackages.Add("carbonr", Chr(34) & "carbonr" & Chr(34)) + dctPackages.Add("rapidpror", Chr(34) & "rapidpror" & Chr(34)) + dctPackages.Add("openappr", Chr(34) & "openappr" & Chr(34)) + dctPackages.Add("networkGraphsR", Chr(34) & "networkGraphsR" & Chr(34)) + ucrInputPackage.SetItems(dctPackages) ucrPnlRPackages.AddParameterValuesCondition(rdoCRAN, "checked", "cran") ucrPnlRPackages.AddParameterValuesCondition(rdoRPackage, "checked", "rpackage") ucrInputMessage.SetLinkedDisplayControl(cmdCheck) - ucrPnlRPackages.AddToLinkedControls(ucrInputRepositoryName, {rdoRPackage}, bNewLinkedHideIfParameterMissing:=True) + ucrInputRepositoryName.SetLinkedDisplayControl(lblRepository) + + ucrPnlRPackages.AddToLinkedControls(ucrInputRepositoryName, {rdoRPackage}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="IDEMSInternational") + ucrPnlRPackages.AddToLinkedControls({ucrInputTextBoxRPackage}, {rdoCRAN}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlRPackages.AddToLinkedControls(ucrInputPackage, {rdoRPackage}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=" ") CheckEnable() End Sub @@ -71,6 +86,7 @@ Public Class dlgInstallRPackage Private Sub SetRCodeForControls(bReset As Boolean) ucrInputTextBoxRPackage.SetRCode(clsInstallPackage, bReset) + ucrInputPackage.SetRCode(clsInstallPackage, bReset) If bReset Then ucrPnlRPackages.SetRCode(clsDummyFunction, bReset) ucrInputRepositoryName.SetRCode(clsRepositoryFunction, bReset) @@ -81,11 +97,11 @@ Public Class dlgInstallRPackage If rdoCRAN.Checked Then ucrBase.OKEnabled(Not ucrInputTextBoxRPackage.IsEmpty) ElseIf rdoRPackage.Checked Then - ucrBase.OKEnabled(Not ucrInputRepositoryName.IsEmpty AndAlso Not ucrInputTextBoxRPackage.IsEmpty AndAlso bUniqueChecked) + ucrBase.OKEnabled(Not ucrInputRepositoryName.IsEmpty AndAlso Not ucrInputPackage.IsEmpty AndAlso bUniqueChecked) End If End Sub - Private Sub ucrInputTextBoxRPackage_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputTextBoxRPackage.ControlContentsChanged + Private Sub ucrInputTextBoxRPackage_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputTextBoxRPackage.ControlContentsChanged, ucrInputPackage.ControlContentsChanged bUniqueChecked = False ucrInputMessage.SetText("") ucrInputMessage.txtInput.BackColor = Color.White @@ -104,7 +120,7 @@ Public Class dlgInstallRPackage clsPackageCheck.AddParameter("package", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) ElseIf rdoRPackage.Checked Then clsPackageCheck.SetRCommand("check_github_repo") - clsPackageCheck.AddParameter("repo", Chr(34) & ucrInputTextBoxRPackage.GetText() & Chr(34)) + clsPackageCheck.AddParameter("repo", Chr(34) & ucrInputPackage.GetText() & Chr(34)) clsPackageCheck.AddParameter("owner", Chr(34) & ucrInputRepositoryName.GetText() & Chr(34)) End If expOutput = frmMain.clsRLink.RunInternalScriptGetValue(clsPackageCheck.ToScript(), bSilent:=True) @@ -173,6 +189,13 @@ Public Class dlgInstallRPackage cmdCheck.Enabled = False ucrInputMessage.Enabled = False End If + If Not ucrInputPackage.IsEmpty Then + cmdCheck.Enabled = True + ucrInputMessage.Enabled = True + Else + cmdCheck.Enabled = False + ucrInputMessage.Enabled = False + End If End Sub Private Sub cmdCheck_Click(sender As Object, e As EventArgs) Handles cmdCheck.Click @@ -192,15 +215,15 @@ Public Class dlgInstallRPackage ucrInputTextBoxRPackage.txtInput.Clear() End Sub - Private Sub ucrInputRepositoryName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRepositoryName.ControlContentsChanged + Private Sub ucrInputRepositoryName_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputRepositoryName.ControlValueChanged TestOkEnabled() GithubOption() bUniqueChecked = False End Sub Private Sub GithubOption() - If Not (ucrInputTextBoxRPackage.IsEmpty AndAlso ucrInputRepositoryName.IsEmpty) Then - clsRepositoryFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputTextBoxRPackage.GetText & Chr(34), bIncludeArgumentName:=False) + If Not (ucrInputPackage.IsEmpty AndAlso ucrInputRepositoryName.IsEmpty) Then + clsRepositoryFunction.AddParameter("paste", Chr(34) & ucrInputRepositoryName.GetText & "/" & ucrInputPackage.GetText() & Chr(34), bIncludeArgumentName:=False) Else clsRepositoryFunction.RemoveParameterByName("paste") End If From 63212eaf0a82abf9b7fd4fc7891af724b22b5f7c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 9 Sep 2024 13:42:53 +0300 Subject: [PATCH 116/273] changes --- instat/dlgRPackages.Designer.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgRPackages.Designer.vb b/instat/dlgRPackages.Designer.vb index 3593fd73b0d..ac7d9b97aa1 100644 --- a/instat/dlgRPackages.Designer.vb +++ b/instat/dlgRPackages.Designer.vb @@ -160,7 +160,7 @@ Partial Class dlgInstallRPackage Me.ucrInputRepositoryName.Location = New System.Drawing.Point(151, 105) Me.ucrInputRepositoryName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputRepositoryName.Name = "ucrInputRepositoryName" - Me.ucrInputRepositoryName.Size = New System.Drawing.Size(346, 33) + Me.ucrInputRepositoryName.Size = New System.Drawing.Size(471, 33) Me.ucrInputRepositoryName.TabIndex = 6 ' 'ucrInputPackage From 57d340060612a2f8b4a61994e3f891920f2e4370 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 10 Sep 2024 10:40:58 +0300 Subject: [PATCH 117/273] displaying roman in the grid --- instat/static/InstatObject/R/stand_alone_functions.R | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 79b7472c29f..2f0a88e8cb6 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -24,11 +24,7 @@ convert_to_character_matrix <- function(data, format_decimal_places = TRUE, deci #which are recognised oddly by the R.Net out[, i] <- as.character(data[[i]]) } else { - temp_data <- c() - for(val in data[[i]]){ - temp_data <- append(temp_data, format(val, digits = decimal_places[i], scientific = is_scientific[i])) - } - out[, i] <- temp_data + out[,i] <- format(data[[i]], digits = decimal_places[i], scientific = is_scientific[i]) } if (!is.null(na_display)) { out[is.na(data[[i]]), i] <- na_display From 373d22c749d46e8ee4721781be23aa86445a74bf Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 11 Sep 2024 10:35:46 +0100 Subject: [PATCH 118/273] Change made --- instat/dlgEndOfRainsSeason.vb | 19 ++++++++++--------- instat/dlgStartofRains.vb | 7 ++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/instat/dlgEndOfRainsSeason.vb b/instat/dlgEndOfRainsSeason.vb index 205815734a4..8bf2b645f9b 100644 --- a/instat/dlgEndOfRainsSeason.vb +++ b/instat/dlgEndOfRainsSeason.vb @@ -252,8 +252,8 @@ Public Class dlgEndOfRainsSeason ucrInputEndofRainsDate.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) ucrChkEndofRainsOccurence.SetText("Occurrence") - ucrChkEndofRainsOccurence.AddParameterPresentCondition(True, "sub3") - ucrChkEndofRainsOccurence.AddParameterPresentCondition(False, "sub3", False) + ucrChkEndofRainsOccurence.AddParameterValuesCondition(True, "sub3", "True") + ucrChkEndofRainsOccurence.AddParameterValuesCondition(False, "sub3", "False") ucrInputEndofRainsOccurence.SetParameter(New RParameter("result_name", 2)) ucrInputEndofRainsOccurence.SetValidationTypeAsRVariable() @@ -289,15 +289,15 @@ Public Class dlgEndOfRainsSeason ucrInputSeasonDoy.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) ucrChkEndofSeasonDate.SetText("Date") - ucrChkEndofSeasonDate.AddParameterPresentCondition(True, "sub2") - ucrChkEndofSeasonDate.AddParameterPresentCondition(False, "sub2", False) + ucrChkEndofSeasonDate.AddParameterValuesCondition(True, "sub2", "True") + ucrChkEndofSeasonDate.AddParameterValuesCondition(False, "sub2", "False") ucrInputEndofSeasonDate.SetParameter(New RParameter("result_name", 3)) ucrInputEndofSeasonDate.SetValidationTypeAsRVariable() ucrInputEndofSeasonDate.SetDataFrameSelector(ucrSelectorForWaterBalance.ucrAvailableDataFrames) - ucrChkEndofSeasonOccurence.AddParameterPresentCondition(True, "sub3") - ucrChkEndofSeasonOccurence.AddParameterPresentCondition(False, "sub3", False) + ucrChkEndofSeasonOccurence.AddParameterValuesCondition(True, "sub3", "True") + ucrChkEndofSeasonOccurence.AddParameterValuesCondition(False, "sub3", "False") ucrChkEndofSeasonOccurence.SetText("Occurrence") ucrInputEndofSeasonOccurence.SetParameter(New RParameter("result_name", 2)) @@ -501,6 +501,7 @@ Public Class dlgEndOfRainsSeason clsDummyFunction = New RFunction clsDummyFunction.AddParameter("sub2", "True", iPosition:=0) + clsDummyFunction.AddParameter("sub3", "True", iPosition:=1) ' Group by clsGroupByStationYearCalc.SetRCommand("instat_calculation$new") @@ -960,14 +961,14 @@ Public Class dlgEndOfRainsSeason End If ucrChkEndofSeasonDoy.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) - ucrChkEndofSeasonDate.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) - ucrChkEndofSeasonOccurence.SetRCode(clsEndSeasonCombinationSubCalcList, bReset) + ucrChkEndofSeasonDate.SetRCode(clsDummyFunction, bReset) + ucrChkEndofSeasonOccurence.SetRCode(clsDummyFunction, bReset) ucrNudAmount.SetRCode(clsEndRainsRollSumRainConditionOperator, bReset) ucrNudTotalOverDays.SetRCode(clsRollSumRainFunction, bReset) ucrChkEndofRainsDoy.SetRCode(clsEndRainsCombinationSubCalcList, bReset) ucrChkEndofRainsDate.SetRCode(clsDummyFunction, bReset) - ucrChkEndofRainsOccurence.SetRCode(clsEndRainsCombinationSubCalcList, bReset) + ucrChkEndofRainsOccurence.SetRCode(clsDummyFunction, bReset) ucrPnlEndOfRainsAndSeasons.SetRCode(clsFirstOrLastFunction, bReset) End Sub diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index ea6a26c25f2..759ad8cbe58 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -248,8 +248,8 @@ Public Class dlgStartofRains ucrChkAsDate.AddParameterValuesCondition(False, "sub2", "False") ucrChkAsDate.SetText("Date") - ucrChkStatus.AddParameterPresentCondition(True, "sub3", True) - ucrChkStatus.AddParameterPresentCondition(False, "sub3", False) + ucrChkStatus.AddParameterValuesCondition(True, "sub3", "True") + ucrChkStatus.AddParameterValuesCondition(False, "sub3", "False") ucrChkStatus.SetText("Occurrence") End Sub @@ -357,6 +357,7 @@ Public Class dlgStartofRains clsDummyFunction = New RFunction clsDummyFunction.AddParameter("sub2", "True", iPosition:=0) + clsDummyFunction.AddParameter("sub3", "True", iPosition:=1) 'Day From and To clsDayFromAndTo.SetRCommand("instat_calculation$new") @@ -743,7 +744,7 @@ Public Class dlgStartofRains ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) ucrChkAsDoy.SetRCode(clsCombinationSubCalcList, bReset) - ucrChkStatus.SetRCode(clsCombinationSubCalcList, bReset) + ucrChkStatus.SetRCode(clsDummyFunction, bReset) ucrChkAsDate.SetRCode(clsDummyFunction, bReset) ucrInputThreshold.SetRCode(clsRainDayOperator, bReset) From 5c7003838acbbfb363772404ac3a5ba278d4ba12 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Thu, 12 Sep 2024 09:41:56 +0300 Subject: [PATCH 119/273] added column type for roman --- instat/Model/DataFrame/clsDataFramePage.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 9d1250831aa..2c119733bc4 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -286,7 +286,7 @@ Public Class clsDataFramePage columnHeader.strTypeShortCode = "(L)" ' Structured columns e.g. "circular or bigz or bigq " are coded with "(S)" ElseIf strHeaderType.Contains("circular") OrElse strHeaderType.Contains("bigz") OrElse - strHeaderType.Contains("bigq") OrElse strHeaderType.Contains("polynomial") Then + strHeaderType.Contains("bigq") OrElse strHeaderType.Contains("polynomial") OrElse strHeaderType.Contains("roman") Then columnHeader.strTypeShortCode = "(S)" ElseIf strHeaderType.Contains("list") Then columnHeader.strTypeShortCode = "(LT)" From 31320d3e542af46306ffa916874167d0771023d7 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:48:08 +0200 Subject: [PATCH 120/273] unticked the NTotal checkbox when opening the column summaries subdialog --- instat/dlgColumnStats.vb | 1 - 1 file changed, 1 deletion(-) diff --git a/instat/dlgColumnStats.vb b/instat/dlgColumnStats.vb index 98e43b2340a..ba0c66beead 100644 --- a/instat/dlgColumnStats.vb +++ b/instat/dlgColumnStats.vb @@ -112,7 +112,6 @@ Public Class dlgColumnStats clsSummariesList.SetRCommand("c") clsSummariesList.AddParameter("summary_count_non_missing", Chr(34) & "summary_count_non_missing" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsSummariesList.AddParameter("summary_count", Chr(34) & "summary_count" & Chr(34), bIncludeArgumentName:=False, iPosition:=3) clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False, iPosition:=11) clsDefaultFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$calculate_summary") From 77d1ea8840f228b50ce45a2c62b0765a1ee10e8c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 12 Sep 2024 16:12:22 +0300 Subject: [PATCH 121/273] changes --- instat/sdgSelectMonth.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/sdgSelectMonth.vb b/instat/sdgSelectMonth.vb index 63c4f6209eb..e625c96a900 100644 --- a/instat/sdgSelectMonth.vb +++ b/instat/sdgSelectMonth.vb @@ -30,6 +30,7 @@ Public Class sdgSelectMonth ucrMonthAsFactor.SetAsMultipleSelectorGrid(ucrReceiverMonth, hiddenColNames:={ucrFactor.DefaultColumnNames.Level}, bIncludeNALevel:=False) + ucrMonthAsFactor.btnSelectAll.Enabled = False End Sub Public Sub SetRCode(Optional clsNewInOperator As ROperator = Nothing, Optional clsNewListCalcFunction As RFunction = Nothing, Optional clsNewFilterMonthFunction As RFunction = Nothing, Optional ucrNewReceiverMonth As ucrReceiverSingle = Nothing, Optional bReset As Boolean = False) From 54da58357dfdd458fd68f1a21f8693a25fbdac8a Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 16 Sep 2024 10:22:14 +0300 Subject: [PATCH 122/273] changes --- instat/dlgExportToClimsoft.vb | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 3946732a6dd..084b77e91db 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -20,7 +20,7 @@ Imports instat.Translations Public Class dlgExportToClimsoft Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsFormatFunction, clsPosixctFunction As New RFunction + Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsPosixctFunction As New RFunction Private clsPipeOperator As New ROperator Private Sub dlgExportToClimsoft_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -112,12 +112,8 @@ Public Class dlgExportToClimsoft clsPosixctFunction.AddParameter("x", clsRFunctionParameter:=clsPasteFunction, bIncludeArgumentName:=False, iPosition:=0) clsPosixctFunction.AddParameter("format", Chr(34) & "%Y-%m-%d %H:%M:%S" & Chr(34), iPosition:=1) - clsFormatFunction.SetRCommand("format") - clsFormatFunction.AddParameter("posix", clsRFunctionParameter:=clsPosixctFunction, bIncludeArgumentName:=False, iPosition:=0) - clsFormatFunction.AddParameter("yhs", Chr(34) & "%Y-%m-%d %H:%M:%S" & Chr(34), bIncludeArgumentName:=False, iPosition:=1) - clsDataFrameFunction.SetRCommand("data.frame") - clsDataFrameFunction.AddParameter("date_time", clsRFunctionParameter:=clsFormatFunction, iPosition:=0) + clsDataFrameFunction.AddParameter("date_time", clsRFunctionParameter:=clsPosixctFunction, iPosition:=0) clsDataFrameFunction.AddParameter("x", "columns", iPosition:=5, bIncludeArgumentName:=False) clsPipeOperator.SetOperation("%>%") From ff97c4b8d7f72fb5493eda55a3862427c6ed6f37 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 16 Sep 2024 10:56:10 +0300 Subject: [PATCH 123/273] escaped characters --- instat/dlgClimSoft.Designer.vb | 32 ++--- instat/dlgClimSoft.vb | 16 ++- .../static/InstatObject/R/instat_object_R6.R | 133 +----------------- 3 files changed, 35 insertions(+), 146 deletions(-) diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb index 1c5b32afda8..498170e670b 100644 --- a/instat/dlgClimSoft.Designer.vb +++ b/instat/dlgClimSoft.Designer.vb @@ -49,6 +49,7 @@ Partial Class dlgClimSoft Me.ucrDtpEndDataDate = New instat.ucrDateTimePicker() Me.ucrDtpStartDataDate = New instat.ucrDateTimePicker() Me.ucrChkImportFlagsMetadata = New instat.ucrCheck() + Me.ucrChKUnstackData = New instat.ucrCheck() Me.lblConnection = New System.Windows.Forms.Label() Me.lblToDataDate = New System.Windows.Forms.Label() Me.lblSelectTable = New System.Windows.Forms.Label() @@ -67,7 +68,6 @@ Partial Class dlgClimSoft Me.ucrReceiverMultipleElements = New instat.ucrReceiverMultiple() Me.ucrReceiverMultipleStations = New instat.ucrReceiverMultiple() Me.ucrBase = New instat.ucrButtons() - Me.ucrChKUnstackData = New instat.ucrCheck() Me.SuspendLayout() ' 'btnConnection @@ -87,7 +87,7 @@ Partial Class dlgClimSoft Me.lblSelectElements.Location = New System.Drawing.Point(285, 226) Me.lblSelectElements.Name = "lblSelectElements" Me.lblSelectElements.Size = New System.Drawing.Size(86, 13) - Me.lblSelectElements.TabIndex = 4 + Me.lblSelectElements.TabIndex = 5 Me.lblSelectElements.Text = "Select Elements:" ' 'lblSelectStations @@ -173,6 +173,17 @@ Partial Class dlgClimSoft Me.ucrChkImportFlagsMetadata.TabIndex = 37 Me.ttClimsoft.SetToolTip(Me.ucrChkImportFlagsMetadata, "Unstack elements") ' + 'ucrChKUnstackData + ' + Me.ucrChKUnstackData.AutoSize = True + Me.ucrChKUnstackData.Checked = False + Me.ucrChKUnstackData.Location = New System.Drawing.Point(8, 289) + Me.ucrChKUnstackData.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrChKUnstackData.Name = "ucrChKUnstackData" + Me.ucrChKUnstackData.Size = New System.Drawing.Size(169, 23) + Me.ucrChKUnstackData.TabIndex = 38 + Me.ttClimsoft.SetToolTip(Me.ucrChKUnstackData, "Select Observation Data Date Range") + ' 'lblConnection ' Me.lblConnection.AutoSize = True @@ -325,7 +336,7 @@ Partial Class dlgClimSoft Me.ucrCboElements.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrCboElements.Name = "ucrCboElements" Me.ucrCboElements.Size = New System.Drawing.Size(137, 21) - Me.ucrCboElements.TabIndex = 5 + Me.ucrCboElements.TabIndex = 6 ' 'ucrCboStations ' @@ -359,7 +370,7 @@ Partial Class dlgClimSoft Me.ucrReceiverMultipleElements.Selector = Nothing Me.ucrReceiverMultipleElements.Size = New System.Drawing.Size(137, 100) Me.ucrReceiverMultipleElements.strNcFilePath = "" - Me.ucrReceiverMultipleElements.TabIndex = 6 + Me.ucrReceiverMultipleElements.TabIndex = 7 Me.ucrReceiverMultipleElements.ucrSelector = Nothing ' 'ucrReceiverMultipleStations @@ -385,17 +396,6 @@ Partial Class dlgClimSoft Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 14 ' - 'ucrChKUnstackData - ' - Me.ucrChKUnstackData.AutoSize = True - Me.ucrChKUnstackData.Checked = False - Me.ucrChKUnstackData.Location = New System.Drawing.Point(8, 289) - Me.ucrChKUnstackData.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrChKUnstackData.Name = "ucrChKUnstackData" - Me.ucrChKUnstackData.Size = New System.Drawing.Size(169, 23) - Me.ucrChKUnstackData.TabIndex = 38 - Me.ttClimsoft.SetToolTip(Me.ucrChKUnstackData, "Select Observation Data Date Range") - ' 'dlgClimSoft ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -435,7 +435,7 @@ Partial Class dlgClimSoft Me.MinimizeBox = False Me.Name = "dlgClimSoft" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Import From Climsoft" + Me.Text = "Import From Climsoft (version 4.2.2)" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgClimSoft.vb b/instat/dlgClimSoft.vb index b448a049de6..4bff7f4305b 100644 --- a/instat/dlgClimSoft.vb +++ b/instat/dlgClimSoft.vb @@ -275,8 +275,8 @@ Public Class dlgClimSoft Dim strTableName As String = dctTables.Item(ucrCboTable.GetText).Trim("""") Dim strStationColumn As String = dctStationCols.Item(ucrCboStations.GetText).Trim("""") Dim strElementsColumn As String = dctElementsCols.Item(ucrCboElements.GetText).Trim("""") - Dim strStationsValues As String = String.Join(",", ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=True, strQuotes:="'")) - Dim strElementsValues As String = String.Join(",", ucrReceiverMultipleElements.GetVariableNamesList(bWithQuotes:=True, strQuotes:="'")) + Dim strStationsValues As String = GetSQLArrayFilter(ucrReceiverMultipleStations.GetVariableNamesList(bWithQuotes:=False)) + Dim strElementsValues As String = GetSQLArrayFilter(ucrReceiverMultipleElements.GetVariableNamesList(bWithQuotes:=False)) Dim strQueryCondition As String = " INNER JOIN station ON " & strTableName & ".recordedFrom = station.stationId" & " INNER JOIN obselement ON " & strTableName & ".describedBy = obselement.elementId WHERE" & " station." & strStationColumn & " IN (" & strStationsValues & ")" & @@ -308,6 +308,18 @@ Public Class dlgClimSoft End Try End Sub + Private Function GetSQLArrayFilter(values() As String) As String + Dim strSQL As String = "" + For index As Integer = 0 To values.Length - 1 + If index = 0 Then + strSQL = "'" & values(index).Replace("'", "''") & "'" + Else + strSQL = strSQL & "," & "'" & values(index).Replace("'", "''") & "'" + End If + Next + Return strSQL + End Function + Private Sub ucrControlsContents_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverMultipleStations.ControlContentsChanged, ucrReceiverMultipleElements.ControlContentsChanged, ucrCboTable.ControlContentsChanged, ucrCboQCStatus.ControlContentsChanged, ucrDtpStartDataDate.ControlContentsChanged, ucrDtpEndDataDate.ControlContentsChanged, ucrPnlOptions.ControlContentsChanged, ucrChkImportStationsMetadata.ControlContentsChanged, ucrChkImportElementsMetadata.ControlContentsChanged, ucrChkImportFlagsMetadata.ControlContentsChanged Dim bValid As Boolean = False If rdoData.Checked Then diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index ee580e5519a..c3d38d9ee99 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1930,7 +1930,7 @@ DataBook$set("public", "import_climsoft_data", function(tableName, #-------------------------------- con <- self$get_database_connection() if(is.null(con)){ - stop("No database connection") + stop("No database connection") } if(missing(tableName) || missing(station_filter_column) || missing(element_filter_column) || length(stations) == 0 || length(elements) == 0){ @@ -2001,6 +2001,8 @@ DataBook$set("public", "import_climsoft_data", function(tableName, #filters #-------------------------------- + stations <- gsub("'", "''", stations) # Escape any apostrophes + elements <- gsub("'", "''", elements) # Escape any apostrophes sql_stations_filter <- paste0(" station.", station_filter_column, " IN ", paste0("(", paste0("'", stations, "'", collapse = ", "), ")")) sql_elements_filter <- paste0(" obselement.", element_filter_column, " IN ", paste0("(", paste0("'", elements, "'", collapse = ", "), ")")) @@ -2035,12 +2037,12 @@ DataBook$set("public", "import_climsoft_data", function(tableName, if(import_selected_stations_metadata){ stations_metadata_name <- next_default_item("stations_metadata", self$get_data_names(), include_index = FALSE) - data_list[[stations_metadata_name]] <- DBI::dbGetQuery(con, paste0("SELECT * FROM station WHERE", sql_stations_filter)) + data_list[[stations_metadata_name]] <- DBI::dbGetQuery(con, paste0("SELECT * FROM station WHERE ", sql_stations_filter)) } if(import_selected_elements_metadata){ elements_metadata_name <- next_default_item("elements_metadata", self$get_data_names(), include_index = FALSE) - data_list[[elements_metadata_name]] <- DBI::dbGetQuery(con, paste0("SELECT * FROM obselement WHERE", sql_elements_filter)) + data_list[[elements_metadata_name]] <- DBI::dbGetQuery(con, paste0("SELECT * FROM obselement WHERE ", sql_elements_filter)) } #-------------------------------- @@ -2106,131 +2108,6 @@ DataBook$set("public", "import_climsoft_data", function(tableName, }) -#TODO. Deprecated. Delete this after after deleting the import from Climsoft wizard dialog -DataBook$set("public", "import_from_climsoft", function(stationfiltercolumn = "stationId", stations = c(), elementfiltercolumn = "elementId", elements = c(), include_observation_data = FALSE, include_observation_flags = FALSE, unstack_data = FALSE, include_elements_info = FALSE, start_date = NULL, end_date = NULL) { - #need to perform checks here - con <- self$get_database_connection() - - #get stations database data and station ids values - if (length(stations) > 0) { - #construct a string of station values from the passed station vector eg of result ('191','122') - passed_station_values <- paste0("(", paste0("'", stations, "'", collapse = ", "), ")") - - #get the station info of the passed station values - db_station_info <- DBI::dbGetQuery(con, paste0( "SELECT * FROM station WHERE ", stationfiltercolumn, " IN ", passed_station_values, ";")) - - #set values of station ids only - if (stationfiltercolumn == "stationId") { - station_ids_values <- passed_station_values - } else{ - station_ids_values <- paste0("(", paste0("'", db_station_info$stationId, "'", collapse = ", "),")") - } - } - - #if true get observation data - if (include_observation_data) { - #if there are no elements passed then stop and throw error - if (length(elements) < 1) stop("start_date must be of type Date.") - - #set values of element ids only - if (elementfiltercolumn == "elementId") { - #get element id values directly from passed data - element_ids_values <- paste0("(", paste0(elements, collapse = ", "), ")") - } else{ - #get element id values from the database - passed_element_values <- paste0("(", paste0("'", elements, "'", collapse = ", "), ")") - db_elements_ids <- DBI::dbGetQuery( con, paste0("SELECT elementId FROM obselement WHERE ", elementfiltercolumn, " IN ", passed_element_values, ";" )) - element_ids_values <- paste0("(", paste0(sprintf("%d", db_elements_ids$elementId), collapse = ", "), ")") - } - - if(include_elements_info) { - db_elements_info <- DBI::dbGetQuery(con, paste0("SELECT elementId, elementName, abbreviation, description, elementtype, upperLimit, lowerLimit, units FROM obselement WHERE elementId ", " IN ", element_ids_values, ";" )) - } - - flags_column_col_sql <- " " - if (include_observation_flags) { - flags_column_col_sql <- ", observationfinal.flag AS flag" - } - - #get databounds filter query if dates have been passed - date_bounds_filter <- "" - if (!is.null(start_date)) { - if (!lubridate::is.Date(start_date)) - stop("start_date must be of type Date.") - start_date <- format(start_date, format = "%Y-%m-%d") - date_bounds_filter = paste0(date_bounds_filter, " AND obsDatetime >= ", sQuote(start_date)) - } - if (!is.null(end_date)) { - if (!lubridate::is.Date(end_date)) - stop("end_date must be of type Date.") - end_date <- format(end_date, format = "%Y-%m-%d") - date_bounds_filter <- paste0(date_bounds_filter," AND obsDatetime <=", sQuote(end_date)) - } - - #construct observation data sql query and get data from database - if (length(stations) > 0) { - #if stations passed get observation data of selected elements of passed stations - db_observation_data <- DBI::dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom As station, obselement.abbreviation AS element, observationfinal.obsDatetime AS datetime, observationfinal.obsValue AS obsvalue", flags_column_col_sql, " FROM observationfinal INNER JOIN obselement ON observationfinal.describedBy = obselement.elementId WHERE observationfinal.recordedFrom IN ", station_ids_values, " AND observationfinal.describedBy IN ", element_ids_values, date_bounds_filter, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) - } else{ - #if stations have not been passed get observation data of passed elements of all stations - db_observation_data <- DBI::dbGetQuery(con, paste0("SELECT observationfinal.recordedFrom As station, obselement.abbreviation AS element, observationfinal.obsDatetime AS datetime, observationfinal.obsValue AS obsvalue", flags_column_col_sql, " FROM observationfinal INNER JOIN obselement ON observationfinal.describedBy = obselement.elementId WHERE observationfinal.describedBy IN ", element_ids_values, date_bounds_filter, " ORDER BY observationfinal.recordedFrom, observationfinal.describedBy;")) - - #then get the stations ids (uniquely) from the observation data and use the ids to get station info - station_ids_values <- paste0("(", paste0("'", as.character(unique(db_observation_data$station) ), "'", collapse = ", "), ")") - db_station_info <- DBI::dbGetQuery(con, paste0("SELECT * FROM station WHERE stationId IN ", station_ids_values, ";" )) - } - - station_data_name <- next_default_item("stations_info", self$get_data_names(), include_index = FALSE) - elements_data_name <- next_default_item("elements_info", self$get_data_names(), include_index = FALSE) - observation_data_name <- next_default_item("observation_data", self$get_data_names(), include_index = FALSE) - - #elements info could be optional - if (include_elements_info) { - data_list <- list(db_station_info, db_elements_info, db_observation_data) - names(data_list) <- c(station_data_name, elements_data_name, observation_data_name) - } else{ - data_list <- list(db_station_info, db_observation_data) - names(data_list) <- c(station_data_name, observation_data_name) - } - - } else{ - if (length(stations) > 0) { - data_list <- list(db_station_info) - names(data_list) <- next_default_item("stations_info", self$get_data_names()) - } - } - - #import the data as separate data frames - self$import_data(data_tables = data_list) - - #if observation data was included, and key links, convert columns and optionally unstack data - if (include_observation_data) { - #add relationship key between the observation data and station data - #linked by stationId and recordedFrom columns - self$add_key(station_data_name, c("stationId")) - self$add_link(from_data_frame = observation_data_name, to_data_frame = station_data_name, link_pairs = c(recordedFrom = "stationId"), type = keyed_link_label) - - #convert stations in observation data to factors - self$convert_column_to_type(data_name = observation_data_name, col_names = "station", to_type = "factor") - #convert elements in observation data to factors - self$convert_column_to_type(data_name = observation_data_name, col_names = "element", to_type = "factor") - #convert flags to factors if included - if(include_observation_flags){ - self$convert_column_to_type(data_name = observation_data_name, col_names = "flag", to_type = "factor") - } - #create a plain date column from the observation data datetime column values - obsdate <- self$get_columns_from_data(data_name = observation_data_name, col_names = "datetime", use_current_filter = FALSE) - self$add_columns_to_data(data_name = observation_data_name, col_name = "date", col_data = as.Date(x = obsdate), before = FALSE, adjacent_column = "datetime") - - if(unstack_data){ - observation_data <- self$get_data_frame(data_name = observation_data_name) - observation_data_unstacked <- reshape2::dcast(data = observation_data, formula = station + datetime + date ~ element, value.var = "obsvalue") - self$import_data(data_tables = list(observation_data_unstacked = observation_data_unstacked)) - } - } - -}) - DataBook$set("public", "import_from_iri", function(download_from, data_file, data_frame_name, location_data_name, path, X1, X2 = NA, Y1, Y2 = NA, get_area_point = "area"){ data_list <- import_from_iri(download_from = download_from, data_file = data_file, path = path, X1 = X1, X2 = X2, Y1 = Y1, Y2 = Y2, get_area_point = get_area_point) From da03d2dac41a3b336961df5aac81b31c2b723d5c Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 16 Sep 2024 11:11:24 +0300 Subject: [PATCH 124/273] removed wizard menu item --- instat/frmMain.Designer.vb | 1376 ++++++++++++++++++------------------ instat/frmMain.resx | 4 +- instat/frmMain.vb | 4 - 3 files changed, 678 insertions(+), 706 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 18e4c4f4f17..de1ce3227d0 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -197,11 +197,8 @@ Partial Class frmMain Me.mnuClimaticFileImportfromClimateDataStore = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileImportandTidyNetCDF = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileImportandTidyShapefile = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator20 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimateFileImportfromClimSoft = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuClimateFileImportfromClimSoftWizard = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileImportfromCliData = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticFileExportToClimsoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuExportToWWRToolStrip = New System.Windows.Forms.ToolStripMenuItem() @@ -702,6 +699,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -727,7 +725,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -735,25 +733,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -761,26 +759,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -788,26 +786,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -815,19 +813,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -835,14 +833,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -850,25 +848,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -876,7 +874,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -884,7 +882,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -892,7 +890,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -900,7 +898,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -908,12 +906,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -921,7 +919,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -929,27 +927,27 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -957,83 +955,83 @@ Partial Class frmMain 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(175, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(178, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 29) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1041,168 +1039,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1210,7 +1208,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1218,7 +1216,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1226,7 +1224,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1234,7 +1232,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1242,7 +1240,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1251,7 +1249,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1260,7 +1258,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1268,21 +1266,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1290,14 +1288,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1306,7 +1304,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1315,21 +1313,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1338,7 +1336,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1347,7 +1345,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1355,7 +1353,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1363,7 +1361,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1371,7 +1369,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1380,7 +1378,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1389,7 +1387,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1398,7 +1396,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1406,7 +1404,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1414,7 +1412,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1423,21 +1421,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1446,7 +1444,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 29) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1454,7 +1452,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1462,21 +1460,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1484,7 +1482,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1492,19 +1490,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1512,7 +1510,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1520,532 +1518,516 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 29) + Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(341, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(341, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(341, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) ' 'RInstatResourcesSiteToolStripMenuItem ' Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(344, 34) + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' 'mnuClimaticFile ' - Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.ToolStripSeparator20, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimateFileImportfromClimSoftWizard, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) + Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' - 'ToolStripSeparator20 - ' - Me.ToolStripSeparator20.Name = "ToolStripSeparator20" - Me.ToolStripSeparator20.Size = New System.Drawing.Size(423, 6) - ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' - 'mnuClimateFileImportfromClimSoftWizard - ' - Me.mnuClimateFileImportfromClimSoftWizard.Name = "mnuClimateFileImportfromClimSoftWizard" - Me.mnuClimateFileImportfromClimSoftWizard.Size = New System.Drawing.Size(426, 34) - Me.mnuClimateFileImportfromClimSoftWizard.Text = "Import from Climsoft Wizard..." - ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' - 'ToolStripSeparator15 - ' - Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) - ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) + Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2053,169 +2035,169 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2223,7 +2205,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2232,7 +2214,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2241,7 +2223,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2250,7 +2232,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2259,7 +2241,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2268,7 +2250,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2276,361 +2258,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) + Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2639,7 +2621,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2647,7 +2629,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2655,7 +2637,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2663,7 +2645,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2671,7 +2653,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2679,7 +2661,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2687,7 +2669,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2695,7 +2677,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2703,7 +2685,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2711,7 +2693,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2719,7 +2701,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2727,7 +2709,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2735,7 +2717,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2743,7 +2725,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2751,7 +2733,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2759,7 +2741,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2767,7 +2749,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2775,7 +2757,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2783,7 +2765,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2791,7 +2773,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2799,7 +2781,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2807,7 +2789,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2815,7 +2797,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2823,7 +2805,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2831,7 +2813,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2839,7 +2821,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2847,7 +2829,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2855,7 +2837,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2863,7 +2845,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2871,7 +2853,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2879,7 +2861,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2887,7 +2869,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2895,7 +2877,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2903,7 +2885,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2911,7 +2893,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2919,7 +2901,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2927,7 +2909,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2935,7 +2917,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2943,7 +2925,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(365, 34) + Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2951,32 +2933,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(365, 34) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2984,7 +2966,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(365, 34) + Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2993,7 +2975,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(365, 34) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3001,12 +2983,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) + Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3014,7 +2996,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 29) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -3022,7 +3004,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3030,7 +3012,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3038,27 +3020,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3066,18 +3048,17 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 691) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1251, 32) + Me.stsStrip.Size = New System.Drawing.Size(834, 22) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(182, 25) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3086,12 +3067,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 33) + Me.Tool_strip.Location = New System.Drawing.Point(0, 24) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3103,7 +3084,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3114,7 +3095,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3126,40 +3107,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLast10Dialogs ' @@ -3175,7 +3156,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 39) + Me.separator2.Size = New System.Drawing.Size(6, 37) ' 'mnuTbDataView ' @@ -3185,7 +3166,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3197,34 +3178,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) + Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) + Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3241,25 +3222,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(194, 34) + Me.mnuploty.Size = New System.Drawing.Size(128, 22) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLogScript ' @@ -3277,14 +3258,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) + Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3303,27 +3284,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) ' 'mnuTbResetLayout ' @@ -3332,13 +3313,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 39) + Me.separator3.Size = New System.Drawing.Size(6, 37) ' 'mnuTbHelp ' @@ -3347,13 +3328,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLan ' @@ -3362,29 +3343,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 39) + Me.separator1.Size = New System.Drawing.Size(6, 37) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) + Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(1251, 33) + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3392,7 +3372,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 29) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3400,7 +3380,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(365, 34) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3408,33 +3388,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(362, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3442,7 +3422,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3450,88 +3430,88 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(365, 34) + Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(362, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(365, 34) + Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) + Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(362, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3539,105 +3519,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3645,7 +3625,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3654,7 +3634,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3662,7 +3642,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3670,107 +3650,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3778,95 +3758,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3874,105 +3854,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3980,42 +3960,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4023,7 +4003,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4031,7 +4011,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4039,38 +4019,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4078,7 +4058,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4086,169 +4066,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.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, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4256,7 +4236,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4264,46 +4244,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4311,7 +4291,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4320,7 +4300,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4329,7 +4309,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4338,35 +4318,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4374,78 +4354,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 29) + Me.mnuStructured.Size = New System.Drawing.Size(74, 22) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4453,126 +4433,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4580,424 +4560,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) + Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 29) + Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5005,54 +4985,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5066,8 +5046,7 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5080,9 +5059,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(1251, 619) - Me.splOverall.SplitterDistance = 251 - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 161 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5090,7 +5069,6 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5102,9 +5080,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 251) - Me.splExtraWindows.SplitterDistance = 378 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 161) + Me.splExtraWindows.SplitterDistance = 252 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5112,7 +5090,6 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5123,9 +5100,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(378, 251) - Me.splMetadata.SplitterDistance = 102 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(252, 161) + Me.splMetadata.SplitterDistance = 68 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5135,9 +5112,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 251) + Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 161) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5146,9 +5123,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 251) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 161) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5157,9 +5134,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 251) + Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 161) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5169,7 +5146,6 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5181,9 +5157,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(1251, 360) - Me.splDataOutput.SplitterDistance = 573 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 233) + Me.splDataOutput.SplitterDistance = 382 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5193,9 +5169,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(573, 360) + Me.ucrDataViewer.Size = New System.Drawing.Size(382, 233) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5205,9 +5181,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(670, 360) + Me.ucrOutput.Size = New System.Drawing.Size(447, 233) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5245,11 +5221,16 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' + 'ToolStripSeparator15 + ' + Me.ToolStripSeparator15.Name = "ToolStripSeparator15" + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1251, 723) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5257,11 +5238,8 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() @@ -5587,7 +5565,6 @@ Partial Class frmMain Friend WithEvents mnuPrepareKeysAndLinksAddComment As ToolStripMenuItem Friend WithEvents mnuClimaticModelsExtremes As ToolStripMenuItem Friend WithEvents mnuClimaticModelCircular As ToolStripMenuItem - Friend WithEvents ToolStripSeparator15 As ToolStripSeparator Friend WithEvents mnuClimaticPrepareClimaticSummaries As ToolStripMenuItem Friend WithEvents mnuClimaticCheckDataInventory As ToolStripMenuItem Friend WithEvents mnuClimaticCheckDataDisplayDaily As ToolStripMenuItem @@ -5828,8 +5805,6 @@ Partial Class frmMain Friend WithEvents ToolStripSeparator67 As ToolStripSeparator Friend WithEvents ToolStripSeparator68 As ToolStripSeparator Friend WithEvents mnuStructuredCircularCirclize As ToolStripMenuItem - Friend WithEvents ToolStripSeparator20 As ToolStripSeparator - Friend WithEvents mnuClimateFileImportfromClimSoftWizard As ToolStripMenuItem Friend WithEvents mnuExportToWWRToolStrip As ToolStripMenuItem Friend WithEvents mnuViewStructuredMenu As ToolStripMenuItem Friend WithEvents mnuClimaticNCMP As ToolStripMenuItem @@ -5969,4 +5944,5 @@ Partial Class frmMain Friend WithEvents mnuSwapDataMetadata As ToolStripMenuItem Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem + Friend WithEvents ToolStripSeparator15 As ToolStripSeparator End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index e679779467e..c73bcdce42b 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c89ed417c92..b388462affb 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -1414,10 +1414,6 @@ Public Class frmMain dlgClimSoft.ShowDialog() End Sub - Private Sub mnuClimateFileImportfromClimSoftWizard_Click(sender As Object, e As EventArgs) Handles mnuClimateFileImportfromClimSoftWizard.Click - dlgClimsoftWizard.ShowDialog() - End Sub - Private Sub mnuClimaticFileImportFromCliData_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportfromCliData.Click dlgCliData.ShowDialog() End Sub From e4737558585058a040f62c6ac76dfce33a72b1f6 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 16 Sep 2024 11:29:17 +0300 Subject: [PATCH 125/273] changes --- instat/dlgExportToClimsoft.Designer.vb | 75 ++++++++------------------ instat/dlgExportToClimsoft.vb | 48 ++++------------- 2 files changed, 32 insertions(+), 91 deletions(-) diff --git a/instat/dlgExportToClimsoft.Designer.vb b/instat/dlgExportToClimsoft.Designer.vb index cf0ff235bbb..936d119bb89 100644 --- a/instat/dlgExportToClimsoft.Designer.vb +++ b/instat/dlgExportToClimsoft.Designer.vb @@ -25,12 +25,10 @@ Partial Class dlgExportToClimsoft Me.lblElement = New System.Windows.Forms.Label() Me.lblDate = New System.Windows.Forms.Label() Me.lblHour = New System.Windows.Forms.Label() - Me.lblStation = New System.Windows.Forms.Label() Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() Me.ucrChkExportDataFrame = New instat.ucrCheck() Me.ucrInputExportFile = New instat.ucrInputTextBox() - Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrSaveNewDataFrame = New instat.ucrSave() Me.ucrChkNewDataFrame = New instat.ucrCheck() Me.ucrInputHour = New instat.ucrInputTextBox() @@ -48,43 +46,33 @@ Partial Class dlgExportToClimsoft 'lblElement ' Me.lblElement.AutoSize = True - Me.lblElement.Location = New System.Drawing.Point(417, 325) + Me.lblElement.Location = New System.Drawing.Point(417, 268) Me.lblElement.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblElement.Name = "lblElement" Me.lblElement.Size = New System.Drawing.Size(80, 20) - Me.lblElement.TabIndex = 12 + Me.lblElement.TabIndex = 10 Me.lblElement.Text = "Elements:" ' 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(417, 197) + Me.lblDate.Location = New System.Drawing.Point(417, 140) Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDate.Name = "lblDate" Me.lblDate.Size = New System.Drawing.Size(48, 20) - Me.lblDate.TabIndex = 8 + Me.lblDate.TabIndex = 6 Me.lblDate.Text = "Date:" ' 'lblHour ' Me.lblHour.AutoSize = True - Me.lblHour.Location = New System.Drawing.Point(417, 261) + Me.lblHour.Location = New System.Drawing.Point(417, 204) Me.lblHour.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHour.Name = "lblHour" Me.lblHour.Size = New System.Drawing.Size(48, 20) - Me.lblHour.TabIndex = 10 + Me.lblHour.TabIndex = 8 Me.lblHour.Text = "Hour:" ' - 'lblStation - ' - Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(417, 73) - Me.lblStation.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(64, 20) - Me.lblStation.TabIndex = 4 - Me.lblStation.Text = "Station:" - ' 'lblExport ' Me.lblExport.AutoSize = True @@ -93,7 +81,7 @@ Partial Class dlgExportToClimsoft Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(88, 20) - Me.lblExport.TabIndex = 17 + Me.lblExport.TabIndex = 15 Me.lblExport.Text = "Export File:" ' 'cmdBrowse @@ -103,7 +91,7 @@ Partial Class dlgExportToClimsoft Me.cmdBrowse.Margin = New System.Windows.Forms.Padding(4) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(120, 34) - Me.cmdBrowse.TabIndex = 19 + Me.cmdBrowse.TabIndex = 17 Me.cmdBrowse.Text = "Browse" Me.cmdBrowse.UseVisualStyleBackColor = True ' @@ -115,7 +103,7 @@ Partial Class dlgExportToClimsoft Me.ucrChkExportDataFrame.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkExportDataFrame.Name = "ucrChkExportDataFrame" Me.ucrChkExportDataFrame.Size = New System.Drawing.Size(399, 34) - Me.ucrChkExportDataFrame.TabIndex = 15 + Me.ucrChkExportDataFrame.TabIndex = 13 ' 'ucrInputExportFile ' @@ -127,20 +115,7 @@ Partial Class dlgExportToClimsoft Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputExportFile.Name = "ucrInputExportFile" Me.ucrInputExportFile.Size = New System.Drawing.Size(273, 32) - Me.ucrInputExportFile.TabIndex = 18 - ' - 'ucrReceiverStation - ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(417, 101) - Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 5 - Me.ucrReceiverStation.ucrSelector = Nothing + Me.ucrInputExportFile.TabIndex = 16 ' 'ucrSaveNewDataFrame ' @@ -149,7 +124,7 @@ Partial Class dlgExportToClimsoft Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(522, 36) - Me.ucrSaveNewDataFrame.TabIndex = 16 + Me.ucrSaveNewDataFrame.TabIndex = 14 ' 'ucrChkNewDataFrame ' @@ -159,7 +134,7 @@ Partial Class dlgExportToClimsoft Me.ucrChkNewDataFrame.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkNewDataFrame.Name = "ucrChkNewDataFrame" Me.ucrChkNewDataFrame.Size = New System.Drawing.Size(399, 34) - Me.ucrChkNewDataFrame.TabIndex = 14 + Me.ucrChkNewDataFrame.TabIndex = 12 ' 'ucrInputHour ' @@ -167,11 +142,11 @@ Partial Class dlgExportToClimsoft Me.ucrInputHour.AutoSize = True Me.ucrInputHour.IsMultiline = False Me.ucrInputHour.IsReadOnly = False - Me.ucrInputHour.Location = New System.Drawing.Point(417, 287) + Me.ucrInputHour.Location = New System.Drawing.Point(417, 230) Me.ucrInputHour.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputHour.Name = "ucrInputHour" Me.ucrInputHour.Size = New System.Drawing.Size(178, 32) - Me.ucrInputHour.TabIndex = 11 + Me.ucrInputHour.TabIndex = 9 ' 'ucrBase ' @@ -181,32 +156,32 @@ Partial Class dlgExportToClimsoft Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) - Me.ucrBase.TabIndex = 20 + Me.ucrBase.TabIndex = 18 ' 'ucrReceiverElements ' Me.ucrReceiverElements.AutoSize = True Me.ucrReceiverElements.frmParent = Me - Me.ucrReceiverElements.Location = New System.Drawing.Point(417, 355) + Me.ucrReceiverElements.Location = New System.Drawing.Point(417, 298) Me.ucrReceiverElements.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverElements.Name = "ucrReceiverElements" Me.ucrReceiverElements.Selector = Nothing Me.ucrReceiverElements.Size = New System.Drawing.Size(180, 150) Me.ucrReceiverElements.strNcFilePath = "" - Me.ucrReceiverElements.TabIndex = 13 + Me.ucrReceiverElements.TabIndex = 11 Me.ucrReceiverElements.ucrSelector = Nothing ' 'ucrReceiverDate ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(417, 222) + Me.ucrReceiverDate.Location = New System.Drawing.Point(417, 165) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing Me.ucrReceiverDate.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 9 + Me.ucrReceiverDate.TabIndex = 7 Me.ucrReceiverDate.ucrSelector = Nothing ' 'ucrSelectorImportToClimsoft @@ -275,23 +250,23 @@ Partial Class dlgExportToClimsoft ' Me.ucrReceiverStationID.AutoSize = True Me.ucrReceiverStationID.frmParent = Me - Me.ucrReceiverStationID.Location = New System.Drawing.Point(414, 167) + Me.ucrReceiverStationID.Location = New System.Drawing.Point(414, 110) Me.ucrReceiverStationID.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStationID.Name = "ucrReceiverStationID" Me.ucrReceiverStationID.Selector = Nothing Me.ucrReceiverStationID.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverStationID.strNcFilePath = "" - Me.ucrReceiverStationID.TabIndex = 7 + Me.ucrReceiverStationID.TabIndex = 5 Me.ucrReceiverStationID.ucrSelector = Nothing ' 'lblStationID ' Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(419, 141) + Me.lblStationID.Location = New System.Drawing.Point(419, 84) Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStationID.Name = "lblStationID" Me.lblStationID.Size = New System.Drawing.Size(85, 20) - Me.lblStationID.TabIndex = 6 + Me.lblStationID.TabIndex = 4 Me.lblStationID.Text = "Station ID:" ' 'dlgExportToClimsoft @@ -308,8 +283,6 @@ Partial Class dlgExportToClimsoft Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdBrowse) Me.Controls.Add(Me.ucrInputExportFile) - Me.Controls.Add(Me.ucrReceiverStation) - Me.Controls.Add(Me.lblStation) Me.Controls.Add(Me.ucrSaveNewDataFrame) Me.Controls.Add(Me.ucrChkNewDataFrame) Me.Controls.Add(Me.lblHour) @@ -341,8 +314,6 @@ Partial Class dlgExportToClimsoft Friend WithEvents ucrInputHour As ucrInputTextBox Friend WithEvents ucrChkNewDataFrame As ucrCheck Friend WithEvents ucrSaveNewDataFrame As ucrSave - Friend WithEvents lblStation As Label - Friend WithEvents ucrReceiverStation As ucrReceiverSingle Friend WithEvents lblExport As Label Friend WithEvents cmdBrowse As Button Friend WithEvents ucrInputExportFile As ucrInputTextBox diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 084b77e91db..91514d69f97 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -35,15 +35,14 @@ Public Class dlgExportToClimsoft bReset = False TestOkEnabled() autoTranslate(Me) - AddStationName() End Sub Private Sub InitialiseDialog() - ucrBase.iHelpTopicID=476 - ucrReceiverStation.SetClimaticType("station") - ucrReceiverStation.bAutoFill = True - ucrReceiverStation.Selector = ucrSelectorImportToClimsoft - ucrReceiverStation.SetLinkedDisplayControl(lblStation) + ucrBase.iHelpTopicID = 476 + ucrReceiverStationID.SetParameter(New RParameter("station_id", 1)) + ucrReceiverStationID.SetParameterIsRFunction() + ucrReceiverStationID.SetLinkedDisplayControl(lblStationID) + ucrReceiverStationID.Selector = ucrSelectorImportToClimsoft ucrReceiverDate.SetParameter(New RParameter("date", 2)) ucrReceiverDate.SetParameterIsRFunction() @@ -60,11 +59,6 @@ Public Class dlgExportToClimsoft ucrInputHour.SetParameter(New RParameter("hour", 3)) ucrInputHour.SetLinkedDisplayControl(lblHour) - ucrReceiverStationID.SetParameter(New RParameter("station_id", 4)) - ucrReceiverStationID.SetParameterIsRFunction() - ucrReceiverStationID.SetLinkedDisplayControl(lblStationID) - ucrReceiverStationID.Selector = ucrSelectorImportToClimsoft - ucrReceiverElements.SetParameter(New RParameter("element", 5, bNewIncludeArgumentName:=False)) ucrReceiverElements.SetParameterIsRFunction() ucrReceiverElements.SetLinkedDisplayControl(lblElement) @@ -102,7 +96,7 @@ Public Class dlgExportToClimsoft ucrSelectorImportToClimsoft.Reset() ucrSaveNewDataFrame.Reset() - ucrReceiverElements.SetMeAsReceiver() + ucrReceiverStationID.SetMeAsReceiver() clsDummyFunction.AddParameter("dataframe", "True", iPosition:=0) clsDummyFunction.AddParameter("export", "False", iPosition:=1) @@ -113,7 +107,7 @@ Public Class dlgExportToClimsoft clsPosixctFunction.AddParameter("format", Chr(34) & "%Y-%m-%d %H:%M:%S" & Chr(34), iPosition:=1) clsDataFrameFunction.SetRCommand("data.frame") - clsDataFrameFunction.AddParameter("date_time", clsRFunctionParameter:=clsPosixctFunction, iPosition:=0) + clsDataFrameFunction.AddParameter("date_time", clsRFunctionParameter:=clsPosixctFunction, iPosition:=4) clsDataFrameFunction.AddParameter("x", "columns", iPosition:=5, bIncludeArgumentName:=False) clsPipeOperator.SetOperation("%>%") @@ -157,7 +151,7 @@ Public Class dlgExportToClimsoft Private Sub TestOkEnabled() ucrBase.OKEnabled(Not ucrReceiverDate.IsEmpty _ AndAlso Not ucrReceiverElements.IsEmpty _ - AndAlso (Not ucrReceiverStation.IsEmpty OrElse Not ucrReceiverStationID.IsEmpty) + AndAlso Not ucrReceiverStationID.IsEmpty ) If ucrChkNewDataFrame.Checked And Not ucrSaveNewDataFrame.IsComplete Then ucrBase.OKEnabled(False) @@ -200,26 +194,6 @@ Public Class dlgExportToClimsoft SettingBaseFunction() End Sub - Private Sub AddStationName() - If ucrReceiverStation.IsEmpty Then - ucrReceiverStation.SetText(ucrSelectorImportToClimsoft.strCurrentDataFrame) - ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) - clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsMutateFunction, iPosition:=1) - Else - clsPipeOperator.RemoveParameterByName("right") - End If - If ucrSelectorImportToClimsoft.lstAvailableVariable.FindItemWithText(ucrReceiverStation.GetVariableNames(False)) Is Nothing Then - clsMutateFunction.AddParameter("station", ucrReceiverStation.GetVariableNames(), iPosition:=0) - clsPipeOperator.AddParameter("right", clsRFunctionParameter:=clsMutateFunction, iPosition:=1) - clsDataFrameFunction.RemoveParameterByName("station") - Else - Dim clsGetVariable As RFunction = ucrReceiverStation.GetVariables - clsGetVariable.SetAssignTo("station") - clsDataFrameFunction.AddParameter("station", clsRFunctionParameter:=clsGetVariable, iPosition:=1) - clsPipeOperator.RemoveParameterByName("right") - End If - End Sub - Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click SelectFileToSave() End Sub @@ -262,12 +236,8 @@ Public Class dlgExportToClimsoft End Using End Sub - Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged - AddStationName() - End Sub - Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElements.ControlContentsChanged, - ucrReceiverDate.ControlContentsChanged, ucrReceiverStation.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, + ucrReceiverDate.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged TestOkEnabled() End Sub From b352f4109a7d86789f1c26668424ba1ad23666ac Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 16 Sep 2024 16:08:57 +0300 Subject: [PATCH 126/273] Implemented suggested changes --- .../FootNotes/ucrCellsFootNotes.Designer.vb | 4 +- .../Cells/FootNotes/ucrCellsFootNotes.resx | 3 + .../Columns/ucrColumnFootNote.Designer.vb | 2 +- .../UserTables/Columns/ucrColumnFootNote.resx | 3 - .../UserTables/Header/ucrHeader.Designer.vb | 18 +-- instat/UserTables/Header/ucrHeader.vb | 18 +-- instat/UserTables/Rows/ucrRowSummary.vb | 1 + instat/UserTables/Stub/ucrStub.vb | 12 -- instat/UserTables/Stub/ucrStubOptions.vb | 3 - instat/UserTables/Stub/ucrStubStyle.vb | 1 - instat/UserTables/clsTablesUtils.vb | 2 + instat/UserTables/dlgGeneralTable.Designer.vb | 4 +- instat/UserTables/dlgGeneralTable.vb | 8 +- instat/UserTables/sdgTableOptions.Designer.vb | 129 ++++++++---------- instat/UserTables/sdgTableOptions.vb | 2 - instat/UserTables/sdgTableStyles.vb | 116 ++++++++-------- 16 files changed, 147 insertions(+), 179 deletions(-) diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb index 1dfcb663dfe..e6c7a3e1c0e 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.Designer.vb @@ -127,7 +127,7 @@ Partial Class ucrCellsFootNotes Me.ucrReceiverSingleCol.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSingleCol.Name = "ucrReceiverSingleCol" Me.ucrReceiverSingleCol.Selector = Nothing - Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSingleCol.Size = New System.Drawing.Size(142, 20) Me.ucrReceiverSingleCol.strNcFilePath = "" Me.ucrReceiverSingleCol.TabIndex = 339 Me.ucrReceiverSingleCol.ucrSelector = Nothing @@ -152,7 +152,7 @@ Partial Class ucrCellsFootNotes Me.ucrTxtFootNote.IsReadOnly = False Me.ucrTxtFootNote.Location = New System.Drawing.Point(241, 107) Me.ucrTxtFootNote.Name = "ucrTxtFootNote" - Me.ucrTxtFootNote.Size = New System.Drawing.Size(136, 21) + Me.ucrTxtFootNote.Size = New System.Drawing.Size(299, 21) Me.ucrTxtFootNote.TabIndex = 340 ' 'lblFootNote diff --git a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx index d937ee32b35..a249bebae7f 100644 --- a/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx +++ b/instat/UserTables/Cells/FootNotes/ucrCellsFootNotes.resx @@ -120,4 +120,7 @@ True + + True + \ No newline at end of file diff --git a/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb b/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb index d6474b517a6..366a55af019 100644 --- a/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb +++ b/instat/UserTables/Columns/ucrColumnFootNote.Designer.vb @@ -104,7 +104,7 @@ Partial Class ucrColumnFootNote Me.ucrTxtFootNote.IsReadOnly = False Me.ucrTxtFootNote.Location = New System.Drawing.Point(239, 134) Me.ucrTxtFootNote.Name = "ucrTxtFootNote" - Me.ucrTxtFootNote.Size = New System.Drawing.Size(136, 21) + Me.ucrTxtFootNote.Size = New System.Drawing.Size(305, 21) Me.ucrTxtFootNote.TabIndex = 351 ' 'btnAdd diff --git a/instat/UserTables/Columns/ucrColumnFootNote.resx b/instat/UserTables/Columns/ucrColumnFootNote.resx index a249bebae7f..d937ee32b35 100644 --- a/instat/UserTables/Columns/ucrColumnFootNote.resx +++ b/instat/UserTables/Columns/ucrColumnFootNote.resx @@ -120,7 +120,4 @@ True - - True - \ No newline at end of file diff --git a/instat/UserTables/Header/ucrHeader.Designer.vb b/instat/UserTables/Header/ucrHeader.Designer.vb index b05909fe369..eb1345fbe24 100644 --- a/instat/UserTables/Header/ucrHeader.Designer.vb +++ b/instat/UserTables/Header/ucrHeader.Designer.vb @@ -47,7 +47,7 @@ Partial Class ucrHeader Me.ucrInputSubtitleFooter.Location = New System.Drawing.Point(9, 88) Me.ucrInputSubtitleFooter.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSubtitleFooter.Name = "ucrInputSubtitleFooter" - Me.ucrInputSubtitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputSubtitleFooter.Size = New System.Drawing.Size(361, 21) Me.ucrInputSubtitleFooter.TabIndex = 23 ' 'ucrInputTitleFooter @@ -59,7 +59,7 @@ Partial Class ucrHeader Me.ucrInputTitleFooter.Location = New System.Drawing.Point(11, 89) Me.ucrInputTitleFooter.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputTitleFooter.Name = "ucrInputTitleFooter" - Me.ucrInputTitleFooter.Size = New System.Drawing.Size(142, 21) + Me.ucrInputTitleFooter.Size = New System.Drawing.Size(359, 21) Me.ucrInputTitleFooter.TabIndex = 22 ' 'lblHeaderSubtitle @@ -84,7 +84,7 @@ Partial Class ucrHeader ' 'btnSubTitleFormat ' - Me.btnSubTitleFormat.Location = New System.Drawing.Point(153, 40) + Me.btnSubTitleFormat.Location = New System.Drawing.Point(372, 40) Me.btnSubTitleFormat.Name = "btnSubTitleFormat" Me.btnSubTitleFormat.Size = New System.Drawing.Size(75, 23) Me.btnSubTitleFormat.TabIndex = 31 @@ -93,7 +93,7 @@ Partial Class ucrHeader ' 'btnTitleFormat ' - Me.btnTitleFormat.Location = New System.Drawing.Point(155, 42) + Me.btnTitleFormat.Location = New System.Drawing.Point(374, 42) Me.btnTitleFormat.Name = "btnTitleFormat" Me.btnTitleFormat.Size = New System.Drawing.Size(79, 23) Me.btnTitleFormat.TabIndex = 30 @@ -109,7 +109,7 @@ Partial Class ucrHeader Me.ucrInputSubtitle.Location = New System.Drawing.Point(9, 42) Me.ucrInputSubtitle.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputSubtitle.Name = "ucrInputSubtitle" - Me.ucrInputSubtitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputSubtitle.Size = New System.Drawing.Size(361, 21) Me.ucrInputSubtitle.TabIndex = 29 ' 'ucrInputTitle @@ -121,7 +121,7 @@ Partial Class ucrHeader Me.ucrInputTitle.Location = New System.Drawing.Point(11, 42) Me.ucrInputTitle.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputTitle.Name = "ucrInputTitle" - Me.ucrInputTitle.Size = New System.Drawing.Size(142, 21) + Me.ucrInputTitle.Size = New System.Drawing.Size(359, 21) Me.ucrInputTitle.TabIndex = 28 ' 'lblSubtitle @@ -153,7 +153,7 @@ Partial Class ucrHeader Me.grpBoxTitle.Controls.Add(Me.ucrInputTitleFooter) Me.grpBoxTitle.Location = New System.Drawing.Point(4, 5) Me.grpBoxTitle.Name = "grpBoxTitle" - Me.grpBoxTitle.Size = New System.Drawing.Size(248, 115) + Me.grpBoxTitle.Size = New System.Drawing.Size(463, 115) Me.grpBoxTitle.TabIndex = 32 Me.grpBoxTitle.TabStop = False Me.grpBoxTitle.Text = "Title" @@ -167,7 +167,7 @@ Partial Class ucrHeader Me.grpBoxSubtitle.Controls.Add(Me.lblSubtitle) Me.grpBoxSubtitle.Location = New System.Drawing.Point(4, 125) Me.grpBoxSubtitle.Name = "grpBoxSubtitle" - Me.grpBoxSubtitle.Size = New System.Drawing.Size(248, 116) + Me.grpBoxSubtitle.Size = New System.Drawing.Size(463, 116) Me.grpBoxSubtitle.TabIndex = 33 Me.grpBoxSubtitle.TabStop = False Me.grpBoxSubtitle.Text = "Subtitle" @@ -179,7 +179,7 @@ Partial Class ucrHeader Me.Controls.Add(Me.grpBoxSubtitle) Me.Controls.Add(Me.grpBoxTitle) Me.Name = "ucrHeader" - Me.Size = New System.Drawing.Size(259, 246) + Me.Size = New System.Drawing.Size(470, 246) Me.grpBoxTitle.ResumeLayout(False) Me.grpBoxTitle.PerformLayout() Me.grpBoxSubtitle.ResumeLayout(False) diff --git a/instat/UserTables/Header/ucrHeader.vb b/instat/UserTables/Header/ucrHeader.vb index 6850e928898..dc765685d8e 100644 --- a/instat/UserTables/Header/ucrHeader.vb +++ b/instat/UserTables/Header/ucrHeader.vb @@ -54,15 +54,15 @@ Public Class ucrHeader '-------------- ' Set up the title and subtitle styles R function Dim lstTabStyleForRParams As List(Of RParameter) = clsTablesUtils.FindRFunctionsParamsWithRParamValue({"tab_style"}, "locations", "cells_title", clsOperator) - For Each clsTabFootNoteRParam As RParameter In lstTabStyleForRParams - For Each clsFooterParam As RParameter In clsTabFootNoteRParam.clsArgumentCodeStructure.clsParameters - If clsFooterParam.strArgumentName = "locations" AndAlso clsFooterParam.clsArgumentCodeStructure.ContainsParameter("groups") Then - If clsTablesUtils.GetStringValue(clsFooterParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "title" Then - clsTitleStyleRFunction = clsTabFootNoteRParam.clsArgumentCodeStructure - clsTitleLocationRFunction = clsFooterParam.clsArgumentCodeStructure - ElseIf clsTablesUtils.GetStringValue(clsFooterParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "subtitle" Then - clsSubtitleStyleRFunction = clsTabFootNoteRParam.clsArgumentCodeStructure - clsSubtitleLocationRFunction = clsFooterParam.clsArgumentCodeStructure + For Each clsTabStyleRParam As RParameter In lstTabStyleForRParams + For Each clsStyleLocationParam As RParameter In clsTabStyleRParam.clsArgumentCodeStructure.clsParameters + If clsStyleLocationParam.strArgumentName = "locations" AndAlso clsStyleLocationParam.clsArgumentCodeStructure.ContainsParameter("groups") Then + If clsTablesUtils.GetStringValue(clsStyleLocationParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "title" Then + clsTitleStyleRFunction = clsTabStyleRParam.clsArgumentCodeStructure + clsTitleLocationRFunction = clsStyleLocationParam.clsArgumentCodeStructure + ElseIf clsTablesUtils.GetStringValue(clsStyleLocationParam.clsArgumentCodeStructure.GetParameter("groups").strArgumentValue, False) = "subtitle" Then + clsSubtitleStyleRFunction = clsTabStyleRParam.clsArgumentCodeStructure + clsSubtitleLocationRFunction = clsStyleLocationParam.clsArgumentCodeStructure End If End If Next diff --git a/instat/UserTables/Rows/ucrRowSummary.vb b/instat/UserTables/Rows/ucrRowSummary.vb index 689d8db5e7b..c34ec209a0d 100644 --- a/instat/UserTables/Rows/ucrRowSummary.vb +++ b/instat/UserTables/Rows/ucrRowSummary.vb @@ -22,6 +22,7 @@ dctSummaryTypes.Add("Median", "median") dctSummaryTypes.Add("Standard Deviation", "sd") dctSummaryTypes.Add("Sum", "sum") + dctSummaryTypes.Add("Length", "length") ucrCboSummaryType.SetItems(dctSummaryTypes, bSetConditions:=False) ucrCboSummaryType.SetDropDownStyleAsNonEditable() ucrCboSummaryType.GetSetSelectedIndex = 0 diff --git a/instat/UserTables/Stub/ucrStub.vb b/instat/UserTables/Stub/ucrStub.vb index 2378d97fee5..b96c302de4d 100644 --- a/instat/UserTables/Stub/ucrStub.vb +++ b/instat/UserTables/Stub/ucrStub.vb @@ -5,16 +5,13 @@ Public Class ucrStub Private bFirstload As Boolean = True Private Sub initialiseDialog() - ucrPnlStub.AddRadioButton(rdoVariables) ucrPnlStub.AddRadioButton(rdoStyles) rdoVariables.Checked = True - End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) - If bFirstload Then initialiseDialog() bFirstload = False @@ -22,7 +19,6 @@ Public Class ucrStub ucrStubOptions.Setup(strDataFrameName, clsOperator) ucrStubStyle.Setup(strDataFrameName, clsOperator) - End Sub Private Sub ucrPnlRows_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStub.ControlValueChanged @@ -30,16 +26,8 @@ Public Class ucrStub ucrStubStyle.Visible = rdoStyles.Checked End Sub - - Public Sub SetValuesToOperator() - ucrStubOptions.SetValuesToOperator() ucrStubStyle.SetValuesToOperator() - - End Sub - - - End Class diff --git a/instat/UserTables/Stub/ucrStubOptions.vb b/instat/UserTables/Stub/ucrStubOptions.vb index 88d400cc444..e78295e38fa 100644 --- a/instat/UserTables/Stub/ucrStubOptions.vb +++ b/instat/UserTables/Stub/ucrStubOptions.vb @@ -4,8 +4,6 @@ Private bFirstload As Boolean = True Private Sub initialiseDialog() - - ucrReceiverSingleRowName.SetParameter(New RParameter("rowname_col", 0)) ucrReceiverSingleRowName.SetParameterIsString() ucrReceiverSingleRowName.Selector = ucrSelectorCols @@ -17,7 +15,6 @@ ucrReceiverSingleGroupByCol.SetLinkedDisplayControl(lblGroupByCol) ucrInputStubHead.SetParameter(New RParameter("label", 0)) - End Sub Public Sub Setup(strDataFrameName As String, clsOperator As ROperator) diff --git a/instat/UserTables/Stub/ucrStubStyle.vb b/instat/UserTables/Stub/ucrStubStyle.vb index af18602bb68..71f87724290 100644 --- a/instat/UserTables/Stub/ucrStubStyle.vb +++ b/instat/UserTables/Stub/ucrStubStyle.vb @@ -31,7 +31,6 @@ End Sub Private Sub btnEnterStyle_Click(sender As Object, e As EventArgs) Handles btnEnterStyle.Click - Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm) If clsListStyleRFunction Is Nothing Then Exit Sub diff --git a/instat/UserTables/clsTablesUtils.vb b/instat/UserTables/clsTablesUtils.vb index 7bdb8eae968..cace4963759 100644 --- a/instat/UserTables/clsTablesUtils.vb +++ b/instat/UserTables/clsTablesUtils.vb @@ -5,6 +5,8 @@ Public Class clsTablesUtils Public Shared Function ShowStyleSubDialog(owner As Form, Optional clsListStyleRFunction As RFunction = Nothing) As RFunction If clsListStyleRFunction IsNot Nothing AndAlso clsListStyleRFunction.ContainsParameter("style") Then sdgTableStyles.Setup(clsListStyleRFunction.GetParameter("style").clsArgumentCodeStructure) + Else + sdgTableStyles.Setup() End If sdgTableStyles.ShowDialog(owner) diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index dedeb89ad4a..0251e0959bd 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -44,11 +44,11 @@ Partial Class dlgGeneralTable ' 'btnMoreOptions ' - Me.btnMoreOptions.Location = New System.Drawing.Point(250, 209) + Me.btnMoreOptions.Location = New System.Drawing.Point(9, 204) Me.btnMoreOptions.Name = "btnMoreOptions" Me.btnMoreOptions.Size = New System.Drawing.Size(141, 23) Me.btnMoreOptions.TabIndex = 25 - Me.btnMoreOptions.Text = "More Options" + Me.btnMoreOptions.Text = "Table Options" Me.btnMoreOptions.UseVisualStyleBackColor = True ' 'ucrNudPreview diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index 5dac4efb956..d6a59570641 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -18,6 +18,7 @@ Public Class dlgGeneralTable SetRCodeForControls(bReset) bReset = False autoTranslate(Me) + TestOKEnabled() End Sub Private Sub btnMoreOptions_Click(sender As Object, e As EventArgs) Handles btnMoreOptions.Click @@ -35,9 +36,7 @@ Public Class dlgGeneralTable TestOKEnabled() End Sub - Private Sub initialiseDialog() - ucrReceiverMultipleCols.SetParameter(New RParameter("df_columns_to_use_param", 0, bNewIncludeArgumentName:=False)) ucrReceiverMultipleCols.SetParameterIsRFunction() ucrReceiverMultipleCols.Selector = ucrSelectorCols @@ -50,6 +49,7 @@ Public Class dlgGeneralTable ucrNudPreview.SetParameter(New RParameter("x", 0, bNewIncludeArgumentName:=False)) ucrNudPreview.Minimum = 6 + ucrNudPreview.Maximum = Decimal.MaxValue ucrNudPreview.SetRDefault(6) ucrSaveTable.SetPrefix("presentation_table") @@ -78,6 +78,7 @@ Public Class dlgGeneralTable clsHeadRFunction.SetPackageName("utils") clsHeadRFunction.SetRCommand("head") + clsHeadRFunction.AddParameter(strParameterName:="x", strParameterValue:=100, iPosition:=0, bIncludeArgumentName:=False) clsBaseOperator.AddParameter(strParameterName:="head", clsRFunctionParameter:=clsHeadRFunction, iPosition:=1, bIncludeArgumentName:=False) clsGtRFunction.SetPackageName("gt") @@ -91,18 +92,15 @@ Public Class dlgGeneralTable strObjectName:="last_table") ucrBase.clsRsyntax.SetBaseROperator(clsBaseOperator) - End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverMultipleCols.SetRCode(clsBaseOperator, bReset) ucrSaveTable.SetRCode(clsBaseOperator, bReset) ucrChkPreview.SetRCode(clsBaseOperator, bReset) ucrNudPreview.SetRCode(clsHeadRFunction, bReset) - End Sub Private Sub TestOKEnabled() diff --git a/instat/UserTables/sdgTableOptions.Designer.vb b/instat/UserTables/sdgTableOptions.Designer.vb index af45e52407c..5f4be438d62 100644 --- a/instat/UserTables/sdgTableOptions.Designer.vb +++ b/instat/UserTables/sdgTableOptions.Designer.vb @@ -65,126 +65,119 @@ Partial Class sdgTableOptions Me.tbpFormatOptions.Controls.Add(Me.tbpSourceNotes) Me.tbpFormatOptions.Controls.Add(Me.tbpThemes) Me.tbpFormatOptions.Controls.Add(Me.tbpOtherStyles) - Me.tbpFormatOptions.Location = New System.Drawing.Point(4, 8) - Me.tbpFormatOptions.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpFormatOptions.Location = New System.Drawing.Point(3, 5) Me.tbpFormatOptions.Name = "tbpFormatOptions" Me.tbpFormatOptions.SelectedIndex = 0 - Me.tbpFormatOptions.Size = New System.Drawing.Size(984, 703) + Me.tbpFormatOptions.Size = New System.Drawing.Size(656, 457) Me.tbpFormatOptions.TabIndex = 5 ' 'tbpHeader ' Me.tbpHeader.Controls.Add(Me.ucrHeader) - Me.tbpHeader.Location = New System.Drawing.Point(4, 29) - Me.tbpHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpHeader.Location = New System.Drawing.Point(4, 22) Me.tbpHeader.Name = "tbpHeader" - Me.tbpHeader.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpHeader.Size = New System.Drawing.Size(976, 582) + Me.tbpHeader.Padding = New System.Windows.Forms.Padding(3) + Me.tbpHeader.Size = New System.Drawing.Size(648, 431) Me.tbpHeader.TabIndex = 0 Me.tbpHeader.Text = "Header" Me.tbpHeader.UseVisualStyleBackColor = True ' 'ucrHeader ' - Me.ucrHeader.Location = New System.Drawing.Point(10, 9) - Me.ucrHeader.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrHeader.Location = New System.Drawing.Point(7, 6) + Me.ucrHeader.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrHeader.Name = "ucrHeader" - Me.ucrHeader.Size = New System.Drawing.Size(454, 409) + Me.ucrHeader.Size = New System.Drawing.Size(601, 300) Me.ucrHeader.TabIndex = 16 ' 'tbpStub ' Me.tbpStub.Controls.Add(Me.ucrStub) - Me.tbpStub.Location = New System.Drawing.Point(4, 29) - Me.tbpStub.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpStub.Location = New System.Drawing.Point(4, 22) Me.tbpStub.Name = "tbpStub" - Me.tbpStub.Size = New System.Drawing.Size(976, 582) + Me.tbpStub.Size = New System.Drawing.Size(648, 431) Me.tbpStub.TabIndex = 9 Me.tbpStub.Text = "Stub" Me.tbpStub.UseVisualStyleBackColor = True ' 'ucrStub ' - Me.ucrStub.Location = New System.Drawing.Point(10, 11) - Me.ucrStub.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrStub.Location = New System.Drawing.Point(7, 7) + Me.ucrStub.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrStub.Name = "ucrStub" - Me.ucrStub.Size = New System.Drawing.Size(638, 397) + Me.ucrStub.Size = New System.Drawing.Size(425, 258) Me.ucrStub.TabIndex = 0 ' 'tbpColumns ' Me.tbpColumns.Controls.Add(Me.ucrColumns) - Me.tbpColumns.Location = New System.Drawing.Point(4, 29) - Me.tbpColumns.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpColumns.Location = New System.Drawing.Point(4, 22) Me.tbpColumns.Name = "tbpColumns" - Me.tbpColumns.Size = New System.Drawing.Size(976, 582) + Me.tbpColumns.Size = New System.Drawing.Size(648, 431) Me.tbpColumns.TabIndex = 8 Me.tbpColumns.Text = "Columns" Me.tbpColumns.UseVisualStyleBackColor = True ' 'ucrColumns ' - Me.ucrColumns.Location = New System.Drawing.Point(8, 9) - Me.ucrColumns.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumns.Location = New System.Drawing.Point(5, 6) + Me.ucrColumns.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumns.Name = "ucrColumns" - Me.ucrColumns.Size = New System.Drawing.Size(948, 554) + Me.ucrColumns.Size = New System.Drawing.Size(632, 360) Me.ucrColumns.TabIndex = 0 ' 'tbpRows ' Me.tbpRows.Controls.Add(Me.ucrRows) - Me.tbpRows.Location = New System.Drawing.Point(4, 29) - Me.tbpRows.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpRows.Location = New System.Drawing.Point(4, 22) Me.tbpRows.Name = "tbpRows" - Me.tbpRows.Size = New System.Drawing.Size(976, 670) + Me.tbpRows.Size = New System.Drawing.Size(648, 431) Me.tbpRows.TabIndex = 7 Me.tbpRows.Text = "Rows" Me.tbpRows.UseVisualStyleBackColor = True ' 'ucrRows ' - Me.ucrRows.Location = New System.Drawing.Point(10, 14) - Me.ucrRows.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrRows.Location = New System.Drawing.Point(7, 9) + Me.ucrRows.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrRows.Name = "ucrRows" - Me.ucrRows.Size = New System.Drawing.Size(900, 648) + Me.ucrRows.Size = New System.Drawing.Size(600, 421) Me.ucrRows.TabIndex = 0 ' 'tbpCells ' Me.tbpCells.Controls.Add(Me.ucrCells) - Me.tbpCells.Location = New System.Drawing.Point(4, 29) - Me.tbpCells.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpCells.Location = New System.Drawing.Point(4, 22) Me.tbpCells.Name = "tbpCells" - Me.tbpCells.Size = New System.Drawing.Size(976, 582) + Me.tbpCells.Size = New System.Drawing.Size(648, 431) Me.tbpCells.TabIndex = 3 Me.tbpCells.Text = "Cells" Me.tbpCells.UseVisualStyleBackColor = True ' 'ucrCells ' - Me.ucrCells.Location = New System.Drawing.Point(12, 12) - Me.ucrCells.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrCells.Location = New System.Drawing.Point(8, 8) + Me.ucrCells.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrCells.Name = "ucrCells" - Me.ucrCells.Size = New System.Drawing.Size(966, 554) + Me.ucrCells.Size = New System.Drawing.Size(644, 360) Me.ucrCells.TabIndex = 6 ' 'tbpSourceNotes ' Me.tbpSourceNotes.Controls.Add(Me.ucrSourceNotes) - Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 29) - Me.tbpSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpSourceNotes.Location = New System.Drawing.Point(4, 22) Me.tbpSourceNotes.Name = "tbpSourceNotes" - Me.tbpSourceNotes.Size = New System.Drawing.Size(976, 582) + Me.tbpSourceNotes.Size = New System.Drawing.Size(648, 431) Me.tbpSourceNotes.TabIndex = 4 Me.tbpSourceNotes.Text = "Source Notes" Me.tbpSourceNotes.UseVisualStyleBackColor = True ' 'ucrSourceNotes ' - Me.ucrSourceNotes.Location = New System.Drawing.Point(10, 11) - Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSourceNotes.Location = New System.Drawing.Point(7, 7) + Me.ucrSourceNotes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSourceNotes.Name = "ucrSourceNotes" - Me.ucrSourceNotes.Size = New System.Drawing.Size(872, 292) + Me.ucrSourceNotes.Size = New System.Drawing.Size(581, 190) Me.ucrSourceNotes.TabIndex = 0 ' 'tbpThemes @@ -194,10 +187,9 @@ Partial Class sdgTableOptions Me.tbpThemes.Controls.Add(Me.rdoSelectTheme) Me.tbpThemes.Controls.Add(Me.rdoManualTheme) Me.tbpThemes.Controls.Add(Me.ucrPnlThemesPanel) - Me.tbpThemes.Location = New System.Drawing.Point(4, 29) - Me.tbpThemes.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpThemes.Location = New System.Drawing.Point(4, 22) Me.tbpThemes.Name = "tbpThemes" - Me.tbpThemes.Size = New System.Drawing.Size(976, 582) + Me.tbpThemes.Size = New System.Drawing.Size(648, 431) Me.tbpThemes.TabIndex = 6 Me.tbpThemes.Text = "Themes" Me.tbpThemes.UseVisualStyleBackColor = True @@ -208,18 +200,17 @@ Partial Class sdgTableOptions Me.ucrCboSelectThemes.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrCboSelectThemes.GetSetSelectedIndex = -1 Me.ucrCboSelectThemes.IsReadOnly = False - Me.ucrCboSelectThemes.Location = New System.Drawing.Point(236, 45) - Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrCboSelectThemes.Location = New System.Drawing.Point(157, 29) + Me.ucrCboSelectThemes.Margin = New System.Windows.Forms.Padding(9) Me.ucrCboSelectThemes.Name = "ucrCboSelectThemes" - Me.ucrCboSelectThemes.Size = New System.Drawing.Size(252, 32) + Me.ucrCboSelectThemes.Size = New System.Drawing.Size(168, 21) Me.ucrCboSelectThemes.TabIndex = 3 ' 'btnManualTheme ' - Me.btnManualTheme.Location = New System.Drawing.Point(236, 91) - Me.btnManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.btnManualTheme.Location = New System.Drawing.Point(157, 59) Me.btnManualTheme.Name = "btnManualTheme" - Me.btnManualTheme.Size = New System.Drawing.Size(252, 32) + Me.btnManualTheme.Size = New System.Drawing.Size(168, 21) Me.btnManualTheme.TabIndex = 2 Me.btnManualTheme.Text = "Custom Theme" Me.btnManualTheme.UseVisualStyleBackColor = True @@ -228,10 +219,9 @@ Partial Class sdgTableOptions ' Me.rdoSelectTheme.AutoSize = True Me.rdoSelectTheme.Checked = True - Me.rdoSelectTheme.Location = New System.Drawing.Point(33, 48) - Me.rdoSelectTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoSelectTheme.Location = New System.Drawing.Point(22, 31) Me.rdoSelectTheme.Name = "rdoSelectTheme" - Me.rdoSelectTheme.Size = New System.Drawing.Size(132, 24) + Me.rdoSelectTheme.Size = New System.Drawing.Size(91, 17) Me.rdoSelectTheme.TabIndex = 0 Me.rdoSelectTheme.TabStop = True Me.rdoSelectTheme.Text = "Select Theme" @@ -240,10 +230,9 @@ Partial Class sdgTableOptions 'rdoManualTheme ' Me.rdoManualTheme.AutoSize = True - Me.rdoManualTheme.Location = New System.Drawing.Point(33, 94) - Me.rdoManualTheme.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.rdoManualTheme.Location = New System.Drawing.Point(22, 61) Me.rdoManualTheme.Name = "rdoManualTheme" - Me.rdoManualTheme.Size = New System.Drawing.Size(139, 24) + Me.rdoManualTheme.Size = New System.Drawing.Size(96, 17) Me.rdoManualTheme.TabIndex = 1 Me.rdoManualTheme.Text = "Manual Theme" Me.rdoManualTheme.UseVisualStyleBackColor = True @@ -251,50 +240,48 @@ Partial Class sdgTableOptions 'ucrPnlThemesPanel ' Me.ucrPnlThemesPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(18, 25) - Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlThemesPanel.Location = New System.Drawing.Point(12, 16) + Me.ucrPnlThemesPanel.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlThemesPanel.Name = "ucrPnlThemesPanel" - Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(524, 108) + Me.ucrPnlThemesPanel.Size = New System.Drawing.Size(349, 70) Me.ucrPnlThemesPanel.TabIndex = 4 ' 'tbpOtherStyles ' Me.tbpOtherStyles.Controls.Add(Me.ucrOtherStyles) - Me.tbpOtherStyles.Location = New System.Drawing.Point(4, 29) - Me.tbpOtherStyles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.tbpOtherStyles.Location = New System.Drawing.Point(4, 22) Me.tbpOtherStyles.Name = "tbpOtherStyles" - Me.tbpOtherStyles.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.tbpOtherStyles.Size = New System.Drawing.Size(976, 582) + Me.tbpOtherStyles.Padding = New System.Windows.Forms.Padding(3) + Me.tbpOtherStyles.Size = New System.Drawing.Size(648, 431) Me.tbpOtherStyles.TabIndex = 10 Me.tbpOtherStyles.Text = "Other Styles" Me.tbpOtherStyles.UseVisualStyleBackColor = True ' 'ucrOtherStyles ' - Me.ucrOtherStyles.Location = New System.Drawing.Point(12, 11) - Me.ucrOtherStyles.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOtherStyles.Location = New System.Drawing.Point(8, 7) + Me.ucrOtherStyles.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOtherStyles.Name = "ucrOtherStyles" - Me.ucrOtherStyles.Size = New System.Drawing.Size(489, 275) + Me.ucrOtherStyles.Size = New System.Drawing.Size(326, 179) Me.ucrOtherStyles.TabIndex = 0 ' 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(300, 716) - Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(200, 465) + Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" - Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(336, 46) + Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) Me.ucrSdgBaseButtons.TabIndex = 343 ' 'sdgTableOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(992, 769) + Me.ClientSize = New System.Drawing.Size(661, 500) Me.Controls.Add(Me.ucrSdgBaseButtons) Me.Controls.Add(Me.tbpFormatOptions) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "sdgTableOptions" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Table Options" diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 9d3d175627c..65b1c98917f 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -44,13 +44,11 @@ Public Class sdgTableOptions ''' ''' Public Sub Setup(strDataFrameName As String, clsNewOperator As ROperator) - If clsTablesUtils.FindRFunctionsParamsWithRCommand({"gt"}, clsNewOperator).Count = 0 Then MsgBox("Developer Error: Parameter with 'gt' as name MUST be set up before using this subdialog") Exit Sub End If - clsOperator = clsNewOperator ucrHeader.Setup(clsOperator) diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb index 0f73abb23af..b0f1c2948ca 100644 --- a/instat/UserTables/sdgTableStyles.vb +++ b/instat/UserTables/sdgTableStyles.vb @@ -1,12 +1,9 @@ Imports instat.Translations Public Class sdgTableStyles - Private clsStyleListRFunction, clsCellTextRFunction, clsCellFillRFunction, clsCellBordersRFunction, clsCellBorderSidesRFunction As New RFunction Private bFirstload As Boolean = True - Private bUserMadeChanges As Boolean = False Private bUserClickedReturn As Boolean = False - Private bSetDefaults As Boolean = True Private Sub sdgTableTextFormatOptions_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -14,13 +11,8 @@ Public Class sdgTableStyles bFirstload = False End If - If bSetDefaults Then - SetDefaults() - End If - SetRCode() - bUserMadeChanges = False bUserClickedReturn = False autoTranslate(Me) End Sub @@ -51,12 +43,6 @@ Public Class sdgTableStyles ucrCboFontFamily.SetRDefault("NULL") '----------------- - '----------------- - ucrTxtFontSize.SetParameter(New RParameter("size", iNewPosition:=2)) - ucrTxtFontSize.AddQuotesIfUnrecognised = False - ucrTxtFontSize.SetRDefault("NULL") - '----------------- - '----------------- Dim dctAlignHorizontal As New Dictionary(Of String, String) From { {"Default", "NULL"}, @@ -256,19 +242,9 @@ Public Class sdgTableStyles '--------------------------------------------------- - - End Sub - Public Sub Setup(clsStyleListRFunction As RFunction) - - ' TODO - - bSetDefaults = False - End Sub - - Private Sub SetDefaults() - + Public Sub Setup(Optional clsNewStyleListRFunction As RFunction = Nothing) clsStyleListRFunction = New RFunction clsCellTextRFunction = New RFunction clsCellFillRFunction = New RFunction @@ -288,16 +264,61 @@ Public Class sdgTableStyles clsCellBorderSidesRFunction.SetRCommand("c") + ucrTxtFontSize.SetName("") + + If clsNewStyleListRFunction IsNot Nothing Then + clsStyleListRFunction = clsNewStyleListRFunction + + If clsStyleListRFunction.ContainsParameter("cell_text_param") Then + clsCellTextRFunction = clsStyleListRFunction.GetParameter("cell_text_param").clsArgumentCodeStructure + Dim sizeValue As String = clsCellTextRFunction.GetParameter("size")?.clsArgumentCodeStructure.GetParameter("x")?.strArgumentValue + ucrTxtFontSize.SetName(If(sizeValue IsNot Nothing, sizeValue, "")) + End If + + If clsStyleListRFunction.ContainsParameter("cell_fill_param") Then + clsCellFillRFunction = clsStyleListRFunction.GetParameter("cell_fill_param").clsArgumentCodeStructure + End If + + If clsStyleListRFunction.ContainsParameter("cell_borders_param") Then + clsCellBordersRFunction = clsStyleListRFunction.GetParameter("cell_borders_param").clsArgumentCodeStructure + If clsCellBordersRFunction.ContainsParameter("sides") Then + clsCellBordersRFunction = clsCellBordersRFunction.GetParameter("sides").clsArgumentCodeStructure + End If + End If + End If End Sub + Public Function GetNewUserInputAsRFunction() As RFunction + If Not bUserClickedReturn OrElse clsStyleListRFunction.clsParameters.Count = 0 Then + Return Nothing + End If + + If clsCellTextRFunction.clsParameters.Count > 0 Then + clsStyleListRFunction.AddParameter(strParameterName:="cell_text_param", clsRFunctionParameter:=clsCellTextRFunction, bIncludeArgumentName:=False, iPosition:=0) + End If + + If clsCellFillRFunction.clsParameters.Count > 0 Then + clsStyleListRFunction.AddParameter(strParameterName:="cell_fill_param", clsRFunctionParameter:=clsCellFillRFunction, bIncludeArgumentName:=False, iPosition:=1) + End If + + If clsCellBordersRFunction.clsParameters.Count > 0 OrElse clsCellBorderSidesRFunction.clsParameters.Count > 0 Then + If clsCellBorderSidesRFunction.clsParameters.Count > 0 Then + clsCellBordersRFunction.AddParameter(strParameterName:="sides", clsRFunctionParameter:=clsCellBorderSidesRFunction, iPosition:=0) + End If + clsStyleListRFunction.AddParameter(strParameterName:="cell_borders_param", clsRFunctionParameter:=clsCellBordersRFunction, bIncludeArgumentName:=False, iPosition:=1) + End If + + Return clsStyleListRFunction + End Function + + Private Sub SetRCode() '----------------- ' Cell text controls ucrCboFontFamily.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboFontStyle.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboFontWeight.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrTxtFontSize.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboColorText.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboUnderlineType.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) 'ucrCboUnderlineStyle.SetRCode(clsNewStyleRFunction, bReset:=False, bCloneIfNeeded:=True) @@ -305,7 +326,6 @@ Public Class sdgTableStyles ucrCboAlignHorizontal.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboAlignVertical.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboTransform.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) - ucrTxtFontSize.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboWhiteSpace.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) ucrCboStretch.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) 'ucrTxtIndent.SetRCode(clsCellTextRFunction, bReset:=False, bCloneIfNeeded:=True) @@ -330,43 +350,21 @@ Public Class sdgTableStyles '----------------- End Sub - Public Function GetNewUserInputAsRFunction() As RFunction - If Not bUserClickedReturn OrElse Not bUserMadeChanges Then - Return Nothing - End If - - If clsCellTextRFunction.clsParameters.Count > 0 Then - clsStyleListRFunction.AddParameter(strParameterName:="cell_text_param", clsRFunctionParameter:=clsCellTextRFunction, bIncludeArgumentName:=False, iPosition:=0) - End If - - If clsCellFillRFunction.clsParameters.Count > 0 Then - clsStyleListRFunction.AddParameter(strParameterName:="cell_fill_param", clsRFunctionParameter:=clsCellFillRFunction, bIncludeArgumentName:=False, iPosition:=1) - End If - - If clsCellBordersRFunction.clsParameters.Count > 0 OrElse clsCellBorderSidesRFunction.clsParameters.Count > 0 Then - If clsCellBorderSidesRFunction.clsParameters.Count > 0 Then - clsCellBordersRFunction.AddParameter(strParameterName:="sides", clsRFunctionParameter:=clsCellBorderSidesRFunction, iPosition:=0) - End If - clsStyleListRFunction.AddParameter(strParameterName:="cell_borders_param", clsRFunctionParameter:=clsCellBordersRFunction, bIncludeArgumentName:=False, iPosition:=1) - End If - - Return clsStyleListRFunction - End Function Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn bUserClickedReturn = True End Sub - Private Sub controls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrCboAlignHorizontal.ControlValueChanged, - ucrCboAlignVertical.ControlValueChanged, ucrCboBorderColor.ControlValueChanged, ucrCboBorderStyle.ControlValueChanged, - ucrNudBorderWeight.ControlValueChanged, ucrCboColorBackground.ControlValueChanged, ucrCboColorText.ControlValueChanged, - ucrCboFontFamily.ControlValueChanged, ucrCboFontStyle.ControlValueChanged, ucrCboFontWeight.ControlValueChanged, - ucrCboStretch.ControlValueChanged, - ucrCboUnderlineType.ControlValueChanged, ucrCboWhiteSpace.ControlValueChanged, ucrChkBorderBottom.ControlValueChanged, - ucrChkBorderLeft.ControlValueChanged, ucrChkBorderRight.ControlValueChanged, ucrChkBorderTop.ControlValueChanged, - ucrCboTransform.ControlValueChanged, ucrTxtFontSize.ControlValueChanged, ucrNudIndent.ControlValueChanged - - bUserMadeChanges = True + Private Sub ucrTxtFontSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrTxtFontSize.ControlValueChanged + If ucrTxtFontSize.IsEmpty Then + clsCellTextRFunction.RemoveParameterByName("size") + Else + Dim pxRFunction As New RFunction + pxRFunction.SetPackageName("gt") + pxRFunction.SetRCommand("px") + pxRFunction.AddParameter(strParameterName:="x", strParameterValue:=ucrTxtFontSize.GetText(), bIncludeArgumentName:=False, iPosition:=2) + clsCellTextRFunction.AddParameter(strParameterName:="size", clsRFunctionParameter:=pxRFunction) + End If End Sub From 28ca7f144aa7bc2860a6a8ed6e548a75e777cf33 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 16 Sep 2024 16:18:55 +0300 Subject: [PATCH 127/273] fixed alignment bug --- instat/UserTables/sdgTableStyles.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb index b0f1c2948ca..7f1d96f80a0 100644 --- a/instat/UserTables/sdgTableStyles.vb +++ b/instat/UserTables/sdgTableStyles.vb @@ -65,8 +65,8 @@ Public Class sdgTableStyles {"Bottom", Chr(34) & "bottom" & Chr(34)} } ucrCboAlignVertical.SetDropDownStyleAsNonEditable() - ucrCboAlignVertical.SetParameter(New RParameter("align", iNewPosition:=4)) - ucrCboAlignVertical.SetItems(dctAlignHorizontal) + ucrCboAlignVertical.SetParameter(New RParameter("v_align", iNewPosition:=4)) + ucrCboAlignVertical.SetItems(dctAlignVertical) ucrCboAlignVertical.SetRDefault("NULL") '----------------- @@ -290,7 +290,7 @@ Public Class sdgTableStyles End Sub Public Function GetNewUserInputAsRFunction() As RFunction - If Not bUserClickedReturn OrElse clsStyleListRFunction.clsParameters.Count = 0 Then + If Not bUserClickedReturn Then Return Nothing End If @@ -309,7 +309,7 @@ Public Class sdgTableStyles clsStyleListRFunction.AddParameter(strParameterName:="cell_borders_param", clsRFunctionParameter:=clsCellBordersRFunction, bIncludeArgumentName:=False, iPosition:=1) End If - Return clsStyleListRFunction + Return If(clsStyleListRFunction.clsParameters.Count > 0, clsStyleListRFunction, Nothing) End Function From 6206daf3324dad750750dac4ef66795c75d3204d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 16 Sep 2024 15:05:53 +0100 Subject: [PATCH 128/273] Change made --- instat/dlgClimograph.vb | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index acd9f455840..4171b891ecd 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -114,6 +114,10 @@ Public Class dlgClimograph Private clsAesTmaxBarFunction1, clsAesTminBarFunction1, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction Private clsAesRainBarTextFunction, clsPlotGridFunction, clsAesTmaxBarTextFunction, clsAesTminBarTextFunction, clsRainRoundFunction, clsTmaxRoundFunction, clsTminRoundFunction As New RFunction Private strScale As String = "scale_Factor" + Dim lstRecognisedRain As New List(Of KeyValuePair(Of String, List(Of String))) + Dim lstRecognisedTmax As New List(Of KeyValuePair(Of String, List(Of String))) + Dim lstRecognisedTmin As New List(Of KeyValuePair(Of String, List(Of String))) + Dim lstRecognisedMinTmin As New List(Of KeyValuePair(Of String, List(Of String))) Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -131,10 +135,18 @@ Public Class dlgClimograph End Sub Private Sub InitialiseDialog() + Dim kvpRain As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("rain", {"sum_rainfall", "sum_rain", "sum_prec", "sum_precip", "sum_precipitation", "sum_rr", "mean_sum_prcp", "mean_sum_rainfall", "mean_sum_rain", "mean_sum_prec", "mean_sum_precip", "mean_sum_precipitation", "mean_sum_rr", "mean_sum_prcp", "median_sum_rainfall", "median_sum_rain", "median_sum_prec", "median_sum_precip", "median_sum_precipitation", "median_sum_rr", "median_sum_prcp", "max_sum_rainfall", "max_sum_rain", "max_sum_prec", "max_sum_precip", "max_sum_precipitation", "max_sum_rr", "max_sum_prcp", "min_sum_rainfall", "min_sum_rain", "min_sum_prec", "min_sum_precip", "min_sum_precipitation", "min_sum_rr", "min_sum_prcp", "mean_rainfall", "mean_rain", "mean_prec", "mean_precip", "mean_precipitation", "mean_rr", "mean_prcp", "max_rainfall", "max_rain", "max_prec", "max_precip", "max_precipitation", "max_rr", "max_prcp", "min_rainfall", "min_rain", "min_prec", "min_precip", "min_precipitation", "min_rr", "min_prcp", "mean_max_rainfall", "mean_max_rain", "mean_max_prec", "mean_max_precip", "mean_max_precipitation", "mean_max_rr", "mean_max_prcp", "mean_min_rainfall", "mean_min_rain", "mean_min_prec", "mean_min_precip", "mean_min_precipitation", "mean_min_rr", "mean_min_prcp", "max_max_rainfall", "max_max_rain", "max_max_prec", "max_max_precip", "max_max_precipitation", "max_max_rr", "max_max_prcp", "max_min_rainfall", "max_min_rain", "max_min_prec", "max_min_precip", "max_min_precipitation", "max_min_rr", "max_min_prcp", "min_max_rainfall", "min_max_rain", "min_max_prec", "min_max_precip", "min_max_precipitation", "min_max_rr", "min_max_prcp", "min_min_rainfall", "min_min_rain", "min_min_prec", "min_min_precip", "min_min_precipitation", "min_min_rr", "min_min_prcp"}.ToList()) + Dim kvpTmax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"mean_tmax", "mean_tx", "mean_tempmax", "mean_tmp_max", "mean_tmpmax", "mean_max_temperature", "max_tmax", "max_max_temperature", "max_tx", "max_tempmax", "max_tmp_max", "max_tmpmax", "min_tmax", "min_max_temperature", "min_tx", "min_tempmax", "min_tmp_max", "min_tmpmax", "tmax", "max_temperature", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList()) + Dim kvpTmin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"mean_tmin", "mean_tn", "mean_tempmin", "mean_tmp_min", "mean_tmpmin", "mean_min_temperature", "max_tmin", "max_min_temperature", "max_tn", "max_tempmin", "max_tmp_min", "max_tmpmin", "min_tmin", "min_min_temperature", "min_tn", "min_tempmin", "min_tmp_min", "min_tmpmin", "tmin", "min_temperature", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList()) + Dim kvpMinTmin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("min_temp_min", {"min_tmin", "min_tn", "min_tempmin", "min_tmp_min", "min_tmpmin", "min_min_temperature"}.ToList()) Dim dctLegendPosition As New Dictionary(Of String, String) Dim dctColourPallette As New Dictionary(Of String, String) Dim dctPalette As New Dictionary(Of String, String) + lstRecognisedTypes.AddRange({kvpAnnualRain, kvpEndRainDate, kvpEndRainDOY, kvpEndRainStatus, kvpEndSeasonDate, kvpEndSeasonDOY, kvpEndSeasonStatus, + kvpRainDaysSeason, kvpRainDaysYear, kvpSeasonalLength, kvpSeasonalRain, kvpStartRainDate, + kvpStartRainDOY, kvpStartRainStatus}) + ucrBase.iHelpTopicID = 432 ucrSelectorClimograph.SetParameter(New RParameter("data", 0, bNewIncludeArgumentName:=False)) From 62539ebe09e3c29bb403f9b13aee77393b1e9c01 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 17 Sep 2024 10:14:17 +0300 Subject: [PATCH 129/273] improvement in the recovery feature --- instat/frmMain.vb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index c89ed417c92..5806b399109 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -464,13 +464,11 @@ Public Class frmMain Dim lastExitStatus As String = File.ReadAllText(strMarkerFilePath).Trim() If lastExitStatus <> "CleanExit" AndAlso MsgBox("We have detected that R-Instat may have closed unexpectedly last time." & Environment.NewLine & - "Would you like to see auto recovery options?", + "The Tools > Restore Backup dialog allows you to restore backed-up data, or save the corresponding log file." & Environment.NewLine & + "To proceed, click Yes.", MessageBoxButtons.YesNo, "Auto Recovery") = MsgBoxResult.Yes Then - dlgAutoSaveRecovery.strAutoSavedLogFilePaths = strAutoSavedLogFilePaths - dlgAutoSaveRecovery.strAutoSavedDataFilePaths = strAutoSavedDataFilePaths - dlgAutoSaveRecovery.strAutoSavedInternalLogFilePaths = strAutoSavedInternalLogFilePaths - dlgAutoSaveRecovery.ShowDialog() + dlgRestoreBackup.ShowDialog() 'todo. the dialog design is meant to only return just one option; script, data file path or new session. 'refactor the dialog to enforce the design From e111027e5d0839de25547f7f0cd4d72ee8c14c01 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 17 Sep 2024 12:43:26 +0300 Subject: [PATCH 130/273] addition to the recovery --- instat/dlgRestoreBackup.vb | 8 ++++++++ instat/frmMain.vb | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/instat/dlgRestoreBackup.vb b/instat/dlgRestoreBackup.vb index 6737206db9a..02cba02cab6 100644 --- a/instat/dlgRestoreBackup.vb +++ b/instat/dlgRestoreBackup.vb @@ -198,6 +198,14 @@ Public Class dlgRestoreBackup End If End Sub + Public Function GetScript() As String + Return strScript + End Function + + Public Function GetDataFilePath() As String + Return strLoadDateFilePath + End Function + Private Sub ucrInputSavedPathData_Leave(sender As Object, e As EventArgs) Handles ucrInputSavedPathData.Leave If Not String.IsNullOrEmpty(ucrInputSavedPathData.IsEmpty) Then frmMain.clsRecentItems.addToMenu(Replace(ucrInputSavedPathData.FilePath, "\", "/")) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 5806b399109..498f4fdbe82 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -474,9 +474,9 @@ Public Class frmMain 'refactor the dialog to enforce the design 'get the R script from read file if selected by the user - strScript = dlgAutoSaveRecovery.GetScript() + strScript = dlgRestoreBackup.GetScript() 'get the data file path if selected by the user - strDataFilePath = dlgAutoSaveRecovery.GetDataFilePath() + strDataFilePath = dlgRestoreBackup.GetDataFilePath() End If End If From 89ed9aadd131ea98a5d67e8be940e6268b472658 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 17 Sep 2024 14:50:53 +0300 Subject: [PATCH 131/273] added suggested changes --- instat/dlgClimSoft.Designer.vb | 2 +- instat/sdgClimsoft.vb | 2 ++ instat/sdgImportFromClimSoft.vb | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/instat/dlgClimSoft.Designer.vb b/instat/dlgClimSoft.Designer.vb index 498170e670b..44f5fa99426 100644 --- a/instat/dlgClimSoft.Designer.vb +++ b/instat/dlgClimSoft.Designer.vb @@ -435,7 +435,7 @@ Partial Class dlgClimSoft Me.MinimizeBox = False Me.Name = "dlgClimSoft" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Import From Climsoft (version 4.2.2)" + Me.Text = "Import From Climsoft" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/sdgClimsoft.vb b/instat/sdgClimsoft.vb index e23c63a5b8f..c5f4e51094e 100644 --- a/instat/sdgClimsoft.vb +++ b/instat/sdgClimsoft.vb @@ -28,6 +28,8 @@ Public Class sdgClimsoft Exit Sub End If + ucrBaseSubdialog.iHelpTopicID = 352 + 'Columns to include '--------------------------------------- ucrChkIncludeStationId.SetText("Station Id") diff --git a/instat/sdgImportFromClimSoft.vb b/instat/sdgImportFromClimSoft.vb index 392722acea6..0b826309739 100644 --- a/instat/sdgImportFromClimSoft.vb +++ b/instat/sdgImportFromClimSoft.vb @@ -38,6 +38,8 @@ Public Class sdgImportFromClimSoft End Sub Private Sub InitialiseDialog() + ucrBaseSdgClimSoft.iHelpTopicID = 354 + Dim dctDatabaseNames As New Dictionary(Of String, String) Dim dctPorts As New Dictionary(Of String, String) Dim dctDrv As New Dictionary(Of String, String) From 849709ccbf2ef5249d4c3ca62d2c58000db29f62 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 17 Sep 2024 15:19:24 +0300 Subject: [PATCH 132/273] changes --- instat/dlgExportToClimsoft.vb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 91514d69f97..887d4aa091f 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -117,15 +117,14 @@ Public Class dlgExportToClimsoft clsMutateFunction.SetPackageName("dplyr") clsMutateFunction.SetRCommand("mutate") - clsExportClimsoftFunction.SetPackageName("rio") - clsExportClimsoftFunction.SetRCommand("export") - clsExportClimsoftFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0) + clsExportClimsoftFunction.SetRCommand("write.csv") + clsExportClimsoftFunction.AddParameter("x", clsROperatorParameter:=clsPipeOperator, iPosition:=0, bIncludeArgumentName:=False) clsPasteFunction.SetRCommand("paste") clsPasteFunction.SetAssignTo("date1") clsSprintfFunction.SetRCommand("sprintf") - clsSprintfFunction.AddParameter("hour", 6, iPosition:=1) + clsSprintfFunction.AddParameter("hour", 6, iPosition:=1, bIncludeArgumentName:=False) ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) @@ -251,7 +250,7 @@ Public Class dlgExportToClimsoft Private Sub ucrInputHour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHour.ControlValueChanged If Not ucrInputHour.IsEmpty Then - clsSprintfFunction.AddParameter("format", Chr(34) & "%02d:00:00" & Chr(34), bIncludeArgumentName:=False, iPosition:=0) + clsSprintfFunction.AddParameter("fmt", Chr(34) & "%02d:00:00" & Chr(34), iPosition:=0) clsSprintfFunction.AddParameter("hour", ucrInputHour.GetText, bIncludeArgumentName:=False, iPosition:=1) Else From 4adb56df0e40a0a48c581bc92c9b1687e3d6e02e Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 18 Sep 2024 12:48:12 +0300 Subject: [PATCH 133/273] Additional library for R-Instat --- instat/static/InstatObject/R/InstallPackages.R | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 7cfea6f7431..6e19a9c5ddd 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -1,6 +1,13 @@ Sys.setenv(TZ='GMT') Sys.setlocale("LC_TIME", "C") +# Define the custom package library path (in AppData, no admin rights needed) +app_data_lib <- file.path(Sys.getenv("APPDATA"), "R-Instat", "library") +dir.create(app_data_lib, recursive = TRUE, showWarnings = FALSE) + +# Add the custom library path to .libPaths() for installing user-level packages +.libPaths(c(app_data_lib, .libPaths())) + #Install packages from CRAN archive install.packages("http://cran.r-project.org/src/contrib/Archive/signmedian.test/signmedian.test_1.5.1.tar.gz", repos=NULL, type="source") @@ -157,7 +164,10 @@ packs <- c("abind", "agricolae", "agridat", install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org', type="win.binary") # Only use internal library -if (length(.libPaths()) == 2) .libPaths(.libPaths()[2]) +if (length(.libPaths()) >= 2){ + current_paths <- .libPaths() + current_paths[c(1, 2) <= length(current_paths)] +} #install development packages not on CRAN devtools::install_github("ianmoran11/mmtable2") From 8e7c0b03c2fbb123e291805877cdd1d8f8680a52 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Wed, 18 Sep 2024 14:42:30 +0300 Subject: [PATCH 134/273] changed frmMain title --- instat/frmMain.Designer.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index de1ce3227d0..e7e4ee0766b 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5239,7 +5239,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat .." + Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() From 117885fa76b6fadfe99541fdd1b8549ca16c8aa6 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 18 Sep 2024 16:25:16 +0300 Subject: [PATCH 135/273] changes to the code --- instat/dlgClimaticCheckDataRain.vb | 55 ++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/instat/dlgClimaticCheckDataRain.vb b/instat/dlgClimaticCheckDataRain.vb index 454d67d285f..4b9309ebc5b 100644 --- a/instat/dlgClimaticCheckDataRain.vb +++ b/instat/dlgClimaticCheckDataRain.vb @@ -23,6 +23,7 @@ Public Class dlgClimaticCheckDataRain Private clsGroupByFunc As New RFunction Private clsRainFilterFunc As New RFunction Private clsRunCalcFunc As New RFunction + Private clsDayFilterFunc As New RFunction Private clsListFunc As New RFunction Private clsGroupByMonth As New RFunction 'Large @@ -66,6 +67,7 @@ Public Class dlgClimaticCheckDataRain 'Dry Month Private clsGroupByMonthYearFunction As New RFunction Private clsDryMonthCalculationFunc As New RFunction + Private clsDayFilterCalcFunction As New RFunction Private clsListCalcFunction As New RFunction Private clsSumFuction As New RFunction Private clsDryMonthTestCalculationFunc As New RFunction @@ -74,7 +76,9 @@ Public Class dlgClimaticCheckDataRain Private clsDrySumFuction As New RFunction Private clsFilterMonthFunction As New RFunction Private clsGroupByListFunc As New RFunction + Private clsManuplationDayListFunction As New RFunction Private clsDryMonthEqualOperator As New ROperator + Private clsDayEqualOperator As New ROperator Private clsDryMonthAndOperator As New ROperator Private clsLessOperator As New ROperator Private clsDryTestAndOperator As New ROperator @@ -84,6 +88,7 @@ Public Class dlgClimaticCheckDataRain 'Combined Filters Private clsOrOperator As New ROperator Private clsListSubCalc As New RFunction + Private clsListDayFunction As New RFunction 'Outlier Private clsListForOutlierManipulations As New RFunction Private clsRainyDaysFunc As New RFunction @@ -253,6 +258,7 @@ Public Class dlgClimaticCheckDataRain clsSecondGreaterSameOperator.Clear() clsRainFilterFunc.Clear() + clsDayFilterFunc.Clear() clsLargeTestCalcFunc.Clear() clsSameCalcFunc.Clear() clsCumulativeTestFunc.Clear() @@ -261,6 +267,7 @@ Public Class dlgClimaticCheckDataRain clsUpperOutlierlimitTestFunc.Clear() clsListForOutlierManipulations.Clear() clsDryMonthCalculationFunc.Clear() + clsDayFilterCalcFunction.Clear() clsGroupByMonthYearFunction.Clear() clsListCalcFunction.Clear() clsSumFuction.Clear() @@ -270,7 +277,9 @@ Public Class dlgClimaticCheckDataRain clsDrySumFuction.Clear() clsFilterMonthFunction.Clear() clsGroupByListFunc.Clear() + clsManuplationDayListFunction.Clear() clsDryMonthEqualOperator.Clear() + clsDayEqualOperator.Clear() clsDryMonthAndOperator.Clear() clsLessOperator.Clear() clsDryTestAndOperator.Clear() @@ -296,11 +305,23 @@ Public Class dlgClimaticCheckDataRain clsRainFilterFunc.AddParameter("function_exp", clsROperatorParameter:=clsOrOperator, iPosition:=1) clsRainFilterFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsListSubCalc, iPosition:=2) clsRainFilterFunc.AddParameter("result_data_frame", Chr(34) & "qcRain" & Chr(34), iPosition:=4) - clsRainFilterFunc.AddParameter("save", 2, iPosition:=5) clsRainFilterFunc.SetAssignTo("rainfall_filter") + clsManuplationDayListFunction.SetRCommand("list") + clsManuplationDayListFunction.AddParameter("list", clsRFunctionParameter:=clsRainFilterFunc, iPosition:=0, bIncludeArgumentName:=False) + + clsDayFilterFunc.SetRCommand("instat_calculation$new") + clsDayFilterFunc.AddParameter("type", Chr(34) & "filter" & Chr(34), iPosition:=0) + clsDayFilterFunc.AddParameter("function_exp", Chr(34) & "day" & Chr(34), iPosition:=1) + clsDayFilterFunc.AddParameter("sub_calculations", clsRFunctionParameter:=clsListDayFunction, iPosition:=2) + clsDayFilterFunc.AddParameter("result_data_frame", Chr(34) & "qcRain" & Chr(34), iPosition:=4) + clsDayFilterFunc.SetAssignTo("filter_first_day") + clsListSubCalc.SetRCommand("list") + clsListDayFunction.SetRCommand("list") + clsListDayFunction.AddParameter("cal", clsRFunctionParameter:=clsDayFilterCalcFunction, iPosition:=0, bIncludeArgumentName:=False) + clsManipList.SetRCommand("list") clsManipList.AddParameter("manip1", clsRFunctionParameter:=clsGroupByFunc, bIncludeArgumentName:=False, iPosition:=0) @@ -530,6 +551,13 @@ Public Class dlgClimaticCheckDataRain clsDryMonthCalculationFunc.AddParameter("result_name", Chr(34) & strDryMonthCalc & Chr(34), iPosition:=4) clsDryMonthCalculationFunc.SetAssignTo("dry_month_calculation") + clsDayFilterCalcFunction.SetRCommand("instat_calculation$new") + clsDayFilterCalcFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsDayFilterCalcFunction.AddParameter("function_exp", Chr(34) & "day==1" & Chr(34), iPosition:=1) + clsDayFilterCalcFunction.AddParameter("manipulations", clsRFunctionParameter:=clsManuplationDayListFunction, iPosition:=3) + clsDayFilterCalcFunction.AddParameter("result_name", Chr(34) & "day" & Chr(34), iPosition:=4) + clsDayFilterCalcFunction.SetAssignTo("day_calculation") + clsListCalcFunction.SetRCommand("list") clsListCalcFunction.AddParameter("year_month_grouping", clsRFunctionParameter:=clsGroupByMonthYearFunction, bIncludeArgumentName:=False, iPosition:=1) @@ -537,6 +565,10 @@ Public Class dlgClimaticCheckDataRain clsDryMonthEqualOperator.AddParameter("sum", clsRFunctionParameter:=clsSumFuction, iPosition:=0) clsDryMonthEqualOperator.AddParameter("zero", 0, iPosition:=1) + clsDayEqualOperator.SetOperation("==") + clsDayEqualOperator.AddParameter("doy", "day", iPosition:=0, bIncludeArgumentName:=False) + clsDayEqualOperator.AddParameter("one", "1", iPosition:=1, bIncludeArgumentName:=False) + clsSumFuction.SetRCommand("sum") clsLessOperator.SetOperation("<") @@ -570,9 +602,9 @@ Public Class dlgClimaticCheckDataRain ' Run Calc function clsRunCalcFunc.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$run_instat_calculation") - clsRunCalcFunc.AddParameter("calc", clsRFunctionParameter:=clsRainFilterFunc, iPosition:=0) clsRunCalcFunc.AddParameter("display", "FALSE", iPosition:=1) ucrBase.clsRsyntax.SetBaseRFunction(clsRunCalcFunc) + AddRemoveDayFilter() End Sub Private Sub setRcodeForControls(bReset) @@ -624,6 +656,7 @@ Public Class dlgClimaticCheckDataRain ucrChkLogicalColumns.SetRCode(clsLargeTestCalcFunc, bReset) ucrChkCalculatedColumns.SetRCode(clsCumulativeCalcFunc, bReset) + AddRemoveDayFilter() End Sub Private Sub TestOkEnabled() @@ -687,6 +720,7 @@ Public Class dlgClimaticCheckDataRain strCurrDataName = Chr(34) & ucrSelectorRain.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34) clsRainyDaysFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) clsDryMonthCalculationFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) + clsDayFilterCalcFunction.AddParameter("calculated_from", "list(" & Chr(34) & "qcRain" & Chr(34) & "=" & ucrReceiverDay.GetVariableNames & "," & Chr(34) & "qcRain" & Chr(34) & "=" & ucrReceiverMonth.GetVariableNames & "," & Chr(34) & "qcRain" & Chr(34) & "=" & ucrReceiverYear.GetVariableNames & ")", iPosition:=2) clsUpperOutlierLimitValueCalcFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) clsLargeTestCalcFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) clsSameCalcFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "= " & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) @@ -718,4 +752,21 @@ Public Class dlgClimaticCheckDataRain Private Sub ucrReceiverElement_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement.ControlContentsChanged, ucrChkLarge.ControlContentsChanged, ucrChkSame.ControlContentsChanged, ucrChkWetDays.ControlContentsChanged, ucrNudLarge.ControlContentsChanged, ucrNudSame.ControlContentsChanged, ucrNudWetDays.ControlContentsChanged, ucrChkOutlier.ControlContentsChanged, ucrChkOmitZero.ControlContentsChanged, ucrInputThresholdValue.ControlContentsChanged, ucrChkDryMonth.ControlContentsChanged, ucrInputThreshold.ControlContentsChanged, ucrReceiverMonth.ControlContentsChanged, ucrInputSameValue.ControlContentsChanged TestOkEnabled() End Sub + + Private Sub ucrChkDryMonth_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryMonth.ControlValueChanged + AddRemoveDayFilter() + End Sub + + Private Sub AddRemoveDayFilter() + clsRunCalcFunc.RemoveParameterByName("calc") + If ucrChkDryMonth.Checked Then + clsRunCalcFunc.AddParameter("calc", clsRFunctionParameter:=clsDayFilterFunc, iPosition:=0) + clsDayFilterFunc.AddParameter("save", 2, iPosition:=5) + clsRainFilterFunc.RemoveParameterByName("save") + Else + clsRunCalcFunc.AddParameter("calc", clsRFunctionParameter:=clsRainFilterFunc, iPosition:=0) + clsRainFilterFunc.AddParameter("save", 2, iPosition:=5) + clsDayFilterFunc.RemoveParameterByName("save") + End If + End Sub End Class From 7ff46169c2bd2d0d284419da0d0d1a7ba4256139 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 18 Sep 2024 15:22:35 +0100 Subject: [PATCH 136/273] Update stand_alone_functions.R @Vitalis95 I have updated the R function here. When you next work on this, make sure you pull changes to your Visual Studio --- .../InstatObject/R/stand_alone_functions.R | 62 +++++++++++++++---- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 86de4861b9e..6ddf5282347 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3360,16 +3360,56 @@ ggwalter_lieth <- function (data, month, station = NULL, p_mes, tm_max, tm_min, return(wandlplot) } -# Function to check if a repo exists and is in R -check_github_repo <- function(owner, repo) { - tryCatch({ - response <- gh::gh("/repos/:owner/:repo", owner = owner, repo = repo, verb = "GET", silent = TRUE) - if (response$language == "R") { - return(1) # Repository exists and is in the R language +# Function to check if a repo exists and is in R. Can give either owner and repo, or give url +check_github_repo <- function(owner = NULL, repo = NULL, url = NULL) { + if (!is.null(url)){ + # Extract the part after 'github.com' + url <- sub(".*github.com/", "", url) + + # Extract the correct parts + owner <- dirname(url) + repo <- basename(url) + } + # Check if the package is already installed + if (requireNamespace(repo, quietly = TRUE)) { + + # Get the installed package's remote SHA (if installed via GitHub) + local_sha <- packageDescription(repo)$GithubSHA1 + + if (!is.null(local_sha)) { + # Get the latest commit SHA from the GitHub repository + latest_commit <- tryCatch({ + response <- gh::gh("/repos/:owner/:repo/commits", owner = owner, repo = repo, .limit = 1) + response[[1]]$sha + }, error = function(e) { + # Handle error if GitHub API call fails + return(NULL) + }) + + if (!is.null(latest_commit)) { + if (local_sha == latest_commit) { + return(0) # Package is installed and up-to-date + } else { + return(1) # Package is installed but not the latest version + } + } else { + return(2) # Unable to retrieve the latest commit from GitHub + } } else { - return(2) # Repository exists, but isn't in the R language + return(3) # Package is installed but not from GitHub } - }, error = function(e) { - return(3) # Error occurred, repository doesn't exist - }) -} \ No newline at end of file + + # If not installed, check if the repository exists on GitHub + } else { + tryCatch({ + response <- gh::gh("/repos/:owner/:repo", owner = owner, repo = repo, verb = "GET", silent = TRUE) + if (response$language == "R") { + return(4) # Repository exists and is in the R language + } else { + return(5) # Repository exists, but isn't in the R language + } + }, error = function(e) { + return(6) # Error occurred, repository doesn't exist + }) + } +} From 6d8ce58bc76c6d7411e25a10a0cc7777ceae8879 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 18 Sep 2024 17:14:48 +0100 Subject: [PATCH 137/273] Update dlgRPackages.vb --- instat/dlgRPackages.vb | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 7945d6d3aba..0142fc2ddec 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -135,13 +135,17 @@ Public Class dlgInstallRPackage Exit Sub End If Select Case chrOutput(0) + Case "0" + bUniqueChecked = False + ucrInputMessage.SetText("Package is up to date.") + ucrInputMessage.txtInput.BackColor = Color.LightGreen Case "1" bUniqueChecked = True If rdoCRAN.Checked Then If chrOutput.Count = 4 Then If chrOutput(1) = "0" Then ucrInputMessage.SetText("Package is installed and up to date.") - ucrInputMessage.txtInput.BackColor = Color.Yellow + ucrInputMessage.txtInput.BackColor = Color.LightBlue ElseIf chrOutput(1) = "-1" Then ucrInputMessage.SetText("Package is installed. Newer version available: " & chrOutput(3) & " (current: " & chrOutput(2) & ").") End If @@ -157,24 +161,40 @@ Public Class dlgInstallRPackage ucrInputMessage.SetText("Package exists and not currently installed.") ucrInputMessage.txtInput.BackColor = Color.LightGreen ElseIf rdoRPackage.Checked Then - ucrInputMessage.SetText("Package exists in the repo but is not in the R language") - ucrInputMessage.txtInput.BackColor = Color.LightGreen + ucrInputMessage.SetText("Unable to retrieve from GitHub. Check internet connection?") + ucrInputMessage.txtInput.BackColor = Color.LightCoral End If Case "3" If rdoCRAN.Checked Then ucrInputMessage.SetText("Package is installed but not a current CRAN package") ucrInputMessage.txtInput.BackColor = Color.LightBlue ElseIf rdoRPackage.Checked Then - ucrInputMessage.SetText("Not a package in the given repo. Perhaps spelled wrongly?") - ucrInputMessage.txtInput.BackColor = Color.LightCoral - bUniqueChecked = False + ucrInputMessage.SetText("Package exists in the repo and is ready for installation") + ucrInputMessage.txtInput.BackColor = Color.LightGreen + bUniqueChecked = True End If Case "4" - ucrInputMessage.SetText("Not a current CRAN package. Perhaps spelled wrongly, or archived?") - ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue - bUniqueChecked = False + If rdoCRAN.Checked Then + ucrInputMessage.SetText("Not a current CRAN package. Perhaps spelled wrongly, or archived?") + ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue + bUniqueChecked = False + ElseIf rdoRPackage.Checked Then + ucrInputMessage.SetText("Package exists in the repo and is ready for installation") + ucrInputMessage.txtInput.BackColor = Color.LightGreen + bUniqueChecked = True + End If Case "5" - ucrInputMessage.SetText("No internet connection.Try reconnecting") + If rdoCRAN.Checked Then + ucrInputMessage.SetText("No internet connection.Try reconnecting") + ucrInputMessage.txtInput.BackColor = Color.LightCoral + bUniqueChecked = False + ElseIf rdoRPackage.Checked Then + ucrInputMessage.SetText("Package exists but is not in the R language") + ucrInputMessage.txtInput.BackColor = Color.LightCoral + bUniqueChecked = False + End If + Case "6" + ucrInputMessage.SetText("Not a package in the given repo. Check spelling?") ucrInputMessage.txtInput.BackColor = Color.LightCoral bUniqueChecked = False End Select @@ -234,4 +254,4 @@ Public Class dlgInstallRPackage SetRCodeForControls(True) TestOkEnabled() End Sub -End Class \ No newline at end of file +End Class From 63a1708e54e36020592e48e48c58effc5eecc1f3 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 18 Sep 2024 17:24:40 +0100 Subject: [PATCH 138/273] Update dlgRPackages.vb --- instat/dlgRPackages.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 0142fc2ddec..e37002aade7 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -138,7 +138,7 @@ Public Class dlgInstallRPackage Case "0" bUniqueChecked = False ucrInputMessage.SetText("Package is up to date.") - ucrInputMessage.txtInput.BackColor = Color.LightGreen + ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue Case "1" bUniqueChecked = True If rdoCRAN.Checked Then From 08af9f1d43979407468041ef24b266e57d642423 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 19 Sep 2024 07:24:12 +0300 Subject: [PATCH 139/273] changes --- instat/dlgClimaticCheckDataRain.vb | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/instat/dlgClimaticCheckDataRain.vb b/instat/dlgClimaticCheckDataRain.vb index 4b9309ebc5b..97e2fb3b035 100644 --- a/instat/dlgClimaticCheckDataRain.vb +++ b/instat/dlgClimaticCheckDataRain.vb @@ -553,7 +553,7 @@ Public Class dlgClimaticCheckDataRain clsDayFilterCalcFunction.SetRCommand("instat_calculation$new") clsDayFilterCalcFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) - clsDayFilterCalcFunction.AddParameter("function_exp", Chr(34) & "day==1" & Chr(34), iPosition:=1) + clsDayFilterCalcFunction.AddParameter("function_exp", clsROperatorParameter:=clsDayEqualOperator, iPosition:=1) clsDayFilterCalcFunction.AddParameter("manipulations", clsRFunctionParameter:=clsManuplationDayListFunction, iPosition:=3) clsDayFilterCalcFunction.AddParameter("result_name", Chr(34) & "day" & Chr(34), iPosition:=4) clsDayFilterCalcFunction.SetAssignTo("day_calculation") @@ -566,8 +566,8 @@ Public Class dlgClimaticCheckDataRain clsDryMonthEqualOperator.AddParameter("zero", 0, iPosition:=1) clsDayEqualOperator.SetOperation("==") - clsDayEqualOperator.AddParameter("doy", "day", iPosition:=0, bIncludeArgumentName:=False) clsDayEqualOperator.AddParameter("one", "1", iPosition:=1, bIncludeArgumentName:=False) + clsDayEqualOperator.bToScriptAsRString = True clsSumFuction.SetRCommand("sum") @@ -656,7 +656,7 @@ Public Class dlgClimaticCheckDataRain ucrChkLogicalColumns.SetRCode(clsLargeTestCalcFunc, bReset) ucrChkCalculatedColumns.SetRCode(clsCumulativeCalcFunc, bReset) - AddRemoveDayFilter() + 'AddRemoveDayFilter() End Sub Private Sub TestOkEnabled() @@ -716,7 +716,7 @@ Public Class dlgClimaticCheckDataRain GroupByMonth() End Sub - Private Sub ucrSelectorRain_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorRain.ControlValueChanged, ucrReceiverElement.ControlValueChanged + Private Sub ucrSelectorRain_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorRain.ControlValueChanged, ucrReceiverElement.ControlValueChanged, ucrReceiverDay.ControlValueChanged, ucrReceiverMonth.ControlValueChanged, ucrReceiverYear.ControlValueChanged strCurrDataName = Chr(34) & ucrSelectorRain.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34) clsRainyDaysFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) clsDryMonthCalculationFunc.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverElement.GetVariableNames & ")", iPosition:=2) @@ -731,10 +731,14 @@ Public Class dlgClimaticCheckDataRain GroupByOptions() GroupByMonth() + AddRemoveDayFilter() + AddDoy() End Sub Private Sub ucrSelectorRain_DataFrameChanged() Handles ucrSelectorRain.DataFrameChanged AutoFillRainColumn() + AddRemoveDayFilter() + AddDoy() End Sub Private Sub AutoFillRainColumn() @@ -768,5 +772,15 @@ Public Class dlgClimaticCheckDataRain clsRainFilterFunc.AddParameter("save", 2, iPosition:=5) clsDayFilterFunc.RemoveParameterByName("save") End If + AddDoy() + End Sub + + Private Sub AddDoy() + If Not ucrReceiverDay.IsEmpty Then + clsDayEqualOperator.AddParameter("doy", ucrReceiverDay.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + + Else + clsDayEqualOperator.RemoveParameterByName("doy") + End If End Sub End Class From 3c9dd9b176abbaf6af6ad18559c0db8438db796c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 19 Sep 2024 11:56:35 +0300 Subject: [PATCH 140/273] changes --- instat/dlgRPackages.vb | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index e37002aade7..51adba2baf5 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -137,8 +137,14 @@ Public Class dlgInstallRPackage Select Case chrOutput(0) Case "0" bUniqueChecked = False - ucrInputMessage.SetText("Package is up to date.") - ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue + If rdoCRAN.Checked Then + ucrInputMessage.SetText("Package is up to date.") + ucrInputMessage.txtInput.BackColor = Color.LightSkyBlue + ElseIf rdoRPackage.Checked Then + ucrInputMessage.SetText("Package is up to date.") + ucrInputMessage.txtInput.BackColor = Color.Orange + End If + Case "1" bUniqueChecked = True If rdoCRAN.Checked Then @@ -154,7 +160,7 @@ Public Class dlgInstallRPackage End If ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package exists in the repo and is ready for installation") - ucrInputMessage.txtInput.BackColor = Color.LightGreen + ucrInputMessage.txtInput.BackColor = Color.Green End If Case "2" If rdoCRAN.Checked Then @@ -162,16 +168,17 @@ Public Class dlgInstallRPackage ucrInputMessage.txtInput.BackColor = Color.LightGreen ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Unable to retrieve from GitHub. Check internet connection?") - ucrInputMessage.txtInput.BackColor = Color.LightCoral + ucrInputMessage.txtInput.BackColor = Color.Red + bUniqueChecked = False End If Case "3" If rdoCRAN.Checked Then ucrInputMessage.SetText("Package is installed but not a current CRAN package") ucrInputMessage.txtInput.BackColor = Color.LightBlue ElseIf rdoRPackage.Checked Then - ucrInputMessage.SetText("Package exists in the repo and is ready for installation") - ucrInputMessage.txtInput.BackColor = Color.LightGreen - bUniqueChecked = True + ucrInputMessage.SetText("Package is installed but not from GitHub") + ucrInputMessage.txtInput.BackColor = Color.Green + bUniqueChecked = False End If Case "4" If rdoCRAN.Checked Then @@ -180,7 +187,7 @@ Public Class dlgInstallRPackage bUniqueChecked = False ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package exists in the repo and is ready for installation") - ucrInputMessage.txtInput.BackColor = Color.LightGreen + ucrInputMessage.txtInput.BackColor = Color.Green bUniqueChecked = True End If Case "5" @@ -190,12 +197,12 @@ Public Class dlgInstallRPackage bUniqueChecked = False ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package exists but is not in the R language") - ucrInputMessage.txtInput.BackColor = Color.LightCoral + ucrInputMessage.txtInput.BackColor = Color.Red bUniqueChecked = False End If Case "6" - ucrInputMessage.SetText("Not a package in the given repo. Check spelling?") - ucrInputMessage.txtInput.BackColor = Color.LightCoral + ucrInputMessage.SetText("Error occurred, repository doesn't exist") + ucrInputMessage.txtInput.BackColor = Color.Red bUniqueChecked = False End Select TestOkEnabled() From e45924f770254495cc1374433903797dbfb20ff2 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 19 Sep 2024 09:58:35 +0100 Subject: [PATCH 141/273] Change made --- instat/dlgClimograph.vb | 300 +++++++++++++++++----------------------- 1 file changed, 127 insertions(+), 173 deletions(-) diff --git a/instat/dlgClimograph.vb b/instat/dlgClimograph.vb index 4171b891ecd..6939f27a817 100644 --- a/instat/dlgClimograph.vb +++ b/instat/dlgClimograph.vb @@ -114,10 +114,6 @@ Public Class dlgClimograph Private clsAesTmaxBarFunction1, clsAesTminBarFunction1, clsAesTemGgplotFunction, clsAesRainGgplotFunction, clsSecAxisRainFunction, clsSecAxisTemFunction As New RFunction Private clsAesRainBarTextFunction, clsPlotGridFunction, clsAesTmaxBarTextFunction, clsAesTminBarTextFunction, clsRainRoundFunction, clsTmaxRoundFunction, clsTminRoundFunction As New RFunction Private strScale As String = "scale_Factor" - Dim lstRecognisedRain As New List(Of KeyValuePair(Of String, List(Of String))) - Dim lstRecognisedTmax As New List(Of KeyValuePair(Of String, List(Of String))) - Dim lstRecognisedTmin As New List(Of KeyValuePair(Of String, List(Of String))) - Dim lstRecognisedMinTmin As New List(Of KeyValuePair(Of String, List(Of String))) Private Sub dlgClimograph_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then @@ -131,22 +127,14 @@ Public Class dlgClimograph bReset = False TestOKEnabled() autoTranslate(Me) - DialogueSize() + ResizeDialogue() End Sub Private Sub InitialiseDialog() - Dim kvpRain As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("rain", {"sum_rainfall", "sum_rain", "sum_prec", "sum_precip", "sum_precipitation", "sum_rr", "mean_sum_prcp", "mean_sum_rainfall", "mean_sum_rain", "mean_sum_prec", "mean_sum_precip", "mean_sum_precipitation", "mean_sum_rr", "mean_sum_prcp", "median_sum_rainfall", "median_sum_rain", "median_sum_prec", "median_sum_precip", "median_sum_precipitation", "median_sum_rr", "median_sum_prcp", "max_sum_rainfall", "max_sum_rain", "max_sum_prec", "max_sum_precip", "max_sum_precipitation", "max_sum_rr", "max_sum_prcp", "min_sum_rainfall", "min_sum_rain", "min_sum_prec", "min_sum_precip", "min_sum_precipitation", "min_sum_rr", "min_sum_prcp", "mean_rainfall", "mean_rain", "mean_prec", "mean_precip", "mean_precipitation", "mean_rr", "mean_prcp", "max_rainfall", "max_rain", "max_prec", "max_precip", "max_precipitation", "max_rr", "max_prcp", "min_rainfall", "min_rain", "min_prec", "min_precip", "min_precipitation", "min_rr", "min_prcp", "mean_max_rainfall", "mean_max_rain", "mean_max_prec", "mean_max_precip", "mean_max_precipitation", "mean_max_rr", "mean_max_prcp", "mean_min_rainfall", "mean_min_rain", "mean_min_prec", "mean_min_precip", "mean_min_precipitation", "mean_min_rr", "mean_min_prcp", "max_max_rainfall", "max_max_rain", "max_max_prec", "max_max_precip", "max_max_precipitation", "max_max_rr", "max_max_prcp", "max_min_rainfall", "max_min_rain", "max_min_prec", "max_min_precip", "max_min_precipitation", "max_min_rr", "max_min_prcp", "min_max_rainfall", "min_max_rain", "min_max_prec", "min_max_precip", "min_max_precipitation", "min_max_rr", "min_max_prcp", "min_min_rainfall", "min_min_rain", "min_min_prec", "min_min_precip", "min_min_precipitation", "min_min_rr", "min_min_prcp"}.ToList()) - Dim kvpTmax As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_max", {"mean_tmax", "mean_tx", "mean_tempmax", "mean_tmp_max", "mean_tmpmax", "mean_max_temperature", "max_tmax", "max_max_temperature", "max_tx", "max_tempmax", "max_tmp_max", "max_tmpmax", "min_tmax", "min_max_temperature", "min_tx", "min_tempmax", "min_tmp_max", "min_tmpmax", "tmax", "max_temperature", "tx", "tempmax", "tmp_max", "tmpmax"}.ToList()) - Dim kvpTmin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("temp_min", {"mean_tmin", "mean_tn", "mean_tempmin", "mean_tmp_min", "mean_tmpmin", "mean_min_temperature", "max_tmin", "max_min_temperature", "max_tn", "max_tempmin", "max_tmp_min", "max_tmpmin", "min_tmin", "min_min_temperature", "min_tn", "min_tempmin", "min_tmp_min", "min_tmpmin", "tmin", "min_temperature", "tn", "tempmin", "tmp_min", "tmpmin"}.ToList()) - Dim kvpMinTmin As KeyValuePair(Of String, List(Of String)) = New KeyValuePair(Of String, List(Of String))("min_temp_min", {"min_tmin", "min_tn", "min_tempmin", "min_tmp_min", "min_tmpmin", "min_min_temperature"}.ToList()) Dim dctLegendPosition As New Dictionary(Of String, String) Dim dctColourPallette As New Dictionary(Of String, String) Dim dctPalette As New Dictionary(Of String, String) - lstRecognisedTypes.AddRange({kvpAnnualRain, kvpEndRainDate, kvpEndRainDOY, kvpEndRainStatus, kvpEndSeasonDate, kvpEndSeasonDOY, kvpEndSeasonStatus, - kvpRainDaysSeason, kvpRainDaysYear, kvpSeasonalLength, kvpSeasonalRain, kvpStartRainDate, - kvpStartRainDOY, kvpStartRainStatus}) - ucrBase.iHelpTopicID = 432 ucrSelectorClimograph.SetParameter(New RParameter("data", 0, bNewIncludeArgumentName:=False)) @@ -391,7 +379,7 @@ Public Class dlgClimograph ucrSave.SetCheckBoxText("Store Graph") ucrSave.SetDataFrameSelector(ucrSelectorClimograph.ucrAvailableDataFrames) ucrSave.SetAssignToIfUncheckedValue("last_graph") - DialogueSize() + ResizeDialogue() End Sub Private Sub SetDefaults() @@ -877,7 +865,7 @@ Public Class dlgClimograph End Sub Private Sub ucrPnlClimograph_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlClimograph.ControlValueChanged - DialogueSize() + ResizeDialogue() If rdoClimograph.Checked Then cmdOptions.Visible = True ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsPlus1Operator) @@ -1396,40 +1384,25 @@ Public Class dlgClimograph Private Sub AddRemoveGeomTextBar() - If rdoClimograph.Checked Then - If ucrChkText.Checked Then - If Not ucrReceiverRainC.IsEmpty Then - clsRoundBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) - clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextBarFunction, iPosition:=5, bIncludeArgumentName:=False) - Else - clsBaseOperator.RemoveParameterByName("geom_text") - End If - Else - clsBaseOperator.RemoveParameterByName("geom_text") - End If + If rdoClimograph.Checked AndAlso ucrChkText.Checked AndAlso Not ucrReceiverRainC.IsEmpty Then + clsRoundBarFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesGeomTextBarFunction.AddParameter("label", clsRFunctionParameter:=clsRoundBarFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_text", clsRFunctionParameter:=clsGeomTextBarFunction, iPosition:=5, bIncludeArgumentName:=False) Else clsBaseOperator.RemoveParameterByName("geom_text") End If End Sub Private Sub AddRemoveGeomTextTmax() - If rdoClimograph.Checked Then - If ucrChkText.Checked Then - If Not ucrReceiverElement1.IsEmpty Then - clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - If Not ucrReceiverRainC.IsEmpty Then - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxStarFunction, iPosition:=6, bIncludeArgumentName:=False) - Else - clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) - End If - Else - clsBaseOperator.RemoveParameterByName("geom_text1") - End If + If rdoClimograph.Checked And ucrChkText.Checked And Not ucrReceiverElement1.IsEmpty Then + clsRoundTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + + If Not ucrReceiverRainC.IsEmpty Then + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxStarFunction, iPosition:=6, bIncludeArgumentName:=False) Else - clsBaseOperator.RemoveParameterByName("geom_text1") + clsAesGeomTextTmaxFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_text1", clsRFunctionParameter:=clsGeomTextTmaxFunction, iPosition:=6, bIncludeArgumentName:=False) End If Else clsBaseOperator.RemoveParameterByName("geom_text1") @@ -1437,22 +1410,15 @@ Public Class dlgClimograph End Sub Private Sub AddRemoveGeomTextTmin() - If rdoClimograph.Checked Then - If ucrChkText.Checked Then - If Not ucrReceiverElement2.IsEmpty Then - clsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - If Not ucrReceiverRainC.IsEmpty Then - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminStarFunction, iPosition:=7, bIncludeArgumentName:=False) - Else - clsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) - End If - Else - clsBaseOperator.RemoveParameterByName("geom_text2") - End If + If rdoClimograph.Checked And ucrChkText.Checked And Not ucrReceiverElement2.IsEmpty Then + clsRoundTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + + If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminStarFunction, iPosition:=7, bIncludeArgumentName:=False) Else - clsBaseOperator.RemoveParameterByName("geom_text2") + clsAesGeomTextTminFunction.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsBaseOperator.AddParameter("geom_text2", clsRFunctionParameter:=clsGeomTextTminFunction, iPosition:=7, bIncludeArgumentName:=False) End If Else clsBaseOperator.RemoveParameterByName("geom_text2") @@ -1460,26 +1426,17 @@ Public Class dlgClimograph End Sub Private Sub AddRemoveGeomRibbon() - If rdoClimograph.Checked Then - If ucrChkRibbon.Checked Then - If ucrChkRibbon.Enabled = True Then - clsBaseOperator.AddParameter("scale_x_discrete", clsRFunctionParameter:=clsXScalediscreteFunction, iPosition:=12) - If Not ucrReceiverRainC.IsEmpty Then - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) - clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) - Else - clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) - clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) - End If - Else - clsBaseOperator.RemoveParameterByName("geom_ribbon") - clsBaseOperator.RemoveParameterByName("scale_x_discrete") - End If + If rdoClimograph.Checked And ucrChkRibbon.Checked And ucrChkRibbon.Enabled Then + clsBaseOperator.AddParameter("scale_x_discrete", clsRFunctionParameter:=clsXScalediscreteFunction, iPosition:=12) + + If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbon1Function, iPosition:=1) Else - clsBaseOperator.RemoveParameterByName("geom_ribbon") - clsBaseOperator.RemoveParameterByName("scale_x_discrete") + clsAesGeomRibbonFunction.AddParameter("ymin", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) + clsAesGeomRibbonFunction.AddParameter("ymax", ucrReceiverElement1.GetVariableNames(False), iPosition:=1) + clsBaseOperator.AddParameter("geom_ribbon", clsRFunctionParameter:=clsGeomRibbonFunction, iPosition:=1) End If Else clsBaseOperator.RemoveParameterByName("geom_ribbon") @@ -1498,137 +1455,134 @@ Public Class dlgClimograph End Sub Private Sub AddRemoveGeomLines() - If rdoClimograph.Checked Then - If Not ucrReceiverElement1.IsEmpty Then - If Not ucrReceiverRainC.IsEmpty Then - clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesLineStarFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) - Else - clsAesLineStarFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - clsAesLineStarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) - End If + If rdoClimograph.Checked And Not ucrReceiverElement1.IsEmpty Then + clsAesLineStarFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + + If Not ucrReceiverRainC.IsEmpty Then + clsStarOperator.AddParameter("left", ucrReceiverElement1.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLineStarFunction.AddParameter("y", clsROperatorParameter:=clsStarOperator, iPosition:=1) Else - clsBaseOperator.RemoveParameterByName("geom_line") + clsAesLineStarFunction.AddParameter("y", ucrReceiverElement1.GetVariableNames(False), iPosition:=0) End If + + clsBaseOperator.AddParameter("geom_line", clsRFunctionParameter:=clsGeomLineStarFunction, iPosition:=4) Else clsBaseOperator.RemoveParameterByName("geom_line") End If End Sub Private Sub AddRemoveGeomLine1() - If rdoClimograph.Checked Then - If Not ucrReceiverElement2.IsEmpty Then - If Not ucrReceiverRainC.IsEmpty Then - clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=1) - clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) - Else - clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) - clsAesLineStar1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) - clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) - End If + If rdoClimograph.Checked And Not ucrReceiverElement2.IsEmpty Then + clsAesLineStar1Function.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0) + + If Not ucrReceiverRainC.IsEmpty Then + clsStar1Operator.AddParameter("left", ucrReceiverElement2.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + clsAesLineStar1Function.AddParameter("y", clsROperatorParameter:=clsStar1Operator, iPosition:=1) Else - clsBaseOperator.RemoveParameterByName("geom_line1") + clsAesLineStar1Function.AddParameter("y", ucrReceiverElement2.GetVariableNames(False), iPosition:=0) End If + + clsBaseOperator.AddParameter("geom_line1", clsRFunctionParameter:=clsGeomLineStar1Function, iPosition:=4) Else clsBaseOperator.RemoveParameterByName("geom_line1") End If End Sub Private Sub AddRemoveGeomBar() - If rdoClimograph.Checked Then - If Not ucrReceiverRainC.IsEmpty Then - clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) - clsLabFunction.AddParameter("fill", Chr(34) & "Rainfall" & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabFunction, iPosition:=13) - If ucrChkTile.Checked Then - clsBarAesFunction.AddParameter("fill", ucrReceiverRainC.GetVariableNames(False), iPosition:=3) - clsBaseOperator.AddParameter("geom_tile", clsRFunctionParameter:=clsGeomTileFunction, iPosition:=1) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - Else - clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - clsBaseOperator.RemoveParameterByName("geom_tile") - End If - If ucrChkColour.Checked Then - Dim clsAsnumericFunction As New RFunction - clsAsnumericFunction.SetRCommand("as.numeric") - clsAsnumericFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) - - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") - If rdoViridis.Checked Then - clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsAsnumericFunction, iPosition:=3) - clsColourPaletteFunction.AddParameter("option", Chr(34) & ucrInputColourPalette.GetText() & Chr(34), iPosition:=0) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) - ElseIf rdoPalette.Checked Then - If Not ucrReceiverMonthC.IsEmpty Then - clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - If ucrReceiverMonthC.strCurrDataType = "factor" OrElse ucrReceiverMonthC.strCurrDataType = "ordered,factor" Then - clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) - clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=6) - Else - clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) - clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=6) - End If - End If - Else - clsBarAesFunction.AddParameter("fill", Chr(34) & "" & Chr(34), iPosition:=3) - clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) - End If + ' Handle case when rdoClimograph is not checked or ucrReceiverRainC is empty + If Not rdoClimograph.Checked OrElse ucrReceiverRainC.IsEmpty Then + RemoveAllParameters() + Return + End If + + ' Set common parameters + clsBarAesFunction.AddParameter("y", ucrReceiverRainC.GetVariableNames(False), iPosition:=0) + clsLabFunction.AddParameter("fill", Chr(34) & "Rainfall" & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("labs", clsRFunctionParameter:=clsLabFunction, iPosition:=13) + + ' Handle geom parameters + If ucrChkTile.Checked Then + clsBarAesFunction.AddParameter("fill", ucrReceiverRainC.GetVariableNames(False), iPosition:=3) + clsBaseOperator.AddParameter("geom_tile", clsRFunctionParameter:=clsGeomTileFunction, iPosition:=1) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + Else + clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) + clsBaseOperator.AddParameter("geom_bar", clsRFunctionParameter:=clsGeomBarFunction, iPosition:=2) + clsBaseOperator.RemoveParameterByName("geom_tile") + End If + + ' Handle color parameters + If ucrChkColour.Checked Then + Dim clsAsnumericFunction As New RFunction + clsAsnumericFunction.SetRCommand("as.numeric") + clsAsnumericFunction.AddParameter("x", ucrReceiverMonthC.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + + If rdoViridis.Checked Then + clsBarAesFunction.AddParameter("fill", clsRFunctionParameter:=clsAsnumericFunction, iPosition:=3) + clsColourPaletteFunction.AddParameter("option", Chr(34) & ucrInputColourPalette.GetText() & Chr(34), iPosition:=0) + clsBaseOperator.AddParameter("palette", clsRFunctionParameter:=clsColourPaletteFunction, iPosition:=6) + ElseIf rdoPalette.Checked AndAlso Not ucrReceiverMonthC.IsEmpty Then + clsBarAesFunction.AddParameter("fill", ucrReceiverMonthC.GetVariableNames(False), iPosition:=3) + If ucrReceiverMonthC.strCurrDataType = "factor" OrElse ucrReceiverMonthC.strCurrDataType = "ordered,factor" Then + clsFillBrewerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_brewer", clsRFunctionParameter:=clsFillBrewerFunction, iPosition:=6) Else - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsScalefillDistillerFunction.AddParameter("palette", Chr(34) & ucrInputPalette.GetText() & Chr(34)) + clsBaseOperator.AddParameter("scale_fill_distiller", clsRFunctionParameter:=clsScalefillDistillerFunction, iPosition:=6) End If Else - clsBarAesFunction.RemoveParameterByName("y") - clsBaseOperator.RemoveParameterByName("geom_tile") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("labs") - clsBaseOperator.RemoveParameterByName("palette") - clsBaseOperator.RemoveParameterByName("scale_fill_brewer") - clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + clsBarAesFunction.AddParameter("fill", Chr(34) & "" & Chr(34), iPosition:=3) End If Else - clsBaseOperator.RemoveParameterByName("geom_tile") - clsBaseOperator.RemoveParameterByName("geom_bar") - clsBaseOperator.RemoveParameterByName("labs") clsBaseOperator.RemoveParameterByName("palette") clsBaseOperator.RemoveParameterByName("scale_fill_brewer") clsBaseOperator.RemoveParameterByName("scale_fill_distiller") End If End Sub + Private Sub RemoveAllParameters() + clsBarAesFunction.RemoveParameterByName("y") + clsBaseOperator.RemoveParameterByName("geom_tile") + clsBaseOperator.RemoveParameterByName("geom_bar") + clsBaseOperator.RemoveParameterByName("labs") + clsBaseOperator.RemoveParameterByName("palette") + clsBaseOperator.RemoveParameterByName("scale_fill_brewer") + clsBaseOperator.RemoveParameterByName("scale_fill_distiller") + End Sub + Private Sub EnableTileAndRibbon() ucrChkRibbon.Enabled = (Not ucrReceiverElement1.IsEmpty AndAlso Not ucrReceiverElement2.IsEmpty) AndAlso Not ucrChkTile.Checked ucrChkTile.Enabled = Not ucrChkRibbon.Checked AndAlso Not ucrReceiverRainC.IsEmpty End Sub Private Sub AddRemoveSecondaryAxis() - If rdoClimograph.Checked Then - clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsScaleycontinuousFunction, iPosition:=9) - If Not ucrReceiverRainC.IsEmpty Then - clsScaleycontinuousFunction.AddParameter("name", Chr(34) & "Rainfall (mm)" & Chr(34), iPosition:=0) - If Not ucrReceiverElement1.IsEmpty OrElse Not ucrReceiverElement2.IsEmpty Then - clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis2Function, iPosition:=1) - Else - clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxisFunction, iPosition:=1) - End If - Else - clsScaleycontinuousFunction.AddParameter("name", Chr(34) & "Temperature (c)" & Chr(34), iPosition:=0) - clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=clsSecondaryAxis1Function, iPosition:=1) - End If - Else + If Not rdoClimograph.Checked Then clsBaseOperator.RemoveParameterByName("scale_y_continuous") + Return + End If + + ' Add the scale_y_continuous parameter + clsBaseOperator.AddParameter("scale_y_continuous", clsRFunctionParameter:=clsScaleycontinuousFunction, iPosition:=9) + + ' Set the "name" parameter based on ucrReceiverRainC + Dim name As String + Dim secondaryAxisFunction As RFunction + + If Not ucrReceiverRainC.IsEmpty Then + name = "Rainfall (mm)" + secondaryAxisFunction = If(Not ucrReceiverElement1.IsEmpty OrElse Not ucrReceiverElement2.IsEmpty, clsSecondaryAxis2Function, clsSecondaryAxisFunction) + Else + name = "Temperature (c)" + secondaryAxisFunction = clsSecondaryAxis1Function End If + + ' Add parameters to clsScaleycontinuousFunction + clsScaleycontinuousFunction.AddParameter("name", Chr(34) & name & Chr(34), iPosition:=0) + clsScaleycontinuousFunction.AddParameter("sec.axis", clsRFunctionParameter:=secondaryAxisFunction, iPosition:=1) End Sub Private Sub ucrReceiverElement2_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElement2.ControlValueChanged @@ -1834,7 +1788,7 @@ Public Class dlgClimograph AddRemoveGeomBar() End Sub - Private Sub DialogueSize() + Private Sub ResizeDialogue() If rdoClimograph.Checked Then Me.Size = New Size(488, 617) Me.ucrSave.Location = New Point(14, 493) From 7fc2f6774615a37dda548c9e97fe6ca62ab1969d Mon Sep 17 00:00:00 2001 From: lilyclements Date: Thu, 19 Sep 2024 16:45:36 +0100 Subject: [PATCH 142/273] Update dlgRPackages.vb --- instat/dlgRPackages.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 51adba2baf5..7bd9c845ae1 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -77,6 +77,7 @@ Public Class dlgInstallRPackage clsRepositoryFunction.SetRCommand("install_github") clsRepositoryFunction.SetPackageName("devtools") + clsRepositoryFunction.AddParameter("upgrade", Chr(34) & "never" & Chr(34), iPosition:=1) clsAfterOptionsFunc.SetRCommand("options") clsAfterOptionsFunc.AddParameter(strParameterName:="warn", strParameterValue:="0") From 20571334011e33fae106e44f23b585a0de638d6d Mon Sep 17 00:00:00 2001 From: lilyclements Date: Thu, 19 Sep 2024 17:16:29 +0100 Subject: [PATCH 143/273] Update summary_functions.R --- .../R/Backend_Components/summary_functions.R | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index 4e647613ff9..e853e1db43a 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -10,6 +10,17 @@ DataSheet$set("public", "merge_data", function(new_data, by = NULL, type = "left by_col_attributes[[names(by)[[i]]]] <- get_column_attributes(curr_data[[names(by)[[i]]]]) } } + # if the class is different, set to be the same or throw a useful warning + if (class(curr_data[[by]]) != class(new_data[[by]])){ + warning(paste0("Type is different for ", by, " in the two data frames. Setting as numeric in both data frames.")) + if (class(curr_data[[by]]) == "factor"){ + curr_data[[by]] <- as.numeric(as.character(curr_data[[by]])) + } else if (class(curr_data[[by]]) == "numeric"){ + new_data[[by]] <- as.numeric(as.character(new_data[[by]])) + } else { + stop(paste0("Type is different for ", by, " in the two data frames.")) + } + } if(type == "left") { new_data <- dplyr::left_join(curr_data, new_data, by) } From 897beeac1dafed982fb0f2d549345e46b828619d Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 19 Sep 2024 19:21:53 +0300 Subject: [PATCH 144/273] changes --- instat/dlgRPackages.vb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/instat/dlgRPackages.vb b/instat/dlgRPackages.vb index 7bd9c845ae1..488477f7658 100644 --- a/instat/dlgRPackages.vb +++ b/instat/dlgRPackages.vb @@ -161,7 +161,7 @@ Public Class dlgInstallRPackage End If ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package exists in the repo and is ready for installation") - ucrInputMessage.txtInput.BackColor = Color.Green + ucrInputMessage.txtInput.BackColor = Color.LightGreen End If Case "2" If rdoCRAN.Checked Then @@ -169,7 +169,7 @@ Public Class dlgInstallRPackage ucrInputMessage.txtInput.BackColor = Color.LightGreen ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Unable to retrieve from GitHub. Check internet connection?") - ucrInputMessage.txtInput.BackColor = Color.Red + ucrInputMessage.txtInput.BackColor = Color.LightCoral bUniqueChecked = False End If Case "3" @@ -178,7 +178,7 @@ Public Class dlgInstallRPackage ucrInputMessage.txtInput.BackColor = Color.LightBlue ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package is installed but not from GitHub") - ucrInputMessage.txtInput.BackColor = Color.Green + ucrInputMessage.txtInput.BackColor = Color.LightGreen bUniqueChecked = False End If Case "4" @@ -188,7 +188,7 @@ Public Class dlgInstallRPackage bUniqueChecked = False ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package exists in the repo and is ready for installation") - ucrInputMessage.txtInput.BackColor = Color.Green + ucrInputMessage.txtInput.BackColor = Color.LightGreen bUniqueChecked = True End If Case "5" @@ -198,12 +198,12 @@ Public Class dlgInstallRPackage bUniqueChecked = False ElseIf rdoRPackage.Checked Then ucrInputMessage.SetText("Package exists but is not in the R language") - ucrInputMessage.txtInput.BackColor = Color.Red + ucrInputMessage.txtInput.BackColor = Color.LightCoral bUniqueChecked = False End If Case "6" ucrInputMessage.SetText("Error occurred, repository doesn't exist") - ucrInputMessage.txtInput.BackColor = Color.Red + ucrInputMessage.txtInput.BackColor = Color.LightCoral bUniqueChecked = False End Select TestOkEnabled() From 6d8d0c8ae42ba9db113cdb5b2bea5f7a6333b9e7 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 20 Sep 2024 16:34:31 +0300 Subject: [PATCH 145/273] fixing the setting of library paths --- instat/static/InstatObject/R/InstallPackages.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 6e19a9c5ddd..4aff199362e 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -166,7 +166,7 @@ install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org # Only use internal library if (length(.libPaths()) >= 2){ current_paths <- .libPaths() - current_paths[c(1, 2) <= length(current_paths)] + .libPaths(current_paths[c(1, 3)[c(1, 3) <= length(current_paths)]]) } #install development packages not on CRAN From e5493c971b87c25b49331bee013712a922999b0a Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 20 Sep 2024 18:09:53 +0300 Subject: [PATCH 146/273] minor addition --- instat/static/InstatObject/R/InstallPackages.R | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 4aff199362e..8a88a8bd9f3 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -1,13 +1,6 @@ Sys.setenv(TZ='GMT') Sys.setlocale("LC_TIME", "C") -# Define the custom package library path (in AppData, no admin rights needed) -app_data_lib <- file.path(Sys.getenv("APPDATA"), "R-Instat", "library") -dir.create(app_data_lib, recursive = TRUE, showWarnings = FALSE) - -# Add the custom library path to .libPaths() for installing user-level packages -.libPaths(c(app_data_lib, .libPaths())) - #Install packages from CRAN archive install.packages("http://cran.r-project.org/src/contrib/Archive/signmedian.test/signmedian.test_1.5.1.tar.gz", repos=NULL, type="source") @@ -163,6 +156,13 @@ packs <- c("abind", "agricolae", "agridat", install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org', type="win.binary") +# Define the custom package library path (in AppData, no admin rights needed) +app_data_lib <- file.path(Sys.getenv("APPDATA"), "R-Instat", "library") +dir.create(app_data_lib, recursive = TRUE, showWarnings = FALSE) + +# Add the custom library path to .libPaths() for installing user-level packages +.libPaths(c(app_data_lib, .libPaths())) + # Only use internal library if (length(.libPaths()) >= 2){ current_paths <- .libPaths() From 7708f48117af03e72a4512f8c1e267e4bfffca66 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 23 Sep 2024 08:04:22 +0100 Subject: [PATCH 147/273] Added drop parameter on Start and End of rain. --- instat/dlgStartofRains.vb | 52 +++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 5 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 759ad8cbe58..3a8543470da 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class dlgStartofRains - Private clsCalcRainDay, clsCalcStartDOY, clsDummyFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private clsCalcRainDay, clsCalcStartDOY, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsAllStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction Private clsDayFromAndToOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction @@ -265,6 +265,7 @@ Public Class dlgStartofRains Dim strStartStatus As String = "start_rain_status" Dim strStartDoy As String = "start_rain" Dim strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" + Dim strYearType As String = "year_type" clsDayFromAndTo.Clear() clsDayFromAndToOperator.Clear() @@ -281,6 +282,12 @@ Public Class dlgStartofRains clsListSubCalc.Clear() clsListCalFunction.Clear() clsCombinationSubCalcList.Clear() + clsIfelseStatus1Function.Clear() + clsIfelseStatusFunction.Clear() + clsAllStatusFunction.Clear() + clsIsNAStatusFunction.Clear() + clsGetColumnDataTypeFunction.Clear() + clsConvertColumnTypeFunction.Clear() clsSpellsFunction.Clear() clsRainDaySpellsOperator.Clear() @@ -388,6 +395,14 @@ Public Class dlgStartofRains clsGroupByYear.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) clsGroupByYear.SetAssignTo("grouping_by_year") + clsGetColumnDataTypeFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_column_data_types") + clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsGetColumnDataTypeFunction.SetAssignTo(strYearType) + + clsConvertColumnTypeFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") + clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsConvertColumnTypeFunction.AddParameter("to_type", Chr(34) & "factor" & Chr(34), iPosition:=2) + 'TOTAL RAIN: associated with ucrChkTotalRainfall clsCalcRainRollingSum.SetRCommand("instat_calculation$new") clsCalcRainRollingSum.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) @@ -688,11 +703,28 @@ Public Class dlgStartofRains ' Status clsCalcStatus.SetRCommand("instat_calculation$new") clsCalcStatus.AddParameter("type", Chr(34) & "summary" & Chr(34), iPosition:=0) - clsCalcStatus.AddParameter("function_exp", Chr(34) & "n() > 0" & Chr(34), iPosition:=1) + clsCalcStatus.AddParameter("function_exp", clsRFunctionParameter:=clsIfelseStatusFunction, iPosition:=1) clsCalcStatus.AddParameter("result_name", Chr(34) & strStartStatus & Chr(34), iPosition:=3) clsCalcStatus.AddParameter("save", 2, iPosition:=4) clsCalcStatus.SetAssignTo("start_of_rains_status") + clsIfelseStatusFunction.SetRCommand("ifelse") + clsIfelseStatusFunction.bToScriptAsRString = True + clsIfelseStatusFunction.AddParameter("x", "n() > 0", iPosition:=0, bIncludeArgumentName:=False) + clsIfelseStatusFunction.AddParameter("y", clsRFunctionParameter:=clsIfelseStatus1Function, iPosition:=1, bIncludeArgumentName:=False) + clsIfelseStatusFunction.AddParameter("z", "FALSE", iPosition:=2, bIncludeArgumentName:=False) + + clsIfelseStatus1Function.SetRCommand("ifelse") + clsIfelseStatus1Function.AddParameter("yes", clsRFunctionParameter:=clsAllStatusFunction, iPosition:=0, bIncludeArgumentName:=False) + clsIfelseStatus1Function.AddParameter("test", "NA", iPosition:=1, bIncludeArgumentName:=False) + clsIfelseStatus1Function.AddParameter("no", "TRUE", iPosition:=2, bIncludeArgumentName:=False) + + clsAllStatusFunction.SetRCommand("all") + clsAllStatusFunction.AddParameter("x", clsRFunctionParameter:=clsIsNAStatusFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsIsNAStatusFunction.SetRCommand("is.na") + clsIsNAStatusFunction.AddParameter("x", strRollSumRain, iPosition:=0, bIncludeArgumentName:=False) + 'Combination clsCombinationCalc.SetRCommand("instat_calculation$new") clsCombinationCalc.AddParameter("type", Chr(34) & "combination" & Chr(34), iPosition:=0) @@ -707,10 +739,11 @@ Public Class dlgStartofRains clsCombinationSubCalcList.SetRCommand("list") clsCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsCalcStartDOY, bIncludeArgumentName:=False, iPosition:=0) + clsCombinationSubCalcList.AddParameter("sub2", clsRFunctionParameter:=clsCalcStartDate, bIncludeArgumentName:=False, iPosition:=1) + clsCombinationSubCalcList.AddParameter("sub3", clsRFunctionParameter:=clsCalcStatus, bIncludeArgumentName:=False, iPosition:=2) 'Sub_Calculations List clsListSubCalc.SetRCommand("list") - clsListSubCalc.AddParameter("sub1", iPosition:=0, clsRFunctionParameter:=clsCalcStartDOY, bIncludeArgumentName:=False) 'Run Calculations clsListCalFunction.SetRCommand("list") @@ -721,8 +754,9 @@ Public Class dlgStartofRains clsApplyInstatFunction.AddParameter("calc", clsRFunctionParameter:=clsCombinationCalc, iPosition:=0) clsApplyInstatFunction.AddParameter("param_list", clsRFunctionParameter:=clsListCalFunction, iPosition:=2) - 'Base Function ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatFunction) + ucrBase.clsRsyntax.AddToBeforeCodes(clsGetColumnDataTypeFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsConvertColumnTypeFunction, iPosition:=1) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -874,9 +908,13 @@ Public Class dlgStartofRains Private Sub GroupByYearOptions() If Not ucrReceiverYear.IsEmpty Then + clsGetColumnDataTypeFunction.AddParameter("columns", ucrReceiverYear.GetVariableNames(), iPosition:=1) + clsConvertColumnTypeFunction.AddParameter("col_names", ucrReceiverYear.GetVariableNames(), iPosition:=1) clsGroupByYear.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverYear.GetVariableNames & ")", iPosition:=3) Else clsGroupByYear.RemoveParameterByName("calculated_from") + clsGetColumnDataTypeFunction.RemoveParameterByName("columns") + clsConvertColumnTypeFunction.RemoveParameterByName("col_names") End If End Sub @@ -949,6 +987,8 @@ Public Class dlgStartofRains End Sub Private Sub ucrSelectorForStartofRains_DataFrameChanged() Handles ucrSelectorForStartofRains.DataFrameChanged + clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsDayFilterCalcFromList.ClearParameters() End Sub @@ -969,7 +1009,7 @@ Public Class dlgStartofRains Private Sub ucrChkAsDoy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAsDoy.ControlValueChanged If ucrChkAsDoy.Checked Then clsCombinationSubCalcList.AddParameter("sub1", clsRFunctionParameter:=clsCalcStartDOY, bIncludeArgumentName:=False, iPosition:=0) - clsListSubCalc.AddParameter("sub1", clsRFunctionParameter:=clsCalcStartDOY, bIncludeArgumentName:=False, iPosition:=1) + clsListSubCalc.AddParameter("sub1", clsRFunctionParameter:=clsCalcStartDOY, bIncludeArgumentName:=False, iPosition:=0) Else clsCombinationSubCalcList.RemoveParameterByName("sub1") clsListSubCalc.RemoveParameterByName("sub1") @@ -984,8 +1024,10 @@ Public Class dlgStartofRains Private Sub ucrChkStatus_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkStatus.ControlValueChanged If ucrChkStatus.Checked Then clsCombinationSubCalcList.AddParameter("sub3", clsRFunctionParameter:=clsCalcStatus, bIncludeArgumentName:=False, iPosition:=2) + clsListSubCalc.AddParameter("sub3", clsRFunctionParameter:=clsCalcStatus, bIncludeArgumentName:=False, iPosition:=2) Else clsCombinationSubCalcList.RemoveParameterByName("sub3") + clsListSubCalc.RemoveParameterByName("sub3") End If End Sub From c9784d97054ee5c0156eebf4ccf001a466d9c9c3 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 23 Sep 2024 13:39:37 +0300 Subject: [PATCH 148/273] changes --- instat/dlgDistances.Designer.vb | 54 ++++++++++++++ instat/dlgDistances.resx | 120 ++++++++++++++++++++++++++++++++ instat/dlgDistances.vb | 3 + instat/instat.vbproj | 9 +++ 4 files changed, 186 insertions(+) create mode 100644 instat/dlgDistances.Designer.vb create mode 100644 instat/dlgDistances.resx create mode 100644 instat/dlgDistances.vb diff --git a/instat/dlgDistances.Designer.vb b/instat/dlgDistances.Designer.vb new file mode 100644 index 00000000000..92e01a0a7be --- /dev/null +++ b/instat/dlgDistances.Designer.vb @@ -0,0 +1,54 @@ + _ +Partial Class dlgDistances + Inherits System.Windows.Forms.Form + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.ucrBase = New instat.ucrButtons() + Me.SuspendLayout() + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 373) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(615, 78) + Me.ucrBase.TabIndex = 0 + ' + 'dlgDistances + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(656, 470) + Me.Controls.Add(Me.ucrBase) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgDistances" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Distances" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ucrBase As ucrButtons +End Class diff --git a/instat/dlgDistances.resx b/instat/dlgDistances.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/dlgDistances.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb new file mode 100644 index 00000000000..80cf80dc157 --- /dev/null +++ b/instat/dlgDistances.vb @@ -0,0 +1,3 @@ +Public Class dlgDistances + +End Class \ No newline at end of file diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 1b2d4bf4295..76b4308199d 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -239,6 +239,12 @@ Form + + dlgDistances.vb + + + Form + dlgEdit.vb @@ -3116,6 +3122,9 @@ dlgDisplayTopN.vb Designer + + dlgDistances.vb + dlgEdit.vb From 37c7c7bb590211eda2098b86b95e85662fe23d7d Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 23 Sep 2024 14:16:07 +0300 Subject: [PATCH 149/273] changes --- instat/dlgDistances.Designer.vb | 10 +++++----- instat/frmMain.Designer.vb | 23 ++++++++++++++++------- instat/frmMain.vb | 4 ++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/instat/dlgDistances.Designer.vb b/instat/dlgDistances.Designer.vb index 92e01a0a7be..dc4a112b081 100644 --- a/instat/dlgDistances.Designer.vb +++ b/instat/dlgDistances.Designer.vb @@ -28,19 +28,19 @@ Partial Class dlgDistances 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 373) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.ucrBase.Location = New System.Drawing.Point(6, 242) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(615, 78) + Me.ucrBase.Size = New System.Drawing.Size(410, 51) Me.ucrBase.TabIndex = 0 ' 'dlgDistances ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(656, 470) + Me.ClientSize = New System.Drawing.Size(423, 305) Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDistances" diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index e7e4ee0766b..664ddd7b5c0 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -199,6 +199,7 @@ Partial Class frmMain Me.mnuClimaticFileImportandTidyShapefile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateFileImportfromClimSoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileImportfromCliData = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticFileExportToClimsoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuExportToWWRToolStrip = New System.Windows.Forms.ToolStripMenuItem() @@ -251,6 +252,7 @@ Partial Class frmMain Me.ToolStripSeparator70 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticCheckDataHomogenization = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticCheckDataCheckStationLocations = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuClimaticCheckDataDistances = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepare = New System.Windows.Forms.ToolStripMenuItem() Me.mnuCimaticPrepareTransform = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticPrepareConversions = New System.Windows.Forms.ToolStripMenuItem() @@ -699,7 +701,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1798,6 +1799,11 @@ Partial Class frmMain Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' + 'ToolStripSeparator15 + ' + Me.ToolStripSeparator15.Name = "ToolStripSeparator15" + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" @@ -2047,7 +2053,7 @@ Partial Class frmMain ' 'mnuClimaticCheckData ' - Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) + Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations, Me.mnuClimaticCheckDataDistances}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" @@ -2110,6 +2116,12 @@ Partial Class frmMain Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' + 'mnuClimaticCheckDataDistances + ' + Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDistances.Text = "Distances..." + ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) @@ -5221,11 +5233,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ToolStripSeparator15 - ' - Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) @@ -5239,6 +5246,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" + Me.Name = "frmMain" Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) @@ -5945,4 +5953,5 @@ Partial Class frmMain Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator + Friend WithEvents mnuClimaticCheckDataDistances As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 74fa9309f21..477c337beeb 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2845,4 +2845,8 @@ Public Class frmMain Private Sub mnuImportFromOpenAppBuilder_Click(sender As Object, e As EventArgs) Handles mnuImportFromOpenAppBuilder.Click dlgImportOpenAppBuilder.ShowDialog() End Sub + + Private Sub mnuClimaticCheckDataDistances_Click(sender As Object, e As EventArgs) Handles mnuClimaticCheckDataDistances.Click + dlgDistances.ShowDialog() + End Sub End Class From cbb34f4684b7da556c7c0c008642263e6c063d9f Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 23 Sep 2024 14:21:39 +0300 Subject: [PATCH 150/273] changes to the code --- instat/frmMain.Designer.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 664ddd7b5c0..afb10ba7779 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -2118,6 +2118,7 @@ Partial Class frmMain ' 'mnuClimaticCheckDataDistances ' + Me.mnuClimaticCheckDataDistances.Enabled = False Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDistances.Text = "Distances..." @@ -5246,8 +5247,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() From dc8dec7f9dbc0dd6207387d17661f65ea868f620 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 23 Sep 2024 15:47:21 +0300 Subject: [PATCH 151/273] Creating additional libray on vb.net --- instat/frmMain.vb | 13 +++++++++++++ instat/static/InstatObject/R/InstallPackages.R | 1 - 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 74fa9309f21..7dcdb0c1d00 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -222,6 +222,10 @@ Public Class frmMain AddHandler System.Windows.Forms.Application.Idle, AddressOf Application_Idle '--------------------------------------- + '-------------------------------------- + CreateAdditionalLibraryDirectory() + '------------------------------------- + isMaximised = True 'Need to get the windowstate when the application is loaded End Sub @@ -393,6 +397,15 @@ Public Class frmMain End If End Function + Private Sub CreateAdditionalLibraryDirectory() + Dim strLibraryPath As String = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "R-Instat", "library") + + If Not Directory.Exists(strLibraryPath) Then + Directory.CreateDirectory(strLibraryPath) + End If + End Sub + + Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() Dim strRScripts As String = "" Dim strDataFilePath As String = "" diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 8a88a8bd9f3..45133a93efa 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -158,7 +158,6 @@ install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org # Define the custom package library path (in AppData, no admin rights needed) app_data_lib <- file.path(Sys.getenv("APPDATA"), "R-Instat", "library") -dir.create(app_data_lib, recursive = TRUE, showWarnings = FALSE) # Add the custom library path to .libPaths() for installing user-level packages .libPaths(c(app_data_lib, .libPaths())) From baaffa5b2811d9e148ebc5ca204e233597efca24 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Mon, 23 Sep 2024 17:06:14 +0100 Subject: [PATCH 152/273] Update data_object_R6.R --- instat/static/InstatObject/R/data_object_R6.R | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index a92de3fcbd3..49d582fa8a7 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4525,7 +4525,6 @@ DataSheet$set("public", "has_labels", function(col_names) { ) DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { - if(missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") if(sign_level || signif.stars) message("This is no longer descriptive") if(sign_level) end_col = 5 else end_col = 4 @@ -4538,8 +4537,18 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, signi return_item <- NULL mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) - return_item[[paste0("ANOVA table: ", formula_str, sep = "")]] <- anova(mod)[1:end_col] - if(means) return_item[[paste0("Means table of ", y_col_name)]] <- model.tables(aov(mod), type = "means") + anova_mod <- anova(mod)[1:end_col] %>% + tibble::as_tibble(rownames = " ") %>% + tibble::add_row(` ` = "Total", + dplyr::summarise(., across(where(is.numeric), sum))) + return_item[[paste0("ANOVA table: ", formula_str, sep = "")]] <- anova_mod + if(means){ + if (class(mod$model[[x_col_names]]) == "numeric"){ + return_item[[paste0("Means table of ", y_col_name)]] <- mod$coefficients + } else { + return_item[[paste0("Means table of ", y_col_name)]] <- model.tables(aov(mod), type = "means") + } + } return(return_item) } -) \ No newline at end of file +) From 4b43e4ab16e290ad3a08cf2c1faa37f0a8a11dfb Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 23 Sep 2024 19:36:56 +0300 Subject: [PATCH 153/273] minor code changes --- instat/frmMain.vb | 19 +++++++++++++++---- .../static/InstatObject/R/InstallPackages.R | 6 ------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 7dcdb0c1d00..464eefece38 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -398,13 +398,24 @@ Public Class frmMain End Function Private Sub CreateAdditionalLibraryDirectory() + ' Define the custom library path in the ApplicationData folder Dim strLibraryPath As String = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "R-Instat", "library") - If Not Directory.Exists(strLibraryPath) Then - Directory.CreateDirectory(strLibraryPath) - End If - End Sub + Try + ' Check if the directory exists, if not, create it + If Not Directory.Exists(strLibraryPath) Then + Directory.CreateDirectory(strLibraryPath) + End If + ' Add the custom library path to R's .libPaths for user-level package installation + Dim strScript As String = $".libPaths(c('{strLibraryPath.Replace("\", "/")}', .libPaths()))" + ' Execute the R script to update the library paths + clsRLink.RunScript(strScript:=strScript, bSeparateThread:=False, bSilent:=False) + Catch ex As Exception + ' Handle potential errors (e.g., directory creation failure) + MessageBox.Show($"Failed to create or update library directory: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error) + End Try + End Sub Private Sub ExecuteSetupRScriptsAndSetupRLinkAndDatabook() Dim strRScripts As String = "" diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R index 45133a93efa..6b8ccf7f91c 100644 --- a/instat/static/InstatObject/R/InstallPackages.R +++ b/instat/static/InstatObject/R/InstallPackages.R @@ -156,12 +156,6 @@ packs <- c("abind", "agricolae", "agridat", install.packages(packs, dependencies = FALSE, repos='https://cloud.r-project.org', type="win.binary") -# Define the custom package library path (in AppData, no admin rights needed) -app_data_lib <- file.path(Sys.getenv("APPDATA"), "R-Instat", "library") - -# Add the custom library path to .libPaths() for installing user-level packages -.libPaths(c(app_data_lib, .libPaths())) - # Only use internal library if (length(.libPaths()) >= 2){ current_paths <- .libPaths() From 4431bf43d51e7525c84a371a79d83271ac383a78 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 24 Sep 2024 08:24:38 +0300 Subject: [PATCH 154/273] code addition for not debug mode --- instat/frmMain.vb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 464eefece38..b5fabc04c34 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -406,11 +406,20 @@ Public Class frmMain If Not Directory.Exists(strLibraryPath) Then Directory.CreateDirectory(strLibraryPath) End If + + 'To ensure this part of the code only runs when the application Is Not in the Debug mode (i.e., in Release mode) +#If Not DEBUG Then ' Add the custom library path to R's .libPaths for user-level package installation - Dim strScript As String = $".libPaths(c('{strLibraryPath.Replace("\", "/")}', .libPaths()))" + Dim strScript As String = $".libPaths(c('{strLibraryPath.Replace("\", "/")}', .libPaths()))" & Environment.NewLine & + "if (length(.libPaths()) >= 2) { + current_paths <- .libPaths() + valid_indices <- c(1, 3)[c(1, 3) <= length(current_paths)] + .libPaths(current_paths[valid_indices]) + }" ' Execute the R script to update the library paths clsRLink.RunScript(strScript:=strScript, bSeparateThread:=False, bSilent:=False) +#End If Catch ex As Exception ' Handle potential errors (e.g., directory creation failure) MessageBox.Show($"Failed to create or update library directory: {ex.Message}", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error) From eec78dce3255839f4d4ae47bfdb66ed3eae904e9 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Tue, 24 Sep 2024 09:36:23 +0300 Subject: [PATCH 155/273] Made suggested changes --- .../Formats/Date/sdgCellFormatDateOptions.vb | 58 +++++++++---------- .../UserTables/Header/ucrHeader.Designer.vb | 40 ++++++------- instat/UserTables/Header/ucrHeader.vb | 4 +- instat/UserTables/dlgGeneralTable.Designer.vb | 2 +- instat/UserTables/dlgGeneralTable.vb | 2 + instat/UserTables/sdgTableOptions.vb | 2 + instat/UserTables/sdgTableStyles.vb | 1 + 7 files changed, 57 insertions(+), 52 deletions(-) diff --git a/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb index 0e187903bf2..96d2cdc8784 100644 --- a/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb +++ b/instat/UserTables/Cells/Formats/Date/sdgCellFormatDateOptions.vb @@ -32,35 +32,35 @@ {"29 February", Chr(34) & "day_month" & Chr(34)}, {"29 Feb", Chr(34) & "day_m" & Chr(34)}, {"2000", Chr(34) & "year" & Chr(34)}, - {"month", Chr(34) & "February" & Chr(34)}, - {"day", Chr(34) & "29" & Chr(34)}, - {"year.mn.day", Chr(34) & "2000/02/29" & Chr(34)}, - {"y.mn.day", Chr(34) & "00/02/29" & Chr(34)}, - {"year_week", Chr(34) & "2000-W09" & Chr(34)}, - {"year_quarter", Chr(34) & "2000-Q1" & Chr(34)}, - {"yMd", Chr(34) & "2/29/2000" & Chr(34)}, - {"yMEd", Chr(34) & "Tue, 2/29/2000" & Chr(34)}, - {"yMMM", Chr(34) & "Feb 2000" & Chr(34)}, - {"yMMMM", Chr(34) & "February 2000" & Chr(34)}, - {"yMMMd", Chr(34) & "Feb 29, 2000" & Chr(34)}, - {"yMMMEd", Chr(34) & "Tue, Feb 29, 2000" & Chr(34)}, - {"GyMd", Chr(34) & "2/29/2000 A" & Chr(34)}, - {"GyMMMd", Chr(34) & "Feb 29, 2000 AD" & Chr(34)}, - {"GyMMMEd", Chr(34) & "Tue, Feb 29, 2000 AD" & Chr(34)}, - {"yM", Chr(34) & "2/2000" & Chr(34)}, - {"Md", Chr(34) & "2/29" & Chr(34)}, - {"MEd", Chr(34) & "Tue, 2/29" & Chr(34)}, - {"MMMd", Chr(34) & "Feb 29" & Chr(34)}, - {"MMMEd", Chr(34) & "Tue, Feb 29" & Chr(34)}, - {"MMMMd", Chr(34) & "February 29" & Chr(34)}, - {"GyMMM", Chr(34) & "Feb 2000 AD" & Chr(34)}, - {"yQQQ", Chr(34) & "Q1 2000" & Chr(34)}, - {"yQQQQ", Chr(34) & "1st quarter 2000" & Chr(34)}, - {"Gy", Chr(34) & "2000 AD" & Chr(34)}, - {"y", Chr(34) & "2000" & Chr(34)}, - {"MMM", Chr(34) & "Feb" & Chr(34)}, - {"d", Chr(34) & "29" & Chr(34)}, - {"Ed", Chr(34) & "29 Tue" & Chr(34)} + {"February", Chr(34) & "month" & Chr(34)}, + {"29", Chr(34) & "day" & Chr(34)}, + {"2000/02/29", Chr(34) & "year.mn.day" & Chr(34)}, + {"00/02/2", Chr(34) & " y.mn.day" & Chr(34)}, + {"2000-W09", Chr(34) & "year_week" & Chr(34)}, + {"2000-Q1", Chr(34) & "year_quarter" & Chr(34)}, + {"2/29/2000 (flexible)", Chr(34) & "yMd" & Chr(34)}, + {"Tue, 2/29/2000 (flexible)", Chr(34) & "yMEd" & Chr(34)}, + {"Feb 2000 (flexible)", Chr(34) & "yMMM" & Chr(34)}, + {"February 2000 (flexible)", Chr(34) & "yMMMM" & Chr(34)}, + {"Feb 29, 2000 (flexible)", Chr(34) & "yMMMd" & Chr(34)}, + {"Tue, Feb 29, 2000 (flexible)", Chr(34) & "yMMMEd" & Chr(34)}, + {"2/29/2000 A (flexible)", Chr(34) & "GyMd" & Chr(34)}, + {"Feb 29, 2000 AD (flexible)", Chr(34) & "GyMMMd" & Chr(34)}, + {"Tue, Feb 29, 2000 AD (flexible)", Chr(34) & "GyMMMEd" & Chr(34)}, + {"2/2000 (flexible)", Chr(34) & "yM" & Chr(34)}, + {"2/29 (flexible)", Chr(34) & "Md" & Chr(34)}, + {"Tue, 2/29 (flexible)", Chr(34) & "MEd" & Chr(34)}, + {"Feb 29 (flexible)", Chr(34) & "MMMd" & Chr(34)}, + {"Tue, Feb 29 (flexible)", Chr(34) & "MMMEd" & Chr(34)}, + {"February 29 (flexible)", Chr(34) & "MMMMd" & Chr(34)}, + {"Feb 2000 AD (flexible)", Chr(34) & "GyMMM" & Chr(34)}, + {"Q1 2000 (flexible)", Chr(34) & "yQQQ" & Chr(34)}, + {"1st quarter 2000", Chr(34) & "yQQQQ" & Chr(34)}, + {"2000 AD (flexible)", Chr(34) & "Gy" & Chr(34)}, + {"2000 (flexible)", Chr(34) & "y" & Chr(34)}, + {"Feb (flexible)", Chr(34) & "MMM" & Chr(34)}, + {"29 (flexible)", Chr(34) & "d" & Chr(34)}, + {"29 Tue (flexible)", Chr(34) & "Ed" & Chr(34)} } ucrInputCboDateFormat.SetParameter(New RParameter("date_style", 3)) diff --git a/instat/UserTables/Header/ucrHeader.Designer.vb b/instat/UserTables/Header/ucrHeader.Designer.vb index eb1345fbe24..ebd3b82dd80 100644 --- a/instat/UserTables/Header/ucrHeader.Designer.vb +++ b/instat/UserTables/Header/ucrHeader.Designer.vb @@ -26,8 +26,8 @@ Partial Class ucrHeader Me.ucrInputTitleFooter = New instat.ucrInputTextBox() Me.lblHeaderSubtitle = New System.Windows.Forms.Label() Me.lblHeaderTitle = New System.Windows.Forms.Label() - Me.btnSubTitleFormat = New System.Windows.Forms.Button() - Me.btnTitleFormat = New System.Windows.Forms.Button() + Me.btnSubTitleStyle = New System.Windows.Forms.Button() + Me.btnTitleStyle = New System.Windows.Forms.Button() Me.ucrInputSubtitle = New instat.ucrInputTextBox() Me.ucrInputTitle = New instat.ucrInputTextBox() Me.lblSubtitle = New System.Windows.Forms.Label() @@ -82,23 +82,23 @@ Partial Class ucrHeader Me.lblHeaderTitle.TabIndex = 20 Me.lblHeaderTitle.Text = "Title Footer:" ' - 'btnSubTitleFormat + 'btnSubTitleStyle ' - Me.btnSubTitleFormat.Location = New System.Drawing.Point(372, 40) - Me.btnSubTitleFormat.Name = "btnSubTitleFormat" - Me.btnSubTitleFormat.Size = New System.Drawing.Size(75, 23) - Me.btnSubTitleFormat.TabIndex = 31 - Me.btnSubTitleFormat.Text = "Format" - Me.btnSubTitleFormat.UseVisualStyleBackColor = True + Me.btnSubTitleStyle.Location = New System.Drawing.Point(372, 40) + Me.btnSubTitleStyle.Name = "btnSubTitleStyle" + Me.btnSubTitleStyle.Size = New System.Drawing.Size(75, 23) + Me.btnSubTitleStyle.TabIndex = 31 + Me.btnSubTitleStyle.Text = "Style" + Me.btnSubTitleStyle.UseVisualStyleBackColor = True ' - 'btnTitleFormat + 'btnTitleStyle ' - Me.btnTitleFormat.Location = New System.Drawing.Point(374, 42) - Me.btnTitleFormat.Name = "btnTitleFormat" - Me.btnTitleFormat.Size = New System.Drawing.Size(79, 23) - Me.btnTitleFormat.TabIndex = 30 - Me.btnTitleFormat.Text = "Format" - Me.btnTitleFormat.UseVisualStyleBackColor = True + Me.btnTitleStyle.Location = New System.Drawing.Point(374, 42) + Me.btnTitleStyle.Name = "btnTitleStyle" + Me.btnTitleStyle.Size = New System.Drawing.Size(79, 23) + Me.btnTitleStyle.TabIndex = 30 + Me.btnTitleStyle.Text = "Style" + Me.btnTitleStyle.UseVisualStyleBackColor = True ' 'ucrInputSubtitle ' @@ -148,7 +148,7 @@ Partial Class ucrHeader ' Me.grpBoxTitle.Controls.Add(Me.lblTitle) Me.grpBoxTitle.Controls.Add(Me.ucrInputTitle) - Me.grpBoxTitle.Controls.Add(Me.btnTitleFormat) + Me.grpBoxTitle.Controls.Add(Me.btnTitleStyle) Me.grpBoxTitle.Controls.Add(Me.lblHeaderTitle) Me.grpBoxTitle.Controls.Add(Me.ucrInputTitleFooter) Me.grpBoxTitle.Location = New System.Drawing.Point(4, 5) @@ -162,7 +162,7 @@ Partial Class ucrHeader ' Me.grpBoxSubtitle.Controls.Add(Me.lblHeaderSubtitle) Me.grpBoxSubtitle.Controls.Add(Me.ucrInputSubtitleFooter) - Me.grpBoxSubtitle.Controls.Add(Me.btnSubTitleFormat) + Me.grpBoxSubtitle.Controls.Add(Me.btnSubTitleStyle) Me.grpBoxSubtitle.Controls.Add(Me.ucrInputSubtitle) Me.grpBoxSubtitle.Controls.Add(Me.lblSubtitle) Me.grpBoxSubtitle.Location = New System.Drawing.Point(4, 125) @@ -191,8 +191,8 @@ Partial Class ucrHeader Friend WithEvents ucrInputTitleFooter As ucrInputTextBox Friend WithEvents lblHeaderSubtitle As Label Friend WithEvents lblHeaderTitle As Label - Friend WithEvents btnSubTitleFormat As Button - Friend WithEvents btnTitleFormat As Button + Friend WithEvents btnSubTitleStyle As Button + Friend WithEvents btnTitleStyle As Button Friend WithEvents ucrInputSubtitle As ucrInputTextBox Friend WithEvents ucrInputTitle As ucrInputTextBox Friend WithEvents lblSubtitle As Label diff --git a/instat/UserTables/Header/ucrHeader.vb b/instat/UserTables/Header/ucrHeader.vb index dc765685d8e..1be15500eee 100644 --- a/instat/UserTables/Header/ucrHeader.vb +++ b/instat/UserTables/Header/ucrHeader.vb @@ -126,7 +126,7 @@ Public Class ucrHeader End Sub - Private Sub btnTitleFormat_Click(sender As Object, e As EventArgs) Handles btnTitleFormat.Click + Private Sub btnTitleFormat_Click(sender As Object, e As EventArgs) Handles btnTitleStyle.Click Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm, clsTitleStyleRFunction) If clsListStyleRFunction Is Nothing Then Exit Sub @@ -136,7 +136,7 @@ Public Class ucrHeader End Sub - Private Sub btnSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnSubTitleFormat.Click + Private Sub btnSubtitleFormat_Click(sender As Object, e As EventArgs) Handles btnSubTitleStyle.Click Dim clsListStyleRFunction As RFunction = clsTablesUtils.ShowStyleSubDialog(Me.ParentForm, clsSubtitleStyleRFunction) If clsListStyleRFunction Is Nothing Then Exit Sub diff --git a/instat/UserTables/dlgGeneralTable.Designer.vb b/instat/UserTables/dlgGeneralTable.Designer.vb index 0251e0959bd..481a6fbbd41 100644 --- a/instat/UserTables/dlgGeneralTable.Designer.vb +++ b/instat/UserTables/dlgGeneralTable.Designer.vb @@ -134,7 +134,7 @@ Partial Class dlgGeneralTable Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "dlgGeneralTable" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Table" + Me.Text = "Presentation Table" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/UserTables/dlgGeneralTable.vb b/instat/UserTables/dlgGeneralTable.vb index d6a59570641..fefc401eee2 100644 --- a/instat/UserTables/dlgGeneralTable.vb +++ b/instat/UserTables/dlgGeneralTable.vb @@ -37,6 +37,8 @@ Public Class dlgGeneralTable End Sub Private Sub initialiseDialog() + ucrBase.iHelpTopicID = 419 + ucrReceiverMultipleCols.SetParameter(New RParameter("df_columns_to_use_param", 0, bNewIncludeArgumentName:=False)) ucrReceiverMultipleCols.SetParameterIsRFunction() ucrReceiverMultipleCols.Selector = ucrSelectorCols diff --git a/instat/UserTables/sdgTableOptions.vb b/instat/UserTables/sdgTableOptions.vb index 65b1c98917f..53386ef1e0b 100644 --- a/instat/UserTables/sdgTableOptions.vb +++ b/instat/UserTables/sdgTableOptions.vb @@ -31,6 +31,8 @@ Public Class sdgTableOptions End Sub Private Sub InitialiseDialog() + ucrSdgBaseButtons.iHelpTopicID = 146 + ucrPnlThemesPanel.AddRadioButton(rdoSelectTheme) ucrPnlThemesPanel.AddRadioButton(rdoManualTheme) diff --git a/instat/UserTables/sdgTableStyles.vb b/instat/UserTables/sdgTableStyles.vb index 7f1d96f80a0..d6c1c720bdc 100644 --- a/instat/UserTables/sdgTableStyles.vb +++ b/instat/UserTables/sdgTableStyles.vb @@ -18,6 +18,7 @@ Public Class sdgTableStyles End Sub Private Sub InitialiseDialog() + ucrBaseSubdialog.iHelpTopicID = 150 '----------------- ucrCboColorText.SetDropDownStyleAsNonEditable() From 7f2a3847c65da0d268216cb0c589d78172c65031 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 24 Sep 2024 08:44:43 +0100 Subject: [PATCH 156/273] Change made --- instat/dlgStartofRains.vb | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 3a8543470da..617898e67a5 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class dlgStartofRains - Private clsCalcRainDay, clsCalcStartDOY, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsAllStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private clsCalcRainDay, clsCalcStartDOY, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsAllStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction Private clsDayFromAndToOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction @@ -288,6 +288,8 @@ Public Class dlgStartofRains clsIsNAStatusFunction.Clear() clsGetColumnDataTypeFunction.Clear() clsConvertColumnTypeFunction.Clear() + clsConvertColumnType2Function.Clear() + clsConvertColumnType1Function.Clear() clsSpellsFunction.Clear() clsRainDaySpellsOperator.Clear() @@ -403,6 +405,13 @@ Public Class dlgStartofRains clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnTypeFunction.AddParameter("to_type", Chr(34) & "factor" & Chr(34), iPosition:=2) + clsConvertColumnType1Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") + clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsConvertColumnType1Function.AddParameter("to_type", "year_type", iPosition:=2) + + clsConvertColumnType2Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") + clsConvertColumnType2Function.AddParameter("to_type", "year_type", iPosition:=2) + 'TOTAL RAIN: associated with ucrChkTotalRainfall clsCalcRainRollingSum.SetRCommand("instat_calculation$new") clsCalcRainRollingSum.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) @@ -757,6 +766,8 @@ Public Class dlgStartofRains ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatFunction) ucrBase.clsRsyntax.AddToBeforeCodes(clsGetColumnDataTypeFunction, iPosition:=0) ucrBase.clsRsyntax.AddToBeforeCodes(clsConvertColumnTypeFunction, iPosition:=1) + ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType1Function, iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType2Function, iPosition:=1) End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -910,11 +921,15 @@ Public Class dlgStartofRains If Not ucrReceiverYear.IsEmpty Then clsGetColumnDataTypeFunction.AddParameter("columns", ucrReceiverYear.GetVariableNames(), iPosition:=1) clsConvertColumnTypeFunction.AddParameter("col_names", ucrReceiverYear.GetVariableNames(), iPosition:=1) + clsConvertColumnType1Function.AddParameter("col_names", ucrReceiverYear.GetVariableNames(), iPosition:=1) + clsConvertColumnType2Function.AddParameter("col_names", ucrReceiverYear.GetVariableNames(), iPosition:=1) clsGroupByYear.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverYear.GetVariableNames & ")", iPosition:=3) Else clsGroupByYear.RemoveParameterByName("calculated_from") clsGetColumnDataTypeFunction.RemoveParameterByName("columns") clsConvertColumnTypeFunction.RemoveParameterByName("col_names") + clsConvertColumnType1Function.RemoveParameterByName("col_names") + clsConvertColumnType2Function.RemoveParameterByName("col_names") End If End Sub @@ -989,6 +1004,8 @@ Public Class dlgStartofRains Private Sub ucrSelectorForStartofRains_DataFrameChanged() Handles ucrSelectorForStartofRains.DataFrameChanged clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsConvertColumnType2Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_by_year" & Chr(34), iPosition:=0) clsDayFilterCalcFromList.ClearParameters() End Sub From a85d0058c85e23584a41c24d2279a5cd49894965 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 24 Sep 2024 10:57:01 +0300 Subject: [PATCH 157/273] changes --- instat/dlgDescribeTwoVariable.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index ee8a907e85f..10c3cd8ce21 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -153,7 +153,7 @@ Public Class dlgDescribeTwoVariable ucrChkCorrelations.AddParameterValuesCondition(True, "corr", "True") ucrChkCorrelations.AddParameterValuesCondition(False, "corr", "False") - ucrChkMeans.SetText("Means") + ucrChkMeans.SetText("Means/Model") ucrChkMeans.SetParameter(New RParameter("means", 5)) ucrChkMeans.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkMeans.SetRDefault("FALSE") @@ -375,7 +375,6 @@ Public Class dlgDescribeTwoVariable clsSkimrFunction.SetRCommand("skim_without_charts") clsRAnovaTableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$anova_tables") - clsRAnovaTableFunction.AddParameter("data", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsRAnovaTableFunction.AddParameter("x_col_names", clsRFunctionParameter:=clsCombineAnovaFunction, iPosition:=1) clsRAnovaTableFunction.AddParameter("y_col_name", clsRFunctionParameter:=clsCombineFunction, iPosition:=2) clsRAnovaTableFunction.AddParameter("signif.stars", "FALSE", iPosition:=3) @@ -1329,6 +1328,7 @@ Public Class dlgDescribeTwoVariable Private Sub ucrSelectorDescribeTwoVar_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDescribeTwoVar.ControlValueChanged clsGroupByPipeOperator.AddParameter("data", clsRFunctionParameter:=ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + clsRAnovaTableFunction.AddParameter("data", Chr(34) & ucrSelectorDescribeTwoVar.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) End Sub Private Sub UpdateSummaryTableFunction() From 20c187c53304d28cbf45b67c800fa39be62780b1 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 24 Sep 2024 11:00:39 +0300 Subject: [PATCH 158/273] changes --- instat/dlgDescribeTwoVariable.vb | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 10c3cd8ce21..e80feaea984 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -196,7 +196,7 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetDataFrameSelector(ucrSelectorDescribeTwoVar.ucrAvailableDataFrames) ucrSaveTable.SetIsTextBox() - + rdoThreeVariable.Enabled = False ucrReorderSummary.bDataIsSummaries = True End Sub @@ -636,7 +636,7 @@ Public Class dlgDescribeTwoVariable ucrChkSwapXYVar.Visible = IsNumericByNumeric() OrElse IsFactorByNumeric() ucrChkCorrelations.Visible = IsNumericByNumeric() cmdMissingOptions.Visible = ucrChkOmitMissing.Checked - + ucrChkOmitMissing.Visible = ucrChkSwapXYVar.Checked 'ElseIf rdoThreeVariable.Checked Then ' ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() 'Else @@ -714,16 +714,11 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 450) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) - 'ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") ucrSaveTable.SetCheckBoxText("Store Table") - 'clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", - ' strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, - ' strRObjectFormatToAssignTo:=RObjectFormat.Html, - ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, - ' strObjectName:="last_table") + ElseIf IsFactorByFactor() Then ucrSaveTable.Visible = True cmdFormatTable.Visible = True From 962c0b21a9aee49fc8ef4cb577352a4543f00e1d Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 24 Sep 2024 10:36:07 +0100 Subject: [PATCH 159/273] Adding total as parameter --- instat/static/InstatObject/R/data_object_R6.R | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 49d582fa8a7..9849e5ca74c 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4524,7 +4524,7 @@ DataSheet$set("public", "has_labels", function(col_names) { } ) -DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { +DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = TRUE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { if(missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") if(sign_level || signif.stars) message("This is no longer descriptive") if(sign_level) end_col = 5 else end_col = 4 @@ -4536,11 +4536,9 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, signi } return_item <- NULL - mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) - anova_mod <- anova(mod)[1:end_col] %>% - tibble::as_tibble(rownames = " ") %>% - tibble::add_row(` ` = "Total", - dplyr::summarise(., across(where(is.numeric), sum))) + mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) + anova_mod <- anova(mod)[1:end_col] %>% tibble::as_tibble(rownames = " ") + if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) return_item[[paste0("ANOVA table: ", formula_str, sep = "")]] <- anova_mod if(means){ if (class(mod$model[[x_col_names]]) == "numeric"){ From 739793de99cb1085b04d4613ce45d858a79f3e62 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 24 Sep 2024 14:23:49 +0300 Subject: [PATCH 160/273] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 165 ++++++++++-------- instat/dlgDescribeTwoVariable.vb | 15 +- instat/static/InstatObject/R/data_object_R6.R | 2 +- 3 files changed, 104 insertions(+), 78 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 7663e9c6357..06047b002cf 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,17 +60,18 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() - Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.rdoOCol = New System.Windows.Forms.RadioButton() Me.rdoOCell = New System.Windows.Forms.RadioButton() Me.rdoORow = New System.Windows.Forms.RadioButton() + Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() Me.ucrReceiverPercentages = New instat.ucrReceiverSingle() Me.ucrpnlPercent = New instat.UcrPanel() Me.ucrReceiverThreeVariableSecondFactor = New instat.ucrReceiverSingle() Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrBase = New instat.ucrButtons() @@ -78,14 +79,14 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrPnlDescribe = New instat.UcrPanel() Me.ucrReceiverSkimrGroupByFactor = New instat.ucrReceiverSingle() + Me.ucrChkDisplayMargins = New instat.ucrCheck() Me.ucrChkSummariesRowCol = New instat.ucrCheck() + Me.ucrChkLevSig = New instat.ucrCheck() Me.ucrChkMeans = New instat.ucrCheck() - Me.ucrChkDisplayMargins = New instat.ucrCheck() + Me.ucrChkOmitMissing = New instat.ucrCheck() Me.ucrChkSwapXYVar = New instat.ucrCheck() Me.ucrChkCorrelations = New instat.ucrCheck() - Me.ucrChkLevSig = New instat.ucrCheck() - Me.ucrChkOmitMissing = New instat.ucrCheck() - Me.ucrReceiverThreeVariableThirdVariable = New instat.ucrReceiverSingle() + Me.ucrChkTotal = New instat.ucrCheck() Me.grpSummaries.SuspendLayout() Me.grpDisplay.SuspendLayout() Me.SuspendLayout() @@ -347,6 +348,7 @@ Partial Class dlgDescribeTwoVariable ' 'grpDisplay ' + Me.grpDisplay.Controls.Add(Me.ucrChkTotal) Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) Me.grpDisplay.Location = New System.Drawing.Point(414, 277) @@ -358,29 +360,6 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' - 'ucrReceiverColumns - ' - Me.ucrReceiverColumns.AutoSize = True - Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) - Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 - Me.ucrReceiverColumns.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) - Me.ucrChkDisplayAsPercentage.TabIndex = 54 - ' 'rdoOCol ' Me.rdoOCol.AutoSize = True @@ -414,6 +393,19 @@ Partial Class dlgDescribeTwoVariable Me.rdoORow.Text = "Row(%)" Me.rdoORow.UseVisualStyleBackColor = True ' + 'ucrReceiverThreeVariableThirdVariable + ' + Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True + Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 313) + Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" + Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" + Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 + Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing + ' 'ucrReceiverPercentages ' Me.ucrReceiverPercentages.AutoSize = True @@ -484,6 +476,29 @@ Partial Class dlgDescribeTwoVariable Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Nothing + Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True @@ -563,6 +578,16 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing ' + 'ucrChkDisplayMargins + ' + Me.ucrChkDisplayMargins.AutoSize = True + Me.ucrChkDisplayMargins.Checked = False + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) + Me.ucrChkDisplayMargins.TabIndex = 18 + ' 'ucrChkSummariesRowCol ' Me.ucrChkSummariesRowCol.AutoSize = True @@ -573,31 +598,41 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) Me.ucrChkSummariesRowCol.TabIndex = 20 ' + 'ucrChkLevSig + ' + Me.ucrChkLevSig.AutoSize = True + Me.ucrChkLevSig.Checked = False + Me.ucrChkLevSig.Location = New System.Drawing.Point(595, 307) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkLevSig.Name = "ucrChkLevSig" + Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) + Me.ucrChkLevSig.TabIndex = 38 + ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(450, 278) + Me.ucrChkMeans.Location = New System.Drawing.Point(450, 309) Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkMeans.Name = "ucrChkMeans" Me.ucrChkMeans.Size = New System.Drawing.Size(145, 34) Me.ucrChkMeans.TabIndex = 37 ' - 'ucrChkDisplayMargins + 'ucrChkOmitMissing ' - Me.ucrChkDisplayMargins.AutoSize = True - Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) - Me.ucrChkDisplayMargins.TabIndex = 18 + Me.ucrChkOmitMissing.AutoSize = True + Me.ucrChkOmitMissing.Checked = False + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(450, 412) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) + Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(450, 309) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(450, 338) Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) @@ -607,44 +642,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(450, 344) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(450, 373) Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" Me.ucrChkCorrelations.Size = New System.Drawing.Size(223, 34) Me.ucrChkCorrelations.TabIndex = 35 ' - 'ucrChkLevSig + 'ucrChkTotal ' - Me.ucrChkLevSig.AutoSize = True - Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(595, 278) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) - Me.ucrChkLevSig.TabIndex = 38 - ' - 'ucrChkOmitMissing - ' - Me.ucrChkOmitMissing.AutoSize = True - Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(450, 383) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) - Me.ucrChkOmitMissing.TabIndex = 0 - ' - 'ucrReceiverThreeVariableThirdVariable - ' - Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True - Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 313) - Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" - Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" - Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 - Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing + Me.ucrChkTotal.AutoSize = True + Me.ucrChkTotal.Checked = False + Me.ucrChkTotal.Location = New System.Drawing.Point(46, -3) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkTotal.Name = "ucrChkTotal" + Me.ucrChkTotal.Size = New System.Drawing.Size(147, 34) + Me.ucrChkTotal.TabIndex = 44 ' 'dlgDescribeTwoVariable ' @@ -654,7 +666,6 @@ Partial Class dlgDescribeTwoVariable Me.ClientSize = New System.Drawing.Size(723, 748) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) - Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) Me.Controls.Add(Me.rdoORow) Me.Controls.Add(Me.rdoOCell) @@ -683,14 +694,15 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.lbSecondVariable) Me.Controls.Add(Me.lblFirstGroupByFactor) Me.Controls.Add(Me.lblThreeVariableSecondFactor) - Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkDisplayMargins) - Me.Controls.Add(Me.ucrChkCorrelations) - Me.Controls.Add(Me.ucrChkLevSig) - Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.cmdMissingOptions) Me.Controls.Add(Me.ucrChkSummariesRowCol) + Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkSwapXYVar) + Me.Controls.Add(Me.ucrChkCorrelations) + Me.Controls.Add(Me.ucrChkOmitMissing) + Me.Controls.Add(Me.lblThirdVariable) + Me.Controls.Add(Me.ucrChkMeans) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False @@ -755,4 +767,5 @@ Partial Class dlgDescribeTwoVariable Friend WithEvents rdoOCol As RadioButton Friend WithEvents ucrpnlPercent As UcrPanel Friend WithEvents ucrReceiverColumns As ucrReceiverMultiple + Friend WithEvents ucrChkTotal As ucrCheck End Class diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index e80feaea984..f7348ce8b15 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -163,6 +163,11 @@ Public Class dlgDescribeTwoVariable ucrChkLevSig.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkLevSig.SetRDefault("FALSE") + ucrChkTotal.SetText("Total") + ucrChkTotal.SetParameter(New RParameter("total", 5)) + ucrChkTotal.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkTotal.SetRDefault("FALSE") + ucrChkSwapXYVar.SetText("Swap First/Second Variables") ucrChkSwapXYVar.AddParameterValuesCondition(True, "var", "True") ucrChkSwapXYVar.AddParameterValuesCondition(False, "var", "False") @@ -497,6 +502,7 @@ Public Class dlgDescribeTwoVariable ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsMapSummaryFunction, New RParameter(".x", 1), iAdditionalPairNo:=3) ucrChkMeans.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("means", iNewPosition:=5), iAdditionalPairNo:=1) ucrChkLevSig.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("sign_level", iNewPosition:=4), iAdditionalPairNo:=1) + ucrChkTotal.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("total", iNewPosition:=4), iAdditionalPairNo:=1) ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=1) ucrChkDisplayAsPercentage.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("percentage_type", iNewPosition:=1), iAdditionalPairNo:=1) @@ -520,6 +526,7 @@ Public Class dlgDescribeTwoVariable ucrChkSwapXYVar.SetRCode(clsDummyFunction, bReset) ucrChkMeans.SetRCode(clsRAnovaTable2Function, bReset) ucrChkLevSig.SetRCode(clsRAnovaTable2Function, bReset) + ucrChkTotal.SetRCode(clsRAnovaTable2Function, bReset) ucrReceiverThreeVariableSecondFactor.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) @@ -636,7 +643,6 @@ Public Class dlgDescribeTwoVariable ucrChkSwapXYVar.Visible = IsNumericByNumeric() OrElse IsFactorByNumeric() ucrChkCorrelations.Visible = IsNumericByNumeric() cmdMissingOptions.Visible = ucrChkOmitMissing.Checked - ucrChkOmitMissing.Visible = ucrChkSwapXYVar.Checked 'ElseIf rdoThreeVariable.Checked Then ' ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() 'Else @@ -667,6 +673,7 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = False ucrChkMeans.Visible = False ucrChkLevSig.Visible = False + ucrChkTotal.Visible = False cmdMissingOptions.Visible = False If rdoSkim.Checked Then clsDummyFunction.AddParameter("checked", "skim", iPosition:=0) @@ -707,10 +714,12 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True ElseIf IsNumericByFactor() Then ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) ucrChkMeans.Visible = True ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True ucrSaveTable.Visible = True ucrSaveTable.Location = New Point(23, 450) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) @@ -724,6 +733,7 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = True ucrChkMeans.Visible = False ucrChkLevSig.Visible = False + ucrChkTotal.Visible = False ucrSaveTable.Location = New Point(23, 351) clsDummyFunction.AddParameter("factor_cols", "FactorVar", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) @@ -748,6 +758,7 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True Else clsDummyFunction.AddParameter("var", "False", iPosition:=5) ucrSaveTable.Visible = True @@ -757,6 +768,7 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = True ucrChkMeans.Visible = False ucrChkLevSig.Visible = False + ucrChkTotal.Visible = False ucrSaveTable.Location = New Point(23, 450) clsDummyFunction.AddParameter("factor_cols", "Sum", iPosition:=1) ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) @@ -808,6 +820,7 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = False ucrChkMeans.Visible = True ucrChkLevSig.Visible = True + ucrChkTotal.Visible = True If ucrChkSwapXYVar.Checked Then ucrBase.clsRsyntax.SetBaseRFunction(clsMapping2Function) clsDummyFunction.AddParameter("var", "True", iPosition:=5) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 9849e5ca74c..ceb954340d9 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4524,7 +4524,7 @@ DataSheet$set("public", "has_labels", function(col_names) { } ) -DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = TRUE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { +DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { if(missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") if(sign_level || signif.stars) message("This is no longer descriptive") if(sign_level) end_col = 5 else end_col = 4 From 05f7ec78d1107f7c8d53dd74d74c471f992b69ef Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 24 Sep 2024 18:18:29 +0100 Subject: [PATCH 161/273] Update instat_object_R6 to have total = TRUE --- instat/static/InstatObject/R/instat_object_R6.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index c3d38d9ee99..d258423d884 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -2956,7 +2956,7 @@ DataBook$set("public","wrap_or_unwrap_data", function(data_name, col_name, colum } ) -DataBook$set("public", "anova_tables2", function(data_name, x_col_names, y_col_name, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { - self$get_data_objects(data_name)$anova_tables2(x_col_names = x_col_names, y_col_name = y_col_name, signif.stars = signif.stars, sign_level = sign_level, means = means) +DataBook$set("public", "anova_tables2", function(data_name, x_col_names, y_col_name, total = TRUE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { + self$get_data_objects(data_name)$anova_tables2(x_col_names = x_col_names, y_col_name = y_col_name, total = total, signif.stars = signif.stars, sign_level = sign_level, means = means) } ) From 50af29287c9941ac205a4d2fa5e5d711d4e981cd Mon Sep 17 00:00:00 2001 From: lilyclements Date: Tue, 24 Sep 2024 19:39:54 +0100 Subject: [PATCH 162/273] Update summary_functions.R --- .../R/Backend_Components/summary_functions.R | 79 +++++++++++-------- 1 file changed, 44 insertions(+), 35 deletions(-) diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index e853e1db43a..92e81c7bdc4 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -4,54 +4,63 @@ DataSheet$set("public", "merge_data", function(new_data, by = NULL, type = "left old_metadata <- attributes(private$data) curr_data <- self$get_data_frame(use_current_filter = FALSE) by_col_attributes <- list() + if(!is.null(by)) { for(i in seq_along(by)) { - # TODO also check that !is.null(names(by)) ? - by_col_attributes[[names(by)[[i]]]] <- get_column_attributes(curr_data[[names(by)[[i]]]]) - } - } - # if the class is different, set to be the same or throw a useful warning - if (class(curr_data[[by]]) != class(new_data[[by]])){ - warning(paste0("Type is different for ", by, " in the two data frames. Setting as numeric in both data frames.")) - if (class(curr_data[[by]]) == "factor"){ - curr_data[[by]] <- as.numeric(as.character(curr_data[[by]])) - } else if (class(curr_data[[by]]) == "numeric"){ - new_data[[by]] <- as.numeric(as.character(new_data[[by]])) - } else { - stop(paste0("Type is different for ", by, " in the two data frames.")) + # Collect column attributes + by_col_attributes[[by[[i]]]] <- get_column_attributes(curr_data[[by[[i]]]]) + + # Check and align the data types for each "by" column + if (class(curr_data[[by[[i]]]]) != class(new_data[[by[[i]]]])) { + warning(paste0("Type is different for ", by[[i]], " in the two data frames. Setting as numeric in both data frames.")) + + # Convert factors to numeric if necessary + if (class(curr_data[[by[[i]]]]) == "factor") { + curr_data[[by[[i]]]] <- as.numeric(as.character(curr_data[[by[[i]]]])) + } else if (class(new_data[[by[[i]]]]) == "factor") { + new_data[[by[[i]]]] <- as.numeric(as.character(new_data[[by[[i]]]])) + } else { + stop(paste0("Type is different for ", by[[i]], " in the two data frames and cannot be coerced.")) + } + } } } - if(type == "left") { - new_data <- dplyr::left_join(curr_data, new_data, by) - } - else if(type == "right") { - new_data <- dplyr::right_join(curr_data, new_data, by) - } - else if(type == "full") { - new_data <- dplyr::full_join(curr_data, new_data, by) - } - else if(type == "inner") { - new_data <- dplyr::inner_join(curr_data, new_data, by) + + # Perform the appropriate join based on the "type" argument + if (type == "left") { + new_data <- dplyr::left_join(curr_data, new_data, by = by) + } else if (type == "right") { + new_data <- dplyr::right_join(curr_data, new_data, by = by) + } else if (type == "full") { + new_data <- dplyr::full_join(curr_data, new_data, by = by) + } else if (type == "inner") { + new_data <- dplyr::inner_join(curr_data, new_data, by = by) + } else { + stop("type must be one of left, right, inner, or full") } - else stop("type must be one of left, right, inner or full") + + # Update the data in the object self$set_data(new_data) - self$append_to_changes(Merged_data) - #TODO will column/row count be correct here? - for(name in names(old_metadata)) { - if(!name %in% c("names", "class", "row.names")) { + self$append_to_changes("Merged_data") + + # Restore the old metadata + for (name in names(old_metadata)) { + if (!name %in% c("names", "class", "row.names")) { self$append_to_metadata(name, old_metadata[[name]]) } } - self$append_to_metadata(is_calculated_label, TRUE) + + self$append_to_metadata("is_calculated_label", TRUE) self$add_defaults_meta() self$add_defaults_variables_metadata(setdiff(names(new_data), names(curr_data))) - if(!is.null(by)) { - for(i in seq_along(by_col_attributes)) { - self$append_column_attributes(col_name = names(by_col_attributes)[i], new_attr = by_col_attributes[[i]]) + + # Add back column attributes for the "by" columns + if (!is.null(by)) { + for (i in seq_along(by_col_attributes)) { + self$append_column_attributes(col_name = by[[i]], new_attr = by_col_attributes[[i]]) } } -} -) +}) DataBook$set("public", "append_summaries_to_data_object", function(out, data_name, columns_to_summarise, summaries, factors = c(), summary_name, calc, calc_name = "") { if(!is.character(data_name)) stop("data_name must be of type character") From 97a4b0b1a3457e7ebc86ffcf96d8d819a402b75f Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 25 Sep 2024 09:11:03 +0300 Subject: [PATCH 163/273] minor code change --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index b5fabc04c34..534502b3d44 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -411,7 +411,7 @@ Public Class frmMain #If Not DEBUG Then ' Add the custom library path to R's .libPaths for user-level package installation Dim strScript As String = $".libPaths(c('{strLibraryPath.Replace("\", "/")}', .libPaths()))" & Environment.NewLine & - "if (length(.libPaths()) >= 2) { + "if (length(.libPaths()) > 2) { current_paths <- .libPaths() valid_indices <- c(1, 3)[c(1, 3) <= length(current_paths)] .libPaths(current_paths[valid_indices]) From fe3001e100288433377251ad9db68b451ba8408e Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 25 Sep 2024 09:17:47 +0300 Subject: [PATCH 164/273] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 300 ++++++++++------------ 1 file changed, 139 insertions(+), 161 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 06047b002cf..78a4192ca81 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,6 +60,8 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.rdoOCol = New System.Windows.Forms.RadioButton() Me.rdoOCell = New System.Windows.Forms.RadioButton() Me.rdoORow = New System.Windows.Forms.RadioButton() @@ -70,8 +72,6 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() - Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrBase = New instat.ucrButtons() @@ -99,10 +99,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) + Me.rdoThreeVariable.Location = New System.Drawing.Point(288, 8) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) Me.rdoThreeVariable.TabIndex = 3 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -112,10 +111,9 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(489, 634) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) + Me.cmdFormatTable.Location = New System.Drawing.Point(326, 423) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) + Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) Me.cmdFormatTable.TabIndex = 23 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -123,10 +121,9 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) - Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(315, 150) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) Me.lblThreeVariableSecondFactor.TabIndex = 10 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -134,10 +131,9 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(539, 439) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) + Me.cmdMissingOptions.Location = New System.Drawing.Point(359, 293) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) + Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) Me.cmdMissingOptions.TabIndex = 21 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -145,10 +141,9 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(465, 225) - Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lbSecondVariable.Location = New System.Drawing.Point(310, 150) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) + Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) Me.lbSecondVariable.TabIndex = 9 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -157,10 +152,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(465, 74) - Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstVariable.Location = New System.Drawing.Point(310, 49) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) + Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) Me.lblFirstVariable.TabIndex = 5 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -174,11 +168,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) + Me.grpSummaries.Location = New System.Drawing.Point(11, 219) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) - Me.grpSummaries.Size = New System.Drawing.Size(315, 108) + Me.grpSummaries.Size = New System.Drawing.Size(210, 72) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False ' @@ -186,20 +178,18 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(18, 27) - Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstType.Location = New System.Drawing.Point(12, 18) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 20) + Me.lblFirstType.Size = New System.Drawing.Size(0, 13) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) - Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) + Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) Me.lblSecondBy.TabIndex = 6 Me.lblSecondBy.Text = "by" ' @@ -207,10 +197,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) - Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) Me.lblThreeVariableCategorical.TabIndex = 1 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -218,20 +207,18 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) - Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) Me.lblSummaryName.TabIndex = 3 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(18, 76) - Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSummary.Location = New System.Drawing.Point(12, 51) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(80, 20) + Me.lblSummary.Size = New System.Drawing.Size(53, 13) Me.lblSummary.TabIndex = 2 Me.lblSummary.Text = "Summary:" ' @@ -239,10 +226,9 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(123, 24) - Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblBy.Location = New System.Drawing.Point(82, 16) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(25, 20) + Me.lblBy.Size = New System.Drawing.Size(18, 13) Me.lblBy.TabIndex = 4 Me.lblBy.Text = "by" ' @@ -250,19 +236,17 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(159, 27) - Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondType.Location = New System.Drawing.Point(106, 18) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 20) + Me.lblSecondType.Size = New System.Drawing.Size(0, 13) Me.lblSecondType.TabIndex = 5 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) - Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(315, 149) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) Me.lblFirstGroupByFactor.TabIndex = 7 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -275,10 +259,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) + Me.rdoSkim.Location = New System.Drawing.Point(95, 8) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(150, 42) + Me.rdoSkim.Size = New System.Drawing.Size(100, 28) Me.rdoSkim.TabIndex = 1 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -287,10 +270,9 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(465, 286) - Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblThirdVariable.Location = New System.Drawing.Point(310, 191) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) + Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) Me.lblThirdVariable.TabIndex = 13 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -298,10 +280,9 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) - Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(315, 191) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -314,10 +295,9 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) + Me.rdoTwoVariable.Location = New System.Drawing.Point(191, 8) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) + Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) Me.rdoTwoVariable.TabIndex = 2 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -326,10 +306,9 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(465, 344) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) + Me.cmdSummaries.Location = New System.Drawing.Point(310, 229) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) + Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -338,34 +317,54 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(22, 480) - Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblMarginName.Location = New System.Drawing.Point(15, 320) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(140, 22) + Me.lblMarginName.Size = New System.Drawing.Size(93, 15) Me.lblMarginName.TabIndex = 19 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" ' 'grpDisplay ' - Me.grpDisplay.Controls.Add(Me.ucrChkTotal) Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(414, 277) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) + Me.grpDisplay.Location = New System.Drawing.Point(276, 185) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) - Me.grpDisplay.Size = New System.Drawing.Size(291, 219) + Me.grpDisplay.Size = New System.Drawing.Size(194, 146) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Me + Me.ucrReceiverColumns.Location = New System.Drawing.Point(13, 61) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(120, 81) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(9, 15) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(4) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(114, 23) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(432, 336) + Me.rdoOCol.Location = New System.Drawing.Point(288, 224) + Me.rdoOCol.Margin = New System.Windows.Forms.Padding(2) Me.rdoOCol.Name = "rdoOCol" - Me.rdoOCol.Size = New System.Drawing.Size(81, 24) + Me.rdoOCol.Size = New System.Drawing.Size(54, 17) Me.rdoOCol.TabIndex = 40 Me.rdoOCol.TabStop = True Me.rdoOCol.Text = "Col(%)" @@ -374,9 +373,10 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(612, 335) + Me.rdoOCell.Location = New System.Drawing.Point(408, 223) + Me.rdoOCell.Margin = New System.Windows.Forms.Padding(2) Me.rdoOCell.Name = "rdoOCell" - Me.rdoOCell.Size = New System.Drawing.Size(84, 24) + Me.rdoOCell.Size = New System.Drawing.Size(56, 17) Me.rdoOCell.TabIndex = 41 Me.rdoOCell.TabStop = True Me.rdoOCell.Text = "Cell(%)" @@ -385,9 +385,10 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(517, 336) + Me.rdoORow.Location = New System.Drawing.Point(345, 224) + Me.rdoORow.Margin = New System.Windows.Forms.Padding(2) Me.rdoORow.Name = "rdoORow" - Me.rdoORow.Size = New System.Drawing.Size(90, 24) + Me.rdoORow.Size = New System.Drawing.Size(61, 17) Me.rdoORow.TabIndex = 42 Me.rdoORow.TabStop = True Me.rdoORow.Text = "Row(%)" @@ -397,11 +398,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 313) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(310, 209) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -410,11 +411,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(431, 369) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(287, 246) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -422,21 +423,21 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 331) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrpnlPercent.Location = New System.Drawing.Point(283, 221) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(4) Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 37) + Me.ucrpnlPercent.Size = New System.Drawing.Size(180, 25) Me.ucrpnlPercent.TabIndex = 43 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -445,11 +446,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -458,11 +459,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(310, 64) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 6 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -470,53 +471,30 @@ Partial Class dlgDescribeTwoVariable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveTable.Location = New System.Drawing.Point(15, 451) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) + Me.ucrSaveTable.Size = New System.Drawing.Size(306, 24) Me.ucrSaveTable.TabIndex = 24 ' - 'ucrReceiverColumns - ' - Me.ucrReceiverColumns.AutoSize = True - Me.ucrReceiverColumns.frmParent = Nothing - Me.ucrReceiverColumns.Location = New System.Drawing.Point(19, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 121) - Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 - Me.ucrReceiverColumns.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 34) - Me.ucrChkDisplayAsPercentage.TabIndex = 54 - ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputMarginName.Location = New System.Drawing.Point(114, 318) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(9) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) + Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 387) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9) + Me.ucrReorderSummary.Location = New System.Drawing.Point(275, 258) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(6) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) + Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) Me.ucrReorderSummary.TabIndex = 16 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -525,21 +503,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(22, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Location = New System.Drawing.Point(15, 489) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 25 ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(310, 204) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -550,30 +528,30 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(16, 54) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(11, 36) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorDescribeTwoVar.TabIndex = 4 ' 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(92, 3) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) Me.ucrPnlDescribe.TabIndex = 0 ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(310, 164) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -582,88 +560,88 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(17, 296) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) Me.ucrChkDisplayMargins.TabIndex = 18 ' 'ucrChkSummariesRowCol ' Me.ucrChkSummariesRowCol.AutoSize = True Me.ucrChkSummariesRowCol.Checked = False - Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(23, 507) - Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(15, 338) + Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkSummariesRowCol.Name = "ucrChkSummariesRowCol" - Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) + Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(180, 23) Me.ucrChkSummariesRowCol.TabIndex = 20 ' 'ucrChkLevSig ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(595, 307) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkLevSig.Location = New System.Drawing.Point(397, 205) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) + Me.ucrChkLevSig.Size = New System.Drawing.Size(86, 23) Me.ucrChkLevSig.TabIndex = 38 ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(450, 309) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkMeans.Location = New System.Drawing.Point(300, 206) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkMeans.Name = "ucrChkMeans" - Me.ucrChkMeans.Size = New System.Drawing.Size(145, 34) + Me.ucrChkMeans.Size = New System.Drawing.Size(97, 23) Me.ucrChkMeans.TabIndex = 37 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(450, 412) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(300, 275) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(450, 338) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(300, 225) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" - Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(157, 23) Me.ucrChkSwapXYVar.TabIndex = 36 ' 'ucrChkCorrelations ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(450, 373) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(300, 249) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(223, 34) + Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkTotal ' Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(46, -3) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkTotal.Location = New System.Drawing.Point(300, 186) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(6) Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(147, 34) + Me.ucrChkTotal.Size = New System.Drawing.Size(97, 23) Me.ucrChkTotal.TabIndex = 44 ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(723, 748) + Me.ClientSize = New System.Drawing.Size(482, 467) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) @@ -703,8 +681,8 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.ucrChkMeans) + Me.Controls.Add(Me.ucrChkTotal) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" From 494f5d57606ac6a7656a611ed1cc8ba87a23bb66 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 25 Sep 2024 11:20:13 +0300 Subject: [PATCH 165/273] Formatting Script --- instat/frmMain.Designer.vb | 1363 ++++++++++++++++++------------------ instat/frmMain.resx | 4 +- instat/frmMain.vb | 4 + instat/ucrScript.vb | 43 ++ 4 files changed, 738 insertions(+), 676 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index e5b39315da8..e89088ca12e 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -201,6 +201,7 @@ Partial Class frmMain Me.mnuClimaticFileImportandTidyShapefile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimateFileImportfromClimSoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileImportfromCliData = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() Me.mnuClimaticFileExportToClimsoft = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClimaticFileExportToCPT = New System.Windows.Forms.ToolStripMenuItem() Me.mnuExportToWWRToolStrip = New System.Windows.Forms.ToolStripMenuItem() @@ -701,7 +702,7 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator15 = New System.Windows.Forms.ToolStripSeparator() + Me.FormatCodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -727,7 +728,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -735,25 +736,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -761,26 +762,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -788,26 +789,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -815,19 +816,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -835,14 +836,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -850,25 +851,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -876,7 +877,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -884,7 +885,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -892,7 +893,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -900,7 +901,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -908,12 +909,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -921,7 +922,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -929,28 +930,28 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -958,95 +959,95 @@ Partial Class frmMain 'mnuDescribeSummaries ' Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" - Me.mnuDescribeSummaries.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(224, 34) Me.mnuDescribeSummaries.Text = "Summaries..." ' 'mnuDescribePresentation ' Me.mnuDescribePresentation.Name = "mnuDescribePresentation" - Me.mnuDescribePresentation.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribePresentation.Size = New System.Drawing.Size(224, 34) Me.mnuDescribePresentation.Text = "Presentation..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(53, 22) + Me.mnuModel.Size = New System.Drawing.Size(79, 29) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1054,168 +1055,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1223,7 +1224,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1231,7 +1232,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1239,7 +1240,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1247,7 +1248,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1255,7 +1256,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1264,7 +1265,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1273,7 +1274,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1281,21 +1282,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1303,14 +1304,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1319,7 +1320,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1328,21 +1329,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1351,7 +1352,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1360,7 +1361,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1368,7 +1369,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1376,7 +1377,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1384,7 +1385,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1393,7 +1394,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1402,7 +1403,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1411,7 +1412,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1419,7 +1420,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1427,7 +1428,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1436,21 +1437,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1459,7 +1460,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(44, 22) + Me.mnuView.Size = New System.Drawing.Size(65, 29) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1467,7 +1468,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1475,21 +1476,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1497,7 +1498,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1505,19 +1506,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1525,7 +1526,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1533,232 +1534,232 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(44, 22) + Me.mnuHelp.Size = New System.Drawing.Size(65, 29) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(344, 34) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(344, 34) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(344, 34) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(344, 34) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(344, 34) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(344, 34) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(344, 34) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(341, 6) ' 'RInstatResourcesSiteToolStripMenuItem ' Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(344, 34) Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(344, 34) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1766,283 +1767,288 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' + 'ToolStripSeparator15 + ' + Me.ToolStripSeparator15.Name = "ToolStripSeparator15" + Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) + ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) + Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2050,169 +2056,169 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2220,7 +2226,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2229,7 +2235,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2238,7 +2244,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2247,7 +2253,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2256,7 +2262,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2265,7 +2271,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2273,361 +2279,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) + Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2636,7 +2642,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2644,7 +2650,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2652,7 +2658,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2660,7 +2666,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2668,7 +2674,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2676,7 +2682,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2684,7 +2690,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2692,7 +2698,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2700,7 +2706,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2708,7 +2714,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2716,7 +2722,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2724,7 +2730,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2732,7 +2738,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2740,7 +2746,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2748,7 +2754,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2756,7 +2762,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2764,7 +2770,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2772,7 +2778,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2780,7 +2786,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2788,7 +2794,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2796,7 +2802,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2804,7 +2810,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2812,7 +2818,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2820,7 +2826,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2828,7 +2834,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2836,7 +2842,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2844,7 +2850,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2852,7 +2858,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2860,7 +2866,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2868,7 +2874,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2876,7 +2882,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2884,7 +2890,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2892,7 +2898,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2900,7 +2906,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2908,7 +2914,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2916,7 +2922,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2924,7 +2930,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2932,7 +2938,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2940,7 +2946,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(365, 34) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2948,32 +2954,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(365, 34) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2981,7 +2987,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -2990,7 +2996,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -2998,20 +3004,20 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.FormatCodeToolStripMenuItem}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(39, 22) + Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -3019,7 +3025,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(270, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3027,7 +3033,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(270, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3035,27 +3041,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(270, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(270, 34) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(270, 34) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(270, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3063,17 +3069,18 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 460) + Me.stsStrip.Location = New System.Drawing.Point(0, 691) Me.stsStrip.Name = "stsStrip" + Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(834, 22) + Me.stsStrip.Size = New System.Drawing.Size(1251, 32) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(119, 17) + Me.tstatus.Size = New System.Drawing.Size(182, 25) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3082,12 +3089,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 24) + Me.Tool_strip.Location = New System.Drawing.Point(0, 33) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(834, 37) + Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3099,7 +3106,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3110,7 +3117,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3122,40 +3129,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLast10Dialogs ' @@ -3171,7 +3178,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 37) + Me.separator2.Size = New System.Drawing.Size(6, 39) ' 'mnuTbDataView ' @@ -3181,7 +3188,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3193,34 +3200,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) ' 'mnuLastGraph ' @@ -3237,25 +3244,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(128, 22) + Me.mnuploty.Size = New System.Drawing.Size(194, 34) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLogScript ' @@ -3273,14 +3280,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3299,27 +3306,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) ' 'mnuTbResetLayout ' @@ -3328,13 +3335,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 37) + Me.separator3.Size = New System.Drawing.Size(6, 39) ' 'mnuTbHelp ' @@ -3343,13 +3350,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLan ' @@ -3358,28 +3365,29 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 37) + Me.separator1.Size = New System.Drawing.Size(6, 39) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) + Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(834, 24) + Me.mnuBar.Size = New System.Drawing.Size(1251, 33) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3387,7 +3395,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(37, 22) + Me.mnuFile.Size = New System.Drawing.Size(54, 29) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3395,7 +3403,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(365, 34) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3403,33 +3411,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(362, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3437,7 +3445,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3445,88 +3453,88 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(365, 34) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(362, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(365, 34) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(362, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3534,105 +3542,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3640,7 +3648,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3649,7 +3657,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3657,7 +3665,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3665,107 +3673,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3773,95 +3781,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3869,105 +3877,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3975,42 +3983,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4018,7 +4026,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4026,7 +4034,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4034,38 +4042,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4073,7 +4081,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4081,169 +4089,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.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, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4251,7 +4259,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4259,46 +4267,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4306,7 +4314,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4315,7 +4323,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4324,7 +4332,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4333,35 +4341,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4369,78 +4377,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(74, 22) + Me.mnuStructured.Size = New System.Drawing.Size(109, 29) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4448,126 +4456,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4575,424 +4583,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(46, 22) + Me.mnuTools.Size = New System.Drawing.Size(69, 29) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5000,54 +5008,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5061,7 +5069,8 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 61) + Me.splOverall.Location = New System.Drawing.Point(0, 72) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5074,9 +5083,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 161 - Me.splOverall.SplitterWidth = 5 + Me.splOverall.Size = New System.Drawing.Size(1251, 619) + Me.splOverall.SplitterDistance = 249 + Me.splOverall.SplitterWidth = 8 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5084,6 +5093,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5095,9 +5105,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 161) - Me.splExtraWindows.SplitterDistance = 252 - Me.splExtraWindows.SplitterWidth = 5 + Me.splExtraWindows.Size = New System.Drawing.Size(1251, 249) + Me.splExtraWindows.SplitterDistance = 378 + Me.splExtraWindows.SplitterWidth = 8 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5105,6 +5115,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5115,9 +5126,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(252, 161) - Me.splMetadata.SplitterDistance = 68 - Me.splMetadata.SplitterWidth = 5 + Me.splMetadata.Size = New System.Drawing.Size(378, 249) + Me.splMetadata.SplitterDistance = 102 + Me.splMetadata.SplitterWidth = 8 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5127,9 +5138,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 161) + Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 249) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5138,9 +5149,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 161) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 249) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5149,9 +5160,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 161) + Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 249) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5161,6 +5172,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5172,9 +5184,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 233) - Me.splDataOutput.SplitterDistance = 382 - Me.splDataOutput.SplitterWidth = 5 + Me.splDataOutput.Size = New System.Drawing.Size(1251, 362) + Me.splDataOutput.SplitterDistance = 573 + Me.splDataOutput.SplitterWidth = 8 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5184,9 +5196,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(382, 233) + Me.ucrDataViewer.Size = New System.Drawing.Size(573, 362) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5196,9 +5208,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(447, 233) + Me.ucrOutput.Size = New System.Drawing.Size(670, 362) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5236,16 +5248,17 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'ToolStripSeparator15 + 'FormatCodeToolStripMenuItem ' - Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + Me.FormatCodeToolStripMenuItem.Name = "FormatCodeToolStripMenuItem" + Me.FormatCodeToolStripMenuItem.Size = New System.Drawing.Size(270, 34) + Me.FormatCodeToolStripMenuItem.Text = "Format Code" ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(834, 482) + Me.ClientSize = New System.Drawing.Size(1251, 723) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5253,6 +5266,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "frmMain" Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + My.Application.Info.Version.Minor.ToString + "." + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5964,4 +5978,5 @@ Partial Class frmMain Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator + Friend WithEvents FormatCodeToolStripMenuItem As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index c73bcdce42b..e679779467e 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index ff9c4936917..c1d1175cda3 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2848,4 +2848,8 @@ Public Class frmMain Private Sub mnuImportFromOpenAppBuilder_Click(sender As Object, e As EventArgs) Handles mnuImportFromOpenAppBuilder.Click dlgImportOpenAppBuilder.ShowDialog() End Sub + + Private Sub FormatCodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FormatCodeToolStripMenuItem.Click + ucrScriptWindow.FormatRCode() + End Sub End Class diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 8f1cad6613d..52596cafde3 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -19,6 +19,7 @@ Imports System.IO Imports System.Windows.Controls Imports RInsightF461 Imports ScintillaNET +Imports RDotNet Public Class ucrScript @@ -119,6 +120,48 @@ Public Class ucrScript EnableDisableButtons() End Sub + Function EscapeDoubleQuotes(ByVal input As String) As String + ' Replace each double quote with an escaped double quote + Return input.Replace("""", "\""") + End Function + + Public Sub FormatRCode() + + Try + ' Your R script text from Scintilla + Dim scriptText As String = EscapeDoubleQuotes(clsScriptActive.SelectedText) + Dim clsStylerFunction As New RFunction + + clsStylerFunction.SetPackageName("styler") + clsStylerFunction.SetRCommand("style_text") + clsStylerFunction.AddParameter("text", Chr(34) & scriptText & Chr(34), bIncludeArgumentName:=False) + + Dim expTemp As SymbolicExpression + Dim formattedCode As String() = Nothing + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsStylerFunction.ToScript(), bSilent:=True) + If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then + formattedCode = expTemp.AsCharacter().ToArray + End If + + ' Join the formattedCode array into a single string + Dim formattedText As String = String.Join(Environment.NewLine, formattedCode) + + ' Check if there is any selected text + If clsScriptActive.SelectionStart <> clsScriptActive.SelectionEnd Then + ' Replace the selected text with the formatted text + clsScriptActive.ReplaceSelection(formattedText) + Else + ' If no text is selected, you could decide what to do (e.g., insert the text at the current caret position) + Dim currentPos As Integer = clsScriptActive.CurrentPosition + clsScriptActive.InsertText(currentPos, formattedText) + End If + Catch ex As Exception + MsgBox(ex.Message) + End Try + + End Sub + + ''' ''' Removes the selected text from the active tab, and copies the removed text to the clipboard. ''' From 681034a2e19231ad730016d6b18039786230b427 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 25 Sep 2024 11:43:01 +0300 Subject: [PATCH 166/273] Changes to the code --- instat/dlgDescribeTwoVariable.Designer.vb | 258 ++++++++++++---------- instat/dlgDescribeTwoVariable.vb | 16 +- 2 files changed, 151 insertions(+), 123 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 78a4192ca81..549e78226a8 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -99,9 +99,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoThreeVariable.Location = New System.Drawing.Point(288, 8) + Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoThreeVariable.Name = "rdoThreeVariable" - Me.rdoThreeVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 Me.rdoThreeVariable.Text = "Three Variables" Me.rdoThreeVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -111,9 +112,10 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(326, 423) + Me.cmdFormatTable.Location = New System.Drawing.Point(489, 642) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdFormatTable.Name = "cmdFormatTable" - Me.cmdFormatTable.Size = New System.Drawing.Size(104, 23) + Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 Me.cmdFormatTable.Text = "Format Table..." Me.cmdFormatTable.UseVisualStyleBackColor = True @@ -121,9 +123,10 @@ Partial Class dlgDescribeTwoVariable 'lblThreeVariableSecondFactor ' Me.lblThreeVariableSecondFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(315, 150) + Me.lblThreeVariableSecondFactor.Location = New System.Drawing.Point(472, 225) + Me.lblThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableSecondFactor.Name = "lblThreeVariableSecondFactor" - Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(100, 15) + Me.lblThreeVariableSecondFactor.Size = New System.Drawing.Size(150, 22) Me.lblThreeVariableSecondFactor.TabIndex = 10 Me.lblThreeVariableSecondFactor.Tag = "" Me.lblThreeVariableSecondFactor.Text = "Second Variable :" @@ -131,9 +134,10 @@ Partial Class dlgDescribeTwoVariable 'cmdMissingOptions ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMissingOptions.Location = New System.Drawing.Point(359, 293) + Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdMissingOptions.Name = "cmdMissingOptions" - Me.cmdMissingOptions.Size = New System.Drawing.Size(105, 23) + Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 Me.cmdMissingOptions.Text = "Missing Options..." Me.cmdMissingOptions.UseVisualStyleBackColor = True @@ -141,9 +145,10 @@ Partial Class dlgDescribeTwoVariable 'lbSecondVariable ' Me.lbSecondVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lbSecondVariable.Location = New System.Drawing.Point(310, 150) + Me.lbSecondVariable.Location = New System.Drawing.Point(465, 225) + Me.lbSecondVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lbSecondVariable.Name = "lbSecondVariable" - Me.lbSecondVariable.Size = New System.Drawing.Size(100, 15) + Me.lbSecondVariable.Size = New System.Drawing.Size(150, 22) Me.lbSecondVariable.TabIndex = 9 Me.lbSecondVariable.Tag = "" Me.lbSecondVariable.Text = "Second Variable:" @@ -152,9 +157,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstVariable.AutoSize = True Me.lblFirstVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstVariable.Location = New System.Drawing.Point(310, 49) + Me.lblFirstVariable.Location = New System.Drawing.Point(465, 74) + Me.lblFirstVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstVariable.Name = "lblFirstVariable" - Me.lblFirstVariable.Size = New System.Drawing.Size(75, 13) + Me.lblFirstVariable.Size = New System.Drawing.Size(114, 20) Me.lblFirstVariable.TabIndex = 5 Me.lblFirstVariable.Tag = "" Me.lblFirstVariable.Text = "First Variables:" @@ -168,9 +174,11 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblSummary) Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) - Me.grpSummaries.Location = New System.Drawing.Point(11, 219) + Me.grpSummaries.Location = New System.Drawing.Point(16, 328) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Size = New System.Drawing.Size(210, 72) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False ' @@ -178,18 +186,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblFirstType.AutoSize = True Me.lblFirstType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstType.Location = New System.Drawing.Point(12, 18) + Me.lblFirstType.Location = New System.Drawing.Point(18, 27) + Me.lblFirstType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstType.Name = "lblFirstType" - Me.lblFirstType.Size = New System.Drawing.Size(0, 13) + Me.lblFirstType.Size = New System.Drawing.Size(0, 20) Me.lblFirstType.TabIndex = 0 ' 'lblSecondBy ' Me.lblSecondBy.AutoSize = True Me.lblSecondBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondBy.Location = New System.Drawing.Point(180, 16) + Me.lblSecondBy.Location = New System.Drawing.Point(270, 24) + Me.lblSecondBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondBy.Name = "lblSecondBy" - Me.lblSecondBy.Size = New System.Drawing.Size(18, 13) + Me.lblSecondBy.Size = New System.Drawing.Size(25, 20) Me.lblSecondBy.TabIndex = 6 Me.lblSecondBy.Text = "by" ' @@ -197,9 +207,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblThreeVariableCategorical.AutoSize = True Me.lblThreeVariableCategorical.ForeColor = System.Drawing.SystemColors.Highlight - Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(12, 33) + Me.lblThreeVariableCategorical.Location = New System.Drawing.Point(18, 50) + Me.lblThreeVariableCategorical.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThreeVariableCategorical.Name = "lblThreeVariableCategorical" - Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(59, 13) + Me.lblThreeVariableCategorical.Size = New System.Drawing.Size(86, 20) Me.lblThreeVariableCategorical.TabIndex = 1 Me.lblThreeVariableCategorical.Text = "categorical" ' @@ -207,18 +218,20 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSummaryName.AutoSize = True Me.lblSummaryName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummaryName.Location = New System.Drawing.Point(70, 51) + Me.lblSummaryName.Location = New System.Drawing.Point(105, 76) + Me.lblSummaryName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummaryName.Name = "lblSummaryName" - Me.lblSummaryName.Size = New System.Drawing.Size(0, 13) + Me.lblSummaryName.Size = New System.Drawing.Size(0, 20) Me.lblSummaryName.TabIndex = 3 ' 'lblSummary ' Me.lblSummary.AutoSize = True Me.lblSummary.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSummary.Location = New System.Drawing.Point(12, 51) + Me.lblSummary.Location = New System.Drawing.Point(18, 76) + Me.lblSummary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSummary.Name = "lblSummary" - Me.lblSummary.Size = New System.Drawing.Size(53, 13) + Me.lblSummary.Size = New System.Drawing.Size(80, 20) Me.lblSummary.TabIndex = 2 Me.lblSummary.Text = "Summary:" ' @@ -226,9 +239,10 @@ Partial Class dlgDescribeTwoVariable ' Me.lblBy.AutoSize = True Me.lblBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBy.Location = New System.Drawing.Point(82, 16) + Me.lblBy.Location = New System.Drawing.Point(123, 24) + Me.lblBy.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblBy.Name = "lblBy" - Me.lblBy.Size = New System.Drawing.Size(18, 13) + Me.lblBy.Size = New System.Drawing.Size(25, 20) Me.lblBy.TabIndex = 4 Me.lblBy.Text = "by" ' @@ -236,17 +250,19 @@ Partial Class dlgDescribeTwoVariable ' Me.lblSecondType.AutoSize = True Me.lblSecondType.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondType.Location = New System.Drawing.Point(106, 18) + Me.lblSecondType.Location = New System.Drawing.Point(159, 27) + Me.lblSecondType.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondType.Name = "lblSecondType" - Me.lblSecondType.Size = New System.Drawing.Size(0, 13) + Me.lblSecondType.Size = New System.Drawing.Size(0, 20) Me.lblSecondType.TabIndex = 5 ' 'lblFirstGroupByFactor ' Me.lblFirstGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(315, 149) + Me.lblFirstGroupByFactor.Location = New System.Drawing.Point(472, 224) + Me.lblFirstGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFirstGroupByFactor.Name = "lblFirstGroupByFactor" - Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(100, 15) + Me.lblFirstGroupByFactor.Size = New System.Drawing.Size(150, 22) Me.lblFirstGroupByFactor.TabIndex = 7 Me.lblFirstGroupByFactor.Tag = "" Me.lblFirstGroupByFactor.Text = "Factor (Optional) :" @@ -259,9 +275,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSkim.Location = New System.Drawing.Point(95, 8) + Me.rdoSkim.Location = New System.Drawing.Point(142, 12) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoSkim.Name = "rdoSkim" - Me.rdoSkim.Size = New System.Drawing.Size(100, 28) + Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 Me.rdoSkim.Text = "Skim" Me.rdoSkim.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -270,9 +287,10 @@ Partial Class dlgDescribeTwoVariable 'lblThirdVariable ' Me.lblThirdVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblThirdVariable.Location = New System.Drawing.Point(310, 191) + Me.lblThirdVariable.Location = New System.Drawing.Point(465, 286) + Me.lblThirdVariable.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblThirdVariable.Name = "lblThirdVariable" - Me.lblThirdVariable.Size = New System.Drawing.Size(154, 15) + Me.lblThirdVariable.Size = New System.Drawing.Size(231, 22) Me.lblThirdVariable.TabIndex = 13 Me.lblThirdVariable.Tag = "" Me.lblThirdVariable.Text = "Third Variable :" @@ -280,9 +298,10 @@ Partial Class dlgDescribeTwoVariable 'lblSecondGroupByFactor ' Me.lblSecondGroupByFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(315, 191) + Me.lblSecondGroupByFactor.Location = New System.Drawing.Point(472, 286) + Me.lblSecondGroupByFactor.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblSecondGroupByFactor.Name = "lblSecondGroupByFactor" - Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(137, 15) + Me.lblSecondGroupByFactor.Size = New System.Drawing.Size(206, 22) Me.lblSecondGroupByFactor.TabIndex = 33 Me.lblSecondGroupByFactor.Tag = "" Me.lblSecondGroupByFactor.Text = "Second Factor (Optional) :" @@ -295,9 +314,10 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoTwoVariable.Location = New System.Drawing.Point(191, 8) + Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoTwoVariable.Name = "rdoTwoVariable" - Me.rdoTwoVariable.Size = New System.Drawing.Size(100, 28) + Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 Me.rdoTwoVariable.Text = "Two Variables" Me.rdoTwoVariable.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -306,9 +326,10 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(310, 229) + Me.cmdSummaries.Location = New System.Drawing.Point(465, 363) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdSummaries.Name = "cmdSummaries" - Me.cmdSummaries.Size = New System.Drawing.Size(120, 23) + Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 Me.cmdSummaries.Tag = "Summaries" Me.cmdSummaries.Text = "Choose Summaries..." @@ -317,9 +338,10 @@ Partial Class dlgDescribeTwoVariable 'lblMarginName ' Me.lblMarginName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMarginName.Location = New System.Drawing.Point(15, 320) + Me.lblMarginName.Location = New System.Drawing.Point(22, 480) + Me.lblMarginName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMarginName.Name = "lblMarginName" - Me.lblMarginName.Size = New System.Drawing.Size(93, 15) + Me.lblMarginName.Size = New System.Drawing.Size(140, 22) Me.lblMarginName.TabIndex = 19 Me.lblMarginName.Tag = "" Me.lblMarginName.Text = "Margin Name:" @@ -328,9 +350,11 @@ Partial Class dlgDescribeTwoVariable ' Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) - Me.grpDisplay.Location = New System.Drawing.Point(276, 185) + Me.grpDisplay.Location = New System.Drawing.Point(414, 278) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Size = New System.Drawing.Size(194, 146) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Size = New System.Drawing.Size(291, 219) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" @@ -339,11 +363,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverColumns.AutoSize = True Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(13, 61) + Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverColumns.Name = "ucrReceiverColumns" Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(120, 81) + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) Me.ucrReceiverColumns.strNcFilePath = "" Me.ucrReceiverColumns.TabIndex = 55 Me.ucrReceiverColumns.ucrSelector = Nothing @@ -352,19 +376,18 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayAsPercentage.AutoSize = True Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(9, 15) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(4) + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(114, 23) + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) Me.ucrChkDisplayAsPercentage.TabIndex = 54 ' 'rdoOCol ' Me.rdoOCol.AutoSize = True - Me.rdoOCol.Location = New System.Drawing.Point(288, 224) - Me.rdoOCol.Margin = New System.Windows.Forms.Padding(2) + Me.rdoOCol.Location = New System.Drawing.Point(432, 336) Me.rdoOCol.Name = "rdoOCol" - Me.rdoOCol.Size = New System.Drawing.Size(54, 17) + Me.rdoOCol.Size = New System.Drawing.Size(81, 24) Me.rdoOCol.TabIndex = 40 Me.rdoOCol.TabStop = True Me.rdoOCol.Text = "Col(%)" @@ -373,10 +396,9 @@ Partial Class dlgDescribeTwoVariable 'rdoOCell ' Me.rdoOCell.AutoSize = True - Me.rdoOCell.Location = New System.Drawing.Point(408, 223) - Me.rdoOCell.Margin = New System.Windows.Forms.Padding(2) + Me.rdoOCell.Location = New System.Drawing.Point(612, 334) Me.rdoOCell.Name = "rdoOCell" - Me.rdoOCell.Size = New System.Drawing.Size(56, 17) + Me.rdoOCell.Size = New System.Drawing.Size(84, 24) Me.rdoOCell.TabIndex = 41 Me.rdoOCell.TabStop = True Me.rdoOCell.Text = "Cell(%)" @@ -385,10 +407,9 @@ Partial Class dlgDescribeTwoVariable 'rdoORow ' Me.rdoORow.AutoSize = True - Me.rdoORow.Location = New System.Drawing.Point(345, 224) - Me.rdoORow.Margin = New System.Windows.Forms.Padding(2) + Me.rdoORow.Location = New System.Drawing.Point(518, 336) Me.rdoORow.Name = "rdoORow" - Me.rdoORow.Size = New System.Drawing.Size(61, 17) + Me.rdoORow.Size = New System.Drawing.Size(90, 24) Me.rdoORow.TabIndex = 42 Me.rdoORow.TabStop = True Me.rdoORow.Text = "Row(%)" @@ -398,11 +419,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverThreeVariableThirdVariable.AutoSize = True Me.ucrReceiverThreeVariableThirdVariable.frmParent = Me - Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(310, 209) + Me.ucrReceiverThreeVariableThirdVariable.Location = New System.Drawing.Point(465, 314) Me.ucrReceiverThreeVariableThirdVariable.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableThirdVariable.Name = "ucrReceiverThreeVariableThirdVariable" Me.ucrReceiverThreeVariableThirdVariable.Selector = Nothing - Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableThirdVariable.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableThirdVariable.strNcFilePath = "" Me.ucrReceiverThreeVariableThirdVariable.TabIndex = 14 Me.ucrReceiverThreeVariableThirdVariable.ucrSelector = Nothing @@ -411,11 +432,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverPercentages.AutoSize = True Me.ucrReceiverPercentages.frmParent = Me - Me.ucrReceiverPercentages.Location = New System.Drawing.Point(287, 246) + Me.ucrReceiverPercentages.Location = New System.Drawing.Point(430, 369) Me.ucrReceiverPercentages.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverPercentages.Name = "ucrReceiverPercentages" Me.ucrReceiverPercentages.Selector = Nothing - Me.ucrReceiverPercentages.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverPercentages.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverPercentages.strNcFilePath = "" Me.ucrReceiverPercentages.TabIndex = 39 Me.ucrReceiverPercentages.ucrSelector = Nothing @@ -423,21 +444,21 @@ Partial Class dlgDescribeTwoVariable 'ucrpnlPercent ' Me.ucrpnlPercent.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrpnlPercent.Location = New System.Drawing.Point(283, 221) - Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(4) + Me.ucrpnlPercent.Location = New System.Drawing.Point(424, 332) + Me.ucrpnlPercent.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrpnlPercent.Name = "ucrpnlPercent" - Me.ucrpnlPercent.Size = New System.Drawing.Size(180, 25) + Me.ucrpnlPercent.Size = New System.Drawing.Size(270, 38) Me.ucrpnlPercent.TabIndex = 43 ' 'ucrReceiverThreeVariableSecondFactor ' Me.ucrReceiverThreeVariableSecondFactor.AutoSize = True Me.ucrReceiverThreeVariableSecondFactor.frmParent = Me - Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverThreeVariableSecondFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverThreeVariableSecondFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverThreeVariableSecondFactor.Name = "ucrReceiverThreeVariableSecondFactor" Me.ucrReceiverThreeVariableSecondFactor.Selector = Nothing - Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverThreeVariableSecondFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverThreeVariableSecondFactor.strNcFilePath = "" Me.ucrReceiverThreeVariableSecondFactor.TabIndex = 12 Me.ucrReceiverThreeVariableSecondFactor.ucrSelector = Nothing @@ -446,11 +467,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverSecondTwoVariableFactor.AutoSize = True Me.ucrReceiverSecondTwoVariableFactor.frmParent = Me - Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverSecondTwoVariableFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSecondTwoVariableFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondTwoVariableFactor.Name = "ucrReceiverSecondTwoVariableFactor" Me.ucrReceiverSecondTwoVariableFactor.Selector = Nothing - Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondTwoVariableFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondTwoVariableFactor.strNcFilePath = "" Me.ucrReceiverSecondTwoVariableFactor.TabIndex = 1 Me.ucrReceiverSecondTwoVariableFactor.ucrSelector = Nothing @@ -459,11 +480,11 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrReceiverFirstVars.AutoSize = True Me.ucrReceiverFirstVars.frmParent = Me - Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(310, 64) + Me.ucrReceiverFirstVars.Location = New System.Drawing.Point(465, 96) Me.ucrReceiverFirstVars.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFirstVars.Name = "ucrReceiverFirstVars" Me.ucrReceiverFirstVars.Selector = Nothing - Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(120, 79) + Me.ucrReceiverFirstVars.Size = New System.Drawing.Size(180, 118) Me.ucrReceiverFirstVars.strNcFilePath = "" Me.ucrReceiverFirstVars.TabIndex = 6 Me.ucrReceiverFirstVars.ucrSelector = Nothing @@ -471,10 +492,10 @@ Partial Class dlgDescribeTwoVariable 'ucrSaveTable ' Me.ucrSaveTable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveTable.Location = New System.Drawing.Point(15, 451) - Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveTable.Location = New System.Drawing.Point(22, 676) + Me.ucrSaveTable.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveTable.Name = "ucrSaveTable" - Me.ucrSaveTable.Size = New System.Drawing.Size(306, 24) + Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' 'ucrInputMarginName @@ -483,18 +504,18 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.AutoSize = True Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False - Me.ucrInputMarginName.Location = New System.Drawing.Point(114, 318) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) Me.ucrInputMarginName.Name = "ucrInputMarginName" - Me.ucrInputMarginName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(275, 258) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(6) + Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 403) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrReorderSummary.Name = "ucrReorderSummary" - Me.ucrReorderSummary.Size = New System.Drawing.Size(194, 156) + Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 16 Me.ucrReorderSummary.ucrDataFrameList = Nothing Me.ucrReorderSummary.ucrReceiver = Nothing @@ -503,21 +524,21 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(15, 489) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4) + Me.ucrBase.Location = New System.Drawing.Point(22, 734) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 ' 'ucrReceiverSecondSkimrGroupByFactor ' Me.ucrReceiverSecondSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSecondSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(310, 204) + Me.ucrReceiverSecondSkimrGroupByFactor.Location = New System.Drawing.Point(465, 306) Me.ucrReceiverSecondSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSecondSkimrGroupByFactor.Name = "ucrReceiverSecondSkimrGroupByFactor" Me.ucrReceiverSecondSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSecondSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSecondSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSecondSkimrGroupByFactor.TabIndex = 34 Me.ucrReceiverSecondSkimrGroupByFactor.ucrSelector = Nothing @@ -528,30 +549,30 @@ Partial Class dlgDescribeTwoVariable Me.ucrSelectorDescribeTwoVar.bDropUnusedFilterLevels = False Me.ucrSelectorDescribeTwoVar.bShowHiddenColumns = False Me.ucrSelectorDescribeTwoVar.bUseCurrentFilter = True - Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(11, 36) + Me.ucrSelectorDescribeTwoVar.Location = New System.Drawing.Point(16, 54) Me.ucrSelectorDescribeTwoVar.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorDescribeTwoVar.Name = "ucrSelectorDescribeTwoVar" - Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorDescribeTwoVar.Size = New System.Drawing.Size(320, 274) Me.ucrSelectorDescribeTwoVar.TabIndex = 4 ' 'ucrPnlDescribe ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDescribe.Location = New System.Drawing.Point(92, 3) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" - Me.ucrPnlDescribe.Size = New System.Drawing.Size(317, 34) + Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 ' 'ucrReceiverSkimrGroupByFactor ' Me.ucrReceiverSkimrGroupByFactor.AutoSize = True Me.ucrReceiverSkimrGroupByFactor.frmParent = Me - Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(310, 164) + Me.ucrReceiverSkimrGroupByFactor.Location = New System.Drawing.Point(465, 246) Me.ucrReceiverSkimrGroupByFactor.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverSkimrGroupByFactor.Name = "ucrReceiverSkimrGroupByFactor" Me.ucrReceiverSkimrGroupByFactor.Selector = Nothing - Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverSkimrGroupByFactor.Size = New System.Drawing.Size(180, 30) Me.ucrReceiverSkimrGroupByFactor.strNcFilePath = "" Me.ucrReceiverSkimrGroupByFactor.TabIndex = 2 Me.ucrReceiverSkimrGroupByFactor.ucrSelector = Nothing @@ -560,88 +581,88 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False - Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(17, 296) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" - Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(143, 23) + Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 18 ' 'ucrChkSummariesRowCol ' Me.ucrChkSummariesRowCol.AutoSize = True Me.ucrChkSummariesRowCol.Checked = False - Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(15, 338) - Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(22, 507) + Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkSummariesRowCol.Name = "ucrChkSummariesRowCol" - Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(180, 23) + Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) Me.ucrChkSummariesRowCol.TabIndex = 20 ' 'ucrChkLevSig ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(397, 205) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 308) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkLevSig.Name = "ucrChkLevSig" - Me.ucrChkLevSig.Size = New System.Drawing.Size(86, 23) + Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) Me.ucrChkLevSig.TabIndex = 38 ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(300, 206) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkMeans.Location = New System.Drawing.Point(450, 309) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkMeans.Name = "ucrChkMeans" - Me.ucrChkMeans.Size = New System.Drawing.Size(97, 23) + Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) Me.ucrChkMeans.TabIndex = 37 ' 'ucrChkOmitMissing ' Me.ucrChkOmitMissing.AutoSize = True Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(300, 275) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(450, 412) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(143, 23) + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) Me.ucrChkOmitMissing.TabIndex = 0 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(300, 225) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(450, 338) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" - Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(157, 23) + Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) Me.ucrChkSwapXYVar.TabIndex = 36 ' 'ucrChkCorrelations ' Me.ucrChkCorrelations.AutoSize = True Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(300, 249) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkCorrelations.Location = New System.Drawing.Point(450, 374) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(149, 23) + Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkTotal ' Me.ucrChkTotal.AutoSize = True Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(300, 186) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(6) + Me.ucrChkTotal.Location = New System.Drawing.Point(450, 279) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(97, 23) + Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) Me.ucrChkTotal.TabIndex = 44 ' 'dlgDescribeTwoVariable ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ClientSize = New System.Drawing.Size(482, 467) + Me.ClientSize = New System.Drawing.Size(723, 700) Me.Controls.Add(Me.cmdSummaries) Me.Controls.Add(Me.ucrReceiverThreeVariableThirdVariable) Me.Controls.Add(Me.ucrReceiverPercentages) @@ -683,6 +704,7 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkTotal) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index f7348ce8b15..9683def3b0a 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -631,7 +631,7 @@ Public Class dlgDescribeTwoVariable ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactor() grpDisplay.Visible = rdoTwoVariable.Checked AndAlso IsFactorByFactor() ucrReceiverPercentages.Visible = ucrChkDisplayAsPercentage.Checked AndAlso rdoORow.Checked AndAlso IsFactorByFactor() - ucrpnlPercent.Visible = ucrChkDisplayAsPercentage.Checked AndAlso IsFactorByFactor() + ucrpnlPercent.Visible = IsFactorByFactor() AndAlso ucrChkDisplayAsPercentage.Checked ucrReceiverColumns.Visible = ucrChkDisplayAsPercentage.Checked AndAlso IsFactorByFactor() AndAlso rdoOCol.Checked ucrChkCorrelations.Visible = False ucrChkSwapXYVar.Visible = False @@ -840,7 +840,7 @@ Public Class dlgDescribeTwoVariable cmdFormatTable.Visible = False ucrSaveTable.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsMappingFunction) - ElseIf IsFactorByNumericByFactor OrElse IsFactorByFactorByNumeric Then + ElseIf IsFactorByNumericByFactor() OrElse IsFactorByFactorByNumeric() Then ucrSaveTable.SetPrefix("summary_table") ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) ucrSaveTable.SetAssignToIfUncheckedValue("last_table") @@ -961,9 +961,15 @@ Public Class dlgDescribeTwoVariable Private Sub ChangeLocations() If rdoTwoVariable.Checked Then If IsFactorByNumeric() Then - ucrBase.Location = New Point(iUcrBaseXLocation, 487) - Me.Size = New Point(iDialogueXsize, 580) - cmdFormatTable.Location = New Point(326, 423) + If ucrChkSwapXYVar.Checked Then + ucrBase.Location = New Point(iUcrBaseXLocation, 400) + Me.Size = New Point(iDialogueXsize, 500) + cmdFormatTable.Location = New Point(326, 350) + Else + ucrBase.Location = New Point(iUcrBaseXLocation, 487) + Me.Size = New Point(iDialogueXsize, 580) + cmdFormatTable.Location = New Point(326, 423) + End If ElseIf IsNumericByFactor() Then ucrBase.Location = New Point(iUcrBaseXLocation, 319) Me.Size = New Point(iDialogueXsize, 415) From d274d49f3e4237e571e9881e5c8979b5b802e308 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 25 Sep 2024 13:49:47 +0300 Subject: [PATCH 167/273] minor code change --- instat/frmMain.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 00c000a16ea..039e9ff43e0 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2851,6 +2851,7 @@ Public Class frmMain Private Sub FormatCodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FormatCodeToolStripMenuItem.Click ucrScriptWindow.FormatRCode() + End Sub Private Sub mnuClimaticCheckDataDistances_Click(sender As Object, e As EventArgs) Handles mnuClimaticCheckDataDistances.Click dlgDistances.ShowDialog() End Sub From 8573f7893dd70fd963a5e78edd5ccba837500e42 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 25 Sep 2024 14:22:47 +0300 Subject: [PATCH 168/273] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 4 ++-- instat/dlgDescribeTwoVariable.vb | 22 ++++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 549e78226a8..19da042aa30 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -601,7 +601,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False - Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 308) + Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrChkLevSig.Name = "ucrChkLevSig" Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) @@ -696,12 +696,12 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkDisplayMargins) Me.Controls.Add(Me.cmdMissingOptions) Me.Controls.Add(Me.ucrChkSummariesRowCol) - Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkSwapXYVar) Me.Controls.Add(Me.ucrChkCorrelations) Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.lblThirdVariable) Me.Controls.Add(Me.ucrChkMeans) + Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkTotal) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 9683def3b0a..05a3869d7c2 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -203,6 +203,7 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.SetIsTextBox() rdoThreeVariable.Enabled = False ucrReorderSummary.bDataIsSummaries = True + AddRemoveTotalParm() End Sub Private Sub SetDefaults() @@ -502,7 +503,6 @@ Public Class dlgDescribeTwoVariable ucrReceiverFirstVars.AddAdditionalCodeParameterPair(clsMapSummaryFunction, New RParameter(".x", 1), iAdditionalPairNo:=3) ucrChkMeans.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("means", iNewPosition:=5), iAdditionalPairNo:=1) ucrChkLevSig.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("sign_level", iNewPosition:=4), iAdditionalPairNo:=1) - ucrChkTotal.AddAdditionalCodeParameterPair(clsRAnovaSwapTable2Funtion, New RParameter("total", iNewPosition:=4), iAdditionalPairNo:=1) ucrChkDisplayMargins.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("include_margins", iNewPosition:=5), iAdditionalPairNo:=1) ucrChkDisplayAsPercentage.AddAdditionalCodeParameterPair(clsCombineFrequencyColParametersFunction, New RParameter("percentage_type", iNewPosition:=1), iAdditionalPairNo:=1) @@ -526,7 +526,6 @@ Public Class dlgDescribeTwoVariable ucrChkSwapXYVar.SetRCode(clsDummyFunction, bReset) ucrChkMeans.SetRCode(clsRAnovaTable2Function, bReset) ucrChkLevSig.SetRCode(clsRAnovaTable2Function, bReset) - ucrChkTotal.SetRCode(clsRAnovaTable2Function, bReset) ucrReceiverThreeVariableSecondFactor.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrReceiverThreeVariableThirdVariable.SetRCode(clsSummaryTableCombineFactorsFunction, bReset) ucrChkDisplayMargins.SetRCode(clsCombineFrequencyParametersFunction, bReset) @@ -534,6 +533,7 @@ Public Class dlgDescribeTwoVariable bRcodeSet = True FillListView() + AddRemoveTotalParm() End Sub Public Sub TestOKEnabled() @@ -1079,7 +1079,7 @@ Public Class dlgDescribeTwoVariable clsSummaryTableFunction.AddParameter("factors", "c(" & ucrReceiverThreeVariableSecondFactor.GetVariableNames & "," & ucrReceiverThreeVariableThirdVariable.GetVariableNames & "," & ".x" & ")") clsSummaryTableFunction.AddParameter("columns_to_summarise", ".x") clsPivotWiderFunction.AddParameter("names_from", "{{ .x }}", iPosition:=1) - ElseIf IsFactorByFactorByNumeric Then + ElseIf IsFactorByFactorByNumeric() Then clsMapSummaryFunction.AddParameter(".x", "c(" & ucrReceiverFirstVars.GetVariableNames.Replace("c(", "").Replace(")", "") & "," & ucrReceiverThreeVariableSecondFactor.GetVariableNames.Replace("c(", "").Replace(")", "") & ")") clsSummaryTableFunction.AddParameter("factors", ".x") clsSummaryTableFunction.AddParameter("columns_to_summarise", ucrReceiverThreeVariableThirdVariable.GetVariableNames) @@ -1358,7 +1358,7 @@ Public Class dlgDescribeTwoVariable ElseIf rdoThreeVariable.Checked Then If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then clsSummaryTableFunction.AddParameter("summaries", clsRFunctionParameter:=clsSummariesListFunction, iPosition:=4) - ElseIf IsFactorByFactorByFactor Then + ElseIf IsFactorByFactorByFactor() Then clsSummaryTableFunction.AddParameter("summaries", "count_label", iPosition:=4) End If End If @@ -1418,9 +1418,9 @@ Public Class dlgDescribeTwoVariable strSummaryName = "ANOVA tables" ElseIf IsFactorByFactorByFactor() Then strSummaryName = "Frequency tables" - ElseIf IsFactorByNumericByFactor Then + ElseIf IsFactorByNumericByFactor() Then strSummaryName = "Summary tables" - ElseIf IsFactorByFactorByNumeric Then + ElseIf IsFactorByFactorByNumeric() Then strSummaryName = "Summary tables" Else strSummaryName = "" @@ -1756,4 +1756,14 @@ Public Class dlgDescribeTwoVariable clsDummyFunction.AddParameter("percent", "cell", iPosition:=6) End If End Sub + + Private Sub ucrChkTotal_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTotal.ControlValueChanged + AddRemoveTotalParm() + End Sub + + Private Sub AddRemoveTotalParm() + clsRAnovaTable2Function.AddParameter("total", If(ucrChkTotal.Checked, "TRUE", "FALSE"), iPosition:=6) + clsRAnovaSwapTable2Funtion.AddParameter("total", If(ucrChkTotal.Checked AndAlso ucrChkSwapXYVar.Checked, "TRUE", "FALSE"), iPosition:=6) + + End Sub End Class From 74ffcce7253b368ee6b90069b22725f54d788295 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 25 Sep 2024 15:58:37 +0300 Subject: [PATCH 169/273] code addition --- instat/ucrScript.Designer.vb | 71 ++++++++++++++++++++++-------------- instat/ucrScript.vb | 3 ++ 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/instat/ucrScript.Designer.vb b/instat/ucrScript.Designer.vb index 5d4628065c0..e1240b0807b 100644 --- a/instat/ucrScript.Designer.vb +++ b/instat/ucrScript.Designer.vb @@ -53,6 +53,7 @@ Partial Class ucrScript Me.mnuRunAllText = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuOpenScriptasFile = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuInsertScript = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLoadScriptFromFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuSaveScript = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() @@ -60,6 +61,7 @@ Partial Class ucrScript Me.lblHeaderScript = New System.Windows.Forms.Label() Me.tlpTableContainer = New System.Windows.Forms.TableLayoutPanel() Me.Panel = New System.Windows.Forms.Panel() + Me.cmdInsertScript = New System.Windows.Forms.Button() Me.cmdSave = New System.Windows.Forms.Button() Me.cmdLoadScript = New System.Windows.Forms.Button() Me.cmdRemoveTab = New System.Windows.Forms.Button() @@ -70,8 +72,8 @@ Partial Class ucrScript Me.cmdRunStatementSelection = New System.Windows.Forms.Button() Me.TabControl = New System.Windows.Forms.TabControl() Me.toolTipScriptWindow = New System.Windows.Forms.ToolTip(Me.components) - Me.cmdInsertScript = New System.Windows.Forms.Button() - Me.mnuInsertScript = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuReformatCode = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator5 = New System.Windows.Forms.ToolStripSeparator() Me.mnuContextScript.SuspendLayout() Me.tlpTableContainer.SuspendLayout() Me.Panel.SuspendLayout() @@ -80,9 +82,9 @@ Partial Class ucrScript 'mnuContextScript ' Me.mnuContextScript.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.mnuContextScript.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuUndo, Me.mnuRedo, Me.ToolStripSeparator1, Me.mnuCut, Me.mnuCopy, Me.mnuPaste, Me.mnuSelectAll, Me.mnuClear, Me.ToolStripSeparator2, Me.mnuRunCurrentStatementSelection, Me.mnuRunAllText, Me.ToolStripSeparator3, Me.mnuOpenScriptasFile, Me.mnuInsertScript, Me.mnuLoadScriptFromFile, Me.mnuSaveScript, Me.ToolStripSeparator4, Me.mnuHelp}) + Me.mnuContextScript.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuUndo, Me.mnuRedo, Me.ToolStripSeparator1, Me.mnuCut, Me.mnuCopy, Me.mnuPaste, Me.mnuSelectAll, Me.mnuClear, Me.ToolStripSeparator2, Me.mnuRunCurrentStatementSelection, Me.mnuRunAllText, Me.ToolStripSeparator5, Me.mnuReformatCode, Me.ToolStripSeparator3, Me.mnuOpenScriptasFile, Me.mnuInsertScript, Me.mnuLoadScriptFromFile, Me.mnuSaveScript, Me.ToolStripSeparator4, Me.mnuHelp}) Me.mnuContextScript.Name = "mnuContextLogFile" - Me.mnuContextScript.Size = New System.Drawing.Size(426, 509) + Me.mnuContextScript.Size = New System.Drawing.Size(426, 547) ' 'mnuUndo ' @@ -168,6 +170,12 @@ Partial Class ucrScript Me.mnuOpenScriptasFile.Size = New System.Drawing.Size(425, 32) Me.mnuOpenScriptasFile.Text = "Open Script as File" ' + 'mnuInsertScript + ' + Me.mnuInsertScript.Name = "mnuInsertScript" + Me.mnuInsertScript.Size = New System.Drawing.Size(425, 32) + Me.mnuInsertScript.Text = "Insert Script" + ' 'mnuLoadScriptFromFile ' Me.mnuLoadScriptFromFile.Name = "mnuLoadScriptFromFile" @@ -214,7 +222,7 @@ Partial Class ucrScript Me.tlpTableContainer.Controls.Add(Me.TabControl, 0, 2) Me.tlpTableContainer.Dock = System.Windows.Forms.DockStyle.Fill Me.tlpTableContainer.Location = New System.Drawing.Point(0, 0) - Me.tlpTableContainer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tlpTableContainer.Margin = New System.Windows.Forms.Padding(4) Me.tlpTableContainer.Name = "tlpTableContainer" Me.tlpTableContainer.RowCount = 3 Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!)) @@ -239,15 +247,25 @@ Partial Class ucrScript Me.Panel.Controls.Add(Me.cmdRunStatementSelection) Me.Panel.Dock = System.Windows.Forms.DockStyle.Fill Me.Panel.Location = New System.Drawing.Point(4, 34) - Me.Panel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Panel.Margin = New System.Windows.Forms.Padding(4) Me.Panel.Name = "Panel" Me.Panel.Size = New System.Drawing.Size(997, 42) Me.Panel.TabIndex = 10 ' + 'cmdInsertScript + ' + Me.cmdInsertScript.Location = New System.Drawing.Point(503, 2) + Me.cmdInsertScript.Margin = New System.Windows.Forms.Padding(4) + Me.cmdInsertScript.Name = "cmdInsertScript" + Me.cmdInsertScript.Size = New System.Drawing.Size(112, 34) + Me.cmdInsertScript.TabIndex = 8 + Me.cmdInsertScript.Text = "Insert" + Me.cmdInsertScript.UseVisualStyleBackColor = True + ' 'cmdSave ' Me.cmdSave.Location = New System.Drawing.Point(279, 2) - Me.cmdSave.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSave.Margin = New System.Windows.Forms.Padding(4) Me.cmdSave.Name = "cmdSave" Me.cmdSave.Size = New System.Drawing.Size(82, 34) Me.cmdSave.TabIndex = 3 @@ -257,7 +275,7 @@ Partial Class ucrScript 'cmdLoadScript ' Me.cmdLoadScript.Location = New System.Drawing.Point(194, 2) - Me.cmdLoadScript.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdLoadScript.Margin = New System.Windows.Forms.Padding(4) Me.cmdLoadScript.Name = "cmdLoadScript" Me.cmdLoadScript.Size = New System.Drawing.Size(82, 34) Me.cmdLoadScript.TabIndex = 2 @@ -267,7 +285,7 @@ Partial Class ucrScript 'cmdRemoveTab ' Me.cmdRemoveTab.Location = New System.Drawing.Point(620, 2) - Me.cmdRemoveTab.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdRemoveTab.Margin = New System.Windows.Forms.Padding(4) Me.cmdRemoveTab.Name = "cmdRemoveTab" Me.cmdRemoveTab.Size = New System.Drawing.Size(112, 34) Me.cmdRemoveTab.TabIndex = 5 @@ -277,7 +295,7 @@ Partial Class ucrScript 'cmdAddTab ' Me.cmdAddTab.Location = New System.Drawing.Point(386, 2) - Me.cmdAddTab.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdAddTab.Margin = New System.Windows.Forms.Padding(4) Me.cmdAddTab.Name = "cmdAddTab" Me.cmdAddTab.Size = New System.Drawing.Size(112, 34) Me.cmdAddTab.TabIndex = 4 @@ -287,7 +305,7 @@ Partial Class ucrScript 'cmdHelp ' Me.cmdHelp.Location = New System.Drawing.Point(872, 2) - Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(82, 34) Me.cmdHelp.TabIndex = 7 @@ -297,7 +315,7 @@ Partial Class ucrScript 'cmdClear ' Me.cmdClear.Location = New System.Drawing.Point(735, 2) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdClear.Margin = New System.Windows.Forms.Padding(4) Me.cmdClear.Name = "cmdClear" Me.cmdClear.Size = New System.Drawing.Size(120, 34) Me.cmdClear.TabIndex = 6 @@ -307,7 +325,7 @@ Partial Class ucrScript 'cmdRunAll ' Me.cmdRunAll.Location = New System.Drawing.Point(87, 2) - Me.cmdRunAll.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdRunAll.Margin = New System.Windows.Forms.Padding(4) Me.cmdRunAll.Name = "cmdRunAll" Me.cmdRunAll.Size = New System.Drawing.Size(82, 34) Me.cmdRunAll.TabIndex = 1 @@ -317,7 +335,7 @@ Partial Class ucrScript 'cmdRunStatementSelection ' Me.cmdRunStatementSelection.Location = New System.Drawing.Point(3, 2) - Me.cmdRunStatementSelection.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdRunStatementSelection.Margin = New System.Windows.Forms.Padding(4) Me.cmdRunStatementSelection.Name = "cmdRunStatementSelection" Me.cmdRunStatementSelection.Size = New System.Drawing.Size(82, 34) Me.cmdRunStatementSelection.TabIndex = 0 @@ -328,27 +346,22 @@ Partial Class ucrScript ' Me.TabControl.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControl.Location = New System.Drawing.Point(4, 84) - Me.TabControl.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.TabControl.Margin = New System.Windows.Forms.Padding(4) Me.TabControl.Name = "TabControl" Me.TabControl.SelectedIndex = 0 Me.TabControl.Size = New System.Drawing.Size(997, 662) Me.TabControl.TabIndex = 1 ' - 'cmdInsertScript + 'mnuReformatCode ' - Me.cmdInsertScript.Location = New System.Drawing.Point(503, 2) - Me.cmdInsertScript.Margin = New System.Windows.Forms.Padding(4) - Me.cmdInsertScript.Name = "cmdInsertScript" - Me.cmdInsertScript.Size = New System.Drawing.Size(112, 34) - Me.cmdInsertScript.TabIndex = 8 - Me.cmdInsertScript.Text = "Insert" - Me.cmdInsertScript.UseVisualStyleBackColor = True + Me.mnuReformatCode.Name = "mnuReformatCode" + Me.mnuReformatCode.Size = New System.Drawing.Size(425, 32) + Me.mnuReformatCode.Text = "Reformat Code" ' - 'mnuInsertScript + 'ToolStripSeparator5 ' - Me.mnuInsertScript.Name = "mnuInsertScript" - Me.mnuInsertScript.Size = New System.Drawing.Size(425, 32) - Me.mnuInsertScript.Text = "Insert Script" + Me.ToolStripSeparator5.Name = "ToolStripSeparator5" + Me.ToolStripSeparator5.Size = New System.Drawing.Size(422, 6) ' 'ucrScript ' @@ -356,7 +369,7 @@ Partial Class ucrScript Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.tlpTableContainer) - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "ucrScript" Me.Size = New System.Drawing.Size(1005, 750) Me.Tag = "Script_Window" @@ -399,4 +412,6 @@ Partial Class ucrScript Friend WithEvents cmdLoadScript As Button Friend WithEvents cmdInsertScript As Button Friend WithEvents mnuInsertScript As ToolStripMenuItem + Friend WithEvents ToolStripSeparator5 As ToolStripSeparator + Friend WithEvents mnuReformatCode As ToolStripMenuItem End Class \ No newline at end of file diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 52596cafde3..55e8f63b452 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -1068,4 +1068,7 @@ Public Class ucrScript sender.Dispose() End Sub + Private Sub mnuReformatCode_Click(sender As Object, e As EventArgs) Handles mnuReformatCode.Click + FormatRCode() + End Sub End Class From 168a5f39ec75f2c7080046bf9dc2b438a94671ce Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 25 Sep 2024 15:16:17 +0100 Subject: [PATCH 170/273] Change made --- instat/dlgStartofRains.vb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 617898e67a5..b5df24820c2 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -17,7 +17,7 @@ Imports instat.Translations Public Class dlgStartofRains - Private clsCalcRainDay, clsCalcStartDOY, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsAllStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private clsCalcRainDay, clsCalcStartDOY, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction Private clsDayFromAndToOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction @@ -284,7 +284,7 @@ Public Class dlgStartofRains clsCombinationSubCalcList.Clear() clsIfelseStatus1Function.Clear() clsIfelseStatusFunction.Clear() - clsAllStatusFunction.Clear() + clsFirstStatusFunction.Clear() clsIsNAStatusFunction.Clear() clsGetColumnDataTypeFunction.Clear() clsConvertColumnTypeFunction.Clear() @@ -724,12 +724,13 @@ Public Class dlgStartofRains clsIfelseStatusFunction.AddParameter("z", "FALSE", iPosition:=2, bIncludeArgumentName:=False) clsIfelseStatus1Function.SetRCommand("ifelse") - clsIfelseStatus1Function.AddParameter("yes", clsRFunctionParameter:=clsAllStatusFunction, iPosition:=0, bIncludeArgumentName:=False) + clsIfelseStatus1Function.AddParameter("yes", clsRFunctionParameter:=clsFirstStatusFunction, iPosition:=0, bIncludeArgumentName:=False) clsIfelseStatus1Function.AddParameter("test", "NA", iPosition:=1, bIncludeArgumentName:=False) clsIfelseStatus1Function.AddParameter("no", "TRUE", iPosition:=2, bIncludeArgumentName:=False) - clsAllStatusFunction.SetRCommand("all") - clsAllStatusFunction.AddParameter("x", clsRFunctionParameter:=clsIsNAStatusFunction, iPosition:=0, bIncludeArgumentName:=False) + clsFirstStatusFunction.SetPackageName("dplyr") + clsFirstStatusFunction.SetRCommand("first") + clsFirstStatusFunction.AddParameter("x", clsRFunctionParameter:=clsIsNAStatusFunction, iPosition:=0, bIncludeArgumentName:=False) clsIsNAStatusFunction.SetRCommand("is.na") clsIsNAStatusFunction.AddParameter("x", strRollSumRain, iPosition:=0, bIncludeArgumentName:=False) @@ -987,6 +988,7 @@ Public Class dlgStartofRains Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStationOptions() + ConvertYearType() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged @@ -1001,11 +1003,19 @@ Public Class dlgStartofRains TestOKEnabled() End Sub + Private Sub ConvertYearType() + If Not ucrReceiverStation.IsEmpty Then + clsConvertColumnType2Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_by_station_year" & Chr(34), iPosition:=0) + Else + clsConvertColumnType2Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_by_year" & Chr(34), iPosition:=0) + End If + End Sub + Private Sub ucrSelectorForStartofRains_DataFrameChanged() Handles ucrSelectorForStartofRains.DataFrameChanged clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) - clsConvertColumnType2Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_by_year" & Chr(34), iPosition:=0) + ConvertYearType() clsDayFilterCalcFromList.ClearParameters() End Sub From f900948420c0a6062d04da2e06a4059d4595748c Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Thu, 26 Sep 2024 09:09:59 +0300 Subject: [PATCH 171/273] Remove format code menu --- instat/frmMain.Designer.vb | 24 +++++++----------------- instat/frmMain.vb | 4 ---- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 0ff5e8280db..477deb49939 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -703,7 +703,6 @@ Partial Class frmMain Me.mnuDataFrameMetadata = New System.Windows.Forms.ToolStripMenuItem() Me.mnuScriptFile = New System.Windows.Forms.ToolStripMenuItem() Me.mnuLogFile = New System.Windows.Forms.ToolStripMenuItem() - Me.FormatCodeToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem() Me.stsStrip.SuspendLayout() Me.Tool_strip.SuspendLayout() Me.mnuBar.SuspendLayout() @@ -1819,7 +1818,6 @@ Partial Class frmMain ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' @@ -2137,7 +2135,7 @@ Partial Class frmMain ' Me.mnuClimaticCheckDataDistances.Enabled = False Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" - Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDistances.Text = "Distances..." ' 'mnuClimaticPrepare @@ -3024,7 +3022,7 @@ Partial Class frmMain ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll, Me.FormatCodeToolStripMenuItem}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" @@ -3393,7 +3391,6 @@ Partial Class frmMain Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True Me.mnuBar.Size = New System.Drawing.Size(1251, 33) @@ -5079,7 +5076,7 @@ Partial Class frmMain Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill Me.splOverall.Location = New System.Drawing.Point(0, 72) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5102,7 +5099,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5124,7 +5121,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5181,7 +5178,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5257,12 +5254,6 @@ Partial Class frmMain Me.mnuLogFile.Text = "Log Window..." Me.mnuLogFile.ToolTipText = "Log Window" ' - 'FormatCodeToolStripMenuItem - ' - Me.FormatCodeToolStripMenuItem.Name = "FormatCodeToolStripMenuItem" - Me.FormatCodeToolStripMenuItem.Size = New System.Drawing.Size(270, 34) - Me.FormatCodeToolStripMenuItem.Text = "Format Code" - ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) @@ -5275,7 +5266,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5987,6 +5978,5 @@ Partial Class frmMain Friend WithEvents RInstatResourcesSiteToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator - Friend WithEvents FormatCodeToolStripMenuItem As ToolStripMenuItem Friend WithEvents mnuClimaticCheckDataDistances As ToolStripMenuItem End Class diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 039e9ff43e0..574c9d778ab 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2848,10 +2848,6 @@ Public Class frmMain Private Sub mnuImportFromOpenAppBuilder_Click(sender As Object, e As EventArgs) Handles mnuImportFromOpenAppBuilder.Click dlgImportOpenAppBuilder.ShowDialog() End Sub - - Private Sub FormatCodeToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FormatCodeToolStripMenuItem.Click - ucrScriptWindow.FormatRCode() - End Sub Private Sub mnuClimaticCheckDataDistances_Click(sender As Object, e As EventArgs) Handles mnuClimaticCheckDataDistances.Click dlgDistances.ShowDialog() End Sub From a7e61a11c3a1aeb744778817cb47df3f36b431b3 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Thu, 26 Sep 2024 10:14:27 +0300 Subject: [PATCH 172/273] Simplify the code --- instat/ucrScript.vb | 74 +++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 43 deletions(-) diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 55e8f63b452..25ac4d3448e 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -120,48 +120,6 @@ Public Class ucrScript EnableDisableButtons() End Sub - Function EscapeDoubleQuotes(ByVal input As String) As String - ' Replace each double quote with an escaped double quote - Return input.Replace("""", "\""") - End Function - - Public Sub FormatRCode() - - Try - ' Your R script text from Scintilla - Dim scriptText As String = EscapeDoubleQuotes(clsScriptActive.SelectedText) - Dim clsStylerFunction As New RFunction - - clsStylerFunction.SetPackageName("styler") - clsStylerFunction.SetRCommand("style_text") - clsStylerFunction.AddParameter("text", Chr(34) & scriptText & Chr(34), bIncludeArgumentName:=False) - - Dim expTemp As SymbolicExpression - Dim formattedCode As String() = Nothing - expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsStylerFunction.ToScript(), bSilent:=True) - If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then - formattedCode = expTemp.AsCharacter().ToArray - End If - - ' Join the formattedCode array into a single string - Dim formattedText As String = String.Join(Environment.NewLine, formattedCode) - - ' Check if there is any selected text - If clsScriptActive.SelectionStart <> clsScriptActive.SelectionEnd Then - ' Replace the selected text with the formatted text - clsScriptActive.ReplaceSelection(formattedText) - Else - ' If no text is selected, you could decide what to do (e.g., insert the text at the current caret position) - Dim currentPos As Integer = clsScriptActive.CurrentPosition - clsScriptActive.InsertText(currentPos, formattedText) - End If - Catch ex As Exception - MsgBox(ex.Message) - End Try - - End Sub - - ''' ''' Removes the selected text from the active tab, and copies the removed text to the clipboard. ''' @@ -1069,6 +1027,36 @@ Public Class ucrScript End Sub Private Sub mnuReformatCode_Click(sender As Object, e As EventArgs) Handles mnuReformatCode.Click - FormatRCode() + Try + ' Your R script text from Scintilla + Dim scriptText As String = clsScriptActive.SelectedText.Replace("""", "\""") + Dim clsStylerFunction As New RFunction + + clsStylerFunction.SetPackageName("styler") + clsStylerFunction.SetRCommand("style_text") + clsStylerFunction.AddParameter("text", Chr(34) & scriptText & Chr(34), bIncludeArgumentName:=False) + + Dim expTemp As SymbolicExpression + Dim formattedCode As String() = Nothing + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsStylerFunction.ToScript(), bSilent:=True) + If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then + formattedCode = expTemp.AsCharacter().ToArray + End If + + ' Join the formattedCode array into a single string + Dim formattedText As String = String.Join(Environment.NewLine, formattedCode) + + ' Check if there is any selected text + If clsScriptActive.SelectionStart <> clsScriptActive.SelectionEnd Then + ' Replace the selected text with the formatted text + clsScriptActive.ReplaceSelection(formattedText) + Else + ' If no text is selected, you could decide what to do (e.g., insert the text at the current caret position) + Dim currentPos As Integer = clsScriptActive.CurrentPosition + clsScriptActive.InsertText(currentPos, formattedText) + End If + Catch ex As Exception + MsgBox(ex.Message) + End Try End Sub End Class From 91715bbca2d68a69f6742e3b8dce1b26d1f50675 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Thu, 26 Sep 2024 11:29:30 +0300 Subject: [PATCH 173/273] minor code change --- instat/ucrScript.vb | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 25ac4d3448e..83f2d2dc3f9 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -1025,9 +1025,13 @@ Public Class ucrScript TabControl.SelectedTab.Text = sender.text sender.Dispose() End Sub - Private Sub mnuReformatCode_Click(sender As Object, e As EventArgs) Handles mnuReformatCode.Click Try + ' Exit early if no text is selected + If clsScriptActive.SelectionStart = clsScriptActive.SelectionEnd Then + Exit Sub + End If + ' Your R script text from Scintilla Dim scriptText As String = clsScriptActive.SelectedText.Replace("""", "\""") Dim clsStylerFunction As New RFunction @@ -1046,17 +1050,12 @@ Public Class ucrScript ' Join the formattedCode array into a single string Dim formattedText As String = String.Join(Environment.NewLine, formattedCode) - ' Check if there is any selected text - If clsScriptActive.SelectionStart <> clsScriptActive.SelectionEnd Then - ' Replace the selected text with the formatted text - clsScriptActive.ReplaceSelection(formattedText) - Else - ' If no text is selected, you could decide what to do (e.g., insert the text at the current caret position) - Dim currentPos As Integer = clsScriptActive.CurrentPosition - clsScriptActive.InsertText(currentPos, formattedText) - End If + ' Replace the selected text with the formatted text + clsScriptActive.ReplaceSelection(formattedText) + Catch ex As Exception MsgBox(ex.Message) End Try End Sub + End Class From 08e113c549ac3257d862685ed3e0848cc58517a4 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Thu, 26 Sep 2024 11:47:38 +0300 Subject: [PATCH 174/273] removed try catch --- instat/ucrScript.vb | 40 ++++++++++++++++------------------------ 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/instat/ucrScript.vb b/instat/ucrScript.vb index 83f2d2dc3f9..794614210ce 100644 --- a/instat/ucrScript.vb +++ b/instat/ucrScript.vb @@ -1026,36 +1026,28 @@ Public Class ucrScript sender.Dispose() End Sub Private Sub mnuReformatCode_Click(sender As Object, e As EventArgs) Handles mnuReformatCode.Click - Try - ' Exit early if no text is selected - If clsScriptActive.SelectionStart = clsScriptActive.SelectionEnd Then - Exit Sub - End If + ' Exit early if no text is selected + If clsScriptActive.SelectionStart = clsScriptActive.SelectionEnd Then + Exit Sub + End If - ' Your R script text from Scintilla - Dim scriptText As String = clsScriptActive.SelectedText.Replace("""", "\""") - Dim clsStylerFunction As New RFunction + ' Your R script text from Scintilla + Dim scriptText As String = clsScriptActive.SelectedText.Replace("""", "\""") + Dim clsStylerFunction As New RFunction - clsStylerFunction.SetPackageName("styler") - clsStylerFunction.SetRCommand("style_text") - clsStylerFunction.AddParameter("text", Chr(34) & scriptText & Chr(34), bIncludeArgumentName:=False) + clsStylerFunction.SetPackageName("styler") + clsStylerFunction.SetRCommand("style_text") + clsStylerFunction.AddParameter("text", Chr(34) & scriptText & Chr(34), bIncludeArgumentName:=False) - Dim expTemp As SymbolicExpression - Dim formattedCode As String() = Nothing - expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsStylerFunction.ToScript(), bSilent:=True) - If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then - formattedCode = expTemp.AsCharacter().ToArray - End If + Dim expTemp As SymbolicExpression = frmMain.clsRLink.RunInternalScriptGetValue(clsStylerFunction.ToScript(), bSilent:=True) - ' Join the formattedCode array into a single string + ' Check if the result from R is valid + If expTemp IsNot Nothing AndAlso expTemp.Type <> Internals.SymbolicExpressionType.Null Then + ' If valid, format and replace the selected text + Dim formattedCode As String() = expTemp.AsCharacter().ToArray Dim formattedText As String = String.Join(Environment.NewLine, formattedCode) - - ' Replace the selected text with the formatted text clsScriptActive.ReplaceSelection(formattedText) - - Catch ex As Exception - MsgBox(ex.Message) - End Try + End If End Sub End Class From 101afbdd7e99bf453938ec824fbf6010e38586ae Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 26 Sep 2024 15:40:53 +0100 Subject: [PATCH 175/273] Change made in Length of season dialog --- instat/dlgClimaticLengthOfSeason.vb | 102 ++++++++++++++++++++++++---- 1 file changed, 88 insertions(+), 14 deletions(-) diff --git a/instat/dlgClimaticLengthOfSeason.vb b/instat/dlgClimaticLengthOfSeason.vb index 321ef0fc7ee..1ceeea188b1 100644 --- a/instat/dlgClimaticLengthOfSeason.vb +++ b/instat/dlgClimaticLengthOfSeason.vb @@ -20,8 +20,8 @@ Public Class dlgClimaticLengthOfSeason Private bReset As Boolean = True Private strCurrDataName As String = "" - Private clsLengthOfSeasonFunction, clsApplyInstatCalcFunction, clsCombinationCalcFunction, clsStartEndStatusFunction, clsIfElseFunction, clsIsNAFunction, clsCombinationListFunction As New RFunction - Private clsMinusOpertor, clsAndOperator, clsOROperator As New ROperator + Private clsLengthOfSeasonFunction, clsApplyInstatCalcFunction, clsAsCharacterFunction, clsCombinationCalcFunction, clsStartEndStatusFunction, clsCaseWhenFunction, clsIsNAFunction, clsIsNA1Function, clsCombinationListFunction As New RFunction + Private clsMinusOpertor, clsAndOperator, clsOROperator, clsCaseWhenOperator, clsCaseWhen1Operator, clsCaseWhen2Operator, clsCaseWhen3Operator, clsAssignOperator, clsAssign1Operator, clsAssign2Operator, clsAssign3Operator, clsAssign4Operator, clsAnd1Operator, clsAnd2Operator As New ROperator Private Sub dlgClimaticLengthOfSeason_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -91,12 +91,23 @@ Public Class dlgClimaticLengthOfSeason clsStartEndStatusFunction.Clear() clsCombinationListFunction.Clear() clsIsNAFunction.Clear() - + clsIsNA1Function.Clear() + clsAsCharacterFunction.Clear() clsMinusOpertor.Clear() clsAndOperator.Clear() clsOROperator.Clear() - + clsCaseWhenOperator.Clear() + clsCaseWhen1Operator.Clear() + clsCaseWhen2Operator.Clear() + clsCaseWhen3Operator.Clear() + clsAssignOperator.Clear() + clsAssign1Operator.Clear() + clsAssign2Operator.Clear() + clsAssign3Operator.Clear() + clsAssign4Operator.Clear() + clsAnd1Operator.Clear() + clsAnd2Operator.Clear() ucrSelectorLengthofSeason.Reset() ucrReceiverStartofRains.SetMeAsReceiver() @@ -115,24 +126,80 @@ Public Class dlgClimaticLengthOfSeason 'start status calculation clsStartEndStatusFunction.SetRCommand("instat_calculation$new") clsStartEndStatusFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) - clsStartEndStatusFunction.AddParameter("function_exp", clsRFunctionParameter:=clsIfElseFunction, iPosition:=1) + clsStartEndStatusFunction.AddParameter("function_exp", clsRFunctionParameter:=clsCaseWhenFunction, iPosition:=1) clsStartEndStatusFunction.AddParameter("result_name", Chr(34) & strTypeName & Chr(34), iPosition:=2) clsStartEndStatusFunction.AddParameter("save", 2, iPosition:=6) clsStartEndStatusFunction.SetAssignTo("start_end_status") - clsIfElseFunction.SetPackageName("dplyr") - clsIfElseFunction.SetRCommand("if_else") - clsIfElseFunction.AddParameter("is.na", clsRFunctionParameter:=clsIsNAFunction, bIncludeArgumentName:=False, iPosition:=0) - clsIfElseFunction.AddParameter("NA", "NA", bIncludeArgumentName:=False, iPosition:=1) - clsIfElseFunction.AddParameter("and", clsROperatorParameter:=clsAndOperator, bIncludeArgumentName:=False, iPosition:=2) - clsIfElseFunction.bToScriptAsRString = True + clsCaseWhenFunction.SetPackageName("dplyr") + clsCaseWhenFunction.SetRCommand("case_when") + clsCaseWhenFunction.AddParameter("is.na", clsROperatorParameter:=clsCaseWhenOperator, bIncludeArgumentName:=False, iPosition:=0) + clsCaseWhenFunction.AddParameter("NA", clsROperatorParameter:=clsCaseWhen1Operator, bIncludeArgumentName:=False, iPosition:=1) + clsCaseWhenFunction.AddParameter("and", clsROperatorParameter:=clsCaseWhen2Operator, bIncludeArgumentName:=False, iPosition:=2) + clsCaseWhenFunction.AddParameter("test", clsROperatorParameter:=clsCaseWhen3Operator, bIncludeArgumentName:=False, iPosition:=3) + clsCaseWhenFunction.bToScriptAsRString = True clsAndOperator.SetOperation("&") clsIsNAFunction.SetRCommand("is.na") - clsIsNAFunction.AddParameter("or", clsROperatorParameter:=clsOROperator, bIncludeArgumentName:=False) + + clsIsNA1Function.SetRCommand("is.na") + + clsCaseWhenOperator.SetOperation("~") + clsCaseWhenOperator.AddParameter("left", clsROperatorParameter:=clsOROperator, iPosition:=0, bIncludeArgumentName:=False) + clsCaseWhenOperator.AddParameter("right", "NA_character_", iPosition:=1, bIncludeArgumentName:=False) + clsCaseWhenOperator.bBrackets = False + + clsCaseWhen1Operator.SetOperation("~") + clsCaseWhen1Operator.AddParameter("left", clsROperatorParameter:=clsAssignOperator, iPosition:=0, bIncludeArgumentName:=False) + clsCaseWhen1Operator.AddParameter("right", clsRFunctionParameter:=clsAsCharacterFunction, iPosition:=1, bIncludeArgumentName:=False) + clsCaseWhen1Operator.bBrackets = False + + clsCaseWhen2Operator.SetOperation("~") + clsCaseWhen2Operator.AddParameter("left", clsROperatorParameter:=clsAssign2Operator, iPosition:=0, bIncludeArgumentName:=False) + clsCaseWhen2Operator.AddParameter("right", "'NONE'", iPosition:=1, bIncludeArgumentName:=False) + clsCaseWhen2Operator.bBrackets = False + + clsCaseWhen3Operator.SetOperation("~") + clsCaseWhen3Operator.AddParameter("left", clsROperatorParameter:=clsAssign4Operator, iPosition:=0, bIncludeArgumentName:=False) + clsCaseWhen3Operator.AddParameter("right", "'MORE'", iPosition:=1, bIncludeArgumentName:=False) + clsCaseWhen3Operator.bBrackets = False + + clsAsCharacterFunction.SetRCommand("as.character") + + clsAssignOperator.SetOperation("==") + clsAssignOperator.bBrackets = False + + clsAssign2Operator.SetOperation("==") + clsAssign2Operator.AddParameter("left", clsROperatorParameter:=clsAnd1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsAssign2Operator.AddParameter("right", "TRUE", iPosition:=1, bIncludeArgumentName:=False) + clsAssign2Operator.bBrackets = False + + clsAnd1Operator.SetOperation("&") + clsAnd1Operator.AddParameter("left", clsROperatorParameter:=clsAssign1Operator, iPosition:=0, bIncludeArgumentName:=False) + clsAnd1Operator.bBrackets = False + + clsAssign1Operator.SetOperation("==") + clsAssign1Operator.AddParameter("right", "FALSE", iPosition:=1, bIncludeArgumentName:=False) + clsAssign1Operator.bBrackets = False + + clsAssign4Operator.SetOperation("==") + clsAssign4Operator.AddParameter("left", clsROperatorParameter:=clsAnd2Operator, iPosition:=0, bIncludeArgumentName:=False) + clsAssign4Operator.AddParameter("right", "FALSE", iPosition:=1, bIncludeArgumentName:=False) + clsAssign4Operator.bBrackets = False + + clsAnd2Operator.SetOperation("&") + clsAnd2Operator.AddParameter("left", clsROperatorParameter:=clsAssign3Operator, iPosition:=0, bIncludeArgumentName:=False) + clsAnd2Operator.bBrackets = False + + clsAssign3Operator.SetOperation("==") + clsAssign3Operator.AddParameter("right", "TRUE", iPosition:=1, bIncludeArgumentName:=False) + clsAssign3Operator.bBrackets = False clsOROperator.SetOperation("|") + clsOROperator.AddParameter("left", clsRFunctionParameter:=clsIsNAFunction, iPosition:=0, bIncludeArgumentName:=False) + clsOROperator.AddParameter("right", clsRFunctionParameter:=clsIsNA1Function, iPosition:=1, bIncludeArgumentName:=False) + clsOROperator.bBrackets = False 'combination calculation clsCombinationCalcFunction.SetRCommand("instat_calculation$new") @@ -153,8 +220,15 @@ Public Class dlgClimaticLengthOfSeason End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsOROperator, New RParameter("start_status", 0), iAdditionalPairNo:=1) - ucrReceiverEndofRainsLogical.AddAdditionalCodeParameterPair(clsOROperator, New RParameter("end_status", 1), iAdditionalPairNo:=1) + ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsIsNAFunction, New RParameter("start_status", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverEndofRainsLogical.AddAdditionalCodeParameterPair(clsIsNA1Function, New RParameter("end_status", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsAsCharacterFunction, New RParameter("start_status", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) + ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsAssignOperator, New RParameter("start_status", 0), iAdditionalPairNo:=3) + ucrReceiverEndofRainsLogical.AddAdditionalCodeParameterPair(clsAssignOperator, New RParameter("end_status", 1), iAdditionalPairNo:=2) + ucrReceiverEndofRainsLogical.AddAdditionalCodeParameterPair(clsAnd1Operator, New RParameter("end_status", 1), iAdditionalPairNo:=3) + ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsAssign1Operator, New RParameter("start_status", 0), iAdditionalPairNo:=4) + ucrReceiverEndofRainsLogical.AddAdditionalCodeParameterPair(clsAnd2Operator, New RParameter("end_status", 1), iAdditionalPairNo:=4) + ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsAssign3Operator, New RParameter("start_status", 0), iAdditionalPairNo:=5) ucrReceiverStartofRains.SetRCode(clsMinusOpertor, bReset) ucrReceiverEndofRains.SetRCode(clsMinusOpertor, bReset) From 91f1b10fbda65f43aa6dfd12412ee8ab70993b73 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Fri, 27 Sep 2024 12:08:26 +0200 Subject: [PATCH 176/273] Added Version Number --- instat/frmMain.Designer.vb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index b6e4800811e..890ed9c4919 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5262,7 +5262,9 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat .." + Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + + My.Application.Info.Version.Minor.ToString + "." + + My.Application.Info.Version.Build.ToString Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() From 69e9c5b6269bc9d185c780f61d5f606fdc26ca48 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:44:17 +0200 Subject: [PATCH 177/273] Version Number in the Frmmain code file --- instat/frmMain.vb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index aab37fc42f3..a36a8b79ce1 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -225,7 +225,7 @@ Public Class frmMain '-------------------------------------- CreateAdditionalLibraryDirectory() '------------------------------------- - + VersionNumber() isMaximised = True 'Need to get the windowstate when the application is loaded End Sub @@ -585,6 +585,12 @@ Public Class frmMain mnuTbLan.Visible = bVisible End Sub + Public Sub VersionNumber() + Me.Text = "R-Instat " & My.Application.Info.Version.Major.ToString() & "." & + My.Application.Info.Version.Minor.ToString() & "." & + My.Application.Info.Version.Build.ToString() + End Sub + Private Sub SetMainMenusEnabled(bEnabled As Boolean) mnuFile.Enabled = bEnabled mnuEdit.Enabled = bEnabled From 7e13bbdf66d891852852a359cf819453c5d3153b Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 30 Sep 2024 15:21:33 +0300 Subject: [PATCH 178/273] changes to the code --- instat/dlgDistances.Designer.vb | 226 +++++- instat/dlgDistances.vb | 86 +- instat/frmMain.Designer.vb | 1349 ++++++++++++++++--------------- instat/frmMain.resx | 4 +- 4 files changed, 986 insertions(+), 679 deletions(-) diff --git a/instat/dlgDistances.Designer.vb b/instat/dlgDistances.Designer.vb index dc4a112b081..fc05a003777 100644 --- a/instat/dlgDistances.Designer.vb +++ b/instat/dlgDistances.Designer.vb @@ -23,32 +23,248 @@ Partial Class dlgDistances _ Private Sub InitializeComponent() Me.ucrBase = New instat.ucrButtons() + Me.ucrSelectorDistance = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrReceiverLong = New instat.ucrReceiverSingle() + Me.ucrReceiverLat = New instat.ucrReceiverSingle() + Me.lblLon = New System.Windows.Forms.Label() + Me.lblLat = New System.Windows.Forms.Label() + Me.rdoValue = New System.Windows.Forms.RadioButton() + Me.rdoVariable = New System.Windows.Forms.RadioButton() + Me.ucrPnlFrom = New instat.UcrPanel() + Me.grpFrom = New System.Windows.Forms.GroupBox() + Me.ucrNudLon = New instat.ucrNud() + Me.ucrNudLat = New instat.ucrNud() + Me.lblLongFrom = New System.Windows.Forms.Label() + Me.lblLatFrom = New System.Windows.Forms.Label() + Me.ucrReceiverVariable = New instat.ucrReceiverSingle() + Me.ucrInputVariable = New instat.ucrInputComboBox() + Me.grpFrom.SuspendLayout() Me.SuspendLayout() ' 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(6, 242) + Me.ucrBase.Location = New System.Drawing.Point(9, 372) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(410, 51) + Me.ucrBase.Size = New System.Drawing.Size(615, 78) Me.ucrBase.TabIndex = 0 ' + 'ucrSelectorDistance + ' + Me.ucrSelectorDistance.AutoSize = True + Me.ucrSelectorDistance.bDropUnusedFilterLevels = False + Me.ucrSelectorDistance.bShowHiddenColumns = False + Me.ucrSelectorDistance.bUseCurrentFilter = True + Me.ucrSelectorDistance.Location = New System.Drawing.Point(5, 22) + Me.ucrSelectorDistance.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDistance.Name = "ucrSelectorDistance" + Me.ucrSelectorDistance.Size = New System.Drawing.Size(318, 274) + Me.ucrSelectorDistance.TabIndex = 1 + ' + 'ucrReceiverLong + ' + Me.ucrReceiverLong.AutoSize = True + Me.ucrReceiverLong.frmParent = Me + Me.ucrReceiverLong.Location = New System.Drawing.Point(430, 73) + Me.ucrReceiverLong.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLong.Name = "ucrReceiverLong" + Me.ucrReceiverLong.Selector = Nothing + Me.ucrReceiverLong.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverLong.strNcFilePath = "" + Me.ucrReceiverLong.TabIndex = 2 + Me.ucrReceiverLong.ucrSelector = Nothing + ' + 'ucrReceiverLat + ' + Me.ucrReceiverLat.AutoSize = True + Me.ucrReceiverLat.frmParent = Me + Me.ucrReceiverLat.Location = New System.Drawing.Point(432, 142) + Me.ucrReceiverLat.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLat.Name = "ucrReceiverLat" + Me.ucrReceiverLat.Selector = Nothing + Me.ucrReceiverLat.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverLat.strNcFilePath = "" + Me.ucrReceiverLat.TabIndex = 3 + Me.ucrReceiverLat.ucrSelector = Nothing + ' + 'lblLon + ' + Me.lblLon.AutoSize = True + Me.lblLon.Location = New System.Drawing.Point(433, 45) + Me.lblLon.Name = "lblLon" + Me.lblLon.Size = New System.Drawing.Size(49, 20) + Me.lblLon.TabIndex = 4 + Me.lblLon.Text = "Long:" + ' + 'lblLat + ' + Me.lblLat.AutoSize = True + Me.lblLat.Location = New System.Drawing.Point(432, 119) + Me.lblLat.Name = "lblLat" + Me.lblLat.Size = New System.Drawing.Size(36, 20) + Me.lblLat.TabIndex = 5 + Me.lblLat.Text = "Lat:" + ' + 'rdoValue + ' + Me.rdoValue.AutoSize = True + Me.rdoValue.Location = New System.Drawing.Point(371, 209) + Me.rdoValue.Name = "rdoValue" + Me.rdoValue.Size = New System.Drawing.Size(83, 24) + Me.rdoValue.TabIndex = 6 + Me.rdoValue.TabStop = True + Me.rdoValue.Text = "Values" + Me.rdoValue.UseVisualStyleBackColor = True + ' + 'rdoVariable + ' + Me.rdoVariable.AutoSize = True + Me.rdoVariable.Location = New System.Drawing.Point(497, 208) + Me.rdoVariable.Name = "rdoVariable" + Me.rdoVariable.Size = New System.Drawing.Size(92, 24) + Me.rdoVariable.TabIndex = 7 + Me.rdoVariable.TabStop = True + Me.rdoVariable.Text = "Variable" + Me.rdoVariable.UseVisualStyleBackColor = True + ' + 'ucrPnlFrom + ' + Me.ucrPnlFrom.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlFrom.Location = New System.Drawing.Point(356, 207) + Me.ucrPnlFrom.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlFrom.Name = "ucrPnlFrom" + Me.ucrPnlFrom.Size = New System.Drawing.Size(263, 31) + Me.ucrPnlFrom.TabIndex = 8 + ' + 'grpFrom + ' + Me.grpFrom.Controls.Add(Me.ucrInputVariable) + Me.grpFrom.Controls.Add(Me.ucrReceiverVariable) + Me.grpFrom.Controls.Add(Me.lblLatFrom) + Me.grpFrom.Controls.Add(Me.lblLongFrom) + Me.grpFrom.Controls.Add(Me.ucrNudLat) + Me.grpFrom.Controls.Add(Me.ucrNudLon) + Me.grpFrom.Location = New System.Drawing.Point(347, 186) + Me.grpFrom.Name = "grpFrom" + Me.grpFrom.Size = New System.Drawing.Size(275, 135) + Me.grpFrom.TabIndex = 9 + Me.grpFrom.TabStop = False + Me.grpFrom.Text = "From:" + ' + 'ucrNudLon + ' + Me.ucrNudLon.AutoSize = True + Me.ucrNudLon.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLon.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLon.Location = New System.Drawing.Point(56, 57) + Me.ucrNudLon.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudLon.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLon.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLon.Name = "ucrNudLon" + Me.ucrNudLon.Size = New System.Drawing.Size(75, 30) + Me.ucrNudLon.TabIndex = 0 + Me.ucrNudLon.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLat + ' + Me.ucrNudLat.AutoSize = True + Me.ucrNudLat.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLat.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLat.Location = New System.Drawing.Point(55, 99) + Me.ucrNudLat.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudLat.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLat.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLat.Name = "ucrNudLat" + Me.ucrNudLat.Size = New System.Drawing.Size(75, 30) + Me.ucrNudLat.TabIndex = 1 + Me.ucrNudLat.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblLongFrom + ' + Me.lblLongFrom.AutoSize = True + Me.lblLongFrom.Location = New System.Drawing.Point(5, 58) + Me.lblLongFrom.Name = "lblLongFrom" + Me.lblLongFrom.Size = New System.Drawing.Size(49, 20) + Me.lblLongFrom.TabIndex = 5 + Me.lblLongFrom.Text = "Long:" + ' + 'lblLatFrom + ' + Me.lblLatFrom.AutoSize = True + Me.lblLatFrom.Location = New System.Drawing.Point(7, 101) + Me.lblLatFrom.Name = "lblLatFrom" + Me.lblLatFrom.Size = New System.Drawing.Size(36, 20) + Me.lblLatFrom.TabIndex = 6 + Me.lblLatFrom.Text = "Lat:" + ' + 'ucrReceiverVariable + ' + Me.ucrReceiverVariable.AutoSize = True + Me.ucrReceiverVariable.frmParent = Me + Me.ucrReceiverVariable.Location = New System.Drawing.Point(137, 55) + Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverVariable.Name = "ucrReceiverVariable" + Me.ucrReceiverVariable.Selector = Nothing + Me.ucrReceiverVariable.Size = New System.Drawing.Size(135, 30) + Me.ucrReceiverVariable.strNcFilePath = "" + Me.ucrReceiverVariable.TabIndex = 7 + Me.ucrReceiverVariable.ucrSelector = Nothing + ' + 'ucrInputVariable + ' + Me.ucrInputVariable.AddQuotesIfUnrecognised = True + Me.ucrInputVariable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputVariable.GetSetSelectedIndex = -1 + Me.ucrInputVariable.IsReadOnly = False + Me.ucrInputVariable.Location = New System.Drawing.Point(135, 94) + Me.ucrInputVariable.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputVariable.Name = "ucrInputVariable" + Me.ucrInputVariable.Size = New System.Drawing.Size(135, 32) + Me.ucrInputVariable.TabIndex = 8 + ' 'dlgDistances ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(423, 305) + Me.ClientSize = New System.Drawing.Size(634, 469) + Me.Controls.Add(Me.rdoVariable) + Me.Controls.Add(Me.rdoValue) + Me.Controls.Add(Me.lblLat) + Me.Controls.Add(Me.lblLon) + Me.Controls.Add(Me.ucrReceiverLat) + Me.Controls.Add(Me.ucrReceiverLong) + Me.Controls.Add(Me.ucrSelectorDistance) Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrPnlFrom) + Me.Controls.Add(Me.grpFrom) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(2, 2, 2, 2) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDistances" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Distances" + Me.grpFrom.ResumeLayout(False) + Me.grpFrom.PerformLayout() Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrSelectorDistance As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrReceiverLong As ucrReceiverSingle + Friend WithEvents rdoVariable As RadioButton + Friend WithEvents rdoValue As RadioButton + Friend WithEvents lblLat As Label + Friend WithEvents lblLon As Label + Friend WithEvents ucrReceiverLat As ucrReceiverSingle + Friend WithEvents ucrPnlFrom As UcrPanel + Friend WithEvents grpFrom As GroupBox + Friend WithEvents ucrNudLat As ucrNud + Friend WithEvents ucrNudLon As ucrNud + Friend WithEvents lblLatFrom As Label + Friend WithEvents lblLongFrom As Label + Friend WithEvents ucrInputVariable As ucrInputComboBox + Friend WithEvents ucrReceiverVariable As ucrReceiverSingle End Class diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb index 80cf80dc157..7337b0f46dd 100644 --- a/instat/dlgDistances.vb +++ b/instat/dlgDistances.vb @@ -1,3 +1,87 @@ -Public Class dlgDistances +' 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 System.IO +Imports instat.Translations + +Public Class dlgDistances + Private bFirstLoad As Boolean = True + Private bReset As Boolean = True + Private clsConcFunction, clsDistFunction As New RFunction + Private Sub dlgDistances_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 + 'TestOkEnabled() + autoTranslate(Me) + End Sub + Private Sub InitialiseDialog() + + ucrSelectorDistance.SetParameter(New RParameter("df", 0)) + ucrSelectorDistance.SetParameterIsrfunction() + + ucrReceiverLong.SetParameter(New RParameter("long", 1)) + ucrReceiverLong.Selector = ucrSelectorDistance + ucrReceiverLong.SetParameterIsRFunction() + ucrReceiverLong.SetClimaticType("lon") + ucrReceiverLong.bAutoFill = True + ucrReceiverLong.SetLinkedDisplayControl(lblLon) + + ucrReceiverLat.SetParameter(New RParameter("lat", 2)) + ucrReceiverLat.Selector = ucrSelectorDistance + ucrReceiverLat.SetParameterIsRFunction() + ucrReceiverLat.SetClimaticType("lat") + ucrReceiverLat.bAutoFill = True + ucrReceiverLat.SetLinkedDisplayControl(lblLat) + + ucrPnlFrom.AddRadioButton(rdoValue) + ucrPnlFrom.AddRadioButton(rdoVariable) + ucrPnlFrom.AddParameterValuesCondition(rdoValue, "checked", "value") + ucrPnlFrom.AddParameterValuesCondition(rdoVariable, "checked", "variable") + + ucrNudLon.SetParameter(New RParameter("lon", 0)) + ucrNudLon.SetMinMax(-180, 180) + 'ucrNudLon.DecimalPlaces = 2 + ucrNudLon.Increment = 1 + ucrNudLon.SetLinkedDisplayControl(lblLongFrom) + + ucrNudLat.SetParameter(New RParameter("lat", 1)) + ucrNudLat.SetMinMax(-90, 90) + 'ucrNudLat.DecimalPlaces = 2 + ucrNudLat.Increment = 1 + ucrNudLat.SetLinkedDisplayControl(lblLatFrom) + + ucrPnlFrom.AddToLinkedControls(ucrNudLon, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") + ucrPnlFrom.AddToLinkedControls(ucrNudLat, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") + ucrPnlFrom.AddToLinkedControls({ucrReceiverVariable, ucrInputVariable}, {rdoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") + + End Sub + Private Sub SetDefaults() + + End Sub + + Private Sub SetRCodeForControls(bReset As Boolean) + + End Sub + End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index b6e4800811e..b01008d18d3 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -728,7 +728,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 32) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -736,25 +736,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -762,26 +762,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -789,26 +789,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -816,19 +816,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -836,14 +836,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -851,25 +851,25 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -877,7 +877,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -885,7 +885,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -893,7 +893,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -901,7 +901,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -909,12 +909,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -922,7 +922,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -930,28 +930,28 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -959,95 +959,95 @@ Partial Class frmMain 'mnuDescribeSummaries ' Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" - Me.mnuDescribeSummaries.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(224, 34) Me.mnuDescribeSummaries.Text = "Summaries..." ' 'mnuDescribePresentation ' Me.mnuDescribePresentation.Name = "mnuDescribePresentation" - Me.mnuDescribePresentation.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribePresentation.Size = New System.Drawing.Size(224, 34) Me.mnuDescribePresentation.Text = "Presentation..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(53, 22) + Me.mnuModel.Size = New System.Drawing.Size(79, 32) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1055,168 +1055,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1224,7 +1224,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1232,7 +1232,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1240,7 +1240,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1248,7 +1248,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1256,7 +1256,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1265,7 +1265,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1274,7 +1274,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1282,21 +1282,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1304,14 +1304,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1320,7 +1320,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1329,21 +1329,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1352,7 +1352,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1361,7 +1361,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1369,7 +1369,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1377,7 +1377,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1385,7 +1385,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1394,7 +1394,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1403,7 +1403,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1412,7 +1412,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1420,7 +1420,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1428,7 +1428,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1437,21 +1437,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1460,7 +1460,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(44, 22) + Me.mnuView.Size = New System.Drawing.Size(65, 32) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1468,7 +1468,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1476,21 +1476,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1498,7 +1498,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1506,19 +1506,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1526,7 +1526,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1534,232 +1534,232 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(44, 22) + Me.mnuHelp.Size = New System.Drawing.Size(65, 32) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(344, 34) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(344, 34) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(344, 34) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(344, 34) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(344, 34) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(344, 34) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(344, 34) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(341, 6) ' 'RInstatResourcesSiteToolStripMenuItem ' Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(344, 34) Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(344, 34) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 32) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1767,288 +1767,288 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) + Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2056,176 +2056,176 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations, Me.mnuClimaticCheckDataDistances}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticCheckDataDistances ' Me.mnuClimaticCheckDataDistances.Enabled = False Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" - Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDistances.Text = "Distances..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2233,7 +2233,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2242,7 +2242,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2251,7 +2251,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2260,7 +2260,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2269,7 +2269,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2278,7 +2278,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2286,361 +2286,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) + Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2649,7 +2649,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2657,7 +2657,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2665,7 +2665,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2673,7 +2673,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2681,7 +2681,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2689,7 +2689,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2697,7 +2697,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2705,7 +2705,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2713,7 +2713,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2721,7 +2721,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2729,7 +2729,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2737,7 +2737,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2745,7 +2745,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2753,7 +2753,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2761,7 +2761,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2769,7 +2769,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2777,7 +2777,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2785,7 +2785,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2793,7 +2793,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2801,7 +2801,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2809,7 +2809,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2817,7 +2817,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2825,7 +2825,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2833,7 +2833,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2841,7 +2841,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2849,7 +2849,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2857,7 +2857,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2865,7 +2865,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2873,7 +2873,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2881,7 +2881,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2889,7 +2889,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2897,7 +2897,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2905,7 +2905,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2913,7 +2913,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2921,7 +2921,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2929,7 +2929,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2937,7 +2937,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2945,7 +2945,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2953,7 +2953,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(365, 34) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2961,32 +2961,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(365, 34) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2994,7 +2994,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -3003,7 +3003,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3011,12 +3011,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3024,7 +3024,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(39, 22) + Me.mnuEdit.Size = New System.Drawing.Size(58, 32) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -3032,7 +3032,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3040,7 +3040,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3048,27 +3048,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3076,17 +3076,18 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 460) + Me.stsStrip.Location = New System.Drawing.Point(0, 691) Me.stsStrip.Name = "stsStrip" + Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(834, 22) + Me.stsStrip.Size = New System.Drawing.Size(1251, 32) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(119, 17) + Me.tstatus.Size = New System.Drawing.Size(182, 25) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3095,12 +3096,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 24) + Me.Tool_strip.Location = New System.Drawing.Point(0, 36) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(834, 37) + Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3112,7 +3113,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3123,7 +3124,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3135,40 +3136,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLast10Dialogs ' @@ -3184,7 +3185,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 37) + Me.separator2.Size = New System.Drawing.Size(6, 39) ' 'mnuTbDataView ' @@ -3194,7 +3195,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3206,34 +3207,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) ' 'mnuLastGraph ' @@ -3250,25 +3251,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(128, 22) + Me.mnuploty.Size = New System.Drawing.Size(194, 34) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLogScript ' @@ -3286,14 +3287,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3312,27 +3313,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) ' 'mnuTbResetLayout ' @@ -3341,13 +3342,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 37) + Me.separator3.Size = New System.Drawing.Size(6, 39) ' 'mnuTbHelp ' @@ -3356,13 +3357,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLan ' @@ -3371,28 +3372,29 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 37) + Me.separator1.Size = New System.Drawing.Size(6, 39) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) + Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(834, 24) + Me.mnuBar.Size = New System.Drawing.Size(1251, 36) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3400,7 +3402,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(37, 22) + Me.mnuFile.Size = New System.Drawing.Size(54, 32) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3408,7 +3410,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(365, 34) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3416,33 +3418,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(362, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3450,7 +3452,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3458,88 +3460,88 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(365, 34) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(362, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(365, 34) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(362, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 32) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3547,105 +3549,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3653,7 +3655,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3662,7 +3664,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3670,7 +3672,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3678,107 +3680,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3786,95 +3788,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3882,105 +3884,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3988,42 +3990,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4031,7 +4033,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4039,7 +4041,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4047,38 +4049,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4086,7 +4088,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4094,169 +4096,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.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, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(166, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4264,7 +4266,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4272,46 +4274,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4319,7 +4321,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4328,7 +4330,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4337,7 +4339,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4346,35 +4348,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(169, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4382,78 +4384,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(74, 22) + Me.mnuStructured.Size = New System.Drawing.Size(109, 32) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4461,126 +4463,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4588,424 +4590,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 32) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 32) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(46, 22) + Me.mnuTools.Size = New System.Drawing.Size(69, 32) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5013,54 +5015,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5074,7 +5076,8 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 61) + Me.splOverall.Location = New System.Drawing.Point(0, 75) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5087,9 +5090,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 161 - Me.splOverall.SplitterWidth = 5 + Me.splOverall.Size = New System.Drawing.Size(1251, 616) + Me.splOverall.SplitterDistance = 248 + Me.splOverall.SplitterWidth = 8 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5097,6 +5100,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5108,9 +5112,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 161) - Me.splExtraWindows.SplitterDistance = 252 - Me.splExtraWindows.SplitterWidth = 5 + Me.splExtraWindows.Size = New System.Drawing.Size(1251, 248) + Me.splExtraWindows.SplitterDistance = 378 + Me.splExtraWindows.SplitterWidth = 8 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5118,6 +5122,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5128,9 +5133,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(252, 161) - Me.splMetadata.SplitterDistance = 68 - Me.splMetadata.SplitterWidth = 5 + Me.splMetadata.Size = New System.Drawing.Size(378, 248) + Me.splMetadata.SplitterDistance = 102 + Me.splMetadata.SplitterWidth = 8 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5140,9 +5145,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 161) + Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 248) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5151,9 +5156,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 161) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 248) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5162,9 +5167,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 161) + Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 248) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5174,6 +5179,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5185,9 +5191,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 233) - Me.splDataOutput.SplitterDistance = 382 - Me.splDataOutput.SplitterWidth = 5 + Me.splDataOutput.Size = New System.Drawing.Size(1251, 360) + Me.splDataOutput.SplitterDistance = 573 + Me.splDataOutput.SplitterWidth = 8 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5197,9 +5203,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(382, 233) + Me.ucrDataViewer.Size = New System.Drawing.Size(573, 360) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5209,9 +5215,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(447, 233) + Me.ucrOutput.Size = New System.Drawing.Size(670, 360) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5251,9 +5257,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(834, 482) + Me.ClientSize = New System.Drawing.Size(1251, 723) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5261,6 +5267,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized diff --git a/instat/frmMain.resx b/instat/frmMain.resx index c73bcdce42b..e679779467e 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G From 12a4055b4b0817b041c09191b85017ce3d48dff6 Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 30 Sep 2024 18:57:12 +0200 Subject: [PATCH 179/273] Update instat/frmMain.vb --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index a36a8b79ce1..22c7d90dfa2 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -585,7 +585,7 @@ Public Class frmMain mnuTbLan.Visible = bVisible End Sub - Public Sub VersionNumber() + Public Sub SetAppVersionNumber() Me.Text = "R-Instat " & My.Application.Info.Version.Major.ToString() & "." & My.Application.Info.Version.Minor.ToString() & "." & My.Application.Info.Version.Build.ToString() From d98ccf8afb501dd471319df0060e3cb5a1ed2e3d Mon Sep 17 00:00:00 2001 From: patowhiz Date: Mon, 30 Sep 2024 18:58:22 +0200 Subject: [PATCH 180/273] Update instat/frmMain.vb --- instat/frmMain.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 22c7d90dfa2..02ccdf9a381 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -225,7 +225,7 @@ Public Class frmMain '-------------------------------------- CreateAdditionalLibraryDirectory() '------------------------------------- - VersionNumber() + SetAppVersionNumber() isMaximised = True 'Need to get the windowstate when the application is loaded End Sub From 359ae0d24d37a1e77ea81d3bd2caa0d6dc5052d9 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 1 Oct 2024 06:55:19 +0300 Subject: [PATCH 181/273] changes --- instat/dlgDistances.vb | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb index 7337b0f46dd..4b7dff3e7e0 100644 --- a/instat/dlgDistances.vb +++ b/instat/dlgDistances.vb @@ -20,7 +20,8 @@ Imports instat.Translations Public Class dlgDistances Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsConcFunction, clsDistFunction As New RFunction + Private clsConcFunction, clsConc2Function, clsDummyFunction, clsDistFunction As New RFunction + Private clsOpeningOperator, clsClosingOperator As New ROperator Private Sub dlgDistances_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -76,12 +77,40 @@ Public Class dlgDistances End Sub Private Sub SetDefaults() + clsConc2Function = New RFunction + clsConcFunction = New RFunction + clsDistFunction = New RFunction + clsDummyFunction = New RFunction + clsOpeningOperator = New ROperator + clsClosingOperator = New ROperator + + ucrSelectorDistance.Reset() + + clsDummyFunction.AddParameter("value", "checked", iPosition:=0) + + clsConcFunction.SetRCommand("c") + clsConcFunction.SetAssignTo("citycenter") + clsConc2Function.SetRCommand("c") + + clsDistFunction.SetPackageName("geosphere") + clsDistFunction.SetRCommand("distGeo") + clsDistFunction.AddParameter("city", clsRFunctionParameter:=clsConcFunction, iPosition:=0, bIncludeArgumentName:=False) + + clsOpeningOperator.SetOperation("[,") + clsOpeningOperator.AddParameter("right", clsROperatorParameter:=clsClosingOperator, iPosition:=1) + + clsClosingOperator.SetOperation("]") + clsClosingOperator.AddParameter("left", clsRFunctionParameter:=clsConc2Function, iPosition:=0) End Sub Private Sub SetRCodeForControls(bReset As Boolean) + ucrNudLat.SetRCode(clsConcFunction, bReset) + ucrNudLon.SetRCode(clsConcFunction, bReset) End Sub - + Private Sub ucrSelectorDistance_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDistance.ControlValueChanged + clsOpeningOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorDistance.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + End Sub End Class \ No newline at end of file From 23562ade6beb352b428869d1c742d55065fbae20 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 1 Oct 2024 07:03:36 +0300 Subject: [PATCH 182/273] changes --- instat/frmMain.vb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index aab37fc42f3..2bcd6e220fb 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -511,11 +511,11 @@ Public Class frmMain 'get the data file path if selected by the user strDataFilePath = dlgRestoreBackup.GetDataFilePath() End If - End If - Using writer As StreamWriter = New StreamWriter(strMarkerFilePath, False) - writer.WriteLine("Running") - End Using + Using writer As StreamWriter = New StreamWriter(strMarkerFilePath, False) + writer.WriteLine("Running") + End Using + End If '--------------------------------------- From ee9aacf54c05ae1f61b722f51c34208694e4987a Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 1 Oct 2024 08:37:28 +0300 Subject: [PATCH 183/273] minor code improvement --- instat/frmMain.vb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/instat/frmMain.vb b/instat/frmMain.vb index 2bcd6e220fb..29e33e87760 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -511,12 +511,16 @@ Public Class frmMain 'get the data file path if selected by the user strDataFilePath = dlgRestoreBackup.GetDataFilePath() End If + End If - Using writer As StreamWriter = New StreamWriter(strMarkerFilePath, False) - writer.WriteLine("Running") - End Using + If Not Directory.Exists(strAutoSaveLogFolderPath) Then + Directory.CreateDirectory(strAutoSaveLogFolderPath) End If + Using writer As StreamWriter = New StreamWriter(strMarkerFilePath, False) + writer.WriteLine("Running") + End Using + '--------------------------------------- From a06e06dfadd22300c5bc51549818429419ddd218 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 1 Oct 2024 10:31:36 +0300 Subject: [PATCH 184/273] changes --- instat/dlgDistances.vb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb index 4b7dff3e7e0..ece9e5f74c7 100644 --- a/instat/dlgDistances.vb +++ b/instat/dlgDistances.vb @@ -108,9 +108,24 @@ Public Class dlgDistances ucrNudLat.SetRCode(clsConcFunction, bReset) ucrNudLon.SetRCode(clsConcFunction, bReset) + ucrSelectorDistance.SetRCode(clsDistFunction, bReset) + End Sub Private Sub ucrSelectorDistance_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDistance.ControlValueChanged clsOpeningOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorDistance.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) End Sub + + Private Sub ucrReceiverLat_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlValueChanged, ucrReceiverLong.ControlValueChanged + If Not ucrReceiverLong.IsEmpty Then + clsConc2Function.AddParameter("lon", ucrReceiverLong.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + Else + clsConc2Function.RemoveParameterByName("lon") + End If + If ucrReceiverLat.IsEmpty Then + clsConc2Function.AddParameter("lat", ucrReceiverLat.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + Else + clsConc2Function.RemoveParameterByName("lat") + End If + End Sub End Class \ No newline at end of file From 804c9be6ddba6183e6c14d7a811bd3ecc7e5893d Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 1 Oct 2024 17:23:36 +0300 Subject: [PATCH 185/273] changes to the code --- instat/dlgDistances.Designer.vb | 242 +++++++++++++++++--------------- instat/dlgDistances.vb | 90 ++++++++---- instat/frmMain.Designer.vb | 36 +++-- 3 files changed, 209 insertions(+), 159 deletions(-) diff --git a/instat/dlgDistances.Designer.vb b/instat/dlgDistances.Designer.vb index fc05a003777..c1fd795ac3d 100644 --- a/instat/dlgDistances.Designer.vb +++ b/instat/dlgDistances.Designer.vb @@ -22,79 +22,33 @@ Partial Class dlgDistances 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.ucrBase = New instat.ucrButtons() - Me.ucrSelectorDistance = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrReceiverLong = New instat.ucrReceiverSingle() - Me.ucrReceiverLat = New instat.ucrReceiverSingle() Me.lblLon = New System.Windows.Forms.Label() Me.lblLat = New System.Windows.Forms.Label() Me.rdoValue = New System.Windows.Forms.RadioButton() Me.rdoVariable = New System.Windows.Forms.RadioButton() - Me.ucrPnlFrom = New instat.UcrPanel() Me.grpFrom = New System.Windows.Forms.GroupBox() - Me.ucrNudLon = New instat.ucrNud() - Me.ucrNudLat = New instat.ucrNud() - Me.lblLongFrom = New System.Windows.Forms.Label() Me.lblLatFrom = New System.Windows.Forms.Label() - Me.ucrReceiverVariable = New instat.ucrReceiverSingle() + Me.lblLongFrom = New System.Windows.Forms.Label() + Me.ucrReceiverLat = New instat.ucrReceiverSingle() + Me.ucrReceiverLong = New instat.ucrReceiverSingle() + Me.ucrSelectorDistance = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrPnlFrom = New instat.UcrPanel() Me.ucrInputVariable = New instat.ucrInputComboBox() + Me.ucrReceiverVariable = New instat.ucrReceiverSingle() + Me.ucrNudLat = New instat.ucrNud() + Me.ucrNudLon = New instat.ucrNud() + Me.ucrSaveDistance = New instat.ucrSave() Me.grpFrom.SuspendLayout() Me.SuspendLayout() ' - 'ucrBase - ' - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 372) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(615, 78) - Me.ucrBase.TabIndex = 0 - ' - 'ucrSelectorDistance - ' - Me.ucrSelectorDistance.AutoSize = True - Me.ucrSelectorDistance.bDropUnusedFilterLevels = False - Me.ucrSelectorDistance.bShowHiddenColumns = False - Me.ucrSelectorDistance.bUseCurrentFilter = True - Me.ucrSelectorDistance.Location = New System.Drawing.Point(5, 22) - Me.ucrSelectorDistance.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorDistance.Name = "ucrSelectorDistance" - Me.ucrSelectorDistance.Size = New System.Drawing.Size(318, 274) - Me.ucrSelectorDistance.TabIndex = 1 - ' - 'ucrReceiverLong - ' - Me.ucrReceiverLong.AutoSize = True - Me.ucrReceiverLong.frmParent = Me - Me.ucrReceiverLong.Location = New System.Drawing.Point(430, 73) - Me.ucrReceiverLong.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverLong.Name = "ucrReceiverLong" - Me.ucrReceiverLong.Selector = Nothing - Me.ucrReceiverLong.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverLong.strNcFilePath = "" - Me.ucrReceiverLong.TabIndex = 2 - Me.ucrReceiverLong.ucrSelector = Nothing - ' - 'ucrReceiverLat - ' - Me.ucrReceiverLat.AutoSize = True - Me.ucrReceiverLat.frmParent = Me - Me.ucrReceiverLat.Location = New System.Drawing.Point(432, 142) - Me.ucrReceiverLat.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverLat.Name = "ucrReceiverLat" - Me.ucrReceiverLat.Selector = Nothing - Me.ucrReceiverLat.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverLat.strNcFilePath = "" - Me.ucrReceiverLat.TabIndex = 3 - Me.ucrReceiverLat.ucrSelector = Nothing - ' 'lblLon ' Me.lblLon.AutoSize = True Me.lblLon.Location = New System.Drawing.Point(433, 45) Me.lblLon.Name = "lblLon" Me.lblLon.Size = New System.Drawing.Size(49, 20) - Me.lblLon.TabIndex = 4 + Me.lblLon.TabIndex = 1 Me.lblLon.Text = "Long:" ' 'lblLat @@ -103,7 +57,7 @@ Partial Class dlgDistances Me.lblLat.Location = New System.Drawing.Point(432, 119) Me.lblLat.Name = "lblLat" Me.lblLat.Size = New System.Drawing.Size(36, 20) - Me.lblLat.TabIndex = 5 + Me.lblLat.TabIndex = 3 Me.lblLat.Text = "Lat:" ' 'rdoValue @@ -128,15 +82,6 @@ Partial Class dlgDistances Me.rdoVariable.Text = "Variable" Me.rdoVariable.UseVisualStyleBackColor = True ' - 'ucrPnlFrom - ' - Me.ucrPnlFrom.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlFrom.Location = New System.Drawing.Point(356, 207) - Me.ucrPnlFrom.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrPnlFrom.Name = "ucrPnlFrom" - Me.ucrPnlFrom.Size = New System.Drawing.Size(263, 31) - Me.ucrPnlFrom.TabIndex = 8 - ' 'grpFrom ' Me.grpFrom.Controls.Add(Me.ucrInputVariable) @@ -148,37 +93,18 @@ Partial Class dlgDistances Me.grpFrom.Location = New System.Drawing.Point(347, 186) Me.grpFrom.Name = "grpFrom" Me.grpFrom.Size = New System.Drawing.Size(275, 135) - Me.grpFrom.TabIndex = 9 + Me.grpFrom.TabIndex = 5 Me.grpFrom.TabStop = False Me.grpFrom.Text = "From:" ' - 'ucrNudLon - ' - Me.ucrNudLon.AutoSize = True - Me.ucrNudLon.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLon.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLon.Location = New System.Drawing.Point(56, 57) - Me.ucrNudLon.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrNudLon.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLon.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLon.Name = "ucrNudLon" - Me.ucrNudLon.Size = New System.Drawing.Size(75, 30) - Me.ucrNudLon.TabIndex = 0 - Me.ucrNudLon.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLat + 'lblLatFrom ' - Me.ucrNudLat.AutoSize = True - Me.ucrNudLat.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLat.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLat.Location = New System.Drawing.Point(55, 99) - Me.ucrNudLat.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrNudLat.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLat.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLat.Name = "ucrNudLat" - Me.ucrNudLat.Size = New System.Drawing.Size(75, 30) - Me.ucrNudLat.TabIndex = 1 - Me.ucrNudLat.Value = New Decimal(New Integer() {0, 0, 0, 0}) + Me.lblLatFrom.AutoSize = True + Me.lblLatFrom.Location = New System.Drawing.Point(7, 101) + Me.lblLatFrom.Name = "lblLatFrom" + Me.lblLatFrom.Size = New System.Drawing.Size(36, 20) + Me.lblLatFrom.TabIndex = 10 + Me.lblLatFrom.Text = "Lat:" ' 'lblLongFrom ' @@ -186,30 +112,64 @@ Partial Class dlgDistances Me.lblLongFrom.Location = New System.Drawing.Point(5, 58) Me.lblLongFrom.Name = "lblLongFrom" Me.lblLongFrom.Size = New System.Drawing.Size(49, 20) - Me.lblLongFrom.TabIndex = 5 + Me.lblLongFrom.TabIndex = 8 Me.lblLongFrom.Text = "Long:" ' - 'lblLatFrom + 'ucrReceiverLat ' - Me.lblLatFrom.AutoSize = True - Me.lblLatFrom.Location = New System.Drawing.Point(7, 101) - Me.lblLatFrom.Name = "lblLatFrom" - Me.lblLatFrom.Size = New System.Drawing.Size(36, 20) - Me.lblLatFrom.TabIndex = 6 - Me.lblLatFrom.Text = "Lat:" + Me.ucrReceiverLat.AutoSize = True + Me.ucrReceiverLat.frmParent = Me + Me.ucrReceiverLat.Location = New System.Drawing.Point(432, 142) + Me.ucrReceiverLat.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLat.Name = "ucrReceiverLat" + Me.ucrReceiverLat.Selector = Nothing + Me.ucrReceiverLat.Size = New System.Drawing.Size(180, 41) + Me.ucrReceiverLat.strNcFilePath = "" + Me.ucrReceiverLat.TabIndex = 4 + Me.ucrReceiverLat.ucrSelector = Nothing ' - 'ucrReceiverVariable + 'ucrReceiverLong ' - Me.ucrReceiverVariable.AutoSize = True - Me.ucrReceiverVariable.frmParent = Me - Me.ucrReceiverVariable.Location = New System.Drawing.Point(137, 55) - Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverVariable.Name = "ucrReceiverVariable" - Me.ucrReceiverVariable.Selector = Nothing - Me.ucrReceiverVariable.Size = New System.Drawing.Size(135, 30) - Me.ucrReceiverVariable.strNcFilePath = "" - Me.ucrReceiverVariable.TabIndex = 7 - Me.ucrReceiverVariable.ucrSelector = Nothing + Me.ucrReceiverLong.AutoSize = True + Me.ucrReceiverLong.frmParent = Me + Me.ucrReceiverLong.Location = New System.Drawing.Point(430, 73) + Me.ucrReceiverLong.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverLong.Name = "ucrReceiverLong" + Me.ucrReceiverLong.Selector = Nothing + Me.ucrReceiverLong.Size = New System.Drawing.Size(180, 46) + Me.ucrReceiverLong.strNcFilePath = "" + Me.ucrReceiverLong.TabIndex = 2 + Me.ucrReceiverLong.ucrSelector = Nothing + ' + 'ucrSelectorDistance + ' + Me.ucrSelectorDistance.AutoSize = True + Me.ucrSelectorDistance.bDropUnusedFilterLevels = False + Me.ucrSelectorDistance.bShowHiddenColumns = False + Me.ucrSelectorDistance.bUseCurrentFilter = True + Me.ucrSelectorDistance.Location = New System.Drawing.Point(5, 22) + Me.ucrSelectorDistance.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorDistance.Name = "ucrSelectorDistance" + Me.ucrSelectorDistance.Size = New System.Drawing.Size(318, 274) + Me.ucrSelectorDistance.TabIndex = 0 + ' + 'ucrBase + ' + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(9, 408) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(615, 78) + Me.ucrBase.TabIndex = 15 + ' + 'ucrPnlFrom + ' + Me.ucrPnlFrom.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlFrom.Location = New System.Drawing.Point(356, 207) + Me.ucrPnlFrom.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlFrom.Name = "ucrPnlFrom" + Me.ucrPnlFrom.Size = New System.Drawing.Size(263, 31) + Me.ucrPnlFrom.TabIndex = 8 ' 'ucrInputVariable ' @@ -221,13 +181,64 @@ Partial Class dlgDistances Me.ucrInputVariable.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputVariable.Name = "ucrInputVariable" Me.ucrInputVariable.Size = New System.Drawing.Size(135, 32) - Me.ucrInputVariable.TabIndex = 8 + Me.ucrInputVariable.TabIndex = 13 + ' + 'ucrReceiverVariable + ' + Me.ucrReceiverVariable.AutoSize = True + Me.ucrReceiverVariable.frmParent = Nothing + Me.ucrReceiverVariable.Location = New System.Drawing.Point(137, 55) + Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverVariable.Name = "ucrReceiverVariable" + Me.ucrReceiverVariable.Selector = Nothing + Me.ucrReceiverVariable.Size = New System.Drawing.Size(135, 30) + Me.ucrReceiverVariable.strNcFilePath = "" + Me.ucrReceiverVariable.TabIndex = 12 + Me.ucrReceiverVariable.ucrSelector = Nothing + ' + 'ucrNudLat + ' + Me.ucrNudLat.AutoSize = True + Me.ucrNudLat.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLat.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLat.Location = New System.Drawing.Point(55, 99) + Me.ucrNudLat.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudLat.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLat.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLat.Name = "ucrNudLat" + Me.ucrNudLat.Size = New System.Drawing.Size(75, 30) + Me.ucrNudLat.TabIndex = 11 + Me.ucrNudLat.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudLon + ' + Me.ucrNudLon.AutoSize = True + Me.ucrNudLon.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLon.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLon.Location = New System.Drawing.Point(56, 57) + Me.ucrNudLon.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrNudLon.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLon.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLon.Name = "ucrNudLon" + Me.ucrNudLon.Size = New System.Drawing.Size(75, 30) + Me.ucrNudLon.TabIndex = 9 + Me.ucrNudLon.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrSaveDistance + ' + Me.ucrSaveDistance.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveDistance.Location = New System.Drawing.Point(8, 348) + Me.ucrSaveDistance.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveDistance.Name = "ucrSaveDistance" + Me.ucrSaveDistance.Size = New System.Drawing.Size(548, 33) + Me.ucrSaveDistance.TabIndex = 14 ' 'dlgDistances ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(634, 469) + Me.ClientSize = New System.Drawing.Size(634, 496) + Me.Controls.Add(Me.ucrSaveDistance) Me.Controls.Add(Me.rdoVariable) Me.Controls.Add(Me.rdoValue) Me.Controls.Add(Me.lblLat) @@ -267,4 +278,5 @@ Partial Class dlgDistances Friend WithEvents lblLongFrom As Label Friend WithEvents ucrInputVariable As ucrInputComboBox Friend WithEvents ucrReceiverVariable As ucrReceiverSingle + Friend WithEvents ucrSaveDistance As ucrSave End Class diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb index ece9e5f74c7..6192dca0bd5 100644 --- a/instat/dlgDistances.vb +++ b/instat/dlgDistances.vb @@ -32,7 +32,7 @@ Public Class dlgDistances End If SetRCodeForControls(bReset) bReset = False - 'TestOkEnabled() + TestOKEnabled() autoTranslate(Me) End Sub Private Sub InitialiseDialog() @@ -40,14 +40,14 @@ Public Class dlgDistances ucrSelectorDistance.SetParameter(New RParameter("df", 0)) ucrSelectorDistance.SetParameterIsrfunction() - ucrReceiverLong.SetParameter(New RParameter("long", 1)) + ucrReceiverLong.SetParameter(New RParameter("long", 1, bNewIncludeArgumentName:=False)) ucrReceiverLong.Selector = ucrSelectorDistance ucrReceiverLong.SetParameterIsRFunction() ucrReceiverLong.SetClimaticType("lon") ucrReceiverLong.bAutoFill = True ucrReceiverLong.SetLinkedDisplayControl(lblLon) - ucrReceiverLat.SetParameter(New RParameter("lat", 2)) + ucrReceiverLat.SetParameter(New RParameter("lat", 2, bNewIncludeArgumentName:=False)) ucrReceiverLat.Selector = ucrSelectorDistance ucrReceiverLat.SetParameterIsRFunction() ucrReceiverLat.SetClimaticType("lat") @@ -59,22 +59,29 @@ Public Class dlgDistances ucrPnlFrom.AddParameterValuesCondition(rdoValue, "checked", "value") ucrPnlFrom.AddParameterValuesCondition(rdoVariable, "checked", "variable") - ucrNudLon.SetParameter(New RParameter("lon", 0)) + ucrNudLon.SetParameter(New RParameter("lon", 0, bNewIncludeArgumentName:=False)) ucrNudLon.SetMinMax(-180, 180) - 'ucrNudLon.DecimalPlaces = 2 - ucrNudLon.Increment = 1 + ucrNudLon.DecimalPlaces = 2 + ucrNudLon.Increment = 0.05 ucrNudLon.SetLinkedDisplayControl(lblLongFrom) - ucrNudLat.SetParameter(New RParameter("lat", 1)) + ucrNudLat.SetParameter(New RParameter("lat", 1, bNewIncludeArgumentName:=False)) ucrNudLat.SetMinMax(-90, 90) - 'ucrNudLat.DecimalPlaces = 2 - ucrNudLat.Increment = 1 + ucrNudLat.Increment = 0.05 + ucrNudLat.DecimalPlaces = 2 ucrNudLat.SetLinkedDisplayControl(lblLatFrom) - ucrPnlFrom.AddToLinkedControls(ucrNudLon, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") - ucrPnlFrom.AddToLinkedControls(ucrNudLat, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") - ucrPnlFrom.AddToLinkedControls({ucrReceiverVariable, ucrInputVariable}, {rdoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="0.23") + ucrPnlFrom.AddToLinkedControls(ucrNudLon, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.00) + ucrPnlFrom.AddToLinkedControls(ucrNudLat, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.00) + ucrPnlFrom.AddToLinkedControls({ucrReceiverVariable, ucrInputVariable}, {rdoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrSaveDistance.SetLabelText("New Column Name:") + ucrSaveDistance.SetDataFrameSelector(ucrSelectorDistance.ucrAvailableDataFrames) + ucrSaveDistance.SetIsComboBox() + ucrSaveDistance.SetSaveTypeAsColumn() + ucrSaveDistance.SetPrefix("distances") + + rdoVariable.Enabled = False End Sub Private Sub SetDefaults() clsConc2Function = New RFunction @@ -85,47 +92,80 @@ Public Class dlgDistances clsClosingOperator = New ROperator ucrSelectorDistance.Reset() + ucrSaveDistance.Reset() + ucrReceiverLong.SetMeAsReceiver() - clsDummyFunction.AddParameter("value", "checked", iPosition:=0) + clsDummyFunction.AddParameter("checked", "value", iPosition:=0) clsConcFunction.SetRCommand("c") clsConcFunction.SetAssignTo("citycenter") clsConc2Function.SetRCommand("c") + clsClosingOperator.SetOperation("]") + clsClosingOperator.AddParameter("left", clsRFunctionParameter:=clsConc2Function, iPosition:=0) + clsClosingOperator.AddParameter("right", "", iPosition:=1) + + clsOpeningOperator.SetOperation("[,") + clsOpeningOperator.AddParameter("right", clsROperatorParameter:=clsClosingOperator, iPosition:=1) + clsDistFunction.SetPackageName("geosphere") clsDistFunction.SetRCommand("distGeo") clsDistFunction.AddParameter("city", clsRFunctionParameter:=clsConcFunction, iPosition:=0, bIncludeArgumentName:=False) + clsDistFunction.AddParameter("para", clsROperatorParameter:=clsOpeningOperator, iPosition:=2, bIncludeArgumentName:=False) - clsOpeningOperator.SetOperation("[,") - clsOpeningOperator.AddParameter("right", clsROperatorParameter:=clsClosingOperator, iPosition:=1) + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrSaveDistance.GetText, strTempDataframe:=ucrSelectorDistance.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveDistance.GetText) - clsClosingOperator.SetOperation("]") - clsClosingOperator.AddParameter("left", clsRFunctionParameter:=clsConc2Function, iPosition:=0) + ucrBase.clsRsyntax.SetBaseRFunction(clsDistFunction) End Sub Private Sub SetRCodeForControls(bReset As Boolean) ucrNudLat.SetRCode(clsConcFunction, bReset) ucrNudLon.SetRCode(clsConcFunction, bReset) + ucrPnlFrom.SetRCode(clsDummyFunction, bReset) + ucrSaveDistance.SetRCode(clsDistFunction, bReset) + If bReset Then + ucrReceiverLong.SetRCode(clsConc2Function, bReset) + ucrReceiverLat.SetRCode(clsConc2Function, bReset) + End If + End Sub - ucrSelectorDistance.SetRCode(clsDistFunction, bReset) + Private Sub TestOKEnabled() + If Not ucrReceiverLong.IsEmpty AndAlso Not ucrReceiverLat.IsEmpty AndAlso ucrSaveDistance.IsComplete AndAlso Not ucrNudLat.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + End Sub + Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset + SetDefaults() + SetRCodeForControls(True) + TestOKEnabled() End Sub Private Sub ucrSelectorDistance_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorDistance.ControlValueChanged clsOpeningOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorDistance.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) End Sub - Private Sub ucrReceiverLat_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlValueChanged, ucrReceiverLong.ControlValueChanged - If Not ucrReceiverLong.IsEmpty Then - clsConc2Function.AddParameter("lon", ucrReceiverLong.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) + Private Sub ucrReceiverLat_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlValueChanged + + If Not ucrReceiverLat.IsEmpty Then + clsConc2Function.AddParameter("lat", ucrReceiverLat.GetVariableNames, iPosition:=1, bIncludeArgumentName:=False) Else - clsConc2Function.RemoveParameterByName("lon") + clsConc2Function.RemoveParameterByName("lat") End If - If ucrReceiverLat.IsEmpty Then - clsConc2Function.AddParameter("lat", ucrReceiverLat.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + End Sub + + Private Sub ucrReceiverLong_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLong.ControlValueChanged + If Not ucrReceiverLong.IsEmpty Then + clsConc2Function.AddParameter("long", ucrReceiverLong.GetVariableNames, iPosition:=0, bIncludeArgumentName:=False) Else - clsConc2Function.RemoveParameterByName("lat") + clsConc2Function.RemoveParameterByName("long") End If End Sub + + Private Sub ucrReceiverLat_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlContentsChanged, ucrReceiverLong.ControlContentsChanged, ucrSaveDistance.ControlContentsChanged, ucrNudLat.ControlContentsChanged + TestOKEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index b01008d18d3..35071c17605 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -728,7 +728,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 32) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -1047,7 +1047,7 @@ Partial Class frmMain ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 32) + Me.mnuModel.Size = New System.Drawing.Size(79, 29) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1460,7 +1460,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 32) + Me.mnuView.Size = New System.Drawing.Size(65, 29) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1567,7 +1567,7 @@ Partial Class frmMain ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 32) + Me.mnuHelp.Size = New System.Drawing.Size(65, 29) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' @@ -1759,7 +1759,7 @@ Partial Class frmMain ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 32) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -2133,7 +2133,6 @@ Partial Class frmMain ' 'mnuClimaticCheckDataDistances ' - Me.mnuClimaticCheckDataDistances.Enabled = False Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDistances.Text = "Distances..." @@ -3024,7 +3023,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 32) + Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -3391,7 +3390,6 @@ Partial Class frmMain Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(6, 2, 0, 2) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True Me.mnuBar.Size = New System.Drawing.Size(1251, 36) @@ -3402,7 +3400,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 32) + Me.mnuFile.Size = New System.Drawing.Size(54, 29) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3541,7 +3539,7 @@ Partial Class frmMain ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 32) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -4384,7 +4382,7 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 32) + Me.mnuStructured.Size = New System.Drawing.Size(109, 29) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular @@ -4590,7 +4588,7 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 32) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary @@ -4838,7 +4836,7 @@ Partial Class frmMain ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 32) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData @@ -5000,7 +4998,7 @@ Partial Class frmMain ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 32) + Me.mnuTools.Size = New System.Drawing.Size(69, 29) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode @@ -5077,7 +5075,7 @@ Partial Class frmMain Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill Me.splOverall.Location = New System.Drawing.Point(0, 75) - Me.splOverall.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5100,7 +5098,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5122,7 +5120,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5179,7 +5177,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5267,7 +5265,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized From e51fee290d280bee39c4621e121cb39934cf51ab Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 3 Oct 2024 16:18:08 +0300 Subject: [PATCH 186/273] minor change --- instat/dlgTransformClimatic.vb | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index 1b6f7c6009b..1ce2dca1340 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -1236,6 +1236,7 @@ Public Class dlgTransformClimatic RainDays() ReduceWaterBalance() RainfallChange() + AddCalculate() End Sub Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged From 996dbad8a416b0c21209fc368a50b76c2a00d288 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 8 Oct 2024 13:20:26 +0300 Subject: [PATCH 187/273] code changes --- instat/ucrCalculator.Designer.vb | 78 +++++++++++++++++++++++++++----- instat/ucrCalculator.vb | 36 +++++++++++++++ 2 files changed, 103 insertions(+), 11 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 91563cf0e2c..38ef121feff 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -665,6 +665,10 @@ Partial Class ucrCalculator Me.cmdPolynomial = New System.Windows.Forms.Button() Me.cmdOrigin = New System.Windows.Forms.Button() Me.ucrChkStoreScalar = New System.Windows.Forms.CheckBox() + Me.cmdFracDen = New System.Windows.Forms.Button() + Me.cmdFrac20 = New System.Windows.Forms.Button() + Me.cmdFrac100 = New System.Windows.Forms.Button() + Me.cmdFrac10 = New System.Windows.Forms.Button() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -7773,6 +7777,10 @@ Partial Class ucrCalculator ' 'grpFunctions ' + Me.grpFunctions.Controls.Add(Me.cmdFracDen) + Me.grpFunctions.Controls.Add(Me.cmdFrac20) + Me.grpFunctions.Controls.Add(Me.cmdFrac100) + Me.grpFunctions.Controls.Add(Me.cmdFrac10) Me.grpFunctions.Controls.Add(Me.cmdDigitsumSession) Me.grpFunctions.Controls.Add(Me.cmdDigitsquSession) Me.grpFunctions.Controls.Add(Me.cmdFunctionsDigitsum) @@ -7806,7 +7814,7 @@ Partial Class ucrCalculator Me.grpFunctions.Margin = New System.Windows.Forms.Padding(2) Me.grpFunctions.Name = "grpFunctions" Me.grpFunctions.Padding = New System.Windows.Forms.Padding(2) - Me.grpFunctions.Size = New System.Drawing.Size(259, 254) + Me.grpFunctions.Size = New System.Drawing.Size(259, 278) Me.grpFunctions.TabIndex = 216 Me.grpFunctions.TabStop = False Me.grpFunctions.Text = "Functions" @@ -7893,7 +7901,7 @@ Partial Class ucrCalculator ' Me.cmdRhelpFunctions.AutoSize = True Me.cmdRhelpFunctions.ContextMenuStrip = Me.ContextMenuStripFunctions - Me.cmdRhelpFunctions.Location = New System.Drawing.Point(165, 217) + Me.cmdRhelpFunctions.Location = New System.Drawing.Point(165, 251) Me.cmdRhelpFunctions.Margin = New System.Windows.Forms.Padding(2) Me.cmdRhelpFunctions.Name = "cmdRhelpFunctions" Me.cmdRhelpFunctions.Size = New System.Drawing.Size(86, 30) @@ -7988,7 +7996,7 @@ Partial Class ucrCalculator ' Me.cmdCoef.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCoef.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoef.Location = New System.Drawing.Point(128, 188) + Me.cmdCoef.Location = New System.Drawing.Point(128, 217) Me.cmdCoef.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoef.Name = "cmdCoef" Me.cmdCoef.Size = New System.Drawing.Size(62, 30) @@ -8012,7 +8020,7 @@ Partial Class ucrCalculator ' Me.cmdProd.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdProd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdProd.Location = New System.Drawing.Point(2, 188) + Me.cmdProd.Location = New System.Drawing.Point(2, 217) Me.cmdProd.Margin = New System.Windows.Forms.Padding(2) Me.cmdProd.Name = "cmdProd" Me.cmdProd.Size = New System.Drawing.Size(66, 30) @@ -8036,7 +8044,7 @@ Partial Class ucrCalculator ' Me.cmdCombn.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCombn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCombn.Location = New System.Drawing.Point(67, 188) + Me.cmdCombn.Location = New System.Drawing.Point(67, 217) Me.cmdCombn.Margin = New System.Windows.Forms.Padding(2) Me.cmdCombn.Name = "cmdCombn" Me.cmdCombn.Size = New System.Drawing.Size(62, 30) @@ -8060,7 +8068,7 @@ Partial Class ucrCalculator ' Me.cmdCoeffs2.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCoeffs2.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoeffs2.Location = New System.Drawing.Point(189, 188) + Me.cmdCoeffs2.Location = New System.Drawing.Point(189, 217) Me.cmdCoeffs2.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoeffs2.Name = "cmdCoeffs2" Me.cmdCoeffs2.Size = New System.Drawing.Size(62, 30) @@ -8096,7 +8104,7 @@ Partial Class ucrCalculator ' Me.cmdCoeffs.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdCoeffs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdCoeffs.Location = New System.Drawing.Point(189, 159) + Me.cmdCoeffs.Location = New System.Drawing.Point(189, 188) Me.cmdCoeffs.Margin = New System.Windows.Forms.Padding(2) Me.cmdCoeffs.Name = "cmdCoeffs" Me.cmdCoeffs.Size = New System.Drawing.Size(62, 30) @@ -8120,7 +8128,7 @@ Partial Class ucrCalculator ' Me.cmdRoots.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdRoots.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRoots.Location = New System.Drawing.Point(128, 159) + Me.cmdRoots.Location = New System.Drawing.Point(128, 188) Me.cmdRoots.Margin = New System.Windows.Forms.Padding(2) Me.cmdRoots.Name = "cmdRoots" Me.cmdRoots.Size = New System.Drawing.Size(62, 30) @@ -8132,7 +8140,7 @@ Partial Class ucrCalculator ' Me.cmdPolynomial.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdPolynomial.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPolynomial.Location = New System.Drawing.Point(2, 159) + Me.cmdPolynomial.Location = New System.Drawing.Point(2, 188) Me.cmdPolynomial.Margin = New System.Windows.Forms.Padding(2) Me.cmdPolynomial.Name = "cmdPolynomial" Me.cmdPolynomial.Size = New System.Drawing.Size(66, 30) @@ -8144,7 +8152,7 @@ Partial Class ucrCalculator ' Me.cmdOrigin.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!) Me.cmdOrigin.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOrigin.Location = New System.Drawing.Point(67, 159) + Me.cmdOrigin.Location = New System.Drawing.Point(67, 188) Me.cmdOrigin.Margin = New System.Windows.Forms.Padding(2) Me.cmdOrigin.Name = "cmdOrigin" Me.cmdOrigin.Size = New System.Drawing.Size(62, 30) @@ -8163,11 +8171,56 @@ Partial Class ucrCalculator Me.ucrChkStoreScalar.Text = "CheckBox1" Me.ucrChkStoreScalar.UseVisualStyleBackColor = True ' + 'cmdFracDen + ' + Me.cmdFracDen.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFracDen.Location = New System.Drawing.Point(189, 159) + Me.cmdFracDen.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFracDen.Name = "cmdFracDen" + Me.cmdFracDen.Size = New System.Drawing.Size(62, 30) + Me.cmdFracDen.TabIndex = 232 + Me.cmdFracDen.Text = "frac_den" + Me.cmdFracDen.UseVisualStyleBackColor = True + ' + 'cmdFrac20 + ' + Me.cmdFrac20.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFrac20.Location = New System.Drawing.Point(67, 159) + Me.cmdFrac20.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrac20.Name = "cmdFrac20" + Me.cmdFrac20.Size = New System.Drawing.Size(62, 30) + Me.cmdFrac20.TabIndex = 231 + Me.cmdFrac20.Text = "frac20" + Me.cmdFrac20.UseVisualStyleBackColor = True + ' + 'cmdFrac100 + ' + Me.cmdFrac100.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFrac100.Location = New System.Drawing.Point(128, 159) + Me.cmdFrac100.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrac100.Name = "cmdFrac100" + Me.cmdFrac100.Size = New System.Drawing.Size(62, 30) + Me.cmdFrac100.TabIndex = 230 + Me.cmdFrac100.Text = "frac100" + Me.cmdFrac100.UseVisualStyleBackColor = True + ' + 'cmdFrac10 + ' + Me.cmdFrac10.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFrac10.Location = New System.Drawing.Point(2, 159) + Me.cmdFrac10.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrac10.Name = "cmdFrac10" + Me.cmdFrac10.Size = New System.Drawing.Size(66, 30) + Me.cmdFrac10.TabIndex = 229 + Me.cmdFrac10.Text = "frac10" + Me.cmdFrac10.UseVisualStyleBackColor = True + ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True + Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.ucrChkStoreScalar) Me.Controls.Add(Me.cmdRhelpList) Me.Controls.Add(Me.cmdWakefieldHelp) @@ -8180,7 +8233,6 @@ Partial Class ucrCalculator Me.Controls.Add(Me.ucrSelectorForCalculations) Me.Controls.Add(Me.ucrReceiverForCalculation) Me.Controls.Add(Me.lblExpression) - Me.Controls.Add(Me.grpList) Me.Controls.Add(Me.grpFunctions) Me.Controls.Add(Me.grpLogical) Me.Controls.Add(Me.grpDates) @@ -8885,4 +8937,8 @@ Partial Class ucrCalculator Friend WithEvents cmdRescale As Button Friend WithEvents ScalesToolStripMenuItem As ToolStripMenuItem Friend WithEvents ucrChkStoreScalar As CheckBox + Friend WithEvents cmdFracDen As Button + Friend WithEvents cmdFrac20 As Button + Friend WithEvents cmdFrac100 As Button + Friend WithEvents cmdFrac10 As Button End Class diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index c1688b45298..4bc59f3a972 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -494,6 +494,10 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdPascal, "Gives Pascal triangles, e.g. for c(1,2,3,4) gives 1, (1,1), (1, 2, 1), (1, 3, 3, 1)") ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.") ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + ttCalculator.SetToolTip(cmdFrac10, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + ttCalculator.SetToolTip(cmdFrac20, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + ttCalculator.SetToolTip(cmdFrac100, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + ttCalculator.SetToolTip(cmdFracDen, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") '--------------------------------------------------------------------------------------------------------------------- Const strTooltipCmdLength = "number Of observations: For example length(c(1,2,3,4,NA)) = 5 " @@ -6097,4 +6101,36 @@ Public Class ucrCalculator ucrReceiverForCalculation.AddToReceiverAtCursorPosition("decimals( )", 2) End If End Sub + + Private Sub cmdFrac10_Click(sender As Object, e As EventArgs) Handles cmdFrac10.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac10(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac10( )", 2) + End If + End Sub + + Private Sub cmdFrac20_Click(sender As Object, e As EventArgs) Handles cmdFrac20.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac20(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac20( )", 2) + End If + End Sub + + Private Sub cmdFrac100_Click(sender As Object, e As EventArgs) Handles cmdFrac100.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac100(x= )", 2) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac100( )", 2) + End If + End Sub + + Private Sub cmdFracDen_Click(sender As Object, e As EventArgs) Handles cmdFracDen.Click + If chkShowParameters.Checked Then + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(x= , denominator= )", 17) + Else + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(, )", 3) + End If + End Sub End Class \ No newline at end of file From 3513212d5ed474f8b8ed3368f21551d3700de873 Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Tue, 8 Oct 2024 14:08:59 +0300 Subject: [PATCH 188/273] tooltips --- instat/ucrCalculator.vb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index 4bc59f3a972..f82d94a2b02 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -494,10 +494,10 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdPascal, "Gives Pascal triangles, e.g. for c(1,2,3,4) gives 1, (1,1), (1, 2, 1), (1, 3, 3, 1)") ttCalculator.SetToolTip(cmdMASSFractions, "changes decimal data into a character variable with fractions. So 1.5 becomes 3/2, 0.25 becomes 1/4 etc.") ttCalculator.SetToolTip(cmdDecimals, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") - ttCalculator.SetToolTip(cmdFrac10, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") - ttCalculator.SetToolTip(cmdFrac20, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") - ttCalculator.SetToolTip(cmdFrac100, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") - ttCalculator.SetToolTip(cmdFracDen, "the inverse of the fractions key. So 3/2 becomes 1.5, 1/4 becomes 0.25 etc.") + ttCalculator.SetToolTip(cmdFrac10, "Give fraction our of 10 for a decimal value. For example for 0.36 the value is 4/10") + ttCalculator.SetToolTip(cmdFrac20, "Give fraction our of 20 for a decimal value. For example for 0.36 the value is 7/20") + ttCalculator.SetToolTip(cmdFrac100, "Give fraction our of 100 for a decimal value. For example for 0.36 the value is 36/100") + ttCalculator.SetToolTip(cmdFracDen, "Give fraction for a given denominator. For example for frac_den(0.36, 50) gives 18/50") '--------------------------------------------------------------------------------------------------------------------- Const strTooltipCmdLength = "number Of observations: For example length(c(1,2,3,4,NA)) = 5 " @@ -6130,7 +6130,7 @@ Public Class ucrCalculator If chkShowParameters.Checked Then ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(x= , denominator= )", 17) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(, )", 3) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den( , )", 4) End If End Sub End Class \ No newline at end of file From 0aec5aa568dbc0aef826a9fe3bf5c825a11edb9d Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 9 Oct 2024 11:15:59 +0300 Subject: [PATCH 189/273] changes to the code --- instat/dlgDistances.Designer.vb | 128 ++++++++++++++++---------------- instat/dlgDistances.vb | 61 ++++++++++----- 2 files changed, 103 insertions(+), 86 deletions(-) diff --git a/instat/dlgDistances.Designer.vb b/instat/dlgDistances.Designer.vb index c1fd795ac3d..f9c6c3c9c89 100644 --- a/instat/dlgDistances.Designer.vb +++ b/instat/dlgDistances.Designer.vb @@ -27,6 +27,8 @@ Partial Class dlgDistances Me.rdoValue = New System.Windows.Forms.RadioButton() Me.rdoVariable = New System.Windows.Forms.RadioButton() Me.grpFrom = New System.Windows.Forms.GroupBox() + Me.ucrInputVariable = New instat.ucrInputComboBox() + Me.ucrReceiverVariable = New instat.ucrReceiverSingle() Me.lblLatFrom = New System.Windows.Forms.Label() Me.lblLongFrom = New System.Windows.Forms.Label() Me.ucrReceiverLat = New instat.ucrReceiverSingle() @@ -34,11 +36,9 @@ Partial Class dlgDistances Me.ucrSelectorDistance = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlFrom = New instat.UcrPanel() - Me.ucrInputVariable = New instat.ucrInputComboBox() - Me.ucrReceiverVariable = New instat.ucrReceiverSingle() - Me.ucrNudLat = New instat.ucrNud() - Me.ucrNudLon = New instat.ucrNud() Me.ucrSaveDistance = New instat.ucrSave() + Me.ucrInputLon = New instat.ucrInputTextBox() + Me.ucrInputLat = New instat.ucrInputTextBox() Me.grpFrom.SuspendLayout() Me.SuspendLayout() ' @@ -88,19 +88,42 @@ Partial Class dlgDistances Me.grpFrom.Controls.Add(Me.ucrReceiverVariable) Me.grpFrom.Controls.Add(Me.lblLatFrom) Me.grpFrom.Controls.Add(Me.lblLongFrom) - Me.grpFrom.Controls.Add(Me.ucrNudLat) - Me.grpFrom.Controls.Add(Me.ucrNudLon) - Me.grpFrom.Location = New System.Drawing.Point(347, 186) + Me.grpFrom.Location = New System.Drawing.Point(335, 186) Me.grpFrom.Name = "grpFrom" - Me.grpFrom.Size = New System.Drawing.Size(275, 135) + Me.grpFrom.Size = New System.Drawing.Size(298, 135) Me.grpFrom.TabIndex = 5 Me.grpFrom.TabStop = False Me.grpFrom.Text = "From:" ' + 'ucrInputVariable + ' + Me.ucrInputVariable.AddQuotesIfUnrecognised = True + Me.ucrInputVariable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputVariable.GetSetSelectedIndex = -1 + Me.ucrInputVariable.IsReadOnly = False + Me.ucrInputVariable.Location = New System.Drawing.Point(157, 94) + Me.ucrInputVariable.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputVariable.Name = "ucrInputVariable" + Me.ucrInputVariable.Size = New System.Drawing.Size(135, 32) + Me.ucrInputVariable.TabIndex = 13 + ' + 'ucrReceiverVariable + ' + Me.ucrReceiverVariable.AutoSize = True + Me.ucrReceiverVariable.frmParent = Me + Me.ucrReceiverVariable.Location = New System.Drawing.Point(157, 55) + Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverVariable.Name = "ucrReceiverVariable" + Me.ucrReceiverVariable.Selector = Nothing + Me.ucrReceiverVariable.Size = New System.Drawing.Size(135, 30) + Me.ucrReceiverVariable.strNcFilePath = "" + Me.ucrReceiverVariable.TabIndex = 12 + Me.ucrReceiverVariable.ucrSelector = Nothing + ' 'lblLatFrom ' Me.lblLatFrom.AutoSize = True - Me.lblLatFrom.Location = New System.Drawing.Point(7, 101) + Me.lblLatFrom.Location = New System.Drawing.Point(7, 99) Me.lblLatFrom.Name = "lblLatFrom" Me.lblLatFrom.Size = New System.Drawing.Size(36, 20) Me.lblLatFrom.TabIndex = 10 @@ -109,7 +132,7 @@ Partial Class dlgDistances 'lblLongFrom ' Me.lblLongFrom.AutoSize = True - Me.lblLongFrom.Location = New System.Drawing.Point(5, 58) + Me.lblLongFrom.Location = New System.Drawing.Point(3, 58) Me.lblLongFrom.Name = "lblLongFrom" Me.lblLongFrom.Size = New System.Drawing.Size(49, 20) Me.lblLongFrom.TabIndex = 8 @@ -171,59 +194,6 @@ Partial Class dlgDistances Me.ucrPnlFrom.Size = New System.Drawing.Size(263, 31) Me.ucrPnlFrom.TabIndex = 8 ' - 'ucrInputVariable - ' - Me.ucrInputVariable.AddQuotesIfUnrecognised = True - Me.ucrInputVariable.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputVariable.GetSetSelectedIndex = -1 - Me.ucrInputVariable.IsReadOnly = False - Me.ucrInputVariable.Location = New System.Drawing.Point(135, 94) - Me.ucrInputVariable.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputVariable.Name = "ucrInputVariable" - Me.ucrInputVariable.Size = New System.Drawing.Size(135, 32) - Me.ucrInputVariable.TabIndex = 13 - ' - 'ucrReceiverVariable - ' - Me.ucrReceiverVariable.AutoSize = True - Me.ucrReceiverVariable.frmParent = Nothing - Me.ucrReceiverVariable.Location = New System.Drawing.Point(137, 55) - Me.ucrReceiverVariable.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverVariable.Name = "ucrReceiverVariable" - Me.ucrReceiverVariable.Selector = Nothing - Me.ucrReceiverVariable.Size = New System.Drawing.Size(135, 30) - Me.ucrReceiverVariable.strNcFilePath = "" - Me.ucrReceiverVariable.TabIndex = 12 - Me.ucrReceiverVariable.ucrSelector = Nothing - ' - 'ucrNudLat - ' - Me.ucrNudLat.AutoSize = True - Me.ucrNudLat.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLat.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLat.Location = New System.Drawing.Point(55, 99) - Me.ucrNudLat.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrNudLat.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLat.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLat.Name = "ucrNudLat" - Me.ucrNudLat.Size = New System.Drawing.Size(75, 30) - Me.ucrNudLat.TabIndex = 11 - Me.ucrNudLat.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudLon - ' - Me.ucrNudLon.AutoSize = True - Me.ucrNudLon.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLon.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudLon.Location = New System.Drawing.Point(56, 57) - Me.ucrNudLon.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrNudLon.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudLon.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudLon.Name = "ucrNudLon" - Me.ucrNudLon.Size = New System.Drawing.Size(75, 30) - Me.ucrNudLon.TabIndex = 9 - Me.ucrNudLon.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' 'ucrSaveDistance ' Me.ucrSaveDistance.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -233,11 +203,37 @@ Partial Class dlgDistances Me.ucrSaveDistance.Size = New System.Drawing.Size(548, 33) Me.ucrSaveDistance.TabIndex = 14 ' + 'ucrInputLon + ' + Me.ucrInputLon.AddQuotesIfUnrecognised = True + Me.ucrInputLon.AutoSize = True + Me.ucrInputLon.IsMultiline = False + Me.ucrInputLon.IsReadOnly = False + Me.ucrInputLon.Location = New System.Drawing.Point(389, 243) + Me.ucrInputLon.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputLon.Name = "ucrInputLon" + Me.ucrInputLon.Size = New System.Drawing.Size(92, 32) + Me.ucrInputLon.TabIndex = 16 + ' + 'ucrInputLat + ' + Me.ucrInputLat.AddQuotesIfUnrecognised = True + Me.ucrInputLat.AutoSize = True + Me.ucrInputLat.IsMultiline = False + Me.ucrInputLat.IsReadOnly = False + Me.ucrInputLat.Location = New System.Drawing.Point(390, 282) + Me.ucrInputLat.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrInputLat.Name = "ucrInputLat" + Me.ucrInputLat.Size = New System.Drawing.Size(92, 32) + Me.ucrInputLat.TabIndex = 17 + ' 'dlgDistances ' Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(634, 496) + Me.ClientSize = New System.Drawing.Size(645, 496) + Me.Controls.Add(Me.ucrInputLat) + Me.Controls.Add(Me.ucrInputLon) Me.Controls.Add(Me.ucrSaveDistance) Me.Controls.Add(Me.rdoVariable) Me.Controls.Add(Me.rdoValue) @@ -272,11 +268,11 @@ Partial Class dlgDistances Friend WithEvents ucrReceiverLat As ucrReceiverSingle Friend WithEvents ucrPnlFrom As UcrPanel Friend WithEvents grpFrom As GroupBox - Friend WithEvents ucrNudLat As ucrNud - Friend WithEvents ucrNudLon As ucrNud Friend WithEvents lblLatFrom As Label Friend WithEvents lblLongFrom As Label Friend WithEvents ucrInputVariable As ucrInputComboBox Friend WithEvents ucrReceiverVariable As ucrReceiverSingle Friend WithEvents ucrSaveDistance As ucrSave + Friend WithEvents ucrInputLon As ucrInputTextBox + Friend WithEvents ucrInputLat As ucrInputTextBox End Class diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb index 6192dca0bd5..85693255f8b 100644 --- a/instat/dlgDistances.vb +++ b/instat/dlgDistances.vb @@ -21,7 +21,8 @@ Public Class dlgDistances Private bFirstLoad As Boolean = True Private bReset As Boolean = True Private clsConcFunction, clsConc2Function, clsDummyFunction, clsDistFunction As New RFunction - Private clsOpeningOperator, clsClosingOperator As New ROperator + Private clsOpeningOperator, clsClosingOperator, clsConversionOperator As New ROperator + Private Sub dlgDistances_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then InitialiseDialog() @@ -59,20 +60,16 @@ Public Class dlgDistances ucrPnlFrom.AddParameterValuesCondition(rdoValue, "checked", "value") ucrPnlFrom.AddParameterValuesCondition(rdoVariable, "checked", "variable") - ucrNudLon.SetParameter(New RParameter("lon", 0, bNewIncludeArgumentName:=False)) - ucrNudLon.SetMinMax(-180, 180) - ucrNudLon.DecimalPlaces = 2 - ucrNudLon.Increment = 0.05 - ucrNudLon.SetLinkedDisplayControl(lblLongFrom) + ucrInputLon.SetParameter(New RParameter("lon", 0, bNewIncludeArgumentName:=False)) + ucrInputLon.SetValidationTypeAsNumeric(dcmMin:=-180.0, dcmMax:=180.0) + ucrInputLon.SetLinkedDisplayControl(lblLongFrom) - ucrNudLat.SetParameter(New RParameter("lat", 1, bNewIncludeArgumentName:=False)) - ucrNudLat.SetMinMax(-90, 90) - ucrNudLat.Increment = 0.05 - ucrNudLat.DecimalPlaces = 2 - ucrNudLat.SetLinkedDisplayControl(lblLatFrom) + ucrInputLat.SetParameter(New RParameter("lat", 1, bNewIncludeArgumentName:=False)) + ucrInputLat.SetValidationTypeAsNumeric(dcmMin:=-90.0, dcmMax:=90.0) + ucrInputLat.SetLinkedDisplayControl(lblLatFrom) - ucrPnlFrom.AddToLinkedControls(ucrNudLon, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.00) - ucrPnlFrom.AddToLinkedControls(ucrNudLat, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.00) + ucrPnlFrom.AddToLinkedControls(ucrInputLon, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlFrom.AddToLinkedControls(ucrInputLat, {rdoValue}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlFrom.AddToLinkedControls({ucrReceiverVariable, ucrInputVariable}, {rdoVariable}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrSaveDistance.SetLabelText("New Column Name:") @@ -90,6 +87,7 @@ Public Class dlgDistances clsDummyFunction = New RFunction clsOpeningOperator = New ROperator clsClosingOperator = New ROperator + clsConversionOperator = New ROperator ucrSelectorDistance.Reset() ucrSaveDistance.Reset() @@ -99,6 +97,9 @@ Public Class dlgDistances clsConcFunction.SetRCommand("c") clsConcFunction.SetAssignTo("citycenter") + clsConcFunction.AddParameter("lon", 0, iPosition:=0, bIncludeArgumentName:=False) + clsConcFunction.AddParameter("lat", 0, iPosition:=1, bIncludeArgumentName:=False) + clsConc2Function.SetRCommand("c") clsClosingOperator.SetOperation("]") @@ -113,17 +114,21 @@ Public Class dlgDistances clsDistFunction.AddParameter("city", clsRFunctionParameter:=clsConcFunction, iPosition:=0, bIncludeArgumentName:=False) clsDistFunction.AddParameter("para", clsROperatorParameter:=clsOpeningOperator, iPosition:=2, bIncludeArgumentName:=False) + clsConversionOperator.SetOperation("/") + clsConversionOperator.AddParameter("left", clsRFunctionParameter:=clsDistFunction, iPosition:=0) + clsConversionOperator.AddParameter("right", "1000", iPosition:=1) + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrSaveDistance.GetText, strTempDataframe:=ucrSelectorDistance.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveDistance.GetText) - ucrBase.clsRsyntax.SetBaseRFunction(clsDistFunction) + ucrBase.clsRsyntax.SetBaseROperator(clsConversionOperator) End Sub Private Sub SetRCodeForControls(bReset As Boolean) - ucrNudLat.SetRCode(clsConcFunction, bReset) - ucrNudLon.SetRCode(clsConcFunction, bReset) + ucrInputLat.SetRCode(clsConcFunction, bReset) + ucrInputLon.SetRCode(clsConcFunction, bReset) ucrPnlFrom.SetRCode(clsDummyFunction, bReset) - ucrSaveDistance.SetRCode(clsDistFunction, bReset) + ucrSaveDistance.SetRCode(clsConversionOperator, bReset) If bReset Then ucrReceiverLong.SetRCode(clsConc2Function, bReset) ucrReceiverLat.SetRCode(clsConc2Function, bReset) @@ -131,7 +136,7 @@ Public Class dlgDistances End Sub Private Sub TestOKEnabled() - If Not ucrReceiverLong.IsEmpty AndAlso Not ucrReceiverLat.IsEmpty AndAlso ucrSaveDistance.IsComplete AndAlso Not ucrNudLat.IsEmpty Then + If Not ucrReceiverLong.IsEmpty AndAlso Not ucrReceiverLat.IsEmpty AndAlso ucrSaveDistance.IsComplete AndAlso Not ucrInputLat.IsEmpty Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -149,7 +154,6 @@ Public Class dlgDistances End Sub Private Sub ucrReceiverLat_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlValueChanged - If Not ucrReceiverLat.IsEmpty Then clsConc2Function.AddParameter("lat", ucrReceiverLat.GetVariableNames, iPosition:=1, bIncludeArgumentName:=False) Else @@ -165,7 +169,24 @@ Public Class dlgDistances End If End Sub - Private Sub ucrReceiverLat_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlContentsChanged, ucrReceiverLong.ControlContentsChanged, ucrSaveDistance.ControlContentsChanged, ucrNudLat.ControlContentsChanged + Private Sub ucrReceiverLat_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverLat.ControlContentsChanged, ucrReceiverLong.ControlContentsChanged, ucrSaveDistance.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrInputLat_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLat.ControlValueChanged + If Not ucrInputLat.IsEmpty Then + clsConcFunction.AddParameter("lat", ucrInputLat.GetText, iPosition:=1, bIncludeArgumentName:=False) + Else + clsConcFunction.RemoveParameterByName("lat") + End If + End Sub + + Private Sub ucrInputLon_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLon.ControlValueChanged + If Not ucrInputLon.IsEmpty Then + clsConcFunction.AddParameter("lon", ucrInputLon.GetText, iPosition:=0, bIncludeArgumentName:=False) + Else + clsConcFunction.RemoveParameterByName("lon") + End If + End Sub + End Class \ No newline at end of file From cc91a9787c158bae1c418869731fadc1a46872e2 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Oct 2024 11:12:12 +0100 Subject: [PATCH 190/273] Tidying up anova_tables2 format --- instat/static/InstatObject/R/data_object_R6.R | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index ceb954340d9..94e08b3fd88 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4538,11 +4538,13 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total return_item <- NULL mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) anova_mod <- anova(mod)[1:end_col] %>% tibble::as_tibble(rownames = " ") + anova_mod$`F value` <- round(anova_mod$`F value`, 4) + if (sign_level) anova_mod$`Pr(>F)` <- format.pval(anova_mod$`Pr(>F)`, digits = 4, eps = 0.001) if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) return_item[[paste0("ANOVA table: ", formula_str, sep = "")]] <- anova_mod if(means){ if (class(mod$model[[x_col_names]]) == "numeric"){ - return_item[[paste0("Means table of ", y_col_name)]] <- mod$coefficients + return_item[["Model"]] <- mod$coefficients } else { return_item[[paste0("Means table of ", y_col_name)]] <- model.tables(aov(mod), type = "means") } From b27f3c44caa34254a170d2bac78793b4dd34b859 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 9 Oct 2024 14:23:44 +0300 Subject: [PATCH 191/273] changes to the code --- instat/dlgExportToClimsoft.Designer.vb | 152 +++++++++++++++++++------ instat/dlgExportToClimsoft.vb | 150 ++++++++++++++++++------ 2 files changed, 234 insertions(+), 68 deletions(-) diff --git a/instat/dlgExportToClimsoft.Designer.vb b/instat/dlgExportToClimsoft.Designer.vb index 936d119bb89..0c53cfe53be 100644 --- a/instat/dlgExportToClimsoft.Designer.vb +++ b/instat/dlgExportToClimsoft.Designer.vb @@ -27,10 +27,8 @@ Partial Class dlgExportToClimsoft Me.lblHour = New System.Windows.Forms.Label() Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() - Me.ucrChkExportDataFrame = New instat.ucrCheck() Me.ucrInputExportFile = New instat.ucrInputTextBox() Me.ucrSaveNewDataFrame = New instat.ucrSave() - Me.ucrChkNewDataFrame = New instat.ucrCheck() Me.ucrInputHour = New instat.ucrInputTextBox() Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverElements = New instat.ucrReceiverMultiple() @@ -41,6 +39,14 @@ Partial Class dlgExportToClimsoft Me.ucrPnlDailyHourly = New instat.UcrPanel() Me.ucrReceiverStationID = New instat.ucrReceiverSingle() Me.lblStationID = New System.Windows.Forms.Label() + Me.rdoExportData = New System.Windows.Forms.RadioButton() + Me.rdoNewDataFrame = New System.Windows.Forms.RadioButton() + Me.ucrReceiverComments = New instat.ucrReceiverSingle() + Me.ucrChkAddReport = New instat.ucrCheck() + Me.lblcomments = New System.Windows.Forms.Label() + Me.ucrDataFrameSheets = New instat.ucrDataFrame() + Me.ucrPnlOutput = New instat.UcrPanel() + Me.grpSave = New System.Windows.Forms.GroupBox() Me.SuspendLayout() ' 'lblElement @@ -77,7 +83,7 @@ Partial Class dlgExportToClimsoft ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(14, 566) + Me.lblExport.Location = New System.Drawing.Point(14, 654) Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(88, 20) @@ -87,7 +93,7 @@ Partial Class dlgExportToClimsoft 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(489, 558) + Me.cmdBrowse.Location = New System.Drawing.Point(489, 646) Me.cmdBrowse.Margin = New System.Windows.Forms.Padding(4) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(120, 34) @@ -95,23 +101,13 @@ Partial Class dlgExportToClimsoft Me.cmdBrowse.Text = "Browse" Me.cmdBrowse.UseVisualStyleBackColor = True ' - 'ucrChkExportDataFrame - ' - Me.ucrChkExportDataFrame.AutoSize = True - Me.ucrChkExportDataFrame.Checked = False - Me.ucrChkExportDataFrame.Location = New System.Drawing.Point(14, 459) - Me.ucrChkExportDataFrame.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkExportDataFrame.Name = "ucrChkExportDataFrame" - Me.ucrChkExportDataFrame.Size = New System.Drawing.Size(399, 34) - Me.ucrChkExportDataFrame.TabIndex = 13 - ' 'ucrInputExportFile ' Me.ucrInputExportFile.AddQuotesIfUnrecognised = True Me.ucrInputExportFile.AutoSize = True Me.ucrInputExportFile.IsMultiline = False Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(213, 560) + Me.ucrInputExportFile.Location = New System.Drawing.Point(213, 648) Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputExportFile.Name = "ucrInputExportFile" Me.ucrInputExportFile.Size = New System.Drawing.Size(273, 32) @@ -120,22 +116,12 @@ Partial Class dlgExportToClimsoft 'ucrSaveNewDataFrame ' Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(14, 513) + Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(14, 604) Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(522, 36) Me.ucrSaveNewDataFrame.TabIndex = 14 ' - 'ucrChkNewDataFrame - ' - Me.ucrChkNewDataFrame.AutoSize = True - Me.ucrChkNewDataFrame.Checked = False - Me.ucrChkNewDataFrame.Location = New System.Drawing.Point(14, 416) - Me.ucrChkNewDataFrame.Margin = New System.Windows.Forms.Padding(9) - Me.ucrChkNewDataFrame.Name = "ucrChkNewDataFrame" - Me.ucrChkNewDataFrame.Size = New System.Drawing.Size(399, 34) - Me.ucrChkNewDataFrame.TabIndex = 12 - ' 'ucrInputHour ' Me.ucrInputHour.AddQuotesIfUnrecognised = True @@ -152,7 +138,7 @@ Partial Class dlgExportToClimsoft ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 604) + Me.ucrBase.Location = New System.Drawing.Point(10, 688) Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) @@ -269,22 +255,118 @@ Partial Class dlgExportToClimsoft Me.lblStationID.TabIndex = 4 Me.lblStationID.Text = "Station ID:" ' + 'rdoExportData + ' + Me.rdoExportData.AutoSize = True + Me.rdoExportData.Location = New System.Drawing.Point(22, 421) + Me.rdoExportData.Margin = New System.Windows.Forms.Padding(4) + Me.rdoExportData.Name = "rdoExportData" + Me.rdoExportData.Size = New System.Drawing.Size(156, 24) + Me.rdoExportData.TabIndex = 94 + Me.rdoExportData.TabStop = True + Me.rdoExportData.Text = "Export Data (csv)" + Me.rdoExportData.UseVisualStyleBackColor = True + ' + 'rdoNewDataFrame + ' + Me.rdoNewDataFrame.AutoSize = True + Me.rdoNewDataFrame.Location = New System.Drawing.Point(22, 378) + Me.rdoNewDataFrame.Margin = New System.Windows.Forms.Padding(4) + Me.rdoNewDataFrame.Name = "rdoNewDataFrame" + Me.rdoNewDataFrame.Size = New System.Drawing.Size(154, 24) + Me.rdoNewDataFrame.TabIndex = 93 + Me.rdoNewDataFrame.TabStop = True + Me.rdoNewDataFrame.Text = "New Data Frame" + Me.rdoNewDataFrame.UseVisualStyleBackColor = True + ' + 'ucrReceiverComments + ' + Me.ucrReceiverComments.AutoSize = True + Me.ucrReceiverComments.frmParent = Me + Me.ucrReceiverComments.Location = New System.Drawing.Point(427, 557) + Me.ucrReceiverComments.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverComments.Name = "ucrReceiverComments" + Me.ucrReceiverComments.Selector = Nothing + Me.ucrReceiverComments.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverComments.strNcFilePath = "" + Me.ucrReceiverComments.TabIndex = 92 + Me.ucrReceiverComments.ucrSelector = Nothing + ' + 'ucrChkAddReport + ' + Me.ucrChkAddReport.AutoSize = True + Me.ucrChkAddReport.Checked = False + Me.ucrChkAddReport.Location = New System.Drawing.Point(8, 483) + Me.ucrChkAddReport.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkAddReport.Name = "ucrChkAddReport" + Me.ucrChkAddReport.Size = New System.Drawing.Size(315, 34) + Me.ucrChkAddReport.TabIndex = 91 + ' + 'lblcomments + ' + Me.lblcomments.AutoSize = True + Me.lblcomments.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblcomments.Location = New System.Drawing.Point(427, 531) + Me.lblcomments.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblcomments.Name = "lblcomments" + Me.lblcomments.Size = New System.Drawing.Size(90, 20) + Me.lblcomments.TabIndex = 90 + Me.lblcomments.Tag = "New_Name" + Me.lblcomments.Text = "Comments:" + ' + 'ucrDataFrameSheets + ' + Me.ucrDataFrameSheets.AutoSize = True + Me.ucrDataFrameSheets.bDropUnusedFilterLevels = False + Me.ucrDataFrameSheets.bUseCurrentFilter = True + Me.ucrDataFrameSheets.Location = New System.Drawing.Point(17, 524) + Me.ucrDataFrameSheets.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameSheets.Name = "ucrDataFrameSheets" + Me.ucrDataFrameSheets.Size = New System.Drawing.Size(226, 75) + Me.ucrDataFrameSheets.TabIndex = 89 + ' + 'ucrPnlOutput + ' + Me.ucrPnlOutput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlOutput.Location = New System.Drawing.Point(18, 377) + Me.ucrPnlOutput.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlOutput.Name = "ucrPnlOutput" + Me.ucrPnlOutput.Size = New System.Drawing.Size(226, 90) + Me.ucrPnlOutput.TabIndex = 95 + ' + 'grpSave + ' + Me.grpSave.Location = New System.Drawing.Point(12, 356) + Me.grpSave.Margin = New System.Windows.Forms.Padding(4) + Me.grpSave.Name = "grpSave" + Me.grpSave.Padding = New System.Windows.Forms.Padding(4) + Me.grpSave.Size = New System.Drawing.Size(248, 110) + Me.grpSave.TabIndex = 96 + Me.grpSave.TabStop = False + Me.grpSave.Text = "Save" + ' 'dlgExportToClimsoft ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(626, 690) + Me.ClientSize = New System.Drawing.Size(626, 775) + Me.Controls.Add(Me.rdoExportData) + Me.Controls.Add(Me.rdoNewDataFrame) + Me.Controls.Add(Me.ucrReceiverComments) + Me.Controls.Add(Me.ucrChkAddReport) + Me.Controls.Add(Me.lblcomments) + Me.Controls.Add(Me.ucrDataFrameSheets) + Me.Controls.Add(Me.ucrPnlOutput) + Me.Controls.Add(Me.grpSave) Me.Controls.Add(Me.lblStationID) Me.Controls.Add(Me.ucrReceiverStationID) Me.Controls.Add(Me.rdoDaily) Me.Controls.Add(Me.rdoHourly) - Me.Controls.Add(Me.ucrChkExportDataFrame) Me.Controls.Add(Me.lblExport) Me.Controls.Add(Me.cmdBrowse) Me.Controls.Add(Me.ucrInputExportFile) Me.Controls.Add(Me.ucrSaveNewDataFrame) - Me.Controls.Add(Me.ucrChkNewDataFrame) Me.Controls.Add(Me.lblHour) Me.Controls.Add(Me.ucrInputHour) Me.Controls.Add(Me.ucrBase) @@ -312,15 +394,21 @@ Partial Class dlgExportToClimsoft Friend WithEvents ucrBase As ucrButtons Friend WithEvents lblHour As Label Friend WithEvents ucrInputHour As ucrInputTextBox - Friend WithEvents ucrChkNewDataFrame As ucrCheck Friend WithEvents ucrSaveNewDataFrame As ucrSave Friend WithEvents lblExport As Label Friend WithEvents cmdBrowse As Button Friend WithEvents ucrInputExportFile As ucrInputTextBox - Friend WithEvents ucrChkExportDataFrame As ucrCheck Friend WithEvents rdoDaily As RadioButton Friend WithEvents rdoHourly As RadioButton Friend WithEvents ucrPnlDailyHourly As UcrPanel Friend WithEvents lblStationID As Label Friend WithEvents ucrReceiverStationID As ucrReceiverSingle + Friend WithEvents rdoExportData As RadioButton + Friend WithEvents rdoNewDataFrame As RadioButton + Friend WithEvents ucrReceiverComments As ucrReceiverSingle + Friend WithEvents ucrChkAddReport As ucrCheck + Friend WithEvents lblcomments As Label + Friend WithEvents ucrDataFrameSheets As ucrDataFrame + Friend WithEvents ucrPnlOutput As UcrPanel + Friend WithEvents grpSave As GroupBox End Class diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 887d4aa091f..69215091fcb 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -20,7 +20,7 @@ Imports instat.Translations Public Class dlgExportToClimsoft Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsPosixctFunction As New RFunction + Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsPosixctFunction, clsExportCommentsFunction As New RFunction Private clsPipeOperator As New ROperator Private Sub dlgExportToClimsoft_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -44,6 +44,26 @@ Public Class dlgExportToClimsoft ucrReceiverStationID.SetLinkedDisplayControl(lblStationID) ucrReceiverStationID.Selector = ucrSelectorImportToClimsoft + ucrDataFrameSheets.SetParameter(New RParameter("data_name", 0)) + ucrDataFrameSheets.SetParameterIsString() + + ucrReceiverComments.SetParameter(New RParameter("x", 1)) + ucrReceiverComments.SetParameterIsRFunction() + ucrReceiverComments.SetItemType("dataframe") + + ucrReceiverComments.SetLinkedDisplayControl(lblcomments) + + ucrPnlOutput.AddRadioButton(rdoNewDataFrame) + ucrPnlOutput.AddRadioButton(rdoExportData) + + ucrPnlOutput.AddParameterValuesCondition(rdoNewDataFrame, "check", "dataframe") + ucrPnlOutput.AddParameterValuesCondition(rdoExportData, "check", "export") + + ucrChkAddReport.SetText("Add Reports") + ucrChkAddReport.AddToLinkedControls({ucrReceiverComments, ucrDataFrameSheets, ucrInputExportFile}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddReport.AddParameterValuesCondition(True, "comments", "True") + ucrChkAddReport.AddParameterValuesCondition(False, "comments", "False") + ucrReceiverDate.SetParameter(New RParameter("date", 2)) ucrReceiverDate.SetParameterIsRFunction() ucrReceiverDate.SetClimaticType("date") @@ -64,16 +84,6 @@ Public Class dlgExportToClimsoft ucrReceiverElements.SetLinkedDisplayControl(lblElement) ucrReceiverElements.Selector = ucrSelectorImportToClimsoft - ucrChkNewDataFrame.SetText("New Data Frame Name") - ucrChkNewDataFrame.AddToLinkedControls(ucrSaveNewDataFrame, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkNewDataFrame.AddParameterValuesCondition(True, "dataframe", "True") - ucrChkNewDataFrame.AddParameterValuesCondition(False, "dataframe", "False") - - ucrChkExportDataFrame.SetText(" Export Data Frame(s)") - ucrChkExportDataFrame.AddToLinkedControls(ucrInputExportFile, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrChkExportDataFrame.AddParameterValuesCondition(True, "export", "True") - ucrChkExportDataFrame.AddParameterValuesCondition(False, "export", "False") - ucrSaveNewDataFrame.SetSaveTypeAsDataFrame() ucrSaveNewDataFrame.SetIsTextBox() ucrSaveNewDataFrame.SetLabelText("Data Frame Name:") @@ -92,6 +102,7 @@ Public Class dlgExportToClimsoft clsExportClimsoftFunction = New RFunction clsPasteFunction = New RFunction clsSprintfFunction = New RFunction + clsExportCommentsFunction = New RFunction clsPipeOperator = New ROperator ucrSelectorImportToClimsoft.Reset() @@ -101,6 +112,8 @@ Public Class dlgExportToClimsoft clsDummyFunction.AddParameter("dataframe", "True", iPosition:=0) clsDummyFunction.AddParameter("export", "False", iPosition:=1) clsDummyFunction.AddParameter("checked", "daily", iPosition:=2) + clsDummyFunction.AddParameter("value", "True", iPosition:=3) + clsDummyFunction.AddParameter("check", "dataframe", iPosition:=4) clsPosixctFunction.SetRCommand("as.POSIXct") clsPosixctFunction.AddParameter("x", clsRFunctionParameter:=clsPasteFunction, bIncludeArgumentName:=False, iPosition:=0) @@ -126,6 +139,9 @@ Public Class dlgExportToClimsoft clsSprintfFunction.SetRCommand("sprintf") clsSprintfFunction.AddParameter("hour", 6, iPosition:=1, bIncludeArgumentName:=False) + clsExportCommentsFunction.SetPackageName("rio") + clsExportCommentsFunction.SetRCommand("export") + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction, iPosition:=0) @@ -135,6 +151,8 @@ Public Class dlgExportToClimsoft End Sub Private Sub SetRCodeForControls(bReset As Boolean) + ucrInputExportFile.AddAdditionalCodeParameterPair(clsExportCommentsFunction, New RParameter("file", 0), iAdditionalPairNo:=1) + ucrReceiverDate.SetRCode(clsPasteFunction, bReset) ucrInputHour.SetRCode(clsSprintfFunction, bReset) ucrReceiverStationID.SetRCode(clsDataFrameFunction, bReset) @@ -142,21 +160,32 @@ Public Class dlgExportToClimsoft ucrInputExportFile.SetRCode(clsExportClimsoftFunction, bReset) ucrPnlDailyHourly.SetRCode(clsDummyFunction, bReset) If bReset Then - ucrChkExportDataFrame.SetRCode(clsDummyFunction, bReset) - ucrChkNewDataFrame.SetRCode(clsDummyFunction, bReset) + ucrPnlOutput.SetRCode(clsDummyFunction, bReset) + ucrChkAddReport.SetRCode(clsDummyFunction, bReset) + ucrReceiverComments.SetRCode(clsExportCommentsFunction, bReset) End If End Sub Private Sub TestOkEnabled() - ucrBase.OKEnabled(Not ucrReceiverDate.IsEmpty _ - AndAlso Not ucrReceiverElements.IsEmpty _ - AndAlso Not ucrReceiverStationID.IsEmpty - ) - If ucrChkNewDataFrame.Checked And Not ucrSaveNewDataFrame.IsComplete Then - ucrBase.OKEnabled(False) - End If - If ucrChkExportDataFrame.Checked And ucrInputExportFile.IsEmpty Then - ucrBase.OKEnabled(False) + + If rdoNewDataFrame.Checked Then + If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso ucrSaveNewDataFrame.IsComplete Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + ElseIf rdoExportData.Checked Then + If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + ElseIf ucrChkAddReport.Checked And rdoExportData.Checked Then + If Not ucrReceiverComments.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If End If End Sub @@ -181,10 +210,6 @@ Public Class dlgExportToClimsoft DataFrameAssignTo() End Sub - Private Sub ucrChkNewDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNewDataFrame.ControlValueChanged, ucrChkExportDataFrame.ControlValueChanged - SettingBaseFunction() - End Sub - Private Sub ucrReceiverElements_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElements.ControlValueChanged ucrBase.clsRsyntax.GetBeforeCodes().Clear() clsCurrentNewColumnFunction = ucrReceiverElements.GetVariables(True).Clone @@ -198,25 +223,38 @@ Public Class dlgExportToClimsoft End Sub Private Sub SettingBaseFunction() + cmdBrowse.Visible = False - If ucrChkNewDataFrame.Checked And ucrChkExportDataFrame.Checked Then - ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) - ucrBase.clsRsyntax.ClearCodes() - ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) - ucrBase.clsRsyntax.AddToAfterCodes(clsExportClimsoftFunction) - cmdBrowse.Visible = True - ElseIf ucrChkNewDataFrame.Checked AndAlso Not ucrChkExportDataFrame.Checked Then + If rdoNewDataFrame.Checked Then ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) ucrBase.clsRsyntax.GetAfterCodes().Clear() cmdBrowse.Visible = False + ucrInputExportFile.Visible = False - ElseIf ucrChkExportDataFrame.Checked AndAlso Not ucrChkNewDataFrame.Checked Then - ucrBase.clsRsyntax.GetBeforeCodes().Clear() + Else + ucrBase.clsRsyntax.GetAfterCodes().Clear() ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsExportClimsoftFunction) ucrBase.clsRsyntax.GetAfterCodes().Clear() cmdBrowse.Visible = True + ucrInputExportFile.Visible = True + End If + + If ucrChkAddReport.Checked AndAlso rdoExportData.Checked Then + ucrBase.clsRsyntax.ClearCodes() + ucrBase.clsRsyntax.SetBaseRFunction(clsExportCommentsFunction) + cmdBrowse.Visible = True + ucrInputExportFile.Visible = True + End If + End Sub + + Private Sub AddingComments() + If ucrDataFrameSheets.cboAvailableDataFrames.Text = ".comment" Then + ucrReceiverComments.SetText(ucrDataFrameSheets.cboAvailableDataFrames.Text) + Else + ucrReceiverComments.SetText("") End If + End Sub Private Sub SelectFileToSave() @@ -235,9 +273,19 @@ Public Class dlgExportToClimsoft End Using End Sub + Private Sub EnableDisableComments() + If rdoExportData.Checked Then + ucrChkAddReport.Enabled = True + Else + ucrChkAddReport.Enabled = False + ucrChkAddReport.Checked = False + End If + + End Sub + Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElements.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, - ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrChkExportDataFrame.ControlContentsChanged + ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged TestOkEnabled() End Sub @@ -246,6 +294,26 @@ Public Class dlgExportToClimsoft SelectFileToSave() End If SettingBaseFunction() + EnableDisableComments() + End Sub + + Private Sub ucrDataFrameSheets_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFrameSheets.ControlValueChanged + AddingComments() + End Sub + + Private Sub ucrReceiverComments_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverComments.ControlValueChanged + clsExportCommentsFunction.AddParameter("x", clsRFunctionParameter:=ucrDataFrameSheets.clsCurrDataFrame, iPosition:=1) + SettingBaseFunction() + End Sub + + Private Sub ucrChkAddReport_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddReport.ControlValueChanged + AddingComments() + If ucrChkAddReport.Checked Then + ucrInputExportFile.SetName("") + End If + SettingBaseFunction() + EnableDisableComments() + End Sub Private Sub ucrInputHour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHour.ControlValueChanged @@ -267,4 +335,14 @@ Public Class dlgExportToClimsoft clsPasteFunction.RemoveParameterByName("date_time") End If End Sub + + Private Sub ucrInputExportFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputExportFile.ControlValueChanged + EnableDisableComments() + End Sub + + Private Sub ucrPnlOutput_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOutput.ControlValueChanged + EnableDisableComments() + SettingBaseFunction() + End Sub + End Class \ No newline at end of file From a447e91be902b5b08f3ff1be2b0341ca873c7bbb Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Oct 2024 13:36:00 +0100 Subject: [PATCH 192/273] Update data_object_R6.R Removing lists to remove the square brackets, and adding cat to print --- instat/static/InstatObject/R/data_object_R6.R | 35 +++++++++++-------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 94e08b3fd88..c29a578edef 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4525,30 +4525,35 @@ DataSheet$set("public", "has_labels", function(col_names) { ) DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total = FALSE, signif.stars = FALSE, sign_level = FALSE, means = FALSE) { - if(missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") - if(sign_level || signif.stars) message("This is no longer descriptive") - if(sign_level) end_col = 5 else end_col = 4 - + if (missing(x_col_names) || missing(y_col_name)) stop("Both x_col_names and y_col_names are required") + if (sign_level || signif.stars) message("This is no longer descriptive") + if (sign_level) end_col = 5 else end_col = 4 + + # Construct the formula if (length(x_col_names) == 1) { - formula_str <- paste0( as.name(y_col_name), "~ ", as.name(x_col_names)) + formula_str <- paste0(as.name(y_col_name), "~ ", as.name(x_col_names)) } else if (length(x_col_names) > 1) { formula_str <- paste0(as.name(y_col_name), "~ ", as.name(paste(x_col_names, collapse = " + "))) } - return_item <- NULL + # Fit the model mod <- lm(formula = as.formula(formula_str), data = self$get_data_frame()) anova_mod <- anova(mod)[1:end_col] %>% tibble::as_tibble(rownames = " ") + + # Add the total row if requested + if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) anova_mod$`F value` <- round(anova_mod$`F value`, 4) if (sign_level) anova_mod$`Pr(>F)` <- format.pval(anova_mod$`Pr(>F)`, digits = 4, eps = 0.001) - if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) - return_item[[paste0("ANOVA table: ", formula_str, sep = "")]] <- anova_mod - if(means){ - if (class(mod$model[[x_col_names]]) == "numeric"){ - return_item[["Model"]] <- mod$coefficients - } else { - return_item[[paste0("Means table of ", y_col_name)]] <- model.tables(aov(mod), type = "means") - } + + # Optionally print means + if (means) { + if (class(mod$model[[x_col_names]]) == "numeric"){ + cat("Model coefficients:\n") + print(mod$coefficients) + } else { + cat(paste0("Means table of ", y_col_name, ":\n")) + print(model.tables(aov(mod), type = "means")) + } } - return(return_item) } ) From f9a6423290a9692141b5296f4cba0c90d60cb32e Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Wed, 9 Oct 2024 15:45:06 +0300 Subject: [PATCH 193/273] rounding off --- instat/dlgDistances.vb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/instat/dlgDistances.vb b/instat/dlgDistances.vb index 85693255f8b..0e3ccc3a91f 100644 --- a/instat/dlgDistances.vb +++ b/instat/dlgDistances.vb @@ -20,7 +20,7 @@ Imports instat.Translations Public Class dlgDistances Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsConcFunction, clsConc2Function, clsDummyFunction, clsDistFunction As New RFunction + Private clsConcFunction, clsRoundOffFunction, clsConc2Function, clsDummyFunction, clsDistFunction As New RFunction Private clsOpeningOperator, clsClosingOperator, clsConversionOperator As New ROperator Private Sub dlgDistances_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -85,6 +85,7 @@ Public Class dlgDistances clsConcFunction = New RFunction clsDistFunction = New RFunction clsDummyFunction = New RFunction + clsRoundOffFunction = New RFunction clsOpeningOperator = New ROperator clsClosingOperator = New ROperator clsConversionOperator = New ROperator @@ -118,9 +119,13 @@ Public Class dlgDistances clsConversionOperator.AddParameter("left", clsRFunctionParameter:=clsDistFunction, iPosition:=0) clsConversionOperator.AddParameter("right", "1000", iPosition:=1) + clsRoundOffFunction.SetRCommand("round") + clsRoundOffFunction.AddParameter("dec", clsROperatorParameter:=clsConversionOperator, iPosition:=0, bIncludeArgumentName:=False) + clsRoundOffFunction.AddParameter("two", 2, iPosition:=1, bIncludeArgumentName:=False) + ucrBase.clsRsyntax.SetAssignTo(strAssignToName:=ucrSaveDistance.GetText, strTempDataframe:=ucrSelectorDistance.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveDistance.GetText) - ucrBase.clsRsyntax.SetBaseROperator(clsConversionOperator) + ucrBase.clsRsyntax.SetBaseRFunction(clsRoundOffFunction) End Sub @@ -128,7 +133,7 @@ Public Class dlgDistances ucrInputLat.SetRCode(clsConcFunction, bReset) ucrInputLon.SetRCode(clsConcFunction, bReset) ucrPnlFrom.SetRCode(clsDummyFunction, bReset) - ucrSaveDistance.SetRCode(clsConversionOperator, bReset) + ucrSaveDistance.SetRCode(clsRoundOffFunction, bReset) If bReset Then ucrReceiverLong.SetRCode(clsConc2Function, bReset) ucrReceiverLat.SetRCode(clsConc2Function, bReset) From 04a1d4a038a54faa1555f88df5345f87d6d8f11b Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Oct 2024 14:14:39 +0100 Subject: [PATCH 194/273] Fixing sort_dataframe --- instat/static/InstatObject/R/data_object_R6.R | 45 +++++++++---------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index a92de3fcbd3..b8fde8f2682 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1428,36 +1428,35 @@ DataSheet$set("public", "get_column_factor_levels", function(col_name = "") { DataSheet$set("public", "sort_dataframe", function(col_names = c(), decreasing = FALSE, na.last = TRUE, by_row_names = FALSE, row_names_as_numeric = TRUE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - string <- list() - if(missing(col_names) || length(col_names) == 0) { - if(by_row_names) { - if(row_names_as_numeric) row_names_sort <- as.numeric(row.names(curr_data)) - else row_names_sort <- row.names(curr_data) - if(decreasing) self$set_data(arrange(curr_data, desc(row_names_sort))) + + # Check for missing or empty column names + if (missing(col_names) || length(col_names) == 0) { + if (by_row_names) { + row_names_sort <- if (row_names_as_numeric) as.numeric(row.names(curr_data)) else row.names(curr_data) + if (decreasing) self$set_data(arrange(curr_data, desc(row_names_sort))) else self$set_data(arrange(curr_data, row_names_sort)) + } else { + message("No sorting to be done.") } - else message("No sorting to be done.") - } - else { - col_names_exp = c() - i = 1 - for(col_name in col_names){ - if(!(col_name %in% names(curr_data))) { - stop(col_name, " is not a column in ", get_metadata(data_name_label)) + } else { + # Build the expressions using rlang for sorting columns + col_names_exp <- purrr::map(col_names, function(col_name) { + if (!(col_name %in% names(curr_data))) { + stop(col_name, " is not a column in the data.") } - if(decreasing) col_names_exp[[i]] <- lazyeval::interp(~ desc(var), var = as.name(col_name)) - else col_names_exp[[i]] <- lazyeval::interp(~ var, var = as.name(col_name)) - i = i + 1 - } - if(by_row_names) warning("Cannot sort by columns and row names. Sorting will be done by given columns only.") - #self$set_data(dplyr::arrange_(curr_data, .dots = col_names_exp)) - self$set_data(dplyr::arrange(curr_data, dplyr::across(dplyr::all_of(col_names_exp)))) + if (decreasing) dplyr::desc(rlang::sym(col_name)) else rlang::sym(col_name) + }) + + # Handle the case where sorting by row names and column names at the same time + if (by_row_names) warning("Cannot sort by columns and row names. Sorting will be done by given columns only.") + # Sort the data based on the expressions + self$set_data(dplyr::arrange(curr_data, !!!col_names_exp)) } self$data_changed <- TRUE } ) - + DataSheet$set("public", "convert_column_to_type", function(col_names = c(), to_type, factor_values = NULL, set_digits, set_decimals = FALSE, keep_attr = TRUE, ignore_labels = FALSE, keep.labels = TRUE) { if(!all(col_names %in% self$get_column_names())) stop("Some column names not found in the data") @@ -4542,4 +4541,4 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, signi if(means) return_item[[paste0("Means table of ", y_col_name)]] <- model.tables(aov(mod), type = "means") return(return_item) } -) \ No newline at end of file +) From 9ecd1d684c146cf70321b492d5af0bc1d0cd9ef0 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Oct 2024 18:26:31 +0100 Subject: [PATCH 195/273] actually returning the model! --- instat/static/InstatObject/R/data_object_R6.R | 1 + 1 file changed, 1 insertion(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index c29a578edef..7f26ab4edff 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4555,5 +4555,6 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total print(model.tables(aov(mod), type = "means")) } } + return(anova_mod) } ) From c2bebb2c18c6ef08d7721406d060feec63ce37d0 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Oct 2024 19:56:10 +0100 Subject: [PATCH 196/273] Amending anova_tables2 to print --- instat/static/InstatObject/R/data_object_R6.R | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 7f26ab4edff..1b0ec4ae000 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -4544,17 +4544,20 @@ DataSheet$set("public", "anova_tables2", function(x_col_names, y_col_name, total if (total) anova_mod <- anova_mod %>% tibble::add_row(` ` = "Total", dplyr::summarise(., across(where(is.numeric), sum))) anova_mod$`F value` <- round(anova_mod$`F value`, 4) if (sign_level) anova_mod$`Pr(>F)` <- format.pval(anova_mod$`Pr(>F)`, digits = 4, eps = 0.001) - + cat(paste0("ANOVA of ", formula_str, ":\n")) + print(anova_mod) + cat("\n") # Optionally print means if (means) { - if (class(mod$model[[x_col_names]]) == "numeric"){ + if (class(mod$model[[x_col_names]]) %in% c("numeric", "integer")){ cat("Model coefficients:\n") print(mod$coefficients) + cat("\n") } else { cat(paste0("Means table of ", y_col_name, ":\n")) print(model.tables(aov(mod), type = "means")) + cat("\n") } } - return(anova_mod) } ) From d3a4131b8e5ae532e95358b22b7ec55e2cf8c278 Mon Sep 17 00:00:00 2001 From: lilyclements Date: Wed, 9 Oct 2024 20:05:07 +0100 Subject: [PATCH 197/273] Update dlgDescribeTwoVariable.vb --- instat/dlgDescribeTwoVariable.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 05a3869d7c2..8da4fdbdc48 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -311,12 +311,12 @@ Public Class dlgDescribeTwoVariable clsCombineSwapAnova2Table.SetRCommand("c") clsMappingFunction.SetPackageName("purrr") - clsMappingFunction.SetRCommand("map") + clsMappingFunction.SetRCommand("walk") clsMappingFunction.AddParameter(".x", clsROperatorParameter:=clsYlistOperator, iPosition:=0) clsMappingFunction.AddParameter(".f", clsROperatorParameter:=clsAnovaTable2Operator, iPosition:=1) clsMapping2Function.SetPackageName("purrr") - clsMapping2Function.SetRCommand("map") + clsMapping2Function.SetRCommand("walk") clsMapping2Function.AddParameter(".x", clsROperatorParameter:=clsYlist2Operator, iPosition:=0) clsMapping2Function.AddParameter(".f", clsROperatorParameter:=clsAnovaSwapTable2Opeator, iPosition:=1) From d0a52cd4472817b46aca3cd2eaeaff8ac76715e0 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:58:15 +0100 Subject: [PATCH 198/273] Create release-build created new release builder for 64 bit only --- .github/workflows/release-build | 153 ++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) create mode 100644 .github/workflows/release-build diff --git a/.github/workflows/release-build b/.github/workflows/release-build new file mode 100644 index 00000000000..c6f87d027b4 --- /dev/null +++ b/.github/workflows/release-build @@ -0,0 +1,153 @@ + +name: Create Installers + + + +on: + workflow_dispatch: + inputs: + major_version: + description: 'Major Version' + required: true + minor_version: + description: 'Minor Version' + required: true + revision_no: + description: 'Revision' + required: true + +jobs: + + build: + + # running on 2019 so that .NET version 4.5 and lower can be used + runs-on: windows-2019 + + # set variables + env: + Solution_Name: Instat.sln + GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + + + # check out r-instat + steps: + + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild + - name: Setup MSBuild.exe + uses: microsoft/setup-msbuild@v1.1.3 + + # set up and restore NuGet packages + - name: Setup NuGet + uses: NuGet/setup-nuget@v1.1.1 + + - name: Restore NuGet + run: nuget restore $env:Solution_Name + + + # Restore the application to populate the obj folder with RuntimeIdentifiers + - name: Restore the application + run: msbuild $env:Solution_Name /t:Restore /p:Configuration=Release + + # increment build number + - name: Generate build number + uses: einaregilsson/build-number@v3 + with: + token: ${{secrets.github_token}} + + #update version numbers in assembley + - name: set-version-assemblyinfo + uses: dannevesdantas/set-version-assemblyinfo@v.1.0.0 + with: + # Folder location to search for AssemblyInfo.cs/.vb files + path: instat\My Project\AssemblyInfo.vb + # optional, default is ${{ github.workspace }} + # Version number to set on [AssemblyVersion] and [AssemblyFileVersion] attributes of AssemblyInfo.cs/.vb files + version: "${{ inputs.major_version }}.${{ inputs.minor_version }}.${{ inputs.revision_no }}.${env:BUILD_NUMBER}" + + # Create the app package by building and packaging the Windows Application Packaging project + # 64bit + - name: Create the app package 64 bit + run: msbuild $env:Solution_Name /p:Configuration=Release /p:Platform=x64 /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + env: + Appx_Bundle: Always + Appx_Package_Build_Mode: StoreUpload + Configuration: ${{ matrix.configuration }} + + # Build 64 bit installer without R + - name: Building the installer 64bit - No R + run: | + "%programfiles(x86)%\Inno Setup 6\iscc.exe" "inno_install_script_64bit.iss" + shell: cmd + + # Upload 64 bit installer without R + - name: Upload the 64 bit installer as an artifact + uses: actions/upload-artifact@v4 + if: ${{ github.event_name != 'pull_request' }} + with: + path: "Output/" + name: rinstat64NoR + + - name: Remove 64 bit without R installer + run: | + del "Output/*" + + # check out R-Instat Data + - name: Checkout Instat Data + uses: actions/checkout@v3 + with: + repository: ' africanmathsinitiative/R-Instat-Data' + fetch-depth: 0 + path: 'InstatData' + + # Create directory and copy over InstatData (64bit) + - name: Make Library directory 64 bit + run: | + MKDIR instat\bin\x64\Release\static\Library\ + + - name: Copy R-Instat Data 64 bit + run: | + ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E + continue-on-error: true + + # check out R for R-Instat + - name: Checkout R for R-Instat + uses: actions/checkout@v3 + with: + repository: 'ChrisMarsh82/R-RInstat' + fetch-depth: 0 + path: 'R-RInstat' + + - name: Copy R 64 bit + run: | + ROBOCOPY R-RInstat\64Bit\ instat\bin\x64\Release\static\ /E + continue-on-error: true + + - name: Set R-tools + uses: r-windows/install-rtools@master + + - name: Install R packages (64 bit) + run: | + "instat\bin\x64\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R" + shell: cmd + + - name: Building the installer 64bit - With R + run: | + "%programfiles(x86)%\Inno Setup 6\iscc.exe" "inno_install_script_64bit.iss" + shell: cmd + + - name: Upload the 64 bit installer with R as an artifact + uses: actions/upload-artifact@v4 + if: ${{ github.event_name != 'pull_request' }} + with: + path: "Output/" + name: rinstat64WithR-innosetup + + - name: Remove 64 bit release files to free up space + run: | + Remove-Item "instat\bin\x64\Release\" -Recurse + From 8b3df7bf695a3541482709565a059bf44736d3e0 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:40:03 +0100 Subject: [PATCH 199/273] Update release-build --- .github/workflows/release-build | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-build b/.github/workflows/release-build index c6f87d027b4..b84b29cf0e5 100644 --- a/.github/workflows/release-build +++ b/.github/workflows/release-build @@ -15,6 +15,10 @@ on: revision_no: description: 'Revision' required: true + r-version: + description: 'Specify the R version to install' + required: true + default: '4.4.1' # Default version if the user does not specify jobs: @@ -113,7 +117,13 @@ jobs: run: | ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E continue-on-error: true - + + # Install R + - name: Set up R + uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ inputs-version }} + # check out R for R-Instat - name: Checkout R for R-Instat uses: actions/checkout@v3 @@ -124,7 +134,7 @@ jobs: - name: Copy R 64 bit run: | - ROBOCOPY R-RInstat\64Bit\ instat\bin\x64\Release\static\ /E + ROBOCOPY R\ instat\bin\x64\Release\static\ /E continue-on-error: true - name: Set R-tools From 396a709496698bf6784e6dee75e6440441f31b03 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:54:25 +0100 Subject: [PATCH 200/273] Create Rprofile.site --- installer/Rprofile.site | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 installer/Rprofile.site diff --git a/installer/Rprofile.site b/installer/Rprofile.site new file mode 100644 index 00000000000..c12ffddf743 --- /dev/null +++ b/installer/Rprofile.site @@ -0,0 +1,25 @@ +# Things you might want to change + +# options(papersize="a4") +# options(editor="notepad") +# options(pager="internal") + +# set the default help type +# options(help_type="text") + options(help_type="html") + +# set a site library +# .Library.site <- file.path(chartr("\\", "/", R.home()), "site-library") + +# Only use internal library +if (length(.libPaths()) == 2) .libPaths(.libPaths()[2]) + +# set a CRAN mirror +# local({r <- getOption("repos") +# r["CRAN"] <- "http://my.local.cran" +# options(repos=r)}) + +# Give a fortune cookie, but only to interactive sessions +# (This would need the fortunes package to be installed.) +# if (interactive()) +# fortunes::fortune() From 2f4f3f26827190d1a1541cd52cd1810048e6d73d Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:58:00 +0100 Subject: [PATCH 201/273] Update release-build --- .github/workflows/release-build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-build b/.github/workflows/release-build index b84b29cf0e5..dde45f0d611 100644 --- a/.github/workflows/release-build +++ b/.github/workflows/release-build @@ -132,10 +132,15 @@ jobs: fetch-depth: 0 path: 'R-RInstat' + - name: Update Rprofile.site + run: | + ROBOCOPY R-Instat\Installer\Rprofile.site R\etc\ /E + continue-on-error: true + - name: Copy R 64 bit run: | ROBOCOPY R\ instat\bin\x64\Release\static\ /E - continue-on-error: true + continue-on-error: true - name: Set R-tools uses: r-windows/install-rtools@master From 4bdab88336dc0c250c45307eceaa8f896110fb04 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:59:05 +0100 Subject: [PATCH 202/273] Rename release-build to release-build.yml --- .github/workflows/{release-build => release-build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{release-build => release-build.yml} (100%) diff --git a/.github/workflows/release-build b/.github/workflows/release-build.yml similarity index 100% rename from .github/workflows/release-build rename to .github/workflows/release-build.yml From 069b60b240673251969a10c6631f7b79b588c3e9 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:01:22 +0100 Subject: [PATCH 203/273] Update release-build.yml --- .github/workflows/release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index dde45f0d611..a0872e8709a 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -122,7 +122,7 @@ jobs: - name: Set up R uses: r-lib/actions/setup-r@v2 with: - r-version: ${{ inputs-version }} + r-version: ${{ inputs.r-version }} # check out R for R-Instat - name: Checkout R for R-Instat From 6c86c89a36b2352872b4baa28db1059ec6791e50 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:26:50 +0100 Subject: [PATCH 204/273] Update release-build.yml --- .github/workflows/release-build.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index a0872e8709a..7bebe35d8b7 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -124,13 +124,9 @@ jobs: with: r-version: ${{ inputs.r-version }} - # check out R for R-Instat - - name: Checkout R for R-Instat - uses: actions/checkout@v3 - with: - repository: 'ChrisMarsh82/R-RInstat' - fetch-depth: 0 - path: 'R-RInstat' + - name: Print R Home directory + run: | + Rscript -e 'cat(R.home())' - name: Update Rprofile.site run: | From 1c8744aec70c9c0c12c0d630e403f3fd87f958b2 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:42:14 +0100 Subject: [PATCH 205/273] Update release-build.yml --- .github/workflows/release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 7bebe35d8b7..f257fba9ded 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -130,7 +130,7 @@ jobs: - name: Update Rprofile.site run: | - ROBOCOPY R-Instat\Installer\Rprofile.site R\etc\ /E + ROBOCOPY installer\Rprofile.site R\etc\ /E continue-on-error: true - name: Copy R 64 bit From e2192d8898ce0e637e904b2befa81fa319522265 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 10:53:24 +0100 Subject: [PATCH 206/273] Update release-build.yml --- .github/workflows/release-build.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index f257fba9ded..cc06d0b5cc6 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -41,6 +41,12 @@ jobs: with: fetch-depth: 0 + # Install R + - name: Set up R + uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ inputs.r-version }} + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.1.3 @@ -118,11 +124,7 @@ jobs: ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E continue-on-error: true - # Install R - - name: Set up R - uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ inputs.r-version }} + - name: Print R Home directory run: | From ccb77b098460d7c33532b4c9af76b821ba5220d0 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:13:44 +0100 Subject: [PATCH 207/273] Update release-build.yml --- .github/workflows/release-build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index cc06d0b5cc6..8f0cff4b340 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -126,9 +126,11 @@ jobs: - - name: Print R Home directory + - name: Debug paths run: | - Rscript -e 'cat(R.home())' + $R_HOME=$(Rscript -e 'cat(R.home())') + echo "R_HOME path: $R_HOME" + echo "Source path: $(pwd)\installer\Rprofile.site" - name: Update Rprofile.site run: | From b0ee63dc407c9fcff084070ed92e0f1a245e375a Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:22:21 +0100 Subject: [PATCH 208/273] Update release-build.yml --- .github/workflows/release-build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 8f0cff4b340..dd9fcf9442e 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -134,8 +134,9 @@ jobs: - name: Update Rprofile.site run: | - ROBOCOPY installer\Rprofile.site R\etc\ /E - continue-on-error: true + $R_HOME=$(Rscript -e 'cat(R.home())') + ROBOCOPY installer\Rprofile.site "$R_HOME\etc" /E + continue-on-error: true - name: Copy R 64 bit run: | From ec536dfbb1470a29b80d4bd1adf5e2e5b32db027 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:34:01 +0100 Subject: [PATCH 209/273] Update release-build.yml --- .github/workflows/release-build.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index dd9fcf9442e..a5c89029be7 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -135,13 +135,14 @@ jobs: - name: Update Rprofile.site run: | $R_HOME=$(Rscript -e 'cat(R.home())') - ROBOCOPY installer\Rprofile.site "$R_HOME\etc" /E + ROBOCOPY installer\Rprofile.site "$R_HOME\etc" /COPY:DAT continue-on-error: true - name: Copy R 64 bit run: | - ROBOCOPY R\ instat\bin\x64\Release\static\ /E - continue-on-error: true + $R_HOME=$(Rscript -e 'cat(R.home())') + ROBOCOPY "$R_HOME\bin\x64" "instat\bin\x64\Release\static" /E + continue-on-error: true - name: Set R-tools uses: r-windows/install-rtools@master From 1c600be2a698c6b7fd88ff84a8e0f1b33a17b49c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Fri, 11 Oct 2024 13:53:56 +0300 Subject: [PATCH 210/273] changes --- instat/dlgDescribeTwoVariable.Designer.vb | 166 +++++++++++----------- instat/dlgDescribeTwoVariable.vb | 30 ---- 2 files changed, 83 insertions(+), 113 deletions(-) diff --git a/instat/dlgDescribeTwoVariable.Designer.vb b/instat/dlgDescribeTwoVariable.Designer.vb index 19da042aa30..fe9da77487d 100644 --- a/instat/dlgDescribeTwoVariable.Designer.vb +++ b/instat/dlgDescribeTwoVariable.Designer.vb @@ -60,8 +60,6 @@ Partial Class dlgDescribeTwoVariable Me.cmdSummaries = New System.Windows.Forms.Button() Me.lblMarginName = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() - Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() - Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.rdoOCol = New System.Windows.Forms.RadioButton() Me.rdoOCell = New System.Windows.Forms.RadioButton() Me.rdoORow = New System.Windows.Forms.RadioButton() @@ -72,6 +70,8 @@ Partial Class dlgDescribeTwoVariable Me.ucrReceiverSecondTwoVariableFactor = New instat.ucrReceiverSingle() Me.ucrReceiverFirstVars = New instat.ucrReceiverMultiple() Me.ucrSaveTable = New instat.ucrSave() + Me.ucrReceiverColumns = New instat.ucrReceiverMultiple() + Me.ucrChkDisplayAsPercentage = New instat.ucrCheck() Me.ucrInputMarginName = New instat.ucrInputTextBox() Me.ucrReorderSummary = New instat.ucrReorder() Me.ucrBase = New instat.ucrButtons() @@ -82,11 +82,11 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkDisplayMargins = New instat.ucrCheck() Me.ucrChkSummariesRowCol = New instat.ucrCheck() Me.ucrChkLevSig = New instat.ucrCheck() + Me.ucrChkTotal = New instat.ucrCheck() Me.ucrChkMeans = New instat.ucrCheck() - Me.ucrChkOmitMissing = New instat.ucrCheck() - Me.ucrChkSwapXYVar = New instat.ucrCheck() Me.ucrChkCorrelations = New instat.ucrCheck() - Me.ucrChkTotal = New instat.ucrCheck() + Me.ucrChkSwapXYVar = New instat.ucrCheck() + Me.ucrChkOmitMissing = New instat.ucrCheck() Me.grpSummaries.SuspendLayout() Me.grpDisplay.SuspendLayout() Me.SuspendLayout() @@ -100,7 +100,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoThreeVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoThreeVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoThreeVariable.Location = New System.Drawing.Point(432, 12) - Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoThreeVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoThreeVariable.Name = "rdoThreeVariable" Me.rdoThreeVariable.Size = New System.Drawing.Size(150, 42) Me.rdoThreeVariable.TabIndex = 3 @@ -112,8 +112,8 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdFormatTable.Enabled = False Me.cmdFormatTable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFormatTable.Location = New System.Drawing.Point(489, 642) - Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFormatTable.Location = New System.Drawing.Point(489, 645) + Me.cmdFormatTable.Margin = New System.Windows.Forms.Padding(4) Me.cmdFormatTable.Name = "cmdFormatTable" Me.cmdFormatTable.Size = New System.Drawing.Size(156, 34) Me.cmdFormatTable.TabIndex = 23 @@ -135,7 +135,7 @@ Partial Class dlgDescribeTwoVariable ' Me.cmdMissingOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdMissingOptions.Location = New System.Drawing.Point(538, 440) - Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdMissingOptions.Margin = New System.Windows.Forms.Padding(4) Me.cmdMissingOptions.Name = "cmdMissingOptions" Me.cmdMissingOptions.Size = New System.Drawing.Size(158, 34) Me.cmdMissingOptions.TabIndex = 21 @@ -175,9 +175,9 @@ Partial Class dlgDescribeTwoVariable Me.grpSummaries.Controls.Add(Me.lblBy) Me.grpSummaries.Controls.Add(Me.lblSecondType) Me.grpSummaries.Location = New System.Drawing.Point(16, 328) - Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Margin = New System.Windows.Forms.Padding(4) Me.grpSummaries.Name = "grpSummaries" - Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpSummaries.Padding = New System.Windows.Forms.Padding(4) Me.grpSummaries.Size = New System.Drawing.Size(315, 108) Me.grpSummaries.TabIndex = 17 Me.grpSummaries.TabStop = False @@ -276,7 +276,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoSkim.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoSkim.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoSkim.Location = New System.Drawing.Point(142, 12) - Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoSkim.Margin = New System.Windows.Forms.Padding(4) Me.rdoSkim.Name = "rdoSkim" Me.rdoSkim.Size = New System.Drawing.Size(150, 42) Me.rdoSkim.TabIndex = 1 @@ -315,7 +315,7 @@ Partial Class dlgDescribeTwoVariable Me.rdoTwoVariable.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoTwoVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoTwoVariable.Location = New System.Drawing.Point(286, 12) - Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoTwoVariable.Margin = New System.Windows.Forms.Padding(4) Me.rdoTwoVariable.Name = "rdoTwoVariable" Me.rdoTwoVariable.Size = New System.Drawing.Size(150, 42) Me.rdoTwoVariable.TabIndex = 2 @@ -326,8 +326,8 @@ Partial Class dlgDescribeTwoVariable 'cmdSummaries ' Me.cmdSummaries.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSummaries.Location = New System.Drawing.Point(465, 363) - Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdSummaries.Location = New System.Drawing.Point(465, 372) + Me.cmdSummaries.Margin = New System.Windows.Forms.Padding(4) Me.cmdSummaries.Name = "cmdSummaries" Me.cmdSummaries.Size = New System.Drawing.Size(180, 34) Me.cmdSummaries.TabIndex = 1 @@ -351,37 +351,14 @@ Partial Class dlgDescribeTwoVariable Me.grpDisplay.Controls.Add(Me.ucrReceiverColumns) Me.grpDisplay.Controls.Add(Me.ucrChkDisplayAsPercentage) Me.grpDisplay.Location = New System.Drawing.Point(414, 278) - Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Margin = New System.Windows.Forms.Padding(4) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpDisplay.Padding = New System.Windows.Forms.Padding(4) Me.grpDisplay.Size = New System.Drawing.Size(291, 219) Me.grpDisplay.TabIndex = 15 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Percentages" ' - 'ucrReceiverColumns - ' - Me.ucrReceiverColumns.AutoSize = True - Me.ucrReceiverColumns.frmParent = Me - Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) - Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumns.Name = "ucrReceiverColumns" - Me.ucrReceiverColumns.Selector = Nothing - Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) - Me.ucrReceiverColumns.strNcFilePath = "" - Me.ucrReceiverColumns.TabIndex = 55 - Me.ucrReceiverColumns.ucrSelector = Nothing - ' - 'ucrChkDisplayAsPercentage - ' - Me.ucrChkDisplayAsPercentage.AutoSize = True - Me.ucrChkDisplayAsPercentage.Checked = False - Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) - Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" - Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) - Me.ucrChkDisplayAsPercentage.TabIndex = 54 - ' 'rdoOCol ' Me.rdoOCol.AutoSize = True @@ -498,6 +475,29 @@ Partial Class dlgDescribeTwoVariable Me.ucrSaveTable.Size = New System.Drawing.Size(459, 36) Me.ucrSaveTable.TabIndex = 24 ' + 'ucrReceiverColumns + ' + Me.ucrReceiverColumns.AutoSize = True + Me.ucrReceiverColumns.frmParent = Nothing + Me.ucrReceiverColumns.Location = New System.Drawing.Point(20, 92) + Me.ucrReceiverColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverColumns.Name = "ucrReceiverColumns" + Me.ucrReceiverColumns.Selector = Nothing + Me.ucrReceiverColumns.Size = New System.Drawing.Size(180, 122) + Me.ucrReceiverColumns.strNcFilePath = "" + Me.ucrReceiverColumns.TabIndex = 55 + Me.ucrReceiverColumns.ucrSelector = Nothing + ' + 'ucrChkDisplayAsPercentage + ' + Me.ucrChkDisplayAsPercentage.AutoSize = True + Me.ucrChkDisplayAsPercentage.Checked = False + Me.ucrChkDisplayAsPercentage.Location = New System.Drawing.Point(14, 22) + Me.ucrChkDisplayAsPercentage.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrChkDisplayAsPercentage.Name = "ucrChkDisplayAsPercentage" + Me.ucrChkDisplayAsPercentage.Size = New System.Drawing.Size(171, 51) + Me.ucrChkDisplayAsPercentage.TabIndex = 54 + ' 'ucrInputMarginName ' Me.ucrInputMarginName.AddQuotesIfUnrecognised = True @@ -505,15 +505,15 @@ Partial Class dlgDescribeTwoVariable Me.ucrInputMarginName.IsMultiline = False Me.ucrInputMarginName.IsReadOnly = False Me.ucrInputMarginName.Location = New System.Drawing.Point(171, 477) - Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14, 14, 14, 14) + Me.ucrInputMarginName.Margin = New System.Windows.Forms.Padding(14) Me.ucrInputMarginName.Name = "ucrInputMarginName" Me.ucrInputMarginName.Size = New System.Drawing.Size(206, 32) Me.ucrInputMarginName.TabIndex = 22 ' 'ucrReorderSummary ' - Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 403) - Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrReorderSummary.Location = New System.Drawing.Point(412, 409) + Me.ucrReorderSummary.Margin = New System.Windows.Forms.Padding(9) Me.ucrReorderSummary.Name = "ucrReorderSummary" Me.ucrReorderSummary.Size = New System.Drawing.Size(291, 234) Me.ucrReorderSummary.TabIndex = 16 @@ -525,7 +525,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(22, 734) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(6) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(611, 77) Me.ucrBase.TabIndex = 25 @@ -559,7 +559,7 @@ Partial Class dlgDescribeTwoVariable ' Me.ucrPnlDescribe.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlDescribe.Location = New System.Drawing.Point(138, 4) - Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrPnlDescribe.Margin = New System.Windows.Forms.Padding(9) Me.ucrPnlDescribe.Name = "ucrPnlDescribe" Me.ucrPnlDescribe.Size = New System.Drawing.Size(476, 51) Me.ucrPnlDescribe.TabIndex = 0 @@ -582,7 +582,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkDisplayMargins.AutoSize = True Me.ucrChkDisplayMargins.Checked = False Me.ucrChkDisplayMargins.Location = New System.Drawing.Point(26, 444) - Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkDisplayMargins.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkDisplayMargins.Name = "ucrChkDisplayMargins" Me.ucrChkDisplayMargins.Size = New System.Drawing.Size(214, 34) Me.ucrChkDisplayMargins.TabIndex = 18 @@ -592,7 +592,7 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkSummariesRowCol.AutoSize = True Me.ucrChkSummariesRowCol.Checked = False Me.ucrChkSummariesRowCol.Location = New System.Drawing.Point(22, 507) - Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkSummariesRowCol.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSummariesRowCol.Name = "ucrChkSummariesRowCol" Me.ucrChkSummariesRowCol.Size = New System.Drawing.Size(270, 34) Me.ucrChkSummariesRowCol.TabIndex = 20 @@ -602,60 +602,60 @@ Partial Class dlgDescribeTwoVariable Me.ucrChkLevSig.AutoSize = True Me.ucrChkLevSig.Checked = False Me.ucrChkLevSig.Location = New System.Drawing.Point(596, 279) - Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkLevSig.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkLevSig.Name = "ucrChkLevSig" Me.ucrChkLevSig.Size = New System.Drawing.Size(129, 34) Me.ucrChkLevSig.TabIndex = 38 ' + 'ucrChkTotal + ' + Me.ucrChkTotal.AutoSize = True + Me.ucrChkTotal.Checked = False + Me.ucrChkTotal.Location = New System.Drawing.Point(465, 279) + Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkTotal.Name = "ucrChkTotal" + Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) + Me.ucrChkTotal.TabIndex = 44 + ' 'ucrChkMeans ' Me.ucrChkMeans.AutoSize = True Me.ucrChkMeans.Checked = False - Me.ucrChkMeans.Location = New System.Drawing.Point(450, 309) - Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkMeans.Location = New System.Drawing.Point(465, 312) + Me.ucrChkMeans.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkMeans.Name = "ucrChkMeans" Me.ucrChkMeans.Size = New System.Drawing.Size(146, 34) Me.ucrChkMeans.TabIndex = 37 ' - 'ucrChkOmitMissing + 'ucrChkCorrelations ' - Me.ucrChkOmitMissing.AutoSize = True - Me.ucrChkOmitMissing.Checked = False - Me.ucrChkOmitMissing.Location = New System.Drawing.Point(450, 412) - Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" - Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) - Me.ucrChkOmitMissing.TabIndex = 0 + Me.ucrChkCorrelations.AutoSize = True + Me.ucrChkCorrelations.Checked = False + Me.ucrChkCorrelations.Location = New System.Drawing.Point(465, 381) + Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkCorrelations.Name = "ucrChkCorrelations" + Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) + Me.ucrChkCorrelations.TabIndex = 35 ' 'ucrChkSwapXYVar ' Me.ucrChkSwapXYVar.AutoSize = True Me.ucrChkSwapXYVar.Checked = False - Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(450, 338) - Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) + Me.ucrChkSwapXYVar.Location = New System.Drawing.Point(465, 347) + Me.ucrChkSwapXYVar.Margin = New System.Windows.Forms.Padding(9) Me.ucrChkSwapXYVar.Name = "ucrChkSwapXYVar" Me.ucrChkSwapXYVar.Size = New System.Drawing.Size(236, 34) Me.ucrChkSwapXYVar.TabIndex = 36 ' - 'ucrChkCorrelations - ' - Me.ucrChkCorrelations.AutoSize = True - Me.ucrChkCorrelations.Checked = False - Me.ucrChkCorrelations.Location = New System.Drawing.Point(450, 374) - Me.ucrChkCorrelations.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrChkCorrelations.Name = "ucrChkCorrelations" - Me.ucrChkCorrelations.Size = New System.Drawing.Size(224, 34) - Me.ucrChkCorrelations.TabIndex = 35 - ' - 'ucrChkTotal + 'ucrChkOmitMissing ' - Me.ucrChkTotal.AutoSize = True - Me.ucrChkTotal.Checked = False - Me.ucrChkTotal.Location = New System.Drawing.Point(450, 279) - Me.ucrChkTotal.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrChkTotal.Name = "ucrChkTotal" - Me.ucrChkTotal.Size = New System.Drawing.Size(146, 34) - Me.ucrChkTotal.TabIndex = 44 + Me.ucrChkOmitMissing.AutoSize = True + Me.ucrChkOmitMissing.Checked = False + Me.ucrChkOmitMissing.Location = New System.Drawing.Point(465, 416) + Me.ucrChkOmitMissing.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkOmitMissing.Name = "ucrChkOmitMissing" + Me.ucrChkOmitMissing.Size = New System.Drawing.Size(214, 34) + Me.ucrChkOmitMissing.TabIndex = 0 ' 'dlgDescribeTwoVariable ' @@ -696,15 +696,15 @@ Partial Class dlgDescribeTwoVariable Me.Controls.Add(Me.ucrChkDisplayMargins) Me.Controls.Add(Me.cmdMissingOptions) Me.Controls.Add(Me.ucrChkSummariesRowCol) - Me.Controls.Add(Me.ucrChkSwapXYVar) - Me.Controls.Add(Me.ucrChkCorrelations) - Me.Controls.Add(Me.ucrChkOmitMissing) Me.Controls.Add(Me.lblThirdVariable) - Me.Controls.Add(Me.ucrChkMeans) Me.Controls.Add(Me.ucrChkLevSig) Me.Controls.Add(Me.ucrChkTotal) + Me.Controls.Add(Me.ucrChkCorrelations) + Me.Controls.Add(Me.ucrChkSwapXYVar) + Me.Controls.Add(Me.ucrChkMeans) + Me.Controls.Add(Me.ucrChkOmitMissing) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgDescribeTwoVariable" diff --git a/instat/dlgDescribeTwoVariable.vb b/instat/dlgDescribeTwoVariable.vb index 8da4fdbdc48..7c0bf0f82d2 100644 --- a/instat/dlgDescribeTwoVariable.vb +++ b/instat/dlgDescribeTwoVariable.vb @@ -643,11 +643,6 @@ Public Class dlgDescribeTwoVariable ucrChkSwapXYVar.Visible = IsNumericByNumeric() OrElse IsFactorByNumeric() ucrChkCorrelations.Visible = IsNumericByNumeric() cmdMissingOptions.Visible = ucrChkOmitMissing.Checked - 'ElseIf rdoThreeVariable.Checked Then - ' ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() - 'Else - ' ucrChkOmitMissing.Visible = False - ' cmdMissingOptions.Visible = False End If If rdoThreeVariable.Checked Then If IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() Then @@ -658,8 +653,6 @@ Public Class dlgDescribeTwoVariable cmdSummaries.Visible = False End If ucrChkSwapXYVar.Visible = IsNumericByNumericByNumeric() OrElse IsNumericByNumericByFactor() - 'ucrChkDisplayMargins.Visible = IsFactorByFactorByFactor() - 'ucrInputMarginName.Visible = ucrChkDisplayMargins.Checked AndAlso IsFactorByFactorByFactor() ucrChkSummariesRowCol.Visible = IsFactorByFactorByNumeric() OrElse IsFactorByNumericByFactor() ucrChkOmitMissing.Visible = IsFactorByNumericByNumeric() OrElse IsNumericByNumericByFactor() End If @@ -856,22 +849,6 @@ Public Class dlgDescribeTwoVariable ucrSaveTable.Visible = True ucrChkSummariesRowCol.Visible = True ucrSaveTable.Location = New Point(23, 440) - 'ElseIf IsFactorByFactorByNumeric Then - ' ucrReorderSummary.Visible = True - ' cmdSummaries.Visible = True - ' ucrSaveTable.Visible = True - ' ucrChkSummariesRowCol.Visible = True - ' ucrSaveTable.Location = New Point(23, 440) - ' ucrBase.clsRsyntax.SetBaseROperator(clsJoiningPipeOperator) - ' ucrSaveTable.SetPrefix("summary_table") - ' ucrSaveTable.SetSaveType(RObjectTypeLabel.Table, strRObjectFormat:=RObjectFormat.Html) - ' ucrSaveTable.SetAssignToIfUncheckedValue("last_table") - ' ucrSaveTable.SetCheckBoxText("Save Table") - ' clsJoiningPipeOperator.SetAssignToOutputObject(strRObjectToAssignTo:="last_table", - ' strRObjectTypeLabelToAssignTo:=RObjectTypeLabel.Table, - ' strRObjectFormatToAssignTo:=RObjectFormat.Html, - ' strRDataFrameNameToAddObjectTo:=ucrSelectorDescribeTwoVar.strCurrentDataFrame, - ' strObjectName:="last_table") End If End If FactorColumns() @@ -1230,13 +1207,6 @@ Public Class dlgDescribeTwoVariable Private Sub AddRemoveThirdAnovaParam() If rdoThreeVariable.Checked Then If Not ucrReceiverThreeVariableThirdVariable.IsEmpty Then - 'If IsNumericByNumericByFactor() Then - ' ' If ucrChkSwapXYVar.Checked Then - ' ' clsCombineSwapAnova2Table.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) - ' ' Else - ' ' clsCombineAnova2Function.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) - - ' ' End If If IsNumericByNumericByFactor() OrElse IsNumericByNumericByNumeric() OrElse IsNumericByFactorByFactor() OrElse IsNumericByFactorByNumeric() Then clsCombineAnova2Function.AddParameter("y", ucrReceiverThreeVariableThirdVariable.GetVariableNames(True), iPosition:=2, bIncludeArgumentName:=False) Else From c2165671cb0dbde072aed676a2ded20283d5c48b Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 11:54:59 +0100 Subject: [PATCH 211/273] Update release-build.yml --- .github/workflows/release-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index a5c89029be7..779c405f2d0 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -135,13 +135,13 @@ jobs: - name: Update Rprofile.site run: | $R_HOME=$(Rscript -e 'cat(R.home())') - ROBOCOPY installer\Rprofile.site "$R_HOME\etc" /COPY:DAT + ROBOCOPY installer/Rprofile.site "$R_HOME\etc" /COPY:DAT continue-on-error: true - name: Copy R 64 bit run: | $R_HOME=$(Rscript -e 'cat(R.home())') - ROBOCOPY "$R_HOME\bin\x64" "instat\bin\x64\Release\static" /E + ROBOCOPY "$R_HOME" "instat\bin\x64\Release\static" /E continue-on-error: true - name: Set R-tools From 98169f6b3dcfad36fe8e6aa9d9c388a63f19d0b0 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:07:56 +0100 Subject: [PATCH 212/273] Update release-build.yml --- .github/workflows/release-build.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 779c405f2d0..ef87b9f4556 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -34,19 +34,19 @@ jobs: # check out r-instat - steps: - - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 + steps: - # Install R + # Install R - name: Set up R uses: r-lib/actions/setup-r@v2 with: r-version: ${{ inputs.r-version }} - + + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe uses: microsoft/setup-msbuild@v1.1.3 From 56a137f71f07a2507c6b96a5c96c39a97e9b2a86 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:20:15 +0100 Subject: [PATCH 213/273] Update release-build.yml --- .github/workflows/release-build.yml | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index ef87b9f4556..0f110f15f0b 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -35,13 +35,7 @@ jobs: # check out r-instat steps: - - # Install R - - name: Set up R - uses: r-lib/actions/setup-r@v2 - with: - r-version: ${{ inputs.r-version }} - + - name: Checkout uses: actions/checkout@v3 with: @@ -124,7 +118,11 @@ jobs: ROBOCOPY InstatData\data\ instat\bin\x64\Release\static\Library\ /E continue-on-error: true - + # Install R + - name: Set up R + uses: r-lib/actions/setup-r@v2 + with: + r-version: ${{ inputs.r-version }} - name: Debug paths run: | @@ -135,13 +133,13 @@ jobs: - name: Update Rprofile.site run: | $R_HOME=$(Rscript -e 'cat(R.home())') - ROBOCOPY installer/Rprofile.site "$R_HOME\etc" /COPY:DAT + ROBOCOPY "${{ github.workspace }}\installer" "$R_HOME\etc" "Rprofile.site" /COPY:DAT continue-on-error: true - name: Copy R 64 bit run: | $R_HOME=$(Rscript -e 'cat(R.home())') - ROBOCOPY "$R_HOME" "instat\bin\x64\Release\static" /E + ROBOCOPY "$R_HOME" "${{ github.workspace }}\instat\bin\x64\Release\static" /E continue-on-error: true - name: Set R-tools @@ -149,12 +147,12 @@ jobs: - name: Install R packages (64 bit) run: | - "instat\bin\x64\Release\static\R\bin\Rscript.exe" "instat\static\InstatObject\R\InstallPackages.R" + "${{ github.workspace }}\instat\bin\x64\Release\static\R\bin\Rscript.exe" "${{ github.workspace }}\instat\static\InstatObject\R\InstallPackages.R" shell: cmd - name: Building the installer 64bit - With R run: | - "%programfiles(x86)%\Inno Setup 6\iscc.exe" "inno_install_script_64bit.iss" + "%programfiles(x86)%\Inno Setup 6\iscc.exe" "${{ github.workspace }}\inno_install_script_64bit.iss" shell: cmd - name: Upload the 64 bit installer with R as an artifact @@ -163,8 +161,5 @@ jobs: with: path: "Output/" name: rinstat64WithR-innosetup - - - name: Remove 64 bit release files to free up space - run: | - Remove-Item "instat\bin\x64\Release\" -Recurse + From 6ce2e9a33c2dab9ba08d4f60ba143184a10e3355 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:34:03 +0100 Subject: [PATCH 214/273] Update release-build.yml --- .github/workflows/release-build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 0f110f15f0b..e43d9fe4814 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -144,6 +144,20 @@ jobs: - name: Set R-tools uses: r-windows/install-rtools@master + + # Check if the directory exists + - name: Verify InstallPackages.R directory + run: | + if (Test-Path "D:\a\R-Instat\R-Instat\instat\static\InstatObject\R") { + Write-Host "Directory exists." + } else { + Write-Host "Directory does not exist." + } + + # List the contents of the directory to check for the script + - name: List contents of InstatObject\R directory + run: | + Get-ChildItem "D:\a\R-Instat\R-Instat\instat\static\InstatObject\R" - name: Install R packages (64 bit) run: | From 9bfb40f2a546855fcbc034d157d6d66238ad8a56 Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 12:51:49 +0100 Subject: [PATCH 215/273] Update release-build.yml --- .github/workflows/release-build.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index e43d9fe4814..85ec4783f5f 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -158,6 +158,20 @@ jobs: - name: List contents of InstatObject\R directory run: | Get-ChildItem "D:\a\R-Instat\R-Instat\instat\static\InstatObject\R" + + # Check if the directory exists + - name: Verify script directory + run: | + if (Test-Path "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R\bin") { + Write-Host "Directory exists." + } else { + Write-Host "Directory does not exist." + } + + # List the contents of the directory to check for the script + - name: List contents of R\bin directory + run: | + Get-ChildItem "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R\bin" - name: Install R packages (64 bit) run: | From d5d58577e895401886f4a9a935c656adb4017a7b Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 13:03:10 +0100 Subject: [PATCH 216/273] Update release-build.yml --- .github/workflows/release-build.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index 85ec4783f5f..b48b8d54c4e 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -162,7 +162,7 @@ jobs: # Check if the directory exists - name: Verify script directory run: | - if (Test-Path "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R\bin") { + if (Test-Path "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R") { Write-Host "Directory exists." } else { Write-Host "Directory does not exist." @@ -171,7 +171,10 @@ jobs: # List the contents of the directory to check for the script - name: List contents of R\bin directory run: | - Get-ChildItem "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R\bin" + Get-ChildItem "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static" + - name: List contents of R\bin directory + run: | + Get-ChildItem "D:\a\R-Instat\R-Instat\instat\bin\x64\Release\static\R" - name: Install R packages (64 bit) run: | From c759b8d3aef85b73cdc0c316b10c12fed4e19a1d Mon Sep 17 00:00:00 2001 From: Chris Marsh <84872334+ChrisMarsh82@users.noreply.github.com> Date: Fri, 11 Oct 2024 14:08:43 +0100 Subject: [PATCH 217/273] Update release-build.yml --- .github/workflows/release-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml index b48b8d54c4e..cc948147285 100644 --- a/.github/workflows/release-build.yml +++ b/.github/workflows/release-build.yml @@ -139,7 +139,7 @@ jobs: - name: Copy R 64 bit run: | $R_HOME=$(Rscript -e 'cat(R.home())') - ROBOCOPY "$R_HOME" "${{ github.workspace }}\instat\bin\x64\Release\static" /E + ROBOCOPY "$R_HOME" "${{ github.workspace }}\instat\bin\x64\Release\static\R" /E continue-on-error: true - name: Set R-tools From 786bace95fd77e14b7068b904c065fc84b89dc16 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 12 Oct 2024 08:48:30 +0300 Subject: [PATCH 218/273] implementing undo --- instat/Model/DataFrame/clsDataFramePage.vb | 8 ++++ .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 8 ++++ instat/static/InstatObject/R/data_object_R6.R | 44 ++++++++++++++++++- .../static/InstatObject/R/instat_object_R6.R | 5 +++ 4 files changed, 64 insertions(+), 1 deletion(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 2c119733bc4..b522bab885b 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -205,6 +205,14 @@ Public Class clsDataFramePage Return Math.Ceiling(_iTotalColumnCount / iColumnIncrements) End Function + Public Sub Undo() + Dim clsUndoRFunction As New RFunction + clsUndoRFunction.SetRCommand(_clsRLink.strInstatDataObject & "$undo_last_action") + clsUndoRFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) + _clsRLink.RunScript(clsUndoRFunction.ToScript) + + End Sub + Private Function GetDataFrameFromRCommand() As DataFrame Dim clsGetDataFrameRFunction As New RFunction Dim expTemp As SymbolicExpression diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 5971cb5d66c..86d26777714 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -276,6 +276,14 @@ Public Class ucrDataViewReoGrid ElseIf (e.KeyCode And Not Keys.Modifiers) = Keys.F AndAlso e.Modifiers = Keys.Control Then RaiseEvent FindRow() End If + + ' Detect Ctrl+Z for Undo operation + If e.Control AndAlso e.KeyCode = Keys.Z Then + ' Perform Undo + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + e.Handled = True + e.SuppressKeyPress = True + End If End Sub Private Function GetColumnIndex(strColName As String) As Integer diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index b8fde8f2682..5a53179272f 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list()) { # Set up the data object self$set_data(data, messages) @@ -31,6 +31,9 @@ DataSheet <- R6::R6Class("DataSheet", self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) + self$set_history(history) + + self$save_state_to_history() # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index @@ -59,6 +62,7 @@ DataSheet <- R6::R6Class("DataSheet", column_selections = list(), objects = list(), keys = list(), + history = list(), comments = list(), calculations = list(), scalars = list(), @@ -161,6 +165,12 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name } ) +DataSheet$set("public", "save_state_to_history", function() { + #shallow_copy <- list(data = private$data, variables_metadata = self$get_metadata(data_name_label), changes = self$changes) + self$set_history(append(private$history, list(private$data))) + self$set_history(list(private$data)) +}) + DataSheet$set("public", "set_meta", function(new_meta) { meta_data_copy <- new_meta self$clear_metadata() @@ -184,6 +194,23 @@ DataSheet$set("public", "clear_metadata", function() { } ) +DataSheet$set("public", "has_history", function() { + return(length(private$history) > 0) +} +) + +DataSheet$set("public", "undo_last_action", function() { + if (length(private$history) > 1) { + # Revert to the last saved state + previous_state <- private$history[[length(private$history) - 1]] + self$set_data(as.data.frame(previous_state)) # Restore the previous state + self$set_history(private$history[-length(private$history)]) # Remove the latest state from history + } else { + message("No more actions to undo.") + } +} +) + #Removed until can be fixed with attributes # DataSheet$set("public", "set_variables_metadata", function(new_meta) { # if(!is.data.frame(new_meta)) stop("variable metadata must be of type: data.frame") @@ -241,6 +268,13 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { } ) +DataSheet$set("public", "set_history", function(history) { + if(!is.list(history)) stop("history must be of type: list") + self$append_to_changes(list(Set_property, "history")) + private$history <- append(private$history, history) +} +) + DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") self$append_to_changes(list(Set_property, "keys")) @@ -665,6 +699,9 @@ DataSheet$set("public", "add_scalar", function(scalar_name = "", scalar_value) { ) DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = FALSE, hidden = FALSE, before, adjacent_column = "", num_cols, require_correct_length = TRUE, keep_existing_position = TRUE) { + # Save the current state to history before making modifications + self$save_state_to_history() + # Column name must be character if(!is.character(col_name)) stop("Column name must be of type: character") if(missing(num_cols)) { @@ -814,6 +851,10 @@ DataSheet$set("public", "cor", function(x_col_names, y_col_name, use = "everythi DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", new_col_name = "", label = "", type = "single", .fn, .cols = everything(), new_column_names_df, new_labels_df, ...) { curr_data <- self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE) + + # Save the current state to history before making modifications + self$save_state_to_history() + # Column name must be character if (type == "single") { if (new_col_name != curr_col_name) { @@ -938,6 +979,7 @@ DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delet DataSheet$set("public", "replace_value_in_data", function(col_names, rows, old_value, old_is_missing = FALSE, start_value = NA, end_value = NA, new_value, new_is_missing = FALSE, closed_start_value = TRUE, closed_end_value = TRUE, locf = FALSE, from_last = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() # Column name must be character if(!all(is.character(col_names))) stop("Column name must be of type: character") if (!all(col_names %in% names(curr_data))) stop("Cannot find all columns in the data.") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 0634d1aabb4..a829b0ff3e4 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1352,6 +1352,11 @@ DataBook$set("public","has_key", function(data_name) { } ) +DataBook$set("public","undo_last_action", function(data_name) { + self$get_data_objects(data_name)$undo_last_action() +} +) + DataBook$set("public","get_keys", function(data_name, key_name) { self$get_data_objects(data_name)$get_keys(key_name) } From 0c0a5fa6274b0752ce72990ca9117e015983c2ce Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 12 Oct 2024 08:56:28 +0300 Subject: [PATCH 219/273] more changes --- instat/static/InstatObject/R/data_object_R6.R | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 5a53179272f..626dd1171e7 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -945,6 +945,9 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delete_all = FALSE) { + # Save the current state to history before making modifications + self$save_state_to_history() + if(length(cols) == self$get_column_count()) { if(allow_delete_all) { warning("You are deleting all columns in the data frame.") From 84ff435f8a31a54a455e58afd6e891e5cb7cd5f2 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Sat, 12 Oct 2024 10:39:01 +0300 Subject: [PATCH 220/273] more improvement --- instat/static/InstatObject/R/data_object_R6.R | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 626dd1171e7..cf9ee58e613 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -201,15 +201,13 @@ DataSheet$set("public", "has_history", function() { DataSheet$set("public", "undo_last_action", function() { if (length(private$history) > 1) { - # Revert to the last saved state previous_state <- private$history[[length(private$history) - 1]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - self$set_history(private$history[-length(private$history)]) # Remove the latest state from history + # Here, do not remove the latest state } else { message("No more actions to undo.") } -} -) +}) #Removed until can be fixed with attributes # DataSheet$set("public", "set_variables_metadata", function(new_meta) { @@ -270,10 +268,13 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { DataSheet$set("public", "set_history", function(history) { if(!is.list(history)) stop("history must be of type: list") - self$append_to_changes(list(Set_property, "history")) + MAX_HISTORY_SIZE <- 10 + # Limit history size + if (length(private$history) >= MAX_HISTORY_SIZE) { + private$history <- private$history[-1] # Remove the oldest entry + } private$history <- append(private$history, history) -} -) +}) DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") From 08d7357cb270160e42c333428de3671f5ed472dd Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 14 Oct 2024 01:52:15 +0300 Subject: [PATCH 221/273] General graphics --- instat/dlgGeneralForGraphics.Designer.vb | 52 +- instat/frmMain.Designer.vb | 1426 +++++++++----------- instat/frmMain.resx | 4 +- instat/translations/rInstatTranslations.db | Bin 8306688 -> 8306688 bytes 4 files changed, 701 insertions(+), 781 deletions(-) diff --git a/instat/dlgGeneralForGraphics.Designer.vb b/instat/dlgGeneralForGraphics.Designer.vb index a175bff8c64..9497bf9debe 100644 --- a/instat/dlgGeneralForGraphics.Designer.vb +++ b/instat/dlgGeneralForGraphics.Designer.vb @@ -39,7 +39,7 @@ Partial Class dlgGeneralForGraphics Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Me.grpAethetics = New System.Windows.Forms.GroupBox() + Me.grpAesthetics = New System.Windows.Forms.GroupBox() Me.ucrChkUseasNumeric = New instat.ucrCheck() Me.ucrReceiverY = New instat.ucrReceiverSingle() Me.lblYVariable = New System.Windows.Forms.Label() @@ -101,30 +101,30 @@ Partial Class dlgGeneralForGraphics Me.ucrGraphicsSelector = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrAdditionalLayers = New instat.ucrAdditionalLayers() Me.ucrBase = New instat.ucrButtons() - Me.grpAethetics.SuspendLayout() + Me.grpAesthetics.SuspendLayout() Me.ContextMenuPackagesList.SuspendLayout() Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' - 'grpAethetics - ' - Me.grpAethetics.Controls.Add(Me.ucrChkUseasNumeric) - Me.grpAethetics.Controls.Add(Me.ucrReceiverY) - Me.grpAethetics.Controls.Add(Me.lblYVariable) - Me.grpAethetics.Controls.Add(Me.lblXVariable) - Me.grpAethetics.Controls.Add(Me.ucrReceiverX) - Me.grpAethetics.Controls.Add(Me.lblLabel) - Me.grpAethetics.Controls.Add(Me.ucrLabelReceiver) - Me.grpAethetics.Controls.Add(Me.lblColour) - Me.grpAethetics.Controls.Add(Me.ucrColourReceiver) - Me.grpAethetics.Controls.Add(Me.lblFill) - Me.grpAethetics.Controls.Add(Me.ucrFillReceiver) - Me.grpAethetics.Location = New System.Drawing.Point(277, 31) - Me.grpAethetics.Name = "grpAethetics" - Me.grpAethetics.Size = New System.Drawing.Size(174, 257) - Me.grpAethetics.TabIndex = 23 - Me.grpAethetics.TabStop = False - Me.grpAethetics.Text = "Aethetics:" + 'grpAesthetics + ' + Me.grpAesthetics.Controls.Add(Me.ucrChkUseasNumeric) + Me.grpAesthetics.Controls.Add(Me.ucrReceiverY) + Me.grpAesthetics.Controls.Add(Me.lblYVariable) + Me.grpAesthetics.Controls.Add(Me.lblXVariable) + Me.grpAesthetics.Controls.Add(Me.ucrReceiverX) + Me.grpAesthetics.Controls.Add(Me.lblLabel) + Me.grpAesthetics.Controls.Add(Me.ucrLabelReceiver) + Me.grpAesthetics.Controls.Add(Me.lblColour) + Me.grpAesthetics.Controls.Add(Me.ucrColourReceiver) + Me.grpAesthetics.Controls.Add(Me.lblFill) + Me.grpAesthetics.Controls.Add(Me.ucrFillReceiver) + Me.grpAesthetics.Location = New System.Drawing.Point(277, 31) + Me.grpAesthetics.Name = "grpAesthetics" + Me.grpAesthetics.Size = New System.Drawing.Size(174, 257) + Me.grpAesthetics.TabIndex = 23 + Me.grpAesthetics.TabStop = False + Me.grpAesthetics.Text = "Aesthetics:" ' 'ucrChkUseasNumeric ' @@ -631,7 +631,7 @@ Partial Class dlgGeneralForGraphics Me.Controls.Add(Me.lblFacetBy) Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.cmdRHelp) - Me.Controls.Add(Me.grpAethetics) + Me.Controls.Add(Me.grpAesthetics) Me.Controls.Add(Me.ucrInputLegendPosition) Me.Controls.Add(Me.ucrChkFlipCoordinates) Me.Controls.Add(Me.ucrChkLegend) @@ -645,9 +645,9 @@ Partial Class dlgGeneralForGraphics Me.Name = "dlgGeneralForGraphics" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "General " - Me.Text = "General Graphics" - Me.grpAethetics.ResumeLayout(False) - Me.grpAethetics.PerformLayout() + Me.Text = "General" + Me.grpAesthetics.ResumeLayout(False) + Me.grpAesthetics.PerformLayout() Me.ContextMenuPackagesList.ResumeLayout(False) Me.contextMenuStripOptions.ResumeLayout(False) Me.ResumeLayout(False) @@ -661,7 +661,7 @@ Partial Class dlgGeneralForGraphics Friend WithEvents ucrChkLegend As ucrCheck Friend WithEvents ucrChkFlipCoordinates As ucrCheck Friend WithEvents ucrInputLegendPosition As ucrInputComboBox - Friend WithEvents grpAethetics As GroupBox + Friend WithEvents grpAesthetics As GroupBox Friend WithEvents lblColour As Label Friend WithEvents ucrColourReceiver As ucrReceiverSingle Friend WithEvents lblFill As Label diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index d5285992e1a..afe0b327e86 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -728,7 +728,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) + Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -736,25 +736,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -762,26 +762,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -789,26 +789,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -816,19 +816,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -836,40 +836,40 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeSpecificTablesGraphs ' - Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeGeneral, Me.ToolStripSeparator38, Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) + Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator38, Me.mnuDescribeGeneral, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' 'mnuDescribeGeneral ' Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeGeneral.Text = "General..." ' 'ToolStripSeparator38 ' Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -877,7 +877,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -885,7 +885,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -893,7 +893,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -901,7 +901,7 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" @@ -909,12 +909,12 @@ Partial Class frmMain 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -922,7 +922,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -930,28 +930,28 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -959,95 +959,95 @@ Partial Class frmMain 'mnuDescribeSummaries ' Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" - Me.mnuDescribeSummaries.Size = New System.Drawing.Size(224, 34) + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(149, 22) Me.mnuDescribeSummaries.Text = "Summaries..." ' 'mnuDescribePresentation ' Me.mnuDescribePresentation.Name = "mnuDescribePresentation" - Me.mnuDescribePresentation.Size = New System.Drawing.Size(224, 34) + Me.mnuDescribePresentation.Size = New System.Drawing.Size(149, 22) Me.mnuDescribePresentation.Text = "Presentation..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(79, 29) + Me.mnuModel.Size = New System.Drawing.Size(53, 22) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1055,168 +1055,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) + Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1224,7 +1224,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1232,7 +1232,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1240,7 +1240,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1248,7 +1248,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1256,7 +1256,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1265,7 +1265,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1274,7 +1274,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1282,21 +1282,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1304,14 +1304,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1320,7 +1320,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1329,21 +1329,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1352,7 +1352,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1361,7 +1361,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1369,7 +1369,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1377,7 +1377,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1385,7 +1385,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1394,7 +1394,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1403,7 +1403,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1412,7 +1412,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1420,7 +1420,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1428,7 +1428,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1437,21 +1437,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1460,7 +1460,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(65, 29) + Me.mnuView.Size = New System.Drawing.Size(44, 22) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1468,7 +1468,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1476,21 +1476,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1498,7 +1498,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1506,19 +1506,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1526,7 +1526,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1534,232 +1534,232 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(65, 29) + Me.mnuHelp.Size = New System.Drawing.Size(44, 22) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(341, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(341, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(341, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) ' 'RInstatResourcesSiteToolStripMenuItem ' Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(344, 34) + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(344, 34) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) + Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1767,288 +1767,288 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) + Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2056,175 +2056,175 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations, Me.mnuClimaticCheckDataDistances}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticCheckDataDistances ' Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" - Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticCheckDataDistances.Text = "Distances..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2232,7 +2232,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2241,7 +2241,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2250,7 +2250,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2259,7 +2259,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2268,7 +2268,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2277,7 +2277,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2285,361 +2285,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) + Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2648,7 +2648,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2656,7 +2656,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2664,7 +2664,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2672,7 +2672,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2680,7 +2680,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2688,7 +2688,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2696,7 +2696,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2704,7 +2704,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2712,7 +2712,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2720,7 +2720,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2728,7 +2728,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2736,7 +2736,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2744,7 +2744,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2752,7 +2752,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2760,7 +2760,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2768,7 +2768,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2776,7 +2776,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2784,7 +2784,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2792,7 +2792,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2800,7 +2800,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2808,7 +2808,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2816,7 +2816,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2824,7 +2824,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2832,7 +2832,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2840,7 +2840,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2848,7 +2848,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2856,7 +2856,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2864,7 +2864,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2872,7 +2872,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2880,7 +2880,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2888,7 +2888,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2896,7 +2896,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2904,7 +2904,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2912,7 +2912,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2920,7 +2920,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2928,7 +2928,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2936,7 +2936,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2944,7 +2944,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2952,7 +2952,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(365, 34) + Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2960,32 +2960,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(365, 34) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2993,7 +2993,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(365, 34) + Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -3002,7 +3002,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(365, 34) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3010,12 +3010,12 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) + Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' @@ -3023,7 +3023,7 @@ Partial Class frmMain ' Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(58, 29) + Me.mnuEdit.Size = New System.Drawing.Size(39, 22) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' @@ -3031,11 +3031,7 @@ Partial Class frmMain ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - - Me.mnuEditFind.Size = New System.Drawing.Size(270, 34) - - Me.mnuEditFind.Size = New System.Drawing.Size(253, 34) - + Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3043,11 +3039,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - - Me.mnuEditCopy.Size = New System.Drawing.Size(270, 34) - - Me.mnuEditCopy.Size = New System.Drawing.Size(253, 34) - + Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3055,43 +3047,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - - Me.mnuEditPaste.Size = New System.Drawing.Size(270, 34) - - Me.mnuEditPaste.Size = New System.Drawing.Size(253, 34) - + Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - - Me.mnuEditPasteNew.Size = New System.Drawing.Size(270, 34) - - Me.mnuEditPasteNew.Size = New System.Drawing.Size(253, 34) - + Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - - Me.mnuEditWordwrap.Size = New System.Drawing.Size(270, 34) - - Me.mnuEditWordwrap.Size = New System.Drawing.Size(253, 34) - + Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - - Me.mnuEditSelectAll.Size = New System.Drawing.Size(270, 34) - - Me.mnuEditSelectAll.Size = New System.Drawing.Size(253, 34) - + Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3099,18 +3075,17 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 691) + Me.stsStrip.Location = New System.Drawing.Point(0, 460) Me.stsStrip.Name = "stsStrip" - Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(1251, 32) + Me.stsStrip.Size = New System.Drawing.Size(834, 22) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(182, 25) + Me.tstatus.Size = New System.Drawing.Size(119, 17) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3119,16 +3094,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - - Me.Tool_strip.Location = New System.Drawing.Point(0, 33) - - Me.Tool_strip.Location = New System.Drawing.Point(0, 36) - + Me.Tool_strip.Location = New System.Drawing.Point(0, 24) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) + Me.Tool_strip.Size = New System.Drawing.Size(834, 37) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3140,7 +3111,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3151,7 +3122,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3163,40 +3134,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) + Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLast10Dialogs ' @@ -3212,7 +3183,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 39) + Me.separator2.Size = New System.Drawing.Size(6, 37) ' 'mnuTbDataView ' @@ -3222,7 +3193,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3234,34 +3205,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) + Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) + Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) + Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) ' 'mnuLastGraph ' @@ -3278,25 +3249,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(194, 34) + Me.mnuploty.Size = New System.Drawing.Size(128, 22) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) + Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLogScript ' @@ -3314,14 +3285,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) + Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3340,27 +3311,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) ' 'mnuTbResetLayout ' @@ -3369,13 +3340,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 39) + Me.separator3.Size = New System.Drawing.Size(6, 37) ' 'mnuTbHelp ' @@ -3384,13 +3355,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) ' 'mnuTbLan ' @@ -3399,32 +3370,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 39) + Me.separator1.Size = New System.Drawing.Size(6, 37) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight - Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" + Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - - Me.mnuBar.Size = New System.Drawing.Size(1251, 33) - - Me.mnuBar.Size = New System.Drawing.Size(1251, 36) - + Me.mnuBar.Size = New System.Drawing.Size(834, 24) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3432,7 +3399,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(54, 29) + Me.mnuFile.Size = New System.Drawing.Size(37, 22) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3440,7 +3407,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(365, 34) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3448,33 +3415,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(362, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3482,7 +3449,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3490,88 +3457,88 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(365, 34) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(365, 34) + Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(362, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(365, 34) + Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) + Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(362, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) + Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3579,105 +3546,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3685,7 +3652,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3694,7 +3661,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3702,7 +3669,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3710,107 +3677,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3818,95 +3785,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3914,105 +3881,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -4020,42 +3987,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4063,7 +4030,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4071,7 +4038,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4079,38 +4046,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4118,7 +4085,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4126,169 +4093,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.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, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4296,7 +4263,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4304,46 +4271,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4351,7 +4318,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4360,7 +4327,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4369,7 +4336,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4378,35 +4345,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(180, 22) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4414,78 +4381,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(109, 29) + Me.mnuStructured.Size = New System.Drawing.Size(74, 22) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4493,126 +4460,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4620,424 +4587,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) + Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(69, 29) + Me.mnuTools.Size = New System.Drawing.Size(46, 22) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5045,54 +5012,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) + Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5106,12 +5073,7 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - - Me.splOverall.Location = New System.Drawing.Point(0, 72) - - Me.splOverall.Location = New System.Drawing.Point(0, 75) - - Me.splOverall.Margin = New System.Windows.Forms.Padding(4) + Me.splOverall.Location = New System.Drawing.Point(0, 61) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5124,14 +5086,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - - Me.splOverall.Size = New System.Drawing.Size(1251, 619) - Me.splOverall.SplitterDistance = 249 - - Me.splOverall.Size = New System.Drawing.Size(1251, 616) - Me.splOverall.SplitterDistance = 248 - - Me.splOverall.SplitterWidth = 8 + Me.splOverall.Size = New System.Drawing.Size(834, 399) + Me.splOverall.SplitterDistance = 160 + Me.splOverall.SplitterWidth = 5 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5139,7 +5096,6 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) - Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5151,13 +5107,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 249) - - Me.splExtraWindows.Size = New System.Drawing.Size(1251, 248) - - Me.splExtraWindows.SplitterDistance = 378 - Me.splExtraWindows.SplitterWidth = 8 + Me.splExtraWindows.Size = New System.Drawing.Size(834, 160) + Me.splExtraWindows.SplitterDistance = 252 + Me.splExtraWindows.SplitterWidth = 5 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5165,7 +5117,6 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) - Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5176,13 +5127,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - - Me.splMetadata.Size = New System.Drawing.Size(378, 249) - - Me.splMetadata.Size = New System.Drawing.Size(378, 248) - - Me.splMetadata.SplitterDistance = 102 - Me.splMetadata.SplitterWidth = 8 + Me.splMetadata.Size = New System.Drawing.Size(252, 160) + Me.splMetadata.SplitterDistance = 68 + Me.splMetadata.SplitterWidth = 5 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5192,13 +5139,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrColumnMeta.Name = "ucrColumnMeta" - - Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 249) - - Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 248) - + Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 160) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5207,13 +5150,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 249) - - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 248) - + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 160) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5222,12 +5161,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 249) - - Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 248) - + Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 160) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5237,7 +5173,6 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) - Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5249,13 +5184,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - - Me.splDataOutput.Size = New System.Drawing.Size(1251, 362) - - Me.splDataOutput.Size = New System.Drawing.Size(1251, 360) - - Me.splDataOutput.SplitterDistance = 573 - Me.splDataOutput.SplitterWidth = 8 + Me.splDataOutput.Size = New System.Drawing.Size(834, 234) + Me.splDataOutput.SplitterDistance = 382 + Me.splDataOutput.SplitterWidth = 5 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5265,13 +5196,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrDataViewer.Name = "ucrDataViewer" - - Me.ucrDataViewer.Size = New System.Drawing.Size(573, 362) - - Me.ucrDataViewer.Size = New System.Drawing.Size(573, 360) - + Me.ucrDataViewer.Size = New System.Drawing.Size(382, 234) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5281,13 +5208,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrOutput.Name = "ucrOutput" - - Me.ucrOutput.Size = New System.Drawing.Size(670, 362) - - Me.ucrOutput.Size = New System.Drawing.Size(670, 360) - + Me.ucrOutput.Size = New System.Drawing.Size(447, 234) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5327,9 +5250,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(1251, 723) + Me.ClientSize = New System.Drawing.Size(834, 482) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5337,11 +5260,8 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() diff --git a/instat/frmMain.resx b/instat/frmMain.resx index e679779467e..c73bcdce42b 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 9f9e8ebd4dea91c5fe0d359543f761ced4ecd58d..3387a3bfc95ab8bfc60c1dc5b346670bff2af8fb 100644 GIT binary patch delta 569 zcmW;Cxl)q>07YREf;^#S47Q4iMT`{0gbz{xZ~Ktj5B!x zO6Z)__Phy=y^UumzUIs+mHt(iFqe$v=Ue+C`R}qKR@ADtVpff{#)@0D)>^C1s<+lz z4c2-qVKrJ!)&^^%waMCSHCrv#7Hg}u%}QFWR?6CL?XY%QyR0^Ax3$OGYqeYZto_yj zD{US8tzda78Xc;1P6tiV=J;$?A{=QM&rJ+uC$ojF#Z)W|ljZs4`gCHojO7}BWfnVP zVW#}I5QOEWKk4?$N+I|ei`RXt>IuWt>ilD&7@z~4IE2GEf}=QwOPT~|! z;|$K?9M0ncdeMiAxP*QTU=Wva1y^wm*D-`)+`vuT!fo8aUEITcJirJZVib??7*CLa zFovgihH+%^920nfmw1KO$l(npF@DeJHCD=6ZmqBaYo)cys Date: Mon, 14 Oct 2024 03:32:02 +0300 Subject: [PATCH 222/273] adding standalone functions --- instat/static/InstatObject/R/stand_alone_functions.R | 6 ++++++ instat/ucrCalculator.vb | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 66a7468bdb8..f85ee657f6f 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3409,3 +3409,9 @@ check_github_repo <- function(owner = NULL, repo = NULL, url = NULL) { }) } } +#Convert Decimal to Fractions +frac10 <- function(x) {paste0(round(x * 10), "/", 10)} #Give fraction our of 10 for a decimal value +frac20 <- function(x) {paste0(round(x * 20), "/", 20)} #Give fraction our of 20 for a decimal value +frac100 <- function(x) {paste0(round(x * 100), "/", 100)} # Give fraction our of 100 for a decimal value + +frac_den <- function(x, den) {paste0(round(x * den), "/", den)} # Give fraction for a given denominator diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index f82d94a2b02..c0adc1c4449 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -497,7 +497,7 @@ Public Class ucrCalculator ttCalculator.SetToolTip(cmdFrac10, "Give fraction our of 10 for a decimal value. For example for 0.36 the value is 4/10") ttCalculator.SetToolTip(cmdFrac20, "Give fraction our of 20 for a decimal value. For example for 0.36 the value is 7/20") ttCalculator.SetToolTip(cmdFrac100, "Give fraction our of 100 for a decimal value. For example for 0.36 the value is 36/100") - ttCalculator.SetToolTip(cmdFracDen, "Give fraction for a given denominator. For example for frac_den(0.36, 50) gives 18/50") + ttCalculator.SetToolTip(cmdFracDen, "Give fraction for a given denominator. For example frac_den(0.36, 50) gives 18/50") '--------------------------------------------------------------------------------------------------------------------- Const strTooltipCmdLength = "number Of observations: For example length(c(1,2,3,4,NA)) = 5 " @@ -5897,7 +5897,7 @@ Public Class ucrCalculator Private Sub cmdOrigin_Click(sender As Object, e As EventArgs) Handles cmdOrigin.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::change.origin( p= ,o= )", 6) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::change.origin(p= ,o= )", 6) Else ucrReceiverForCalculation.AddToReceiverAtCursorPosition("polynom::change.origin(, )", 3) End If From 8db5ece404fcba8abce473bb90240ec51aca2c79 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 10:33:23 +0300 Subject: [PATCH 223/273] improved the undo to be unlimited --- instat/static/InstatObject/R/data_object_R6.R | 8 +++----- instat/static/InstatObject/R/instat_object_R6.R | 5 +++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index cf9ee58e613..818e8adad8e 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -166,8 +166,6 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name ) DataSheet$set("public", "save_state_to_history", function() { - #shallow_copy <- list(data = private$data, variables_metadata = self$get_metadata(data_name_label), changes = self$changes) - self$set_history(append(private$history, list(private$data))) self$set_history(list(private$data)) }) @@ -195,15 +193,15 @@ DataSheet$set("public", "clear_metadata", function() { ) DataSheet$set("public", "has_history", function() { - return(length(private$history) > 0) + return(length(private$history)) } ) DataSheet$set("public", "undo_last_action", function() { if (length(private$history) > 1) { - previous_state <- private$history[[length(private$history) - 1]] + previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - # Here, do not remove the latest state + private$history <- private$history[-length(private$history)] # Remove the latest state } else { message("No more actions to undo.") } diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index a829b0ff3e4..95affddcc3a 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1352,6 +1352,11 @@ DataBook$set("public","has_key", function(data_name) { } ) +DataBook$set("public","has_history", function(data_name) { + self$get_data_objects(data_name)$has_history() +} +) + DataBook$set("public","undo_last_action", function(data_name) { self$get_data_objects(data_name)$undo_last_action() } From 2bb301871743bd46776e1563d8b65805897eec89 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 11:02:36 +0300 Subject: [PATCH 224/273] set the focus on the grid --- instat/Interface/IDataViewGrid.vb | 2 ++ instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb | 4 ++++ instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 5 +++++ instat/ucrDataView.vb | 3 +++ 4 files changed, 14 insertions(+) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index fa8914db568..4145675170f 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -44,6 +44,8 @@ Public Interface IDataViewGrid Sub AdjustColumnWidthAfterWrapping(strColumn As String, Optional bApplyWrap As Boolean = False) + Sub Focus() + Function GetSelectedColumns() As List(Of clsColumnHeaderDisplay) Function GetFirstRowHeader() As String diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index b899d906312..3977f595ba1 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -69,6 +69,10 @@ Public Class ucrDataViewLinuxGrid Next End Sub + Public Sub FocusGrid() Implements IDataViewGrid.Focus + Me.Focus() + End Sub + Public Function SelectedTab() As String If tcTabs.SelectedTab Is Nothing Then Return "" diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 86d26777714..7e96044857d 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -57,6 +57,11 @@ Public Class ucrDataViewReoGrid Next End Sub + Public Sub FocusGrid() Implements IDataViewGrid.Focus + grdData.Focus() + grdData.CurrentWorksheet.FocusPos = grdData.CurrentWorksheet.FocusPos + End Sub + Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData Dim textColour As Color Dim strRowNames As String() diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index e41522cc43e..c9357defb4d 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -155,6 +155,8 @@ Public Class ucrDataView RefreshDisplayInformation() End If End If + + _grid.Focus() End Sub ''' @@ -190,6 +192,7 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteColumn(GetSelectedColumnNames()) EndWait() + _grid.Focus() End If End If End Sub From da352f4e679741d878eb64ff96bad2af65a44d44 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 14 Oct 2024 13:37:57 +0300 Subject: [PATCH 225/273] changes in the code --- instat/dlgExportToClimsoft.Designer.vb | 154 +++++++++---------------- instat/dlgExportToClimsoft.vb | 62 +++++----- 2 files changed, 86 insertions(+), 130 deletions(-) diff --git a/instat/dlgExportToClimsoft.Designer.vb b/instat/dlgExportToClimsoft.Designer.vb index 0c53cfe53be..73783bb0cad 100644 --- a/instat/dlgExportToClimsoft.Designer.vb +++ b/instat/dlgExportToClimsoft.Designer.vb @@ -41,9 +41,7 @@ Partial Class dlgExportToClimsoft Me.lblStationID = New System.Windows.Forms.Label() Me.rdoExportData = New System.Windows.Forms.RadioButton() Me.rdoNewDataFrame = New System.Windows.Forms.RadioButton() - Me.ucrReceiverComments = New instat.ucrReceiverSingle() Me.ucrChkAddReport = New instat.ucrCheck() - Me.lblcomments = New System.Windows.Forms.Label() Me.ucrDataFrameSheets = New instat.ucrDataFrame() Me.ucrPnlOutput = New instat.UcrPanel() Me.grpSave = New System.Windows.Forms.GroupBox() @@ -52,30 +50,27 @@ Partial Class dlgExportToClimsoft 'lblElement ' Me.lblElement.AutoSize = True - Me.lblElement.Location = New System.Drawing.Point(417, 268) - Me.lblElement.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblElement.Location = New System.Drawing.Point(278, 179) Me.lblElement.Name = "lblElement" - Me.lblElement.Size = New System.Drawing.Size(80, 20) + Me.lblElement.Size = New System.Drawing.Size(53, 13) Me.lblElement.TabIndex = 10 Me.lblElement.Text = "Elements:" ' 'lblDate ' Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(417, 140) - Me.lblDate.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblDate.Location = New System.Drawing.Point(278, 93) Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(48, 20) + Me.lblDate.Size = New System.Drawing.Size(33, 13) Me.lblDate.TabIndex = 6 Me.lblDate.Text = "Date:" ' 'lblHour ' Me.lblHour.AutoSize = True - Me.lblHour.Location = New System.Drawing.Point(417, 204) - Me.lblHour.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblHour.Location = New System.Drawing.Point(278, 136) Me.lblHour.Name = "lblHour" - Me.lblHour.Size = New System.Drawing.Size(48, 20) + Me.lblHour.Size = New System.Drawing.Size(33, 13) Me.lblHour.TabIndex = 8 Me.lblHour.Text = "Hour:" ' @@ -83,20 +78,18 @@ Partial Class dlgExportToClimsoft ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(14, 654) - Me.lblExport.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblExport.Location = New System.Drawing.Point(9, 436) Me.lblExport.Name = "lblExport" - Me.lblExport.Size = New System.Drawing.Size(88, 20) + Me.lblExport.Size = New System.Drawing.Size(59, 13) Me.lblExport.TabIndex = 15 Me.lblExport.Text = "Export File:" ' 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(489, 646) - Me.cmdBrowse.Margin = New System.Windows.Forms.Padding(4) + Me.cmdBrowse.Location = New System.Drawing.Point(326, 431) Me.cmdBrowse.Name = "cmdBrowse" - Me.cmdBrowse.Size = New System.Drawing.Size(120, 34) + Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) Me.cmdBrowse.TabIndex = 17 Me.cmdBrowse.Text = "Browse" Me.cmdBrowse.UseVisualStyleBackColor = True @@ -107,19 +100,19 @@ Partial Class dlgExportToClimsoft Me.ucrInputExportFile.AutoSize = True Me.ucrInputExportFile.IsMultiline = False Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(213, 648) - Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) + Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 432) + Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrInputExportFile.Name = "ucrInputExportFile" - Me.ucrInputExportFile.Size = New System.Drawing.Size(273, 32) + Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) Me.ucrInputExportFile.TabIndex = 16 ' 'ucrSaveNewDataFrame ' Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(14, 604) - Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(9, 403) + Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" - Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(522, 36) + Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(348, 24) Me.ucrSaveNewDataFrame.TabIndex = 14 ' 'ucrInputHour @@ -128,31 +121,31 @@ Partial Class dlgExportToClimsoft Me.ucrInputHour.AutoSize = True Me.ucrInputHour.IsMultiline = False Me.ucrInputHour.IsReadOnly = False - Me.ucrInputHour.Location = New System.Drawing.Point(417, 230) - Me.ucrInputHour.Margin = New System.Windows.Forms.Padding(14) + Me.ucrInputHour.Location = New System.Drawing.Point(278, 153) + Me.ucrInputHour.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputHour.Name = "ucrInputHour" - Me.ucrInputHour.Size = New System.Drawing.Size(178, 32) + Me.ucrInputHour.Size = New System.Drawing.Size(119, 21) Me.ucrInputHour.TabIndex = 9 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 688) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrBase.Location = New System.Drawing.Point(7, 459) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(611, 77) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 18 ' 'ucrReceiverElements ' Me.ucrReceiverElements.AutoSize = True Me.ucrReceiverElements.frmParent = Me - Me.ucrReceiverElements.Location = New System.Drawing.Point(417, 298) + Me.ucrReceiverElements.Location = New System.Drawing.Point(278, 199) Me.ucrReceiverElements.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverElements.Name = "ucrReceiverElements" Me.ucrReceiverElements.Selector = Nothing - Me.ucrReceiverElements.Size = New System.Drawing.Size(180, 150) + Me.ucrReceiverElements.Size = New System.Drawing.Size(120, 100) Me.ucrReceiverElements.strNcFilePath = "" Me.ucrReceiverElements.TabIndex = 11 Me.ucrReceiverElements.ucrSelector = Nothing @@ -161,11 +154,11 @@ Partial Class dlgExportToClimsoft ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(417, 165) + Me.ucrReceiverDate.Location = New System.Drawing.Point(278, 110) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverDate.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverDate.strNcFilePath = "" Me.ucrReceiverDate.TabIndex = 7 Me.ucrReceiverDate.ucrSelector = Nothing @@ -176,10 +169,10 @@ Partial Class dlgExportToClimsoft Me.ucrSelectorImportToClimsoft.bDropUnusedFilterLevels = False Me.ucrSelectorImportToClimsoft.bShowHiddenColumns = False Me.ucrSelectorImportToClimsoft.bUseCurrentFilter = True - Me.ucrSelectorImportToClimsoft.Location = New System.Drawing.Point(14, 78) + Me.ucrSelectorImportToClimsoft.Location = New System.Drawing.Point(9, 52) Me.ucrSelectorImportToClimsoft.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorImportToClimsoft.Name = "ucrSelectorImportToClimsoft" - Me.ucrSelectorImportToClimsoft.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorImportToClimsoft.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorImportToClimsoft.TabIndex = 3 ' 'rdoHourly @@ -192,10 +185,9 @@ Partial Class dlgExportToClimsoft Me.rdoHourly.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoHourly.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoHourly.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoHourly.Location = New System.Drawing.Point(285, 12) - Me.rdoHourly.Margin = New System.Windows.Forms.Padding(4) + Me.rdoHourly.Location = New System.Drawing.Point(190, 8) Me.rdoHourly.Name = "rdoHourly" - Me.rdoHourly.Size = New System.Drawing.Size(136, 42) + Me.rdoHourly.Size = New System.Drawing.Size(91, 28) Me.rdoHourly.TabIndex = 2 Me.rdoHourly.TabStop = True Me.rdoHourly.Tag = "Frequency" @@ -212,10 +204,9 @@ Partial Class dlgExportToClimsoft Me.rdoDaily.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoDaily.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoDaily.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoDaily.Location = New System.Drawing.Point(151, 12) - Me.rdoDaily.Margin = New System.Windows.Forms.Padding(4) + Me.rdoDaily.Location = New System.Drawing.Point(101, 8) Me.rdoDaily.Name = "rdoDaily" - Me.rdoDaily.Size = New System.Drawing.Size(136, 42) + Me.rdoDaily.Size = New System.Drawing.Size(91, 28) Me.rdoDaily.TabIndex = 1 Me.rdoDaily.TabStop = True Me.rdoDaily.Tag = "Frequency" @@ -226,21 +217,21 @@ Partial Class dlgExportToClimsoft 'ucrPnlDailyHourly ' Me.ucrPnlDailyHourly.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDailyHourly.Location = New System.Drawing.Point(136, 12) - Me.ucrPnlDailyHourly.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlDailyHourly.Location = New System.Drawing.Point(91, 8) + Me.ucrPnlDailyHourly.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.ucrPnlDailyHourly.Name = "ucrPnlDailyHourly" - Me.ucrPnlDailyHourly.Size = New System.Drawing.Size(310, 42) + Me.ucrPnlDailyHourly.Size = New System.Drawing.Size(207, 28) Me.ucrPnlDailyHourly.TabIndex = 0 ' 'ucrReceiverStationID ' Me.ucrReceiverStationID.AutoSize = True Me.ucrReceiverStationID.frmParent = Me - Me.ucrReceiverStationID.Location = New System.Drawing.Point(414, 110) + Me.ucrReceiverStationID.Location = New System.Drawing.Point(276, 73) Me.ucrReceiverStationID.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStationID.Name = "ucrReceiverStationID" Me.ucrReceiverStationID.Selector = Nothing - Me.ucrReceiverStationID.Size = New System.Drawing.Size(180, 30) + Me.ucrReceiverStationID.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverStationID.strNcFilePath = "" Me.ucrReceiverStationID.TabIndex = 5 Me.ucrReceiverStationID.ucrSelector = Nothing @@ -248,20 +239,18 @@ Partial Class dlgExportToClimsoft 'lblStationID ' Me.lblStationID.AutoSize = True - Me.lblStationID.Location = New System.Drawing.Point(419, 84) - Me.lblStationID.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.lblStationID.Location = New System.Drawing.Point(279, 56) Me.lblStationID.Name = "lblStationID" - Me.lblStationID.Size = New System.Drawing.Size(85, 20) + Me.lblStationID.Size = New System.Drawing.Size(57, 13) Me.lblStationID.TabIndex = 4 Me.lblStationID.Text = "Station ID:" ' 'rdoExportData ' Me.rdoExportData.AutoSize = True - Me.rdoExportData.Location = New System.Drawing.Point(22, 421) - Me.rdoExportData.Margin = New System.Windows.Forms.Padding(4) + Me.rdoExportData.Location = New System.Drawing.Point(15, 281) Me.rdoExportData.Name = "rdoExportData" - Me.rdoExportData.Size = New System.Drawing.Size(156, 24) + Me.rdoExportData.Size = New System.Drawing.Size(107, 17) Me.rdoExportData.TabIndex = 94 Me.rdoExportData.TabStop = True Me.rdoExportData.Text = "Export Data (csv)" @@ -270,92 +259,62 @@ Partial Class dlgExportToClimsoft 'rdoNewDataFrame ' Me.rdoNewDataFrame.AutoSize = True - Me.rdoNewDataFrame.Location = New System.Drawing.Point(22, 378) - Me.rdoNewDataFrame.Margin = New System.Windows.Forms.Padding(4) + Me.rdoNewDataFrame.Location = New System.Drawing.Point(15, 252) Me.rdoNewDataFrame.Name = "rdoNewDataFrame" - Me.rdoNewDataFrame.Size = New System.Drawing.Size(154, 24) + Me.rdoNewDataFrame.Size = New System.Drawing.Size(105, 17) Me.rdoNewDataFrame.TabIndex = 93 Me.rdoNewDataFrame.TabStop = True Me.rdoNewDataFrame.Text = "New Data Frame" Me.rdoNewDataFrame.UseVisualStyleBackColor = True ' - 'ucrReceiverComments - ' - Me.ucrReceiverComments.AutoSize = True - Me.ucrReceiverComments.frmParent = Me - Me.ucrReceiverComments.Location = New System.Drawing.Point(427, 557) - Me.ucrReceiverComments.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverComments.Name = "ucrReceiverComments" - Me.ucrReceiverComments.Selector = Nothing - Me.ucrReceiverComments.Size = New System.Drawing.Size(180, 30) - Me.ucrReceiverComments.strNcFilePath = "" - Me.ucrReceiverComments.TabIndex = 92 - Me.ucrReceiverComments.ucrSelector = Nothing - ' 'ucrChkAddReport ' Me.ucrChkAddReport.AutoSize = True Me.ucrChkAddReport.Checked = False - Me.ucrChkAddReport.Location = New System.Drawing.Point(8, 483) - Me.ucrChkAddReport.Margin = New System.Windows.Forms.Padding(9) + Me.ucrChkAddReport.Location = New System.Drawing.Point(5, 322) + Me.ucrChkAddReport.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrChkAddReport.Name = "ucrChkAddReport" - Me.ucrChkAddReport.Size = New System.Drawing.Size(315, 34) + Me.ucrChkAddReport.Size = New System.Drawing.Size(239, 23) Me.ucrChkAddReport.TabIndex = 91 ' - 'lblcomments - ' - Me.lblcomments.AutoSize = True - Me.lblcomments.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblcomments.Location = New System.Drawing.Point(427, 531) - Me.lblcomments.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.lblcomments.Name = "lblcomments" - Me.lblcomments.Size = New System.Drawing.Size(90, 20) - Me.lblcomments.TabIndex = 90 - Me.lblcomments.Tag = "New_Name" - Me.lblcomments.Text = "Comments:" - ' 'ucrDataFrameSheets ' Me.ucrDataFrameSheets.AutoSize = True Me.ucrDataFrameSheets.bDropUnusedFilterLevels = False Me.ucrDataFrameSheets.bUseCurrentFilter = True - Me.ucrDataFrameSheets.Location = New System.Drawing.Point(17, 524) + Me.ucrDataFrameSheets.Location = New System.Drawing.Point(11, 349) Me.ucrDataFrameSheets.Margin = New System.Windows.Forms.Padding(0) Me.ucrDataFrameSheets.Name = "ucrDataFrameSheets" - Me.ucrDataFrameSheets.Size = New System.Drawing.Size(226, 75) + Me.ucrDataFrameSheets.Size = New System.Drawing.Size(151, 50) Me.ucrDataFrameSheets.TabIndex = 89 ' 'ucrPnlOutput ' Me.ucrPnlOutput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlOutput.Location = New System.Drawing.Point(18, 377) - Me.ucrPnlOutput.Margin = New System.Windows.Forms.Padding(9) + Me.ucrPnlOutput.Location = New System.Drawing.Point(12, 251) + Me.ucrPnlOutput.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) Me.ucrPnlOutput.Name = "ucrPnlOutput" - Me.ucrPnlOutput.Size = New System.Drawing.Size(226, 90) + Me.ucrPnlOutput.Size = New System.Drawing.Size(151, 60) Me.ucrPnlOutput.TabIndex = 95 ' 'grpSave ' - Me.grpSave.Location = New System.Drawing.Point(12, 356) - Me.grpSave.Margin = New System.Windows.Forms.Padding(4) + Me.grpSave.Location = New System.Drawing.Point(8, 237) Me.grpSave.Name = "grpSave" - Me.grpSave.Padding = New System.Windows.Forms.Padding(4) - Me.grpSave.Size = New System.Drawing.Size(248, 110) + Me.grpSave.Size = New System.Drawing.Size(165, 73) Me.grpSave.TabIndex = 96 Me.grpSave.TabStop = False Me.grpSave.Text = "Save" ' 'dlgExportToClimsoft ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(626, 775) + Me.ClientSize = New System.Drawing.Size(417, 467) Me.Controls.Add(Me.rdoExportData) Me.Controls.Add(Me.rdoNewDataFrame) - Me.Controls.Add(Me.ucrReceiverComments) Me.Controls.Add(Me.ucrChkAddReport) - Me.Controls.Add(Me.lblcomments) Me.Controls.Add(Me.ucrDataFrameSheets) Me.Controls.Add(Me.ucrPnlOutput) Me.Controls.Add(Me.grpSave) @@ -377,7 +336,6 @@ Partial Class dlgExportToClimsoft Me.Controls.Add(Me.ucrSelectorImportToClimsoft) Me.Controls.Add(Me.ucrPnlDailyHourly) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog - Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "dlgExportToClimsoft" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent Me.Text = "Export For Climsoft" @@ -405,9 +363,7 @@ Partial Class dlgExportToClimsoft Friend WithEvents ucrReceiverStationID As ucrReceiverSingle Friend WithEvents rdoExportData As RadioButton Friend WithEvents rdoNewDataFrame As RadioButton - Friend WithEvents ucrReceiverComments As ucrReceiverSingle Friend WithEvents ucrChkAddReport As ucrCheck - Friend WithEvents lblcomments As Label Friend WithEvents ucrDataFrameSheets As ucrDataFrame Friend WithEvents ucrPnlOutput As UcrPanel Friend WithEvents grpSave As GroupBox diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 69215091fcb..a7bff98136d 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -44,14 +44,8 @@ Public Class dlgExportToClimsoft ucrReceiverStationID.SetLinkedDisplayControl(lblStationID) ucrReceiverStationID.Selector = ucrSelectorImportToClimsoft - ucrDataFrameSheets.SetParameter(New RParameter("data_name", 0)) - ucrDataFrameSheets.SetParameterIsString() - - ucrReceiverComments.SetParameter(New RParameter("x", 1)) - ucrReceiverComments.SetParameterIsRFunction() - ucrReceiverComments.SetItemType("dataframe") - - ucrReceiverComments.SetLinkedDisplayControl(lblcomments) + ucrDataFrameSheets.SetParameter(New RParameter("x", 0)) + ucrDataFrameSheets.SetParameterIsRFunction() ucrPnlOutput.AddRadioButton(rdoNewDataFrame) ucrPnlOutput.AddRadioButton(rdoExportData) @@ -59,8 +53,8 @@ Public Class dlgExportToClimsoft ucrPnlOutput.AddParameterValuesCondition(rdoNewDataFrame, "check", "dataframe") ucrPnlOutput.AddParameterValuesCondition(rdoExportData, "check", "export") - ucrChkAddReport.SetText("Add Reports") - ucrChkAddReport.AddToLinkedControls({ucrReceiverComments, ucrDataFrameSheets, ucrInputExportFile}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkAddReport.SetText("Add Report (Comments Sheet)") + ucrChkAddReport.AddToLinkedControls({ucrDataFrameSheets, ucrInputExportFile}, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkAddReport.AddParameterValuesCondition(True, "comments", "True") ucrChkAddReport.AddParameterValuesCondition(False, "comments", "False") @@ -159,10 +153,10 @@ Public Class dlgExportToClimsoft ucrSaveNewDataFrame.SetRCode(clsPipeOperator, bReset) ucrInputExportFile.SetRCode(clsExportClimsoftFunction, bReset) ucrPnlDailyHourly.SetRCode(clsDummyFunction, bReset) + ucrDataFrameSheets.SetRCode(clsExportCommentsFunction, bReset) If bReset Then ucrPnlOutput.SetRCode(clsDummyFunction, bReset) ucrChkAddReport.SetRCode(clsDummyFunction, bReset) - ucrReceiverComments.SetRCode(clsExportCommentsFunction, bReset) End If End Sub @@ -174,20 +168,24 @@ Public Class dlgExportToClimsoft Else ucrBase.OKEnabled(False) End If - ElseIf rdoExportData.Checked Then - If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - ElseIf ucrChkAddReport.Checked And rdoExportData.Checked Then - If Not ucrReceiverComments.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then - ucrBase.OKEnabled(True) + Else + + If Not ucrChkAddReport.Checked Then + If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If Else - ucrBase.OKEnabled(False) + If ucrDataFrameSheets.cboAvailableDataFrames.Text <> "" AndAlso Not ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(True) + + Else + ucrBase.OKEnabled(False) + + End If End If End If - End Sub Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset @@ -249,10 +247,12 @@ Public Class dlgExportToClimsoft End Sub Private Sub AddingComments() - If ucrDataFrameSheets.cboAvailableDataFrames.Text = ".comment" Then - ucrReceiverComments.SetText(ucrDataFrameSheets.cboAvailableDataFrames.Text) + ' Check if .comment is in the list and set it as the default selection + If ucrDataFrameSheets.cboAvailableDataFrames.Items.Contains(".comment") Then + ucrDataFrameSheets.cboAvailableDataFrames.Text = ".comment" Else - ucrReceiverComments.SetText("") + ' Optionally, set the first item as the default if .comment is not present + ucrDataFrameSheets.cboAvailableDataFrames.SelectedIndex = 0 End If End Sub @@ -284,8 +284,8 @@ Public Class dlgExportToClimsoft End Sub Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElements.ControlContentsChanged, - ucrReceiverDate.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, - ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged + ucrReceiverDate.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, ucrChkAddReport.ControlContentsChanged, + ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrDataFrameSheets.ControlContentsChanged TestOkEnabled() End Sub @@ -299,13 +299,12 @@ Public Class dlgExportToClimsoft Private Sub ucrDataFrameSheets_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFrameSheets.ControlValueChanged AddingComments() - End Sub - - Private Sub ucrReceiverComments_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverComments.ControlValueChanged clsExportCommentsFunction.AddParameter("x", clsRFunctionParameter:=ucrDataFrameSheets.clsCurrDataFrame, iPosition:=1) SettingBaseFunction() + End Sub + Private Sub ucrChkAddReport_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddReport.ControlValueChanged AddingComments() If ucrChkAddReport.Checked Then @@ -313,7 +312,7 @@ Public Class dlgExportToClimsoft End If SettingBaseFunction() EnableDisableComments() - + TestOkEnabled() End Sub Private Sub ucrInputHour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHour.ControlValueChanged @@ -343,6 +342,7 @@ Public Class dlgExportToClimsoft Private Sub ucrPnlOutput_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOutput.ControlValueChanged EnableDisableComments() SettingBaseFunction() + TestOkEnabled() End Sub End Class \ No newline at end of file From f5c6f49625539ad477be03bb406c54af8db878b6 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 14:00:04 +0300 Subject: [PATCH 226/273] redo implementation --- instat/static/InstatObject/R/data_object_R6.R | 22 ++++++++++++++++++- .../static/InstatObject/R/instat_object_R6.R | 5 +++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 818e8adad8e..2d945478b50 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list()) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list(), redo_history = list()) { # Set up the data object self$set_data(data, messages) @@ -63,6 +63,7 @@ DataSheet <- R6::R6Class("DataSheet", objects = list(), keys = list(), history = list(), + redo_history = list(), comments = list(), calculations = list(), scalars = list(), @@ -207,6 +208,25 @@ DataSheet$set("public", "undo_last_action", function() { } }) +# Redo function +DataSheet$set("public", "redo_last_action", function() { + if (length(private$redo_history) > 0) { + # Get the last undone state from redo history + next_state <- private$redo_history[[length(private$redo_history)]] + + # Restore the next state + self$set_data(as.data.frame(next_state)) + + # Move the state back to the history + private$history <- append(private$history, list(next_state)) + + # Remove the state from redo history + private$redo_history <- private$redo_history[-length(private$redo_history)] + } else { + message("No more actions to redo.") + } +}) + #Removed until can be fixed with attributes # DataSheet$set("public", "set_variables_metadata", function(new_meta) { # if(!is.data.frame(new_meta)) stop("variable metadata must be of type: data.frame") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 95affddcc3a..05a922fd26f 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1362,6 +1362,11 @@ DataBook$set("public","undo_last_action", function(data_name) { } ) +DataBook$set("public","redo_last_action", function(data_name) { + self$get_data_objects(data_name)$redo_last_action() +} +) + DataBook$set("public","get_keys", function(data_name, key_name) { self$get_data_objects(data_name)$get_keys(key_name) } From e418e093e21de67491c17aeeaf7a74bf82d978f1 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Mon, 14 Oct 2024 14:13:00 +0200 Subject: [PATCH 227/273] Code Changes --- instat/frmMain.Designer.vb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index 890ed9c4919..b6e4800811e 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -5262,9 +5262,7 @@ Partial Class frmMain Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar Me.Name = "frmMain" - Me.Text = "R-Instat " + My.Application.Info.Version.Major.ToString + "." + - My.Application.Info.Version.Minor.ToString + "." + - My.Application.Info.Version.Build.ToString + Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized Me.stsStrip.ResumeLayout(False) Me.stsStrip.PerformLayout() From b91fb752a8cd7ef241d8ccc5022eaf2dce12f1ee Mon Sep 17 00:00:00 2001 From: Fidel365 <107605960+Fidel365@users.noreply.github.com> Date: Mon, 14 Oct 2024 15:14:07 +0300 Subject: [PATCH 228/273] frac_den change --- instat/ucrCalculator.Designer.vb | 100 +++++++++++++++---------------- instat/ucrCalculator.vb | 4 +- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/instat/ucrCalculator.Designer.vb b/instat/ucrCalculator.Designer.vb index 38ef121feff..e2921d45d82 100644 --- a/instat/ucrCalculator.Designer.vb +++ b/instat/ucrCalculator.Designer.vb @@ -635,6 +635,10 @@ Partial Class ucrCalculator Me.ucrSelectorForCalculations = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrReceiverForCalculation = New instat.ucrReceiverExpression() Me.grpFunctions = New System.Windows.Forms.GroupBox() + Me.cmdFracDen = New System.Windows.Forms.Button() + Me.cmdFrac20 = New System.Windows.Forms.Button() + Me.cmdFrac100 = New System.Windows.Forms.Button() + Me.cmdFrac10 = New System.Windows.Forms.Button() Me.cmdDigitsumSession = New System.Windows.Forms.Button() Me.cmdDigitsquSession = New System.Windows.Forms.Button() Me.cmdFunctionsDigitsum = New System.Windows.Forms.Button() @@ -665,10 +669,6 @@ Partial Class ucrCalculator Me.cmdPolynomial = New System.Windows.Forms.Button() Me.cmdOrigin = New System.Windows.Forms.Button() Me.ucrChkStoreScalar = New System.Windows.Forms.CheckBox() - Me.cmdFracDen = New System.Windows.Forms.Button() - Me.cmdFrac20 = New System.Windows.Forms.Button() - Me.cmdFrac100 = New System.Windows.Forms.Button() - Me.cmdFrac10 = New System.Windows.Forms.Button() Me.grpBasic.SuspendLayout Me.grpDates.SuspendLayout Me.ContextMenuStripDate.SuspendLayout @@ -7814,11 +7814,55 @@ Partial Class ucrCalculator Me.grpFunctions.Margin = New System.Windows.Forms.Padding(2) Me.grpFunctions.Name = "grpFunctions" Me.grpFunctions.Padding = New System.Windows.Forms.Padding(2) - Me.grpFunctions.Size = New System.Drawing.Size(259, 278) + Me.grpFunctions.Size = New System.Drawing.Size(259, 280) Me.grpFunctions.TabIndex = 216 Me.grpFunctions.TabStop = False Me.grpFunctions.Text = "Functions" ' + 'cmdFracDen + ' + Me.cmdFracDen.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFracDen.Location = New System.Drawing.Point(189, 159) + Me.cmdFracDen.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFracDen.Name = "cmdFracDen" + Me.cmdFracDen.Size = New System.Drawing.Size(62, 30) + Me.cmdFracDen.TabIndex = 232 + Me.cmdFracDen.Text = "frac_den" + Me.cmdFracDen.UseVisualStyleBackColor = True + ' + 'cmdFrac20 + ' + Me.cmdFrac20.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFrac20.Location = New System.Drawing.Point(67, 159) + Me.cmdFrac20.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrac20.Name = "cmdFrac20" + Me.cmdFrac20.Size = New System.Drawing.Size(62, 30) + Me.cmdFrac20.TabIndex = 231 + Me.cmdFrac20.Text = "frac20" + Me.cmdFrac20.UseVisualStyleBackColor = True + ' + 'cmdFrac100 + ' + Me.cmdFrac100.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFrac100.Location = New System.Drawing.Point(128, 159) + Me.cmdFrac100.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrac100.Name = "cmdFrac100" + Me.cmdFrac100.Size = New System.Drawing.Size(62, 30) + Me.cmdFrac100.TabIndex = 230 + Me.cmdFrac100.Text = "frac100" + Me.cmdFrac100.UseVisualStyleBackColor = True + ' + 'cmdFrac10 + ' + Me.cmdFrac10.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdFrac10.Location = New System.Drawing.Point(2, 159) + Me.cmdFrac10.Margin = New System.Windows.Forms.Padding(2) + Me.cmdFrac10.Name = "cmdFrac10" + Me.cmdFrac10.Size = New System.Drawing.Size(66, 30) + Me.cmdFrac10.TabIndex = 229 + Me.cmdFrac10.Text = "frac10" + Me.cmdFrac10.UseVisualStyleBackColor = True + ' 'cmdDigitsumSession ' Me.cmdDigitsumSession.ImeMode = System.Windows.Forms.ImeMode.NoControl @@ -7901,7 +7945,7 @@ Partial Class ucrCalculator ' Me.cmdRhelpFunctions.AutoSize = True Me.cmdRhelpFunctions.ContextMenuStrip = Me.ContextMenuStripFunctions - Me.cmdRhelpFunctions.Location = New System.Drawing.Point(165, 251) + Me.cmdRhelpFunctions.Location = New System.Drawing.Point(165, 246) Me.cmdRhelpFunctions.Margin = New System.Windows.Forms.Padding(2) Me.cmdRhelpFunctions.Name = "cmdRhelpFunctions" Me.cmdRhelpFunctions.Size = New System.Drawing.Size(86, 30) @@ -8171,50 +8215,6 @@ Partial Class ucrCalculator Me.ucrChkStoreScalar.Text = "CheckBox1" Me.ucrChkStoreScalar.UseVisualStyleBackColor = True ' - 'cmdFracDen - ' - Me.cmdFracDen.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFracDen.Location = New System.Drawing.Point(189, 159) - Me.cmdFracDen.Margin = New System.Windows.Forms.Padding(2) - Me.cmdFracDen.Name = "cmdFracDen" - Me.cmdFracDen.Size = New System.Drawing.Size(62, 30) - Me.cmdFracDen.TabIndex = 232 - Me.cmdFracDen.Text = "frac_den" - Me.cmdFracDen.UseVisualStyleBackColor = True - ' - 'cmdFrac20 - ' - Me.cmdFrac20.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFrac20.Location = New System.Drawing.Point(67, 159) - Me.cmdFrac20.Margin = New System.Windows.Forms.Padding(2) - Me.cmdFrac20.Name = "cmdFrac20" - Me.cmdFrac20.Size = New System.Drawing.Size(62, 30) - Me.cmdFrac20.TabIndex = 231 - Me.cmdFrac20.Text = "frac20" - Me.cmdFrac20.UseVisualStyleBackColor = True - ' - 'cmdFrac100 - ' - Me.cmdFrac100.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFrac100.Location = New System.Drawing.Point(128, 159) - Me.cmdFrac100.Margin = New System.Windows.Forms.Padding(2) - Me.cmdFrac100.Name = "cmdFrac100" - Me.cmdFrac100.Size = New System.Drawing.Size(62, 30) - Me.cmdFrac100.TabIndex = 230 - Me.cmdFrac100.Text = "frac100" - Me.cmdFrac100.UseVisualStyleBackColor = True - ' - 'cmdFrac10 - ' - Me.cmdFrac10.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdFrac10.Location = New System.Drawing.Point(2, 159) - Me.cmdFrac10.Margin = New System.Windows.Forms.Padding(2) - Me.cmdFrac10.Name = "cmdFrac10" - Me.cmdFrac10.Size = New System.Drawing.Size(66, 30) - Me.cmdFrac10.TabIndex = 229 - Me.cmdFrac10.Text = "frac10" - Me.cmdFrac10.UseVisualStyleBackColor = True - ' 'ucrCalculator ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index c0adc1c4449..745d960a3dc 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -6128,9 +6128,9 @@ Public Class ucrCalculator Private Sub cmdFracDen_Click(sender As Object, e As EventArgs) Handles cmdFracDen.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(x= , denominator= )", 17) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(x= ,den= )", 8) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den( , )", 4) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("frac_den(, )", 3) End If End Sub End Class \ No newline at end of file From 513f116d21fe4d39ab86fc035ea1091eb3b17018 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 14 Oct 2024 15:27:09 +0300 Subject: [PATCH 229/273] added undo feature to more operations done in data --- instat/static/InstatObject/R/data_object_R6.R | 5 + instat/ucrDataView.Designer.vb | 341 ++++++++++-------- instat/ucrDataView.resx | 2 +- instat/ucrDataView.vb | 6 +- 4 files changed, 197 insertions(+), 157 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2d945478b50..27bae1008cd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1346,6 +1346,8 @@ DataSheet$set("public", "add_defaults_variables_metadata", function(column_names DataSheet$set("public", "remove_rows_in_data", function(row_names) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() + if(!all(row_names %in% rownames(curr_data))) stop("Some of the row_names not found in data") rows_to_remove <- which(rownames(curr_data) %in% row_names) #Prefer not to use dplyr::slice as it produces a tibble @@ -1392,6 +1394,7 @@ DataSheet$set("public", "reorder_columns_in_data", function(col_order) { DataSheet$set("public", "insert_row_in_data", function(start_row, row_data = c(), number_rows = 1, before = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() curr_row_names <- rownames(curr_data) if (!start_row %in% curr_row_names) { stop(paste(start_row, " not found in rows")) @@ -4574,6 +4577,8 @@ DataSheet$set("public", "remove_empty", function(which = c("rows", "cols")) { DataSheet$set("public", "replace_values_with_NA", function(row_index, column_index) { curr_data <- self$get_data_frame(use_current_filter = FALSE) + self$save_state_to_history() + if(!all(row_index %in% seq_len(nrow(curr_data)))) stop("All row indexes must be within the dataframe") if(!all(column_index %in% seq_len(ncol(curr_data)))) stop("All column indexes must be within the dataframe") curr_data[row_index, column_index] <- NA diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 72b122e3328..6f86b446e0f 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -150,9 +150,9 @@ Partial Class ucrDataView Me.lblRowNext = New System.Windows.Forms.Label() Me.lblColLast = New System.Windows.Forms.Label() Me.lblRowBack = New System.Windows.Forms.Label() + Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.ucrReoGrid = New instat.ucrDataViewReoGrid() Me.ucrLinuxGrid = New instat.ucrDataViewLinuxGrid() - Me.ttGoToRowOrColPage = New System.Windows.Forms.ToolTip(Me.components) Me.columnContextMenuStrip.SuspendLayout() Me.cellContextMenuStrip.SuspendLayout() Me.rowContextMenuStrip.SuspendLayout() @@ -171,159 +171,159 @@ Partial Class ucrDataView Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.ToolStripSeparator13, Me.mnuEditCell2, Me.mnuDeleteCells2, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilterRows, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter, Me.ToolStripSeparator8, Me.mnuHelp}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" - Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 496) + Me.columnContextMenuStrip.Size = New System.Drawing.Size(293, 706) ' 'mnuColumnRename ' Me.mnuColumnRename.Name = "mnuColumnRename" - Me.mnuColumnRename.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnRename.Size = New System.Drawing.Size(292, 32) Me.mnuColumnRename.Text = "Rename Column..." ' 'mnuDuplicateColumn ' Me.mnuDuplicateColumn.Name = "mnuDuplicateColumn" - Me.mnuDuplicateColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuDuplicateColumn.Size = New System.Drawing.Size(292, 32) Me.mnuDuplicateColumn.Text = "Duplicate Column..." ' 'mnuReorderColumns ' Me.mnuReorderColumns.Name = "mnuReorderColumns" - Me.mnuReorderColumns.Size = New System.Drawing.Size(214, 22) + Me.mnuReorderColumns.Size = New System.Drawing.Size(292, 32) Me.mnuReorderColumns.Text = "Reorder Column(s)..." ' 'mnuInsertColsBefore ' Me.mnuInsertColsBefore.Name = "mnuInsertColsBefore" - Me.mnuInsertColsBefore.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertColsBefore.Size = New System.Drawing.Size(292, 32) Me.mnuInsertColsBefore.Text = "Insert Column(s) Before" ' 'mnuInsertColsAfter ' Me.mnuInsertColsAfter.Name = "mnuInsertColsAfter" - Me.mnuInsertColsAfter.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertColsAfter.Size = New System.Drawing.Size(292, 32) Me.mnuInsertColsAfter.Text = "Insert Column(s) After" ' 'mnuDeleteCol ' Me.mnuDeleteCol.Name = "mnuDeleteCol" - Me.mnuDeleteCol.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCol.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCol.Text = "Delete Column(s)" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(289, 6) ' 'mnuEditCell2 ' Me.mnuEditCell2.Enabled = False Me.mnuEditCell2.Name = "mnuEditCell2" - Me.mnuEditCell2.Size = New System.Drawing.Size(214, 22) + Me.mnuEditCell2.Size = New System.Drawing.Size(292, 32) Me.mnuEditCell2.Text = "Edit Cell..." ' 'mnuDeleteCells2 ' Me.mnuDeleteCells2.Enabled = False Me.mnuDeleteCells2.Name = "mnuDeleteCells2" - Me.mnuDeleteCells2.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCells2.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCells2.Text = "Delete Cell(s)" ' 'toolStripMenuItem2 ' Me.toolStripMenuItem2.Name = "toolStripMenuItem2" - Me.toolStripMenuItem2.Size = New System.Drawing.Size(211, 6) + Me.toolStripMenuItem2.Size = New System.Drawing.Size(289, 6) ' 'mnuConvertToFactor ' Me.mnuConvertToFactor.Name = "mnuConvertToFactor" - Me.mnuConvertToFactor.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToFactor.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToFactor.Text = "Convert to Factor" ' 'mnuCovertToOrderedFactors ' Me.mnuCovertToOrderedFactors.Name = "mnuCovertToOrderedFactors" - Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(214, 22) + Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(292, 32) Me.mnuCovertToOrderedFactors.Text = "Convert to Ordered Factor" ' 'mnuConvertText ' Me.mnuConvertText.Name = "mnuConvertText" - Me.mnuConvertText.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertText.Size = New System.Drawing.Size(292, 32) Me.mnuConvertText.Text = "Convert to Character" ' 'mnuConvertToLogical ' Me.mnuConvertToLogical.Name = "mnuConvertToLogical" - Me.mnuConvertToLogical.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToLogical.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToLogical.Text = "Convert to Logical" ' 'mnuConvertVariate ' Me.mnuConvertVariate.Name = "mnuConvertVariate" - Me.mnuConvertVariate.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertVariate.Size = New System.Drawing.Size(292, 32) Me.mnuConvertVariate.Text = "Convert to Numeric" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(289, 6) ' 'mnuLevelsLabels ' Me.mnuLevelsLabels.Name = "mnuLevelsLabels" - Me.mnuLevelsLabels.Size = New System.Drawing.Size(214, 22) + Me.mnuLevelsLabels.Size = New System.Drawing.Size(292, 32) Me.mnuLevelsLabels.Text = "Levels/Labels..." ' 'toolStripMenuItem21 ' Me.toolStripMenuItem21.Name = "toolStripMenuItem21" - Me.toolStripMenuItem21.Size = New System.Drawing.Size(211, 6) + Me.toolStripMenuItem21.Size = New System.Drawing.Size(289, 6) ' 'mnuSort ' Me.mnuSort.Name = "mnuSort" - Me.mnuSort.Size = New System.Drawing.Size(214, 22) + Me.mnuSort.Size = New System.Drawing.Size(292, 32) Me.mnuSort.Text = "Sort..." ' 'mnuColumnAddComment ' Me.mnuColumnAddComment.Name = "mnuColumnAddComment" - Me.mnuColumnAddComment.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnAddComment.Size = New System.Drawing.Size(292, 32) Me.mnuColumnAddComment.Text = "Add Comment..." ' 'mnuColumnFilterRows ' Me.mnuColumnFilterRows.Name = "mnuColumnFilterRows" - Me.mnuColumnFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnFilterRows.Size = New System.Drawing.Size(292, 32) Me.mnuColumnFilterRows.Text = "Filter Rows..." ' 'mnuColumnContextColumnSelection ' Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" - Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuColumnContextColumnSelection.Text = "Select Columns..." ' 'mnuColumnContextRemoveCurrentColumnSelection ' Me.mnuColumnContextRemoveCurrentColumnSelection.Name = "mnuColumnContextRemoveCurrentColumnSelection" - Me.mnuColumnContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuColumnContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuClearColumnFilter ' Me.mnuClearColumnFilter.Name = "mnuClearColumnFilter" - Me.mnuClearColumnFilter.Size = New System.Drawing.Size(214, 22) + Me.mnuClearColumnFilter.Size = New System.Drawing.Size(292, 32) Me.mnuClearColumnFilter.Text = "Remove Current Filter" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(289, 6) ' 'mnuHelp ' Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp.Size = New System.Drawing.Size(292, 32) Me.mnuHelp.Text = "Help" ' 'cellContextMenuStrip @@ -331,146 +331,146 @@ Partial Class ucrDataView Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuDeleteCol2, Me.ToolStripSeparator14, Me.mnuEditCell, Me.mnuDeleteCells, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilterRows, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters, Me.ToolStripSeparator9, Me.mnuHelp1}) Me.cellContextMenuStrip.Name = "cellContextMenuStrip" - Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 452) + Me.cellContextMenuStrip.Size = New System.Drawing.Size(293, 642) ' 'mnuRenameColumn ' Me.mnuRenameColumn.Name = "mnuRenameColumn" - Me.mnuRenameColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuRenameColumn.Size = New System.Drawing.Size(292, 32) Me.mnuRenameColumn.Text = "Rename Column..." ' 'mnuDuplColumn ' Me.mnuDuplColumn.Name = "mnuDuplColumn" - Me.mnuDuplColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuDuplColumn.Size = New System.Drawing.Size(292, 32) Me.mnuDuplColumn.Text = "Duplicate Column..." ' 'mnuReorderColumn ' Me.mnuReorderColumn.Name = "mnuReorderColumn" - Me.mnuReorderColumn.Size = New System.Drawing.Size(214, 22) + Me.mnuReorderColumn.Size = New System.Drawing.Size(292, 32) Me.mnuReorderColumn.Text = "Reorder Column(s)..." ' 'mnuDeleteCol2 ' Me.mnuDeleteCol2.Enabled = False Me.mnuDeleteCol2.Name = "mnuDeleteCol2" - Me.mnuDeleteCol2.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCol2.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCol2.Text = "Delete Column(s)" ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(289, 6) ' 'mnuEditCell ' Me.mnuEditCell.Name = "mnuEditCell" - Me.mnuEditCell.Size = New System.Drawing.Size(214, 22) + Me.mnuEditCell.Size = New System.Drawing.Size(292, 32) Me.mnuEditCell.Text = "Edit Cell..." ' 'mnuDeleteCells ' Me.mnuDeleteCells.Name = "mnuDeleteCells" - Me.mnuDeleteCells.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteCells.Size = New System.Drawing.Size(292, 32) Me.mnuDeleteCells.Text = "Delete Cell(s)" ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(289, 6) ' 'mnuConvertToFact ' Me.mnuConvertToFact.Name = "mnuConvertToFact" - Me.mnuConvertToFact.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToFact.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToFact.Text = "Convert to Factor" ' 'mnuConvertToOrderedFactor ' Me.mnuConvertToOrderedFactor.Name = "mnuConvertToOrderedFactor" - Me.mnuConvertToOrderedFactor.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToOrderedFactor.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToOrderedFactor.Text = "Convert to Ordered Factor" ' 'mnuConvertToCharacter ' Me.mnuConvertToCharacter.Name = "mnuConvertToCharacter" - Me.mnuConvertToCharacter.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToCharacter.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToCharacter.Text = "Convert to Character" ' 'mnuConvertToLogic ' Me.mnuConvertToLogic.Name = "mnuConvertToLogic" - Me.mnuConvertToLogic.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToLogic.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToLogic.Text = "Convert to Logical" ' 'mnuConvertToNumeric ' Me.mnuConvertToNumeric.Name = "mnuConvertToNumeric" - Me.mnuConvertToNumeric.Size = New System.Drawing.Size(214, 22) + Me.mnuConvertToNumeric.Size = New System.Drawing.Size(292, 32) Me.mnuConvertToNumeric.Text = "Convert to Numeric" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(289, 6) ' 'mnuLabelsLevel ' Me.mnuLabelsLevel.Name = "mnuLabelsLevel" - Me.mnuLabelsLevel.Size = New System.Drawing.Size(214, 22) + Me.mnuLabelsLevel.Size = New System.Drawing.Size(292, 32) Me.mnuLabelsLevel.Text = "Levels/Labels..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(289, 6) ' 'mnuSorts ' Me.mnuSorts.Name = "mnuSorts" - Me.mnuSorts.Size = New System.Drawing.Size(214, 22) + Me.mnuSorts.Size = New System.Drawing.Size(292, 32) Me.mnuSorts.Text = "Sort..." ' 'mnuComment ' Me.mnuComment.Name = "mnuComment" - Me.mnuComment.Size = New System.Drawing.Size(214, 22) + Me.mnuComment.Size = New System.Drawing.Size(292, 32) Me.mnuComment.Text = "Add Comment..." ' 'mnuFilterRows ' Me.mnuFilterRows.Name = "mnuFilterRows" - Me.mnuFilterRows.Size = New System.Drawing.Size(214, 22) + Me.mnuFilterRows.Size = New System.Drawing.Size(292, 32) Me.mnuFilterRows.Text = "Filter Rows..." ' 'mnuCellContextColumnSelection ' Me.mnuCellContextColumnSelection.Name = "mnuCellContextColumnSelection" - Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuCellContextColumnSelection.Text = "Select Columns..." ' 'mnuCellContextRemoveCurrentColumnSelection ' Me.mnuCellContextRemoveCurrentColumnSelection.Name = "mnuCellContextRemoveCurrentColumnSelection" - Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(292, 32) Me.mnuCellContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuRemoveCurrentFilters ' Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" - Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) + Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(292, 32) Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(289, 6) ' 'mnuHelp1 ' Me.mnuHelp1.Name = "mnuHelp1" - Me.mnuHelp1.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp1.Size = New System.Drawing.Size(292, 32) Me.mnuHelp1.Text = "Help" ' 'rowContextMenuStrip @@ -478,77 +478,77 @@ Partial Class ucrDataView Me.rowContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) Me.rowContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuInsertRowsBefore, Me.mnuInsertRowsAfter, Me.mnuDeleteRows, Me.ToolStripSeparator2, Me.mnuAddComment, Me.ToolStripSeparator4, Me.mnuFilter, Me.mnuRowContextColumnSelection, Me.mnuRowContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilter, Me.ToolStripSeparator10, Me.mnuHelp2}) Me.rowContextMenuStrip.Name = "columnContextMenuStrip" - Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 220) + Me.rowContextMenuStrip.Size = New System.Drawing.Size(292, 343) ' 'mnuInsertRowsBefore ' Me.mnuInsertRowsBefore.Name = "mnuInsertRowsBefore" - Me.mnuInsertRowsBefore.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertRowsBefore.Size = New System.Drawing.Size(291, 32) Me.mnuInsertRowsBefore.Text = "Insert Row(s) Before" ' 'mnuInsertRowsAfter ' Me.mnuInsertRowsAfter.Name = "mnuInsertRowsAfter" - Me.mnuInsertRowsAfter.Size = New System.Drawing.Size(214, 22) + Me.mnuInsertRowsAfter.Size = New System.Drawing.Size(291, 32) Me.mnuInsertRowsAfter.Text = "Insert Row(s) After" ' 'mnuDeleteRows ' Me.mnuDeleteRows.Name = "mnuDeleteRows" - Me.mnuDeleteRows.Size = New System.Drawing.Size(214, 22) + Me.mnuDeleteRows.Size = New System.Drawing.Size(291, 32) Me.mnuDeleteRows.Text = "Delete Row(s)" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(288, 6) ' 'mnuAddComment ' Me.mnuAddComment.Name = "mnuAddComment" - Me.mnuAddComment.Size = New System.Drawing.Size(214, 22) + Me.mnuAddComment.Size = New System.Drawing.Size(291, 32) Me.mnuAddComment.Text = "Add Comment..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(288, 6) ' 'mnuFilter ' Me.mnuFilter.Name = "mnuFilter" - Me.mnuFilter.Size = New System.Drawing.Size(214, 22) + Me.mnuFilter.Size = New System.Drawing.Size(291, 32) Me.mnuFilter.Tag = "Filter..." Me.mnuFilter.Text = "Filter Rows..." ' 'mnuRowContextColumnSelection ' Me.mnuRowContextColumnSelection.Name = "mnuRowContextColumnSelection" - Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(291, 32) Me.mnuRowContextColumnSelection.Text = "Select Columns..." ' 'mnuRowContextRemoveCurrentColumnSelection ' Me.mnuRowContextRemoveCurrentColumnSelection.Name = "mnuRowContextRemoveCurrentColumnSelection" - Me.mnuRowContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuRowContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(291, 32) Me.mnuRowContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuRemoveCurrentFilter ' Me.mnuRemoveCurrentFilter.Name = "mnuRemoveCurrentFilter" - Me.mnuRemoveCurrentFilter.Size = New System.Drawing.Size(214, 22) + Me.mnuRemoveCurrentFilter.Size = New System.Drawing.Size(291, 32) Me.mnuRemoveCurrentFilter.Tag = "Remove_Current_Filter" Me.mnuRemoveCurrentFilter.Text = "Remove Current Filter" ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(211, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(288, 6) ' 'mnuHelp2 ' Me.mnuHelp2.Name = "mnuHelp2" - Me.mnuHelp2.Size = New System.Drawing.Size(214, 22) + Me.mnuHelp2.Size = New System.Drawing.Size(291, 32) Me.mnuHelp2.Text = "Help" ' 'statusColumnMenu @@ -556,77 +556,77 @@ Partial Class ucrDataView Me.statusColumnMenu.ImageScalingSize = New System.Drawing.Size(20, 20) Me.statusColumnMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.renameSheet, Me.reorderSheet, Me.CopySheet, Me.deleteDataFrame, Me.HideSheet, Me.unhideSheet, Me.ToolStripSeparator12, Me.mnuBottomAddComment, Me.mnuViewHTML, Me.ViewSheet, Me.ToolStripSeparator11, Me.mnuHelp3}) Me.statusColumnMenu.Name = "statusColumnMenu" - Me.statusColumnMenu.Size = New System.Drawing.Size(163, 236) + Me.statusColumnMenu.Size = New System.Drawing.Size(218, 336) ' 'renameSheet ' Me.renameSheet.Name = "renameSheet" - Me.renameSheet.Size = New System.Drawing.Size(162, 22) + Me.renameSheet.Size = New System.Drawing.Size(217, 32) Me.renameSheet.Text = "Rename..." ' 'reorderSheet ' Me.reorderSheet.Name = "reorderSheet" - Me.reorderSheet.Size = New System.Drawing.Size(162, 22) + Me.reorderSheet.Size = New System.Drawing.Size(217, 32) Me.reorderSheet.Text = "Reorder..." ' 'CopySheet ' Me.CopySheet.Name = "CopySheet" - Me.CopySheet.Size = New System.Drawing.Size(162, 22) + Me.CopySheet.Size = New System.Drawing.Size(217, 32) Me.CopySheet.Text = "Copy..." ' 'deleteDataFrame ' Me.deleteDataFrame.Name = "deleteDataFrame" - Me.deleteDataFrame.Size = New System.Drawing.Size(162, 22) + Me.deleteDataFrame.Size = New System.Drawing.Size(217, 32) Me.deleteDataFrame.Text = "Delete..." ' 'HideSheet ' Me.HideSheet.Name = "HideSheet" - Me.HideSheet.Size = New System.Drawing.Size(162, 22) + Me.HideSheet.Size = New System.Drawing.Size(217, 32) Me.HideSheet.Text = "Hide" ' 'unhideSheet ' Me.unhideSheet.Name = "unhideSheet" - Me.unhideSheet.Size = New System.Drawing.Size(162, 22) + Me.unhideSheet.Size = New System.Drawing.Size(217, 32) Me.unhideSheet.Text = "Unhide..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(159, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(214, 6) ' 'mnuBottomAddComment ' Me.mnuBottomAddComment.Name = "mnuBottomAddComment" - Me.mnuBottomAddComment.Size = New System.Drawing.Size(162, 22) + Me.mnuBottomAddComment.Size = New System.Drawing.Size(217, 32) Me.mnuBottomAddComment.Text = "Add Comment..." ' 'mnuViewHTML ' Me.mnuViewHTML.Enabled = False Me.mnuViewHTML.Name = "mnuViewHTML" - Me.mnuViewHTML.Size = New System.Drawing.Size(162, 22) + Me.mnuViewHTML.Size = New System.Drawing.Size(217, 32) Me.mnuViewHTML.Text = "View HTML" ' 'ViewSheet ' Me.ViewSheet.Name = "ViewSheet" - Me.ViewSheet.Size = New System.Drawing.Size(162, 22) + Me.ViewSheet.Size = New System.Drawing.Size(217, 32) Me.ViewSheet.Text = "View Data Frame" ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(159, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(214, 6) ' 'mnuHelp3 ' Me.mnuHelp3.Name = "mnuHelp3" - Me.mnuHelp3.Size = New System.Drawing.Size(162, 22) + Me.mnuHelp3.Size = New System.Drawing.Size(217, 32) Me.mnuHelp3.Text = "Help" ' 'lblHeaderDataView @@ -636,9 +636,10 @@ Partial Class ucrDataView Me.lblHeaderDataView.Dock = System.Windows.Forms.DockStyle.Fill Me.lblHeaderDataView.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!) Me.lblHeaderDataView.ForeColor = System.Drawing.SystemColors.Control - Me.lblHeaderDataView.Location = New System.Drawing.Point(3, 0) + Me.lblHeaderDataView.Location = New System.Drawing.Point(4, 0) + Me.lblHeaderDataView.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHeaderDataView.Name = "lblHeaderDataView" - Me.lblHeaderDataView.Size = New System.Drawing.Size(742, 20) + Me.lblHeaderDataView.Size = New System.Drawing.Size(1114, 30) Me.lblHeaderDataView.TabIndex = 5 Me.lblHeaderDataView.Text = "Data View" Me.lblHeaderDataView.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -649,7 +650,7 @@ Partial Class ucrDataView Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33333!)) - Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 13.0!)) + Me.tlpTableContainer.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) Me.tlpTableContainer.Controls.Add(Me.panelSectionsAll, 0, 1) Me.tlpTableContainer.Controls.Add(Me.lblHeaderDataView, 0, 0) Me.tlpTableContainer.Controls.Add(Me.TblPanPageDisplay, 1, 2) @@ -657,12 +658,13 @@ Partial Class ucrDataView Me.tlpTableContainer.Controls.Add(Me.ucrLinuxGrid, 1, 1) Me.tlpTableContainer.Dock = System.Windows.Forms.DockStyle.Fill Me.tlpTableContainer.Location = New System.Drawing.Point(0, 0) + Me.tlpTableContainer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tlpTableContainer.Name = "tlpTableContainer" Me.tlpTableContainer.RowCount = 3 - Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) + Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!)) Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20.0!)) - Me.tlpTableContainer.Size = New System.Drawing.Size(748, 481) + Me.tlpTableContainer.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30.0!)) + Me.tlpTableContainer.Size = New System.Drawing.Size(1122, 722) Me.tlpTableContainer.TabIndex = 6 ' 'panelSectionsAll @@ -672,10 +674,11 @@ Partial Class ucrDataView Me.panelSectionsAll.Controls.Add(Me.panelSectionStart) Me.panelSectionsAll.Controls.Add(Me.panelSectionRecent) Me.panelSectionsAll.Dock = System.Windows.Forms.DockStyle.Fill - Me.panelSectionsAll.Location = New System.Drawing.Point(3, 23) + Me.panelSectionsAll.Location = New System.Drawing.Point(4, 34) + Me.panelSectionsAll.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionsAll.Name = "panelSectionsAll" Me.tlpTableContainer.SetRowSpan(Me.panelSectionsAll, 2) - Me.panelSectionsAll.Size = New System.Drawing.Size(243, 455) + Me.panelSectionsAll.Size = New System.Drawing.Size(366, 684) Me.panelSectionsAll.TabIndex = 9 ' 'panelSectionAdvanced @@ -684,9 +687,10 @@ Partial Class ucrDataView Me.panelSectionAdvanced.Controls.Add(Me.lblAdvanced) Me.panelSectionAdvanced.Controls.Add(Me.linkStartRestoreBackup) Me.panelSectionAdvanced.Controls.Add(Me.linkStartPasteScriptfromClipboard) - Me.panelSectionAdvanced.Location = New System.Drawing.Point(27, 412) + Me.panelSectionAdvanced.Location = New System.Drawing.Point(40, 618) + Me.panelSectionAdvanced.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionAdvanced.Name = "panelSectionAdvanced" - Me.panelSectionAdvanced.Size = New System.Drawing.Size(374, 83) + Me.panelSectionAdvanced.Size = New System.Drawing.Size(561, 124) Me.panelSectionAdvanced.TabIndex = 12 ' 'linkStartAddRPackage @@ -695,9 +699,10 @@ Partial Class ucrDataView Me.linkStartAddRPackage.AutoSize = True Me.linkStartAddRPackage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartAddRPackage.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartAddRPackage.Location = New System.Drawing.Point(5, 64) + Me.linkStartAddRPackage.Location = New System.Drawing.Point(8, 96) + Me.linkStartAddRPackage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartAddRPackage.Name = "linkStartAddRPackage" - Me.linkStartAddRPackage.Size = New System.Drawing.Size(187, 13) + Me.linkStartAddRPackage.Size = New System.Drawing.Size(275, 20) Me.linkStartAddRPackage.TabIndex = 6 Me.linkStartAddRPackage.TabStop = True Me.linkStartAddRPackage.Text = "Add R Package To R-Instat... (Online)" @@ -707,9 +712,10 @@ Partial Class ucrDataView Me.lblAdvanced.AutoSize = True Me.lblAdvanced.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblAdvanced.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblAdvanced.Location = New System.Drawing.Point(3, 4) + Me.lblAdvanced.Location = New System.Drawing.Point(4, 6) + Me.lblAdvanced.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblAdvanced.Name = "lblAdvanced" - Me.lblAdvanced.Size = New System.Drawing.Size(108, 25) + Me.lblAdvanced.Size = New System.Drawing.Size(159, 37) Me.lblAdvanced.TabIndex = 0 Me.lblAdvanced.Text = "Advanced" ' @@ -719,9 +725,10 @@ Partial Class ucrDataView Me.linkStartRestoreBackup.AutoSize = True Me.linkStartRestoreBackup.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartRestoreBackup.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartRestoreBackup.Location = New System.Drawing.Point(5, 47) + Me.linkStartRestoreBackup.Location = New System.Drawing.Point(8, 70) + Me.linkStartRestoreBackup.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartRestoreBackup.Name = "linkStartRestoreBackup" - Me.linkStartRestoreBackup.Size = New System.Drawing.Size(145, 13) + Me.linkStartRestoreBackup.Size = New System.Drawing.Size(216, 20) Me.linkStartRestoreBackup.TabIndex = 4 Me.linkStartRestoreBackup.TabStop = True Me.linkStartRestoreBackup.Text = "Restore Data From Backup..." @@ -732,9 +739,10 @@ Partial Class ucrDataView Me.linkStartPasteScriptfromClipboard.AutoSize = True Me.linkStartPasteScriptfromClipboard.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteScriptfromClipboard.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(5, 30) + Me.linkStartPasteScriptfromClipboard.Location = New System.Drawing.Point(8, 45) + Me.linkStartPasteScriptfromClipboard.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartPasteScriptfromClipboard.Name = "linkStartPasteScriptfromClipboard" - Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(137, 13) + Me.linkStartPasteScriptfromClipboard.Size = New System.Drawing.Size(207, 20) Me.linkStartPasteScriptfromClipboard.TabIndex = 5 Me.linkStartPasteScriptfromClipboard.TabStop = True Me.linkStartPasteScriptfromClipboard.Text = "Paste Script From Clipboard" @@ -745,9 +753,10 @@ Partial Class ucrDataView Me.panelSectionHelp.Controls.Add(Me.linkHelpGettingStarted) Me.panelSectionHelp.Controls.Add(Me.lblHelp) Me.panelSectionHelp.Controls.Add(Me.linkHelpRInstatResourcesSite) - Me.panelSectionHelp.Location = New System.Drawing.Point(28, 317) + Me.panelSectionHelp.Location = New System.Drawing.Point(42, 476) + Me.panelSectionHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionHelp.Name = "panelSectionHelp" - Me.panelSectionHelp.Size = New System.Drawing.Size(374, 81) + Me.panelSectionHelp.Size = New System.Drawing.Size(561, 122) Me.panelSectionHelp.TabIndex = 12 ' 'linkHelpData @@ -756,9 +765,10 @@ Partial Class ucrDataView Me.linkHelpData.AutoSize = True Me.linkHelpData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpData.Location = New System.Drawing.Point(5, 47) + Me.linkHelpData.Location = New System.Drawing.Point(8, 70) + Me.linkHelpData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkHelpData.Name = "linkHelpData" - Me.linkHelpData.Size = New System.Drawing.Size(39, 13) + Me.linkHelpData.Size = New System.Drawing.Size(56, 20) Me.linkHelpData.TabIndex = 12 Me.linkHelpData.TabStop = True Me.linkHelpData.Text = "Data..." @@ -769,9 +779,10 @@ Partial Class ucrDataView Me.linkHelpGettingStarted.AutoSize = True Me.linkHelpGettingStarted.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpGettingStarted.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpGettingStarted.Location = New System.Drawing.Point(5, 30) + Me.linkHelpGettingStarted.Location = New System.Drawing.Point(8, 45) + Me.linkHelpGettingStarted.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkHelpGettingStarted.Name = "linkHelpGettingStarted" - Me.linkHelpGettingStarted.Size = New System.Drawing.Size(87, 13) + Me.linkHelpGettingStarted.Size = New System.Drawing.Size(131, 20) Me.linkHelpGettingStarted.TabIndex = 11 Me.linkHelpGettingStarted.TabStop = True Me.linkHelpGettingStarted.Text = "Getting Started..." @@ -781,9 +792,10 @@ Partial Class ucrDataView Me.lblHelp.AutoSize = True Me.lblHelp.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblHelp.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHelp.Location = New System.Drawing.Point(3, 4) + Me.lblHelp.Location = New System.Drawing.Point(4, 6) + Me.lblHelp.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHelp.Name = "lblHelp" - Me.lblHelp.Size = New System.Drawing.Size(56, 25) + Me.lblHelp.Size = New System.Drawing.Size(82, 37) Me.lblHelp.TabIndex = 2 Me.lblHelp.Text = "Help" ' @@ -793,9 +805,10 @@ Partial Class ucrDataView Me.linkHelpRInstatResourcesSite.AutoSize = True Me.linkHelpRInstatResourcesSite.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkHelpRInstatResourcesSite.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(5, 64) + Me.linkHelpRInstatResourcesSite.Location = New System.Drawing.Point(8, 96) + Me.linkHelpRInstatResourcesSite.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkHelpRInstatResourcesSite.Name = "linkHelpRInstatResourcesSite" - Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(158, 13) + Me.linkHelpRInstatResourcesSite.Size = New System.Drawing.Size(239, 20) Me.linkHelpRInstatResourcesSite.TabIndex = 9 Me.linkHelpRInstatResourcesSite.TabStop = True Me.linkHelpRInstatResourcesSite.Text = "R-Instat Resources Site (Online)" @@ -807,9 +820,10 @@ Partial Class ucrDataView Me.panelSectionStart.Controls.Add(Me.linkStartNewDataFrame) Me.panelSectionStart.Controls.Add(Me.linkStartOpenFile) Me.panelSectionStart.Controls.Add(Me.linkStartOpenLibrary) - Me.panelSectionStart.Location = New System.Drawing.Point(28, 15) + Me.panelSectionStart.Location = New System.Drawing.Point(42, 22) + Me.panelSectionStart.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionStart.Name = "panelSectionStart" - Me.panelSectionStart.Size = New System.Drawing.Size(374, 100) + Me.panelSectionStart.Size = New System.Drawing.Size(561, 150) Me.panelSectionStart.TabIndex = 11 ' 'linkStartPasteData @@ -818,9 +832,10 @@ Partial Class ucrDataView Me.linkStartPasteData.AutoSize = True Me.linkStartPasteData.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartPasteData.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartPasteData.Location = New System.Drawing.Point(5, 81) + Me.linkStartPasteData.Location = New System.Drawing.Point(8, 122) + Me.linkStartPasteData.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartPasteData.Name = "linkStartPasteData" - Me.linkStartPasteData.Size = New System.Drawing.Size(142, 13) + Me.linkStartPasteData.Size = New System.Drawing.Size(213, 20) Me.linkStartPasteData.TabIndex = 7 Me.linkStartPasteData.TabStop = True Me.linkStartPasteData.Text = "Paste Data From Clipboard..." @@ -830,9 +845,10 @@ Partial Class ucrDataView Me.lblStart.AutoSize = True Me.lblStart.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblStart.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStart.Location = New System.Drawing.Point(3, 4) + Me.lblStart.Location = New System.Drawing.Point(4, 6) + Me.lblStart.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblStart.Name = "lblStart" - Me.lblStart.Size = New System.Drawing.Size(57, 25) + Me.lblStart.Size = New System.Drawing.Size(85, 37) Me.lblStart.TabIndex = 0 Me.lblStart.Text = "Start" ' @@ -842,9 +858,10 @@ Partial Class ucrDataView Me.linkStartNewDataFrame.AutoSize = True Me.linkStartNewDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartNewDataFrame.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartNewDataFrame.Location = New System.Drawing.Point(5, 30) + Me.linkStartNewDataFrame.Location = New System.Drawing.Point(8, 45) + Me.linkStartNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartNewDataFrame.Name = "linkStartNewDataFrame" - Me.linkStartNewDataFrame.Size = New System.Drawing.Size(96, 13) + Me.linkStartNewDataFrame.Size = New System.Drawing.Size(141, 20) Me.linkStartNewDataFrame.TabIndex = 3 Me.linkStartNewDataFrame.TabStop = True Me.linkStartNewDataFrame.Text = "New Data Frame..." @@ -855,9 +872,10 @@ Partial Class ucrDataView Me.linkStartOpenFile.AutoSize = True Me.linkStartOpenFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenFile.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenFile.Location = New System.Drawing.Point(5, 47) + Me.linkStartOpenFile.Location = New System.Drawing.Point(8, 70) + Me.linkStartOpenFile.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartOpenFile.Name = "linkStartOpenFile" - Me.linkStartOpenFile.Size = New System.Drawing.Size(90, 13) + Me.linkStartOpenFile.Size = New System.Drawing.Size(137, 20) Me.linkStartOpenFile.TabIndex = 4 Me.linkStartOpenFile.TabStop = True Me.linkStartOpenFile.Text = "Import From File..." @@ -868,9 +886,10 @@ Partial Class ucrDataView Me.linkStartOpenLibrary.AutoSize = True Me.linkStartOpenLibrary.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.linkStartOpenLibrary.LinkBehavior = System.Windows.Forms.LinkBehavior.NeverUnderline - Me.linkStartOpenLibrary.Location = New System.Drawing.Point(5, 64) + Me.linkStartOpenLibrary.Location = New System.Drawing.Point(8, 96) + Me.linkStartOpenLibrary.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.linkStartOpenLibrary.Name = "linkStartOpenLibrary" - Me.linkStartOpenLibrary.Size = New System.Drawing.Size(105, 13) + Me.linkStartOpenLibrary.Size = New System.Drawing.Size(159, 20) Me.linkStartOpenLibrary.TabIndex = 5 Me.linkStartOpenLibrary.TabStop = True Me.linkStartOpenLibrary.Text = "Import From Library..." @@ -881,9 +900,10 @@ Partial Class ucrDataView Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelSectionRecent.Controls.Add(Me.lblRecent) Me.panelSectionRecent.Controls.Add(Me.panelRecentMenuItems) - Me.panelSectionRecent.Location = New System.Drawing.Point(28, 124) + Me.panelSectionRecent.Location = New System.Drawing.Point(42, 186) + Me.panelSectionRecent.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelSectionRecent.Name = "panelSectionRecent" - Me.panelSectionRecent.Size = New System.Drawing.Size(179, 186) + Me.panelSectionRecent.Size = New System.Drawing.Size(270, 279) Me.panelSectionRecent.TabIndex = 13 ' 'lblRecent @@ -891,9 +911,10 @@ Partial Class ucrDataView Me.lblRecent.AutoSize = True Me.lblRecent.Font = New System.Drawing.Font("Microsoft Sans Serif", 15.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblRecent.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRecent.Location = New System.Drawing.Point(3, 4) + Me.lblRecent.Location = New System.Drawing.Point(4, 6) + Me.lblRecent.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRecent.Name = "lblRecent" - Me.lblRecent.Size = New System.Drawing.Size(80, 25) + Me.lblRecent.Size = New System.Drawing.Size(116, 37) Me.lblRecent.TabIndex = 1 Me.lblRecent.Text = "Recent" ' @@ -902,9 +923,10 @@ Partial Class ucrDataView Me.panelRecentMenuItems.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.panelRecentMenuItems.AutoScroll = True - Me.panelRecentMenuItems.Location = New System.Drawing.Point(5, 30) + Me.panelRecentMenuItems.Location = New System.Drawing.Point(8, 45) + Me.panelRecentMenuItems.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.panelRecentMenuItems.Name = "panelRecentMenuItems" - Me.panelRecentMenuItems.Size = New System.Drawing.Size(159, 138) + Me.panelRecentMenuItems.Size = New System.Drawing.Size(240, 207) Me.panelRecentMenuItems.TabIndex = 6 ' 'TblPanPageDisplay @@ -936,21 +958,22 @@ Partial Class ucrDataView Me.TblPanPageDisplay.Controls.Add(Me.lblRowBack, 3, 0) Me.TblPanPageDisplay.Dock = System.Windows.Forms.DockStyle.Fill Me.TblPanPageDisplay.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.TblPanPageDisplay.Location = New System.Drawing.Point(249, 461) + Me.TblPanPageDisplay.Location = New System.Drawing.Point(374, 692) Me.TblPanPageDisplay.Margin = New System.Windows.Forms.Padding(0) Me.TblPanPageDisplay.Name = "TblPanPageDisplay" Me.TblPanPageDisplay.RowCount = 1 Me.TblPanPageDisplay.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100.0!)) - Me.TblPanPageDisplay.Size = New System.Drawing.Size(499, 20) + Me.TblPanPageDisplay.Size = New System.Drawing.Size(748, 30) Me.TblPanPageDisplay.TabIndex = 8 ' 'lblColFirst ' Me.lblColFirst.AutoSize = True Me.lblColFirst.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColFirst.Location = New System.Drawing.Point(315, 0) + Me.lblColFirst.Location = New System.Drawing.Point(472, 0) + Me.lblColFirst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColFirst.Name = "lblColFirst" - Me.lblColFirst.Size = New System.Drawing.Size(18, 20) + Me.lblColFirst.Size = New System.Drawing.Size(26, 30) Me.lblColFirst.TabIndex = 15 Me.lblColFirst.Text = "«" Me.lblColFirst.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -959,9 +982,10 @@ Partial Class ucrDataView ' Me.lblColDisplay.AutoSize = True Me.lblColDisplay.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColDisplay.Location = New System.Drawing.Point(252, 0) + Me.lblColDisplay.Location = New System.Drawing.Point(378, 0) + Me.lblColDisplay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColDisplay.Name = "lblColDisplay" - Me.lblColDisplay.Size = New System.Drawing.Size(57, 20) + Me.lblColDisplay.Size = New System.Drawing.Size(86, 30) Me.lblColDisplay.TabIndex = 14 Me.lblColDisplay.Text = "Label1" Me.lblColDisplay.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -970,9 +994,10 @@ Partial Class ucrDataView ' Me.lblColNext.AutoSize = True Me.lblColNext.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColNext.Location = New System.Drawing.Point(363, 0) + Me.lblColNext.Location = New System.Drawing.Point(541, 0) + Me.lblColNext.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColNext.Name = "lblColNext" - Me.lblColNext.Size = New System.Drawing.Size(18, 20) + Me.lblColNext.Size = New System.Drawing.Size(27, 30) Me.lblColNext.TabIndex = 13 Me.lblColNext.Text = ">" Me.lblColNext.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -981,9 +1006,10 @@ Partial Class ucrDataView ' Me.lblColBack.AutoSize = True Me.lblColBack.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColBack.Location = New System.Drawing.Point(339, 0) + Me.lblColBack.Location = New System.Drawing.Point(506, 0) + Me.lblColBack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColBack.Name = "lblColBack" - Me.lblColBack.Size = New System.Drawing.Size(18, 20) + Me.lblColBack.Size = New System.Drawing.Size(27, 30) Me.lblColBack.TabIndex = 12 Me.lblColBack.Text = "<" Me.lblColBack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -992,9 +1018,10 @@ Partial Class ucrDataView ' Me.lblRowLast.AutoSize = True Me.lblRowLast.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowLast.Location = New System.Drawing.Point(228, 0) + Me.lblRowLast.Location = New System.Drawing.Point(344, 0) + Me.lblRowLast.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowLast.Name = "lblRowLast" - Me.lblRowLast.Size = New System.Drawing.Size(18, 20) + Me.lblRowLast.Size = New System.Drawing.Size(26, 30) Me.lblRowLast.TabIndex = 11 Me.lblRowLast.Text = "»" Me.lblRowLast.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1003,9 +1030,10 @@ Partial Class ucrDataView ' Me.lblRowFirst.AutoSize = True Me.lblRowFirst.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowFirst.Location = New System.Drawing.Point(156, 0) + Me.lblRowFirst.Location = New System.Drawing.Point(240, 0) + Me.lblRowFirst.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowFirst.Name = "lblRowFirst" - Me.lblRowFirst.Size = New System.Drawing.Size(18, 20) + Me.lblRowFirst.Size = New System.Drawing.Size(26, 30) Me.lblRowFirst.TabIndex = 10 Me.lblRowFirst.Text = "«" Me.lblRowFirst.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1015,9 +1043,10 @@ Partial Class ucrDataView Me.lblRowDisplay.AutoSize = True Me.lblRowDisplay.Dock = System.Windows.Forms.DockStyle.Fill Me.lblRowDisplay.ImageAlign = System.Drawing.ContentAlignment.TopCenter - Me.lblRowDisplay.Location = New System.Drawing.Point(93, 0) + Me.lblRowDisplay.Location = New System.Drawing.Point(146, 0) + Me.lblRowDisplay.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowDisplay.Name = "lblRowDisplay" - Me.lblRowDisplay.Size = New System.Drawing.Size(57, 20) + Me.lblRowDisplay.Size = New System.Drawing.Size(86, 30) Me.lblRowDisplay.TabIndex = 9 Me.lblRowDisplay.Text = "Label1" Me.lblRowDisplay.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -1026,9 +1055,10 @@ Partial Class ucrDataView ' Me.lblRowNext.AutoSize = True Me.lblRowNext.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowNext.Location = New System.Drawing.Point(204, 0) + Me.lblRowNext.Location = New System.Drawing.Point(309, 0) + Me.lblRowNext.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowNext.Name = "lblRowNext" - Me.lblRowNext.Size = New System.Drawing.Size(18, 20) + Me.lblRowNext.Size = New System.Drawing.Size(27, 30) Me.lblRowNext.TabIndex = 8 Me.lblRowNext.Text = ">" Me.lblRowNext.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1037,9 +1067,10 @@ Partial Class ucrDataView ' Me.lblColLast.AutoSize = True Me.lblColLast.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblColLast.Location = New System.Drawing.Point(387, 0) + Me.lblColLast.Location = New System.Drawing.Point(576, 0) + Me.lblColLast.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblColLast.Name = "lblColLast" - Me.lblColLast.Size = New System.Drawing.Size(18, 20) + Me.lblColLast.Size = New System.Drawing.Size(26, 30) Me.lblColLast.TabIndex = 7 Me.lblColLast.Text = "»" Me.lblColLast.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1048,9 +1079,10 @@ Partial Class ucrDataView ' Me.lblRowBack.AutoSize = True Me.lblRowBack.Dock = System.Windows.Forms.DockStyle.Fill - Me.lblRowBack.Location = New System.Drawing.Point(180, 0) + Me.lblRowBack.Location = New System.Drawing.Point(274, 0) + Me.lblRowBack.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblRowBack.Name = "lblRowBack" - Me.lblRowBack.Size = New System.Drawing.Size(18, 20) + Me.lblRowBack.Size = New System.Drawing.Size(27, 30) Me.lblRowBack.TabIndex = 5 Me.lblRowBack.Text = "<" Me.lblRowBack.TextAlign = System.Drawing.ContentAlignment.MiddleCenter @@ -1058,29 +1090,28 @@ Partial Class ucrDataView 'ucrReoGrid ' Me.ucrReoGrid.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrReoGrid.Location = New System.Drawing.Point(500, 22) - Me.ucrReoGrid.Margin = New System.Windows.Forms.Padding(2) + Me.ucrReoGrid.Location = New System.Drawing.Point(751, 33) Me.ucrReoGrid.Name = "ucrReoGrid" - Me.ucrReoGrid.Size = New System.Drawing.Size(246, 437) + Me.ucrReoGrid.Size = New System.Drawing.Size(368, 656) Me.ucrReoGrid.TabIndex = 12 ' 'ucrLinuxGrid ' Me.ucrLinuxGrid.Dock = System.Windows.Forms.DockStyle.Fill - Me.ucrLinuxGrid.Location = New System.Drawing.Point(251, 22) - Me.ucrLinuxGrid.Margin = New System.Windows.Forms.Padding(2) + Me.ucrLinuxGrid.Location = New System.Drawing.Point(377, 33) Me.ucrLinuxGrid.Name = "ucrLinuxGrid" - Me.ucrLinuxGrid.Size = New System.Drawing.Size(245, 437) + Me.ucrLinuxGrid.Size = New System.Drawing.Size(368, 656) Me.ucrLinuxGrid.TabIndex = 13 ' 'ucrDataView ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.Controls.Add(Me.tlpTableContainer) + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.Name = "ucrDataView" - Me.Size = New System.Drawing.Size(748, 481) + Me.Size = New System.Drawing.Size(1122, 722) Me.Tag = "Data_View" Me.columnContextMenuStrip.ResumeLayout(False) Me.cellContextMenuStrip.ResumeLayout(False) diff --git a/instat/ucrDataView.resx b/instat/ucrDataView.resx index 59af2d7d414..ff250794f81 100644 --- a/instat/ucrDataView.resx +++ b/instat/ucrDataView.resx @@ -133,6 +133,6 @@ 706, 17 - 25 + 118 \ No newline at end of file diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index c9357defb4d..89c4f0a1104 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -187,7 +187,7 @@ Public Class ucrDataView If GetSelectedColumns.Count = GetCurrentDataFrameFocus()?.iTotalColumnCount Then MsgBox("Cannot delete all visible columns." & Environment.NewLine & "Use Prepare > Data Object > Delete Data Frame if you wish to delete the data.", MsgBoxStyle.Information, "Cannot Delete All Columns") Else - Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?" & Environment.NewLine & "This action cannot be undone.", MessageBoxButtons.YesNo, "Delete Column") + Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?", MessageBoxButtons.YesNo, "Delete Column") If deleteCol = DialogResult.Yes Then StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteColumn(GetSelectedColumnNames()) @@ -201,12 +201,14 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.InsertRows(GetSelectedRows.Count, GetLastSelectedRow(), False) EndWait() + _grid.Focus() End Sub Private Sub mnuInsertRowsBefore_Click(sender As Object, e As EventArgs) Handles mnuInsertRowsBefore.Click StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.InsertRows(GetSelectedRows.Count, GetFirstSelectedRow, True) EndWait() + _grid.Focus() End Sub Private Sub mnuDeleteRows_Click(sender As Object, e As EventArgs) Handles mnuDeleteRows.Click @@ -215,6 +217,7 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteRows(GetSelectedRows()) EndWait() + _grid.Focus() End If End Sub @@ -911,6 +914,7 @@ Public Class ucrDataView StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteCells(GetSelectedRows(), GetSelectedColumnIndexes()) EndWait() + _grid.Focus() End If End Sub From 4380d012db604ea44018ca12ecb3a050e3d33f44 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Mon, 14 Oct 2024 17:43:53 +0300 Subject: [PATCH 230/273] changes --- instat/dlgExportToClimsoft.vb | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index a7bff98136d..5a4aab07695 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -20,7 +20,7 @@ Imports instat.Translations Public Class dlgExportToClimsoft Private bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsPosixctFunction, clsExportCommentsFunction As New RFunction + Private clsDataFrameFunction, clsGetDataFrameFunction, clsCurrentNewColumnFunction, clsDummyFunction, clsMutateFunction, clsExportClimsoftFunction, clsPasteFunction, clsSprintfFunction, clsPosixctFunction, clsExportCommentsFunction As New RFunction Private clsPipeOperator As New ROperator Private Sub dlgExportToClimsoft_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -85,7 +85,6 @@ Public Class dlgExportToClimsoft ucrInputExportFile.SetParameter(New RParameter("file", 1)) ucrInputExportFile.IsReadOnly = True ucrInputExportFile.SetLinkedDisplayControl(lblExport) - End Sub Private Sub SetDefaults() @@ -133,8 +132,12 @@ Public Class dlgExportToClimsoft clsSprintfFunction.SetRCommand("sprintf") clsSprintfFunction.AddParameter("hour", 6, iPosition:=1, bIncludeArgumentName:=False) + clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_frame") + clsGetDataFrameFunction.SetAssignTo(ucrDataFrameSheets.cboAvailableDataFrames.Text) + clsExportCommentsFunction.SetPackageName("rio") clsExportCommentsFunction.SetRCommand("export") + clsExportCommentsFunction.AddParameter("x", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=1) ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseROperator(clsPipeOperator) @@ -153,7 +156,6 @@ Public Class dlgExportToClimsoft ucrSaveNewDataFrame.SetRCode(clsPipeOperator, bReset) ucrInputExportFile.SetRCode(clsExportClimsoftFunction, bReset) ucrPnlDailyHourly.SetRCode(clsDummyFunction, bReset) - ucrDataFrameSheets.SetRCode(clsExportCommentsFunction, bReset) If bReset Then ucrPnlOutput.SetRCode(clsDummyFunction, bReset) ucrChkAddReport.SetRCode(clsDummyFunction, bReset) @@ -169,7 +171,6 @@ Public Class dlgExportToClimsoft ucrBase.OKEnabled(False) End If Else - If Not ucrChkAddReport.Checked Then If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then ucrBase.OKEnabled(True) @@ -201,7 +202,6 @@ Public Class dlgExportToClimsoft End If ucrSaveNewDataFrame.SetPrefix(strDataframeName & "__climsoft") - End Sub Private Sub ucrSelectorImportToClimsoft_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorImportToClimsoft.ControlValueChanged @@ -246,17 +246,6 @@ Public Class dlgExportToClimsoft End If End Sub - Private Sub AddingComments() - ' Check if .comment is in the list and set it as the default selection - If ucrDataFrameSheets.cboAvailableDataFrames.Items.Contains(".comment") Then - ucrDataFrameSheets.cboAvailableDataFrames.Text = ".comment" - Else - ' Optionally, set the first item as the default if .comment is not present - ucrDataFrameSheets.cboAvailableDataFrames.SelectedIndex = 0 - End If - - End Sub - Private Sub SelectFileToSave() Using dlgSave As New SaveFileDialog dlgSave.Title = "Save CPT File" @@ -298,15 +287,14 @@ Public Class dlgExportToClimsoft End Sub Private Sub ucrDataFrameSheets_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFrameSheets.ControlValueChanged - AddingComments() - clsExportCommentsFunction.AddParameter("x", clsRFunctionParameter:=ucrDataFrameSheets.clsCurrDataFrame, iPosition:=1) SettingBaseFunction() - End Sub + clsGetDataFrameFunction.AddParameter("data_name", Chr(34) & ucrDataFrameSheets.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsGetDataFrameFunction.SetAssignTo(ucrDataFrameSheets.cboAvailableDataFrames.Text) + End Sub Private Sub ucrChkAddReport_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddReport.ControlValueChanged - AddingComments() If ucrChkAddReport.Checked Then ucrInputExportFile.SetName("") End If From 18a67d45238a8c9c6f45ca5f182296a272208000 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 15 Oct 2024 12:21:49 +0300 Subject: [PATCH 231/273] changes --- instat/dlgExportToClimsoft.Designer.vb | 269 +++++++++++++------------ instat/dlgExportToClimsoft.vb | 75 +++---- 2 files changed, 164 insertions(+), 180 deletions(-) diff --git a/instat/dlgExportToClimsoft.Designer.vb b/instat/dlgExportToClimsoft.Designer.vb index 73783bb0cad..04cd11be29c 100644 --- a/instat/dlgExportToClimsoft.Designer.vb +++ b/instat/dlgExportToClimsoft.Designer.vb @@ -27,6 +27,16 @@ Partial Class dlgExportToClimsoft Me.lblHour = New System.Windows.Forms.Label() Me.lblExport = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() + Me.rdoHourly = New System.Windows.Forms.RadioButton() + Me.rdoDaily = New System.Windows.Forms.RadioButton() + Me.lblStationID = New System.Windows.Forms.Label() + Me.rdoExportData = New System.Windows.Forms.RadioButton() + Me.rdoNewDataFrame = New System.Windows.Forms.RadioButton() + Me.grpSave = New System.Windows.Forms.GroupBox() + Me.rdoExportComments = New System.Windows.Forms.RadioButton() + Me.ucrDataFrameSheets = New instat.ucrDataFrame() + Me.ucrPnlOutput = New instat.UcrPanel() + Me.ucrReceiverStationID = New instat.ucrReceiverSingle() Me.ucrInputExportFile = New instat.ucrInputTextBox() Me.ucrSaveNewDataFrame = New instat.ucrSave() Me.ucrInputHour = New instat.ucrInputTextBox() @@ -34,17 +44,7 @@ Partial Class dlgExportToClimsoft Me.ucrReceiverElements = New instat.ucrReceiverMultiple() Me.ucrReceiverDate = New instat.ucrReceiverSingle() Me.ucrSelectorImportToClimsoft = New instat.ucrSelectorByDataFrameAddRemove() - Me.rdoHourly = New System.Windows.Forms.RadioButton() - Me.rdoDaily = New System.Windows.Forms.RadioButton() Me.ucrPnlDailyHourly = New instat.UcrPanel() - Me.ucrReceiverStationID = New instat.ucrReceiverSingle() - Me.lblStationID = New System.Windows.Forms.Label() - Me.rdoExportData = New System.Windows.Forms.RadioButton() - Me.rdoNewDataFrame = New System.Windows.Forms.RadioButton() - Me.ucrChkAddReport = New instat.ucrCheck() - Me.ucrDataFrameSheets = New instat.ucrDataFrame() - Me.ucrPnlOutput = New instat.UcrPanel() - Me.grpSave = New System.Windows.Forms.GroupBox() Me.SuspendLayout() ' 'lblElement @@ -78,7 +78,7 @@ Partial Class dlgExportToClimsoft ' Me.lblExport.AutoSize = True Me.lblExport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblExport.Location = New System.Drawing.Point(9, 436) + Me.lblExport.Location = New System.Drawing.Point(9, 431) Me.lblExport.Name = "lblExport" Me.lblExport.Size = New System.Drawing.Size(59, 13) Me.lblExport.TabIndex = 15 @@ -87,94 +87,13 @@ Partial Class dlgExportToClimsoft 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(326, 431) + Me.cmdBrowse.Location = New System.Drawing.Point(326, 426) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(80, 23) Me.cmdBrowse.TabIndex = 17 Me.cmdBrowse.Text = "Browse" Me.cmdBrowse.UseVisualStyleBackColor = True ' - 'ucrInputExportFile - ' - Me.ucrInputExportFile.AddQuotesIfUnrecognised = True - Me.ucrInputExportFile.AutoSize = True - Me.ucrInputExportFile.IsMultiline = False - Me.ucrInputExportFile.IsReadOnly = False - Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 432) - Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputExportFile.Name = "ucrInputExportFile" - Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) - Me.ucrInputExportFile.TabIndex = 16 - ' - 'ucrSaveNewDataFrame - ' - Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(9, 403) - Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" - Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(348, 24) - Me.ucrSaveNewDataFrame.TabIndex = 14 - ' - 'ucrInputHour - ' - Me.ucrInputHour.AddQuotesIfUnrecognised = True - Me.ucrInputHour.AutoSize = True - Me.ucrInputHour.IsMultiline = False - Me.ucrInputHour.IsReadOnly = False - Me.ucrInputHour.Location = New System.Drawing.Point(278, 153) - Me.ucrInputHour.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) - Me.ucrInputHour.Name = "ucrInputHour" - Me.ucrInputHour.Size = New System.Drawing.Size(119, 21) - Me.ucrInputHour.TabIndex = 9 - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 459) - Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 18 - ' - 'ucrReceiverElements - ' - Me.ucrReceiverElements.AutoSize = True - Me.ucrReceiverElements.frmParent = Me - Me.ucrReceiverElements.Location = New System.Drawing.Point(278, 199) - Me.ucrReceiverElements.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverElements.Name = "ucrReceiverElements" - Me.ucrReceiverElements.Selector = Nothing - Me.ucrReceiverElements.Size = New System.Drawing.Size(120, 100) - Me.ucrReceiverElements.strNcFilePath = "" - Me.ucrReceiverElements.TabIndex = 11 - Me.ucrReceiverElements.ucrSelector = Nothing - ' - 'ucrReceiverDate - ' - Me.ucrReceiverDate.AutoSize = True - Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(278, 110) - Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverDate.Name = "ucrReceiverDate" - Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 7 - Me.ucrReceiverDate.ucrSelector = Nothing - ' - 'ucrSelectorImportToClimsoft - ' - Me.ucrSelectorImportToClimsoft.AutoSize = True - Me.ucrSelectorImportToClimsoft.bDropUnusedFilterLevels = False - Me.ucrSelectorImportToClimsoft.bShowHiddenColumns = False - Me.ucrSelectorImportToClimsoft.bUseCurrentFilter = True - Me.ucrSelectorImportToClimsoft.Location = New System.Drawing.Point(9, 52) - Me.ucrSelectorImportToClimsoft.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorImportToClimsoft.Name = "ucrSelectorImportToClimsoft" - Me.ucrSelectorImportToClimsoft.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorImportToClimsoft.TabIndex = 3 - ' 'rdoHourly ' Me.rdoHourly.Appearance = System.Windows.Forms.Appearance.Button @@ -214,28 +133,6 @@ Partial Class dlgExportToClimsoft Me.rdoDaily.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoDaily.UseVisualStyleBackColor = False ' - 'ucrPnlDailyHourly - ' - Me.ucrPnlDailyHourly.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlDailyHourly.Location = New System.Drawing.Point(91, 8) - Me.ucrPnlDailyHourly.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) - Me.ucrPnlDailyHourly.Name = "ucrPnlDailyHourly" - Me.ucrPnlDailyHourly.Size = New System.Drawing.Size(207, 28) - Me.ucrPnlDailyHourly.TabIndex = 0 - ' - 'ucrReceiverStationID - ' - Me.ucrReceiverStationID.AutoSize = True - Me.ucrReceiverStationID.frmParent = Me - Me.ucrReceiverStationID.Location = New System.Drawing.Point(276, 73) - Me.ucrReceiverStationID.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStationID.Name = "ucrReceiverStationID" - Me.ucrReceiverStationID.Selector = Nothing - Me.ucrReceiverStationID.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverStationID.strNcFilePath = "" - Me.ucrReceiverStationID.TabIndex = 5 - Me.ucrReceiverStationID.ucrSelector = Nothing - ' 'lblStationID ' Me.lblStationID.AutoSize = True @@ -267,15 +164,25 @@ Partial Class dlgExportToClimsoft Me.rdoNewDataFrame.Text = "New Data Frame" Me.rdoNewDataFrame.UseVisualStyleBackColor = True ' - 'ucrChkAddReport + 'grpSave ' - Me.ucrChkAddReport.AutoSize = True - Me.ucrChkAddReport.Checked = False - Me.ucrChkAddReport.Location = New System.Drawing.Point(5, 322) - Me.ucrChkAddReport.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) - Me.ucrChkAddReport.Name = "ucrChkAddReport" - Me.ucrChkAddReport.Size = New System.Drawing.Size(239, 23) - Me.ucrChkAddReport.TabIndex = 91 + Me.grpSave.Location = New System.Drawing.Point(8, 237) + Me.grpSave.Name = "grpSave" + Me.grpSave.Size = New System.Drawing.Size(165, 109) + Me.grpSave.TabIndex = 96 + Me.grpSave.TabStop = False + Me.grpSave.Text = "Save" + ' + 'rdoExportComments + ' + Me.rdoExportComments.AutoSize = True + Me.rdoExportComments.Location = New System.Drawing.Point(15, 306) + Me.rdoExportComments.Name = "rdoExportComments" + Me.rdoExportComments.Size = New System.Drawing.Size(107, 17) + Me.rdoExportComments.TabIndex = 97 + Me.rdoExportComments.TabStop = True + Me.rdoExportComments.Text = "Export Comments" + Me.rdoExportComments.UseVisualStyleBackColor = True ' 'ucrDataFrameSheets ' @@ -292,19 +199,113 @@ Partial Class dlgExportToClimsoft ' Me.ucrPnlOutput.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlOutput.Location = New System.Drawing.Point(12, 251) - Me.ucrPnlOutput.Margin = New System.Windows.Forms.Padding(6, 6, 6, 6) + Me.ucrPnlOutput.Margin = New System.Windows.Forms.Padding(6) Me.ucrPnlOutput.Name = "ucrPnlOutput" - Me.ucrPnlOutput.Size = New System.Drawing.Size(151, 60) + Me.ucrPnlOutput.Size = New System.Drawing.Size(151, 86) Me.ucrPnlOutput.TabIndex = 95 ' - 'grpSave + 'ucrReceiverStationID ' - Me.grpSave.Location = New System.Drawing.Point(8, 237) - Me.grpSave.Name = "grpSave" - Me.grpSave.Size = New System.Drawing.Size(165, 73) - Me.grpSave.TabIndex = 96 - Me.grpSave.TabStop = False - Me.grpSave.Text = "Save" + Me.ucrReceiverStationID.AutoSize = True + Me.ucrReceiverStationID.frmParent = Me + Me.ucrReceiverStationID.Location = New System.Drawing.Point(276, 73) + Me.ucrReceiverStationID.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverStationID.Name = "ucrReceiverStationID" + Me.ucrReceiverStationID.Selector = Nothing + Me.ucrReceiverStationID.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverStationID.strNcFilePath = "" + Me.ucrReceiverStationID.TabIndex = 5 + Me.ucrReceiverStationID.ucrSelector = Nothing + ' + 'ucrInputExportFile + ' + Me.ucrInputExportFile.AddQuotesIfUnrecognised = True + Me.ucrInputExportFile.AutoSize = True + Me.ucrInputExportFile.IsMultiline = False + Me.ucrInputExportFile.IsReadOnly = False + Me.ucrInputExportFile.Location = New System.Drawing.Point(142, 427) + Me.ucrInputExportFile.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputExportFile.Name = "ucrInputExportFile" + Me.ucrInputExportFile.Size = New System.Drawing.Size(182, 21) + Me.ucrInputExportFile.TabIndex = 16 + ' + 'ucrSaveNewDataFrame + ' + Me.ucrSaveNewDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveNewDataFrame.Location = New System.Drawing.Point(9, 399) + Me.ucrSaveNewDataFrame.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveNewDataFrame.Name = "ucrSaveNewDataFrame" + Me.ucrSaveNewDataFrame.Size = New System.Drawing.Size(348, 24) + Me.ucrSaveNewDataFrame.TabIndex = 14 + ' + 'ucrInputHour + ' + Me.ucrInputHour.AddQuotesIfUnrecognised = True + Me.ucrInputHour.AutoSize = True + Me.ucrInputHour.IsMultiline = False + Me.ucrInputHour.IsReadOnly = False + Me.ucrInputHour.Location = New System.Drawing.Point(278, 153) + Me.ucrInputHour.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputHour.Name = "ucrInputHour" + Me.ucrInputHour.Size = New System.Drawing.Size(119, 21) + Me.ucrInputHour.TabIndex = 9 + ' + 'ucrBase + ' + Me.ucrBase.AutoSize = True + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(7, 459) + Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 18 + ' + 'ucrReceiverElements + ' + Me.ucrReceiverElements.AutoSize = True + Me.ucrReceiverElements.frmParent = Me + Me.ucrReceiverElements.Location = New System.Drawing.Point(278, 199) + Me.ucrReceiverElements.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverElements.Name = "ucrReceiverElements" + Me.ucrReceiverElements.Selector = Nothing + Me.ucrReceiverElements.Size = New System.Drawing.Size(120, 100) + Me.ucrReceiverElements.strNcFilePath = "" + Me.ucrReceiverElements.TabIndex = 11 + Me.ucrReceiverElements.ucrSelector = Nothing + ' + 'ucrReceiverDate + ' + Me.ucrReceiverDate.AutoSize = True + Me.ucrReceiverDate.frmParent = Me + Me.ucrReceiverDate.Location = New System.Drawing.Point(278, 110) + Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDate.Name = "ucrReceiverDate" + Me.ucrReceiverDate.Selector = Nothing + Me.ucrReceiverDate.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverDate.strNcFilePath = "" + Me.ucrReceiverDate.TabIndex = 7 + Me.ucrReceiverDate.ucrSelector = Nothing + ' + 'ucrSelectorImportToClimsoft + ' + Me.ucrSelectorImportToClimsoft.AutoSize = True + Me.ucrSelectorImportToClimsoft.bDropUnusedFilterLevels = False + Me.ucrSelectorImportToClimsoft.bShowHiddenColumns = False + Me.ucrSelectorImportToClimsoft.bUseCurrentFilter = True + Me.ucrSelectorImportToClimsoft.Location = New System.Drawing.Point(9, 52) + Me.ucrSelectorImportToClimsoft.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorImportToClimsoft.Name = "ucrSelectorImportToClimsoft" + Me.ucrSelectorImportToClimsoft.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorImportToClimsoft.TabIndex = 3 + ' + 'ucrPnlDailyHourly + ' + Me.ucrPnlDailyHourly.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlDailyHourly.Location = New System.Drawing.Point(91, 8) + Me.ucrPnlDailyHourly.Margin = New System.Windows.Forms.Padding(4) + Me.ucrPnlDailyHourly.Name = "ucrPnlDailyHourly" + Me.ucrPnlDailyHourly.Size = New System.Drawing.Size(207, 28) + Me.ucrPnlDailyHourly.TabIndex = 0 ' 'dlgExportToClimsoft ' @@ -312,9 +313,9 @@ Partial Class dlgExportToClimsoft Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(417, 467) + Me.Controls.Add(Me.rdoExportComments) Me.Controls.Add(Me.rdoExportData) Me.Controls.Add(Me.rdoNewDataFrame) - Me.Controls.Add(Me.ucrChkAddReport) Me.Controls.Add(Me.ucrDataFrameSheets) Me.Controls.Add(Me.ucrPnlOutput) Me.Controls.Add(Me.grpSave) @@ -363,8 +364,8 @@ Partial Class dlgExportToClimsoft Friend WithEvents ucrReceiverStationID As ucrReceiverSingle Friend WithEvents rdoExportData As RadioButton Friend WithEvents rdoNewDataFrame As RadioButton - Friend WithEvents ucrChkAddReport As ucrCheck Friend WithEvents ucrDataFrameSheets As ucrDataFrame Friend WithEvents ucrPnlOutput As UcrPanel Friend WithEvents grpSave As GroupBox + Friend WithEvents rdoExportComments As RadioButton End Class diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 5a4aab07695..6f6a5e2f889 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -49,14 +49,14 @@ Public Class dlgExportToClimsoft ucrPnlOutput.AddRadioButton(rdoNewDataFrame) ucrPnlOutput.AddRadioButton(rdoExportData) + ucrPnlOutput.AddRadioButton(rdoExportComments) + ucrPnlOutput.AddParameterValuesCondition(rdoNewDataFrame, "check", "dataframe") ucrPnlOutput.AddParameterValuesCondition(rdoExportData, "check", "export") + ucrPnlOutput.AddParameterValuesCondition(rdoExportComments, "check", "comments") - ucrChkAddReport.SetText("Add Report (Comments Sheet)") - ucrChkAddReport.AddToLinkedControls({ucrDataFrameSheets, ucrInputExportFile}, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkAddReport.AddParameterValuesCondition(True, "comments", "True") - ucrChkAddReport.AddParameterValuesCondition(False, "comments", "False") + ucrPnlOutput.AddToLinkedControls({ucrDataFrameSheets, ucrInputExportFile}, {rdoExportComments}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) ucrReceiverDate.SetParameter(New RParameter("date", 2)) ucrReceiverDate.SetParameterIsRFunction() @@ -158,7 +158,6 @@ Public Class dlgExportToClimsoft ucrPnlDailyHourly.SetRCode(clsDummyFunction, bReset) If bReset Then ucrPnlOutput.SetRCode(clsDummyFunction, bReset) - ucrChkAddReport.SetRCode(clsDummyFunction, bReset) End If End Sub @@ -170,21 +169,20 @@ Public Class dlgExportToClimsoft Else ucrBase.OKEnabled(False) End If - Else - If Not ucrChkAddReport.Checked Then - If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If + ElseIf rdoExportData.Checked Then + If Not ucrReceiverDate.IsEmpty AndAlso Not ucrReceiverElements.IsEmpty AndAlso Not ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(True) Else - If ucrDataFrameSheets.cboAvailableDataFrames.Text <> "" AndAlso Not ucrInputExportFile.IsEmpty Then - ucrBase.OKEnabled(True) + ucrBase.OKEnabled(False) + End If - Else - ucrBase.OKEnabled(False) + Else + If ucrDataFrameSheets.cboAvailableDataFrames.Text <> "" AndAlso Not ucrInputExportFile.IsEmpty Then + ucrBase.OKEnabled(True) + + Else + ucrBase.OKEnabled(False) - End If End If End If End Sub @@ -216,6 +214,10 @@ Public Class dlgExportToClimsoft SettingBaseFunction() End Sub + Private Sub ucrInputExportFile_ControlValueChanged(ucrChangedControl As ucrCore) + + End Sub + Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click SelectFileToSave() End Sub @@ -228,22 +230,24 @@ Public Class dlgExportToClimsoft ucrBase.clsRsyntax.GetAfterCodes().Clear() cmdBrowse.Visible = False ucrInputExportFile.Visible = False + ucrSaveNewDataFrame.Visible = True - Else + ElseIf rdoExportData.Checked Then ucrBase.clsRsyntax.GetAfterCodes().Clear() ucrBase.clsRsyntax.AddToBeforeCodes(clsCurrentNewColumnFunction) ucrBase.clsRsyntax.SetBaseRFunction(clsExportClimsoftFunction) ucrBase.clsRsyntax.GetAfterCodes().Clear() cmdBrowse.Visible = True ucrInputExportFile.Visible = True - End If - - If ucrChkAddReport.Checked AndAlso rdoExportData.Checked Then + ucrSaveNewDataFrame.Visible = False + Else ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseRFunction(clsExportCommentsFunction) cmdBrowse.Visible = True ucrInputExportFile.Visible = True + ucrSaveNewDataFrame.Visible = False End If + End Sub Private Sub SelectFileToSave() @@ -262,18 +266,8 @@ Public Class dlgExportToClimsoft End Using End Sub - Private Sub EnableDisableComments() - If rdoExportData.Checked Then - ucrChkAddReport.Enabled = True - Else - ucrChkAddReport.Enabled = False - ucrChkAddReport.Checked = False - End If - - End Sub - Private Sub ucrReceiverElements_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverElements.ControlContentsChanged, - ucrReceiverDate.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, ucrChkAddReport.ControlContentsChanged, + ucrReceiverDate.ControlContentsChanged, ucrSaveNewDataFrame.ControlContentsChanged, ucrReceiverStationID.ControlContentsChanged, ucrInputExportFile.ControlContentsChanged, ucrDataFrameSheets.ControlContentsChanged TestOkEnabled() End Sub @@ -283,7 +277,6 @@ Public Class dlgExportToClimsoft SelectFileToSave() End If SettingBaseFunction() - EnableDisableComments() End Sub Private Sub ucrDataFrameSheets_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrDataFrameSheets.ControlValueChanged @@ -294,15 +287,6 @@ Public Class dlgExportToClimsoft End Sub - Private Sub ucrChkAddReport_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddReport.ControlValueChanged - If ucrChkAddReport.Checked Then - ucrInputExportFile.SetName("") - End If - SettingBaseFunction() - EnableDisableComments() - TestOkEnabled() - End Sub - Private Sub ucrInputHour_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputHour.ControlValueChanged If Not ucrInputHour.IsEmpty Then clsSprintfFunction.AddParameter("fmt", Chr(34) & "%02d:00:00" & Chr(34), iPosition:=0) @@ -323,12 +307,11 @@ Public Class dlgExportToClimsoft End If End Sub - Private Sub ucrInputExportFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputExportFile.ControlValueChanged - EnableDisableComments() - End Sub + 'Private Sub ucrInputExportFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputExportFile.ControlValueChanged + ' EnableDisableComments() + 'End Sub Private Sub ucrPnlOutput_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOutput.ControlValueChanged - EnableDisableComments() SettingBaseFunction() TestOkEnabled() End Sub From d0c13b3dbd51c634cbc6936b92c0d76e4fe0fc3c Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Tue, 15 Oct 2024 15:20:38 +0300 Subject: [PATCH 232/273] changes --- instat/dlgExportToClimsoft.vb | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 6f6a5e2f889..44f49a451e9 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -214,8 +214,22 @@ Public Class dlgExportToClimsoft SettingBaseFunction() End Sub - Private Sub ucrInputExportFile_ControlValueChanged(ucrChangedControl As ucrCore) - + Private Sub ucrDataFrameSheets_Load(sender As Object, e As EventArgs) Handles ucrDataFrameSheets.Load + If ucrDataFrameSheets.cboAvailableDataFrames.Items.Count > 0 Then + ' Check if the .comment dataframe exists + Dim commentExists As Boolean = False + For Each dataframe As String In ucrDataFrameSheets.cboAvailableDataFrames.Items + If dataframe = ".comment" Then + commentExists = True + Exit For + End If + Next + + ' Set .comment as the default selection if it exists + If commentExists Then + ucrDataFrameSheets.cboAvailableDataFrames.SelectedItem = ".comment" + End If + End If End Sub Private Sub cmdBrowse_Click(sender As Object, e As EventArgs) Handles cmdBrowse.Click @@ -307,10 +321,6 @@ Public Class dlgExportToClimsoft End If End Sub - 'Private Sub ucrInputExportFile_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputExportFile.ControlValueChanged - ' EnableDisableComments() - 'End Sub - Private Sub ucrPnlOutput_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlOutput.ControlValueChanged SettingBaseFunction() TestOkEnabled() From 7d3efbb44376350846a33013a2cc323ae7fdaff6 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 12:49:31 +0300 Subject: [PATCH 233/273] added and implemented switch off undo checkbox --- instat/Interface/IDataViewGrid.vb | 2 + .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 + .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 5 +- instat/clsInstatOptions.vb | 12 + instat/clsInstatOptionsDefaults.vb | 1 + instat/dlgOptions.Designer.vb | 544 ++++++++++-------- instat/dlgOptions.vb | 5 +- instat/static/InstatObject/R/data_object_R6.R | 2 +- instat/ucrColumnMetadata.vb | 2 +- instat/ucrDataView.vb | 20 + 10 files changed, 352 insertions(+), 243 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index 4145675170f..b4df19941b6 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -33,6 +33,8 @@ Public Interface IDataViewGrid Event FindRow() + Event Undo() + Sub AddColumns(visiblePage As clsDataFramePage) Sub AddRowData(dataFrame As clsDataFrame) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3977f595ba1..3b0a6cb9641 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -33,6 +33,8 @@ Public Class ucrDataViewLinuxGrid Public Event FindRow() Implements IDataViewGrid.FindRow + Public Event Undo() Implements IDataViewGrid.Undo + Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index 7e96044857d..ffc92709e83 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -33,6 +33,8 @@ Public Class ucrDataViewReoGrid Public Event FindRow() Implements IDataViewGrid.FindRow + Public Event Undo() Implements IDataViewGrid.Undo + Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved @@ -284,8 +286,7 @@ Public Class ucrDataViewReoGrid ' Detect Ctrl+Z for Undo operation If e.Control AndAlso e.KeyCode = Keys.Z Then - ' Perform Undo - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + RaiseEvent Undo() e.Handled = True e.SuppressKeyPress = True End If diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 1bd05535f48..4f02cb7d8ec 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -43,6 +43,7 @@ Imports RDotNet Public bShowSignifStars As Nullable(Of Boolean) Public bChangeDataFrame As Nullable(Of Boolean) Public bAutoSaveData As Nullable(Of Boolean) + Public bUndoSwitchAction As Nullable(Of Boolean) Public iAutoSaveDataMinutes As Nullable(Of Integer) Public bShowWaitDialog As Nullable(Of Boolean) Public iWaitTimeDelaySeconds As Nullable(Of Integer) @@ -84,6 +85,7 @@ Imports RDotNet bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData + bUndoSwitchAction = clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds @@ -244,6 +246,12 @@ Imports RDotNet SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData) End If + If bUndoSwitchAction.HasValue Then + SetUndoSwitchAction(bUndoSwitchAction) + Else + SetUndoSwitchAction(clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction) + End If + If iAutoSaveDataMinutes.HasValue Then SetAutoSaveDataMinutes(iAutoSaveDataMinutes) Else @@ -530,6 +538,10 @@ Imports RDotNet bAutoSaveData = bNewAutoSave End Sub + Public Sub SetUndoSwitchAction(bNewUndoSwitchAction As Boolean) + bUndoSwitchAction = bNewUndoSwitchAction + End Sub + Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer) iAutoSaveDataMinutes = iNewMinutes frmMain.ResetTimer() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 7047c81a86a..dfffa158f30 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -45,6 +45,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True + Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = True Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index ed5bd9584f7..7e6cfb377c8 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -38,12 +38,12 @@ Partial Class dlgOptions 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") + Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") Me.cmdApply = New System.Windows.Forms.Button() Me.cmdHelp = New System.Windows.Forms.Button() Me.cmdCancel = New System.Windows.Forms.Button() @@ -128,6 +128,7 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() + Me.ucrChkSwitchUndo = New instat.ucrCheck() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -153,9 +154,10 @@ Partial Class dlgOptions ' 'cmdApply ' - Me.cmdApply.Location = New System.Drawing.Point(384, 324) + Me.cmdApply.Location = New System.Drawing.Point(576, 486) + Me.cmdApply.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdApply.Name = "cmdApply" - Me.cmdApply.Size = New System.Drawing.Size(75, 23) + Me.cmdApply.Size = New System.Drawing.Size(112, 34) Me.cmdApply.TabIndex = 10 Me.cmdApply.Tag = "Apply" Me.cmdApply.Text = "Apply" @@ -163,9 +165,10 @@ Partial Class dlgOptions ' 'cmdHelp ' - Me.cmdHelp.Location = New System.Drawing.Point(465, 324) + Me.cmdHelp.Location = New System.Drawing.Point(698, 486) + Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdHelp.Name = "cmdHelp" - Me.cmdHelp.Size = New System.Drawing.Size(75, 23) + Me.cmdHelp.Size = New System.Drawing.Size(112, 34) Me.cmdHelp.TabIndex = 12 Me.cmdHelp.Tag = "Help" Me.cmdHelp.Text = "Help" @@ -173,9 +176,10 @@ Partial Class dlgOptions ' 'cmdCancel ' - Me.cmdCancel.Location = New System.Drawing.Point(303, 324) + Me.cmdCancel.Location = New System.Drawing.Point(454, 486) + Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCancel.Name = "cmdCancel" - Me.cmdCancel.Size = New System.Drawing.Size(75, 23) + Me.cmdCancel.Size = New System.Drawing.Size(112, 34) Me.cmdCancel.TabIndex = 9 Me.cmdCancel.Tag = "Cancel" Me.cmdCancel.Text = "Cancel" @@ -183,9 +187,10 @@ Partial Class dlgOptions ' 'cmdOk ' - Me.cmdOk.Location = New System.Drawing.Point(222, 324) + Me.cmdOk.Location = New System.Drawing.Point(333, 486) + Me.cmdOk.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdOk.Name = "cmdOk" - Me.cmdOk.Size = New System.Drawing.Size(75, 23) + Me.cmdOk.Size = New System.Drawing.Size(112, 34) Me.cmdOk.TabIndex = 11 Me.cmdOk.Tag = "Ok" Me.cmdOk.Text = "Ok" @@ -194,9 +199,10 @@ Partial Class dlgOptions 'cmdLanguage ' Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdLanguage.Location = New System.Drawing.Point(545, 324) + Me.cmdLanguage.Location = New System.Drawing.Point(818, 486) + Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdLanguage.Name = "cmdLanguage" - Me.cmdLanguage.Size = New System.Drawing.Size(37, 23) + Me.cmdLanguage.Size = New System.Drawing.Size(56, 34) Me.cmdLanguage.TabIndex = 13 Me.cmdLanguage.Tag = "" Me.cmdLanguage.Text = "Lang" @@ -204,7 +210,8 @@ Partial Class dlgOptions ' 'spltControls ' - Me.spltControls.Location = New System.Drawing.Point(5, 1) + Me.spltControls.Location = New System.Drawing.Point(8, 2) + Me.spltControls.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.spltControls.Name = "spltControls" ' 'spltControls.Panel1 @@ -215,15 +222,17 @@ Partial Class dlgOptions 'spltControls.Panel2 ' Me.spltControls.Panel2.Controls.Add(Me.tbcOptions) - Me.spltControls.Size = New System.Drawing.Size(760, 317) - Me.spltControls.SplitterDistance = 184 + Me.spltControls.Size = New System.Drawing.Size(1140, 476) + Me.spltControls.SplitterDistance = 276 + Me.spltControls.SplitterWidth = 6 Me.spltControls.TabIndex = 8 ' 'cmdFactoryReset ' - Me.cmdFactoryReset.Location = New System.Drawing.Point(13, 287) + Me.cmdFactoryReset.Location = New System.Drawing.Point(20, 430) + Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdFactoryReset.Name = "cmdFactoryReset" - Me.cmdFactoryReset.Size = New System.Drawing.Size(100, 23) + Me.cmdFactoryReset.Size = New System.Drawing.Size(150, 34) Me.cmdFactoryReset.TabIndex = 13 Me.cmdFactoryReset.Tag = "Help" Me.cmdFactoryReset.Text = "Factory Reset" @@ -233,31 +242,32 @@ Partial Class dlgOptions ' Me.trOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.trOptions.Location = New System.Drawing.Point(0, 0) + Me.trOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.trOptions.Name = "trOptions" - TreeNode7.Name = "ndLanguages" - TreeNode7.Tag = "1" - TreeNode7.Text = "Languages" - TreeNode7.ToolTipText = "Choose different languages" - TreeNode8.Name = "ndComments" - TreeNode8.Tag = "2" - TreeNode8.Text = "Comments" - TreeNode8.ToolTipText = "Comments for the dialogs" - TreeNode9.Name = "ndImport" - TreeNode9.Tag = "3" - TreeNode9.Text = "Import" - TreeNode9.ToolTipText = "Import Data Settings" - TreeNode10.Name = "ndOutputWindow" - TreeNode10.Tag = "4" - TreeNode10.Text = "Output Window" - TreeNode10.ToolTipText = "Output Window Formatting Options" - TreeNode11.Name = "ndCommands" - TreeNode11.Tag = "8" - TreeNode11.Text = "Commands" - TreeNode11.ToolTipText = "Commands Options" - TreeNode12.Name = "ndDataView" - TreeNode12.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) - Me.trOptions.Size = New System.Drawing.Size(184, 317) + TreeNode1.Name = "ndLanguages" + TreeNode1.Tag = "1" + TreeNode1.Text = "Languages" + TreeNode1.ToolTipText = "Choose different languages" + TreeNode2.Name = "ndComments" + TreeNode2.Tag = "2" + TreeNode2.Text = "Comments" + TreeNode2.ToolTipText = "Comments for the dialogs" + TreeNode3.Name = "ndImport" + TreeNode3.Tag = "3" + TreeNode3.Text = "Import" + TreeNode3.ToolTipText = "Import Data Settings" + TreeNode4.Name = "ndOutputWindow" + TreeNode4.Tag = "4" + TreeNode4.Text = "Output Window" + TreeNode4.ToolTipText = "Output Window Formatting Options" + TreeNode5.Name = "ndCommands" + TreeNode5.Tag = "8" + TreeNode5.Text = "Commands" + TreeNode5.ToolTipText = "Commands Options" + TreeNode6.Name = "ndDataView" + TreeNode6.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}) + Me.trOptions.Size = New System.Drawing.Size(276, 476) Me.trOptions.TabIndex = 0 ' 'tbcOptions @@ -276,9 +286,10 @@ Partial Class dlgOptions Me.tbcOptions.Controls.Add(Me.tbpWebsite) Me.tbcOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcOptions.Location = New System.Drawing.Point(0, 0) + Me.tbcOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 - Me.tbcOptions.Size = New System.Drawing.Size(572, 317) + Me.tbcOptions.Size = New System.Drawing.Size(858, 476) Me.tbcOptions.TabIndex = 0 ' 'tbpLanguages @@ -286,10 +297,11 @@ Partial Class dlgOptions Me.tbpLanguages.Controls.Add(Me.lversion) Me.tbpLanguages.Controls.Add(Me.lblLanguage) Me.tbpLanguages.Controls.Add(Me.ucrInputLanguage) - Me.tbpLanguages.Location = New System.Drawing.Point(4, 22) + Me.tbpLanguages.Location = New System.Drawing.Point(4, 29) + Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpLanguages.Name = "tbpLanguages" - Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(3) - Me.tbpLanguages.Size = New System.Drawing.Size(564, 291) + Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Size = New System.Drawing.Size(850, 443) Me.tbpLanguages.TabIndex = 0 Me.tbpLanguages.Tag = "Languages" Me.tbpLanguages.Text = "Languages" @@ -297,10 +309,9 @@ Partial Class dlgOptions ' 'lversion ' - Me.lversion.Location = New System.Drawing.Point(306, 267) - Me.lversion.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lversion.Location = New System.Drawing.Point(459, 400) Me.lversion.Name = "lversion" - Me.lversion.Size = New System.Drawing.Size(254, 18) + Me.lversion.Size = New System.Drawing.Size(381, 27) Me.lversion.TabIndex = 4 Me.lversion.Text = "v. " Me.lversion.TextAlign = System.Drawing.ContentAlignment.TopRight @@ -308,9 +319,10 @@ Partial Class dlgOptions 'lblLanguage ' Me.lblLanguage.AutoSize = True - Me.lblLanguage.Location = New System.Drawing.Point(9, 18) + Me.lblLanguage.Location = New System.Drawing.Point(14, 27) + Me.lblLanguage.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblLanguage.Name = "lblLanguage" - Me.lblLanguage.Size = New System.Drawing.Size(61, 13) + Me.lblLanguage.Size = New System.Drawing.Size(89, 20) Me.lblLanguage.TabIndex = 3 Me.lblLanguage.Text = "Language :" ' @@ -320,19 +332,20 @@ Partial Class dlgOptions Me.ucrInputLanguage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputLanguage.GetSetSelectedIndex = -1 Me.ucrInputLanguage.IsReadOnly = False - Me.ucrInputLanguage.Location = New System.Drawing.Point(75, 15) - Me.ucrInputLanguage.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputLanguage.Location = New System.Drawing.Point(112, 22) + Me.ucrInputLanguage.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputLanguage.Name = "ucrInputLanguage" - Me.ucrInputLanguage.Size = New System.Drawing.Size(110, 21) + Me.ucrInputLanguage.Size = New System.Drawing.Size(165, 32) Me.ucrInputLanguage.TabIndex = 2 ' 'tbpComments ' Me.tbpComments.Controls.Add(Me.pnComments) - Me.tbpComments.Location = New System.Drawing.Point(4, 22) + Me.tbpComments.Location = New System.Drawing.Point(4, 29) + Me.tbpComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpComments.Name = "tbpComments" - Me.tbpComments.Padding = New System.Windows.Forms.Padding(3) - Me.tbpComments.Size = New System.Drawing.Size(564, 291) + Me.tbpComments.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Size = New System.Drawing.Size(850, 443) Me.tbpComments.TabIndex = 1 Me.tbpComments.Tag = "Comments" Me.tbpComments.Text = "Comments" @@ -343,9 +356,10 @@ Partial Class dlgOptions Me.pnComments.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnComments.Controls.Add(Me.ucrInputComment) Me.pnComments.Controls.Add(Me.lblComment) - Me.pnComments.Location = New System.Drawing.Point(10, 10) + Me.pnComments.Location = New System.Drawing.Point(15, 15) + Me.pnComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnComments.Name = "pnComments" - Me.pnComments.Size = New System.Drawing.Size(391, 29) + Me.pnComments.Size = New System.Drawing.Size(586, 44) Me.pnComments.TabIndex = 2 ' 'ucrInputComment @@ -354,18 +368,19 @@ Partial Class dlgOptions Me.ucrInputComment.AutoSize = True Me.ucrInputComment.IsMultiline = False Me.ucrInputComment.IsReadOnly = False - Me.ucrInputComment.Location = New System.Drawing.Point(96, 5) - Me.ucrInputComment.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputComment.Location = New System.Drawing.Point(144, 8) + Me.ucrInputComment.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputComment.Name = "ucrInputComment" - Me.ucrInputComment.Size = New System.Drawing.Size(292, 21) + Me.ucrInputComment.Size = New System.Drawing.Size(438, 32) Me.ucrInputComment.TabIndex = 1 ' 'lblComment ' Me.lblComment.AutoSize = True - Me.lblComment.Location = New System.Drawing.Point(2, 9) + Me.lblComment.Location = New System.Drawing.Point(3, 14) + Me.lblComment.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblComment.Name = "lblComment" - Me.lblComment.Size = New System.Drawing.Size(54, 13) + Me.lblComment.Size = New System.Drawing.Size(82, 20) Me.lblComment.TabIndex = 0 Me.lblComment.Tag = "Comment:" Me.lblComment.Text = "Comment:" @@ -375,9 +390,10 @@ Partial Class dlgOptions Me.tbpImport.Controls.Add(Me.lblPreviewRows) Me.tbpImport.Controls.Add(Me.ucrNudPreviewRows) Me.tbpImport.Controls.Add(Me.pnImportData) - Me.tbpImport.Location = New System.Drawing.Point(4, 22) + Me.tbpImport.Location = New System.Drawing.Point(4, 29) + Me.tbpImport.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpImport.Name = "tbpImport" - Me.tbpImport.Size = New System.Drawing.Size(564, 291) + Me.tbpImport.Size = New System.Drawing.Size(850, 443) Me.tbpImport.TabIndex = 3 Me.tbpImport.Text = "Import" Me.tbpImport.UseVisualStyleBackColor = True @@ -385,9 +401,10 @@ Partial Class dlgOptions 'lblPreviewRows ' Me.lblPreviewRows.AutoSize = True - Me.lblPreviewRows.Location = New System.Drawing.Point(3, 9) + Me.lblPreviewRows.Location = New System.Drawing.Point(4, 14) + Me.lblPreviewRows.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPreviewRows.Name = "lblPreviewRows" - Me.lblPreviewRows.Size = New System.Drawing.Size(130, 13) + Me.lblPreviewRows.Size = New System.Drawing.Size(189, 20) Me.lblPreviewRows.TabIndex = 0 Me.lblPreviewRows.Text = "Number of Preview Rows:" ' @@ -396,12 +413,12 @@ Partial Class dlgOptions Me.ucrNudPreviewRows.AutoSize = True Me.ucrNudPreviewRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewRows.Location = New System.Drawing.Point(270, 5) - Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudPreviewRows.Location = New System.Drawing.Point(405, 8) + Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudPreviewRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreviewRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Name = "ucrNudPreviewRows" - Me.ucrNudPreviewRows.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreviewRows.Size = New System.Drawing.Size(75, 30) Me.ucrNudPreviewRows.TabIndex = 3 Me.ucrNudPreviewRows.Value = New Decimal(New Integer() {10, 0, 0, 0}) ' @@ -409,7 +426,8 @@ Partial Class dlgOptions ' Me.pnImportData.AutoSize = True Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.pnImportData.Location = New System.Drawing.Point(10, 10) + Me.pnImportData.Location = New System.Drawing.Point(15, 15) + Me.pnImportData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnImportData.Name = "pnImportData" Me.pnImportData.Size = New System.Drawing.Size(0, 0) Me.pnImportData.TabIndex = 2 @@ -422,10 +440,11 @@ Partial Class dlgOptions Me.tbpOutputWindow.Controls.Add(Me.ucrChkIncludeCommentsbyDefault) Me.tbpOutputWindow.Controls.Add(Me.grpROptions) Me.tbpOutputWindow.Controls.Add(Me.pnFormatOptions) - Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 22) + Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 29) + Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpOutputWindow.Name = "tbpOutputWindow" - Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(3) - Me.tbpOutputWindow.Size = New System.Drawing.Size(564, 291) + Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Size = New System.Drawing.Size(850, 443) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" Me.tbpOutputWindow.UseVisualStyleBackColor = True @@ -435,12 +454,12 @@ Partial Class dlgOptions Me.ucrNudMaxOutputsHeight.AutoSize = True Me.ucrNudMaxOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(506, 135) - Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(759, 202) + Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudMaxOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Name = "ucrNudMaxOutputsHeight" - Me.ucrNudMaxOutputsHeight.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxOutputsHeight.Size = New System.Drawing.Size(75, 30) Me.ucrNudMaxOutputsHeight.TabIndex = 29 Me.ucrNudMaxOutputsHeight.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -448,30 +467,30 @@ Partial Class dlgOptions ' Me.ucrChkMaxOutputsHeight.AutoSize = True Me.ucrChkMaxOutputsHeight.Checked = False - Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(300, 135) - Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(450, 202) + Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkMaxOutputsHeight.Name = "ucrChkMaxOutputsHeight" - Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(196, 34) + Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(294, 51) Me.ucrChkMaxOutputsHeight.TabIndex = 28 ' 'ucrChkShowRCommandsinOutputWindow ' Me.ucrChkShowRCommandsinOutputWindow.AutoSize = True Me.ucrChkShowRCommandsinOutputWindow.Checked = False - Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(10, 160) - Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(15, 240) + Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowRCommandsinOutputWindow.Name = "ucrChkShowRCommandsinOutputWindow" - Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(271, 34) + Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(406, 51) Me.ucrChkShowRCommandsinOutputWindow.TabIndex = 27 ' 'ucrChkIncludeCommentsbyDefault ' Me.ucrChkIncludeCommentsbyDefault.AutoSize = True Me.ucrChkIncludeCommentsbyDefault.Checked = False - Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(10, 135) - Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(15, 202) + Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkIncludeCommentsbyDefault.Name = "ucrChkIncludeCommentsbyDefault" - Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(271, 34) + Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(406, 51) Me.ucrChkIncludeCommentsbyDefault.TabIndex = 26 ' 'grpROptions @@ -479,9 +498,11 @@ Partial Class dlgOptions Me.grpROptions.Controls.Add(Me.ucrChkShowSignifStars) Me.grpROptions.Controls.Add(Me.ucrNudDigits) Me.grpROptions.Controls.Add(Me.lblNoDigits) - Me.grpROptions.Location = New System.Drawing.Point(10, 192) + Me.grpROptions.Location = New System.Drawing.Point(15, 288) + Me.grpROptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.grpROptions.Name = "grpROptions" - Me.grpROptions.Size = New System.Drawing.Size(271, 93) + Me.grpROptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Size = New System.Drawing.Size(406, 140) Me.grpROptions.TabIndex = 25 Me.grpROptions.TabStop = False Me.grpROptions.Text = "R Options" @@ -490,10 +511,10 @@ Partial Class dlgOptions ' Me.ucrChkShowSignifStars.AutoSize = True Me.ucrChkShowSignifStars.Checked = False - Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(7, 49) - Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(10, 74) + Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowSignifStars.Name = "ucrChkShowSignifStars" - Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(255, 34) + Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(382, 51) Me.ucrChkShowSignifStars.TabIndex = 28 ' 'ucrNudDigits @@ -501,21 +522,22 @@ Partial Class dlgOptions Me.ucrNudDigits.AutoSize = True Me.ucrNudDigits.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDigits.Location = New System.Drawing.Point(177, 23) - Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudDigits.Location = New System.Drawing.Point(266, 34) + Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudDigits.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDigits.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Name = "ucrNudDigits" - Me.ucrNudDigits.Size = New System.Drawing.Size(50, 20) + Me.ucrNudDigits.Size = New System.Drawing.Size(75, 30) Me.ucrNudDigits.TabIndex = 27 Me.ucrNudDigits.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblNoDigits ' Me.lblNoDigits.AutoSize = True - Me.lblNoDigits.Location = New System.Drawing.Point(6, 23) + Me.lblNoDigits.Location = New System.Drawing.Point(9, 34) + Me.lblNoDigits.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblNoDigits.Name = "lblNoDigits" - Me.lblNoDigits.Size = New System.Drawing.Size(137, 13) + Me.lblNoDigits.Size = New System.Drawing.Size(204, 20) Me.lblNoDigits.TabIndex = 1 Me.lblNoDigits.Text = "Number of Digits to Display:" ' @@ -532,43 +554,48 @@ Partial Class dlgOptions Me.pnFormatOptions.Controls.Add(Me.lblOutputFormat) Me.pnFormatOptions.Controls.Add(Me.cmdCommentFormat) Me.pnFormatOptions.Controls.Add(Me.lblCommandFormat) - Me.pnFormatOptions.Location = New System.Drawing.Point(10, 10) + Me.pnFormatOptions.Location = New System.Drawing.Point(15, 15) + Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnFormatOptions.Name = "pnFormatOptions" - Me.pnFormatOptions.Size = New System.Drawing.Size(391, 118) + Me.pnFormatOptions.Size = New System.Drawing.Size(586, 175) Me.pnFormatOptions.TabIndex = 21 ' 'rtbCommentPreview ' - Me.rtbCommentPreview.Location = New System.Drawing.Point(124, 89) + Me.rtbCommentPreview.Location = New System.Drawing.Point(186, 134) + Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rtbCommentPreview.Name = "rtbCommentPreview" Me.rtbCommentPreview.ReadOnly = True - Me.rtbCommentPreview.Size = New System.Drawing.Size(147, 26) + Me.rtbCommentPreview.Size = New System.Drawing.Size(218, 37) Me.rtbCommentPreview.TabIndex = 22 Me.rtbCommentPreview.Text = "" ' 'rtbOutputPreview ' - Me.rtbOutputPreview.Location = New System.Drawing.Point(124, 49) + Me.rtbOutputPreview.Location = New System.Drawing.Point(186, 74) + Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rtbOutputPreview.Name = "rtbOutputPreview" Me.rtbOutputPreview.ReadOnly = True - Me.rtbOutputPreview.Size = New System.Drawing.Size(147, 26) + Me.rtbOutputPreview.Size = New System.Drawing.Size(218, 37) Me.rtbOutputPreview.TabIndex = 21 Me.rtbOutputPreview.Text = "" ' 'rtbCommandPreview ' - Me.rtbCommandPreview.Location = New System.Drawing.Point(124, 9) + Me.rtbCommandPreview.Location = New System.Drawing.Point(186, 14) + Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rtbCommandPreview.Name = "rtbCommandPreview" Me.rtbCommandPreview.ReadOnly = True - Me.rtbCommandPreview.Size = New System.Drawing.Size(147, 26) + Me.rtbCommandPreview.Size = New System.Drawing.Size(218, 37) Me.rtbCommandPreview.TabIndex = 20 Me.rtbCommandPreview.Text = "" ' 'cmdCommandFormat ' - Me.cmdCommandFormat.Location = New System.Drawing.Point(288, 9) + Me.cmdCommandFormat.Location = New System.Drawing.Point(432, 14) + Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCommandFormat.Name = "cmdCommandFormat" - Me.cmdCommandFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdCommandFormat.Size = New System.Drawing.Size(150, 34) Me.cmdCommandFormat.TabIndex = 10 Me.cmdCommandFormat.Text = "Change..." Me.cmdCommandFormat.UseVisualStyleBackColor = True @@ -576,17 +603,19 @@ Partial Class dlgOptions 'lblCommentFormat ' Me.lblCommentFormat.AutoSize = True - Me.lblCommentFormat.Location = New System.Drawing.Point(4, 94) + Me.lblCommentFormat.Location = New System.Drawing.Point(6, 141) + Me.lblCommentFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCommentFormat.Name = "lblCommentFormat" - Me.lblCommentFormat.Size = New System.Drawing.Size(89, 13) + Me.lblCommentFormat.Size = New System.Drawing.Size(137, 20) Me.lblCommentFormat.TabIndex = 19 Me.lblCommentFormat.Text = "Comment Format:" ' 'cmdOutputFormat ' - Me.cmdOutputFormat.Location = New System.Drawing.Point(288, 49) + Me.cmdOutputFormat.Location = New System.Drawing.Point(432, 74) + Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdOutputFormat.Name = "cmdOutputFormat" - Me.cmdOutputFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdOutputFormat.Size = New System.Drawing.Size(150, 34) Me.cmdOutputFormat.TabIndex = 16 Me.cmdOutputFormat.Text = "Change..." Me.cmdOutputFormat.UseVisualStyleBackColor = True @@ -594,17 +623,19 @@ Partial Class dlgOptions 'lblOutputFormat ' Me.lblOutputFormat.AutoSize = True - Me.lblOutputFormat.Location = New System.Drawing.Point(4, 54) + Me.lblOutputFormat.Location = New System.Drawing.Point(6, 81) + Me.lblOutputFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblOutputFormat.Name = "lblOutputFormat" - Me.lblOutputFormat.Size = New System.Drawing.Size(77, 13) + Me.lblOutputFormat.Size = New System.Drawing.Size(117, 20) Me.lblOutputFormat.TabIndex = 18 Me.lblOutputFormat.Text = "Output Format:" ' 'cmdCommentFormat ' - Me.cmdCommentFormat.Location = New System.Drawing.Point(288, 89) + Me.cmdCommentFormat.Location = New System.Drawing.Point(432, 134) + Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdCommentFormat.Name = "cmdCommentFormat" - Me.cmdCommentFormat.Size = New System.Drawing.Size(100, 23) + Me.cmdCommentFormat.Size = New System.Drawing.Size(150, 34) Me.cmdCommentFormat.TabIndex = 16 Me.cmdCommentFormat.Text = "Change..." Me.cmdCommentFormat.UseVisualStyleBackColor = True @@ -612,19 +643,21 @@ Partial Class dlgOptions 'lblCommandFormat ' Me.lblCommandFormat.AutoSize = True - Me.lblCommandFormat.Location = New System.Drawing.Point(4, 14) + Me.lblCommandFormat.Location = New System.Drawing.Point(6, 21) + Me.lblCommandFormat.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblCommandFormat.Name = "lblCommandFormat" - Me.lblCommandFormat.Size = New System.Drawing.Size(92, 13) + Me.lblCommandFormat.Size = New System.Drawing.Size(141, 20) Me.lblCommandFormat.TabIndex = 17 Me.lblCommandFormat.Text = "Command Format:" ' 'tbpEditor ' Me.tbpEditor.Controls.Add(Me.pnFormatEditor) - Me.tbpEditor.Location = New System.Drawing.Point(4, 22) + Me.tbpEditor.Location = New System.Drawing.Point(4, 29) + Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpEditor.Name = "tbpEditor" - Me.tbpEditor.Padding = New System.Windows.Forms.Padding(3) - Me.tbpEditor.Size = New System.Drawing.Size(564, 291) + Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Size = New System.Drawing.Size(850, 443) Me.tbpEditor.TabIndex = 10 Me.tbpEditor.Text = "Editor Window" Me.tbpEditor.ToolTipText = "Data View" @@ -636,16 +669,18 @@ Partial Class dlgOptions Me.pnFormatEditor.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) Me.pnFormatEditor.Controls.Add(Me.lblFont) - Me.pnFormatEditor.Location = New System.Drawing.Point(10, 10) + Me.pnFormatEditor.Location = New System.Drawing.Point(15, 15) + Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.pnFormatEditor.Name = "pnFormatEditor" - Me.pnFormatEditor.Size = New System.Drawing.Size(212, 28) + Me.pnFormatEditor.Size = New System.Drawing.Size(318, 41) Me.pnFormatEditor.TabIndex = 22 ' 'cmdEditorFont ' - Me.cmdEditorFont.Location = New System.Drawing.Point(109, 2) + Me.cmdEditorFont.Location = New System.Drawing.Point(164, 3) + Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdEditorFont.Name = "cmdEditorFont" - Me.cmdEditorFont.Size = New System.Drawing.Size(100, 23) + Me.cmdEditorFont.Size = New System.Drawing.Size(150, 34) Me.cmdEditorFont.TabIndex = 10 Me.cmdEditorFont.Text = "Change..." Me.cmdEditorFont.UseVisualStyleBackColor = True @@ -653,9 +688,10 @@ Partial Class dlgOptions 'lblFont ' Me.lblFont.AutoSize = True - Me.lblFont.Location = New System.Drawing.Point(4, 7) + Me.lblFont.Location = New System.Drawing.Point(6, 10) + Me.lblFont.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblFont.Name = "lblFont" - Me.lblFont.Size = New System.Drawing.Size(66, 13) + Me.lblFont.Size = New System.Drawing.Size(101, 20) Me.lblFont.TabIndex = 17 Me.lblFont.Text = "Format Font:" ' @@ -665,10 +701,11 @@ Partial Class dlgOptions Me.tbpCommands.Controls.Add(Me.ucrChkShowWaitDialog) Me.tbpCommands.Controls.Add(Me.ucrNudWaitSeconds) Me.tbpCommands.Controls.Add(Me.ucrChkIncludeDefaultParams) - Me.tbpCommands.Location = New System.Drawing.Point(4, 22) + Me.tbpCommands.Location = New System.Drawing.Point(4, 29) + Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpCommands.Name = "tbpCommands" - Me.tbpCommands.Padding = New System.Windows.Forms.Padding(3) - Me.tbpCommands.Size = New System.Drawing.Size(564, 291) + Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Size = New System.Drawing.Size(850, 443) Me.tbpCommands.TabIndex = 4 Me.tbpCommands.Tag = "Commands" Me.tbpCommands.Text = "Commands" @@ -677,9 +714,10 @@ Partial Class dlgOptions 'lblWaitSeconds ' Me.lblWaitSeconds.AutoSize = True - Me.lblWaitSeconds.Location = New System.Drawing.Point(403, 46) + Me.lblWaitSeconds.Location = New System.Drawing.Point(604, 69) + Me.lblWaitSeconds.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWaitSeconds.Name = "lblWaitSeconds" - Me.lblWaitSeconds.Size = New System.Drawing.Size(47, 13) + Me.lblWaitSeconds.Size = New System.Drawing.Size(69, 20) Me.lblWaitSeconds.TabIndex = 8 Me.lblWaitSeconds.Text = "seconds" ' @@ -687,10 +725,10 @@ Partial Class dlgOptions ' Me.ucrChkShowWaitDialog.AutoSize = True Me.ucrChkShowWaitDialog.Checked = False - Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(6, 47) - Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(9, 70) + Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowWaitDialog.Name = "ucrChkShowWaitDialog" - Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(337, 34) + Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(506, 51) Me.ucrChkShowWaitDialog.TabIndex = 6 ' 'ucrNudWaitSeconds @@ -698,12 +736,12 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds.AutoSize = True Me.ucrNudWaitSeconds.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(349, 45) - Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(524, 68) + Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudWaitSeconds.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWaitSeconds.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Name = "ucrNudWaitSeconds" - Me.ucrNudWaitSeconds.Size = New System.Drawing.Size(50, 20) + Me.ucrNudWaitSeconds.Size = New System.Drawing.Size(75, 30) Me.ucrNudWaitSeconds.TabIndex = 5 Me.ucrNudWaitSeconds.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -711,14 +749,15 @@ Partial Class dlgOptions ' Me.ucrChkIncludeDefaultParams.AutoSize = True Me.ucrChkIncludeDefaultParams.Checked = False - Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(6, 20) - Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(9, 30) + Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkIncludeDefaultParams.Name = "ucrChkIncludeDefaultParams" - Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(398, 34) + Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(597, 51) Me.ucrChkIncludeDefaultParams.TabIndex = 3 ' 'tbpDataView ' + Me.tbpDataView.Controls.Add(Me.ucrChkSwitchUndo) Me.tbpDataView.Controls.Add(Me.lblEvery) Me.tbpDataView.Controls.Add(Me.lblMinutes) Me.tbpDataView.Controls.Add(Me.ucrChkAutoSave) @@ -728,10 +767,11 @@ Partial Class dlgOptions Me.tbpDataView.Controls.Add(Me.lblMaxCols) Me.tbpDataView.Controls.Add(Me.ucrNudMaxRows) Me.tbpDataView.Controls.Add(Me.lblMaxRows) - Me.tbpDataView.Location = New System.Drawing.Point(4, 22) + Me.tbpDataView.Location = New System.Drawing.Point(4, 29) + Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpDataView.Name = "tbpDataView" - Me.tbpDataView.Padding = New System.Windows.Forms.Padding(3) - Me.tbpDataView.Size = New System.Drawing.Size(564, 291) + Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Size = New System.Drawing.Size(850, 443) Me.tbpDataView.TabIndex = 9 Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True @@ -739,18 +779,20 @@ Partial Class dlgOptions 'lblEvery ' Me.lblEvery.AutoSize = True - Me.lblEvery.Location = New System.Drawing.Point(220, 115) + Me.lblEvery.Location = New System.Drawing.Point(330, 172) + Me.lblEvery.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblEvery.Name = "lblEvery" - Me.lblEvery.Size = New System.Drawing.Size(33, 13) + Me.lblEvery.Size = New System.Drawing.Size(46, 20) Me.lblEvery.TabIndex = 4 Me.lblEvery.Text = "every" ' 'lblMinutes ' Me.lblMinutes.AutoSize = True - Me.lblMinutes.Location = New System.Drawing.Point(340, 115) + Me.lblMinutes.Location = New System.Drawing.Point(510, 172) + Me.lblMinutes.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMinutes.Name = "lblMinutes" - Me.lblMinutes.Size = New System.Drawing.Size(43, 13) + Me.lblMinutes.Size = New System.Drawing.Size(65, 20) Me.lblMinutes.TabIndex = 4 Me.lblMinutes.Text = "minutes" ' @@ -758,20 +800,20 @@ Partial Class dlgOptions ' Me.ucrChkAutoSave.AutoSize = True Me.ucrChkAutoSave.Checked = False - Me.ucrChkAutoSave.Location = New System.Drawing.Point(13, 114) - Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkAutoSave.Location = New System.Drawing.Point(20, 171) + Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkAutoSave.Name = "ucrChkAutoSave" - Me.ucrChkAutoSave.Size = New System.Drawing.Size(217, 34) + Me.ucrChkAutoSave.Size = New System.Drawing.Size(326, 51) Me.ucrChkAutoSave.TabIndex = 3 ' 'ucrChkShowDataonGrid ' Me.ucrChkShowDataonGrid.AutoSize = True Me.ucrChkShowDataonGrid.Checked = False - Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(13, 78) - Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(20, 117) + Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkShowDataonGrid.Name = "ucrChkShowDataonGrid" - Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(393, 34) + Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(590, 51) Me.ucrChkShowDataonGrid.TabIndex = 3 ' 'ucrNudAutoSaveMinutes @@ -779,12 +821,12 @@ Partial Class dlgOptions Me.ucrNudAutoSaveMinutes.AutoSize = True Me.ucrNudAutoSaveMinutes.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(268, 112) - Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(402, 168) + Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudAutoSaveMinutes.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Name = "ucrNudAutoSaveMinutes" - Me.ucrNudAutoSaveMinutes.Size = New System.Drawing.Size(50, 20) + Me.ucrNudAutoSaveMinutes.Size = New System.Drawing.Size(75, 30) Me.ucrNudAutoSaveMinutes.TabIndex = 2 Me.ucrNudAutoSaveMinutes.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -793,21 +835,22 @@ Partial Class dlgOptions Me.ucrNudMaxCols.AutoSize = True Me.ucrNudMaxCols.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxCols.Location = New System.Drawing.Point(268, 41) - Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudMaxCols.Location = New System.Drawing.Point(402, 62) + Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudMaxCols.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxCols.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Name = "ucrNudMaxCols" - Me.ucrNudMaxCols.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxCols.Size = New System.Drawing.Size(75, 30) Me.ucrNudMaxCols.TabIndex = 2 Me.ucrNudMaxCols.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblMaxCols ' Me.lblMaxCols.AutoSize = True - Me.lblMaxCols.Location = New System.Drawing.Point(10, 44) + Me.lblMaxCols.Location = New System.Drawing.Point(15, 66) + Me.lblMaxCols.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxCols.Name = "lblMaxCols" - Me.lblMaxCols.Size = New System.Drawing.Size(198, 13) + Me.lblMaxCols.Size = New System.Drawing.Size(297, 20) Me.lblMaxCols.TabIndex = 1 Me.lblMaxCols.Text = "Maximum Number of Columns to Display:" ' @@ -816,21 +859,22 @@ Partial Class dlgOptions Me.ucrNudMaxRows.AutoSize = True Me.ucrNudMaxRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxRows.Location = New System.Drawing.Point(268, 15) - Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(5) + Me.ucrNudMaxRows.Location = New System.Drawing.Point(402, 22) + Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrNudMaxRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Name = "ucrNudMaxRows" - Me.ucrNudMaxRows.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMaxRows.Size = New System.Drawing.Size(75, 30) Me.ucrNudMaxRows.TabIndex = 2 Me.ucrNudMaxRows.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'lblMaxRows ' Me.lblMaxRows.AutoSize = True - Me.lblMaxRows.Location = New System.Drawing.Point(10, 18) + Me.lblMaxRows.Location = New System.Drawing.Point(15, 27) + Me.lblMaxRows.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblMaxRows.Name = "lblMaxRows" - Me.lblMaxRows.Size = New System.Drawing.Size(185, 13) + Me.lblMaxRows.Size = New System.Drawing.Size(275, 20) Me.lblMaxRows.TabIndex = 1 Me.lblMaxRows.Text = "Maximum Number of Rows to Display:" ' @@ -839,19 +883,21 @@ Partial Class dlgOptions Me.tbpWorkingDirectory.Controls.Add(Me.cmdWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) - Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 22) + Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 29) + Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" - Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(3) - Me.tbpWorkingDirectory.Size = New System.Drawing.Size(564, 291) + Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Size = New System.Drawing.Size(850, 443) Me.tbpWorkingDirectory.TabIndex = 11 Me.tbpWorkingDirectory.Text = "Working Directory" Me.tbpWorkingDirectory.UseVisualStyleBackColor = True ' 'cmdWorkingDirectory ' - Me.cmdWorkingDirectory.Location = New System.Drawing.Point(399, 16) + Me.cmdWorkingDirectory.Location = New System.Drawing.Point(598, 24) + Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" - Me.cmdWorkingDirectory.Size = New System.Drawing.Size(24, 21) + Me.cmdWorkingDirectory.Size = New System.Drawing.Size(36, 32) Me.cmdWorkingDirectory.TabIndex = 2 Me.cmdWorkingDirectory.Text = "..." Me.cmdWorkingDirectory.UseVisualStyleBackColor = True @@ -859,9 +905,10 @@ Partial Class dlgOptions 'lblWorkingDirectory ' Me.lblWorkingDirectory.AutoSize = True - Me.lblWorkingDirectory.Location = New System.Drawing.Point(13, 20) + Me.lblWorkingDirectory.Location = New System.Drawing.Point(20, 30) + Me.lblWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblWorkingDirectory.Name = "lblWorkingDirectory" - Me.lblWorkingDirectory.Size = New System.Drawing.Size(95, 13) + Me.lblWorkingDirectory.Size = New System.Drawing.Size(138, 20) Me.lblWorkingDirectory.TabIndex = 0 Me.lblWorkingDirectory.Text = "Working Directory:" ' @@ -871,10 +918,10 @@ Partial Class dlgOptions Me.ucrWorkingDirectory.AutoSize = True Me.ucrWorkingDirectory.IsMultiline = False Me.ucrWorkingDirectory.IsReadOnly = False - Me.ucrWorkingDirectory.Location = New System.Drawing.Point(138, 17) - Me.ucrWorkingDirectory.Margin = New System.Windows.Forms.Padding(6) + Me.ucrWorkingDirectory.Location = New System.Drawing.Point(207, 26) + Me.ucrWorkingDirectory.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrWorkingDirectory.Name = "ucrWorkingDirectory" - Me.ucrWorkingDirectory.Size = New System.Drawing.Size(255, 21) + Me.ucrWorkingDirectory.Size = New System.Drawing.Size(382, 32) Me.ucrWorkingDirectory.TabIndex = 1 ' 'tbpGraphDisplay @@ -883,10 +930,11 @@ Partial Class dlgOptions Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinRViewer) Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinOutputWindow) Me.tbpGraphDisplay.Controls.Add(Me.ucrPnlGraphDisplay) - Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 22) + Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 29) + Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpGraphDisplay.Name = "tbpGraphDisplay" - Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(3) - Me.tbpGraphDisplay.Size = New System.Drawing.Size(564, 291) + Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Size = New System.Drawing.Size(850, 443) Me.tbpGraphDisplay.TabIndex = 12 Me.tbpGraphDisplay.Text = "Graph Display" Me.tbpGraphDisplay.UseVisualStyleBackColor = True @@ -895,9 +943,10 @@ Partial Class dlgOptions ' Me.rdoDisplayinSeparateWindows.AutoSize = True Me.rdoDisplayinSeparateWindows.Checked = True - Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(6, 52) + Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(9, 78) + Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDisplayinSeparateWindows.Name = "rdoDisplayinSeparateWindows" - Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(163, 17) + Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(239, 24) Me.rdoDisplayinSeparateWindows.TabIndex = 1 Me.rdoDisplayinSeparateWindows.TabStop = True Me.rdoDisplayinSeparateWindows.Text = "Display in Separate Windows" @@ -906,9 +955,10 @@ Partial Class dlgOptions 'rdoDisplayinRViewer ' Me.rdoDisplayinRViewer.AutoSize = True - Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(6, 29) + Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(9, 44) + Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDisplayinRViewer.Name = "rdoDisplayinRViewer" - Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(116, 17) + Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(169, 24) Me.rdoDisplayinRViewer.TabIndex = 1 Me.rdoDisplayinRViewer.Text = "Display in R Viewer" Me.rdoDisplayinRViewer.UseVisualStyleBackColor = True @@ -916,9 +966,10 @@ Partial Class dlgOptions 'rdoDisplayinOutputWindow ' Me.rdoDisplayinOutputWindow.AutoSize = True - Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(6, 6) + Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(9, 9) + Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.rdoDisplayinOutputWindow.Name = "rdoDisplayinOutputWindow" - Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(147, 17) + Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(214, 24) Me.rdoDisplayinOutputWindow.TabIndex = 1 Me.rdoDisplayinOutputWindow.Text = "Display in Output Window" Me.rdoDisplayinOutputWindow.UseVisualStyleBackColor = True @@ -926,10 +977,10 @@ Partial Class dlgOptions 'ucrPnlGraphDisplay ' Me.ucrPnlGraphDisplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 3) - Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(5) + Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 4) + Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrPnlGraphDisplay.Name = "ucrPnlGraphDisplay" - Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(365, 66) + Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(548, 99) Me.ucrPnlGraphDisplay.TabIndex = 3 ' 'tbpTailoredMenus @@ -938,10 +989,11 @@ Partial Class dlgOptions Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewOptionsByContextMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewProcurementMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewClimaticMenu) - Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 22) + Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 29) + Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpTailoredMenus.Name = "tbpTailoredMenus" - Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(3) - Me.tbpTailoredMenus.Size = New System.Drawing.Size(564, 291) + Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Size = New System.Drawing.Size(850, 443) Me.tbpTailoredMenus.TabIndex = 13 Me.tbpTailoredMenus.Text = "Tailored Menus" Me.tbpTailoredMenus.UseVisualStyleBackColor = True @@ -950,40 +1002,40 @@ Partial Class dlgOptions ' Me.ucrChkViewStructuredMenu.AutoSize = True Me.ucrChkViewStructuredMenu.Checked = False - Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(7, 12) - Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(10, 18) + Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewStructuredMenu.Name = "ucrChkViewStructuredMenu" - Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(378, 34) + Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(567, 51) Me.ucrChkViewStructuredMenu.TabIndex = 2 ' 'ucrChkViewOptionsByContextMenu ' Me.ucrChkViewOptionsByContextMenu.AutoSize = True Me.ucrChkViewOptionsByContextMenu.Checked = False - Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(7, 137) - Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(10, 206) + Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewOptionsByContextMenu.Name = "ucrChkViewOptionsByContextMenu" - Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(413, 34) + Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewOptionsByContextMenu.TabIndex = 1 ' 'ucrChkViewProcurementMenu ' Me.ucrChkViewProcurementMenu.AutoSize = True Me.ucrChkViewProcurementMenu.Checked = False - Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(7, 95) - Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(10, 142) + Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewProcurementMenu.Name = "ucrChkViewProcurementMenu" - Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(413, 34) + Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewProcurementMenu.TabIndex = 0 ' 'ucrChkViewClimaticMenu ' Me.ucrChkViewClimaticMenu.AutoSize = True Me.ucrChkViewClimaticMenu.Checked = False - Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(7, 53) - Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(10, 80) + Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkViewClimaticMenu.Name = "ucrChkViewClimaticMenu" - Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(407, 34) + Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(610, 51) Me.ucrChkViewClimaticMenu.TabIndex = 0 ' 'tbpClimsoft @@ -996,10 +1048,11 @@ Partial Class dlgOptions Me.tbpClimsoft.Controls.Add(Me.ucrInputPort) Me.tbpClimsoft.Controls.Add(Me.ucrInputHost) Me.tbpClimsoft.Controls.Add(Me.ucrInputDatabaseName) - Me.tbpClimsoft.Location = New System.Drawing.Point(4, 22) + Me.tbpClimsoft.Location = New System.Drawing.Point(4, 29) + Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.tbpClimsoft.Name = "tbpClimsoft" - Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(3) - Me.tbpClimsoft.Size = New System.Drawing.Size(564, 291) + Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Size = New System.Drawing.Size(850, 443) Me.tbpClimsoft.TabIndex = 14 Me.tbpClimsoft.Text = "Climsoft" Me.tbpClimsoft.UseVisualStyleBackColor = True @@ -1008,9 +1061,10 @@ Partial Class dlgOptions ' Me.lblUserName.AutoSize = True Me.lblUserName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblUserName.Location = New System.Drawing.Point(6, 103) + Me.lblUserName.Location = New System.Drawing.Point(9, 154) + Me.lblUserName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblUserName.Name = "lblUserName" - Me.lblUserName.Size = New System.Drawing.Size(58, 13) + Me.lblUserName.Size = New System.Drawing.Size(87, 20) Me.lblUserName.TabIndex = 19 Me.lblUserName.Text = "Username:" ' @@ -1018,9 +1072,10 @@ Partial Class dlgOptions ' Me.lblPort.AutoSize = True Me.lblPort.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPort.Location = New System.Drawing.Point(6, 76) + Me.lblPort.Location = New System.Drawing.Point(9, 114) + Me.lblPort.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblPort.Name = "lblPort" - Me.lblPort.Size = New System.Drawing.Size(29, 13) + Me.lblPort.Size = New System.Drawing.Size(42, 20) Me.lblPort.TabIndex = 18 Me.lblPort.Text = "Port:" ' @@ -1028,9 +1083,10 @@ Partial Class dlgOptions ' Me.lblHost.AutoSize = True Me.lblHost.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblHost.Location = New System.Drawing.Point(6, 49) + Me.lblHost.Location = New System.Drawing.Point(9, 74) + Me.lblHost.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblHost.Name = "lblHost" - Me.lblHost.Size = New System.Drawing.Size(32, 13) + Me.lblHost.Size = New System.Drawing.Size(47, 20) Me.lblHost.TabIndex = 17 Me.lblHost.Text = "Host:" ' @@ -1038,9 +1094,10 @@ Partial Class dlgOptions ' Me.lblDatabaseName.AutoSize = True Me.lblDatabaseName.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDatabaseName.Location = New System.Drawing.Point(6, 21) + Me.lblDatabaseName.Location = New System.Drawing.Point(9, 32) + Me.lblDatabaseName.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.lblDatabaseName.Name = "lblDatabaseName" - Me.lblDatabaseName.Size = New System.Drawing.Size(87, 13) + Me.lblDatabaseName.Size = New System.Drawing.Size(129, 20) Me.lblDatabaseName.TabIndex = 16 Me.lblDatabaseName.Text = "Database Name:" ' @@ -1050,10 +1107,10 @@ Partial Class dlgOptions Me.ucrInputUserName.AutoSize = True Me.ucrInputUserName.IsMultiline = False Me.ucrInputUserName.IsReadOnly = False - Me.ucrInputUserName.Location = New System.Drawing.Point(168, 96) - Me.ucrInputUserName.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputUserName.Location = New System.Drawing.Point(252, 144) + Me.ucrInputUserName.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputUserName.Name = "ucrInputUserName" - Me.ucrInputUserName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputUserName.Size = New System.Drawing.Size(206, 32) Me.ucrInputUserName.TabIndex = 15 ' 'ucrInputPort @@ -1062,10 +1119,10 @@ Partial Class dlgOptions Me.ucrInputPort.AutoSize = True Me.ucrInputPort.IsMultiline = False Me.ucrInputPort.IsReadOnly = False - Me.ucrInputPort.Location = New System.Drawing.Point(168, 69) - Me.ucrInputPort.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputPort.Location = New System.Drawing.Point(252, 104) + Me.ucrInputPort.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputPort.Name = "ucrInputPort" - Me.ucrInputPort.Size = New System.Drawing.Size(137, 21) + Me.ucrInputPort.Size = New System.Drawing.Size(206, 32) Me.ucrInputPort.TabIndex = 14 ' 'ucrInputHost @@ -1074,10 +1131,10 @@ Partial Class dlgOptions Me.ucrInputHost.AutoSize = True Me.ucrInputHost.IsMultiline = False Me.ucrInputHost.IsReadOnly = False - Me.ucrInputHost.Location = New System.Drawing.Point(168, 43) - Me.ucrInputHost.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputHost.Location = New System.Drawing.Point(252, 64) + Me.ucrInputHost.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputHost.Name = "ucrInputHost" - Me.ucrInputHost.Size = New System.Drawing.Size(137, 21) + Me.ucrInputHost.Size = New System.Drawing.Size(206, 32) Me.ucrInputHost.TabIndex = 13 ' 'ucrInputDatabaseName @@ -1086,20 +1143,19 @@ Partial Class dlgOptions Me.ucrInputDatabaseName.AutoSize = True Me.ucrInputDatabaseName.IsMultiline = False Me.ucrInputDatabaseName.IsReadOnly = False - Me.ucrInputDatabaseName.Location = New System.Drawing.Point(168, 17) - Me.ucrInputDatabaseName.Margin = New System.Windows.Forms.Padding(6) + Me.ucrInputDatabaseName.Location = New System.Drawing.Point(252, 26) + Me.ucrInputDatabaseName.Margin = New System.Windows.Forms.Padding(9, 9, 9, 9) Me.ucrInputDatabaseName.Name = "ucrInputDatabaseName" - Me.ucrInputDatabaseName.Size = New System.Drawing.Size(137, 21) + Me.ucrInputDatabaseName.Size = New System.Drawing.Size(206, 32) Me.ucrInputDatabaseName.TabIndex = 12 ' 'tbpWebsite ' Me.tbpWebsite.Controls.Add(Me.ucrChkReminder) - Me.tbpWebsite.Location = New System.Drawing.Point(4, 22) - Me.tbpWebsite.Margin = New System.Windows.Forms.Padding(2) + Me.tbpWebsite.Location = New System.Drawing.Point(4, 29) Me.tbpWebsite.Name = "tbpWebsite" - Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(2) - Me.tbpWebsite.Size = New System.Drawing.Size(564, 291) + Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbpWebsite.Size = New System.Drawing.Size(850, 443) Me.tbpWebsite.TabIndex = 15 Me.tbpWebsite.Text = "Website" Me.tbpWebsite.UseVisualStyleBackColor = True @@ -1108,18 +1164,28 @@ Partial Class dlgOptions ' Me.ucrChkReminder.AutoSize = True Me.ucrChkReminder.Checked = False - Me.ucrChkReminder.Location = New System.Drawing.Point(7, 22) - Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(5) + Me.ucrChkReminder.Location = New System.Drawing.Point(10, 33) + Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) Me.ucrChkReminder.Name = "ucrChkReminder" - Me.ucrChkReminder.Size = New System.Drawing.Size(413, 34) + Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' + 'ucrChkSwitchUndo + ' + Me.ucrChkSwitchUndo.AutoSize = True + Me.ucrChkSwitchUndo.Checked = False + Me.ucrChkSwitchUndo.Location = New System.Drawing.Point(20, 227) + Me.ucrChkSwitchUndo.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkSwitchUndo.Name = "ucrChkSwitchUndo" + Me.ucrChkSwitchUndo.Size = New System.Drawing.Size(326, 51) + Me.ucrChkSwitchUndo.TabIndex = 5 + ' 'dlgOptions ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(770, 353) + Me.ClientSize = New System.Drawing.Size(1155, 530) Me.Controls.Add(Me.cmdLanguage) Me.Controls.Add(Me.cmdApply) Me.Controls.Add(Me.cmdHelp) @@ -1127,6 +1193,7 @@ Partial Class dlgOptions Me.Controls.Add(Me.cmdOk) Me.Controls.Add(Me.spltControls) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgOptions" @@ -1256,4 +1323,5 @@ Partial Class dlgOptions Friend WithEvents lversion As Label Friend WithEvents tbpWebsite As TabPage Friend WithEvents ucrChkReminder As ucrCheck + Friend WithEvents ucrChkSwitchUndo As ucrCheck End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 35cf301c8b7..658ed78081e 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -78,6 +78,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") + ucrChkSwitchUndo.SetText("Switch off undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -102,6 +103,7 @@ Public Class dlgOptions Private Sub LoadInstatOptions() ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData + ucrChkSwitchUndo.Checked = frmMain.clsInstatOptions.bUndoSwitchAction SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput) SetCommandFont(frmMain.clsInstatOptions.fntScript, frmMain.clsInstatOptions.clrScript) SetCommentFont(frmMain.clsInstatOptions.fntComment, frmMain.clsInstatOptions.clrComment) @@ -172,6 +174,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetMaxRows(ucrNudMaxRows.Value) frmMain.clsInstatOptions.SetMaxCols(ucrNudMaxCols.Value) frmMain.clsInstatOptions.SetAutoSaveData(ucrChkAutoSave.Checked) + frmMain.clsInstatOptions.SetUndoSwitchAction(ucrChkSwitchUndo.Checked) frmMain.clsInstatOptions.SetAutoSaveDataMinutes(ucrNudAutoSaveMinutes.Value) frmMain.clsInstatOptions.SetLanguageCultureCode(strCurrLanguageCulture) frmMain.clsInstatOptions.SetWorkingDirectory(strWorkingDirectory) @@ -360,7 +363,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrChkSwitchUndo.ControlValueChanged ApplyEnabled(True) End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 065e053bf9d..b0c7ac4ce48 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -286,7 +286,7 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { DataSheet$set("public", "set_history", function(history) { if(!is.list(history)) stop("history must be of type: list") - MAX_HISTORY_SIZE <- 10 + MAX_HISTORY_SIZE <- 5 # Limit history size if (length(private$history) >= MAX_HISTORY_SIZE) { private$history <- private$history[-1] # Remove the oldest entry diff --git a/instat/ucrColumnMetadata.vb b/instat/ucrColumnMetadata.vb index d9f4db985ec..2d102ea97c4 100644 --- a/instat/ucrColumnMetadata.vb +++ b/instat/ucrColumnMetadata.vb @@ -387,7 +387,7 @@ Public Class ucrColumnMetadata If _grid.GetSelectedRows.Count = GetCurrentDataFrameFocus()?.iTotalColumnCount Then MsgBox("Cannot delete all visible columns." & Environment.NewLine & "Use Prepare > Data Object > Delete Data Frame if you wish to delete the data.", MsgBoxStyle.Information, "Cannot Delete All Columns") Else - Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?" & Environment.NewLine & "This action cannot be undone.", MessageBoxButtons.YesNo, "Delete Column") + Dim deleteCol = MsgBox("Are you sure you want to delete these column(s)?", MessageBoxButtons.YesNo, "Delete Column") If deleteCol = DialogResult.Yes Then StartWait() GetCurrentDataFrameFocus().clsPrepareFunctions.DeleteColumn(GetSelectedDataframeColumnsFromSelectedRows) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 89c4f0a1104..9f3690bce3f 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -89,6 +89,7 @@ Public Class ucrDataView AddHandler _grid.DeleteValuesToDataframe, AddressOf DeleteCell_Click AddHandler _grid.EditCell, AddressOf EditCell AddHandler _grid.FindRow, AddressOf FindRow + AddHandler _grid.Undo, AddressOf Undo End Sub Private Sub RefreshWorksheet(fillWorkSheet As clsWorksheetAdapter, dataFrame As clsDataFrame) @@ -1013,6 +1014,25 @@ Public Class ucrDataView dlgFindInVariableOrFilter.ShowDialog() End Sub + Private Sub Undo() + If frmMain.clsInstatOptions.bUndoSwitchAction Then + Dim bUndo As Boolean = True + If GetCurrentDataFrameFocus.iTotalRowCount > 1000 Then + Dim result As DialogResult = MessageBox.Show(Me, "The dataset you are working with has more than 1000 rows, which may cause the undo operation to be slow. Do you want to proceed?", + "Large Data Set Detected", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) + ' Check if the user clicked No + If result = DialogResult.No Then + bUndo = False + End If + End If + + + If bUndo Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + End If + End If + End Sub + Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, Optional bApplyToRows As Boolean = False) _grid.SearchRowInGrid(rowNumbers, strColumn, iRow, bApplyToRows) From 6e55c526b7e8a029f332a112ea14cc3c9de92551 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 14:34:34 +0300 Subject: [PATCH 234/273] improvement in the switch off undo --- instat/Model/DataFrame/clsDataFramePage.vb | 17 + instat/clsInstatOptions.vb | 35 +- instat/clsInstatOptionsDefaults.vb | 4 +- instat/dlgOptions.Designer.vb | 235 ++- instat/dlgOptions.vb | 18 +- instat/frmMain.Designer.vb | 1382 +++++++++-------- instat/frmMain.resx | 4 +- instat/frmMain.vb | 4 + instat/static/InstatObject/R/data_object_R6.R | 2 +- instat/ucrDataView.vb | 29 +- 10 files changed, 930 insertions(+), 800 deletions(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index b522bab885b..3fb28e84784 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -213,6 +213,23 @@ Public Class clsDataFramePage End Sub + Public Function HasHistory() + Dim expTemp As SymbolicExpression + Dim bHasHistory As Boolean = False + Dim clsHasHistoryFunction As New RFunction + + clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_history") + clsHasHistoryFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) + If clsHasHistoryFunction IsNot Nothing Then + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasHistoryFunction.ToScript(), bSilent:=True) + If expTemp IsNot Nothing AndAlso expTemp.AsCharacter(0) = "TRUE" Then + bHasHistory = True + End If + End If + + Return bHasHistory + End Function + Private Function GetDataFrameFromRCommand() As DataFrame Dim clsGetDataFrameRFunction As New RFunction Dim expTemp As SymbolicExpression diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 4f02cb7d8ec..41799e583a3 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -31,6 +31,8 @@ Imports RDotNet Public iPreviewRows As Nullable(Of Integer) Public iMaxRows As Nullable(Of Integer) Public iMaxCols As Nullable(Of Integer) + Public iUndoColLimit As Nullable(Of Integer) + Public iUndoRowLimit As Nullable(Of Integer) Public lstColourPalette As List(Of Color) Public strGraphDisplayOption As String Public bCommandsinOutput As Nullable(Of Boolean) @@ -76,6 +78,8 @@ Imports RDotNet iPreviewRows = clsInstatOptionsDefaults.DEFAULTiPreviewRows iMaxRows = clsInstatOptionsDefaults.DEFAULTiMaxRows iMaxCols = clsInstatOptionsDefaults.DEFAULTiMaxCols + iUndoColLimit = clsInstatOptionsDefaults.DEFAULTiUndoColLimit + iUndoRowLimit = clsInstatOptionsDefaults.DEFAULTiUndoRowLimit strComment = Translations.GetTranslation(clsInstatOptionsDefaults.DEFAULTstrComment) strGraphDisplayOption = clsInstatOptionsDefaults.DEFAULTstrGraphDisplayOption strLanguageCultureCode = clsInstatOptionsDefaults.DEFAULTstrLanguageCultureCode @@ -85,7 +89,6 @@ Imports RDotNet bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData - bUndoSwitchAction = clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds @@ -146,6 +149,18 @@ Imports RDotNet SetMaxCols(clsInstatOptionsDefaults.DEFAULTiMaxCols) End If + If iUndoColLimit.HasValue Then + SetUndoColLimit(iUndoColLimit) + Else + SetUndoColLimit(clsInstatOptionsDefaults.DEFAULTiUndoColLimit) + End If + + If iUndoRowLimit.HasValue Then + SetUndoRowLimit(iUndoRowLimit) + Else + SetUndoRowLimit(clsInstatOptionsDefaults.DEFAULTiUndoRowLimit) + End If + If bCommandsinOutput.HasValue Then SetCommandInOutpt(bCommandsinOutput) Else @@ -246,12 +261,6 @@ Imports RDotNet SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData) End If - If bUndoSwitchAction.HasValue Then - SetUndoSwitchAction(bUndoSwitchAction) - Else - SetUndoSwitchAction(clsInstatOptionsDefaults.DEFAULTbUndoSwitchAction) - End If - If iAutoSaveDataMinutes.HasValue Then SetAutoSaveDataMinutes(iAutoSaveDataMinutes) Else @@ -364,6 +373,14 @@ Imports RDotNet Return If(expression Is Nothing OrElse expression.Type = Internals.SymbolicExpressionType.Null, Nothing, expression.AsCharacter(0)) End Function + Public Sub SetUndoColLimit(iNewUndoColLimit As Integer) + iUndoColLimit = iNewUndoColLimit + End Sub + + Public Sub SetUndoRowLimit(iNewUndoRowLimit As Integer) + iUndoRowLimit = iNewUndoRowLimit + End Sub + Public Sub SetMaxRows(iRows As Integer) iMaxRows = iRows frmMain.UpdateAllGrids() @@ -538,10 +555,6 @@ Imports RDotNet bAutoSaveData = bNewAutoSave End Sub - Public Sub SetUndoSwitchAction(bNewUndoSwitchAction As Boolean) - bUndoSwitchAction = bNewUndoSwitchAction - End Sub - Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer) iAutoSaveDataMinutes = iNewMinutes frmMain.ResetTimer() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index dfffa158f30..ffcf62d0ddb 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,6 +33,8 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 + Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False @@ -45,7 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = True + Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 7e6cfb377c8..4f9e071cf9f 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -94,6 +94,11 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds = New instat.ucrNud() Me.ucrChkIncludeDefaultParams = New instat.ucrCheck() Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.Label3 = New System.Windows.Forms.Label() + Me.ucrNudRowUndoLimit = New instat.ucrNud() + Me.Label2 = New System.Windows.Forms.Label() + Me.Label1 = New System.Windows.Forms.Label() + Me.ucrNudColUndoLimit = New instat.ucrNud() Me.lblEvery = New System.Windows.Forms.Label() Me.lblMinutes = New System.Windows.Forms.Label() Me.ucrChkAutoSave = New instat.ucrCheck() @@ -128,7 +133,7 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() - Me.ucrChkSwitchUndo = New instat.ucrCheck() + Me.Label4 = New System.Windows.Forms.Label() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -155,7 +160,7 @@ Partial Class dlgOptions 'cmdApply ' Me.cmdApply.Location = New System.Drawing.Point(576, 486) - Me.cmdApply.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdApply.Margin = New System.Windows.Forms.Padding(4) Me.cmdApply.Name = "cmdApply" Me.cmdApply.Size = New System.Drawing.Size(112, 34) Me.cmdApply.TabIndex = 10 @@ -166,7 +171,7 @@ Partial Class dlgOptions 'cmdHelp ' Me.cmdHelp.Location = New System.Drawing.Point(698, 486) - Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdHelp.Margin = New System.Windows.Forms.Padding(4) Me.cmdHelp.Name = "cmdHelp" Me.cmdHelp.Size = New System.Drawing.Size(112, 34) Me.cmdHelp.TabIndex = 12 @@ -177,7 +182,7 @@ Partial Class dlgOptions 'cmdCancel ' Me.cmdCancel.Location = New System.Drawing.Point(454, 486) - Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCancel.Margin = New System.Windows.Forms.Padding(4) Me.cmdCancel.Name = "cmdCancel" Me.cmdCancel.Size = New System.Drawing.Size(112, 34) Me.cmdCancel.TabIndex = 9 @@ -188,7 +193,7 @@ Partial Class dlgOptions 'cmdOk ' Me.cmdOk.Location = New System.Drawing.Point(333, 486) - Me.cmdOk.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdOk.Margin = New System.Windows.Forms.Padding(4) Me.cmdOk.Name = "cmdOk" Me.cmdOk.Size = New System.Drawing.Size(112, 34) Me.cmdOk.TabIndex = 11 @@ -200,7 +205,7 @@ Partial Class dlgOptions ' Me.cmdLanguage.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdLanguage.Location = New System.Drawing.Point(818, 486) - Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdLanguage.Margin = New System.Windows.Forms.Padding(4) Me.cmdLanguage.Name = "cmdLanguage" Me.cmdLanguage.Size = New System.Drawing.Size(56, 34) Me.cmdLanguage.TabIndex = 13 @@ -211,7 +216,7 @@ Partial Class dlgOptions 'spltControls ' Me.spltControls.Location = New System.Drawing.Point(8, 2) - Me.spltControls.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.spltControls.Margin = New System.Windows.Forms.Padding(4) Me.spltControls.Name = "spltControls" ' 'spltControls.Panel1 @@ -230,7 +235,7 @@ Partial Class dlgOptions 'cmdFactoryReset ' Me.cmdFactoryReset.Location = New System.Drawing.Point(20, 430) - Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdFactoryReset.Margin = New System.Windows.Forms.Padding(4) Me.cmdFactoryReset.Name = "cmdFactoryReset" Me.cmdFactoryReset.Size = New System.Drawing.Size(150, 34) Me.cmdFactoryReset.TabIndex = 13 @@ -242,7 +247,7 @@ Partial Class dlgOptions ' Me.trOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.trOptions.Location = New System.Drawing.Point(0, 0) - Me.trOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.trOptions.Margin = New System.Windows.Forms.Padding(4) Me.trOptions.Name = "trOptions" TreeNode1.Name = "ndLanguages" TreeNode1.Tag = "1" @@ -286,7 +291,7 @@ Partial Class dlgOptions Me.tbcOptions.Controls.Add(Me.tbpWebsite) Me.tbcOptions.Dock = System.Windows.Forms.DockStyle.Fill Me.tbcOptions.Location = New System.Drawing.Point(0, 0) - Me.tbcOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbcOptions.Margin = New System.Windows.Forms.Padding(4) Me.tbcOptions.Name = "tbcOptions" Me.tbcOptions.SelectedIndex = 0 Me.tbcOptions.Size = New System.Drawing.Size(858, 476) @@ -298,9 +303,9 @@ Partial Class dlgOptions Me.tbpLanguages.Controls.Add(Me.lblLanguage) Me.tbpLanguages.Controls.Add(Me.ucrInputLanguage) Me.tbpLanguages.Location = New System.Drawing.Point(4, 29) - Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Margin = New System.Windows.Forms.Padding(4) Me.tbpLanguages.Name = "tbpLanguages" - Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpLanguages.Padding = New System.Windows.Forms.Padding(4) Me.tbpLanguages.Size = New System.Drawing.Size(850, 443) Me.tbpLanguages.TabIndex = 0 Me.tbpLanguages.Tag = "Languages" @@ -342,9 +347,9 @@ Partial Class dlgOptions ' Me.tbpComments.Controls.Add(Me.pnComments) Me.tbpComments.Location = New System.Drawing.Point(4, 29) - Me.tbpComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Margin = New System.Windows.Forms.Padding(4) Me.tbpComments.Name = "tbpComments" - Me.tbpComments.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpComments.Padding = New System.Windows.Forms.Padding(4) Me.tbpComments.Size = New System.Drawing.Size(850, 443) Me.tbpComments.TabIndex = 1 Me.tbpComments.Tag = "Comments" @@ -357,7 +362,7 @@ Partial Class dlgOptions Me.pnComments.Controls.Add(Me.ucrInputComment) Me.pnComments.Controls.Add(Me.lblComment) Me.pnComments.Location = New System.Drawing.Point(15, 15) - Me.pnComments.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnComments.Margin = New System.Windows.Forms.Padding(4) Me.pnComments.Name = "pnComments" Me.pnComments.Size = New System.Drawing.Size(586, 44) Me.pnComments.TabIndex = 2 @@ -391,7 +396,7 @@ Partial Class dlgOptions Me.tbpImport.Controls.Add(Me.ucrNudPreviewRows) Me.tbpImport.Controls.Add(Me.pnImportData) Me.tbpImport.Location = New System.Drawing.Point(4, 29) - Me.tbpImport.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpImport.Margin = New System.Windows.Forms.Padding(4) Me.tbpImport.Name = "tbpImport" Me.tbpImport.Size = New System.Drawing.Size(850, 443) Me.tbpImport.TabIndex = 3 @@ -414,7 +419,7 @@ Partial Class dlgOptions Me.ucrNudPreviewRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudPreviewRows.Location = New System.Drawing.Point(405, 8) - Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudPreviewRows.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudPreviewRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreviewRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewRows.Name = "ucrNudPreviewRows" @@ -427,7 +432,7 @@ Partial Class dlgOptions Me.pnImportData.AutoSize = True Me.pnImportData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.pnImportData.Location = New System.Drawing.Point(15, 15) - Me.pnImportData.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnImportData.Margin = New System.Windows.Forms.Padding(4) Me.pnImportData.Name = "pnImportData" Me.pnImportData.Size = New System.Drawing.Size(0, 0) Me.pnImportData.TabIndex = 2 @@ -441,9 +446,9 @@ Partial Class dlgOptions Me.tbpOutputWindow.Controls.Add(Me.grpROptions) Me.tbpOutputWindow.Controls.Add(Me.pnFormatOptions) Me.tbpOutputWindow.Location = New System.Drawing.Point(4, 29) - Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Margin = New System.Windows.Forms.Padding(4) Me.tbpOutputWindow.Name = "tbpOutputWindow" - Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpOutputWindow.Padding = New System.Windows.Forms.Padding(4) Me.tbpOutputWindow.Size = New System.Drawing.Size(850, 443) Me.tbpOutputWindow.TabIndex = 2 Me.tbpOutputWindow.Text = "Output Window" @@ -455,7 +460,7 @@ Partial Class dlgOptions Me.ucrNudMaxOutputsHeight.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Location = New System.Drawing.Point(759, 202) - Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudMaxOutputsHeight.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxOutputsHeight.Name = "ucrNudMaxOutputsHeight" @@ -468,7 +473,7 @@ Partial Class dlgOptions Me.ucrChkMaxOutputsHeight.AutoSize = True Me.ucrChkMaxOutputsHeight.Checked = False Me.ucrChkMaxOutputsHeight.Location = New System.Drawing.Point(450, 202) - Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkMaxOutputsHeight.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkMaxOutputsHeight.Name = "ucrChkMaxOutputsHeight" Me.ucrChkMaxOutputsHeight.Size = New System.Drawing.Size(294, 51) Me.ucrChkMaxOutputsHeight.TabIndex = 28 @@ -478,7 +483,7 @@ Partial Class dlgOptions Me.ucrChkShowRCommandsinOutputWindow.AutoSize = True Me.ucrChkShowRCommandsinOutputWindow.Checked = False Me.ucrChkShowRCommandsinOutputWindow.Location = New System.Drawing.Point(15, 240) - Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowRCommandsinOutputWindow.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowRCommandsinOutputWindow.Name = "ucrChkShowRCommandsinOutputWindow" Me.ucrChkShowRCommandsinOutputWindow.Size = New System.Drawing.Size(406, 51) Me.ucrChkShowRCommandsinOutputWindow.TabIndex = 27 @@ -488,7 +493,7 @@ Partial Class dlgOptions Me.ucrChkIncludeCommentsbyDefault.AutoSize = True Me.ucrChkIncludeCommentsbyDefault.Checked = False Me.ucrChkIncludeCommentsbyDefault.Location = New System.Drawing.Point(15, 202) - Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkIncludeCommentsbyDefault.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkIncludeCommentsbyDefault.Name = "ucrChkIncludeCommentsbyDefault" Me.ucrChkIncludeCommentsbyDefault.Size = New System.Drawing.Size(406, 51) Me.ucrChkIncludeCommentsbyDefault.TabIndex = 26 @@ -499,9 +504,9 @@ Partial Class dlgOptions Me.grpROptions.Controls.Add(Me.ucrNudDigits) Me.grpROptions.Controls.Add(Me.lblNoDigits) Me.grpROptions.Location = New System.Drawing.Point(15, 288) - Me.grpROptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Margin = New System.Windows.Forms.Padding(4) Me.grpROptions.Name = "grpROptions" - Me.grpROptions.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.grpROptions.Padding = New System.Windows.Forms.Padding(4) Me.grpROptions.Size = New System.Drawing.Size(406, 140) Me.grpROptions.TabIndex = 25 Me.grpROptions.TabStop = False @@ -512,7 +517,7 @@ Partial Class dlgOptions Me.ucrChkShowSignifStars.AutoSize = True Me.ucrChkShowSignifStars.Checked = False Me.ucrChkShowSignifStars.Location = New System.Drawing.Point(10, 74) - Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowSignifStars.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowSignifStars.Name = "ucrChkShowSignifStars" Me.ucrChkShowSignifStars.Size = New System.Drawing.Size(382, 51) Me.ucrChkShowSignifStars.TabIndex = 28 @@ -523,7 +528,7 @@ Partial Class dlgOptions Me.ucrNudDigits.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudDigits.Location = New System.Drawing.Point(266, 34) - Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudDigits.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudDigits.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudDigits.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudDigits.Name = "ucrNudDigits" @@ -555,7 +560,7 @@ Partial Class dlgOptions Me.pnFormatOptions.Controls.Add(Me.cmdCommentFormat) Me.pnFormatOptions.Controls.Add(Me.lblCommandFormat) Me.pnFormatOptions.Location = New System.Drawing.Point(15, 15) - Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnFormatOptions.Margin = New System.Windows.Forms.Padding(4) Me.pnFormatOptions.Name = "pnFormatOptions" Me.pnFormatOptions.Size = New System.Drawing.Size(586, 175) Me.pnFormatOptions.TabIndex = 21 @@ -563,7 +568,7 @@ Partial Class dlgOptions 'rtbCommentPreview ' Me.rtbCommentPreview.Location = New System.Drawing.Point(186, 134) - Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbCommentPreview.Margin = New System.Windows.Forms.Padding(4) Me.rtbCommentPreview.Name = "rtbCommentPreview" Me.rtbCommentPreview.ReadOnly = True Me.rtbCommentPreview.Size = New System.Drawing.Size(218, 37) @@ -573,7 +578,7 @@ Partial Class dlgOptions 'rtbOutputPreview ' Me.rtbOutputPreview.Location = New System.Drawing.Point(186, 74) - Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbOutputPreview.Margin = New System.Windows.Forms.Padding(4) Me.rtbOutputPreview.Name = "rtbOutputPreview" Me.rtbOutputPreview.ReadOnly = True Me.rtbOutputPreview.Size = New System.Drawing.Size(218, 37) @@ -583,7 +588,7 @@ Partial Class dlgOptions 'rtbCommandPreview ' Me.rtbCommandPreview.Location = New System.Drawing.Point(186, 14) - Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rtbCommandPreview.Margin = New System.Windows.Forms.Padding(4) Me.rtbCommandPreview.Name = "rtbCommandPreview" Me.rtbCommandPreview.ReadOnly = True Me.rtbCommandPreview.Size = New System.Drawing.Size(218, 37) @@ -593,7 +598,7 @@ Partial Class dlgOptions 'cmdCommandFormat ' Me.cmdCommandFormat.Location = New System.Drawing.Point(432, 14) - Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCommandFormat.Margin = New System.Windows.Forms.Padding(4) Me.cmdCommandFormat.Name = "cmdCommandFormat" Me.cmdCommandFormat.Size = New System.Drawing.Size(150, 34) Me.cmdCommandFormat.TabIndex = 10 @@ -613,7 +618,7 @@ Partial Class dlgOptions 'cmdOutputFormat ' Me.cmdOutputFormat.Location = New System.Drawing.Point(432, 74) - Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdOutputFormat.Margin = New System.Windows.Forms.Padding(4) Me.cmdOutputFormat.Name = "cmdOutputFormat" Me.cmdOutputFormat.Size = New System.Drawing.Size(150, 34) Me.cmdOutputFormat.TabIndex = 16 @@ -633,7 +638,7 @@ Partial Class dlgOptions 'cmdCommentFormat ' Me.cmdCommentFormat.Location = New System.Drawing.Point(432, 134) - Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdCommentFormat.Margin = New System.Windows.Forms.Padding(4) Me.cmdCommentFormat.Name = "cmdCommentFormat" Me.cmdCommentFormat.Size = New System.Drawing.Size(150, 34) Me.cmdCommentFormat.TabIndex = 16 @@ -654,9 +659,9 @@ Partial Class dlgOptions ' Me.tbpEditor.Controls.Add(Me.pnFormatEditor) Me.tbpEditor.Location = New System.Drawing.Point(4, 29) - Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Margin = New System.Windows.Forms.Padding(4) Me.tbpEditor.Name = "tbpEditor" - Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpEditor.Padding = New System.Windows.Forms.Padding(4) Me.tbpEditor.Size = New System.Drawing.Size(850, 443) Me.tbpEditor.TabIndex = 10 Me.tbpEditor.Text = "Editor Window" @@ -670,7 +675,7 @@ Partial Class dlgOptions Me.pnFormatEditor.Controls.Add(Me.cmdEditorFont) Me.pnFormatEditor.Controls.Add(Me.lblFont) Me.pnFormatEditor.Location = New System.Drawing.Point(15, 15) - Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.pnFormatEditor.Margin = New System.Windows.Forms.Padding(4) Me.pnFormatEditor.Name = "pnFormatEditor" Me.pnFormatEditor.Size = New System.Drawing.Size(318, 41) Me.pnFormatEditor.TabIndex = 22 @@ -678,7 +683,7 @@ Partial Class dlgOptions 'cmdEditorFont ' Me.cmdEditorFont.Location = New System.Drawing.Point(164, 3) - Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdEditorFont.Margin = New System.Windows.Forms.Padding(4) Me.cmdEditorFont.Name = "cmdEditorFont" Me.cmdEditorFont.Size = New System.Drawing.Size(150, 34) Me.cmdEditorFont.TabIndex = 10 @@ -702,9 +707,9 @@ Partial Class dlgOptions Me.tbpCommands.Controls.Add(Me.ucrNudWaitSeconds) Me.tbpCommands.Controls.Add(Me.ucrChkIncludeDefaultParams) Me.tbpCommands.Location = New System.Drawing.Point(4, 29) - Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Margin = New System.Windows.Forms.Padding(4) Me.tbpCommands.Name = "tbpCommands" - Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpCommands.Padding = New System.Windows.Forms.Padding(4) Me.tbpCommands.Size = New System.Drawing.Size(850, 443) Me.tbpCommands.TabIndex = 4 Me.tbpCommands.Tag = "Commands" @@ -726,7 +731,7 @@ Partial Class dlgOptions Me.ucrChkShowWaitDialog.AutoSize = True Me.ucrChkShowWaitDialog.Checked = False Me.ucrChkShowWaitDialog.Location = New System.Drawing.Point(9, 70) - Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowWaitDialog.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowWaitDialog.Name = "ucrChkShowWaitDialog" Me.ucrChkShowWaitDialog.Size = New System.Drawing.Size(506, 51) Me.ucrChkShowWaitDialog.TabIndex = 6 @@ -737,7 +742,7 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudWaitSeconds.Location = New System.Drawing.Point(524, 68) - Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudWaitSeconds.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudWaitSeconds.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudWaitSeconds.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudWaitSeconds.Name = "ucrNudWaitSeconds" @@ -750,14 +755,19 @@ Partial Class dlgOptions Me.ucrChkIncludeDefaultParams.AutoSize = True Me.ucrChkIncludeDefaultParams.Checked = False Me.ucrChkIncludeDefaultParams.Location = New System.Drawing.Point(9, 30) - Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkIncludeDefaultParams.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkIncludeDefaultParams.Name = "ucrChkIncludeDefaultParams" Me.ucrChkIncludeDefaultParams.Size = New System.Drawing.Size(597, 51) Me.ucrChkIncludeDefaultParams.TabIndex = 3 ' 'tbpDataView ' - Me.tbpDataView.Controls.Add(Me.ucrChkSwitchUndo) + Me.tbpDataView.Controls.Add(Me.Label4) + Me.tbpDataView.Controls.Add(Me.Label3) + Me.tbpDataView.Controls.Add(Me.ucrNudRowUndoLimit) + Me.tbpDataView.Controls.Add(Me.Label2) + Me.tbpDataView.Controls.Add(Me.Label1) + Me.tbpDataView.Controls.Add(Me.ucrNudColUndoLimit) Me.tbpDataView.Controls.Add(Me.lblEvery) Me.tbpDataView.Controls.Add(Me.lblMinutes) Me.tbpDataView.Controls.Add(Me.ucrChkAutoSave) @@ -768,14 +778,72 @@ Partial Class dlgOptions Me.tbpDataView.Controls.Add(Me.ucrNudMaxRows) Me.tbpDataView.Controls.Add(Me.lblMaxRows) Me.tbpDataView.Location = New System.Drawing.Point(4, 29) - Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Margin = New System.Windows.Forms.Padding(4) Me.tbpDataView.Name = "tbpDataView" - Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpDataView.Padding = New System.Windows.Forms.Padding(4) Me.tbpDataView.Size = New System.Drawing.Size(850, 443) Me.tbpDataView.TabIndex = 9 Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True ' + 'Label3 + ' + Me.Label3.AutoSize = True + Me.Label3.Location = New System.Drawing.Point(781, 230) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label3.Name = "Label3" + Me.Label3.Size = New System.Drawing.Size(46, 20) + Me.Label3.TabIndex = 10 + Me.Label3.Text = "rows." + ' + 'ucrNudRowUndoLimit + ' + Me.ucrNudRowUndoLimit.AutoSize = True + Me.ucrNudRowUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Location = New System.Drawing.Point(692, 227) + Me.ucrNudRowUndoLimit.Margin = New System.Windows.Forms.Padding(8) + Me.ucrNudRowUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowUndoLimit.Name = "ucrNudRowUndoLimit" + Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(77, 30) + Me.ucrNudRowUndoLimit.TabIndex = 9 + Me.ucrNudRowUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(595, 230) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(86, 20) + Me.Label2.TabIndex = 8 + Me.Label2.Text = "columns or" + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(16, 230) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(482, 20) + Me.Label1.TabIndex = 7 + Me.Label1.Text = "Switch off spreadsheet-syle undo when a dataframe has more than" + ' + 'ucrNudColUndoLimit + ' + Me.ucrNudColUndoLimit.AutoSize = True + Me.ucrNudColUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudColUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudColUndoLimit.Location = New System.Drawing.Point(506, 227) + Me.ucrNudColUndoLimit.Margin = New System.Windows.Forms.Padding(8) + Me.ucrNudColUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudColUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudColUndoLimit.Name = "ucrNudColUndoLimit" + Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(81, 30) + Me.ucrNudColUndoLimit.TabIndex = 6 + Me.ucrNudColUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblEvery ' Me.lblEvery.AutoSize = True @@ -801,7 +869,7 @@ Partial Class dlgOptions Me.ucrChkAutoSave.AutoSize = True Me.ucrChkAutoSave.Checked = False Me.ucrChkAutoSave.Location = New System.Drawing.Point(20, 171) - Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkAutoSave.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkAutoSave.Name = "ucrChkAutoSave" Me.ucrChkAutoSave.Size = New System.Drawing.Size(326, 51) Me.ucrChkAutoSave.TabIndex = 3 @@ -811,7 +879,7 @@ Partial Class dlgOptions Me.ucrChkShowDataonGrid.AutoSize = True Me.ucrChkShowDataonGrid.Checked = False Me.ucrChkShowDataonGrid.Location = New System.Drawing.Point(20, 117) - Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkShowDataonGrid.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkShowDataonGrid.Name = "ucrChkShowDataonGrid" Me.ucrChkShowDataonGrid.Size = New System.Drawing.Size(590, 51) Me.ucrChkShowDataonGrid.TabIndex = 3 @@ -822,7 +890,7 @@ Partial Class dlgOptions Me.ucrNudAutoSaveMinutes.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Location = New System.Drawing.Point(402, 168) - Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudAutoSaveMinutes.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudAutoSaveMinutes.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudAutoSaveMinutes.Name = "ucrNudAutoSaveMinutes" @@ -836,7 +904,7 @@ Partial Class dlgOptions Me.ucrNudMaxCols.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudMaxCols.Location = New System.Drawing.Point(402, 62) - Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxCols.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudMaxCols.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxCols.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxCols.Name = "ucrNudMaxCols" @@ -860,7 +928,7 @@ Partial Class dlgOptions Me.ucrNudMaxRows.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Increment = New Decimal(New Integer() {1, 0, 0, 0}) Me.ucrNudMaxRows.Location = New System.Drawing.Point(402, 22) - Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrNudMaxRows.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudMaxRows.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudMaxRows.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudMaxRows.Name = "ucrNudMaxRows" @@ -884,9 +952,9 @@ Partial Class dlgOptions Me.tbpWorkingDirectory.Controls.Add(Me.lblWorkingDirectory) Me.tbpWorkingDirectory.Controls.Add(Me.ucrWorkingDirectory) Me.tbpWorkingDirectory.Location = New System.Drawing.Point(4, 29) - Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Margin = New System.Windows.Forms.Padding(4) Me.tbpWorkingDirectory.Name = "tbpWorkingDirectory" - Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpWorkingDirectory.Padding = New System.Windows.Forms.Padding(4) Me.tbpWorkingDirectory.Size = New System.Drawing.Size(850, 443) Me.tbpWorkingDirectory.TabIndex = 11 Me.tbpWorkingDirectory.Text = "Working Directory" @@ -895,7 +963,7 @@ Partial Class dlgOptions 'cmdWorkingDirectory ' Me.cmdWorkingDirectory.Location = New System.Drawing.Point(598, 24) - Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.cmdWorkingDirectory.Margin = New System.Windows.Forms.Padding(4) Me.cmdWorkingDirectory.Name = "cmdWorkingDirectory" Me.cmdWorkingDirectory.Size = New System.Drawing.Size(36, 32) Me.cmdWorkingDirectory.TabIndex = 2 @@ -931,9 +999,9 @@ Partial Class dlgOptions Me.tbpGraphDisplay.Controls.Add(Me.rdoDisplayinOutputWindow) Me.tbpGraphDisplay.Controls.Add(Me.ucrPnlGraphDisplay) Me.tbpGraphDisplay.Location = New System.Drawing.Point(4, 29) - Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Margin = New System.Windows.Forms.Padding(4) Me.tbpGraphDisplay.Name = "tbpGraphDisplay" - Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpGraphDisplay.Padding = New System.Windows.Forms.Padding(4) Me.tbpGraphDisplay.Size = New System.Drawing.Size(850, 443) Me.tbpGraphDisplay.TabIndex = 12 Me.tbpGraphDisplay.Text = "Graph Display" @@ -944,7 +1012,7 @@ Partial Class dlgOptions Me.rdoDisplayinSeparateWindows.AutoSize = True Me.rdoDisplayinSeparateWindows.Checked = True Me.rdoDisplayinSeparateWindows.Location = New System.Drawing.Point(9, 78) - Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinSeparateWindows.Margin = New System.Windows.Forms.Padding(4) Me.rdoDisplayinSeparateWindows.Name = "rdoDisplayinSeparateWindows" Me.rdoDisplayinSeparateWindows.Size = New System.Drawing.Size(239, 24) Me.rdoDisplayinSeparateWindows.TabIndex = 1 @@ -956,7 +1024,7 @@ Partial Class dlgOptions ' Me.rdoDisplayinRViewer.AutoSize = True Me.rdoDisplayinRViewer.Location = New System.Drawing.Point(9, 44) - Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinRViewer.Margin = New System.Windows.Forms.Padding(4) Me.rdoDisplayinRViewer.Name = "rdoDisplayinRViewer" Me.rdoDisplayinRViewer.Size = New System.Drawing.Size(169, 24) Me.rdoDisplayinRViewer.TabIndex = 1 @@ -967,7 +1035,7 @@ Partial Class dlgOptions ' Me.rdoDisplayinOutputWindow.AutoSize = True Me.rdoDisplayinOutputWindow.Location = New System.Drawing.Point(9, 9) - Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.rdoDisplayinOutputWindow.Margin = New System.Windows.Forms.Padding(4) Me.rdoDisplayinOutputWindow.Name = "rdoDisplayinOutputWindow" Me.rdoDisplayinOutputWindow.Size = New System.Drawing.Size(214, 24) Me.rdoDisplayinOutputWindow.TabIndex = 1 @@ -978,7 +1046,7 @@ Partial Class dlgOptions ' Me.ucrPnlGraphDisplay.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrPnlGraphDisplay.Location = New System.Drawing.Point(0, 4) - Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrPnlGraphDisplay.Margin = New System.Windows.Forms.Padding(8) Me.ucrPnlGraphDisplay.Name = "ucrPnlGraphDisplay" Me.ucrPnlGraphDisplay.Size = New System.Drawing.Size(548, 99) Me.ucrPnlGraphDisplay.TabIndex = 3 @@ -990,9 +1058,9 @@ Partial Class dlgOptions Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewProcurementMenu) Me.tbpTailoredMenus.Controls.Add(Me.ucrChkViewClimaticMenu) Me.tbpTailoredMenus.Location = New System.Drawing.Point(4, 29) - Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Margin = New System.Windows.Forms.Padding(4) Me.tbpTailoredMenus.Name = "tbpTailoredMenus" - Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpTailoredMenus.Padding = New System.Windows.Forms.Padding(4) Me.tbpTailoredMenus.Size = New System.Drawing.Size(850, 443) Me.tbpTailoredMenus.TabIndex = 13 Me.tbpTailoredMenus.Text = "Tailored Menus" @@ -1003,7 +1071,7 @@ Partial Class dlgOptions Me.ucrChkViewStructuredMenu.AutoSize = True Me.ucrChkViewStructuredMenu.Checked = False Me.ucrChkViewStructuredMenu.Location = New System.Drawing.Point(10, 18) - Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewStructuredMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewStructuredMenu.Name = "ucrChkViewStructuredMenu" Me.ucrChkViewStructuredMenu.Size = New System.Drawing.Size(567, 51) Me.ucrChkViewStructuredMenu.TabIndex = 2 @@ -1013,7 +1081,7 @@ Partial Class dlgOptions Me.ucrChkViewOptionsByContextMenu.AutoSize = True Me.ucrChkViewOptionsByContextMenu.Checked = False Me.ucrChkViewOptionsByContextMenu.Location = New System.Drawing.Point(10, 206) - Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewOptionsByContextMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewOptionsByContextMenu.Name = "ucrChkViewOptionsByContextMenu" Me.ucrChkViewOptionsByContextMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewOptionsByContextMenu.TabIndex = 1 @@ -1023,7 +1091,7 @@ Partial Class dlgOptions Me.ucrChkViewProcurementMenu.AutoSize = True Me.ucrChkViewProcurementMenu.Checked = False Me.ucrChkViewProcurementMenu.Location = New System.Drawing.Point(10, 142) - Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewProcurementMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewProcurementMenu.Name = "ucrChkViewProcurementMenu" Me.ucrChkViewProcurementMenu.Size = New System.Drawing.Size(620, 51) Me.ucrChkViewProcurementMenu.TabIndex = 0 @@ -1033,7 +1101,7 @@ Partial Class dlgOptions Me.ucrChkViewClimaticMenu.AutoSize = True Me.ucrChkViewClimaticMenu.Checked = False Me.ucrChkViewClimaticMenu.Location = New System.Drawing.Point(10, 80) - Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkViewClimaticMenu.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkViewClimaticMenu.Name = "ucrChkViewClimaticMenu" Me.ucrChkViewClimaticMenu.Size = New System.Drawing.Size(610, 51) Me.ucrChkViewClimaticMenu.TabIndex = 0 @@ -1049,9 +1117,9 @@ Partial Class dlgOptions Me.tbpClimsoft.Controls.Add(Me.ucrInputHost) Me.tbpClimsoft.Controls.Add(Me.ucrInputDatabaseName) Me.tbpClimsoft.Location = New System.Drawing.Point(4, 29) - Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Margin = New System.Windows.Forms.Padding(4) Me.tbpClimsoft.Name = "tbpClimsoft" - Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.tbpClimsoft.Padding = New System.Windows.Forms.Padding(4) Me.tbpClimsoft.Size = New System.Drawing.Size(850, 443) Me.tbpClimsoft.TabIndex = 14 Me.tbpClimsoft.Text = "Climsoft" @@ -1154,7 +1222,7 @@ Partial Class dlgOptions Me.tbpWebsite.Controls.Add(Me.ucrChkReminder) Me.tbpWebsite.Location = New System.Drawing.Point(4, 29) Me.tbpWebsite.Name = "tbpWebsite" - Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3, 3, 3, 3) + Me.tbpWebsite.Padding = New System.Windows.Forms.Padding(3) Me.tbpWebsite.Size = New System.Drawing.Size(850, 443) Me.tbpWebsite.TabIndex = 15 Me.tbpWebsite.Text = "Website" @@ -1165,20 +1233,20 @@ Partial Class dlgOptions Me.ucrChkReminder.AutoSize = True Me.ucrChkReminder.Checked = False Me.ucrChkReminder.Location = New System.Drawing.Point(10, 33) - Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8, 8, 8, 8) + Me.ucrChkReminder.Margin = New System.Windows.Forms.Padding(8) Me.ucrChkReminder.Name = "ucrChkReminder" Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' - 'ucrChkSwitchUndo + 'Label4 ' - Me.ucrChkSwitchUndo.AutoSize = True - Me.ucrChkSwitchUndo.Checked = False - Me.ucrChkSwitchUndo.Location = New System.Drawing.Point(20, 227) - Me.ucrChkSwitchUndo.Margin = New System.Windows.Forms.Padding(8) - Me.ucrChkSwitchUndo.Name = "ucrChkSwitchUndo" - Me.ucrChkSwitchUndo.Size = New System.Drawing.Size(326, 51) - Me.ucrChkSwitchUndo.TabIndex = 5 + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(25, 262) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(541, 20) + Me.Label4.TabIndex = 11 + Me.Label4.Text = "(Any changes from the default only apply to the current session of R-Instat.)" ' 'dlgOptions ' @@ -1193,7 +1261,7 @@ Partial Class dlgOptions Me.Controls.Add(Me.cmdOk) Me.Controls.Add(Me.spltControls) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.Margin = New System.Windows.Forms.Padding(4, 4, 4, 4) + Me.Margin = New System.Windows.Forms.Padding(4) Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgOptions" @@ -1323,5 +1391,10 @@ Partial Class dlgOptions Friend WithEvents lversion As Label Friend WithEvents tbpWebsite As TabPage Friend WithEvents ucrChkReminder As ucrCheck - Friend WithEvents ucrChkSwitchUndo As ucrCheck + Friend WithEvents ucrNudColUndoLimit As ucrNud + Friend WithEvents Label2 As Label + Friend WithEvents Label1 As Label + Friend WithEvents Label3 As Label + Friend WithEvents ucrNudRowUndoLimit As ucrNud + Friend WithEvents Label4 As Label End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 658ed78081e..f355500249f 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -61,6 +61,13 @@ Public Class dlgOptions ucrNudWaitSeconds.Maximum = Integer.MaxValue ucrNudWaitSeconds.Increment = 0.5 + ucrNudColUndoLimit.Maximum = 1000 + ucrNudColUndoLimit.Minimum = 200 + ucrNudColUndoLimit.Increment = 100 + ucrNudRowUndoLimit.Maximum = Integer.MaxValue + ucrNudRowUndoLimit.Minimum = 200000 + ucrNudRowUndoLimit.Increment = 100000 + strPreviewText = "R-Instat 2017" rtbCommandPreview.Text = strPreviewText rtbCommentPreview.Text = strPreviewText @@ -78,7 +85,6 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") - ucrChkSwitchUndo.SetText("Switch off undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -103,13 +109,14 @@ Public Class dlgOptions Private Sub LoadInstatOptions() ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData - ucrChkSwitchUndo.Checked = frmMain.clsInstatOptions.bUndoSwitchAction SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput) SetCommandFont(frmMain.clsInstatOptions.fntScript, frmMain.clsInstatOptions.clrScript) SetCommentFont(frmMain.clsInstatOptions.fntComment, frmMain.clsInstatOptions.clrComment) SetEditorFont(frmMain.clsInstatOptions.fntEditor, frmMain.clsInstatOptions.clrEditor) ucrNudMaxRows.Value = frmMain.clsInstatOptions.iMaxRows ucrNudMaxCols.Value = frmMain.clsInstatOptions.iMaxCols + ucrNudColUndoLimit.Value = frmMain.clsInstatOptions.iUndoColLimit + ucrNudRowUndoLimit.Value = frmMain.clsInstatOptions.iUndoRowLimit ucrNudAutoSaveMinutes.Value = frmMain.clsInstatOptions.iAutoSaveDataMinutes ucrNudPreviewRows.Value = frmMain.clsInstatOptions.iPreviewRows ucrInputComment.SetName(frmMain.clsInstatOptions.strComment) @@ -173,8 +180,9 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetPreviewRows(ucrNudPreviewRows.Value) frmMain.clsInstatOptions.SetMaxRows(ucrNudMaxRows.Value) frmMain.clsInstatOptions.SetMaxCols(ucrNudMaxCols.Value) + frmMain.clsInstatOptions.SetUndoColLimit(ucrNudColUndoLimit.Value) + frmMain.clsInstatOptions.SetUndoRowLimit(ucrNudRowUndoLimit.Value) frmMain.clsInstatOptions.SetAutoSaveData(ucrChkAutoSave.Checked) - frmMain.clsInstatOptions.SetUndoSwitchAction(ucrChkSwitchUndo.Checked) frmMain.clsInstatOptions.SetAutoSaveDataMinutes(ucrNudAutoSaveMinutes.Value) frmMain.clsInstatOptions.SetLanguageCultureCode(strCurrLanguageCulture) frmMain.clsInstatOptions.SetWorkingDirectory(strWorkingDirectory) @@ -363,7 +371,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrChkSwitchUndo.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged ApplyEnabled(True) End Sub @@ -431,7 +439,7 @@ Public Class dlgOptions ApplyEnabled(True) End Sub - Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged End Sub diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index afe0b327e86..af04f1a6834 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -58,13 +58,13 @@ Partial Class frmMain Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificTablesGraphs = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() - Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificBarPieChart = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificBoxplotJitterViolinPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificHistogramDensityFrequencyPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificPointPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificLineSmoothPlot = New System.Windows.Forms.ToolStripMenuItem() + Me.ToolStripSeparator38 = New System.Windows.Forms.ToolStripSeparator() + Me.mnuDescribeGeneral = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator26 = New System.Windows.Forms.ToolStripSeparator() Me.mnuDescribeSpecificMapPlot = New System.Windows.Forms.ToolStripMenuItem() Me.mnuDescribeSpecificDotPlot = New System.Windows.Forms.ToolStripMenuItem() @@ -384,6 +384,7 @@ Partial Class frmMain Me.tlSeparatorFile3 = New System.Windows.Forms.ToolStripSeparator() Me.mnuFIleExit = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEdit = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuUndo = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditFind = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditCopy = New System.Windows.Forms.ToolStripMenuItem() Me.mnuEditPaste = New System.Windows.Forms.ToolStripMenuItem() @@ -728,7 +729,7 @@ Partial Class frmMain ' Me.mnuDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariable, Me.mnuDescribeTwoThreeVariables, Me.mnuDescribeSpecificTablesGraphs, Me.mnuDescribeSpecificTables, Me.ToolStripSeparator9, Me.mnuDescribeMultivariate, Me.ToolStripSeparator13, Me.mnuDescribeUseTable, Me.mnuDescribeUseGraph, Me.mnuDescribeCombineGraph, Me.mnuDescribeThemes, Me.mnuDescribeViewGraph}) Me.mnuDescribe.Name = "mnuDescribe" - Me.mnuDescribe.Size = New System.Drawing.Size(64, 22) + Me.mnuDescribe.Size = New System.Drawing.Size(96, 29) Me.mnuDescribe.Tag = "Describe" Me.mnuDescribe.Text = "Describe" ' @@ -736,25 +737,25 @@ Partial Class frmMain ' Me.mnuDescribeOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeOneVariableVisualiseData, Me.ToolStripSeparator72, Me.mnuDescribeOneVariableSummarise, Me.mnuDescribeOneVariableGraph, Me.ToolStripSeparator33, Me.mnuDescribeOneVariableFrequencies, Me.mnuDescribeOneVariableRatingData}) Me.mnuDescribeOneVariable.Name = "mnuDescribeOneVariable" - Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeOneVariable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeOneVariable.Tag = "One_Variable" Me.mnuDescribeOneVariable.Text = "One Variable" ' 'mnuDescribeOneVariableVisualiseData ' Me.mnuDescribeOneVariableVisualiseData.Name = "mnuDescribeOneVariableVisualiseData" - Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableVisualiseData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableVisualiseData.Text = "Visualise Data..." ' 'ToolStripSeparator72 ' Me.ToolStripSeparator72.Name = "ToolStripSeparator72" - Me.ToolStripSeparator72.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator72.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableSummarise ' Me.mnuDescribeOneVariableSummarise.Name = "mnuDescribeOneVariableSummarise" - Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableSummarise.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableSummarise.Tag = "Summarise..." Me.mnuDescribeOneVariableSummarise.Text = "Summarise..." Me.mnuDescribeOneVariableSummarise.ToolTipText = "One Variable Summarise, Skim and Customised" @@ -762,26 +763,26 @@ Partial Class frmMain 'mnuDescribeOneVariableGraph ' Me.mnuDescribeOneVariableGraph.Name = "mnuDescribeOneVariableGraph" - Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableGraph.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableGraph.Tag = "Graph..." Me.mnuDescribeOneVariableGraph.Text = "Graph..." ' 'ToolStripSeparator33 ' Me.ToolStripSeparator33.Name = "ToolStripSeparator33" - Me.ToolStripSeparator33.Size = New System.Drawing.Size(152, 6) + Me.ToolStripSeparator33.Size = New System.Drawing.Size(232, 6) ' 'mnuDescribeOneVariableFrequencies ' Me.mnuDescribeOneVariableFrequencies.Name = "mnuDescribeOneVariableFrequencies" - Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableFrequencies.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableFrequencies.Text = "Frequencies..." Me.mnuDescribeOneVariableFrequencies.ToolTipText = "Table or Graph. Also Stem and Leaf Plots" ' 'mnuDescribeOneVariableRatingData ' Me.mnuDescribeOneVariableRatingData.Name = "mnuDescribeOneVariableRatingData" - Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(155, 22) + Me.mnuDescribeOneVariableRatingData.Size = New System.Drawing.Size(235, 34) Me.mnuDescribeOneVariableRatingData.Text = "Rating Data..." Me.mnuDescribeOneVariableRatingData.ToolTipText = "Table, Stacked Graph or Likert Graph" ' @@ -789,26 +790,26 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeTwoThreeVariablesPivotTable, Me.ToolStripSeparator36, Me.mnuDescribeTwoVariablesSummarise, Me.mnuDescribeTwoVariablesGraph, Me.ToolStripSeparator34, Me.mnuDescribeTwoThreeVariablesCorrelations, Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies, Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies}) Me.mnuDescribeTwoThreeVariables.Name = "mnuDescribeTwoThreeVariables" - Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeTwoThreeVariables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeTwoThreeVariables.Tag = "Two_Variables" Me.mnuDescribeTwoThreeVariables.Text = "Two/Three Variables" ' 'mnuDescribeTwoThreeVariablesPivotTable ' Me.mnuDescribeTwoThreeVariablesPivotTable.Name = "mnuDescribeTwoThreeVariablesPivotTable" - Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesPivotTable.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator36 ' Me.ToolStripSeparator36.Name = "ToolStripSeparator36" - Me.ToolStripSeparator36.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator36.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoVariablesSummarise ' Me.mnuDescribeTwoVariablesSummarise.DoubleClickEnabled = True Me.mnuDescribeTwoVariablesSummarise.Name = "mnuDescribeTwoVariablesSummarise" - Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesSummarise.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesSummarise.Tag = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.Text = "Summarise..." Me.mnuDescribeTwoVariablesSummarise.ToolTipText = "Skim or Two Variables" @@ -816,19 +817,19 @@ Partial Class frmMain 'mnuDescribeTwoVariablesGraph ' Me.mnuDescribeTwoVariablesGraph.Name = "mnuDescribeTwoVariablesGraph" - Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoVariablesGraph.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoVariablesGraph.Tag = "Graph..." Me.mnuDescribeTwoVariablesGraph.Text = "Graph..." ' 'ToolStripSeparator34 ' Me.ToolStripSeparator34.Name = "ToolStripSeparator34" - Me.ToolStripSeparator34.Size = New System.Drawing.Size(203, 6) + Me.ToolStripSeparator34.Size = New System.Drawing.Size(305, 6) ' 'mnuDescribeTwoThreeVariablesCorrelations ' Me.mnuDescribeTwoThreeVariablesCorrelations.Name = "mnuDescribeTwoThreeVariablesCorrelations" - Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesCorrelations.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesCorrelations.Text = "Correlations..." Me.mnuDescribeTwoThreeVariablesCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' @@ -836,14 +837,14 @@ Partial Class frmMain ' Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.DoubleClickEnabled = True Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Name = "mnuDescribeTwoThreeVariablesTwoWayFrequencies" - Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.Text = "Two-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesTwoWayFrequencies.ToolTipText = "Table or Graph" ' 'mnuDescribeTwoThreeVariablesThreeWayFrequencies ' Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Name = "mnuDescribeTwoThreeVariablesThreeWayFrequencies" - Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(206, 22) + Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Size = New System.Drawing.Size(308, 34) Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.Text = "Three-Way Frequencies..." Me.mnuDescribeTwoThreeVariablesThreeWayFrequencies.ToolTipText = "Table or Graph" ' @@ -851,25 +852,14 @@ Partial Class frmMain ' Me.mnuDescribeSpecificTablesGraphs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSpecificBarPieChart, Me.mnuDescribeSpecificBoxplotJitterViolinPlot, Me.mnuDescribeSpecificHistogramDensityFrequencyPlot, Me.mnuDescribeSpecificPointPlot, Me.mnuDescribeSpecificLineSmoothPlot, Me.ToolStripSeparator38, Me.mnuDescribeGeneral, Me.ToolStripSeparator26, Me.mnuDescribeSpecificMapPlot, Me.mnuDescribeSpecificDotPlot, Me.mnuDescribeSpecificMosaic, Me.mnuDescribeSpecificCummulativeDistribution, Me.mnuDescribeSpecificParallelCoordinatePlot}) Me.mnuDescribeSpecificTablesGraphs.Name = "mnuDescribeSpecificTablesGraphs" - Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTablesGraphs.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTablesGraphs.Tag = "Graph_Dialogs" Me.mnuDescribeSpecificTablesGraphs.Text = "Graphs" ' - 'mnuDescribeGeneral - ' - Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" - Me.mnuDescribeGeneral.Size = New System.Drawing.Size(209, 22) - Me.mnuDescribeGeneral.Text = "General..." - ' - 'ToolStripSeparator38 - ' - Me.ToolStripSeparator38.Name = "ToolStripSeparator38" - Me.ToolStripSeparator38.Size = New System.Drawing.Size(206, 6) - ' 'mnuDescribeSpecificBarPieChart ' Me.mnuDescribeSpecificBarPieChart.Name = "mnuDescribeSpecificBarPieChart" - Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBarPieChart.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBarPieChart.Tag = "Bar_Chart" Me.mnuDescribeSpecificBarPieChart.Text = "Bar Chart..." Me.mnuDescribeSpecificBarPieChart.ToolTipText = "Bar, Column, Lollipop, Pie, and Donut Charts, plus Treemaps and Wordclouds" @@ -877,7 +867,7 @@ Partial Class frmMain 'mnuDescribeSpecificBoxplotJitterViolinPlot ' Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Name = "mnuDescribeSpecificBoxplotJitterViolinPlot" - Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Tag = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.Text = "Boxplot..." Me.mnuDescribeSpecificBoxplotJitterViolinPlot.ToolTipText = "Boxplot (including Tufte), Jitter and Violin Plots" @@ -885,7 +875,7 @@ Partial Class frmMain 'mnuDescribeSpecificHistogramDensityFrequencyPlot ' Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Name = "mnuDescribeSpecificHistogramDensityFrequencyPlot" - Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Tag = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.Text = "Histogram..." Me.mnuDescribeSpecificHistogramDensityFrequencyPlot.ToolTipText = "Histograms, Dotplots, Density and Ridge Plots and Frequency Polygons" @@ -893,7 +883,7 @@ Partial Class frmMain 'mnuDescribeSpecificPointPlot ' Me.mnuDescribeSpecificPointPlot.Name = "mnuDescribeSpecificPointPlot" - Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificPointPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificPointPlot.Tag = "Point_Plot..." Me.mnuDescribeSpecificPointPlot.Text = "Scatter Plot..." Me.mnuDescribeSpecificPointPlot.ToolTipText = "Point Plot" @@ -901,20 +891,31 @@ Partial Class frmMain 'mnuDescribeSpecificLineSmoothPlot ' Me.mnuDescribeSpecificLineSmoothPlot.Name = "mnuDescribeSpecificLineSmoothPlot" - Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificLineSmoothPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificLineSmoothPlot.Tag = "Line_Plot..." Me.mnuDescribeSpecificLineSmoothPlot.Text = "Line Plot..." Me.mnuDescribeSpecificLineSmoothPlot.ToolTipText = "Line Plots, Smoothed Plots, Dumbbell and Slope Plots" ' + 'ToolStripSeparator38 + ' + Me.ToolStripSeparator38.Name = "ToolStripSeparator38" + Me.ToolStripSeparator38.Size = New System.Drawing.Size(309, 6) + ' + 'mnuDescribeGeneral + ' + Me.mnuDescribeGeneral.Name = "mnuDescribeGeneral" + Me.mnuDescribeGeneral.Size = New System.Drawing.Size(312, 34) + Me.mnuDescribeGeneral.Text = "General..." + ' 'ToolStripSeparator26 ' Me.ToolStripSeparator26.Name = "ToolStripSeparator26" - Me.ToolStripSeparator26.Size = New System.Drawing.Size(206, 6) + Me.ToolStripSeparator26.Size = New System.Drawing.Size(309, 6) ' 'mnuDescribeSpecificMapPlot ' Me.mnuDescribeSpecificMapPlot.Name = "mnuDescribeSpecificMapPlot" - Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMapPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMapPlot.Text = "Heatmap..." Me.mnuDescribeSpecificMapPlot.ToolTipText = "Heat Map and Chorolopleth Map" ' @@ -922,7 +923,7 @@ Partial Class frmMain ' Me.mnuDescribeSpecificDotPlot.Enabled = False Me.mnuDescribeSpecificDotPlot.Name = "mnuDescribeSpecificDotPlot" - Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificDotPlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificDotPlot.Tag = "Dotplot..." Me.mnuDescribeSpecificDotPlot.Text = "Dot Plot..." Me.mnuDescribeSpecificDotPlot.Visible = False @@ -930,28 +931,28 @@ Partial Class frmMain 'mnuDescribeSpecificMosaic ' Me.mnuDescribeSpecificMosaic.Name = "mnuDescribeSpecificMosaic" - Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificMosaic.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificMosaic.Text = "Mosaic Plot..." Me.mnuDescribeSpecificMosaic.ToolTipText = "Mosaic Plot" ' 'mnuDescribeSpecificCummulativeDistribution ' Me.mnuDescribeSpecificCummulativeDistribution.Name = "mnuDescribeSpecificCummulativeDistribution" - Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificCummulativeDistribution.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificCummulativeDistribution.Text = "Cumulative Distribution..." Me.mnuDescribeSpecificCummulativeDistribution.ToolTipText = "Cumulative Graph and Exceedance Graph" ' 'mnuDescribeSpecificParallelCoordinatePlot ' Me.mnuDescribeSpecificParallelCoordinatePlot.Name = "mnuDescribeSpecificParallelCoordinatePlot" - Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(209, 22) + Me.mnuDescribeSpecificParallelCoordinatePlot.Size = New System.Drawing.Size(312, 34) Me.mnuDescribeSpecificParallelCoordinatePlot.Text = "Parallel Coordinate Plot..." ' 'mnuDescribeSpecificTables ' Me.mnuDescribeSpecificTables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeSummaries, Me.mnuDescribePresentation}) Me.mnuDescribeSpecificTables.Name = "mnuDescribeSpecificTables" - Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeSpecificTables.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeSpecificTables.Tag = "Table_Dialogs" Me.mnuDescribeSpecificTables.Text = "Tables..." Me.mnuDescribeSpecificTables.ToolTipText = "Frequency tables and Summary tables" @@ -959,95 +960,95 @@ Partial Class frmMain 'mnuDescribeSummaries ' Me.mnuDescribeSummaries.Name = "mnuDescribeSummaries" - Me.mnuDescribeSummaries.Size = New System.Drawing.Size(149, 22) + Me.mnuDescribeSummaries.Size = New System.Drawing.Size(224, 34) Me.mnuDescribeSummaries.Text = "Summaries..." ' 'mnuDescribePresentation ' Me.mnuDescribePresentation.Name = "mnuDescribePresentation" - Me.mnuDescribePresentation.Size = New System.Drawing.Size(149, 22) + Me.mnuDescribePresentation.Size = New System.Drawing.Size(224, 34) Me.mnuDescribePresentation.Text = "Presentation..." ' 'ToolStripSeparator9 ' Me.ToolStripSeparator9.Name = "ToolStripSeparator9" - Me.ToolStripSeparator9.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator9.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeMultivariate ' Me.mnuDescribeMultivariate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuDescribeMultivariateCorrelations, Me.mnuDescribeMultivariateprincipalComponents, Me.mnuDescribeMultivariateCanonicalCorrelations, Me.mnuDescribeMultivariateClusterAnalysis}) Me.mnuDescribeMultivariate.Name = "mnuDescribeMultivariate" - Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeMultivariate.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeMultivariate.Text = "Multivariate" ' 'mnuDescribeMultivariateCorrelations ' Me.mnuDescribeMultivariateCorrelations.Name = "mnuDescribeMultivariateCorrelations" - Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCorrelations.Text = "Correlations..." Me.mnuDescribeMultivariateCorrelations.ToolTipText = "Multiple Variables or Two Variables" ' 'mnuDescribeMultivariateprincipalComponents ' Me.mnuDescribeMultivariateprincipalComponents.Name = "mnuDescribeMultivariateprincipalComponents" - Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateprincipalComponents.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateprincipalComponents.Text = "Principal Components..." ' 'mnuDescribeMultivariateCanonicalCorrelations ' Me.mnuDescribeMultivariateCanonicalCorrelations.Name = "mnuDescribeMultivariateCanonicalCorrelations" - Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateCanonicalCorrelations.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuDescribeMultivariateClusterAnalysis ' Me.mnuDescribeMultivariateClusterAnalysis.Name = "mnuDescribeMultivariateClusterAnalysis" - Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(203, 22) + Me.mnuDescribeMultivariateClusterAnalysis.Size = New System.Drawing.Size(302, 34) Me.mnuDescribeMultivariateClusterAnalysis.Text = "Cluster Analysis..." Me.mnuDescribeMultivariateClusterAnalysis.ToolTipText = "Partitioning or Hierarchical" ' 'ToolStripSeparator13 ' Me.ToolStripSeparator13.Name = "ToolStripSeparator13" - Me.ToolStripSeparator13.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator13.Size = New System.Drawing.Size(268, 6) ' 'mnuDescribeUseTable ' Me.mnuDescribeUseTable.Name = "mnuDescribeUseTable" - Me.mnuDescribeUseTable.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseTable.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseTable.Text = "Use Table..." ' 'mnuDescribeUseGraph ' Me.mnuDescribeUseGraph.Name = "mnuDescribeUseGraph" - Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeUseGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeUseGraph.Text = "Use Graph..." ' 'mnuDescribeCombineGraph ' Me.mnuDescribeCombineGraph.Name = "mnuDescribeCombineGraph" - Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeCombineGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeCombineGraph.Text = "Combine Graphs..." ' 'mnuDescribeThemes ' Me.mnuDescribeThemes.Enabled = False Me.mnuDescribeThemes.Name = "mnuDescribeThemes" - Me.mnuDescribeThemes.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeThemes.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeThemes.Text = "Themes..." Me.mnuDescribeThemes.Visible = False ' 'mnuDescribeViewGraph ' Me.mnuDescribeViewGraph.Name = "mnuDescribeViewGraph" - Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(180, 22) + Me.mnuDescribeViewGraph.Size = New System.Drawing.Size(271, 34) Me.mnuDescribeViewGraph.Text = "View Graph..." ' 'mnuModel ' Me.mnuModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributions, Me.ToolStripSeparator3, Me.mnuModelFitModel, Me.mnuModelCompareModels, Me.mnuModelUseModel, Me.mnuModelOtherOneVariable, Me.mnuModelOtherTwoVariables, Me.mnuModelOtherThreeVariables, Me.mnuModelOtherGeneral}) Me.mnuModel.Name = "mnuModel" - Me.mnuModel.Size = New System.Drawing.Size(53, 22) + Me.mnuModel.Size = New System.Drawing.Size(79, 29) Me.mnuModel.Tag = "Model" Me.mnuModel.Text = "Model" ' @@ -1055,168 +1056,168 @@ Partial Class frmMain ' Me.mnuModelProbabilityDistributions.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelProbabilityDistributionsShowModel, Me.mnuModelProbabilityDistributionsCompareModels, Me.mnuModelProbabilityDistributionsRandomSamplesUseModel}) Me.mnuModelProbabilityDistributions.Name = "mnuModelProbabilityDistributions" - Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(201, 22) + Me.mnuModelProbabilityDistributions.Size = New System.Drawing.Size(305, 34) Me.mnuModelProbabilityDistributions.Tag = "Probability_Distributions" Me.mnuModelProbabilityDistributions.Text = "Probability Distributions" ' 'mnuModelProbabilityDistributionsShowModel ' Me.mnuModelProbabilityDistributionsShowModel.Name = "mnuModelProbabilityDistributionsShowModel" - Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsShowModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsShowModel.Text = "Show Model..." ' 'mnuModelProbabilityDistributionsCompareModels ' Me.mnuModelProbabilityDistributionsCompareModels.Enabled = False Me.mnuModelProbabilityDistributionsCompareModels.Name = "mnuModelProbabilityDistributionsCompareModels" - Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsCompareModels.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsCompareModels.Tag = "Show_Models..." Me.mnuModelProbabilityDistributionsCompareModels.Text = "Compare Models..." ' 'mnuModelProbabilityDistributionsRandomSamplesUseModel ' Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Name = "mnuModelProbabilityDistributionsRandomSamplesUseModel" - Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(178, 22) + Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Size = New System.Drawing.Size(271, 34) Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Tag = "RandomSamples_(Use_Model)..." Me.mnuModelProbabilityDistributionsRandomSamplesUseModel.Text = "Random Samples ..." ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(302, 6) ' 'mnuModelFitModel ' Me.mnuModelFitModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelFitModelOneVariable, Me.mnuModelFitModelTwoVariables, Me.mnuModelFitModelThreeVariables, Me.mnuModelFitModelFourVariables, Me.ToolStripSeparator24, Me.mnuModelFitModelGeneral, Me.mnuModelFitModelMachineLearning, Me.ToolStripSeparator57, Me.mnuModelFitModelHypothesisTestsKeyboard, Me.mnuModelFitModelModelKeyboard}) Me.mnuModelFitModel.Name = "mnuModelFitModel" - Me.mnuModelFitModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelFitModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelFitModel.Tag = "Fit_Model..." Me.mnuModelFitModel.Text = "Fit Model" ' 'mnuModelFitModelOneVariable ' Me.mnuModelFitModelOneVariable.Name = "mnuModelFitModelOneVariable" - Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelOneVariable.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelOneVariable.Text = "One Variable..." ' 'mnuModelFitModelTwoVariables ' Me.mnuModelFitModelTwoVariables.Name = "mnuModelFitModelTwoVariables" - Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelTwoVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelTwoVariables.Text = "Two Variables..." ' 'mnuModelFitModelThreeVariables ' Me.mnuModelFitModelThreeVariables.Name = "mnuModelFitModelThreeVariables" - Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelThreeVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelThreeVariables.Text = "Three Variables..." ' 'mnuModelFitModelFourVariables ' Me.mnuModelFitModelFourVariables.Name = "mnuModelFitModelFourVariables" - Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelFourVariables.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelFourVariables.Text = "Four Variables..." ' 'ToolStripSeparator24 ' Me.ToolStripSeparator24.Name = "ToolStripSeparator24" - Me.ToolStripSeparator24.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator24.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelGeneral ' Me.mnuModelFitModelGeneral.Name = "mnuModelFitModelGeneral" - Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelGeneral.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelGeneral.Text = "General..." ' 'mnuModelFitModelMachineLearning ' Me.mnuModelFitModelMachineLearning.Enabled = False Me.mnuModelFitModelMachineLearning.Name = "mnuModelFitModelMachineLearning" - Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelMachineLearning.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelMachineLearning.Text = "Machine Learning (Caret)..." Me.mnuModelFitModelMachineLearning.Visible = False ' 'ToolStripSeparator57 ' Me.ToolStripSeparator57.Name = "ToolStripSeparator57" - Me.ToolStripSeparator57.Size = New System.Drawing.Size(225, 6) + Me.ToolStripSeparator57.Size = New System.Drawing.Size(344, 6) ' 'mnuModelFitModelHypothesisTestsKeyboard ' Me.mnuModelFitModelHypothesisTestsKeyboard.Name = "mnuModelFitModelHypothesisTestsKeyboard" - Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelHypothesisTestsKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelHypothesisTestsKeyboard.Text = "Hypothesis Tests Keyboards..." ' 'mnuModelFitModelModelKeyboard ' Me.mnuModelFitModelModelKeyboard.Name = "mnuModelFitModelModelKeyboard" - Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(228, 22) + Me.mnuModelFitModelModelKeyboard.Size = New System.Drawing.Size(347, 34) Me.mnuModelFitModelModelKeyboard.Text = "Fit Model Keyboards..." ' 'mnuModelCompareModels ' Me.mnuModelCompareModels.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelCompareModelsOneVariable}) Me.mnuModelCompareModels.Name = "mnuModelCompareModels" - Me.mnuModelCompareModels.Size = New System.Drawing.Size(201, 22) + Me.mnuModelCompareModels.Size = New System.Drawing.Size(305, 34) Me.mnuModelCompareModels.Text = "Compare Models" ' 'mnuModelCompareModelsOneVariable ' Me.mnuModelCompareModelsOneVariable.Name = "mnuModelCompareModelsOneVariable" - Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuModelCompareModelsOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuModelCompareModelsOneVariable.Text = "One Variable..." ' 'mnuModelUseModel ' Me.mnuModelUseModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelUseModelOneVariable, Me.mnuModelUseModelTwoVariables, Me.ToolStripSeparator59, Me.mnuModelUseModelGlance, Me.mnuModelUseModelTidy, Me.mnuModelUseModelAugment, Me.ToolStripSeparator58, Me.mnuModelUseModelUseModelKeyboard}) Me.mnuModelUseModel.Name = "mnuModelUseModel" - Me.mnuModelUseModel.Size = New System.Drawing.Size(201, 22) + Me.mnuModelUseModel.Size = New System.Drawing.Size(305, 34) Me.mnuModelUseModel.Text = "Use Model" ' 'mnuModelUseModelOneVariable ' Me.mnuModelUseModelOneVariable.Name = "mnuModelUseModelOneVariable" - Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelOneVariable.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelOneVariable.Text = "One Variable..." ' 'mnuModelUseModelTwoVariables ' Me.mnuModelUseModelTwoVariables.Name = "mnuModelUseModelTwoVariables" - Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTwoVariables.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTwoVariables.Text = "Two Variables..." ' 'ToolStripSeparator59 ' Me.ToolStripSeparator59.Name = "ToolStripSeparator59" - Me.ToolStripSeparator59.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator59.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelGlance ' Me.mnuModelUseModelGlance.Name = "mnuModelUseModelGlance" - Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelGlance.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelGlance.Text = "Glance..." ' 'mnuModelUseModelTidy ' Me.mnuModelUseModelTidy.Name = "mnuModelUseModelTidy" - Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelTidy.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelTidy.Text = "Tidy..." ' 'mnuModelUseModelAugment ' Me.mnuModelUseModelAugment.Name = "mnuModelUseModelAugment" - Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelAugment.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelAugment.Text = "Augment..." ' 'ToolStripSeparator58 ' Me.ToolStripSeparator58.Name = "ToolStripSeparator58" - Me.ToolStripSeparator58.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator58.Size = New System.Drawing.Size(297, 6) ' 'mnuModelUseModelUseModelKeyboard ' Me.mnuModelUseModelUseModelKeyboard.Name = "mnuModelUseModelUseModelKeyboard" - Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(197, 22) + Me.mnuModelUseModelUseModelKeyboard.Size = New System.Drawing.Size(300, 34) Me.mnuModelUseModelUseModelKeyboard.Text = "Use Model Keyboards..." ' 'mnuModelOtherOneVariable @@ -1224,7 +1225,7 @@ Partial Class frmMain Me.mnuModelOtherOneVariable.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherOneVariableExactResults, Me.mnuModelOtherOneVariableSampleSummaryData, Me.mnuModelOtherOneVariableNonParametric, Me.mnuModelOtherOneVariableGoodnessofFit}) Me.mnuModelOtherOneVariable.Enabled = False Me.mnuModelOtherOneVariable.Name = "mnuModelOtherOneVariable" - Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherOneVariable.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherOneVariable.Tag = "Other_(One_Variable)" Me.mnuModelOtherOneVariable.Text = "Other (One Variable)" Me.mnuModelOtherOneVariable.Visible = False @@ -1232,7 +1233,7 @@ Partial Class frmMain 'mnuModelOtherOneVariableExactResults ' Me.mnuModelOtherOneVariableExactResults.Name = "mnuModelOtherOneVariableExactResults" - Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableExactResults.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableExactResults.Tag = "Exact_Results..." Me.mnuModelOtherOneVariableExactResults.Text = "Exact Results..." ' @@ -1240,7 +1241,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableSampleSummaryData.Enabled = False Me.mnuModelOtherOneVariableSampleSummaryData.Name = "mnuModelOtherOneVariableSampleSummaryData" - Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableSampleSummaryData.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableSampleSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherOneVariableSampleSummaryData.Text = "Summary Data..." ' @@ -1248,7 +1249,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableNonParametric.Enabled = False Me.mnuModelOtherOneVariableNonParametric.Name = "mnuModelOtherOneVariableNonParametric" - Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableNonParametric.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableNonParametric.Tag = "Non_Parametric..." Me.mnuModelOtherOneVariableNonParametric.Text = "Non Parametric..." ' @@ -1256,7 +1257,7 @@ Partial Class frmMain ' Me.mnuModelOtherOneVariableGoodnessofFit.Enabled = False Me.mnuModelOtherOneVariableGoodnessofFit.Name = "mnuModelOtherOneVariableGoodnessofFit" - Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherOneVariableGoodnessofFit.Size = New System.Drawing.Size(252, 34) Me.mnuModelOtherOneVariableGoodnessofFit.Tag = "Goodness_of_Fit" Me.mnuModelOtherOneVariableGoodnessofFit.Text = "Goodness of Fit..." ' @@ -1265,7 +1266,7 @@ Partial Class frmMain Me.mnuModelOtherTwoVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherTwoVariablesTwoSamples, Me.mnuModelOtherTwoVariablesSummaryData, Me.mnuModelOtherTwoVariablesSimpleRegression, Me.mnuModelOtherTwoVariablesOneWayANOVA, Me.mnuModelOtherTwoVariablesNonParametricTwoSamples, Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA}) Me.mnuModelOtherTwoVariables.Enabled = False Me.mnuModelOtherTwoVariables.Name = "mnuModelOtherTwoVariables" - Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherTwoVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherTwoVariables.Tag = "Other_(Two_Variables)" Me.mnuModelOtherTwoVariables.Text = "Other (Two Variables)" Me.mnuModelOtherTwoVariables.Visible = False @@ -1274,7 +1275,7 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesTwoSamples.Name = "mnuModelOtherTwoVariablesTwoSamples" - Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesTwoSamples.Tag = "Two_Samples..." Me.mnuModelOtherTwoVariablesTwoSamples.Text = "Two Samples..." ' @@ -1282,21 +1283,21 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesSummaryData.Enabled = False Me.mnuModelOtherTwoVariablesSummaryData.Name = "mnuModelOtherTwoVariablesSummaryData" - Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSummaryData.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSummaryData.Tag = "Summary_Data..." Me.mnuModelOtherTwoVariablesSummaryData.Text = "Summary Data..." ' 'mnuModelOtherTwoVariablesSimpleRegression ' Me.mnuModelOtherTwoVariablesSimpleRegression.Name = "mnuModelOtherTwoVariablesSimpleRegression" - Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesSimpleRegression.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesSimpleRegression.Tag = "Simple_Regression..." Me.mnuModelOtherTwoVariablesSimpleRegression.Text = "Simple Regression..." ' 'mnuModelOtherTwoVariablesOneWayANOVA ' Me.mnuModelOtherTwoVariablesOneWayANOVA.Name = "mnuModelOtherTwoVariablesOneWayANOVA" - Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesOneWayANOVA.Tag = "One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesOneWayANOVA.Text = "One Way ANOVA..." ' @@ -1304,14 +1305,14 @@ Partial Class frmMain ' Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Enabled = False Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Name = "mnuModelOtherTwoVariablesNonParametricTwoSamples" - Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Tag = "Non_Parameteric_Two_Samples..." Me.mnuModelOtherTwoVariablesNonParametricTwoSamples.Text = "Non Parametric Two Samples..." ' 'mnuModelOtherTwoVariablesNonParametricOneWayANOVA ' Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Name = "mnuModelOtherTwoVariablesNonParametricOneWayANOVA" - Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(266, 22) + Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Size = New System.Drawing.Size(399, 34) Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Tag = "Non_Parameteric_One_Way_ANOVA..." Me.mnuModelOtherTwoVariablesNonParametricOneWayANOVA.Text = "Non Parameteric One Way ANOVA..." ' @@ -1320,7 +1321,7 @@ Partial Class frmMain Me.mnuModelOtherThreeVariables.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherThreeVariablesSimpleWithGroups, Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA, Me.mnuModelOtherThreeVariablesChisquareTest}) Me.mnuModelOtherThreeVariables.Enabled = False Me.mnuModelOtherThreeVariables.Name = "mnuModelOtherThreeVariables" - Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherThreeVariables.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherThreeVariables.Tag = "Other_(Three_Variable)" Me.mnuModelOtherThreeVariables.Text = "Other (Three Variable)" Me.mnuModelOtherThreeVariables.Visible = False @@ -1329,21 +1330,21 @@ Partial Class frmMain ' Me.mnuModelOtherThreeVariablesSimpleWithGroups.Enabled = False Me.mnuModelOtherThreeVariablesSimpleWithGroups.Name = "mnuModelOtherThreeVariablesSimpleWithGroups" - Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesSimpleWithGroups.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesSimpleWithGroups.Tag = "Simple_with_groups..." Me.mnuModelOtherThreeVariablesSimpleWithGroups.Text = "Simple With Groups..." ' 'mnuModelOtherThreeVariablesNonParametricTwoWayANOVA ' Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Name = "mnuModelOtherThreeVariablesNonParametricTwoWayANOVA" - Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Tag = "Non_Parametric_Two_Way_ANOVA..." Me.mnuModelOtherThreeVariablesNonParametricTwoWayANOVA.Text = "Non Parametric Two Way ANOVA..." ' 'mnuModelOtherThreeVariablesChisquareTest ' Me.mnuModelOtherThreeVariablesChisquareTest.Name = "mnuModelOtherThreeVariablesChisquareTest" - Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(259, 22) + Me.mnuModelOtherThreeVariablesChisquareTest.Size = New System.Drawing.Size(389, 34) Me.mnuModelOtherThreeVariablesChisquareTest.Tag = "Chi-square_Test" Me.mnuModelOtherThreeVariablesChisquareTest.Text = "Chi-square Test..." ' @@ -1352,7 +1353,7 @@ Partial Class frmMain Me.mnuModelOtherGeneral.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuModelOtherGeneralANOVAGeneral, Me.mnuModelOtherGeneralRegression, Me.mnuModelOtherGeneralLogLinear}) Me.mnuModelOtherGeneral.Enabled = False Me.mnuModelOtherGeneral.Name = "mnuModelOtherGeneral" - Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(201, 22) + Me.mnuModelOtherGeneral.Size = New System.Drawing.Size(305, 34) Me.mnuModelOtherGeneral.Tag = "Other_(General)" Me.mnuModelOtherGeneral.Text = "Other (General)" Me.mnuModelOtherGeneral.Visible = False @@ -1361,7 +1362,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralANOVAGeneral.Enabled = False Me.mnuModelOtherGeneralANOVAGeneral.Name = "mnuModelOtherGeneralANOVAGeneral" - Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralANOVAGeneral.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralANOVAGeneral.Tag = "ANOVA_General..." Me.mnuModelOtherGeneralANOVAGeneral.Text = "ANOVA General..." ' @@ -1369,7 +1370,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralRegression.Enabled = False Me.mnuModelOtherGeneralRegression.Name = "mnuModelOtherGeneralRegression" - Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralRegression.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralRegression.Tag = "Regression..." Me.mnuModelOtherGeneralRegression.Text = "Regression..." ' @@ -1377,7 +1378,7 @@ Partial Class frmMain ' Me.mnuModelOtherGeneralLogLinear.Enabled = False Me.mnuModelOtherGeneralLogLinear.Name = "mnuModelOtherGeneralLogLinear" - Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(166, 22) + Me.mnuModelOtherGeneralLogLinear.Size = New System.Drawing.Size(251, 34) Me.mnuModelOtherGeneralLogLinear.Tag = "Log_Linear" Me.mnuModelOtherGeneralLogLinear.Text = "Log Linear..." ' @@ -1385,7 +1386,7 @@ Partial Class frmMain ' Me.mnuClimaticExamine.Enabled = False Me.mnuClimaticExamine.Name = "mnuClimaticExamine" - Me.mnuClimaticExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticExamine.Tag = "Examine" Me.mnuClimaticExamine.Text = "Examine..." Me.mnuClimaticExamine.Visible = False @@ -1394,7 +1395,7 @@ Partial Class frmMain ' Me.mnuClimaticProcess.Enabled = False Me.mnuClimaticProcess.Name = "mnuClimaticProcess" - Me.mnuClimaticProcess.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticProcess.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticProcess.Tag = "Process" Me.mnuClimaticProcess.Text = "Process..." Me.mnuClimaticProcess.Visible = False @@ -1403,7 +1404,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticEvaporationSite, Me.mnuClimaticEvaporationPenman}) Me.mnuClimaticEvaporation.Name = "mnuClimaticEvaporation" - Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticEvaporation.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticEvaporation.Tag = "Evaporation" Me.mnuClimaticEvaporation.Text = "Evaporation" Me.mnuClimaticEvaporation.Visible = False @@ -1412,7 +1413,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationSite.Enabled = False Me.mnuClimaticEvaporationSite.Name = "mnuClimaticEvaporationSite" - Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationSite.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationSite.Tag = "Site" Me.mnuClimaticEvaporationSite.Text = "Site..." ' @@ -1420,7 +1421,7 @@ Partial Class frmMain ' Me.mnuClimaticEvaporationPenman.Enabled = False Me.mnuClimaticEvaporationPenman.Name = "mnuClimaticEvaporationPenman" - Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(127, 22) + Me.mnuClimaticEvaporationPenman.Size = New System.Drawing.Size(189, 34) Me.mnuClimaticEvaporationPenman.Tag = "Penman" Me.mnuClimaticEvaporationPenman.Text = "Penman..." ' @@ -1428,7 +1429,7 @@ Partial Class frmMain ' Me.mnuClimaticCrop.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCropCropCoefficients, Me.mnuClimaticCropWaterSatisfactionIndex}) Me.mnuClimaticCrop.Name = "mnuClimaticCrop" - Me.mnuClimaticCrop.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCrop.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCrop.Tag = "Crop" Me.mnuClimaticCrop.Text = "Crop" Me.mnuClimaticCrop.Visible = False @@ -1437,21 +1438,21 @@ Partial Class frmMain ' Me.mnuClimaticCropCropCoefficients.Enabled = False Me.mnuClimaticCropCropCoefficients.Name = "mnuClimaticCropCropCoefficients" - Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropCropCoefficients.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropCropCoefficients.Text = "Crop Coefficients..." ' 'mnuClimaticCropWaterSatisfactionIndex ' Me.mnuClimaticCropWaterSatisfactionIndex.Enabled = False Me.mnuClimaticCropWaterSatisfactionIndex.Name = "mnuClimaticCropWaterSatisfactionIndex" - Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCropWaterSatisfactionIndex.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticCropWaterSatisfactionIndex.Text = "Water Satisfaction Index..." ' 'mnuClimaticHeatSum ' Me.mnuClimaticHeatSum.Enabled = False Me.mnuClimaticHeatSum.Name = "mnuClimaticHeatSum" - Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticHeatSum.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticHeatSum.Tag = "Heat_Sum" Me.mnuClimaticHeatSum.Text = "Heat Sum..." Me.mnuClimaticHeatSum.Visible = False @@ -1460,7 +1461,7 @@ Partial Class frmMain ' Me.mnuView.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuViewDataView, Me.mnuViewOutput, Me.mnuViewLogScript, Me.mnuViewColumnMetadata, Me.mnuViewDataFrameMetadata, Me.mnuViewStructuredMenu, Me.ToolStripSeparator22, Me.mnuViewClimaticMenu, Me.mnuViewProcurementMenu, Me.mnuViewOptionsByContextMenu, Me.ToolStripSeparator39, Me.mnuViewResetToDefaultLayout, Me.mnuViewSwapDataAndMetadata, Me.mnuViewSwapDataAndScript}) Me.mnuView.Name = "mnuView" - Me.mnuView.Size = New System.Drawing.Size(44, 22) + Me.mnuView.Size = New System.Drawing.Size(65, 29) Me.mnuView.Tag = "View" Me.mnuView.Text = "View" ' @@ -1468,7 +1469,7 @@ Partial Class frmMain ' Me.mnuViewDataView.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataView.Name = "mnuViewDataView" - Me.mnuViewDataView.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataView.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataView.Tag = "Data_View" Me.mnuViewDataView.Text = "Data View" ' @@ -1476,21 +1477,21 @@ Partial Class frmMain ' Me.mnuViewOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOutput.Name = "mnuViewOutput" - Me.mnuViewOutput.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOutput.Size = New System.Drawing.Size(326, 34) Me.mnuViewOutput.Text = "Output" ' 'mnuViewLogScript ' Me.mnuViewLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewLogScript.Name = "mnuViewLogScript" - Me.mnuViewLogScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewLogScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewLogScript.Text = "Log/Script" ' 'mnuViewColumnMetadata ' Me.mnuViewColumnMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewColumnMetadata.Name = "mnuViewColumnMetadata" - Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewColumnMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewColumnMetadata.Tag = "Column_Metadata" Me.mnuViewColumnMetadata.Text = "Column Metadata" ' @@ -1498,7 +1499,7 @@ Partial Class frmMain ' Me.mnuViewDataFrameMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewDataFrameMetadata.Name = "mnuViewDataFrameMetadata" - Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewDataFrameMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewDataFrameMetadata.Tag = "Data_Frame_Metadata" Me.mnuViewDataFrameMetadata.Text = "Data Frame Metadata" ' @@ -1506,19 +1507,19 @@ Partial Class frmMain ' Me.mnuViewStructuredMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewStructuredMenu.Name = "mnuViewStructuredMenu" - Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewStructuredMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewStructuredMenu.Text = "Structured Menu" ' 'ToolStripSeparator22 ' Me.ToolStripSeparator22.Name = "ToolStripSeparator22" - Me.ToolStripSeparator22.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator22.Size = New System.Drawing.Size(323, 6) ' 'mnuViewClimaticMenu ' Me.mnuViewClimaticMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewClimaticMenu.Name = "mnuViewClimaticMenu" - Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewClimaticMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewClimaticMenu.Tag = "" Me.mnuViewClimaticMenu.Text = "Climatic Menu" ' @@ -1526,7 +1527,7 @@ Partial Class frmMain ' Me.mnuViewProcurementMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewProcurementMenu.Name = "mnuViewProcurementMenu" - Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewProcurementMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewProcurementMenu.Tag = "" Me.mnuViewProcurementMenu.Text = "Procurement Menu" ' @@ -1534,232 +1535,232 @@ Partial Class frmMain ' Me.mnuViewOptionsByContextMenu.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewOptionsByContextMenu.Name = "mnuViewOptionsByContextMenu" - Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(213, 22) + Me.mnuViewOptionsByContextMenu.Size = New System.Drawing.Size(326, 34) Me.mnuViewOptionsByContextMenu.Text = "Experiments" ' 'ToolStripSeparator39 ' Me.ToolStripSeparator39.Name = "ToolStripSeparator39" - Me.ToolStripSeparator39.Size = New System.Drawing.Size(210, 6) + Me.ToolStripSeparator39.Size = New System.Drawing.Size(323, 6) ' 'mnuViewResetToDefaultLayout ' Me.mnuViewResetToDefaultLayout.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewResetToDefaultLayout.Name = "mnuViewResetToDefaultLayout" - Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(213, 22) + Me.mnuViewResetToDefaultLayout.Size = New System.Drawing.Size(326, 34) Me.mnuViewResetToDefaultLayout.Text = "Reset to Default Layout" ' 'mnuViewSwapDataAndMetadata ' Me.mnuViewSwapDataAndMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndMetadata.Name = "mnuViewSwapDataAndMetadata" - Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndMetadata.Text = "Swap Data and Metadata" ' 'mnuViewSwapDataAndScript ' Me.mnuViewSwapDataAndScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuViewSwapDataAndScript.Name = "mnuViewSwapDataAndScript" - Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(213, 22) + Me.mnuViewSwapDataAndScript.Size = New System.Drawing.Size(326, 34) Me.mnuViewSwapDataAndScript.Text = "Swap Data and Log/Script" ' 'mnuHelp ' Me.mnuHelp.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuHelpHelpIntroduction, Me.mnuHelpFAQ, Me.mnuHelpGetingStarted, Me.mnuHelpData, Me.ToolStripSeparator28, Me.mnuHelpWindows, Me.ToolStripSeparator81, Me.mnuHelpMenus, Me.mnuHelpAboutR, Me.mnuHelpLearningStatistics, Me.mnuHelpRPackages, Me.mnuHelpGlossary, Me.mnuHelpLicence, Me.ToolStripSeparator29, Me.RInstatResourcesSiteToolStripMenuItem, Me.mnuHelpPackagesDocumentation}) Me.mnuHelp.Name = "mnuHelp" - Me.mnuHelp.Size = New System.Drawing.Size(44, 22) + Me.mnuHelp.Size = New System.Drawing.Size(65, 29) Me.mnuHelp.Tag = "Help" Me.mnuHelp.Text = "Help" ' 'mnuHelpHelpIntroduction ' Me.mnuHelpHelpIntroduction.Name = "mnuHelpHelpIntroduction" - Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpHelpIntroduction.Size = New System.Drawing.Size(344, 34) Me.mnuHelpHelpIntroduction.Text = "Introduction..." ' 'mnuHelpFAQ ' Me.mnuHelpFAQ.Name = "mnuHelpFAQ" - Me.mnuHelpFAQ.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpFAQ.Size = New System.Drawing.Size(344, 34) Me.mnuHelpFAQ.Text = "FAQ..." ' 'mnuHelpGetingStarted ' Me.mnuHelpGetingStarted.Name = "mnuHelpGetingStarted" - Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGetingStarted.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGetingStarted.Text = "Getting Started..." ' 'mnuHelpData ' Me.mnuHelpData.Name = "mnuHelpData" - Me.mnuHelpData.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpData.Size = New System.Drawing.Size(344, 34) Me.mnuHelpData.Text = "Data..." ' 'ToolStripSeparator28 ' Me.ToolStripSeparator28.Name = "ToolStripSeparator28" - Me.ToolStripSeparator28.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator28.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpWindows ' Me.mnuHelpWindows.Name = "mnuHelpWindows" - Me.mnuHelpWindows.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpWindows.Size = New System.Drawing.Size(344, 34) Me.mnuHelpWindows.Text = "Windows..." ' 'ToolStripSeparator81 ' Me.ToolStripSeparator81.Name = "ToolStripSeparator81" - Me.ToolStripSeparator81.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator81.Size = New System.Drawing.Size(341, 6) ' 'mnuHelpMenus ' Me.mnuHelpMenus.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenusAndDialogsToolStripMenuItem, Me.ToolStripSeparator82, Me.FileToolStripMenuItem, Me.EditToolStripMenuItem, Me.PrepareToolStripMenuItem, Me.DescribeToolStripMenuItem, Me.ModelToolStripMenuItem, Me.ToolStripSeparator83, Me.StructuredToolStripMenuItem, Me.ClimaticToolStripMenuItem, Me.ProcurementToolStripMenuItem, Me.ExperimentsToolStripMenuItem, Me.ToolsToolStripMenuItem, Me.ViewToolStripMenuItem}) Me.mnuHelpMenus.Name = "mnuHelpMenus" - Me.mnuHelpMenus.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpMenus.Size = New System.Drawing.Size(344, 34) Me.mnuHelpMenus.Text = "Menus and Dialogs" ' 'MenusAndDialogsToolStripMenuItem ' Me.MenusAndDialogsToolStripMenuItem.Name = "MenusAndDialogsToolStripMenuItem" - Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.MenusAndDialogsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.MenusAndDialogsToolStripMenuItem.Text = "Menus and Dialogs..." ' 'ToolStripSeparator82 ' Me.ToolStripSeparator82.Name = "ToolStripSeparator82" - Me.ToolStripSeparator82.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator82.Size = New System.Drawing.Size(276, 6) ' 'FileToolStripMenuItem ' Me.FileToolStripMenuItem.Name = "FileToolStripMenuItem" - Me.FileToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.FileToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.FileToolStripMenuItem.Text = "File..." ' 'EditToolStripMenuItem ' Me.EditToolStripMenuItem.Name = "EditToolStripMenuItem" - Me.EditToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.EditToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.EditToolStripMenuItem.Text = "Edit..." ' 'PrepareToolStripMenuItem ' Me.PrepareToolStripMenuItem.Name = "PrepareToolStripMenuItem" - Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.PrepareToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.PrepareToolStripMenuItem.Text = "Prepare..." ' 'DescribeToolStripMenuItem ' Me.DescribeToolStripMenuItem.Name = "DescribeToolStripMenuItem" - Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.DescribeToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.DescribeToolStripMenuItem.Text = "Describe..." ' 'ModelToolStripMenuItem ' Me.ModelToolStripMenuItem.Name = "ModelToolStripMenuItem" - Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ModelToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ModelToolStripMenuItem.Text = "Model..." ' 'ToolStripSeparator83 ' Me.ToolStripSeparator83.Name = "ToolStripSeparator83" - Me.ToolStripSeparator83.Size = New System.Drawing.Size(181, 6) + Me.ToolStripSeparator83.Size = New System.Drawing.Size(276, 6) ' 'StructuredToolStripMenuItem ' Me.StructuredToolStripMenuItem.Name = "StructuredToolStripMenuItem" - Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.StructuredToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.StructuredToolStripMenuItem.Text = "Structured..." ' 'ClimaticToolStripMenuItem ' Me.ClimaticToolStripMenuItem.Name = "ClimaticToolStripMenuItem" - Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ClimaticToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ClimaticToolStripMenuItem.Text = "Climatic..." ' 'ProcurementToolStripMenuItem ' Me.ProcurementToolStripMenuItem.Name = "ProcurementToolStripMenuItem" - Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ProcurementToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ProcurementToolStripMenuItem.Text = "Procurement..." ' 'ExperimentsToolStripMenuItem ' Me.ExperimentsToolStripMenuItem.Name = "ExperimentsToolStripMenuItem" - Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ExperimentsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ExperimentsToolStripMenuItem.Text = "Experiments..." ' 'ToolsToolStripMenuItem ' Me.ToolsToolStripMenuItem.Name = "ToolsToolStripMenuItem" - Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ToolsToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ToolsToolStripMenuItem.Text = "Tools..." ' 'ViewToolStripMenuItem ' Me.ViewToolStripMenuItem.Name = "ViewToolStripMenuItem" - Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(184, 22) + Me.ViewToolStripMenuItem.Size = New System.Drawing.Size(279, 34) Me.ViewToolStripMenuItem.Text = "View..." ' 'mnuHelpAboutR ' Me.mnuHelpAboutR.Name = "mnuHelpAboutR" - Me.mnuHelpAboutR.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpAboutR.Size = New System.Drawing.Size(344, 34) Me.mnuHelpAboutR.Text = "About R..." Me.mnuHelpAboutR.Visible = False ' 'mnuHelpLearningStatistics ' Me.mnuHelpLearningStatistics.Name = "mnuHelpLearningStatistics" - Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLearningStatistics.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLearningStatistics.Text = "Learning Statistics..." Me.mnuHelpLearningStatistics.Visible = False ' 'mnuHelpRPackages ' Me.mnuHelpRPackages.Name = "mnuHelpRPackages" - Me.mnuHelpRPackages.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpRPackages.Size = New System.Drawing.Size(344, 34) Me.mnuHelpRPackages.Text = "R Packages..." ' 'mnuHelpGlossary ' Me.mnuHelpGlossary.Name = "mnuHelpGlossary" - Me.mnuHelpGlossary.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpGlossary.Size = New System.Drawing.Size(344, 34) Me.mnuHelpGlossary.Text = "Glossary..." ' 'mnuHelpLicence ' Me.mnuHelpLicence.Name = "mnuHelpLicence" - Me.mnuHelpLicence.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpLicence.Size = New System.Drawing.Size(344, 34) Me.mnuHelpLicence.Tag = "Licence..." Me.mnuHelpLicence.Text = "Licence..." ' 'ToolStripSeparator29 ' Me.ToolStripSeparator29.Name = "ToolStripSeparator29" - Me.ToolStripSeparator29.Size = New System.Drawing.Size(227, 6) + Me.ToolStripSeparator29.Size = New System.Drawing.Size(341, 6) ' 'RInstatResourcesSiteToolStripMenuItem ' Me.RInstatResourcesSiteToolStripMenuItem.Name = "RInstatResourcesSiteToolStripMenuItem" - Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(230, 22) + Me.RInstatResourcesSiteToolStripMenuItem.Size = New System.Drawing.Size(344, 34) Me.RInstatResourcesSiteToolStripMenuItem.Text = "R-Instat Resources Site" ' 'mnuHelpPackagesDocumentation ' Me.mnuHelpPackagesDocumentation.Name = "mnuHelpPackagesDocumentation" - Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(230, 22) + Me.mnuHelpPackagesDocumentation.Size = New System.Drawing.Size(344, 34) Me.mnuHelpPackagesDocumentation.Text = "R-Packages Documentation..." ' 'ToolStripSeparator16 ' Me.ToolStripSeparator16.Name = "ToolStripSeparator16" - Me.ToolStripSeparator16.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator16.Size = New System.Drawing.Size(322, 6) ' 'mnuClimatic ' Me.mnuClimatic.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFile, Me.ToolStripSeparator18, Me.mnuExamineEditData, Me.mnuClimaticTidyandExamine, Me.mnuClimaticDates, Me.mnuClimaticDefineClimaticData, Me.mnuClimaticCheckData, Me.mnuClimaticPrepare, Me.ToolStripSeparator30, Me.mnuClimaticDescribe, Me.mnuClimaticNCMP, Me.mnuClimaticPICSA, Me.mnuCMSAF, Me.mnuClimaticCompare, Me.mnuClimaticMapping, Me.ToolStripSeparator16, Me.mnuClimaticModel, Me.mnuClimaticExamine, Me.mnuClimaticProcess, Me.ToolStripSeparator23, Me.mnuClimaticSCF, Me.mnuClimaticEvaporation, Me.mnuClimaticCrop, Me.mnuClimaticHeatSum, Me.mnuClimaticClimateMethods}) Me.mnuClimatic.Name = "mnuClimatic" - Me.mnuClimatic.Size = New System.Drawing.Size(63, 22) + Me.mnuClimatic.Size = New System.Drawing.Size(90, 29) Me.mnuClimatic.Tag = "Climatic" Me.mnuClimatic.Text = "Climatic" ' @@ -1767,288 +1768,288 @@ Partial Class frmMain ' Me.mnuClimaticFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticFileImportSST, Me.mnuClimaticFileImportfromIRIDataLibrary, Me.mnuClimaticFileImportfromClimateDataStore, Me.mnuClimaticFileImportandTidyNetCDF, Me.mnuClimaticFileImportandTidyShapefile, Me.mnuClimateFileImportfromClimSoft, Me.mnuClimaticFileImportfromCliData, Me.ToolStripSeparator15, Me.mnuClimaticFileExportToClimsoft, Me.mnuClimaticFileExportToCPT, Me.mnuExportToWWRToolStrip, Me.mnuClimaticFileExportToClimpact, Me.mnuClimaticFileExportToGoogleBucketsToolStrip}) Me.mnuClimaticFile.Name = "mnuClimaticFile" - Me.mnuClimaticFile.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticFile.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticFile.Text = "File" ' 'mnuClimaticFileImportSST ' Me.mnuClimaticFileImportSST.Name = "mnuClimaticFileImportSST" - Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportSST.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportSST.Text = "Import SST..." ' 'mnuClimaticFileImportfromIRIDataLibrary ' Me.mnuClimaticFileImportfromIRIDataLibrary.Name = "mnuClimaticFileImportfromIRIDataLibrary" - Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromIRIDataLibrary.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromIRIDataLibrary.Text = "Import from IRI Data Library..." ' 'mnuClimaticFileImportfromClimateDataStore ' Me.mnuClimaticFileImportfromClimateDataStore.Name = "mnuClimaticFileImportfromClimateDataStore" - Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromClimateDataStore.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromClimateDataStore.Text = "Import from CDS (Climate Data Store)..." ' 'mnuClimaticFileImportandTidyNetCDF ' Me.mnuClimaticFileImportandTidyNetCDF.Name = "mnuClimaticFileImportandTidyNetCDF" - Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyNetCDF.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyNetCDF.Text = "Import and Tidy NetCDF..." ' 'mnuClimaticFileImportandTidyShapefile ' Me.mnuClimaticFileImportandTidyShapefile.Name = "mnuClimaticFileImportandTidyShapefile" - Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportandTidyShapefile.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportandTidyShapefile.Text = "Import and Tidy Shapefile..." ' 'mnuClimateFileImportfromClimSoft ' Me.mnuClimateFileImportfromClimSoft.Name = "mnuClimateFileImportfromClimSoft" - Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimateFileImportfromClimSoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimateFileImportfromClimSoft.Text = "Import from Climsoft..." ' 'mnuClimaticFileImportfromCliData ' Me.mnuClimaticFileImportfromCliData.Enabled = False Me.mnuClimaticFileImportfromCliData.Name = "mnuClimaticFileImportfromCliData" - Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileImportfromCliData.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileImportfromCliData.Text = "Import from CLIDATA..." Me.mnuClimaticFileImportfromCliData.Visible = False ' 'ToolStripSeparator15 ' Me.ToolStripSeparator15.Name = "ToolStripSeparator15" - Me.ToolStripSeparator15.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator15.Size = New System.Drawing.Size(423, 6) ' 'mnuClimaticFileExportToClimsoft ' Me.mnuClimaticFileExportToClimsoft.Name = "mnuClimaticFileExportToClimsoft" - Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimsoft.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimsoft.Text = "Export to Climsoft..." ' 'mnuClimaticFileExportToCPT ' Me.mnuClimaticFileExportToCPT.Name = "mnuClimaticFileExportToCPT" - Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToCPT.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToCPT.Tag = "Export_to_CPT" Me.mnuClimaticFileExportToCPT.Text = "Export to CPT..." ' 'mnuExportToWWRToolStrip ' Me.mnuExportToWWRToolStrip.Name = "mnuExportToWWRToolStrip" - Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuExportToWWRToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuExportToWWRToolStrip.Text = "Export to World Weather Records..." ' 'mnuClimaticFileExportToClimpact ' Me.mnuClimaticFileExportToClimpact.Name = "mnuClimaticFileExportToClimpact" - Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToClimpact.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToClimpact.Text = "Export to Climpact..." ' 'mnuClimaticFileExportToGoogleBucketsToolStrip ' Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Name = "mnuClimaticFileExportToGoogleBucketsToolStrip" - Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(282, 22) + Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Size = New System.Drawing.Size(426, 34) Me.mnuClimaticFileExportToGoogleBucketsToolStrip.Text = "Export to Google Buckets..." ' 'ToolStripSeparator18 ' Me.ToolStripSeparator18.Name = "ToolStripSeparator18" - Me.ToolStripSeparator18.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator18.Size = New System.Drawing.Size(322, 6) ' 'mnuExamineEditData ' Me.mnuExamineEditData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticExamineEditDataVisualiseData, Me.mnuExamineEditDataPivotTable, Me.ToolStripSeparator27, Me.mnuExamineEditDataOneVariableSummarise, Me.mnuExamineEditDataOneVariableGraph, Me.mnuExamineEditDataOneVariableFrequencies, Me.ToolStripSeparator78, Me.mnuExamineEditDataSetupForDataEditing, Me.mnuExamineEditDataDailyDataEditing, Me.mnuExamineEditDataCompareColumns}) Me.mnuExamineEditData.Name = "mnuExamineEditData" - Me.mnuExamineEditData.Size = New System.Drawing.Size(212, 22) + Me.mnuExamineEditData.Size = New System.Drawing.Size(325, 34) Me.mnuExamineEditData.Text = "Examine/Edit Data" ' 'mnuClimaticExamineEditDataVisualiseData ' Me.mnuClimaticExamineEditDataVisualiseData.Name = "mnuClimaticExamineEditDataVisualiseData" - Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(215, 22) + Me.mnuClimaticExamineEditDataVisualiseData.Size = New System.Drawing.Size(324, 34) Me.mnuClimaticExamineEditDataVisualiseData.Text = "Visualise Data..." ' 'mnuExamineEditDataPivotTable ' Me.mnuExamineEditDataPivotTable.Name = "mnuExamineEditDataPivotTable" - Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataPivotTable.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator27 ' Me.ToolStripSeparator27.Name = "ToolStripSeparator27" - Me.ToolStripSeparator27.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator27.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataOneVariableSummarise ' Me.mnuExamineEditDataOneVariableSummarise.Name = "mnuExamineEditDataOneVariableSummarise" - Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuExamineEditDataOneVariableGraph ' Me.mnuExamineEditDataOneVariableGraph.Name = "mnuExamineEditDataOneVariableGraph" - Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuExamineEditDataOneVariableFrequencies ' Me.mnuExamineEditDataOneVariableFrequencies.Name = "mnuExamineEditDataOneVariableFrequencies" - Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'ToolStripSeparator78 ' Me.ToolStripSeparator78.Name = "ToolStripSeparator78" - Me.ToolStripSeparator78.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator78.Size = New System.Drawing.Size(321, 6) ' 'mnuExamineEditDataSetupForDataEditing ' Me.mnuExamineEditDataSetupForDataEditing.Name = "mnuExamineEditDataSetupForDataEditing" - Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataSetupForDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataSetupForDataEditing.Text = "Setup for Data Editing..." ' 'mnuExamineEditDataDailyDataEditing ' Me.mnuExamineEditDataDailyDataEditing.Name = "mnuExamineEditDataDailyDataEditing" - Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataDailyDataEditing.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataDailyDataEditing.Text = "Daily Data Editing..." ' 'mnuExamineEditDataCompareColumns ' Me.mnuExamineEditDataCompareColumns.Name = "mnuExamineEditDataCompareColumns" - Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuExamineEditDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuExamineEditDataCompareColumns.Text = "Compare Columns..." ' 'mnuClimaticTidyandExamine ' Me.mnuClimaticTidyandExamine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticTidyandExamineTidyDailyData, Me.ToolStripSeparator71, Me.mnuClimaticTidyandExamineReplaceValues, Me.mnuClimaticTidyandExamineDuplicateRows, Me.mnuClimaticTidyandExamineNonNumericCases, Me.ToolStripSeparator54, Me.mnuClimaticTidyandExamineTransformText, Me.mnuClimaticTidyandExamineSplitText, Me.ToolStripSeparator80, Me.mnuClimaticTidyandExamineStack, Me.mnuClimaticTidyandExamineUnstack, Me.mnuClimaticTidyandExamineMerge, Me.mnuClimaticTidyandExamineAppend, Me.ToolStripSeparator69, Me.mnuClimaticTidyDataKey}) Me.mnuClimaticTidyandExamine.Name = "mnuClimaticTidyandExamine" - Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticTidyandExamine.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticTidyandExamine.Text = "Tidy Data" ' 'mnuClimaticTidyandExamineTidyDailyData ' Me.mnuClimaticTidyandExamineTidyDailyData.Name = "mnuClimaticTidyandExamineTidyDailyData" - Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTidyDailyData.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTidyDailyData.Text = "Tidy Daily Data..." ' 'ToolStripSeparator71 ' Me.ToolStripSeparator71.Name = "ToolStripSeparator71" - Me.ToolStripSeparator71.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator71.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineReplaceValues ' Me.mnuClimaticTidyandExamineReplaceValues.Name = "mnuClimaticTidyandExamineReplaceValues" - Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineReplaceValues.Text = "Replace Values..." ' 'mnuClimaticTidyandExamineDuplicateRows ' Me.mnuClimaticTidyandExamineDuplicateRows.Name = "mnuClimaticTidyandExamineDuplicateRows" - Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineDuplicateRows.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineDuplicateRows.Text = "Duplicate Rows..." ' 'mnuClimaticTidyandExamineNonNumericCases ' Me.mnuClimaticTidyandExamineNonNumericCases.Name = "mnuClimaticTidyandExamineNonNumericCases" - Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineNonNumericCases.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator54 ' Me.ToolStripSeparator54.Name = "ToolStripSeparator54" - Me.ToolStripSeparator54.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator54.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineTransformText ' Me.mnuClimaticTidyandExamineTransformText.Name = "mnuClimaticTidyandExamineTransformText" - Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineTransformText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineTransformText.Text = "Transform Text..." ' 'mnuClimaticTidyandExamineSplitText ' Me.mnuClimaticTidyandExamineSplitText.Name = "mnuClimaticTidyandExamineSplitText" - Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineSplitText.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineSplitText.Text = "Split Text..." ' 'ToolStripSeparator80 ' Me.ToolStripSeparator80.Name = "ToolStripSeparator80" - Me.ToolStripSeparator80.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator80.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyandExamineStack ' Me.mnuClimaticTidyandExamineStack.Name = "mnuClimaticTidyandExamineStack" - Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineStack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineStack.Text = "Stack (Pivot Longer)..." ' 'mnuClimaticTidyandExamineUnstack ' Me.mnuClimaticTidyandExamineUnstack.Name = "mnuClimaticTidyandExamineUnstack" - Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineUnstack.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuClimaticTidyandExamineMerge ' Me.mnuClimaticTidyandExamineMerge.Name = "mnuClimaticTidyandExamineMerge" - Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineMerge.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineMerge.Text = "Add (Merge) Columns..." ' 'mnuClimaticTidyandExamineAppend ' Me.mnuClimaticTidyandExamineAppend.Name = "mnuClimaticTidyandExamineAppend" - Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyandExamineAppend.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyandExamineAppend.Text = "Append (Bind Rows)..." ' 'ToolStripSeparator69 ' Me.ToolStripSeparator69.Name = "ToolStripSeparator69" - Me.ToolStripSeparator69.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator69.Size = New System.Drawing.Size(298, 6) ' 'mnuClimaticTidyDataKey ' Me.mnuClimaticTidyDataKey.Name = "mnuClimaticTidyDataKey" - Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(201, 22) + Me.mnuClimaticTidyDataKey.Size = New System.Drawing.Size(301, 34) Me.mnuClimaticTidyDataKey.Text = "Add Key..." ' 'mnuClimaticDates ' Me.mnuClimaticDates.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDatesGenerateDates, Me.mnuClimaticDatesMakeDate, Me.mnuClimaticDatesInfillMissingDates, Me.mnuClimaticDatesUseDate, Me.mnuClimaticDatesMakeTime, Me.mnuClimaticDatesUseTime}) Me.mnuClimaticDates.Name = "mnuClimaticDates" - Me.mnuClimaticDates.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDates.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDates.Text = "Dates" ' 'mnuClimaticDatesGenerateDates ' Me.mnuClimaticDatesGenerateDates.Name = "mnuClimaticDatesGenerateDates" - Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesGenerateDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesGenerateDates.Text = "Generate Dates..." ' 'mnuClimaticDatesMakeDate ' Me.mnuClimaticDatesMakeDate.Name = "mnuClimaticDatesMakeDate" - Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeDate.Text = "Make Date..." ' 'mnuClimaticDatesInfillMissingDates ' Me.mnuClimaticDatesInfillMissingDates.Name = "mnuClimaticDatesInfillMissingDates" - Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuClimaticDatesUseDate ' Me.mnuClimaticDatesUseDate.Name = "mnuClimaticDatesUseDate" - Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseDate.Text = "Use Date..." ' 'mnuClimaticDatesMakeTime ' Me.mnuClimaticDatesMakeTime.Enabled = False Me.mnuClimaticDatesMakeTime.Name = "mnuClimaticDatesMakeTime" - Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesMakeTime.Text = "Make Time..." Me.mnuClimaticDatesMakeTime.Visible = False ' @@ -2056,175 +2057,175 @@ Partial Class frmMain ' Me.mnuClimaticDatesUseTime.Enabled = False Me.mnuClimaticDatesUseTime.Name = "mnuClimaticDatesUseTime" - Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuClimaticDatesUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuClimaticDatesUseTime.Text = "Use Time..." Me.mnuClimaticDatesUseTime.Visible = False ' 'mnuClimaticDefineClimaticData ' Me.mnuClimaticDefineClimaticData.Name = "mnuClimaticDefineClimaticData" - Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDefineClimaticData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDefineClimaticData.Text = "Define Climatic Data..." ' 'mnuClimaticCheckData ' Me.mnuClimaticCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCheckDataInventory, Me.mnuClimaticCheckDataDisplayDaily, Me.ToolStripSeparator65, Me.mnuClimaticCheckDataFillMissingValues, Me.mnuClimaticCheckDataBoxplot, Me.mnuClimaticCheckDataQCTemperatures, Me.mnuClimaticCheckDataQCRainfall, Me.ToolStripSeparator70, Me.mnuClimaticCheckDataHomogenization, Me.mnuClimaticCheckDataCheckStationLocations, Me.mnuClimaticCheckDataDistances}) Me.mnuClimaticCheckData.Name = "mnuClimaticCheckData" - Me.mnuClimaticCheckData.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCheckData.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCheckData.Text = "Check Data" ' 'mnuClimaticCheckDataInventory ' Me.mnuClimaticCheckDataInventory.Name = "mnuClimaticCheckDataInventory" - Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataInventory.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataInventory.Text = "Inventory..." ' 'mnuClimaticCheckDataDisplayDaily ' Me.mnuClimaticCheckDataDisplayDaily.Name = "mnuClimaticCheckDataDisplayDaily" - Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDisplayDaily.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDisplayDaily.Text = "Display Daily..." ' 'ToolStripSeparator65 ' Me.ToolStripSeparator65.Name = "ToolStripSeparator65" - Me.ToolStripSeparator65.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator65.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataFillMissingValues ' Me.mnuClimaticCheckDataFillMissingValues.Name = "mnuClimaticCheckDataFillMissingValues" - Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataFillMissingValues.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataFillMissingValues.Text = "Fill Missing Values..." ' 'mnuClimaticCheckDataBoxplot ' Me.mnuClimaticCheckDataBoxplot.Name = "mnuClimaticCheckDataBoxplot" - Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataBoxplot.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataBoxplot.Text = "Boxplot..." ' 'mnuClimaticCheckDataQCTemperatures ' Me.mnuClimaticCheckDataQCTemperatures.Name = "mnuClimaticCheckDataQCTemperatures" - Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCTemperatures.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCTemperatures.Text = "QC Temperatures..." ' 'mnuClimaticCheckDataQCRainfall ' Me.mnuClimaticCheckDataQCRainfall.Name = "mnuClimaticCheckDataQCRainfall" - Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataQCRainfall.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataQCRainfall.Text = "QC Rainfall..." ' 'ToolStripSeparator70 ' Me.ToolStripSeparator70.Name = "ToolStripSeparator70" - Me.ToolStripSeparator70.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator70.Size = New System.Drawing.Size(310, 6) ' 'mnuClimaticCheckDataHomogenization ' Me.mnuClimaticCheckDataHomogenization.Name = "mnuClimaticCheckDataHomogenization" - Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataHomogenization.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataHomogenization.Text = "Homogenization..." ' 'mnuClimaticCheckDataCheckStationLocations ' Me.mnuClimaticCheckDataCheckStationLocations.Name = "mnuClimaticCheckDataCheckStationLocations" - Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticCheckDataDistances ' Me.mnuClimaticCheckDataDistances.Name = "mnuClimaticCheckDataDistances" - Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticCheckDataDistances.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticCheckDataDistances.Text = "Distances..." ' 'mnuClimaticPrepare ' Me.mnuClimaticPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuCimaticPrepareTransform, Me.mnuClimaticPrepareConversions, Me.ToolStripSeparator37, Me.mnuClimaticPrepareClimaticSummaries, Me.mnuClimaticPrepareStartoftheRains, Me.mnuClimaticPrepareEndOfRains, Me.mnuClimaticPrepareLengthOfSeason, Me.mnuClimaticPrepareSpells, Me.mnuClimaticPrepareExtremes, Me.ToolStripSeparator64, Me.mnuClimaticPrepareClimdex, Me.ToolStripSeparator51, Me.mnuClimaticPrepareEvapotranspiration, Me.mnuClimaticPrepareSummary, Me.mnuClimaticPrepareNewWorksheet, Me.mnuClimaticPrepareImportDailyData, Me.mnuClimaticPrepareMakeFactor, Me.mnuClimaticPrepareShiftDailyData, Me.mnuClimaticPrepareUnstackDailyData, Me.mnuClimaticPrepareStackDailyData}) Me.mnuClimaticPrepare.Name = "mnuClimaticPrepare" - Me.mnuClimaticPrepare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPrepare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPrepare.Tag = "Prepare" Me.mnuClimaticPrepare.Text = "Prepare" ' 'mnuCimaticPrepareTransform ' Me.mnuCimaticPrepareTransform.Name = "mnuCimaticPrepareTransform" - Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(189, 22) + Me.mnuCimaticPrepareTransform.Size = New System.Drawing.Size(281, 34) Me.mnuCimaticPrepareTransform.Text = "Transform..." ' 'mnuClimaticPrepareConversions ' Me.mnuClimaticPrepareConversions.Name = "mnuClimaticPrepareConversions" - Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareConversions.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareConversions.Text = "Conversions..." ' 'ToolStripSeparator37 ' Me.ToolStripSeparator37.Name = "ToolStripSeparator37" - Me.ToolStripSeparator37.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator37.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimaticSummaries ' Me.mnuClimaticPrepareClimaticSummaries.Name = "mnuClimaticPrepareClimaticSummaries" - Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimaticSummaries.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimaticSummaries.Text = "Climatic Summaries..." ' 'mnuClimaticPrepareStartoftheRains ' Me.mnuClimaticPrepareStartoftheRains.Name = "mnuClimaticPrepareStartoftheRains" - Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStartoftheRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStartoftheRains.Text = "Start of the Rains..." ' 'mnuClimaticPrepareEndOfRains ' Me.mnuClimaticPrepareEndOfRains.Name = "mnuClimaticPrepareEndOfRains" - Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEndOfRains.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEndOfRains.Text = "End of Rains..." ' 'mnuClimaticPrepareLengthOfSeason ' Me.mnuClimaticPrepareLengthOfSeason.Name = "mnuClimaticPrepareLengthOfSeason" - Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareLengthOfSeason.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareLengthOfSeason.Text = "Length of Season..." ' 'mnuClimaticPrepareSpells ' Me.mnuClimaticPrepareSpells.Name = "mnuClimaticPrepareSpells" - Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSpells.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSpells.Text = "Spells..." ' 'mnuClimaticPrepareExtremes ' Me.mnuClimaticPrepareExtremes.Name = "mnuClimaticPrepareExtremes" - Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareExtremes.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareExtremes.Text = "Extremes..." ' 'ToolStripSeparator64 ' Me.ToolStripSeparator64.Name = "ToolStripSeparator64" - Me.ToolStripSeparator64.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator64.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareClimdex ' Me.mnuClimaticPrepareClimdex.Name = "mnuClimaticPrepareClimdex" - Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareClimdex.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareClimdex.Text = "Climdex..." ' 'ToolStripSeparator51 ' Me.ToolStripSeparator51.Name = "ToolStripSeparator51" - Me.ToolStripSeparator51.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator51.Size = New System.Drawing.Size(278, 6) ' 'mnuClimaticPrepareEvapotranspiration ' Me.mnuClimaticPrepareEvapotranspiration.Name = "mnuClimaticPrepareEvapotranspiration" - Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareEvapotranspiration.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareEvapotranspiration.Text = "Evapotranspiration..." ' 'mnuClimaticPrepareSummary ' Me.mnuClimaticPrepareSummary.Enabled = False Me.mnuClimaticPrepareSummary.Name = "mnuClimaticPrepareSummary" - Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareSummary.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareSummary.Text = "Summary..." Me.mnuClimaticPrepareSummary.Visible = False ' @@ -2232,7 +2233,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareNewWorksheet.Enabled = False Me.mnuClimaticPrepareNewWorksheet.Name = "mnuClimaticPrepareNewWorksheet" - Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareNewWorksheet.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareNewWorksheet.Tag = "New_Worksheet" Me.mnuClimaticPrepareNewWorksheet.Text = "New Worksheet..." Me.mnuClimaticPrepareNewWorksheet.Visible = False @@ -2241,7 +2242,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareImportDailyData.Enabled = False Me.mnuClimaticPrepareImportDailyData.Name = "mnuClimaticPrepareImportDailyData" - Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareImportDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareImportDailyData.Tag = "Import_daily_data" Me.mnuClimaticPrepareImportDailyData.Text = "Import daily Data..." Me.mnuClimaticPrepareImportDailyData.Visible = False @@ -2250,7 +2251,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareMakeFactor.Enabled = False Me.mnuClimaticPrepareMakeFactor.Name = "mnuClimaticPrepareMakeFactor" - Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareMakeFactor.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareMakeFactor.Tag = "Make_Factor" Me.mnuClimaticPrepareMakeFactor.Text = "Make Factor..." Me.mnuClimaticPrepareMakeFactor.Visible = False @@ -2259,7 +2260,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareShiftDailyData.Enabled = False Me.mnuClimaticPrepareShiftDailyData.Name = "mnuClimaticPrepareShiftDailyData" - Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareShiftDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareShiftDailyData.Tag = "Shift_Daily_data" Me.mnuClimaticPrepareShiftDailyData.Text = "Shift Daily Data..." Me.mnuClimaticPrepareShiftDailyData.Visible = False @@ -2268,7 +2269,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareUnstackDailyData.Enabled = False Me.mnuClimaticPrepareUnstackDailyData.Name = "mnuClimaticPrepareUnstackDailyData" - Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareUnstackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareUnstackDailyData.Tag = "Unstack_Daily_data" Me.mnuClimaticPrepareUnstackDailyData.Text = "Unstack Daily Data..." Me.mnuClimaticPrepareUnstackDailyData.Visible = False @@ -2277,7 +2278,7 @@ Partial Class frmMain ' Me.mnuClimaticPrepareStackDailyData.Enabled = False Me.mnuClimaticPrepareStackDailyData.Name = "mnuClimaticPrepareStackDailyData" - Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(189, 22) + Me.mnuClimaticPrepareStackDailyData.Size = New System.Drawing.Size(281, 34) Me.mnuClimaticPrepareStackDailyData.Tag = "Stack_Daily_data" Me.mnuClimaticPrepareStackDailyData.Text = "Stack Daily data..." Me.mnuClimaticPrepareStackDailyData.Visible = False @@ -2285,361 +2286,361 @@ Partial Class frmMain 'ToolStripSeparator30 ' Me.ToolStripSeparator30.Name = "ToolStripSeparator30" - Me.ToolStripSeparator30.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator30.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticDescribe ' Me.mnuClimaticDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticDescribeSummarise23Variables, Me.mnuClimaticDescribeGraph23Variables, Me.ToolStripSeparator31, Me.mnuClimaticDescribeSPISPEI, Me.mnuClimaticDescribeClimograph, Me.mnuClimaticDescribeTrendGraph, Me.mnuClimaticDescribeSeasonalGraph, Me.mnuClimaticDescribeIDF, Me.ToolStripSeparator17, Me.mnuClimaticDescribeWindRose, Me.mnuClimaticDescribeWindPollutionRose, Me.mnuClimaticDescribeOtherRosePlots}) Me.mnuClimaticDescribe.Name = "mnuClimaticDescribe" - Me.mnuClimaticDescribe.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticDescribe.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticDescribe.Text = "Describe" ' 'mnuClimaticDescribeSummarise23Variables ' Me.mnuClimaticDescribeSummarise23Variables.Name = "mnuClimaticDescribeSummarise23Variables" - Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSummarise23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSummarise23Variables.Text = "Summarise 2/3 Variables..." ' 'mnuClimaticDescribeGraph23Variables ' Me.mnuClimaticDescribeGraph23Variables.Name = "mnuClimaticDescribeGraph23Variables" - Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeGraph23Variables.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeGraph23Variables.Text = "Graph 2/3 Variables..." ' 'ToolStripSeparator31 ' Me.ToolStripSeparator31.Name = "ToolStripSeparator31" - Me.ToolStripSeparator31.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator31.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeSPISPEI ' Me.mnuClimaticDescribeSPISPEI.Name = "mnuClimaticDescribeSPISPEI" - Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSPISPEI.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSPISPEI.Text = "SPI/SPEI..." ' 'mnuClimaticDescribeClimograph ' Me.mnuClimaticDescribeClimograph.Name = "mnuClimaticDescribeClimograph" - Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeClimograph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeClimograph.Text = "Climograph..." ' 'mnuClimaticDescribeTrendGraph ' Me.mnuClimaticDescribeTrendGraph.Name = "mnuClimaticDescribeTrendGraph" - Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeTrendGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeTrendGraph.Text = "Trend Graph..." ' 'mnuClimaticDescribeSeasonalGraph ' Me.mnuClimaticDescribeSeasonalGraph.Name = "mnuClimaticDescribeSeasonalGraph" - Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeSeasonalGraph.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeSeasonalGraph.Text = "Seasonal Graph..." ' 'mnuClimaticDescribeIDF ' Me.mnuClimaticDescribeIDF.Name = "mnuClimaticDescribeIDF" - Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeIDF.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeIDF.Text = "IDF..." ' 'ToolStripSeparator17 ' Me.ToolStripSeparator17.Name = "ToolStripSeparator17" - Me.ToolStripSeparator17.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator17.Size = New System.Drawing.Size(318, 6) ' 'mnuClimaticDescribeWindRose ' Me.mnuClimaticDescribeWindRose.Name = "mnuClimaticDescribeWindRose" - Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindRose.Text = "Wind Rose..." ' 'mnuClimaticDescribeWindPollutionRose ' Me.mnuClimaticDescribeWindPollutionRose.Name = "mnuClimaticDescribeWindPollutionRose" - Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeWindPollutionRose.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuClimaticDescribeOtherRosePlots ' Me.mnuClimaticDescribeOtherRosePlots.Name = "mnuClimaticDescribeOtherRosePlots" - Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(211, 22) + Me.mnuClimaticDescribeOtherRosePlots.Size = New System.Drawing.Size(321, 34) Me.mnuClimaticDescribeOtherRosePlots.Text = "Other Rose Plots..." ' 'mnuClimaticNCMP ' Me.mnuClimaticNCMP.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticNCMPIndices, Me.mnuClimaticNCMPVariogram, Me.mnuClimaticNCMPRegionAverage, Me.mnuClimaticNCMPTrendGraphs, Me.mnuClimaticNCMPCountRecords, Me.mnuClimaticNCMPSummary}) Me.mnuClimaticNCMP.Name = "mnuClimaticNCMP" - Me.mnuClimaticNCMP.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticNCMP.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticNCMP.Text = "NCMP" ' 'mnuClimaticNCMPIndices ' Me.mnuClimaticNCMPIndices.Name = "mnuClimaticNCMPIndices" - Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPIndices.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPIndices.Text = "Indices..." ' 'mnuClimaticNCMPVariogram ' Me.mnuClimaticNCMPVariogram.Name = "mnuClimaticNCMPVariogram" - Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPVariogram.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPVariogram.Text = "Variogram..." ' 'mnuClimaticNCMPRegionAverage ' Me.mnuClimaticNCMPRegionAverage.Name = "mnuClimaticNCMPRegionAverage" - Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPRegionAverage.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPRegionAverage.Text = "Region Average..." ' 'mnuClimaticNCMPTrendGraphs ' Me.mnuClimaticNCMPTrendGraphs.Name = "mnuClimaticNCMPTrendGraphs" - Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPTrendGraphs.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPTrendGraphs.Text = "Trend Graphs..." ' 'mnuClimaticNCMPCountRecords ' Me.mnuClimaticNCMPCountRecords.Name = "mnuClimaticNCMPCountRecords" - Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPCountRecords.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPCountRecords.Text = "Count Records..." ' 'mnuClimaticNCMPSummary ' Me.mnuClimaticNCMPSummary.Name = "mnuClimaticNCMPSummary" - Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(166, 22) + Me.mnuClimaticNCMPSummary.Size = New System.Drawing.Size(251, 34) Me.mnuClimaticNCMPSummary.Text = "Summary..." ' 'mnuClimaticPICSA ' Me.mnuClimaticPICSA.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticPICSARainfallGraph, Me.mnuClimaticPICSATemperatureGraph, Me.mnuClimaticPICSAGeneralGrap, Me.ToolStripSeparator73, Me.mnuClimaticPICSACumExeedenceGraph, Me.mnuClimaticPICSACrops}) Me.mnuClimaticPICSA.Name = "mnuClimaticPICSA" - Me.mnuClimaticPICSA.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticPICSA.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticPICSA.Text = "PICSA" ' 'mnuClimaticPICSARainfallGraph ' Me.mnuClimaticPICSARainfallGraph.Name = "mnuClimaticPICSARainfallGraph" - Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSARainfallGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSARainfallGraph.Text = "Rainfall Graph..." ' 'mnuClimaticPICSATemperatureGraph ' Me.mnuClimaticPICSATemperatureGraph.Name = "mnuClimaticPICSATemperatureGraph" - Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSATemperatureGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSATemperatureGraph.Text = "Temperature Graph..." ' 'mnuClimaticPICSAGeneralGrap ' Me.mnuClimaticPICSAGeneralGrap.Name = "mnuClimaticPICSAGeneralGrap" - Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSAGeneralGrap.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSAGeneralGrap.Text = "General Graph..." ' 'ToolStripSeparator73 ' Me.ToolStripSeparator73.Name = "ToolStripSeparator73" - Me.ToolStripSeparator73.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator73.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticPICSACumExeedenceGraph ' Me.mnuClimaticPICSACumExeedenceGraph.Name = "mnuClimaticPICSACumExeedenceGraph" - Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACumExeedenceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACumExeedenceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticPICSACrops ' Me.mnuClimaticPICSACrops.Name = "mnuClimaticPICSACrops" - Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticPICSACrops.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticPICSACrops.Text = "Crops..." ' 'mnuCMSAF ' Me.mnuCMSAF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCMSAFPlotRegion, Me.mnuClimaticCMSAFExporttoCMSAFRToolbox}) Me.mnuCMSAF.Name = "mnuCMSAF" - Me.mnuCMSAF.Size = New System.Drawing.Size(212, 22) + Me.mnuCMSAF.Size = New System.Drawing.Size(325, 34) Me.mnuCMSAF.Text = "CM SAF" ' 'mnuClimaticCMSAFPlotRegion ' Me.mnuClimaticCMSAFPlotRegion.Name = "mnuClimaticCMSAFPlotRegion" - Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFPlotRegion.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFPlotRegion.Text = "Plot Region..." ' 'mnuClimaticCMSAFExporttoCMSAFRToolbox ' Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Name = "mnuClimaticCMSAFExporttoCMSAFRToolbox" - Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(231, 22) + Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Size = New System.Drawing.Size(351, 34) Me.mnuClimaticCMSAFExporttoCMSAFRToolbox.Text = "Export to CM SAF R Toolbox..." ' 'mnuClimaticCompare ' Me.mnuClimaticCompare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticCompareCalculation, Me.mnuClimaticCompareSummary, Me.ToolStripSeparator66, Me.mnuClimaticCompareCorrelations, Me.mnuClimaticCompareScatterplot, Me.mnuClimaticCompareTimeSeriesPlot, Me.mnuClimaticCompareSeasonalPlot, Me.mnuClimaticCompareDensityPlot, Me.mnuClimaticCompareConditionalQuantiles, Me.mnuClimaticCompareTaylorDiagram}) Me.mnuClimaticCompare.Name = "mnuClimaticCompare" - Me.mnuClimaticCompare.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticCompare.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticCompare.Text = "Compare" ' 'mnuClimaticCompareCalculation ' Me.mnuClimaticCompareCalculation.Name = "mnuClimaticCompareCalculation" - Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCalculation.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCalculation.Text = "Calculation..." ' 'mnuClimaticCompareSummary ' Me.mnuClimaticCompareSummary.Name = "mnuClimaticCompareSummary" - Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSummary.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSummary.Text = "Summary..." ' 'ToolStripSeparator66 ' Me.ToolStripSeparator66.Name = "ToolStripSeparator66" - Me.ToolStripSeparator66.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator66.Size = New System.Drawing.Size(293, 6) ' 'mnuClimaticCompareCorrelations ' Me.mnuClimaticCompareCorrelations.Name = "mnuClimaticCompareCorrelations" - Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareCorrelations.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareCorrelations.Text = "Correlations..." ' 'mnuClimaticCompareScatterplot ' Me.mnuClimaticCompareScatterplot.Name = "mnuClimaticCompareScatterplot" - Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareScatterplot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareScatterplot.Text = "Scatterplot..." ' 'mnuClimaticCompareTimeSeriesPlot ' Me.mnuClimaticCompareTimeSeriesPlot.Name = "mnuClimaticCompareTimeSeriesPlot" - Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTimeSeriesPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTimeSeriesPlot.Text = "Time Series Plot..." ' 'mnuClimaticCompareSeasonalPlot ' Me.mnuClimaticCompareSeasonalPlot.Name = "mnuClimaticCompareSeasonalPlot" - Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareSeasonalPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareSeasonalPlot.Text = "Seasonal Plot..." ' 'mnuClimaticCompareDensityPlot ' Me.mnuClimaticCompareDensityPlot.Name = "mnuClimaticCompareDensityPlot" - Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareDensityPlot.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareDensityPlot.Text = "Density Plot..." ' 'mnuClimaticCompareConditionalQuantiles ' Me.mnuClimaticCompareConditionalQuantiles.Name = "mnuClimaticCompareConditionalQuantiles" - Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareConditionalQuantiles.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareConditionalQuantiles.Text = "Conditional Quantiles..." ' 'mnuClimaticCompareTaylorDiagram ' Me.mnuClimaticCompareTaylorDiagram.Name = "mnuClimaticCompareTaylorDiagram" - Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(198, 22) + Me.mnuClimaticCompareTaylorDiagram.Size = New System.Drawing.Size(296, 34) Me.mnuClimaticCompareTaylorDiagram.Text = "Taylor Diagram..." ' 'mnuClimaticMapping ' Me.mnuClimaticMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticMappingMap, Me.mnuClimaticMappingCheckStationLocations}) Me.mnuClimaticMapping.Name = "mnuClimaticMapping" - Me.mnuClimaticMapping.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticMapping.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticMapping.Text = "Mapping" ' 'mnuClimaticMappingMap ' Me.mnuClimaticMappingMap.Name = "mnuClimaticMappingMap" - Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingMap.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingMap.Text = "Map..." ' 'mnuClimaticMappingCheckStationLocations ' Me.mnuClimaticMappingCheckStationLocations.Name = "mnuClimaticMappingCheckStationLocations" - Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(210, 22) + Me.mnuClimaticMappingCheckStationLocations.Size = New System.Drawing.Size(313, 34) Me.mnuClimaticMappingCheckStationLocations.Text = "Check Station Locations..." ' 'mnuClimaticModel ' Me.mnuClimaticModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticModelsExtremes, Me.mnuClimaticModelCircular, Me.mnuClimaticModelMarkovModelling}) Me.mnuClimaticModel.Name = "mnuClimaticModel" - Me.mnuClimaticModel.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticModel.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticModel.Text = "Model" ' 'mnuClimaticModelsExtremes ' Me.mnuClimaticModelsExtremes.Name = "mnuClimaticModelsExtremes" - Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelsExtremes.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelsExtremes.Text = "Extremes..." ' 'mnuClimaticModelCircular ' Me.mnuClimaticModelCircular.Enabled = False Me.mnuClimaticModelCircular.Name = "mnuClimaticModelCircular" - Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelCircular.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelCircular.Text = "Circular..." Me.mnuClimaticModelCircular.Visible = False ' 'mnuClimaticModelMarkovModelling ' Me.mnuClimaticModelMarkovModelling.Name = "mnuClimaticModelMarkovModelling" - Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(180, 22) + Me.mnuClimaticModelMarkovModelling.Size = New System.Drawing.Size(271, 34) Me.mnuClimaticModelMarkovModelling.Tag = "Markov_Modelling" Me.mnuClimaticModelMarkovModelling.Text = "Markov Modelling..." ' 'ToolStripSeparator23 ' Me.ToolStripSeparator23.Name = "ToolStripSeparator23" - Me.ToolStripSeparator23.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator23.Size = New System.Drawing.Size(322, 6) ' 'mnuClimaticSCF ' Me.mnuClimaticSCF.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticSCFSupportOpenSST, Me.mnuClimaticSCFSupportExporttoCPT, Me.ToolStripSeparator32, Me.mnuClimaticSCFSupportCorrelations, Me.mnuClimaticSCFSupportPrincipalComponents, Me.mnuClimaticSCFSupportCanonicalCorrelations, Me.mnuClimaticSCFSupportCumulativeExceedanceGraph}) Me.mnuClimaticSCF.Name = "mnuClimaticSCF" - Me.mnuClimaticSCF.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticSCF.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticSCF.Text = "Seasonal Forecast Support" ' 'mnuClimaticSCFSupportOpenSST ' Me.mnuClimaticSCFSupportOpenSST.Name = "mnuClimaticSCFSupportOpenSST" - Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportOpenSST.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportOpenSST.Text = "Open SST..." ' 'mnuClimaticSCFSupportExporttoCPT ' Me.mnuClimaticSCFSupportExporttoCPT.Name = "mnuClimaticSCFSupportExporttoCPT" - Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportExporttoCPT.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportExporttoCPT.Tag = "Export_to_CPT" Me.mnuClimaticSCFSupportExporttoCPT.Text = "Export to CPT..." ' 'ToolStripSeparator32 ' Me.ToolStripSeparator32.Name = "ToolStripSeparator32" - Me.ToolStripSeparator32.Size = New System.Drawing.Size(243, 6) + Me.ToolStripSeparator32.Size = New System.Drawing.Size(361, 6) ' 'mnuClimaticSCFSupportCorrelations ' Me.mnuClimaticSCFSupportCorrelations.Name = "mnuClimaticSCFSupportCorrelations" - Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCorrelations.Text = "Correlations..." ' 'mnuClimaticSCFSupportPrincipalComponents ' Me.mnuClimaticSCFSupportPrincipalComponents.Name = "mnuClimaticSCFSupportPrincipalComponents" - Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportPrincipalComponents.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportPrincipalComponents.Text = "Principal Components..." ' 'mnuClimaticSCFSupportCanonicalCorrelations ' Me.mnuClimaticSCFSupportCanonicalCorrelations.Name = "mnuClimaticSCFSupportCanonicalCorrelations" - Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCanonicalCorrelations.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCanonicalCorrelations.Text = "Canonical Correlations..." ' 'mnuClimaticSCFSupportCumulativeExceedanceGraph ' Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Name = "mnuClimaticSCFSupportCumulativeExceedanceGraph" - Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(246, 22) + Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Size = New System.Drawing.Size(364, 34) Me.mnuClimaticSCFSupportCumulativeExceedanceGraph.Text = "Cumulative/Exceedance Graph..." ' 'mnuClimaticClimateMethods ' Me.mnuClimaticClimateMethods.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulation, Me.mnuClimaticClimateMethodsGraphics, Me.mnuClimaticClimateMethodsModel, Me.mnuClimaticClimateMethodsAdditional, Me.mnuClimateMethodsCreateClimateObject}) Me.mnuClimaticClimateMethods.Name = "mnuClimaticClimateMethods" - Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(212, 22) + Me.mnuClimaticClimateMethods.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethods.Tag = "Climatic_Methods" Me.mnuClimaticClimateMethods.Text = "Climate Methods" Me.mnuClimaticClimateMethods.Visible = False @@ -2648,7 +2649,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulation.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsDataManipulationStartOfRain, Me.mnuClimaticClimateMethodsDataManipulationEndOfRain, Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth, Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular, Me.mnuClimaticClimateMethodsDataManipulationDayMonth, Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily, Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear, Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal, Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength, Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA, Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents, Me.mnuClimaticClimateMethodsDataManipulationMissingData, Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable, Me.mnuClimateMethodsDataManipulationMonthlySummaries, Me.mnuClimateMethodsDataManipulationOutputForCD}) Me.mnuClimaticClimateMethodsDataManipulation.Name = "mnuClimaticClimateMethodsDataManipulation" - Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsDataManipulation.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsDataManipulation.Tag = "Data_Manipulation" Me.mnuClimaticClimateMethodsDataManipulation.Text = "Data Manipulation" ' @@ -2656,7 +2657,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Name = "mnuClimaticClimateMethodsDataManipulationStartOfRain" - Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Tag = "Start_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationStartOfRain.Text = "Start of Rain..." ' @@ -2664,7 +2665,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Name = "mnuClimaticClimateMethodsDataManipulationEndOfRain" - Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Tag = "End_of_Rain" Me.mnuClimaticClimateMethodsDataManipulationEndOfRain.Text = "End of Rain..." ' @@ -2672,7 +2673,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Tag = "Change_Format_Month" Me.mnuClimaticClimateMethodsDataManipulationChangeFormatDayMonth.Text = "Change Format Day Month..." ' @@ -2680,7 +2681,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Name = "mnuClimaticClimateMethodsDataManipulationExportCPTToTabular" - Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Tag = "Expot_CPT_to_Tabular" Me.mnuClimaticClimateMethodsDataManipulationExportCPTToTabular.Text = "Export CPT to Tabular..." ' @@ -2688,7 +2689,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Name = "mnuClimaticClimateMethodsDataManipulationDayMonth" - Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Tag = "Day_Month" Me.mnuClimaticClimateMethodsDataManipulationDayMonth.Text = "Day Month..." ' @@ -2696,7 +2697,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDaily" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Tag = "Display_Daily" Me.mnuClimaticClimateMethodsDataManipulationDisplayDaily.Text = "Display Daily..." ' @@ -2704,7 +2705,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Name = "mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear" - Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Tag = "Display_DOY_of_Year" Me.mnuClimaticClimateMethodsDataManipulationDisplayDOYOfYear.Text = "Display DOY of Year..." ' @@ -2712,7 +2713,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Name = "mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal" - Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Tag = "Display_Rain_Running_Total" Me.mnuClimaticClimateMethodsDataManipulationDisplayRainRunningTotal.Text = "Display Rain Running Total..." ' @@ -2720,7 +2721,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Name = "mnuClimaticClimateMethodsDataManipulationDisplaySpellLength" - Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Tag = "Display_Spell_length" Me.mnuClimaticClimateMethodsDataManipulationDisplaySpellLength.Text = "Display Spell Length..." ' @@ -2728,7 +2729,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Name = "mnuClimaticClimateMethodsDataManipulationExportForPICSA" - Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Tag = "Export_for_PICSA" Me.mnuClimaticClimateMethodsDataManipulationExportForPICSA.Text = "Export for PICSA..." ' @@ -2736,7 +2737,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Name = "mnuClimaticClimateMethodsDataManipulationExtremeEvents" - Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Tag = "Extreme_Events" Me.mnuClimaticClimateMethodsDataManipulationExtremeEvents.Text = "Extreme Events..." ' @@ -2744,7 +2745,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingData.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingData.Name = "mnuClimaticClimateMethodsDataManipulationMissingData" - Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingData.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingData.Tag = "Missing_Data" Me.mnuClimaticClimateMethodsDataManipulationMissingData.Text = "Missing Data..." ' @@ -2752,7 +2753,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Enabled = False Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Name = "mnuClimaticClimateMethodsDataManipulationMissingDataTable" - Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(227, 22) + Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Size = New System.Drawing.Size(342, 34) Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Tag = "Missing_Data_Table" Me.mnuClimaticClimateMethodsDataManipulationMissingDataTable.Text = "Missing Data Table..." ' @@ -2760,7 +2761,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationMonthlySummaries.Enabled = False Me.mnuClimateMethodsDataManipulationMonthlySummaries.Name = "mnuClimateMethodsDataManipulationMonthlySummaries" - Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationMonthlySummaries.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationMonthlySummaries.Tag = "Monthly_Summaries" Me.mnuClimateMethodsDataManipulationMonthlySummaries.Text = "Monthly Summaries..." ' @@ -2768,7 +2769,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsDataManipulationOutputForCD.Enabled = False Me.mnuClimateMethodsDataManipulationOutputForCD.Name = "mnuClimateMethodsDataManipulationOutputForCD" - Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(227, 22) + Me.mnuClimateMethodsDataManipulationOutputForCD.Size = New System.Drawing.Size(342, 34) Me.mnuClimateMethodsDataManipulationOutputForCD.Tag = "Output_for_CDT" Me.mnuClimateMethodsDataManipulationOutputForCD.Text = "Output for CDT..." ' @@ -2776,7 +2777,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphics.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot, Me.mnuClimaticClimateMethodsGraphicsCliplot, Me.mnuClimaticClimateMethodsGraphicsMissingValues, Me.mnuClimaticClimateMethodsGraphicsHistogram, Me.mnuClimaticClimateMethodsGraphicsCumExceedance, Me.mnuClimaticClimateMethodsGraphicsBoxplot, Me.mnuClimaticClimateMethodsGraphicsInventory, Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall, Me.mnuClimaticClimateMethodsGraphicsRainCount, Me.mnuClimaticClimateMethodsGraphicsTimeseries, Me.mnuClimaticClimateMethodsGraphicsWindrose, Me.mnuClimateMethodsGraphicsMultipleLines, Me.mnuClmateMethodThreeSummaries}) Me.mnuClimaticClimateMethodsGraphics.Name = "mnuClimaticClimateMethodsGraphics" - Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsGraphics.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsGraphics.Tag = "Graphics" Me.mnuClimaticClimateMethodsGraphics.Text = "Graphics" ' @@ -2784,7 +2785,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Name = "mnuClimaticClimateMethodsGraphicsClipBoxPlot" - Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Tag = "Cliboxplot" Me.mnuClimaticClimateMethodsGraphicsClipBoxPlot.Text = "Cliboxplot..." ' @@ -2792,7 +2793,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCliplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCliplot.Name = "mnuClimaticClimateMethodsGraphicsCliplot" - Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCliplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCliplot.Tag = "Cliplot" Me.mnuClimaticClimateMethodsGraphicsCliplot.Text = "Cliplot..." ' @@ -2800,7 +2801,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsMissingValues.Enabled = False Me.mnuClimaticClimateMethodsGraphicsMissingValues.Name = "mnuClimaticClimateMethodsGraphicsMissingValues" - Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsMissingValues.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsMissingValues.Tag = "Missing_values" Me.mnuClimaticClimateMethodsGraphicsMissingValues.Text = "Missing Values..." ' @@ -2808,7 +2809,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsHistogram.Enabled = False Me.mnuClimaticClimateMethodsGraphicsHistogram.Name = "mnuClimaticClimateMethodsGraphicsHistogram" - Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsHistogram.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsHistogram.Tag = "Histogram" Me.mnuClimaticClimateMethodsGraphicsHistogram.Text = "Histogram..." ' @@ -2816,7 +2817,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Enabled = False Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Name = "mnuClimaticClimateMethodsGraphicsCumExceedance" - Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Tag = "Cumulative_Exceedence" Me.mnuClimaticClimateMethodsGraphicsCumExceedance.Text = "Cummulative Exceedance..." ' @@ -2824,7 +2825,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsBoxplot.Enabled = False Me.mnuClimaticClimateMethodsGraphicsBoxplot.Name = "mnuClimaticClimateMethodsGraphicsBoxplot" - Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsBoxplot.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsBoxplot.Tag = "Boxplot" Me.mnuClimaticClimateMethodsGraphicsBoxplot.Text = "Boxplot..." ' @@ -2832,7 +2833,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsInventory.Enabled = False Me.mnuClimaticClimateMethodsGraphicsInventory.Name = "mnuClimaticClimateMethodsGraphicsInventory" - Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsInventory.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsInventory.Tag = "Inventory" Me.mnuClimaticClimateMethodsGraphicsInventory.Text = "Inventory..." ' @@ -2840,7 +2841,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Enabled = False Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Name = "mnuClimaticClimateMethodsGraphicsAnnualRainfall" - Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Tag = "Annual_rainfall" Me.mnuClimaticClimateMethodsGraphicsAnnualRainfall.Text = "Annual Rainfall..." ' @@ -2848,7 +2849,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsRainCount.Enabled = False Me.mnuClimaticClimateMethodsGraphicsRainCount.Name = "mnuClimaticClimateMethodsGraphicsRainCount" - Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsRainCount.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsRainCount.Tag = "Rain_count" Me.mnuClimaticClimateMethodsGraphicsRainCount.Text = "Rain Count..." ' @@ -2856,7 +2857,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsTimeseries.Enabled = False Me.mnuClimaticClimateMethodsGraphicsTimeseries.Name = "mnuClimaticClimateMethodsGraphicsTimeseries" - Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsTimeseries.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsTimeseries.Tag = "Timeseries" Me.mnuClimaticClimateMethodsGraphicsTimeseries.Text = "Timeseries..." ' @@ -2864,7 +2865,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsGraphicsWindrose.Enabled = False Me.mnuClimaticClimateMethodsGraphicsWindrose.Name = "mnuClimaticClimateMethodsGraphicsWindrose" - Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(220, 22) + Me.mnuClimaticClimateMethodsGraphicsWindrose.Size = New System.Drawing.Size(325, 34) Me.mnuClimaticClimateMethodsGraphicsWindrose.Tag = "Windrose" Me.mnuClimaticClimateMethodsGraphicsWindrose.Text = "Windrose..." ' @@ -2872,7 +2873,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsGraphicsMultipleLines.Enabled = False Me.mnuClimateMethodsGraphicsMultipleLines.Name = "mnuClimateMethodsGraphicsMultipleLines" - Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(220, 22) + Me.mnuClimateMethodsGraphicsMultipleLines.Size = New System.Drawing.Size(325, 34) Me.mnuClimateMethodsGraphicsMultipleLines.Tag = "Multiple_lines" Me.mnuClimateMethodsGraphicsMultipleLines.Text = "Multple Lines..." ' @@ -2880,7 +2881,7 @@ Partial Class frmMain ' Me.mnuClmateMethodThreeSummaries.Enabled = False Me.mnuClmateMethodThreeSummaries.Name = "mnuClmateMethodThreeSummaries" - Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(220, 22) + Me.mnuClmateMethodThreeSummaries.Size = New System.Drawing.Size(325, 34) Me.mnuClmateMethodThreeSummaries.Tag = "Three_Summaries" Me.mnuClmateMethodThreeSummaries.Text = "Three Summaries..." ' @@ -2888,7 +2889,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsModel.Enabled = False Me.mnuClimaticClimateMethodsModel.Name = "mnuClimaticClimateMethodsModel" - Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsModel.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsModel.Tag = "Model" Me.mnuClimaticClimateMethodsModel.Text = "Model..." ' @@ -2896,7 +2897,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditional.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuClimaticClimateMethodsAdditionalOutputForCPT, Me.mnuClimaticClimateMethodsAdditionalRainsStatistics, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary, Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain, Me.mnuClimaticClimateMethodsAdditionalWaterBalance}) Me.mnuClimaticClimateMethodsAdditional.Name = "mnuClimaticClimateMethodsAdditional" - Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(199, 22) + Me.mnuClimaticClimateMethodsAdditional.Size = New System.Drawing.Size(297, 34) Me.mnuClimaticClimateMethodsAdditional.Tag = "Additional" Me.mnuClimaticClimateMethodsAdditional.Text = "Additional" ' @@ -2904,7 +2905,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Enabled = False Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Name = "mnuClimaticClimateMethodsAdditionalOutputForCPT" - Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Tag = "Output_for_CPT" Me.mnuClimaticClimateMethodsAdditionalOutputForCPT.Text = "Output for CPT..." ' @@ -2912,7 +2913,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Enabled = False Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Name = "mnuClimaticClimateMethodsAdditionalRainsStatistics" - Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Tag = "Rain_Statistics" Me.mnuClimaticClimateMethodsAdditionalRainsStatistics.Text = "Rains Statistics..." ' @@ -2920,7 +2921,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummary" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Tag = "Seasonal_Summary" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummary.Text = "Seasonal Summary..." ' @@ -2928,7 +2929,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Enabled = False Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Name = "mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain" - Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Tag = "Seasonal_Summary_Rain" Me.mnuClimaticClimateMethodsAdditionalSeasonalSummaryRain.Text = "Seasonal Summary Rain..." ' @@ -2936,7 +2937,7 @@ Partial Class frmMain ' Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Enabled = False Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Name = "mnuClimaticClimateMethodsAdditionalWaterBalance" - Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(209, 22) + Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Size = New System.Drawing.Size(316, 34) Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Tag = "Water_Balance" Me.mnuClimaticClimateMethodsAdditionalWaterBalance.Text = "Water Balance..." ' @@ -2944,7 +2945,7 @@ Partial Class frmMain ' Me.mnuClimateMethodsCreateClimateObject.Enabled = False Me.mnuClimateMethodsCreateClimateObject.Name = "mnuClimateMethodsCreateClimateObject" - Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(199, 22) + Me.mnuClimateMethodsCreateClimateObject.Size = New System.Drawing.Size(297, 34) Me.mnuClimateMethodsCreateClimateObject.Tag = "Create_Climate_Object" Me.mnuClimateMethodsCreateClimateObject.Text = "Create Climate Object..." ' @@ -2952,7 +2953,7 @@ Partial Class frmMain ' Me.mnuFileSave.Name = "mnuFileSave" Me.mnuFileSave.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.S), System.Windows.Forms.Keys) - Me.mnuFileSave.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSave.Size = New System.Drawing.Size(365, 34) Me.mnuFileSave.Tag = "Save" Me.mnuFileSave.Text = "Save..." ' @@ -2960,32 +2961,32 @@ Partial Class frmMain ' Me.mnuFileSaveAs.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileSaveAsDataAs, Me.mnuFileSaveAsOutputAs, Me.mnuFileSaveAsLogAs, Me.mnuFileSaveAsScriptAs}) Me.mnuFileSaveAs.Name = "mnuFileSaveAs" - Me.mnuFileSaveAs.Size = New System.Drawing.Size(241, 22) + Me.mnuFileSaveAs.Size = New System.Drawing.Size(365, 34) Me.mnuFileSaveAs.Tag = "Save_As" Me.mnuFileSaveAs.Text = "Save As" ' 'mnuFileSaveAsDataAs ' Me.mnuFileSaveAsDataAs.Name = "mnuFileSaveAsDataAs" - Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsDataAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsDataAs.Text = "Save Data As..." ' 'mnuFileSaveAsOutputAs ' Me.mnuFileSaveAsOutputAs.Name = "mnuFileSaveAsOutputAs" - Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsOutputAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsOutputAs.Text = "Save Output As..." ' 'mnuFileSaveAsLogAs ' Me.mnuFileSaveAsLogAs.Name = "mnuFileSaveAsLogAs" - Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsLogAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsLogAs.Text = "Save Log As..." ' 'mnuFileSaveAsScriptAs ' Me.mnuFileSaveAsScriptAs.Name = "mnuFileSaveAsScriptAs" - Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(164, 22) + Me.mnuFileSaveAsScriptAs.Size = New System.Drawing.Size(250, 34) Me.mnuFileSaveAsScriptAs.Text = "Save Script As..." ' 'mnuFilePrint @@ -2993,7 +2994,7 @@ Partial Class frmMain Me.mnuFilePrint.Enabled = False Me.mnuFilePrint.Name = "mnuFilePrint" Me.mnuFilePrint.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.P), System.Windows.Forms.Keys) - Me.mnuFilePrint.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrint.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrint.Tag = "Print" Me.mnuFilePrint.Text = "Print..." Me.mnuFilePrint.Visible = False @@ -3002,7 +3003,7 @@ Partial Class frmMain ' Me.mnuFilePrintPreview.Enabled = False Me.mnuFilePrintPreview.Name = "mnuFilePrintPreview" - Me.mnuFilePrintPreview.Size = New System.Drawing.Size(241, 22) + Me.mnuFilePrintPreview.Size = New System.Drawing.Size(365, 34) Me.mnuFilePrintPreview.Tag = "Print_Preview" Me.mnuFilePrintPreview.Text = "Print Preview..." Me.mnuFilePrintPreview.Visible = False @@ -3010,28 +3011,36 @@ Partial Class frmMain 'tlSeparatorFile3 ' Me.tlSeparatorFile3.Name = "tlSeparatorFile3" - Me.tlSeparatorFile3.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile3.Size = New System.Drawing.Size(362, 6) ' 'mnuFIleExit ' Me.mnuFIleExit.Name = "mnuFIleExit" - Me.mnuFIleExit.Size = New System.Drawing.Size(241, 22) + Me.mnuFIleExit.Size = New System.Drawing.Size(365, 34) Me.mnuFIleExit.Tag = "Exit" Me.mnuFIleExit.Text = "Exit" ' 'mnuEdit ' - Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) + Me.mnuEdit.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuUndo, Me.mnuEditFind, Me.mnuEditCopy, Me.mnuEditPaste, Me.mnuEditPasteNew, Me.mnuEditWordwrap, Me.mnuEditSelectAll}) Me.mnuEdit.Name = "mnuEdit" - Me.mnuEdit.Size = New System.Drawing.Size(39, 22) + Me.mnuEdit.Size = New System.Drawing.Size(58, 29) Me.mnuEdit.Tag = "Edit" Me.mnuEdit.Text = "Edit" ' + 'mnuUndo + ' + Me.mnuUndo.Name = "mnuUndo" + Me.mnuUndo.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _ + Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) + Me.mnuUndo.Size = New System.Drawing.Size(270, 34) + Me.mnuUndo.Text = "Undo" + ' 'mnuEditFind ' Me.mnuEditFind.Name = "mnuEditFind" Me.mnuEditFind.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.F), System.Windows.Forms.Keys) - Me.mnuEditFind.Size = New System.Drawing.Size(167, 22) + Me.mnuEditFind.Size = New System.Drawing.Size(270, 34) Me.mnuEditFind.Tag = "Find" Me.mnuEditFind.Text = "Find" ' @@ -3039,7 +3048,7 @@ Partial Class frmMain ' Me.mnuEditCopy.Name = "mnuEditCopy" Me.mnuEditCopy.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.C), System.Windows.Forms.Keys) - Me.mnuEditCopy.Size = New System.Drawing.Size(167, 22) + Me.mnuEditCopy.Size = New System.Drawing.Size(270, 34) Me.mnuEditCopy.Tag = "Copy" Me.mnuEditCopy.Text = "Copy" ' @@ -3047,27 +3056,27 @@ Partial Class frmMain ' Me.mnuEditPaste.Name = "mnuEditPaste" Me.mnuEditPaste.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.V), System.Windows.Forms.Keys) - Me.mnuEditPaste.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPaste.Size = New System.Drawing.Size(270, 34) Me.mnuEditPaste.Tag = "Paste" Me.mnuEditPaste.Text = "Paste" ' 'mnuEditPasteNew ' Me.mnuEditPasteNew.Name = "mnuEditPasteNew" - Me.mnuEditPasteNew.Size = New System.Drawing.Size(167, 22) + Me.mnuEditPasteNew.Size = New System.Drawing.Size(270, 34) Me.mnuEditPasteNew.Text = "Paste New" ' 'mnuEditWordwrap ' Me.mnuEditWordwrap.Name = "mnuEditWordwrap" - Me.mnuEditWordwrap.Size = New System.Drawing.Size(167, 22) + Me.mnuEditWordwrap.Size = New System.Drawing.Size(270, 34) Me.mnuEditWordwrap.Text = "Wordwrap" ' 'mnuEditSelectAll ' Me.mnuEditSelectAll.Name = "mnuEditSelectAll" Me.mnuEditSelectAll.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.A), System.Windows.Forms.Keys) - Me.mnuEditSelectAll.Size = New System.Drawing.Size(167, 22) + Me.mnuEditSelectAll.Size = New System.Drawing.Size(270, 34) Me.mnuEditSelectAll.Tag = "Select_All" Me.mnuEditSelectAll.Text = "Select All " ' @@ -3075,17 +3084,18 @@ Partial Class frmMain ' Me.stsStrip.ImageScalingSize = New System.Drawing.Size(24, 24) Me.stsStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tstatus}) - Me.stsStrip.Location = New System.Drawing.Point(0, 460) + Me.stsStrip.Location = New System.Drawing.Point(0, 691) Me.stsStrip.Name = "stsStrip" + Me.stsStrip.Padding = New System.Windows.Forms.Padding(2, 0, 21, 0) Me.stsStrip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional - Me.stsStrip.Size = New System.Drawing.Size(834, 22) + Me.stsStrip.Size = New System.Drawing.Size(1251, 32) Me.stsStrip.TabIndex = 8 Me.stsStrip.Text = "Status" ' 'tstatus ' Me.tstatus.Name = "tstatus" - Me.tstatus.Size = New System.Drawing.Size(119, 17) + Me.tstatus.Size = New System.Drawing.Size(182, 25) Me.tstatus.Text = "No worksheet loaded" ' 'Tool_strip @@ -3094,12 +3104,12 @@ Partial Class frmMain Me.Tool_strip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.Tool_strip.ImageScalingSize = New System.Drawing.Size(30, 30) Me.Tool_strip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuTbOpen, Me.mnuTbOpenFromLibrary, Me.mnuTbSave, Me.toolStripSeparator, Me.mnuTbLast10Dialogs, Me.separator2, Me.mnuTbDataView, Me.mnuTbOutput, Me.ToolStripSeparator74, Me.mnuLastGraph, Me.ToolStripSeparator75, Me.mnuTbLogScript, Me.mnuMetadata, Me.ToolStripSeparator76, Me.mnuTbResetLayout, Me.separator3, Me.mnuTbHelp, Me.ToolStripSeparator77, Me.mnuTbLan, Me.separator1}) - Me.Tool_strip.Location = New System.Drawing.Point(0, 24) + Me.Tool_strip.Location = New System.Drawing.Point(0, 33) Me.Tool_strip.Name = "Tool_strip" - Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 2, 0) + Me.Tool_strip.Padding = New System.Windows.Forms.Padding(0, 0, 3, 0) Me.Tool_strip.RenderMode = System.Windows.Forms.ToolStripRenderMode.Professional Me.Tool_strip.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.Tool_strip.Size = New System.Drawing.Size(834, 37) + Me.Tool_strip.Size = New System.Drawing.Size(1251, 39) Me.Tool_strip.TabIndex = 7 Me.Tool_strip.Text = "Tool" ' @@ -3111,7 +3121,7 @@ Partial Class frmMain Me.mnuTbOpen.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpen.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpen.Name = "mnuTbOpen" - Me.mnuTbOpen.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOpen.Size = New System.Drawing.Size(53, 36) Me.mnuTbOpen.Text = "&Open" Me.mnuTbOpen.ToolTipText = "Import" ' @@ -3122,7 +3132,7 @@ Partial Class frmMain Me.mnuTbOpenFromLibrary.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOpenFromLibrary.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOpenFromLibrary.Name = "mnuTbOpenFromLibrary" - Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 34) + Me.mnuTbOpenFromLibrary.Size = New System.Drawing.Size(34, 36) Me.mnuTbOpenFromLibrary.ToolTipText = "Import From Library" ' 'mnuTbSave @@ -3134,40 +3144,40 @@ Partial Class frmMain Me.mnuTbSave.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbSave.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbSave.Name = "mnuTbSave" - Me.mnuTbSave.Size = New System.Drawing.Size(53, 34) + Me.mnuTbSave.Size = New System.Drawing.Size(53, 36) Me.mnuTbSave.Text = "&Save" ' 'mnuSaveData ' Me.mnuSaveData.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveData.Name = "mnuSaveData" - Me.mnuSaveData.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveData.Size = New System.Drawing.Size(213, 34) Me.mnuSaveData.Text = "Save Data" ' 'mnuSaveOutput ' Me.mnuSaveOutput.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveOutput.Name = "mnuSaveOutput" - Me.mnuSaveOutput.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveOutput.Size = New System.Drawing.Size(213, 34) Me.mnuSaveOutput.Text = "Save Output" ' 'mnuSaveScript ' Me.mnuSaveScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSaveScript.Name = "mnuSaveScript" - Me.mnuSaveScript.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveScript.Size = New System.Drawing.Size(213, 34) Me.mnuSaveScript.Text = "Save Script" ' 'mnuSaveLog ' Me.mnuSaveLog.Name = "mnuSaveLog" - Me.mnuSaveLog.Size = New System.Drawing.Size(139, 22) + Me.mnuSaveLog.Size = New System.Drawing.Size(213, 34) Me.mnuSaveLog.Text = "Save Log" ' 'toolStripSeparator ' Me.toolStripSeparator.Name = "toolStripSeparator" - Me.toolStripSeparator.Size = New System.Drawing.Size(6, 37) + Me.toolStripSeparator.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLast10Dialogs ' @@ -3183,7 +3193,7 @@ Partial Class frmMain 'separator2 ' Me.separator2.Name = "separator2" - Me.separator2.Size = New System.Drawing.Size(6, 37) + Me.separator2.Size = New System.Drawing.Size(6, 39) ' 'mnuTbDataView ' @@ -3193,7 +3203,7 @@ Partial Class frmMain Me.mnuTbDataView.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbDataView.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbDataView.Name = "mnuTbDataView" - Me.mnuTbDataView.Size = New System.Drawing.Size(34, 34) + Me.mnuTbDataView.Size = New System.Drawing.Size(34, 36) Me.mnuTbDataView.ToolTipText = "Toggle Data view open and closed" ' 'mnuTbOutput @@ -3205,34 +3215,34 @@ Partial Class frmMain Me.mnuTbOutput.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbOutput.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbOutput.Name = "mnuTbOutput" - Me.mnuTbOutput.Size = New System.Drawing.Size(53, 34) + Me.mnuTbOutput.Size = New System.Drawing.Size(53, 36) Me.mnuTbOutput.ToolTipText = "Toggle Output window open and closed" ' 'mnuOutputWindow ' Me.mnuOutputWindow.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuOutputWindow.Name = "mnuOutputWindow" - Me.mnuOutputWindow.Size = New System.Drawing.Size(178, 22) + Me.mnuOutputWindow.Size = New System.Drawing.Size(271, 34) Me.mnuOutputWindow.Text = "Show Output" ' 'mnuShowRCommand ' Me.mnuShowRCommand.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuShowRCommand.Name = "mnuShowRCommand" - Me.mnuShowRCommand.Size = New System.Drawing.Size(178, 22) + Me.mnuShowRCommand.Size = New System.Drawing.Size(271, 34) Me.mnuShowRCommand.Text = "Show R Commands" ' 'mnuIncludeComments ' Me.mnuIncludeComments.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuIncludeComments.Name = "mnuIncludeComments" - Me.mnuIncludeComments.Size = New System.Drawing.Size(178, 22) + Me.mnuIncludeComments.Size = New System.Drawing.Size(271, 34) Me.mnuIncludeComments.Text = "Show Comments" ' 'ToolStripSeparator74 ' Me.ToolStripSeparator74.Name = "ToolStripSeparator74" - Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator74.Size = New System.Drawing.Size(6, 39) ' 'mnuLastGraph ' @@ -3249,25 +3259,25 @@ Partial Class frmMain 'mnuNormalViewer ' Me.mnuNormalViewer.Name = "mnuNormalViewer" - Me.mnuNormalViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuNormalViewer.Size = New System.Drawing.Size(194, 34) Me.mnuNormalViewer.Text = "Viewer..." ' 'mnuploty ' Me.mnuploty.Name = "mnuploty" - Me.mnuploty.Size = New System.Drawing.Size(128, 22) + Me.mnuploty.Size = New System.Drawing.Size(194, 34) Me.mnuploty.Text = "Plotly..." ' 'mnuRViewer ' Me.mnuRViewer.Name = "mnuRViewer" - Me.mnuRViewer.Size = New System.Drawing.Size(128, 22) + Me.mnuRViewer.Size = New System.Drawing.Size(194, 34) Me.mnuRViewer.Text = "R Viewer..." ' 'ToolStripSeparator75 ' Me.ToolStripSeparator75.Name = "ToolStripSeparator75" - Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator75.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLogScript ' @@ -3285,14 +3295,14 @@ Partial Class frmMain ' Me.mnuLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuLogScript.Name = "mnuLogScript" - Me.mnuLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuLogScript.Text = "Log/Script" ' 'mnuSwapDataLogScript ' Me.mnuSwapDataLogScript.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataLogScript.Name = "mnuSwapDataLogScript" - Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(210, 22) + Me.mnuSwapDataLogScript.Size = New System.Drawing.Size(321, 34) Me.mnuSwapDataLogScript.Text = "Swap Data and Log/Script" ' 'mnuMetadata @@ -3311,27 +3321,27 @@ Partial Class frmMain ' Me.mnuColumnMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuColumnMetadat.Name = "mnuColumnMetadat" - Me.mnuColumnMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuColumnMetadat.Text = " Column Metadata..." ' 'mnuDataFrameMetadat ' Me.mnuDataFrameMetadat.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuDataFrameMetadat.Name = "mnuDataFrameMetadat" - Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(214, 22) + Me.mnuDataFrameMetadat.Size = New System.Drawing.Size(326, 34) Me.mnuDataFrameMetadat.Text = " Data Frame Metadata..." ' 'mnuSwapDataMetadata ' Me.mnuSwapDataMetadata.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None Me.mnuSwapDataMetadata.Name = "mnuSwapDataMetadata" - Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(214, 22) + Me.mnuSwapDataMetadata.Size = New System.Drawing.Size(326, 34) Me.mnuSwapDataMetadata.Text = "Swap Data and Metadata..." ' 'ToolStripSeparator76 ' Me.ToolStripSeparator76.Name = "ToolStripSeparator76" - Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator76.Size = New System.Drawing.Size(6, 39) ' 'mnuTbResetLayout ' @@ -3340,13 +3350,13 @@ Partial Class frmMain Me.mnuTbResetLayout.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbResetLayout.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbResetLayout.Name = "mnuTbResetLayout" - Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 34) + Me.mnuTbResetLayout.Size = New System.Drawing.Size(34, 36) Me.mnuTbResetLayout.ToolTipText = "Reset to Default Layout" ' 'separator3 ' Me.separator3.Name = "separator3" - Me.separator3.Size = New System.Drawing.Size(6, 37) + Me.separator3.Size = New System.Drawing.Size(6, 39) ' 'mnuTbHelp ' @@ -3355,13 +3365,13 @@ Partial Class frmMain Me.mnuTbHelp.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbHelp.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbHelp.Name = "mnuTbHelp" - Me.mnuTbHelp.Size = New System.Drawing.Size(34, 34) + Me.mnuTbHelp.Size = New System.Drawing.Size(34, 36) Me.mnuTbHelp.Text = "He&lp" ' 'ToolStripSeparator77 ' Me.ToolStripSeparator77.Name = "ToolStripSeparator77" - Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 37) + Me.ToolStripSeparator77.Size = New System.Drawing.Size(6, 39) ' 'mnuTbLan ' @@ -3370,28 +3380,28 @@ Partial Class frmMain Me.mnuTbLan.ImageTransparentColor = System.Drawing.Color.Magenta Me.mnuTbLan.Margin = New System.Windows.Forms.Padding(2, 1, 2, 2) Me.mnuTbLan.Name = "mnuTbLan" - Me.mnuTbLan.Size = New System.Drawing.Size(34, 34) + Me.mnuTbLan.Size = New System.Drawing.Size(34, 36) Me.mnuTbLan.ToolTipText = "Changes the menu language to English, and from English" ' 'separator1 ' Me.separator1.Name = "separator1" - Me.separator1.Size = New System.Drawing.Size(6, 37) + Me.separator1.Size = New System.Drawing.Size(6, 39) ' 'mnuBar ' Me.mnuBar.AllowMerge = False Me.mnuBar.BackColor = System.Drawing.SystemColors.ControlLightLight + Me.mnuBar.GripMargin = New System.Windows.Forms.Padding(2, 2, 0, 2) Me.mnuBar.ImageScalingSize = New System.Drawing.Size(24, 24) Me.mnuBar.ImeMode = System.Windows.Forms.ImeMode.[On] Me.mnuBar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFile, Me.mnuEdit, Me.mnuPrepare, Me.mnuDescribe, Me.mnuModel, Me.mnuStructured, Me.mnuClimatic, Me.mnuProcurement, Me.mnuOptionsByContext, Me.mnuTools, Me.mnuView, Me.mnuHelp}) Me.mnuBar.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow Me.mnuBar.Location = New System.Drawing.Point(0, 0) Me.mnuBar.Name = "mnuBar" - Me.mnuBar.Padding = New System.Windows.Forms.Padding(4, 1, 0, 1) Me.mnuBar.RenderMode = System.Windows.Forms.ToolStripRenderMode.System Me.mnuBar.ShowItemToolTips = True - Me.mnuBar.Size = New System.Drawing.Size(834, 24) + Me.mnuBar.Size = New System.Drawing.Size(1251, 33) Me.mnuBar.TabIndex = 6 Me.mnuBar.Text = "Menu_strip" ' @@ -3399,7 +3409,7 @@ Partial Class frmMain ' Me.mnuFile.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileNewDataFrame, Me.mnuFileImportFromFile, Me.mnuFileImportFromLibrary, Me.ToolStripSeparator35, Me.mnuFileImportFromODK, Me.mnuFileImportFromCSPRO, Me.mnuFileImportFromDatabases, Me.mnuFileImportFromPostgres, Me.mnuFileImportFromRapidPro, Me.mnuFileImportandTidyNetCDFFile, Me.mnuImportFromOpenAppBuilder, Me.mnuFileConvert, Me.tlSeparatorFile, Me.mnuFileSave, Me.mnuFileSaveAs, Me.mnuFileExport, Me.mnuFilePrint, Me.mnuFilePrintPreview, Me.tlSeparatorFile3, Me.mnuFileCloseData, Me.ToolStripSeparator8, Me.mnuFIleExit}) Me.mnuFile.Name = "mnuFile" - Me.mnuFile.Size = New System.Drawing.Size(37, 22) + Me.mnuFile.Size = New System.Drawing.Size(54, 29) Me.mnuFile.Tag = "File" Me.mnuFile.Text = "File" ' @@ -3407,7 +3417,7 @@ Partial Class frmMain ' Me.mnuFileNewDataFrame.Name = "mnuFileNewDataFrame" Me.mnuFileNewDataFrame.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.N), System.Windows.Forms.Keys) - Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(241, 22) + Me.mnuFileNewDataFrame.Size = New System.Drawing.Size(365, 34) Me.mnuFileNewDataFrame.Tag = "New_Data_Frame" Me.mnuFileNewDataFrame.Text = "New Data Frame..." ' @@ -3415,33 +3425,33 @@ Partial Class frmMain ' Me.mnuFileImportFromFile.Name = "mnuFileImportFromFile" Me.mnuFileImportFromFile.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.O), System.Windows.Forms.Keys) - Me.mnuFileImportFromFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromFile.Tag = "Import_From_File" Me.mnuFileImportFromFile.Text = "Import From File..." ' 'mnuFileImportFromLibrary ' Me.mnuFileImportFromLibrary.Name = "mnuFileImportFromLibrary" - Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromLibrary.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromLibrary.Tag = "Open_From_Library" Me.mnuFileImportFromLibrary.Text = "Import From Library..." ' 'ToolStripSeparator35 ' Me.ToolStripSeparator35.Name = "ToolStripSeparator35" - Me.ToolStripSeparator35.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator35.Size = New System.Drawing.Size(362, 6) ' 'mnuFileImportFromODK ' Me.mnuFileImportFromODK.Name = "mnuFileImportFromODK" - Me.mnuFileImportFromODK.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromODK.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromODK.Text = "Import From ODK..." ' 'mnuFileImportFromCSPRO ' Me.mnuFileImportFromCSPRO.Enabled = False Me.mnuFileImportFromCSPRO.Name = "mnuFileImportFromCSPRO" - Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromCSPRO.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromCSPRO.Text = "Import From CSPRO..." Me.mnuFileImportFromCSPRO.Visible = False ' @@ -3449,7 +3459,7 @@ Partial Class frmMain ' Me.mnuFileImportFromDatabases.Enabled = False Me.mnuFileImportFromDatabases.Name = "mnuFileImportFromDatabases" - Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromDatabases.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromDatabases.Text = "Import From Databases..." Me.mnuFileImportFromDatabases.Visible = False ' @@ -3457,88 +3467,88 @@ Partial Class frmMain ' Me.mnuFileImportFromPostgres.Enabled = False Me.mnuFileImportFromPostgres.Name = "mnuFileImportFromPostgres" - Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromPostgres.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromPostgres.Text = "Import From Postgres" Me.mnuFileImportFromPostgres.Visible = False ' 'mnuFileImportFromRapidPro ' Me.mnuFileImportFromRapidPro.Name = "mnuFileImportFromRapidPro" - Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportFromRapidPro.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportFromRapidPro.Text = "Import From RapidPro" ' 'mnuFileImportandTidyNetCDFFile ' Me.mnuFileImportandTidyNetCDFFile.Name = "mnuFileImportandTidyNetCDFFile" - Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(241, 22) + Me.mnuFileImportandTidyNetCDFFile.Size = New System.Drawing.Size(365, 34) Me.mnuFileImportandTidyNetCDFFile.Text = "Import and Tidy NetCDF File..." ' 'mnuImportFromOpenAppBuilder ' Me.mnuImportFromOpenAppBuilder.Name = "mnuImportFromOpenAppBuilder" - Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(241, 22) + Me.mnuImportFromOpenAppBuilder.Size = New System.Drawing.Size(365, 34) Me.mnuImportFromOpenAppBuilder.Text = "Import From OpenAppBuilder..." ' 'mnuFileConvert ' Me.mnuFileConvert.Enabled = False Me.mnuFileConvert.Name = "mnuFileConvert" - Me.mnuFileConvert.Size = New System.Drawing.Size(241, 22) + Me.mnuFileConvert.Size = New System.Drawing.Size(365, 34) Me.mnuFileConvert.Text = "Convert..." Me.mnuFileConvert.Visible = False ' 'tlSeparatorFile ' Me.tlSeparatorFile.Name = "tlSeparatorFile" - Me.tlSeparatorFile.Size = New System.Drawing.Size(238, 6) + Me.tlSeparatorFile.Size = New System.Drawing.Size(362, 6) ' 'mnuFileExport ' Me.mnuFileExport.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuFileExportExportDataSet, Me.mnuFileExportExportRObjectsToolStripMenuItem, Me.mnuFileExportExportRWorkspace, Me.mnuFileExportExportGraphAsImage}) Me.mnuFileExport.Name = "mnuFileExport" - Me.mnuFileExport.Size = New System.Drawing.Size(241, 22) + Me.mnuFileExport.Size = New System.Drawing.Size(365, 34) Me.mnuFileExport.Text = "Export" ' 'mnuFileExportExportDataSet ' Me.mnuFileExportExportDataSet.Name = "mnuFileExportExportDataSet" - Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportDataSet.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportDataSet.Text = "Export Dataset..." ' 'mnuFileExportExportRObjectsToolStripMenuItem ' Me.mnuFileExportExportRObjectsToolStripMenuItem.Name = "mnuFileExportExportRObjectsToolStripMenuItem" - Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRObjectsToolStripMenuItem.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRObjectsToolStripMenuItem.Text = "Export R Objects..." ' 'mnuFileExportExportRWorkspace ' Me.mnuFileExportExportRWorkspace.Name = "mnuFileExportExportRWorkspace" - Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportRWorkspace.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportRWorkspace.Text = "Export R Workspace..." ' 'mnuFileExportExportGraphAsImage ' Me.mnuFileExportExportGraphAsImage.Name = "mnuFileExportExportGraphAsImage" - Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(204, 22) + Me.mnuFileExportExportGraphAsImage.Size = New System.Drawing.Size(310, 34) Me.mnuFileExportExportGraphAsImage.Text = "Export Graph As Image..." ' 'mnuFileCloseData ' Me.mnuFileCloseData.Name = "mnuFileCloseData" - Me.mnuFileCloseData.Size = New System.Drawing.Size(241, 22) + Me.mnuFileCloseData.Size = New System.Drawing.Size(365, 34) Me.mnuFileCloseData.Text = "Close Data Book" ' 'ToolStripSeparator8 ' Me.ToolStripSeparator8.Name = "ToolStripSeparator8" - Me.ToolStripSeparator8.Size = New System.Drawing.Size(238, 6) + Me.ToolStripSeparator8.Size = New System.Drawing.Size(362, 6) ' 'mnuPrepare ' Me.mnuPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrame, Me.mnuPrepareCheckData, Me.ToolStripSeparator6, Me.mnuPrepareCalculator, Me.ToolStripSeparator79, Me.mnuPrepareColumnCalculate, Me.mnuPrepareColumnFactor, Me.mnuPrepareColumnText, Me.mnuPrepareColumnDate, Me.mnuPrepareColumnDefine, Me.ToolStripSeparator4, Me.mnuPrepareDataReshape, Me.ToolStripSeparator7, Me.mnuPrepareKeysAndLinks, Me.mnuPrepareDataBook, Me.mnuPrepareRObjects}) Me.mnuPrepare.Name = "mnuPrepare" - Me.mnuPrepare.Size = New System.Drawing.Size(59, 22) + Me.mnuPrepare.Size = New System.Drawing.Size(88, 29) Me.mnuPrepare.Tag = "Prepare" Me.mnuPrepare.Text = "Prepare" ' @@ -3546,105 +3556,105 @@ Partial Class frmMain ' Me.mnuPrepareDataFrame.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataFrameViewData, Me.mnuPrepareDataFrameRenameColumn, Me.mnuPrepareDataFrameDuplicateColumn, Me.mnuPrepareDataFrameRowNumbersNames, Me.ToolStripSeparator1, Me.mnuPrepareDataFrameSort, Me.mnuPrepareDataFrameFilterRows, Me.mnuPrepareDataFrameSelectColumns, Me.mnuPrepareDataFrameReplaceValues, Me.mnuPrepareDataFrameConvertColumns, Me.ToolStripSeparator2, Me.mnuPrepareDataFrameReorderColumns, Me.mnuPrepareDataFrameAddMergeColumns, Me.mnuPrepareDataFrameInsertColumnsRows, Me.mnuPrepareDataFrameDeleteColumnsRows, Me.mnuPrepareDataFrameProtectColumn, Me.mnuPrepareDataFrameFreezeColumns, Me.mnuPrepareDataframeColourByProperty}) Me.mnuPrepareDataFrame.Name = "mnuPrepareDataFrame" - Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataFrame.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataFrame.Tag = "Data_Frame" Me.mnuPrepareDataFrame.Text = "Data Frame" ' 'mnuPrepareDataFrameViewData ' Me.mnuPrepareDataFrameViewData.Name = "mnuPrepareDataFrameViewData" - Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameViewData.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameViewData.Tag = "View_Data..." Me.mnuPrepareDataFrameViewData.Text = "View Data..." ' 'mnuPrepareDataFrameRenameColumn ' Me.mnuPrepareDataFrameRenameColumn.Name = "mnuPrepareDataFrameRenameColumn" - Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRenameColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRenameColumn.Tag = "Rename_Column..." Me.mnuPrepareDataFrameRenameColumn.Text = "Rename Columns..." ' 'mnuPrepareDataFrameDuplicateColumn ' Me.mnuPrepareDataFrameDuplicateColumn.Name = "mnuPrepareDataFrameDuplicateColumn" - Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDuplicateColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDuplicateColumn.Text = "Duplicate Column..." ' 'mnuPrepareDataFrameRowNumbersNames ' Me.mnuPrepareDataFrameRowNumbersNames.Name = "mnuPrepareDataFrameRowNumbersNames" - Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameRowNumbersNames.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameRowNumbersNames.Tag = "Row_Numbers/Names..." Me.mnuPrepareDataFrameRowNumbersNames.Text = "Row Numbers/Names..." ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameSort ' Me.mnuPrepareDataFrameSort.Name = "mnuPrepareDataFrameSort" - Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSort.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSort.Tag = "Sort..." Me.mnuPrepareDataFrameSort.Text = "Sort..." ' 'mnuPrepareDataFrameFilterRows ' Me.mnuPrepareDataFrameFilterRows.Name = "mnuPrepareDataFrameFilterRows" - Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFilterRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFilterRows.Tag = "Filter..." Me.mnuPrepareDataFrameFilterRows.Text = "Filter Rows..." ' 'mnuPrepareDataFrameSelectColumns ' Me.mnuPrepareDataFrameSelectColumns.Name = "mnuPrepareDataFrameSelectColumns" - Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameSelectColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameSelectColumns.Text = "Select Columns..." ' 'mnuPrepareDataFrameReplaceValues ' Me.mnuPrepareDataFrameReplaceValues.Name = "mnuPrepareDataFrameReplaceValues" - Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReplaceValues.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReplaceValues.Tag = "Replace_Values..." Me.mnuPrepareDataFrameReplaceValues.Text = "Replace Values..." ' 'mnuPrepareDataFrameConvertColumns ' Me.mnuPrepareDataFrameConvertColumns.Name = "mnuPrepareDataFrameConvertColumns" - Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameConvertColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameConvertColumns.Tag = "Convert_Columns..." Me.mnuPrepareDataFrameConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(198, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(298, 6) ' 'mnuPrepareDataFrameReorderColumns ' Me.mnuPrepareDataFrameReorderColumns.Name = "mnuPrepareDataFrameReorderColumns" - Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameReorderColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameReorderColumns.Tag = "Reorder_Columns..." Me.mnuPrepareDataFrameReorderColumns.Text = "Reorder Columns..." ' 'mnuPrepareDataFrameAddMergeColumns ' Me.mnuPrepareDataFrameAddMergeColumns.Name = "mnuPrepareDataFrameAddMergeColumns" - Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameAddMergeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameAddMergeColumns.Text = "Add (Merge) Columns..." ' 'mnuPrepareDataFrameInsertColumnsRows ' Me.mnuPrepareDataFrameInsertColumnsRows.Name = "mnuPrepareDataFrameInsertColumnsRows" - Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameInsertColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameInsertColumnsRows.Tag = "Insert_Columns/Rows..." Me.mnuPrepareDataFrameInsertColumnsRows.Text = "Insert Columns/Rows..." ' 'mnuPrepareDataFrameDeleteColumnsRows ' Me.mnuPrepareDataFrameDeleteColumnsRows.Name = "mnuPrepareDataFrameDeleteColumnsRows" - Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameDeleteColumnsRows.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameDeleteColumnsRows.Tag = "Delete_Columns/Rows..." Me.mnuPrepareDataFrameDeleteColumnsRows.Text = "Delete Columns/Rows..." ' @@ -3652,7 +3662,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameProtectColumn.Enabled = False Me.mnuPrepareDataFrameProtectColumn.Name = "mnuPrepareDataFrameProtectColumn" - Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameProtectColumn.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameProtectColumn.Tag = "..." Me.mnuPrepareDataFrameProtectColumn.Text = "Protect Column..." Me.mnuPrepareDataFrameProtectColumn.Visible = False @@ -3661,7 +3671,7 @@ Partial Class frmMain ' Me.mnuPrepareDataFrameFreezeColumns.Enabled = False Me.mnuPrepareDataFrameFreezeColumns.Name = "mnuPrepareDataFrameFreezeColumns" - Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataFrameFreezeColumns.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataFrameFreezeColumns.Tag = "Freeze_Columns..." Me.mnuPrepareDataFrameFreezeColumns.Text = "Freeze Columns..." Me.mnuPrepareDataFrameFreezeColumns.Visible = False @@ -3669,7 +3679,7 @@ Partial Class frmMain 'mnuPrepareDataframeColourByProperty ' Me.mnuPrepareDataframeColourByProperty.Name = "mnuPrepareDataframeColourByProperty" - Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(201, 22) + Me.mnuPrepareDataframeColourByProperty.Size = New System.Drawing.Size(301, 34) Me.mnuPrepareDataframeColourByProperty.Text = "Colour by Property..." ' 'mnuPrepareCheckData @@ -3677,107 +3687,107 @@ Partial Class frmMain Me.mnuPrepareCheckData.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right Me.mnuPrepareCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareCheckDataVisualiseData, Me.mnuPrepareCheckDataPivotTable, Me.ToolStripSeparator50, Me.mnuPrepareCheckDataDuplicates, Me.mnuPrepareCheckDataCompareColumns, Me.mnuPrepareCheckDataNonNumericCases, Me.ToolStripSeparator49, Me.mnuPrepareCheckDataBoxplot, Me.mnuPrepareCheckDataOneVariableSummarise, Me.mnuPrepareCheckDataOneVariableGraph, Me.mnuPrepareCheckDataOneWayFrequencies, Me.mnuPrepareCheckDataViewDeleteLabels, Me.ToolStripSeparator41, Me.mnuPrepareCheckDataExportOpenRefine, Me.mnuPrepareCheckDataImportOpenRefine, Me.ToolStripSeparator40, Me.mnuPreparePrepareToShareJitter, Me.mnuPrepareCheckDataPrePareToShareSdcPackage, Me.mnuPrepareCheckDataAnonymiseIDColumn}) Me.mnuPrepareCheckData.Name = "mnuPrepareCheckData" - Me.mnuPrepareCheckData.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareCheckData.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCheckData.Text = "Check Data" ' 'mnuPrepareCheckDataVisualiseData ' Me.mnuPrepareCheckDataVisualiseData.Name = "mnuPrepareCheckDataVisualiseData" - Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataVisualiseData.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataVisualiseData.Text = "Visualise Data..." ' 'mnuPrepareCheckDataPivotTable ' Me.mnuPrepareCheckDataPivotTable.Name = "mnuPrepareCheckDataPivotTable" - Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPivotTable.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPivotTable.Text = "Pivot Table..." ' 'ToolStripSeparator50 ' Me.ToolStripSeparator50.Name = "ToolStripSeparator50" - Me.ToolStripSeparator50.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator50.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataDuplicates ' Me.mnuPrepareCheckDataDuplicates.Name = "mnuPrepareCheckDataDuplicates" - Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataDuplicates.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataDuplicates.Text = "Duplicate Rows..." ' 'mnuPrepareCheckDataCompareColumns ' Me.mnuPrepareCheckDataCompareColumns.Name = "mnuPrepareCheckDataCompareColumns" - Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataCompareColumns.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataCompareColumns.Text = "Compare Columns..." ' 'mnuPrepareCheckDataNonNumericCases ' Me.mnuPrepareCheckDataNonNumericCases.Name = "mnuPrepareCheckDataNonNumericCases" - Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataNonNumericCases.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataNonNumericCases.Text = "Non-Numeric Values..." ' 'ToolStripSeparator49 ' Me.ToolStripSeparator49.Name = "ToolStripSeparator49" - Me.ToolStripSeparator49.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator49.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataBoxplot ' Me.mnuPrepareCheckDataBoxplot.Name = "mnuPrepareCheckDataBoxplot" - Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataBoxplot.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataBoxplot.Text = "Boxplot..." ' 'mnuPrepareCheckDataOneVariableSummarise ' Me.mnuPrepareCheckDataOneVariableSummarise.Name = "mnuPrepareCheckDataOneVariableSummarise" - Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableSummarise.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuPrepareCheckDataOneVariableGraph ' Me.mnuPrepareCheckDataOneVariableGraph.Name = "mnuPrepareCheckDataOneVariableGraph" - Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneVariableGraph.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuPrepareCheckDataOneWayFrequencies ' Me.mnuPrepareCheckDataOneWayFrequencies.Name = "mnuPrepareCheckDataOneWayFrequencies" - Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataOneWayFrequencies.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataOneWayFrequencies.Text = "One Variable Frequencies..." ' 'mnuPrepareCheckDataViewDeleteLabels ' Me.mnuPrepareCheckDataViewDeleteLabels.Name = "mnuPrepareCheckDataViewDeleteLabels" - Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataViewDeleteLabels.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataViewDeleteLabels.Text = "View/Delete Labels..." ' 'ToolStripSeparator41 ' Me.ToolStripSeparator41.Name = "ToolStripSeparator41" - Me.ToolStripSeparator41.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator41.Size = New System.Drawing.Size(367, 6) ' 'mnuPrepareCheckDataExportOpenRefine ' Me.mnuPrepareCheckDataExportOpenRefine.Name = "mnuPrepareCheckDataExportOpenRefine" - Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataExportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataExportOpenRefine.Text = "Export To OpenRefine..." ' 'mnuPrepareCheckDataImportOpenRefine ' Me.mnuPrepareCheckDataImportOpenRefine.Name = "mnuPrepareCheckDataImportOpenRefine" - Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataImportOpenRefine.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataImportOpenRefine.Text = "Import From OpenRefine..." Me.mnuPrepareCheckDataImportOpenRefine.Visible = False ' 'ToolStripSeparator40 ' Me.ToolStripSeparator40.Name = "ToolStripSeparator40" - Me.ToolStripSeparator40.Size = New System.Drawing.Size(242, 6) + Me.ToolStripSeparator40.Size = New System.Drawing.Size(367, 6) ' 'mnuPreparePrepareToShareJitter ' Me.mnuPreparePrepareToShareJitter.Enabled = False Me.mnuPreparePrepareToShareJitter.Name = "mnuPreparePrepareToShareJitter" - Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(245, 22) + Me.mnuPreparePrepareToShareJitter.Size = New System.Drawing.Size(370, 34) Me.mnuPreparePrepareToShareJitter.Text = "Jitter..." Me.mnuPreparePrepareToShareJitter.Visible = False ' @@ -3785,95 +3795,95 @@ Partial Class frmMain ' Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Enabled = False Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Name = "mnuPrepareCheckDataPrePareToShareSdcPackage" - Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Text = "Prepare to Share (sdc package)..." Me.mnuPrepareCheckDataPrePareToShareSdcPackage.Visible = False ' 'mnuPrepareCheckDataAnonymiseIDColumn ' Me.mnuPrepareCheckDataAnonymiseIDColumn.Name = "mnuPrepareCheckDataAnonymiseIDColumn" - Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(245, 22) + Me.mnuPrepareCheckDataAnonymiseIDColumn.Size = New System.Drawing.Size(370, 34) Me.mnuPrepareCheckDataAnonymiseIDColumn.Text = "Anonymise ID Column..." ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareCalculator ' Me.mnuPrepareCalculator.Name = "mnuPrepareCalculator" - Me.mnuPrepareCalculator.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareCalculator.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareCalculator.Tag = "Calculator..." Me.mnuPrepareCalculator.Text = "Calculator..." ' 'ToolStripSeparator79 ' Me.ToolStripSeparator79.Name = "ToolStripSeparator79" - Me.ToolStripSeparator79.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator79.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareColumnCalculate ' Me.mnuPrepareColumnCalculate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnNumericRegularSequence, Me.mnuPrepareColumnNumericEnter, Me.ToolStripSeparator25, Me.mnuPrepareColumnNumericRowSummaries, Me.mnuPrepareColumnNumericTransform, Me.mnuPrepareColumnNumericPolynomials, Me.ToolStripSeparator56, Me.mnuPrepareColumnNumericRandomSamples, Me.mnuPrepareColumnNumericPermuteRows}) Me.mnuPrepareColumnCalculate.Name = "mnuPrepareColumnCalculate" - Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnCalculate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnCalculate.Tag = "Column:_Calculate" Me.mnuPrepareColumnCalculate.Text = "Column: Numeric" ' 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRegularSequence.Tag = "Regular_Sequence..." Me.mnuPrepareColumnNumericRegularSequence.Text = "Regular Sequence..." ' 'mnuPrepareColumnNumericEnter ' Me.mnuPrepareColumnNumericEnter.Name = "mnuPrepareColumnNumericEnter" - Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericEnter.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericEnter.Text = "Enter..." ' 'ToolStripSeparator25 ' Me.ToolStripSeparator25.Name = "ToolStripSeparator25" - Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRowSummaries.Text = "Row Summaries..." ' 'mnuPrepareColumnNumericTransform ' Me.mnuPrepareColumnNumericTransform.Name = "mnuPrepareColumnNumericTransform" - Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericTransform.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericTransform.Tag = "Rank..." Me.mnuPrepareColumnNumericTransform.Text = "Transform..." ' 'mnuPrepareColumnNumericPolynomials ' Me.mnuPrepareColumnNumericPolynomials.Name = "mnuPrepareColumnNumericPolynomials" - Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPolynomials.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPolynomials.Tag = "Polynomials..." Me.mnuPrepareColumnNumericPolynomials.Text = "Polynomials..." ' 'ToolStripSeparator56 ' Me.ToolStripSeparator56.Name = "ToolStripSeparator56" - Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(301, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericRandomSamples.Tag = "Random_Samples..." Me.mnuPrepareColumnNumericRandomSamples.Text = "Random Samples..." ' 'mnuPrepareColumnNumericPermuteRows ' Me.mnuPrepareColumnNumericPermuteRows.Name = "mnuPrepareColumnNumericPermuteRows" - Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(304, 34) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' @@ -3881,105 +3891,105 @@ Partial Class frmMain ' Me.mnuPrepareColumnFactor.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnFactorConvertToFactor, Me.mnuPrepareColumnFactorRecodeNumeric, Me.mnuPrepareColumnFactorCountInFactor, Me.ToolStripSeparator12, Me.mnuPrepareColumnFactorRecodeFactor, Me.mnuPrepareColumnFactorCombineFactors, Me.mnuPrepareColumnFactorDummyVariables, Me.ToolStripSeparator14, Me.mnuPrepareColumnFactorLevelsLabels, Me.mnuPrepareColumnFactorReorderLevels, Me.mnuPrepareColumnFactorReferenceLevel, Me.mnuPrepareColumnFactorUnusedLevels, Me.mnuPrepareColumnFactorContrasts, Me.ToolStripSeparator19, Me.mnuPrepareColumnFactorFactorDataFrame}) Me.mnuPrepareColumnFactor.Name = "mnuPrepareColumnFactor" - Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnFactor.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnFactor.Tag = "Column:_Factor" Me.mnuPrepareColumnFactor.Text = "Column: Factor" ' 'mnuPrepareColumnFactorConvertToFactor ' Me.mnuPrepareColumnFactorConvertToFactor.Name = "mnuPrepareColumnFactorConvertToFactor" - Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorConvertToFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorConvertToFactor.Tag = "Convert_To_Factor" Me.mnuPrepareColumnFactorConvertToFactor.Text = "Convert To Factor..." ' 'mnuPrepareColumnFactorRecodeNumeric ' Me.mnuPrepareColumnFactorRecodeNumeric.Name = "mnuPrepareColumnFactorRecodeNumeric" - Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeNumeric.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeNumeric.Tag = "Recode_Numeric..." Me.mnuPrepareColumnFactorRecodeNumeric.Text = "Recode Numeric..." ' 'mnuPrepareColumnFactorCountInFactor ' Me.mnuPrepareColumnFactorCountInFactor.Name = "mnuPrepareColumnFactorCountInFactor" - Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCountInFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCountInFactor.Text = "Count in Factor..." ' 'ToolStripSeparator12 ' Me.ToolStripSeparator12.Name = "ToolStripSeparator12" - Me.ToolStripSeparator12.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator12.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorRecodeFactor ' Me.mnuPrepareColumnFactorRecodeFactor.Name = "mnuPrepareColumnFactorRecodeFactor" - Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorRecodeFactor.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorRecodeFactor.Tag = "Recode_Factor..." Me.mnuPrepareColumnFactorRecodeFactor.Text = "Recode Factor..." ' 'mnuPrepareColumnFactorCombineFactors ' Me.mnuPrepareColumnFactorCombineFactors.Name = "mnuPrepareColumnFactorCombineFactors" - Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorCombineFactors.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorCombineFactors.Tag = "Combine_Factors..." Me.mnuPrepareColumnFactorCombineFactors.Text = "Combine Factors..." ' 'mnuPrepareColumnFactorDummyVariables ' Me.mnuPrepareColumnFactorDummyVariables.Name = "mnuPrepareColumnFactorDummyVariables" - Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorDummyVariables.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorDummyVariables.Tag = "Dummy_Variables..." Me.mnuPrepareColumnFactorDummyVariables.Text = "Dummy Variables..." ' 'ToolStripSeparator14 ' Me.ToolStripSeparator14.Name = "ToolStripSeparator14" - Me.ToolStripSeparator14.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator14.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorLevelsLabels ' Me.mnuPrepareColumnFactorLevelsLabels.Name = "mnuPrepareColumnFactorLevelsLabels" - Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorLevelsLabels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorLevelsLabels.Tag = "Levels/Labels..." Me.mnuPrepareColumnFactorLevelsLabels.Text = "Levels/Labels..." ' 'mnuPrepareColumnFactorReorderLevels ' Me.mnuPrepareColumnFactorReorderLevels.Name = "mnuPrepareColumnFactorReorderLevels" - Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReorderLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReorderLevels.Tag = "Reorder_Levels..." Me.mnuPrepareColumnFactorReorderLevels.Text = "Reorder Levels..." ' 'mnuPrepareColumnFactorReferenceLevel ' Me.mnuPrepareColumnFactorReferenceLevel.Name = "mnuPrepareColumnFactorReferenceLevel" - Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorReferenceLevel.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorReferenceLevel.Tag = "Reference_Level..." Me.mnuPrepareColumnFactorReferenceLevel.Text = "Reference Level..." ' 'mnuPrepareColumnFactorUnusedLevels ' Me.mnuPrepareColumnFactorUnusedLevels.Name = "mnuPrepareColumnFactorUnusedLevels" - Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorUnusedLevels.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorUnusedLevels.Tag = "Unused_Levels..." Me.mnuPrepareColumnFactorUnusedLevels.Text = "Unused Levels..." ' 'mnuPrepareColumnFactorContrasts ' Me.mnuPrepareColumnFactorContrasts.Name = "mnuPrepareColumnFactorContrasts" - Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorContrasts.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorContrasts.Tag = "Contrasts..." Me.mnuPrepareColumnFactorContrasts.Text = "Contrasts..." ' 'ToolStripSeparator19 ' Me.ToolStripSeparator19.Name = "ToolStripSeparator19" - Me.ToolStripSeparator19.Size = New System.Drawing.Size(176, 6) + Me.ToolStripSeparator19.Size = New System.Drawing.Size(267, 6) ' 'mnuPrepareColumnFactorFactorDataFrame ' Me.mnuPrepareColumnFactorFactorDataFrame.Name = "mnuPrepareColumnFactorFactorDataFrame" - Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(179, 22) + Me.mnuPrepareColumnFactorFactorDataFrame.Size = New System.Drawing.Size(270, 34) Me.mnuPrepareColumnFactorFactorDataFrame.Tag = "Factor_Data_Frame" Me.mnuPrepareColumnFactorFactorDataFrame.Text = "Factor Data Frame..." ' @@ -3987,42 +3997,42 @@ Partial Class frmMain ' Me.mnuPrepareColumnText.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnTextFindReplace, Me.mnuPrepareColumnTextSearch, Me.mnuPrepareColumnTextTransform, Me.mnuPrepareColumnTextSplit, Me.mnuPrepareColumnTextCombine, Me.mnuPrepareColumnTextMatch, Me.mnuPrepareColumnTextDistance}) Me.mnuPrepareColumnText.Name = "mnuPrepareColumnText" - Me.mnuPrepareColumnText.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnText.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnText.Tag = "Column:_Text" Me.mnuPrepareColumnText.Text = "Column: Text" ' 'mnuPrepareColumnTextFindReplace ' Me.mnuPrepareColumnTextFindReplace.Name = "mnuPrepareColumnTextFindReplace" - Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextFindReplace.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextFindReplace.Tag = "Find/Replace..." Me.mnuPrepareColumnTextFindReplace.Text = "Find/Replace..." ' 'mnuPrepareColumnTextSearch ' Me.mnuPrepareColumnTextSearch.Name = "mnuPrepareColumnTextSearch" - Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSearch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSearch.Text = "Search..." Me.mnuPrepareColumnTextSearch.Visible = False ' 'mnuPrepareColumnTextTransform ' Me.mnuPrepareColumnTextTransform.Name = "mnuPrepareColumnTextTransform" - Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextTransform.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextTransform.Tag = "Transform..." Me.mnuPrepareColumnTextTransform.Text = "Transform..." ' 'mnuPrepareColumnTextSplit ' Me.mnuPrepareColumnTextSplit.Name = "mnuPrepareColumnTextSplit" - Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextSplit.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextSplit.Tag = "Split..." Me.mnuPrepareColumnTextSplit.Text = "Split..." ' 'mnuPrepareColumnTextCombine ' Me.mnuPrepareColumnTextCombine.Name = "mnuPrepareColumnTextCombine" - Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextCombine.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextCombine.Tag = "Combine..." Me.mnuPrepareColumnTextCombine.Text = "Combine..." ' @@ -4030,7 +4040,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnTextMatch.Enabled = False Me.mnuPrepareColumnTextMatch.Name = "mnuPrepareColumnTextMatch" - Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextMatch.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextMatch.Tag = "Match..." Me.mnuPrepareColumnTextMatch.Text = "Match..." Me.mnuPrepareColumnTextMatch.Visible = False @@ -4038,7 +4048,7 @@ Partial Class frmMain 'mnuPrepareColumnTextDistance ' Me.mnuPrepareColumnTextDistance.Name = "mnuPrepareColumnTextDistance" - Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(152, 22) + Me.mnuPrepareColumnTextDistance.Size = New System.Drawing.Size(227, 34) Me.mnuPrepareColumnTextDistance.Tag = "Distance..." Me.mnuPrepareColumnTextDistance.Text = "Distance..." ' @@ -4046,38 +4056,38 @@ Partial Class frmMain ' Me.mnuPrepareColumnDate.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDateGenerateDate, Me.mnuPrepareColumnDateMakeDate, Me.mnuPrepareColumnDateInfillMissingDates, Me.mnuPrepareColumnDateUseDate, Me.mnuPrepareColumnDateMakeTime, Me.mnuPrepareColumnDateUseTime}) Me.mnuPrepareColumnDate.Name = "mnuPrepareColumnDate" - Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnDate.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDate.Text = "Column: Date" ' 'mnuPrepareColumnDateGenerateDate ' Me.mnuPrepareColumnDateGenerateDate.Name = "mnuPrepareColumnDateGenerateDate" - Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateGenerateDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateGenerateDate.Text = "Generate Dates..." ' 'mnuPrepareColumnDateMakeDate ' Me.mnuPrepareColumnDateMakeDate.Name = "mnuPrepareColumnDateMakeDate" - Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeDate.Text = "Make Date..." ' 'mnuPrepareColumnDateInfillMissingDates ' Me.mnuPrepareColumnDateInfillMissingDates.Name = "mnuPrepareColumnDateInfillMissingDates" - Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateInfillMissingDates.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateInfillMissingDates.Text = "Fill Date Gaps..." ' 'mnuPrepareColumnDateUseDate ' Me.mnuPrepareColumnDateUseDate.Name = "mnuPrepareColumnDateUseDate" - Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseDate.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseDate.Text = "Use Date..." ' 'mnuPrepareColumnDateMakeTime ' Me.mnuPrepareColumnDateMakeTime.Enabled = False Me.mnuPrepareColumnDateMakeTime.Name = "mnuPrepareColumnDateMakeTime" - Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateMakeTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateMakeTime.Text = "Make Time..." Me.mnuPrepareColumnDateMakeTime.Visible = False ' @@ -4085,7 +4095,7 @@ Partial Class frmMain ' Me.mnuPrepareColumnDateUseTime.Enabled = False Me.mnuPrepareColumnDateUseTime.Name = "mnuPrepareColumnDateUseTime" - Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(162, 22) + Me.mnuPrepareColumnDateUseTime.Size = New System.Drawing.Size(246, 34) Me.mnuPrepareColumnDateUseTime.Text = "Use Time..." Me.mnuPrepareColumnDateUseTime.Visible = False ' @@ -4093,169 +4103,169 @@ Partial Class frmMain ' Me.mnuPrepareColumnDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareColumnDefineConvertColumns, Me.ToolStripSeparator55, Me.mnuPrepareColumnDefineCircular}) Me.mnuPrepareColumnDefine.Name = "mnuPrepareColumnDefine" - Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareColumnDefine.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareColumnDefine.Text = "Column: Define" ' 'mnuPrepareColumnDefineConvertColumns ' Me.mnuPrepareColumnDefineConvertColumns.Name = "mnuPrepareColumnDefineConvertColumns" - Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineConvertColumns.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineConvertColumns.Text = "Convert Columns..." ' 'ToolStripSeparator55 ' Me.ToolStripSeparator55.Name = "ToolStripSeparator55" - Me.ToolStripSeparator55.Size = New System.Drawing.Size(173, 6) + Me.ToolStripSeparator55.Size = New System.Drawing.Size(260, 6) ' 'mnuPrepareColumnDefineCircular ' Me.mnuPrepareColumnDefineCircular.Name = "mnuPrepareColumnDefineCircular" - Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(176, 22) + Me.mnuPrepareColumnDefineCircular.Size = New System.Drawing.Size(263, 34) Me.mnuPrepareColumnDefineCircular.Text = "Circular..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareDataReshape ' Me.mnuPrepareDataReshape.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, Me.mnuPrepareDataReshapeScaleOrDistance, Me.mnuPrepareDataReshapeRandomSplit}) Me.mnuPrepareDataReshape.Name = "mnuPrepareDataReshape" - Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataReshape.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataReshape.Tag = "" Me.mnuPrepareDataReshape.Text = "Data Reshape" ' 'mnuPrepareColumnReshapeColumnSummaries ' Me.mnuPrepareColumnReshapeColumnSummaries.Name = "mnuPrepareColumnReshapeColumnSummaries" - Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeColumnSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeColumnSummaries.Tag = "Column_Summaries..." Me.mnuPrepareColumnReshapeColumnSummaries.Text = "Column Summaries..." ' 'mnuPrepareColumnReshapeGeneralSummaries ' Me.mnuPrepareColumnReshapeGeneralSummaries.Name = "mnuPrepareColumnReshapeGeneralSummaries" - Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeGeneralSummaries.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeGeneralSummaries.Text = "General Summaries..." ' 'ToolStripSeparator10 ' Me.ToolStripSeparator10.Name = "ToolStripSeparator10" - Me.ToolStripSeparator10.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator10.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareColumnReshapeStack ' Me.mnuPrepareColumnReshapeStack.Name = "mnuPrepareColumnReshapeStack" - Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeStack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeStack.Tag = "Stack..." Me.mnuPrepareColumnReshapeStack.Text = "Stack (Pivot Longer)..." ' 'mnuPrepareColumnReshapeUnstack ' Me.mnuPrepareColumnReshapeUnstack.Name = "mnuPrepareColumnReshapeUnstack" - Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeUnstack.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeUnstack.Tag = "Unstack..." Me.mnuPrepareColumnReshapeUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuPrepareColumnReshapeMerge ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" - Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' Me.ToolStripSeparator11.Name = "ToolStripSeparator11" - Me.ToolStripSeparator11.Size = New System.Drawing.Size(194, 6) + Me.ToolStripSeparator11.Size = New System.Drawing.Size(292, 6) ' 'mnuPrepareAppendDataFrame ' Me.mnuPrepareAppendDataFrame.Name = "mnuPrepareAppendDataFrame" - Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareAppendDataFrame.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareAppendDataFrame.Text = "Append (Bind Rows)..." ' 'mnuPrepareColumnReshapeSubset ' Me.mnuPrepareColumnReshapeSubset.Name = "mnuPrepareColumnReshapeSubset" - Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeSubset.Tag = "Subset..." Me.mnuPrepareColumnReshapeSubset.Text = "Subset..." ' 'mnuPrepareColumnReshapeRandomSubset ' Me.mnuPrepareColumnReshapeRandomSubset.Name = "mnuPrepareColumnReshapeRandomSubset" - Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeRandomSubset.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeRandomSubset.Tag = "Random_Subset..." Me.mnuPrepareColumnReshapeRandomSubset.Text = "Random Subset..." ' 'mnuPrepareColumnReshapeTranspose ' Me.mnuPrepareColumnReshapeTranspose.Name = "mnuPrepareColumnReshapeTranspose" - Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareColumnReshapeTranspose.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareColumnReshapeTranspose.Tag = "Transpose..." Me.mnuPrepareColumnReshapeTranspose.Text = "Transpose..." ' 'mnuPrepareDataReshapeScaleOrDistance ' Me.mnuPrepareDataReshapeScaleOrDistance.Name = "mnuPrepareDataReshapeScaleOrDistance" - Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeScaleOrDistance.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeScaleOrDistance.Text = "Scale/Distance..." ' 'mnuPrepareDataReshapeRandomSplit ' Me.mnuPrepareDataReshapeRandomSplit.Name = "mnuPrepareDataReshapeRandomSplit" - Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(197, 22) + Me.mnuPrepareDataReshapeRandomSplit.Size = New System.Drawing.Size(295, 34) Me.mnuPrepareDataReshapeRandomSplit.Text = "Random Split..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(177, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(248, 6) ' 'mnuPrepareKeysAndLinks ' Me.mnuPrepareKeysAndLinks.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareKeysAndLinksAddKey, Me.mnuPrepareKeysAndLinksViewAndRemoveKey, Me.mnuPrepareKeysAndLinksAddLink, Me.mnuPrepareKeysAndLinksViewAndRemoveKeys, Me.mnuPrepareKeysAndLinksAddComment}) Me.mnuPrepareKeysAndLinks.Name = "mnuPrepareKeysAndLinks" - Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareKeysAndLinks.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareKeysAndLinks.Text = "Keys and Links" ' 'mnuPrepareKeysAndLinksAddKey ' Me.mnuPrepareKeysAndLinksAddKey.Name = "mnuPrepareKeysAndLinksAddKey" - Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddKey.Text = "Add Key..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKey ' Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Name = "mnuPrepareKeysAndLinksViewAndRemoveKey" - Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKey.Text = "View and Remove Keys..." ' 'mnuPrepareKeysAndLinksAddLink ' Me.mnuPrepareKeysAndLinksAddLink.Name = "mnuPrepareKeysAndLinksAddLink" - Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddLink.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddLink.Text = "Add Link..." ' 'mnuPrepareKeysAndLinksViewAndRemoveKeys ' Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Name = "mnuPrepareKeysAndLinksViewAndRemoveKeys" - Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksViewAndRemoveKeys.Text = "View and Remove Links..." ' 'mnuPrepareKeysAndLinksAddComment ' Me.mnuPrepareKeysAndLinksAddComment.Name = "mnuPrepareKeysAndLinksAddComment" - Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(207, 22) + Me.mnuPrepareKeysAndLinksAddComment.Size = New System.Drawing.Size(311, 34) Me.mnuPrepareKeysAndLinksAddComment.Text = "Add Comment..." ' 'mnuPrepareDataBook ' Me.mnuPrepareDataBook.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareDataObjectDataFrameMetadata, Me.mnuPrepareDataObjectRenameDataFrame, Me.mnuPrepareDataObjectReorderDataFrames, Me.mnuPrepareDataObjectCopyDataFrame, Me.mnuPrepareDataObjectDeleteDataFrame, Me.ToolStripSeparator21, Me.mnuPrepareDataObjectHideDataframes, Me.mnuPrepareDataObjectMetadata, Me.mnuPrepareDataObjectRenameMetadata, Me.mnuPrepareDataObjectReorderMetadata, Me.mnuPrepareDataObjectDeleteMetadata}) Me.mnuPrepareDataBook.Name = "mnuPrepareDataBook" - Me.mnuPrepareDataBook.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareDataBook.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareDataBook.Tag = "Data_Object" Me.mnuPrepareDataBook.Text = "Data Book" ' @@ -4263,7 +4273,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDataFrameMetadata.Enabled = False Me.mnuPrepareDataObjectDataFrameMetadata.Name = "mnuPrepareDataObjectDataFrameMetadata" - Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDataFrameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDataFrameMetadata.Tag = "Data_Frame_Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Text = "Data Frame Metadata..." Me.mnuPrepareDataObjectDataFrameMetadata.Visible = False @@ -4271,46 +4281,46 @@ Partial Class frmMain 'mnuPrepareDataObjectRenameDataFrame ' Me.mnuPrepareDataObjectRenameDataFrame.Name = "mnuPrepareDataObjectRenameDataFrame" - Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameDataFrame.Tag = "ReName_Data_Frame..." Me.mnuPrepareDataObjectRenameDataFrame.Text = "Rename Data Frame..." ' 'mnuPrepareDataObjectReorderDataFrames ' Me.mnuPrepareDataObjectReorderDataFrames.Name = "mnuPrepareDataObjectReorderDataFrames" - Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderDataFrames.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderDataFrames.Tag = "Reorder_Data_Frames..." Me.mnuPrepareDataObjectReorderDataFrames.Text = "Reorder Data Frames..." ' 'mnuPrepareDataObjectCopyDataFrame ' Me.mnuPrepareDataObjectCopyDataFrame.Name = "mnuPrepareDataObjectCopyDataFrame" - Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectCopyDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectCopyDataFrame.Tag = "Copy_Data_Frame..." Me.mnuPrepareDataObjectCopyDataFrame.Text = "Copy Data Frame..." ' 'mnuPrepareDataObjectDeleteDataFrame ' Me.mnuPrepareDataObjectDeleteDataFrame.Name = "mnuPrepareDataObjectDeleteDataFrame" - Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteDataFrame.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteDataFrame.Tag = "Delete_Data_Frame..." Me.mnuPrepareDataObjectDeleteDataFrame.Text = "Delete Data Frames..." ' 'ToolStripSeparator21 ' Me.ToolStripSeparator21.Name = "ToolStripSeparator21" - Me.ToolStripSeparator21.Size = New System.Drawing.Size(207, 6) + Me.ToolStripSeparator21.Size = New System.Drawing.Size(315, 6) ' 'mnuPrepareDataObjectHideDataframes ' Me.mnuPrepareDataObjectHideDataframes.Name = "mnuPrepareDataObjectHideDataframes" - Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectHideDataframes.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectHideDataframes.Text = "Hide/Show Data Frames..." ' 'mnuPrepareDataObjectMetadata ' Me.mnuPrepareDataObjectMetadata.Name = "mnuPrepareDataObjectMetadata" - Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectMetadata.Tag = "Metadata..." Me.mnuPrepareDataObjectMetadata.Text = "Metadata..." ' @@ -4318,7 +4328,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectRenameMetadata.Enabled = False Me.mnuPrepareDataObjectRenameMetadata.Name = "mnuPrepareDataObjectRenameMetadata" - Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectRenameMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectRenameMetadata.Tag = "Rename_Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Text = "Rename Metadata..." Me.mnuPrepareDataObjectRenameMetadata.Visible = False @@ -4327,7 +4337,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectReorderMetadata.Enabled = False Me.mnuPrepareDataObjectReorderMetadata.Name = "mnuPrepareDataObjectReorderMetadata" - Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectReorderMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectReorderMetadata.Tag = "Reorder_Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Text = "Reorder Metadata..." Me.mnuPrepareDataObjectReorderMetadata.Visible = False @@ -4336,7 +4346,7 @@ Partial Class frmMain ' Me.mnuPrepareDataObjectDeleteMetadata.Enabled = False Me.mnuPrepareDataObjectDeleteMetadata.Name = "mnuPrepareDataObjectDeleteMetadata" - Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(210, 22) + Me.mnuPrepareDataObjectDeleteMetadata.Size = New System.Drawing.Size(318, 34) Me.mnuPrepareDataObjectDeleteMetadata.Tag = "Delete_Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Text = "Delete Metadata..." Me.mnuPrepareDataObjectDeleteMetadata.Visible = False @@ -4345,35 +4355,35 @@ Partial Class frmMain ' Me.mnuPrepareRObjects.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuPrepareRObjectsView, Me.mnuPrepareRObjectsRename, Me.mnuPrepareRObjectsReorder, Me.mnuPrepareRObjectsDelete}) Me.mnuPrepareRObjects.Name = "mnuPrepareRObjects" - Me.mnuPrepareRObjects.Size = New System.Drawing.Size(180, 22) + Me.mnuPrepareRObjects.Size = New System.Drawing.Size(251, 34) Me.mnuPrepareRObjects.Tag = "R_Objects" Me.mnuPrepareRObjects.Text = "R Objects" ' 'mnuPrepareRObjectsView ' Me.mnuPrepareRObjectsView.Name = "mnuPrepareRObjectsView" - Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsView.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsView.Tag = "View..." Me.mnuPrepareRObjectsView.Text = "View..." ' 'mnuPrepareRObjectsRename ' Me.mnuPrepareRObjectsRename.Name = "mnuPrepareRObjectsRename" - Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsRename.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsRename.Tag = "Rename..." Me.mnuPrepareRObjectsRename.Text = "Rename..." ' 'mnuPrepareRObjectsReorder ' Me.mnuPrepareRObjectsReorder.Name = "mnuPrepareRObjectsReorder" - Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsReorder.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsReorder.Tag = "Reorder" Me.mnuPrepareRObjectsReorder.Text = "Reorder..." ' 'mnuPrepareRObjectsDelete ' Me.mnuPrepareRObjectsDelete.Name = "mnuPrepareRObjectsDelete" - Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(126, 22) + Me.mnuPrepareRObjectsDelete.Size = New System.Drawing.Size(189, 34) Me.mnuPrepareRObjectsDelete.Tag = "Delete..." Me.mnuPrepareRObjectsDelete.Text = "Delete..." ' @@ -4381,78 +4391,78 @@ Partial Class frmMain ' Me.mnuStructured.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircular, Me.mnuStructuredLow_Flow, Me.mnuStructuredSurvival, Me.mnuStructuredTimeSeries, Me.ToolStripSeparator63, Me.mnuStructuredClimatic, Me.mnuStructuredProcurement, Me.mnuStructuredOptionByContext, Me.mnuStructuredSurvey}) Me.mnuStructured.Name = "mnuStructured" - Me.mnuStructured.Size = New System.Drawing.Size(74, 22) + Me.mnuStructured.Size = New System.Drawing.Size(109, 29) Me.mnuStructured.Text = "Structured" ' 'mnuStructuredCircular ' Me.mnuStructuredCircular.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredCircularDefine, Me.mnuStructuredCircularCalculator, Me.mnuStructuredCircularSummaries, Me.ToolStripSeparator46, Me.mnuStructuredCircularDensityPlot, Me.ToolStripSeparator67, Me.mnuStructuredCircularWindRose, Me.mnuStructuredCircularWindPollutionRose, Me.mnuStructuredCircularOtherRosePlots, Me.ToolStripSeparator68, Me.mnuStructuredCircularCirclize}) Me.mnuStructuredCircular.Name = "mnuStructuredCircular" - Me.mnuStructuredCircular.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredCircular.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredCircular.Text = "Circular" ' 'mnuStructuredCircularDefine ' Me.mnuStructuredCircularDefine.Name = "mnuStructuredCircularDefine" - Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDefine.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDefine.Text = "Define..." ' 'mnuStructuredCircularCalculator ' Me.mnuStructuredCircularCalculator.Name = "mnuStructuredCircularCalculator" - Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCalculator.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCalculator.Text = "Calculator..." ' 'mnuStructuredCircularSummaries ' Me.mnuStructuredCircularSummaries.Name = "mnuStructuredCircularSummaries" - Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularSummaries.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularSummaries.Text = "Summaries..." ' 'ToolStripSeparator46 ' Me.ToolStripSeparator46.Name = "ToolStripSeparator46" - Me.ToolStripSeparator46.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator46.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularDensityPlot ' Me.mnuStructuredCircularDensityPlot.Name = "mnuStructuredCircularDensityPlot" - Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularDensityPlot.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularDensityPlot.Text = "Circular Plots..." ' 'ToolStripSeparator67 ' Me.ToolStripSeparator67.Name = "ToolStripSeparator67" - Me.ToolStripSeparator67.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator67.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularWindRose ' Me.mnuStructuredCircularWindRose.Name = "mnuStructuredCircularWindRose" - Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindRose.Text = "Wind Rose..." ' 'mnuStructuredCircularWindPollutionRose ' Me.mnuStructuredCircularWindPollutionRose.Name = "mnuStructuredCircularWindPollutionRose" - Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularWindPollutionRose.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularWindPollutionRose.Text = "Wind/Pollution Rose..." ' 'mnuStructuredCircularOtherRosePlots ' Me.mnuStructuredCircularOtherRosePlots.Name = "mnuStructuredCircularOtherRosePlots" - Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularOtherRosePlots.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularOtherRosePlots.Text = "Other Rose Plots..." ' 'ToolStripSeparator68 ' Me.ToolStripSeparator68.Name = "ToolStripSeparator68" - Me.ToolStripSeparator68.Size = New System.Drawing.Size(189, 6) + Me.ToolStripSeparator68.Size = New System.Drawing.Size(284, 6) ' 'mnuStructuredCircularCirclize ' Me.mnuStructuredCircularCirclize.Enabled = False Me.mnuStructuredCircularCirclize.Name = "mnuStructuredCircularCirclize" - Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(192, 22) + Me.mnuStructuredCircularCirclize.Size = New System.Drawing.Size(287, 34) Me.mnuStructuredCircularCirclize.Text = "Circlize..." Me.mnuStructuredCircularCirclize.Visible = False ' @@ -4460,126 +4470,126 @@ Partial Class frmMain ' Me.mnuStructuredLow_Flow.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredLow_FlowDefine}) Me.mnuStructuredLow_Flow.Name = "mnuStructuredLow_Flow" - Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredLow_Flow.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredLow_Flow.Text = "Low_Flow" Me.mnuStructuredLow_Flow.Visible = False ' 'mnuStructuredLow_FlowDefine ' Me.mnuStructuredLow_FlowDefine.Name = "mnuStructuredLow_FlowDefine" - Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredLow_FlowDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredLow_FlowDefine.Text = "Define..." ' 'mnuStructuredSurvival ' Me.mnuStructuredSurvival.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredSurvivalDefine}) Me.mnuStructuredSurvival.Name = "mnuStructuredSurvival" - Me.mnuStructuredSurvival.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvival.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvival.Text = "Survival" ' 'mnuStructuredSurvivalDefine ' Me.mnuStructuredSurvivalDefine.Name = "mnuStructuredSurvivalDefine" - Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(117, 22) + Me.mnuStructuredSurvivalDefine.Size = New System.Drawing.Size(177, 34) Me.mnuStructuredSurvivalDefine.Text = "Define..." ' 'mnuStructuredTimeSeries ' Me.mnuStructuredTimeSeries.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDefine, Me.ToolStripSeparator60, Me.mnuStructuredTimeSeriesDescribe, Me.ToolStripSeparator61, Me.mnuStructuredTimeSeriesModel, Me.ToolStripSeparator62}) Me.mnuStructuredTimeSeries.Name = "mnuStructuredTimeSeries" - Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredTimeSeries.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredTimeSeries.Text = "Time Series" Me.mnuStructuredTimeSeries.Visible = False ' 'mnuStructuredTimeSeriesDefine ' Me.mnuStructuredTimeSeriesDefine.Name = "mnuStructuredTimeSeriesDefine" - Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDefine.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDefine.Text = "Define..." ' 'ToolStripSeparator60 ' Me.ToolStripSeparator60.Name = "ToolStripSeparator60" - Me.ToolStripSeparator60.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator60.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesDescribe ' Me.mnuStructuredTimeSeriesDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesDescribeOneVariable, Me.mnuStructuredTimeSeriesDescribeGeneral}) Me.mnuStructuredTimeSeriesDescribe.Name = "mnuStructuredTimeSeriesDescribe" - Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesDescribe.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesDescribe.Text = "Describe" ' 'mnuStructuredTimeSeriesDescribeOneVariable ' Me.mnuStructuredTimeSeriesDescribeOneVariable.Name = "mnuStructuredTimeSeriesDescribeOneVariable" - Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesDescribeGeneral ' Me.mnuStructuredTimeSeriesDescribeGeneral.Name = "mnuStructuredTimeSeriesDescribeGeneral" - Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesDescribeGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesDescribeGeneral.Text = "General..." ' 'ToolStripSeparator61 ' Me.ToolStripSeparator61.Name = "ToolStripSeparator61" - Me.ToolStripSeparator61.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator61.Size = New System.Drawing.Size(179, 6) ' 'mnuStructuredTimeSeriesModel ' Me.mnuStructuredTimeSeriesModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuStructuredTimeSeriesModelOneVariable, Me.mnuStructuredTimeSeriesModelGeneral}) Me.mnuStructuredTimeSeriesModel.Name = "mnuStructuredTimeSeriesModel" - Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(119, 22) + Me.mnuStructuredTimeSeriesModel.Size = New System.Drawing.Size(182, 34) Me.mnuStructuredTimeSeriesModel.Text = "Model" ' 'mnuStructuredTimeSeriesModelOneVariable ' Me.mnuStructuredTimeSeriesModelOneVariable.Name = "mnuStructuredTimeSeriesModelOneVariable" - Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelOneVariable.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelOneVariable.Text = "One Variable..." ' 'mnuStructuredTimeSeriesModelGeneral ' Me.mnuStructuredTimeSeriesModelGeneral.Name = "mnuStructuredTimeSeriesModelGeneral" - Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(149, 22) + Me.mnuStructuredTimeSeriesModelGeneral.Size = New System.Drawing.Size(226, 34) Me.mnuStructuredTimeSeriesModelGeneral.Text = "General..." ' 'ToolStripSeparator62 ' Me.ToolStripSeparator62.Name = "ToolStripSeparator62" - Me.ToolStripSeparator62.Size = New System.Drawing.Size(116, 6) + Me.ToolStripSeparator62.Size = New System.Drawing.Size(179, 6) ' 'ToolStripSeparator63 ' Me.ToolStripSeparator63.Name = "ToolStripSeparator63" - Me.ToolStripSeparator63.Size = New System.Drawing.Size(183, 6) + Me.ToolStripSeparator63.Size = New System.Drawing.Size(278, 6) ' 'mnuStructuredClimatic ' Me.mnuStructuredClimatic.Name = "mnuStructuredClimatic" - Me.mnuStructuredClimatic.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredClimatic.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredClimatic.Text = "Climatic..." Me.mnuStructuredClimatic.Visible = False ' 'mnuStructuredProcurement ' Me.mnuStructuredProcurement.Name = "mnuStructuredProcurement" - Me.mnuStructuredProcurement.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredProcurement.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredProcurement.Text = "Procurement..." Me.mnuStructuredProcurement.Visible = False ' 'mnuStructuredOptionByContext ' Me.mnuStructuredOptionByContext.Name = "mnuStructuredOptionByContext" - Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredOptionByContext.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredOptionByContext.Text = "Options by Context..." Me.mnuStructuredOptionByContext.Visible = False ' 'mnuStructuredSurvey ' Me.mnuStructuredSurvey.Name = "mnuStructuredSurvey" - Me.mnuStructuredSurvey.Size = New System.Drawing.Size(186, 22) + Me.mnuStructuredSurvey.Size = New System.Drawing.Size(281, 34) Me.mnuStructuredSurvey.Text = "Survey" Me.mnuStructuredSurvey.Visible = False ' @@ -4587,424 +4597,424 @@ Partial Class frmMain ' Me.mnuProcurement.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementOpenFromLibrary, Me.mnuProcurementDefineData, Me.mnuProcurementPrepare, Me.mnuProcurementDescribe, Me.mnuProcurementMapping, Me.mnuProcurementModel, Me.ToolStripSeparator45, Me.mnuProcurementDefineRedFlags, Me.mnuProcurementUseCRI}) Me.mnuProcurement.Name = "mnuProcurement" - Me.mnuProcurement.Size = New System.Drawing.Size(88, 22) + Me.mnuProcurement.Size = New System.Drawing.Size(129, 29) Me.mnuProcurement.Text = "Procurement" ' 'mnuProcurementOpenFromLibrary ' Me.mnuProcurementOpenFromLibrary.Name = "mnuProcurementOpenFromLibrary" - Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementOpenFromLibrary.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementOpenFromLibrary.Text = "Open From Library..." ' 'mnuProcurementDefineData ' Me.mnuProcurementDefineData.Name = "mnuProcurementDefineData" - Me.mnuProcurementDefineData.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineData.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineData.Text = "Define Procurement Data..." ' 'mnuProcurementPrepare ' Me.mnuProcurementPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementPrepareFilterByCountry, Me.ToolStripSeparator42, Me.mnuProcurementPrepareDefineContractValueCategories, Me.mnuProcurementPrepareRecodeNumericIntoQuantiles, Me.mnuProcurementPrepareSetFactorReferenceLevel, Me.mnuProcurementPrepareUseAwardDate, Me.ToolStripSeparator43, Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther, Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther, Me.mnuProcurementPrepareMergeAdditionalData}) Me.mnuProcurementPrepare.Name = "mnuProcurementPrepare" - Me.mnuProcurementPrepare.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementPrepare.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementPrepare.Text = "Prepare" ' 'mnuProcurementPrepareFilterByCountry ' Me.mnuProcurementPrepareFilterByCountry.Name = "mnuProcurementPrepareFilterByCountry" - Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareFilterByCountry.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareFilterByCountry.Text = "Filter by Country (or other)..." ' 'ToolStripSeparator42 ' Me.ToolStripSeparator42.Name = "ToolStripSeparator42" - Me.ToolStripSeparator42.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator42.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareDefineContractValueCategories ' Me.mnuProcurementPrepareDefineContractValueCategories.Name = "mnuProcurementPrepareDefineContractValueCategories" - Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareDefineContractValueCategories.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareDefineContractValueCategories.Text = "Define Contract Value Categories..." ' 'mnuProcurementPrepareRecodeNumericIntoQuantiles ' Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Name = "mnuProcurementPrepareRecodeNumericIntoQuantiles" - Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareRecodeNumericIntoQuantiles.Text = "Recode Numeric into Quantiles..." ' 'mnuProcurementPrepareSetFactorReferenceLevel ' Me.mnuProcurementPrepareSetFactorReferenceLevel.Name = "mnuProcurementPrepareSetFactorReferenceLevel" - Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSetFactorReferenceLevel.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSetFactorReferenceLevel.Text = "Set Factor Reference Level..." ' 'mnuProcurementPrepareUseAwardDate ' Me.mnuProcurementPrepareUseAwardDate.Name = "mnuProcurementPrepareUseAwardDate" - Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareUseAwardDate.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareUseAwardDate.Text = "Use Award Date (or other)..." ' 'ToolStripSeparator43 ' Me.ToolStripSeparator43.Name = "ToolStripSeparator43" - Me.ToolStripSeparator43.Size = New System.Drawing.Size(355, 6) + Me.ToolStripSeparator43.Size = New System.Drawing.Size(536, 6) ' 'mnuProcurementPrepareSummariseRedFlagsByCountryorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryorOther.Text = "Summarise Red Flags by Country (or other)..." ' 'mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther ' Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Name = "mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther" - Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareSummariseRedFlagsByCountryAndYearorOther.Text = "Summarise Red Flags by Country and Year (or other)..." ' 'mnuProcurementPrepareMergeAdditionalData ' Me.mnuProcurementPrepareMergeAdditionalData.Name = "mnuProcurementPrepareMergeAdditionalData" - Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(358, 22) + Me.mnuProcurementPrepareMergeAdditionalData.Size = New System.Drawing.Size(539, 34) Me.mnuProcurementPrepareMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuProcurementDescribe ' Me.mnuProcurementDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeOneVariableSummarise, Me.mnuProcurementDescribeOneVariableGraph, Me.ToolStripSeparator44, Me.mnuProcurementDescribeCategorical, Me.mnuProcurementDescribeNumeric}) Me.mnuProcurementDescribe.Name = "mnuProcurementDescribe" - Me.mnuProcurementDescribe.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDescribe.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDescribe.Text = "Describe" ' 'mnuProcurementDescribeOneVariableSummarise ' Me.mnuProcurementDescribeOneVariableSummarise.Name = "mnuProcurementDescribeOneVariableSummarise" - Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableSummarise.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuProcurementDescribeOneVariableGraph ' Me.mnuProcurementDescribeOneVariableGraph.Name = "mnuProcurementDescribeOneVariableGraph" - Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeOneVariableGraph.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeOneVariableGraph.Text = "One Variable Graph..." ' 'ToolStripSeparator44 ' Me.ToolStripSeparator44.Name = "ToolStripSeparator44" - Me.ToolStripSeparator44.Size = New System.Drawing.Size(208, 6) + Me.ToolStripSeparator44.Size = New System.Drawing.Size(316, 6) ' 'mnuProcurementDescribeCategorical ' Me.mnuProcurementDescribeCategorical.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeCategoricalOneVarFreq, Me.mnuProcurementDescribeCategoricalTwoVarFreq, Me.ToolStripSeparator52, Me.mnuProcurementDescribeCategoricalBarCharts, Me.mnuProcurementDescribeCategoricalMosaic, Me.mnuProcurementDescribeCategoricalTreemap, Me.DisplayTopNToolStripMenuItem}) Me.mnuProcurementDescribeCategorical.Name = "mnuProcurementDescribeCategorical" - Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeCategorical.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeCategorical.Text = "Categorical" ' 'mnuProcurementDescribeCategoricalOneVarFreq ' Me.mnuProcurementDescribeCategoricalOneVarFreq.Name = "mnuProcurementDescribeCategoricalOneVarFreq" - Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalOneVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalOneVarFreq.Text = "One Variable Frequencies..." ' 'mnuProcurementDescribeCategoricalTwoVarFreq ' Me.mnuProcurementDescribeCategoricalTwoVarFreq.Name = "mnuProcurementDescribeCategoricalTwoVarFreq" - Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTwoVarFreq.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTwoVarFreq.Text = "Two Variable Frequencies by Sector (or other)..." ' 'ToolStripSeparator52 ' Me.ToolStripSeparator52.Name = "ToolStripSeparator52" - Me.ToolStripSeparator52.Size = New System.Drawing.Size(316, 6) + Me.ToolStripSeparator52.Size = New System.Drawing.Size(479, 6) ' 'mnuProcurementDescribeCategoricalBarCharts ' Me.mnuProcurementDescribeCategoricalBarCharts.Name = "mnuProcurementDescribeCategoricalBarCharts" - Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalBarCharts.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalBarCharts.Text = "Bar Chart..." ' 'mnuProcurementDescribeCategoricalMosaic ' Me.mnuProcurementDescribeCategoricalMosaic.Name = "mnuProcurementDescribeCategoricalMosaic" - Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalMosaic.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalMosaic.Text = "Mosaic Plot..." ' 'mnuProcurementDescribeCategoricalTreemap ' Me.mnuProcurementDescribeCategoricalTreemap.Name = "mnuProcurementDescribeCategoricalTreemap" - Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(319, 22) + Me.mnuProcurementDescribeCategoricalTreemap.Size = New System.Drawing.Size(482, 34) Me.mnuProcurementDescribeCategoricalTreemap.Text = "Treemap..." ' 'DisplayTopNToolStripMenuItem ' Me.DisplayTopNToolStripMenuItem.Name = "DisplayTopNToolStripMenuItem" - Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(319, 22) + Me.DisplayTopNToolStripMenuItem.Size = New System.Drawing.Size(482, 34) Me.DisplayTopNToolStripMenuItem.Text = "Display Top N..." ' 'mnuProcurementDescribeNumeric ' Me.mnuProcurementDescribeNumeric.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementDescribeNumericBoxplot, Me.HistogramToolStripMenuItem, Me.ToolStripSeparator53, Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers}) Me.mnuProcurementDescribeNumeric.Name = "mnuProcurementDescribeNumeric" - Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(211, 22) + Me.mnuProcurementDescribeNumeric.Size = New System.Drawing.Size(319, 34) Me.mnuProcurementDescribeNumeric.Text = "Numeric" ' 'mnuProcurementDescribeNumericBoxplot ' Me.mnuProcurementDescribeNumericBoxplot.Name = "mnuProcurementDescribeNumericBoxplot" - Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericBoxplot.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericBoxplot.Text = "Boxplot..." ' 'HistogramToolStripMenuItem ' Me.HistogramToolStripMenuItem.Name = "HistogramToolStripMenuItem" - Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(258, 22) + Me.HistogramToolStripMenuItem.Size = New System.Drawing.Size(389, 34) Me.HistogramToolStripMenuItem.Text = "Histogram..." ' 'ToolStripSeparator53 ' Me.ToolStripSeparator53.Name = "ToolStripSeparator53" - Me.ToolStripSeparator53.Size = New System.Drawing.Size(255, 6) + Me.ToolStripSeparator53.Size = New System.Drawing.Size(386, 6) ' 'mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers ' Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Name = "mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers" - Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(258, 22) + Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Size = New System.Drawing.Size(389, 34) Me.mnuProcurementDescribeNumericCorrelationsRedFlagsOrOthers.Text = "Correlations (Red Flags or others)..." ' 'mnuProcurementMapping ' Me.mnuProcurementMapping.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementMappingMapCountryValues}) Me.mnuProcurementMapping.Name = "mnuProcurementMapping" - Me.mnuProcurementMapping.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementMapping.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementMapping.Text = "Mapping" ' 'mnuProcurementMappingMapCountryValues ' Me.mnuProcurementMappingMapCountryValues.Name = "mnuProcurementMappingMapCountryValues" - Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(189, 22) + Me.mnuProcurementMappingMapCountryValues.Size = New System.Drawing.Size(285, 34) Me.mnuProcurementMappingMapCountryValues.Text = "Map Country Values..." ' 'mnuProcurementModel ' Me.mnuProcurementModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementModelDefineCorruption, Me.mnuProcurementModelFitModelToolStripMenuItem}) Me.mnuProcurementModel.Name = "mnuProcurementModel" - Me.mnuProcurementModel.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementModel.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementModel.Text = "Model" ' 'mnuProcurementModelDefineCorruption ' Me.mnuProcurementModelDefineCorruption.Name = "mnuProcurementModelDefineCorruption" - Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelDefineCorruption.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelDefineCorruption.Text = "Define Corruption Indicators..." ' 'mnuProcurementModelFitModelToolStripMenuItem ' Me.mnuProcurementModelFitModelToolStripMenuItem.Name = "mnuProcurementModelFitModelToolStripMenuItem" - Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(233, 22) + Me.mnuProcurementModelFitModelToolStripMenuItem.Size = New System.Drawing.Size(351, 34) Me.mnuProcurementModelFitModelToolStripMenuItem.Text = "Fit Model..." ' 'ToolStripSeparator45 ' Me.ToolStripSeparator45.Name = "ToolStripSeparator45" - Me.ToolStripSeparator45.Size = New System.Drawing.Size(214, 6) + Me.ToolStripSeparator45.Size = New System.Drawing.Size(324, 6) ' 'mnuProcurementDefineRedFlags ' Me.mnuProcurementDefineRedFlags.Name = "mnuProcurementDefineRedFlags" - Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementDefineRedFlags.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementDefineRedFlags.Text = "Define Red Flag Variables..." ' 'mnuProcurementUseCRI ' Me.mnuProcurementUseCRI.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuProcurementCTFVCalculateCRI, Me.mnuProcurementUseCRISummariseCRIbyCountry}) Me.mnuProcurementUseCRI.Name = "mnuProcurementUseCRI" - Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(217, 22) + Me.mnuProcurementUseCRI.Size = New System.Drawing.Size(327, 34) Me.mnuProcurementUseCRI.Text = "Corruption Risk Index (CRI)" ' 'mnuProcurementCTFVCalculateCRI ' Me.mnuProcurementCTFVCalculateCRI.Name = "mnuProcurementCTFVCalculateCRI" - Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementCTFVCalculateCRI.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementCTFVCalculateCRI.Text = "Define Corruption Risk Index (CRI)..." ' 'mnuProcurementUseCRISummariseCRIbyCountry ' Me.mnuProcurementUseCRISummariseCRIbyCountry.Name = "mnuProcurementUseCRISummariseCRIbyCountry" - Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(278, 22) + Me.mnuProcurementUseCRISummariseCRIbyCountry.Size = New System.Drawing.Size(418, 34) Me.mnuProcurementUseCRISummariseCRIbyCountry.Text = "Summarise CRI by Country (or other)..." ' 'mnuOptionsByContext ' Me.mnuOptionsByContext.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckData, Me.mnuOptionsByContextDefine, Me.mnuOptionsByContextPrepare, Me.mnuOptionsByContextDescribe, Me.mnuOptionsByContextModel, Me.mnuOptionsByContextCropModel}) Me.mnuOptionsByContext.Name = "mnuOptionsByContext" - Me.mnuOptionsByContext.Size = New System.Drawing.Size(84, 22) + Me.mnuOptionsByContext.Size = New System.Drawing.Size(124, 29) Me.mnuOptionsByContext.Text = "Experiments" ' 'mnuOptionsByContextCheckData ' Me.mnuOptionsByContextCheckData.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCheckDataDuplicateRows, Me.mnuOptionsByContextCheckDataCompareColumns, Me.ToolStripSeparator47, Me.mnuOptionsByContextCheckDataOneVariableSummarise, Me.mnuOptionsByContextCheckDataOneVariableGraph, Me.mnuOptionsByContextCheckDataOneVariableFrequencies}) Me.mnuOptionsByContextCheckData.Name = "mnuOptionsByContextCheckData" - Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCheckData.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCheckData.Text = "Check Data" ' 'mnuOptionsByContextCheckDataDuplicateRows ' Me.mnuOptionsByContextCheckDataDuplicateRows.Name = "mnuOptionsByContextCheckDataDuplicateRows" - Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataDuplicateRows.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataDuplicateRows.Text = "Duplicate Rows..." ' 'mnuOptionsByContextCheckDataCompareColumns ' Me.mnuOptionsByContextCheckDataCompareColumns.Name = "mnuOptionsByContextCheckDataCompareColumns" - Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataCompareColumns.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataCompareColumns.Text = "Compare Columns..." ' 'ToolStripSeparator47 ' Me.ToolStripSeparator47.Name = "ToolStripSeparator47" - Me.ToolStripSeparator47.Size = New System.Drawing.Size(212, 6) + Me.ToolStripSeparator47.Size = New System.Drawing.Size(321, 6) ' 'mnuOptionsByContextCheckDataOneVariableSummarise ' Me.mnuOptionsByContextCheckDataOneVariableSummarise.Name = "mnuOptionsByContextCheckDataOneVariableSummarise" - Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableSummarise.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableSummarise.Text = "One Variable Summarise..." ' 'mnuOptionsByContextCheckDataOneVariableGraph ' Me.mnuOptionsByContextCheckDataOneVariableGraph.Name = "mnuOptionsByContextCheckDataOneVariableGraph" - Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableGraph.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableGraph.Text = "One Variable Graph..." ' 'mnuOptionsByContextCheckDataOneVariableFrequencies ' Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Name = "mnuOptionsByContextCheckDataOneVariableFrequencies" - Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(215, 22) + Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Size = New System.Drawing.Size(324, 34) Me.mnuOptionsByContextCheckDataOneVariableFrequencies.Text = "One Variable Frequencies..." ' 'mnuOptionsByContextDefine ' Me.mnuOptionsByContextDefine.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDefineOnStation, Me.mnuOptionsByContextDefineOnFarm}) Me.mnuOptionsByContextDefine.Name = "mnuOptionsByContextDefine" - Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDefine.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDefine.Text = "Define" ' 'mnuOptionsByContextDefineOnStation ' Me.mnuOptionsByContextDefineOnStation.Name = "mnuOptionsByContextDefineOnStation" - Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnStation.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnStation.Text = "On - Station..." ' 'mnuOptionsByContextDefineOnFarm ' Me.mnuOptionsByContextDefineOnFarm.Name = "mnuOptionsByContextDefineOnFarm" - Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(147, 22) + Me.mnuOptionsByContextDefineOnFarm.Size = New System.Drawing.Size(222, 34) Me.mnuOptionsByContextDefineOnFarm.Text = "On - Farm..." ' 'mnuOptionsByContextPrepare ' Me.mnuOptionsByContextPrepare.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions, Me.ToolStripSeparator48, Me.mnuOptionsByContextMergeAdditionalData, Me.mnuOptionsByContextPrepareStack, Me.mnuOptionsByContextPrepareUnstack}) Me.mnuOptionsByContextPrepare.Name = "mnuOptionsByContextPrepare" - Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextPrepare.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextPrepare.Text = "Prepare" ' 'mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions ' Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Name = "mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions" - Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareCalculateDIfferenceBetweenOptions.Text = "Calculate Difference Between Options..." ' 'ToolStripSeparator48 ' Me.ToolStripSeparator48.Name = "ToolStripSeparator48" - Me.ToolStripSeparator48.Size = New System.Drawing.Size(279, 6) + Me.ToolStripSeparator48.Size = New System.Drawing.Size(418, 6) ' 'mnuOptionsByContextMergeAdditionalData ' Me.mnuOptionsByContextMergeAdditionalData.Name = "mnuOptionsByContextMergeAdditionalData" - Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextMergeAdditionalData.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextMergeAdditionalData.Text = "Merge Additional Data..." ' 'mnuOptionsByContextPrepareStack ' Me.mnuOptionsByContextPrepareStack.Name = "mnuOptionsByContextPrepareStack" - Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareStack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareStack.Text = "Stack (Pivot Longer)..." ' 'mnuOptionsByContextPrepareUnstack ' Me.mnuOptionsByContextPrepareUnstack.Name = "mnuOptionsByContextPrepareUnstack" - Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(282, 22) + Me.mnuOptionsByContextPrepareUnstack.Size = New System.Drawing.Size(421, 34) Me.mnuOptionsByContextPrepareUnstack.Text = "Unstack (Pivot Wider)..." ' 'mnuOptionsByContextDescribe ' Me.mnuOptionsByContextDescribe.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextDescribeCompareTwoTreatments, Me.mnuOptionsByContextDescribeCompareMultipleTreatments, Me.mnuOptionsByContextDescribeBoxplot}) Me.mnuOptionsByContextDescribe.Name = "mnuOptionsByContextDescribe" - Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextDescribe.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextDescribe.Text = "Describe" ' 'mnuOptionsByContextDescribeCompareTwoTreatments ' Me.mnuOptionsByContextDescribeCompareTwoTreatments.Name = "mnuOptionsByContextDescribeCompareTwoTreatments" - Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareTwoTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareTwoTreatments.Text = "Compare Two Options..." ' 'mnuOptionsByContextDescribeCompareMultipleTreatments ' Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Enabled = False Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Name = "mnuOptionsByContextDescribeCompareMultipleTreatments" - Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeCompareMultipleTreatments.Text = "Compare Multiple Options..." ' 'mnuOptionsByContextDescribeBoxplot ' Me.mnuOptionsByContextDescribeBoxplot.Name = "mnuOptionsByContextDescribeBoxplot" - Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(224, 22) + Me.mnuOptionsByContextDescribeBoxplot.Size = New System.Drawing.Size(337, 34) Me.mnuOptionsByContextDescribeBoxplot.Text = "Boxplot..." ' 'mnuOptionsByContextModel ' Me.mnuOptionsByContextModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextModelFitModel, Me.mnuOptionsByContextGeneralFitModel}) Me.mnuOptionsByContextModel.Name = "mnuOptionsByContextModel" - Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextModel.Text = "Model" ' 'mnuOptionsByContextModelFitModel ' Me.mnuOptionsByContextModelFitModel.Name = "mnuOptionsByContextModelFitModel" - Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextModelFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextModelFitModel.Text = "Fit Model..." ' 'mnuOptionsByContextGeneralFitModel ' Me.mnuOptionsByContextGeneralFitModel.Name = "mnuOptionsByContextGeneralFitModel" - Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextGeneralFitModel.Size = New System.Drawing.Size(265, 34) Me.mnuOptionsByContextGeneralFitModel.Text = "General Fit Model..." ' 'mnuOptionsByContextCropModel ' Me.mnuOptionsByContextCropModel.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuOptionsByContextCropModelApsimxExamples}) Me.mnuOptionsByContextCropModel.Name = "mnuOptionsByContextCropModel" - Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(137, 22) + Me.mnuOptionsByContextCropModel.Size = New System.Drawing.Size(209, 34) Me.mnuOptionsByContextCropModel.Text = "Crop Model" ' 'mnuOptionsByContextCropModelApsimxExamples ' Me.mnuOptionsByContextCropModelApsimxExamples.Name = "mnuOptionsByContextCropModelApsimxExamples" - Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(176, 22) + Me.mnuOptionsByContextCropModelApsimxExamples.Size = New System.Drawing.Size(264, 34) Me.mnuOptionsByContextCropModelApsimxExamples.Text = "Apsimx Examples..." ' 'mnuTools ' Me.mnuTools.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuToolsRunRCode, Me.mnuToolsRestartR, Me.mnuToolsCheckForUpdates, Me.mnuToolsClearOutputWindow, Me.ToolStripSeparator5, Me.mnuToolsSaveCurrentOptions, Me.mnuToolsRestoreBackup, Me.mnuToolsInstallRPackage, Me.mnuToolsOptions}) Me.mnuTools.Name = "mnuTools" - Me.mnuTools.Size = New System.Drawing.Size(46, 22) + Me.mnuTools.Size = New System.Drawing.Size(69, 29) Me.mnuTools.Text = "Tools" ' 'mnuToolsRunRCode ' Me.mnuToolsRunRCode.Enabled = False Me.mnuToolsRunRCode.Name = "mnuToolsRunRCode" - Me.mnuToolsRunRCode.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRunRCode.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRunRCode.Tag = "Run_R_Code..." Me.mnuToolsRunRCode.Text = "Run R Code..." ' @@ -5012,54 +5022,54 @@ Partial Class frmMain ' Me.mnuToolsRestartR.Enabled = False Me.mnuToolsRestartR.Name = "mnuToolsRestartR" - Me.mnuToolsRestartR.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestartR.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestartR.Tag = "Restart_R" Me.mnuToolsRestartR.Text = "Restart R" ' 'mnuToolsCheckForUpdates ' Me.mnuToolsCheckForUpdates.Name = "mnuToolsCheckForUpdates" - Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsCheckForUpdates.Size = New System.Drawing.Size(298, 34) Me.mnuToolsCheckForUpdates.Tag = "Check_for_Updates..." Me.mnuToolsCheckForUpdates.Text = "Check for Updates..." ' 'mnuToolsClearOutputWindow ' Me.mnuToolsClearOutputWindow.Name = "mnuToolsClearOutputWindow" - Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsClearOutputWindow.Size = New System.Drawing.Size(298, 34) Me.mnuToolsClearOutputWindow.Tag = "Clear_Output_Window..." Me.mnuToolsClearOutputWindow.Text = "Clear Output Window..." ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(195, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(295, 6) ' 'mnuToolsSaveCurrentOptions ' Me.mnuToolsSaveCurrentOptions.Enabled = False Me.mnuToolsSaveCurrentOptions.Name = "mnuToolsSaveCurrentOptions" - Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsSaveCurrentOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsSaveCurrentOptions.Tag = "Save_Current_Options..." Me.mnuToolsSaveCurrentOptions.Text = "Save Current Options..." ' 'mnuToolsRestoreBackup ' Me.mnuToolsRestoreBackup.Name = "mnuToolsRestoreBackup" - Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsRestoreBackup.Size = New System.Drawing.Size(298, 34) Me.mnuToolsRestoreBackup.Tag = "Load_Options..." Me.mnuToolsRestoreBackup.Text = "Restore Backup..." ' 'mnuToolsInstallRPackage ' Me.mnuToolsInstallRPackage.Name = "mnuToolsInstallRPackage" - Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsInstallRPackage.Size = New System.Drawing.Size(298, 34) Me.mnuToolsInstallRPackage.Text = "Install R Package..." ' 'mnuToolsOptions ' Me.mnuToolsOptions.Name = "mnuToolsOptions" - Me.mnuToolsOptions.Size = New System.Drawing.Size(198, 22) + Me.mnuToolsOptions.Size = New System.Drawing.Size(298, 34) Me.mnuToolsOptions.Tag = "Options..." Me.mnuToolsOptions.Text = "Options..." ' @@ -5073,7 +5083,8 @@ Partial Class frmMain ' Me.splOverall.BackColor = System.Drawing.Color.LightGray Me.splOverall.Dock = System.Windows.Forms.DockStyle.Fill - Me.splOverall.Location = New System.Drawing.Point(0, 61) + Me.splOverall.Location = New System.Drawing.Point(0, 72) + Me.splOverall.Margin = New System.Windows.Forms.Padding(4) Me.splOverall.Name = "splOverall" Me.splOverall.Orientation = System.Windows.Forms.Orientation.Horizontal ' @@ -5086,9 +5097,9 @@ Partial Class frmMain ' Me.splOverall.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splOverall.Panel2.Controls.Add(Me.splDataOutput) - Me.splOverall.Size = New System.Drawing.Size(834, 399) - Me.splOverall.SplitterDistance = 160 - Me.splOverall.SplitterWidth = 5 + Me.splOverall.Size = New System.Drawing.Size(1251, 619) + Me.splOverall.SplitterDistance = 248 + Me.splOverall.SplitterWidth = 8 Me.splOverall.TabIndex = 10 ' 'splExtraWindows @@ -5096,6 +5107,7 @@ Partial Class frmMain Me.splExtraWindows.BackColor = System.Drawing.Color.LightGray Me.splExtraWindows.Dock = System.Windows.Forms.DockStyle.Fill Me.splExtraWindows.Location = New System.Drawing.Point(0, 0) + Me.splExtraWindows.Margin = New System.Windows.Forms.Padding(4) Me.splExtraWindows.Name = "splExtraWindows" ' 'splExtraWindows.Panel1 @@ -5107,9 +5119,9 @@ Partial Class frmMain ' Me.splExtraWindows.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splExtraWindows.Panel2.Controls.Add(Me.ucrScriptWindow) - Me.splExtraWindows.Size = New System.Drawing.Size(834, 160) - Me.splExtraWindows.SplitterDistance = 252 - Me.splExtraWindows.SplitterWidth = 5 + Me.splExtraWindows.Size = New System.Drawing.Size(1251, 248) + Me.splExtraWindows.SplitterDistance = 378 + Me.splExtraWindows.SplitterWidth = 8 Me.splExtraWindows.TabIndex = 0 ' 'splMetadata @@ -5117,6 +5129,7 @@ Partial Class frmMain Me.splMetadata.BackColor = System.Drawing.Color.LightGray Me.splMetadata.Dock = System.Windows.Forms.DockStyle.Fill Me.splMetadata.Location = New System.Drawing.Point(0, 0) + Me.splMetadata.Margin = New System.Windows.Forms.Padding(4) Me.splMetadata.Name = "splMetadata" ' 'splMetadata.Panel1 @@ -5127,9 +5140,9 @@ Partial Class frmMain ' Me.splMetadata.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splMetadata.Panel2.Controls.Add(Me.ucrDataFrameMeta) - Me.splMetadata.Size = New System.Drawing.Size(252, 160) - Me.splMetadata.SplitterDistance = 68 - Me.splMetadata.SplitterWidth = 5 + Me.splMetadata.Size = New System.Drawing.Size(378, 248) + Me.splMetadata.SplitterDistance = 102 + Me.splMetadata.SplitterWidth = 8 Me.splMetadata.TabIndex = 0 ' 'ucrColumnMeta @@ -5139,9 +5152,9 @@ Partial Class frmMain Me.ucrColumnMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrColumnMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrColumnMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrColumnMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrColumnMeta.Name = "ucrColumnMeta" - Me.ucrColumnMeta.Size = New System.Drawing.Size(68, 160) + Me.ucrColumnMeta.Size = New System.Drawing.Size(102, 248) Me.ucrColumnMeta.TabIndex = 0 ' 'ucrDataFrameMeta @@ -5150,9 +5163,9 @@ Partial Class frmMain Me.ucrDataFrameMeta.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataFrameMeta.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataFrameMeta.Location = New System.Drawing.Point(0, 0) - Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataFrameMeta.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataFrameMeta.Name = "ucrDataFrameMeta" - Me.ucrDataFrameMeta.Size = New System.Drawing.Size(179, 160) + Me.ucrDataFrameMeta.Size = New System.Drawing.Size(268, 248) Me.ucrDataFrameMeta.TabIndex = 0 ' 'ucrScriptWindow @@ -5161,9 +5174,9 @@ Partial Class frmMain Me.ucrScriptWindow.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrScriptWindow.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrScriptWindow.Location = New System.Drawing.Point(0, 0) - Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrScriptWindow.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrScriptWindow.Name = "ucrScriptWindow" - Me.ucrScriptWindow.Size = New System.Drawing.Size(577, 160) + Me.ucrScriptWindow.Size = New System.Drawing.Size(865, 248) Me.ucrScriptWindow.strActiveTabText = "" Me.ucrScriptWindow.TabIndex = 2 Me.ucrScriptWindow.Tag = "Script_Window" @@ -5173,6 +5186,7 @@ Partial Class frmMain Me.splDataOutput.BackColor = System.Drawing.Color.LightGray Me.splDataOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.splDataOutput.Location = New System.Drawing.Point(0, 0) + Me.splDataOutput.Margin = New System.Windows.Forms.Padding(4) Me.splDataOutput.Name = "splDataOutput" ' 'splDataOutput.Panel1 @@ -5184,9 +5198,9 @@ Partial Class frmMain ' Me.splDataOutput.Panel2.BackColor = System.Drawing.SystemColors.Control Me.splDataOutput.Panel2.Controls.Add(Me.ucrOutput) - Me.splDataOutput.Size = New System.Drawing.Size(834, 234) - Me.splDataOutput.SplitterDistance = 382 - Me.splDataOutput.SplitterWidth = 5 + Me.splDataOutput.Size = New System.Drawing.Size(1251, 363) + Me.splDataOutput.SplitterDistance = 573 + Me.splDataOutput.SplitterWidth = 8 Me.splDataOutput.TabIndex = 0 ' 'ucrDataViewer @@ -5196,9 +5210,9 @@ Partial Class frmMain Me.ucrDataViewer.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrDataViewer.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrDataViewer.Location = New System.Drawing.Point(0, 0) - Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrDataViewer.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrDataViewer.Name = "ucrDataViewer" - Me.ucrDataViewer.Size = New System.Drawing.Size(382, 234) + Me.ucrDataViewer.Size = New System.Drawing.Size(573, 363) Me.ucrDataViewer.TabIndex = 0 Me.ucrDataViewer.Tag = "Data_View" ' @@ -5208,9 +5222,9 @@ Partial Class frmMain Me.ucrOutput.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.ucrOutput.Dock = System.Windows.Forms.DockStyle.Fill Me.ucrOutput.Location = New System.Drawing.Point(0, 0) - Me.ucrOutput.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrOutput.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrOutput.Name = "ucrOutput" - Me.ucrOutput.Size = New System.Drawing.Size(447, 234) + Me.ucrOutput.Size = New System.Drawing.Size(670, 363) Me.ucrOutput.TabIndex = 0 ' 'mnuPlotly @@ -5250,9 +5264,9 @@ Partial Class frmMain ' 'frmMain ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(834, 482) + Me.ClientSize = New System.Drawing.Size(1251, 723) Me.Controls.Add(Me.splOverall) Me.Controls.Add(Me.stsStrip) Me.Controls.Add(Me.Tool_strip) @@ -5260,6 +5274,7 @@ Partial Class frmMain Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) Me.IsMdiContainer = True Me.MainMenuStrip = Me.mnuBar + Me.Margin = New System.Windows.Forms.Padding(4) Me.Name = "frmMain" Me.Text = "R-Instat .." Me.WindowState = System.Windows.Forms.FormWindowState.Maximized @@ -5972,4 +5987,5 @@ Partial Class frmMain Friend WithEvents mnuImportFromOpenAppBuilder As ToolStripMenuItem Friend WithEvents ToolStripSeparator15 As ToolStripSeparator Friend WithEvents mnuClimaticCheckDataDistances As ToolStripMenuItem + Friend WithEvents mnuUndo As ToolStripMenuItem End Class diff --git a/instat/frmMain.resx b/instat/frmMain.resx index c73bcdce42b..e679779467e 100644 --- a/instat/frmMain.resx +++ b/instat/frmMain.resx @@ -136,7 +136,7 @@ iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAASQSURBVEhLvVd9TFtVFEcT948zi3E4YGxGt6IE6CctLVC+ h9mHMiJLMGYmmi1R/5gzMRjjTNTMoEtYJlmWUVwMiSYODMvG1MzhnDNzA0opsJFAKGxxMMrHoB+8trSv P899763lo+32R+GX3PScc999v95zzj3nvgRImJjkYe3zkxQUDauMEHHdd06o8swkrTHxud845JT0SNrq QyB2OAPYXTaE7FwLaWu443G7D+kpv0ORvVquZrnDi6KEkKuHpznkl/dJWrwQRNNZJ7JfuIrCklvweL2S @@ -162,7 +162,7 @@ iVBORw0KGgoAAAANSUhEUgAAAG8AAABvCAYAAADixZ5gAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 + YQUAAAAJcEhZcwAAFiUAABYlAUlSJPAAAAjpSURBVHhe7V3LaxVXHE4EwQq+IAaVbgQf0FYLBQnx9Q+4 UExQ92oSqkVXopsuEsymXbRYCkVtgkJtVfpY+Eh1YaWWdiOJWdgWbWmlG000kTxujMnp+cY5ZnLyu7nn NXPPuZkPPpLce+b7nd/3hXtn5p6ZW8VyBIs8vICRhxcw8vACRh5ewMjDCxh5eAEjDy9gGIU3OjrKmpub WXV1NauqqsppSPgHH+GnCbTDe/bsGauvrycnk9OM8PPp06exw+rQCm9kZITV1dWRE8hpR/g6PDwcO60G diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d86e0193856..d911c3daadc 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -2894,4 +2894,8 @@ Public Class frmMain Private Sub mnuClimaticCheckDataDistances_Click(sender As Object, e As EventArgs) Handles mnuClimaticCheckDataDistances.Click dlgDistances.ShowDialog() End Sub + + Private Sub mnuUndo_Click(sender As Object, e As EventArgs) Handles mnuUndo.Click + ucrDataViewer.Undo() + End Sub End Class diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index b0c7ac4ce48..ebdf4047bf9 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -194,7 +194,7 @@ DataSheet$set("public", "clear_metadata", function() { ) DataSheet$set("public", "has_history", function() { - return(length(private$history)) + return(length(private$history) > 1) } ) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 9f3690bce3f..adb105daee0 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -101,6 +101,7 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False + frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasHistory RefreshDisplayInformation() End Sub @@ -275,6 +276,7 @@ Public Class ucrDataView SetDisplayLabels() UpdateNavigationButtons() SetGridVisibility(True) + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Else frmMain.tstatus.Text = GetTranslation("No data loaded") SetGridVisibility(False) @@ -1010,27 +1012,22 @@ Public Class ucrDataView EditCell() End Sub - Private Sub FindRow() + Public Sub FindRow() dlgFindInVariableOrFilter.ShowDialog() End Sub - Private Sub Undo() - If frmMain.clsInstatOptions.bUndoSwitchAction Then - Dim bUndo As Boolean = True - If GetCurrentDataFrameFocus.iTotalRowCount > 1000 Then - Dim result As DialogResult = MessageBox.Show(Me, "The dataset you are working with has more than 1000 rows, which may cause the undo operation to be slow. Do you want to proceed?", - "Large Data Set Detected", MessageBoxButtons.YesNo, MessageBoxIcon.Warning) - ' Check if the user clicked No - If result = DialogResult.No Then - bUndo = False - End If - End If - + Public Sub Undo() + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then + frmMain.mnuUndo.Enabled = False + Exit Sub + End If - If bUndo Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() - End If + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + frmMain.mnuUndo.Enabled = True + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If + End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, From 08342f5723e2e3202973c9987bf9e2ad7b8edebe Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 15:17:51 +0300 Subject: [PATCH 235/273] implemented Ctrl+Z under undo menu --- instat/Interface/IDataViewGrid.vb | 2 -- .../UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 -- .../UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 9 --------- instat/frmMain.Designer.vb | 3 +-- instat/ucrDataView.vb | 1 - 5 files changed, 1 insertion(+), 16 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index b4df19941b6..4145675170f 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -33,8 +33,6 @@ Public Interface IDataViewGrid Event FindRow() - Event Undo() - Sub AddColumns(visiblePage As clsDataFramePage) Sub AddRowData(dataFrame As clsDataFrame) diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3b0a6cb9641..3977f595ba1 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -33,8 +33,6 @@ Public Class ucrDataViewLinuxGrid Public Event FindRow() Implements IDataViewGrid.FindRow - Public Event Undo() Implements IDataViewGrid.Undo - Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index ffc92709e83..af8a4ea89e3 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -33,8 +33,6 @@ Public Class ucrDataViewReoGrid Public Event FindRow() Implements IDataViewGrid.FindRow - Public Event Undo() Implements IDataViewGrid.Undo - Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved @@ -283,13 +281,6 @@ Public Class ucrDataViewReoGrid ElseIf (e.KeyCode And Not Keys.Modifiers) = Keys.F AndAlso e.Modifiers = Keys.Control Then RaiseEvent FindRow() End If - - ' Detect Ctrl+Z for Undo operation - If e.Control AndAlso e.KeyCode = Keys.Z Then - RaiseEvent Undo() - e.Handled = True - e.SuppressKeyPress = True - End If End Sub Private Function GetColumnIndex(strColName As String) As Integer diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb index af04f1a6834..925cc2f7010 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -3031,8 +3031,7 @@ Partial Class frmMain 'mnuUndo ' Me.mnuUndo.Name = "mnuUndo" - Me.mnuUndo.ShortcutKeys = CType(((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Shift) _ - Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) + Me.mnuUndo.ShortcutKeys = CType((System.Windows.Forms.Keys.Control Or System.Windows.Forms.Keys.Z), System.Windows.Forms.Keys) Me.mnuUndo.Size = New System.Drawing.Size(270, 34) Me.mnuUndo.Text = "Undo" ' diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index adb105daee0..fcb92ca83ec 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -89,7 +89,6 @@ Public Class ucrDataView AddHandler _grid.DeleteValuesToDataframe, AddressOf DeleteCell_Click AddHandler _grid.EditCell, AddressOf EditCell AddHandler _grid.FindRow, AddressOf FindRow - AddHandler _grid.Undo, AddressOf Undo End Sub Private Sub RefreshWorksheet(fillWorkSheet As clsWorksheetAdapter, dataFrame As clsDataFrame) From 66d205be264ac16a510e8e29791def313c42c7f8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 18:15:06 +0300 Subject: [PATCH 236/273] design fixes, and added a msg for the limits when exceeded --- instat/clsInstatOptionsDefaults.vb | 4 +- instat/dlgOptions.Designer.vb | 92 +++++++++++++++--------------- instat/dlgOptions.vb | 4 +- instat/ucrDataView.vb | 28 ++++++++- 4 files changed, 75 insertions(+), 53 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index ffcf62d0ddb..d839f3c53b4 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,8 +33,8 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 - Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 - Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 0 + Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 4f9e071cf9f..4ffbef3ba91 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -38,12 +38,12 @@ Partial Class dlgOptions 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") + Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") Me.cmdApply = New System.Windows.Forms.Button() Me.cmdHelp = New System.Windows.Forms.Button() Me.cmdCancel = New System.Windows.Forms.Button() @@ -94,6 +94,7 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds = New instat.ucrNud() Me.ucrChkIncludeDefaultParams = New instat.ucrCheck() Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.ucrNudRowUndoLimit = New instat.ucrNud() Me.Label2 = New System.Windows.Forms.Label() @@ -133,7 +134,6 @@ Partial Class dlgOptions Me.ucrInputDatabaseName = New instat.ucrInputTextBox() Me.tbpWebsite = New System.Windows.Forms.TabPage() Me.ucrChkReminder = New instat.ucrCheck() - Me.Label4 = New System.Windows.Forms.Label() CType(Me.spltControls, System.ComponentModel.ISupportInitialize).BeginInit() Me.spltControls.Panel1.SuspendLayout() Me.spltControls.Panel2.SuspendLayout() @@ -249,29 +249,29 @@ Partial Class dlgOptions Me.trOptions.Location = New System.Drawing.Point(0, 0) Me.trOptions.Margin = New System.Windows.Forms.Padding(4) Me.trOptions.Name = "trOptions" - TreeNode1.Name = "ndLanguages" - TreeNode1.Tag = "1" - TreeNode1.Text = "Languages" - TreeNode1.ToolTipText = "Choose different languages" - TreeNode2.Name = "ndComments" - TreeNode2.Tag = "2" - TreeNode2.Text = "Comments" - TreeNode2.ToolTipText = "Comments for the dialogs" - TreeNode3.Name = "ndImport" - TreeNode3.Tag = "3" - TreeNode3.Text = "Import" - TreeNode3.ToolTipText = "Import Data Settings" - TreeNode4.Name = "ndOutputWindow" - TreeNode4.Tag = "4" - TreeNode4.Text = "Output Window" - TreeNode4.ToolTipText = "Output Window Formatting Options" - TreeNode5.Name = "ndCommands" - TreeNode5.Tag = "8" - TreeNode5.Text = "Commands" - TreeNode5.ToolTipText = "Commands Options" - TreeNode6.Name = "ndDataView" - TreeNode6.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}) + TreeNode7.Name = "ndLanguages" + TreeNode7.Tag = "1" + TreeNode7.Text = "Languages" + TreeNode7.ToolTipText = "Choose different languages" + TreeNode8.Name = "ndComments" + TreeNode8.Tag = "2" + TreeNode8.Text = "Comments" + TreeNode8.ToolTipText = "Comments for the dialogs" + TreeNode9.Name = "ndImport" + TreeNode9.Tag = "3" + TreeNode9.Text = "Import" + TreeNode9.ToolTipText = "Import Data Settings" + TreeNode10.Name = "ndOutputWindow" + TreeNode10.Tag = "4" + TreeNode10.Text = "Output Window" + TreeNode10.ToolTipText = "Output Window Formatting Options" + TreeNode11.Name = "ndCommands" + TreeNode11.Tag = "8" + TreeNode11.Text = "Commands" + TreeNode11.ToolTipText = "Commands Options" + TreeNode12.Name = "ndDataView" + TreeNode12.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) Me.trOptions.Size = New System.Drawing.Size(276, 476) Me.trOptions.TabIndex = 0 ' @@ -786,10 +786,20 @@ Partial Class dlgOptions Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True ' + 'Label4 + ' + Me.Label4.AutoSize = True + Me.Label4.Location = New System.Drawing.Point(25, 297) + Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) + Me.Label4.Name = "Label4" + Me.Label4.Size = New System.Drawing.Size(541, 20) + Me.Label4.TabIndex = 11 + Me.Label4.Text = "(Any changes from the default only apply to the current session of R-Instat.)" + ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(781, 230) + Me.Label3.Location = New System.Drawing.Point(669, 262) Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(46, 20) @@ -801,19 +811,19 @@ Partial Class dlgOptions Me.ucrNudRowUndoLimit.AutoSize = True Me.ucrNudRowUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudRowUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRowUndoLimit.Location = New System.Drawing.Point(692, 227) + Me.ucrNudRowUndoLimit.Location = New System.Drawing.Point(529, 259) Me.ucrNudRowUndoLimit.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudRowUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudRowUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudRowUndoLimit.Name = "ucrNudRowUndoLimit" - Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(77, 30) + Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(91, 30) Me.ucrNudRowUndoLimit.TabIndex = 9 Me.ucrNudRowUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(595, 230) + Me.Label2.Location = New System.Drawing.Point(629, 230) Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(86, 20) @@ -835,12 +845,12 @@ Partial Class dlgOptions Me.ucrNudColUndoLimit.AutoSize = True Me.ucrNudColUndoLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudColUndoLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudColUndoLimit.Location = New System.Drawing.Point(506, 227) + Me.ucrNudColUndoLimit.Location = New System.Drawing.Point(529, 227) Me.ucrNudColUndoLimit.Margin = New System.Windows.Forms.Padding(8) Me.ucrNudColUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudColUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudColUndoLimit.Name = "ucrNudColUndoLimit" - Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(81, 30) + Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(91, 30) Me.ucrNudColUndoLimit.TabIndex = 6 Me.ucrNudColUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' @@ -1238,16 +1248,6 @@ Partial Class dlgOptions Me.ucrChkReminder.Size = New System.Drawing.Size(620, 51) Me.ucrChkReminder.TabIndex = 2 ' - 'Label4 - ' - Me.Label4.AutoSize = True - Me.Label4.Location = New System.Drawing.Point(25, 262) - Me.Label4.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) - Me.Label4.Name = "Label4" - Me.Label4.Size = New System.Drawing.Size(541, 20) - Me.Label4.TabIndex = 11 - Me.Label4.Text = "(Any changes from the default only apply to the current session of R-Instat.)" - ' 'dlgOptions ' Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index f355500249f..f1898476d71 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -62,10 +62,10 @@ Public Class dlgOptions ucrNudWaitSeconds.Increment = 0.5 ucrNudColUndoLimit.Maximum = 1000 - ucrNudColUndoLimit.Minimum = 200 + ucrNudColUndoLimit.Minimum = 0 ucrNudColUndoLimit.Increment = 100 ucrNudRowUndoLimit.Maximum = Integer.MaxValue - ucrNudRowUndoLimit.Minimum = 200000 + ucrNudRowUndoLimit.Minimum = 100000 ucrNudRowUndoLimit.Increment = 100000 strPreviewText = "R-Instat 2017" diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index fcb92ca83ec..22bd3f5a733 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1017,13 +1017,35 @@ Public Class ucrDataView Public Sub Undo() If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse - (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then - frmMain.mnuUndo.Enabled = False + (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then + + ' Retrieve the default limits for rows and columns + Dim colLimit As Integer = frmMain.clsInstatOptions.iUndoColLimit + Dim rowLimit As Integer = frmMain.clsInstatOptions.iUndoRowLimit + + ' Construct the concise message + Dim msg As String = "The current data frame exceeds the undo limit (Columns: " & colLimit & ", Rows: " & rowLimit & ")." + + ' Append information on whether it's the rows, columns, or both + If GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit AndAlso + GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Both columns and rows exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit Then + msg &= " Columns exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Rows exceed the limit." + End If + + msg &= " Please go to Tools > Options to adjust the limits." + + ' Display the message box + MsgBox(msg, vbExclamation, "Undo Limit Exceeded") + Exit Sub End If + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - frmMain.mnuUndo.Enabled = True GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If From 1a60e3be1a7837161cfd1718685cb37a075dbd2c Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 18:24:33 +0300 Subject: [PATCH 237/273] set the deault column to 100 --- instat/clsInstatOptionsDefaults.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index d839f3c53b4..cfe0ad3d2b4 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,7 +33,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 - Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 0 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 100 Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" From 2a1d8d5014fae6d042cc886e913715525e9c26ee Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 16 Oct 2024 18:28:03 +0300 Subject: [PATCH 238/273] set the default to 200 for cols --- instat/clsInstatOptionsDefaults.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index cfe0ad3d2b4..82851729b85 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -33,7 +33,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiPreviewRows As Integer = 10 Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 - Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 100 + Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" From 9e5bdfcd406501f4bd84328e8a99bc231213b488 Mon Sep 17 00:00:00 2001 From: KWAMBAI VITALIS Date: Thu, 17 Oct 2024 12:53:56 +0300 Subject: [PATCH 239/273] changes --- instat/dlgExportToClimsoft.vb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/instat/dlgExportToClimsoft.vb b/instat/dlgExportToClimsoft.vb index 44f49a451e9..5db37c474ee 100644 --- a/instat/dlgExportToClimsoft.vb +++ b/instat/dlgExportToClimsoft.vb @@ -50,8 +50,6 @@ Public Class dlgExportToClimsoft ucrPnlOutput.AddRadioButton(rdoNewDataFrame) ucrPnlOutput.AddRadioButton(rdoExportData) ucrPnlOutput.AddRadioButton(rdoExportComments) - - ucrPnlOutput.AddParameterValuesCondition(rdoNewDataFrame, "check", "dataframe") ucrPnlOutput.AddParameterValuesCondition(rdoExportData, "check", "export") ucrPnlOutput.AddParameterValuesCondition(rdoExportComments, "check", "comments") @@ -217,16 +215,16 @@ Public Class dlgExportToClimsoft Private Sub ucrDataFrameSheets_Load(sender As Object, e As EventArgs) Handles ucrDataFrameSheets.Load If ucrDataFrameSheets.cboAvailableDataFrames.Items.Count > 0 Then ' Check if the .comment dataframe exists - Dim commentExists As Boolean = False + Dim bcommentExists As Boolean = False For Each dataframe As String In ucrDataFrameSheets.cboAvailableDataFrames.Items If dataframe = ".comment" Then - commentExists = True + bcommentExists = True Exit For End If Next ' Set .comment as the default selection if it exists - If commentExists Then + If bcommentExists Then ucrDataFrameSheets.cboAvailableDataFrames.SelectedItem = ".comment" End If End If From 6845c03d234e254e57720c9d8703437125e9aa96 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 11:40:19 +0300 Subject: [PATCH 240/273] memory management for the undo feature --- instat/static/InstatObject/R/data_object_R6.R | 28 +++++++++++++++++-- .../InstatObject/R/stand_alone_functions.R | 10 +++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index ebdf4047bf9..517f9c51342 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -203,6 +203,9 @@ DataSheet$set("public", "undo_last_action", function() { previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state private$history <- private$history[-length(private$history)] # Remove the latest state + + # Release memory by triggering garbage collection + gc() } else { message("No more actions to undo.") } @@ -284,14 +287,33 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { } ) +# Set history with memory management DataSheet$set("public", "set_history", function(history) { - if(!is.list(history)) stop("history must be of type: list") - MAX_HISTORY_SIZE <- 5 + if (!is.list(history)) stop("history must be of type: list") + + # Define memory and history limits + MAX_HISTORY_SIZE <- 5 # Limit to last 5 history states + MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo history + + # Check current memory usage + current_memory <- monitor_memory() + + # If memory exceeds limit, remove the oldest entry + if (current_memory > MAX_MEMORY_LIMIT_MB) { + message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) + private$history <- private$history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory + } + # Limit history size if (length(private$history) >= MAX_HISTORY_SIZE) { private$history <- private$history[-1] # Remove the oldest entry } - private$history <- append(private$history, history) + + private$history <- append(private$history, list(history)) + + # Explicitly call garbage collection to release memory + gc() }) DataSheet$set("public", "set_keys", function(new_keys) { diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index f85ee657f6f..043d26a36ad 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3415,3 +3415,13 @@ frac20 <- function(x) {paste0(round(x * 20), "/", 20)} #Give fraction our of 20 frac100 <- function(x) {paste0(round(x * 100), "/", 100)} # Give fraction our of 100 for a decimal value frac_den <- function(x, den) {paste0(round(x * den), "/", den)} # Give fraction for a given denominator + +# Monitor memory usage function +monitor_memory <- function() { + if (.Platform$OS.type == "windows") { + mem_used <- memory.size() + } #else { + # mem_used <- sum(gc()[, "used"]) / 1024 # Convert KB to MB on non-Windows systems + # } + return(mem_used) +} \ No newline at end of file From 68a40a4b1b4a4a55aebc8de9a9f7a2d8612c6299 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 11:44:42 +0300 Subject: [PATCH 241/273] added timer --- instat/static/InstatObject/R/data_object_R6.R | 2 ++ instat/static/InstatObject/R/stand_alone_functions.R | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 517f9c51342..7b35c4b8f6d 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -199,6 +199,7 @@ DataSheet$set("public", "has_history", function() { ) DataSheet$set("public", "undo_last_action", function() { + time_operation({ if (length(private$history) > 1) { previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state @@ -209,6 +210,7 @@ DataSheet$set("public", "undo_last_action", function() { } else { message("No more actions to undo.") } + }) }) # Redo function diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 043d26a36ad..ef7ae16ee90 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -3424,4 +3424,9 @@ monitor_memory <- function() { # mem_used <- sum(gc()[, "used"]) / 1024 # Convert KB to MB on non-Windows systems # } return(mem_used) +} + +time_operation <- function(expr) { + timing <- system.time(expr) + print(timing) } \ No newline at end of file From 7654b1295f692ce804a643a74abafededd9b43c7 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 12:39:32 +0300 Subject: [PATCH 242/273] added switch off undo option --- instat/clsInstatOptions.vb | 12 ++++ instat/clsInstatOptionsDefaults.vb | 1 + instat/dlgOptions.Designer.vb | 71 +++++++++++-------- instat/dlgOptions.vb | 15 +++- instat/static/InstatObject/R/data_object_R6.R | 4 +- instat/ucrDataView.vb | 51 ++++++------- 6 files changed, 95 insertions(+), 59 deletions(-) diff --git a/instat/clsInstatOptions.vb b/instat/clsInstatOptions.vb index 41799e583a3..548562707c6 100644 --- a/instat/clsInstatOptions.vb +++ b/instat/clsInstatOptions.vb @@ -45,6 +45,7 @@ Imports RDotNet Public bShowSignifStars As Nullable(Of Boolean) Public bChangeDataFrame As Nullable(Of Boolean) Public bAutoSaveData As Nullable(Of Boolean) + Public bSwitchOffUndo As Nullable(Of Boolean) Public bUndoSwitchAction As Nullable(Of Boolean) Public iAutoSaveDataMinutes As Nullable(Of Integer) Public bShowWaitDialog As Nullable(Of Boolean) @@ -89,6 +90,7 @@ Imports RDotNet bShowSignifStars = clsInstatOptionsDefaults.DEFAULTbShowSignifStars bChangeDataFrame = clsInstatOptionsDefaults.DEFAULTbChangeDataFrame bAutoSaveData = clsInstatOptionsDefaults.DEFAULTbAutoSaveData + bSwitchOffUndo = clsInstatOptionsDefaults.DEFAULTbSwitchOffUndo iAutoSaveDataMinutes = clsInstatOptionsDefaults.DEFAULTiAutoSaveDataMinutes bShowWaitDialog = clsInstatOptionsDefaults.DEFAULTbShowWaitDialog iWaitTimeDelaySeconds = clsInstatOptionsDefaults.DEFAULTiWaitTimeDelaySeconds @@ -261,6 +263,12 @@ Imports RDotNet SetAutoSaveData(clsInstatOptionsDefaults.DEFAULTbAutoSaveData) End If + If bSwitchOffUndo.HasValue Then + SetOffUndo(bSwitchOffUndo) + Else + SetOffUndo(clsInstatOptionsDefaults.DEFAULTbSwitchOffUndo) + End If + If iAutoSaveDataMinutes.HasValue Then SetAutoSaveDataMinutes(iAutoSaveDataMinutes) Else @@ -555,6 +563,10 @@ Imports RDotNet bAutoSaveData = bNewAutoSave End Sub + Public Sub SetOffUndo(bNewSwitchOffUndo As Boolean) + bSwitchOffUndo = bNewSwitchOffUndo + End Sub + Public Sub SetAutoSaveDataMinutes(iNewMinutes As Integer) iAutoSaveDataMinutes = iNewMinutes frmMain.ResetTimer() diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 82851729b85..6c69fd40326 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,6 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 4ffbef3ba91..5642d7bc6bc 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -38,12 +38,12 @@ Partial Class dlgOptions 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim TreeNode7 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") - Dim TreeNode8 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") - Dim TreeNode9 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") - Dim TreeNode10 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") - Dim TreeNode11 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") - Dim TreeNode12 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") + Dim TreeNode1 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Languages") + Dim TreeNode2 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Comments") + Dim TreeNode3 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Import") + Dim TreeNode4 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Output Window") + Dim TreeNode5 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Commands") + Dim TreeNode6 As System.Windows.Forms.TreeNode = New System.Windows.Forms.TreeNode("Data View") Me.cmdApply = New System.Windows.Forms.Button() Me.cmdHelp = New System.Windows.Forms.Button() Me.cmdCancel = New System.Windows.Forms.Button() @@ -94,6 +94,7 @@ Partial Class dlgOptions Me.ucrNudWaitSeconds = New instat.ucrNud() Me.ucrChkIncludeDefaultParams = New instat.ucrCheck() Me.tbpDataView = New System.Windows.Forms.TabPage() + Me.ucrChkTurnOffUndo = New instat.ucrCheck() Me.Label4 = New System.Windows.Forms.Label() Me.Label3 = New System.Windows.Forms.Label() Me.ucrNudRowUndoLimit = New instat.ucrNud() @@ -249,29 +250,29 @@ Partial Class dlgOptions Me.trOptions.Location = New System.Drawing.Point(0, 0) Me.trOptions.Margin = New System.Windows.Forms.Padding(4) Me.trOptions.Name = "trOptions" - TreeNode7.Name = "ndLanguages" - TreeNode7.Tag = "1" - TreeNode7.Text = "Languages" - TreeNode7.ToolTipText = "Choose different languages" - TreeNode8.Name = "ndComments" - TreeNode8.Tag = "2" - TreeNode8.Text = "Comments" - TreeNode8.ToolTipText = "Comments for the dialogs" - TreeNode9.Name = "ndImport" - TreeNode9.Tag = "3" - TreeNode9.Text = "Import" - TreeNode9.ToolTipText = "Import Data Settings" - TreeNode10.Name = "ndOutputWindow" - TreeNode10.Tag = "4" - TreeNode10.Text = "Output Window" - TreeNode10.ToolTipText = "Output Window Formatting Options" - TreeNode11.Name = "ndCommands" - TreeNode11.Tag = "8" - TreeNode11.Text = "Commands" - TreeNode11.ToolTipText = "Commands Options" - TreeNode12.Name = "ndDataView" - TreeNode12.Text = "Data View" - Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode7, TreeNode8, TreeNode9, TreeNode10, TreeNode11, TreeNode12}) + TreeNode1.Name = "ndLanguages" + TreeNode1.Tag = "1" + TreeNode1.Text = "Languages" + TreeNode1.ToolTipText = "Choose different languages" + TreeNode2.Name = "ndComments" + TreeNode2.Tag = "2" + TreeNode2.Text = "Comments" + TreeNode2.ToolTipText = "Comments for the dialogs" + TreeNode3.Name = "ndImport" + TreeNode3.Tag = "3" + TreeNode3.Text = "Import" + TreeNode3.ToolTipText = "Import Data Settings" + TreeNode4.Name = "ndOutputWindow" + TreeNode4.Tag = "4" + TreeNode4.Text = "Output Window" + TreeNode4.ToolTipText = "Output Window Formatting Options" + TreeNode5.Name = "ndCommands" + TreeNode5.Tag = "8" + TreeNode5.Text = "Commands" + TreeNode5.ToolTipText = "Commands Options" + TreeNode6.Name = "ndDataView" + TreeNode6.Text = "Data View" + Me.trOptions.Nodes.AddRange(New System.Windows.Forms.TreeNode() {TreeNode1, TreeNode2, TreeNode3, TreeNode4, TreeNode5, TreeNode6}) Me.trOptions.Size = New System.Drawing.Size(276, 476) Me.trOptions.TabIndex = 0 ' @@ -762,6 +763,7 @@ Partial Class dlgOptions ' 'tbpDataView ' + Me.tbpDataView.Controls.Add(Me.ucrChkTurnOffUndo) Me.tbpDataView.Controls.Add(Me.Label4) Me.tbpDataView.Controls.Add(Me.Label3) Me.tbpDataView.Controls.Add(Me.ucrNudRowUndoLimit) @@ -786,6 +788,16 @@ Partial Class dlgOptions Me.tbpDataView.Text = "Data View" Me.tbpDataView.UseVisualStyleBackColor = True ' + 'ucrChkTurnOffUndo + ' + Me.ucrChkTurnOffUndo.AutoSize = True + Me.ucrChkTurnOffUndo.Checked = False + Me.ucrChkTurnOffUndo.Location = New System.Drawing.Point(20, 349) + Me.ucrChkTurnOffUndo.Margin = New System.Windows.Forms.Padding(8) + Me.ucrChkTurnOffUndo.Name = "ucrChkTurnOffUndo" + Me.ucrChkTurnOffUndo.Size = New System.Drawing.Size(326, 51) + Me.ucrChkTurnOffUndo.TabIndex = 12 + ' 'Label4 ' Me.Label4.AutoSize = True @@ -1397,4 +1409,5 @@ Partial Class dlgOptions Friend WithEvents Label3 As Label Friend WithEvents ucrNudRowUndoLimit As ucrNud Friend WithEvents Label4 As Label + Friend WithEvents ucrChkTurnOffUndo As ucrCheck End Class diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index f1898476d71..76e880c2129 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -85,6 +85,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") + ucrChkTurnOffUndo.SetText("Switch off Spreadsheet-Style Undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -109,6 +110,7 @@ Public Class dlgOptions Private Sub LoadInstatOptions() ucrChkIncludeDefaultParams.Checked = frmMain.clsInstatOptions.bIncludeRDefaultParameters ucrChkAutoSave.Checked = frmMain.clsInstatOptions.bAutoSaveData + ucrChkTurnOffUndo.Checked = frmMain.clsInstatOptions.bSwitchOffUndo SetOutputFont(frmMain.clsInstatOptions.fntOutput, frmMain.clsInstatOptions.clrOutput) SetCommandFont(frmMain.clsInstatOptions.fntScript, frmMain.clsInstatOptions.clrScript) SetCommentFont(frmMain.clsInstatOptions.fntComment, frmMain.clsInstatOptions.clrComment) @@ -183,6 +185,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetUndoColLimit(ucrNudColUndoLimit.Value) frmMain.clsInstatOptions.SetUndoRowLimit(ucrNudRowUndoLimit.Value) frmMain.clsInstatOptions.SetAutoSaveData(ucrChkAutoSave.Checked) + frmMain.clsInstatOptions.SetOffUndo(ucrChkTurnOffUndo.Checked) frmMain.clsInstatOptions.SetAutoSaveDataMinutes(ucrNudAutoSaveMinutes.Value) frmMain.clsInstatOptions.SetLanguageCultureCode(strCurrLanguageCulture) frmMain.clsInstatOptions.SetWorkingDirectory(strWorkingDirectory) @@ -371,7 +374,7 @@ Public Class dlgOptions End Sub - Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged + Private Sub AllControls_ControlValueChanged() Handles ucrNudMaxCols.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrNudWaitSeconds.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged ApplyEnabled(True) End Sub @@ -439,7 +442,15 @@ Public Class dlgOptions ApplyEnabled(True) End Sub - Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged + Private Sub AllControls_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudWaitSeconds.ControlValueChanged, ucrNudPreviewRows.ControlValueChanged, ucrNudMaxRows.ControlValueChanged, ucrNudMaxCols.ControlValueChanged, ucrNudDigits.ControlValueChanged, ucrNudAutoSaveMinutes.ControlValueChanged, ucrInputUserName.ControlValueChanged, ucrInputPort.ControlValueChanged, ucrInputHost.ControlValueChanged, ucrInputDatabaseName.ControlValueChanged, ucrInputComment.ControlContentsChanged, ucrChkViewStructuredMenu.ControlValueChanged, ucrChkViewProcurementMenu.ControlValueChanged, ucrChkViewOptionsByContextMenu.ControlValueChanged, ucrChkViewClimaticMenu.ControlValueChanged, ucrChkShowWaitDialog.ControlValueChanged, ucrChkShowSignifStars.ControlValueChanged, ucrChkShowRCommandsinOutputWindow.ControlValueChanged, ucrChkShowDataonGrid.ControlValueChanged, ucrChkIncludeDefaultParams.ControlValueChanged, ucrChkIncludeCommentsbyDefault.ControlValueChanged, ucrChkAutoSave.ControlValueChanged, ucrNudMaxOutputsHeight.ControlValueChanged, ucrChkMaxOutputsHeight.ControlValueChanged, ucrChkReminder.ControlValueChanged, ucrNudColUndoLimit.ControlValueChanged, ucrNudRowUndoLimit.ControlValueChanged, ucrChkTurnOffUndo.ControlValueChanged + + End Sub + + Private Sub ucrInputLanguage_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputLanguage.ControlValueChanged + + End Sub + + Private Sub ucrPnlGraphDisplay_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlGraphDisplay.ControlValueChanged End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 7b35c4b8f6d..724916232cd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -33,8 +33,6 @@ DataSheet <- R6::R6Class("DataSheet", self$set_comments(comments) self$set_history(history) - self$save_state_to_history() - # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index if ( !(is.null(data_name) || data_name == "" || missing(data_name))) { @@ -294,7 +292,7 @@ DataSheet$set("public", "set_history", function(history) { if (!is.list(history)) stop("history must be of type: list") # Define memory and history limits - MAX_HISTORY_SIZE <- 5 # Limit to last 5 history states + MAX_HISTORY_SIZE <- 10 # Limit to last 10 history states MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo history # Check current memory usage diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 22bd3f5a733..5298e163f82 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1016,39 +1016,40 @@ Public Class ucrDataView End Sub Public Sub Undo() - If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + If frmMain.clsInstatOptions.bSwitchOffUndo Then + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then - ' Retrieve the default limits for rows and columns - Dim colLimit As Integer = frmMain.clsInstatOptions.iUndoColLimit - Dim rowLimit As Integer = frmMain.clsInstatOptions.iUndoRowLimit - - ' Construct the concise message - Dim msg As String = "The current data frame exceeds the undo limit (Columns: " & colLimit & ", Rows: " & rowLimit & ")." - - ' Append information on whether it's the rows, columns, or both - If GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit AndAlso - GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then - msg &= " Both columns and rows exceed the limit." - ElseIf GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit Then - msg &= " Columns exceed the limit." - ElseIf GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then - msg &= " Rows exceed the limit." - End If + ' Retrieve the default limits for rows and columns + Dim colLimit As Integer = frmMain.clsInstatOptions.iUndoColLimit + Dim rowLimit As Integer = frmMain.clsInstatOptions.iUndoRowLimit + + ' Construct the concise message + Dim msg As String = "The current data frame exceeds the undo limit (Columns: " & colLimit & ", Rows: " & rowLimit & ")." + + ' Append information on whether it's the rows, columns, or both + If GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit AndAlso + GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Both columns and rows exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalColumnCount >= colLimit Then + msg &= " Columns exceed the limit." + ElseIf GetCurrentDataFrameFocus().iTotalRowCount >= rowLimit Then + msg &= " Rows exceed the limit." + End If - msg &= " Please go to Tools > Options to adjust the limits." + msg &= " Please go to Tools > Options to adjust the limits." - ' Display the message box - MsgBox(msg, vbExclamation, "Undo Limit Exceeded") + ' Display the message box + MsgBox(msg, vbExclamation, "Undo Limit Exceeded") - Exit Sub - End If + Exit Sub + End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + End If End If - End Sub Public Sub SearchRowInGrid(rowNumbers As List(Of Integer), strColumn As String, Optional iRow As Integer = 0, From c033eec220dfb169687c8b1dfe8fdefff5ae97ba Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 12:53:07 +0300 Subject: [PATCH 243/273] small design change --- instat/clsInstatOptionsDefaults.vb | 3 +-- instat/dlgOptions.vb | 2 +- instat/ucrDataView.vb | 14 +++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 6c69fd40326..5a6720f27ef 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,8 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True - Public Shared ReadOnly DEFAULTbUndoSwitchAction As Boolean = False + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 76e880c2129..c85eb3672c3 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -85,7 +85,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") - ucrChkTurnOffUndo.SetText("Switch off Spreadsheet-Style Undo") + ucrChkTurnOffUndo.SetText("Switch on Spreadsheet-Style Undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 5298e163f82..cb1ce5e43f9 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1016,8 +1016,13 @@ Public Class ucrDataView End Sub Public Sub Undo() - If frmMain.clsInstatOptions.bSwitchOffUndo Then - If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + If Not frmMain.clsInstatOptions.bSwitchOffUndo Then + ' Show a message box indicating that undo is turned off + MsgBox("Undo is turned off, go to Tools > Options to turn it on.", vbInformation, "Undo Disabled") + Exit Sub + End If + + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then ' Retrieve the default limits for rows and columns @@ -1046,9 +1051,8 @@ Public Class ucrDataView End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() - End If + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If End Sub From 1d61315bf1ed1b174aea4505189570e51e19cacf Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 13:03:57 +0300 Subject: [PATCH 244/273] added timing --- instat/static/InstatObject/R/data_object_R6.R | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 724916232cd..062eadf87be 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -197,20 +197,40 @@ DataSheet$set("public", "has_history", function() { ) DataSheet$set("public", "undo_last_action", function() { - time_operation({ + # Track the start time + start_time <- Sys.time() + + # Perform the undo action if (length(private$history) > 1) { previous_state <- private$history[[length(private$history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - private$history <- private$history[-length(private$history)] # Remove the latest state - # Release memory by triggering garbage collection - gc() + private$history <- private$history[-length(private$history)] # Remove the latest state } else { message("No more actions to undo.") } - }) + + # Trigger garbage collection to free memory + gc() + + # Track the end time + end_time <- Sys.time() + + # Calculate elapsed time + elapsed_time <- as.numeric(difftime(end_time, start_time, units = "secs")) + + # Define a threshold for acceptable timing (in seconds) + acceptable_time_threshold <- 1.0 # Set this to your desired threshold + + # Check if the operation took longer than the acceptable threshold + if (elapsed_time > acceptable_time_threshold) { + warning(sprintf("undo operation took too long: %f seconds.", elapsed_time)) + } else { + message(sprintf("undo operation completed successfully in %f seconds.", elapsed_time)) + } }) + # Redo function DataSheet$set("public", "redo_last_action", function() { if (length(private$redo_history) > 0) { From c3e772f97b650096321beb98c3f77306e0c5ce50 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 13:42:16 +0300 Subject: [PATCH 245/273] minor design change --- instat/clsInstatOptionsDefaults.vb | 2 +- instat/dlgOptions.Designer.vb | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 5a6720f27ef..8a4ee9b62cd 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -34,7 +34,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiMaxRows As Integer = 1000 Public Shared ReadOnly DEFAULTiMaxCols As Integer = 50 Public Shared ReadOnly DEFAULTiUndoColLimit As Integer = 200 - Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 100000 + Public Shared ReadOnly DEFAULTiUndoRowLimit As Integer = 200000 Public Shared ReadOnly DEFAULTstrComment As String = "Dialog:" Public Shared ReadOnly DEFAULTstrGraphDisplayOption As String = "view_output_window" Public Shared ReadOnly DEFAULTbChangeDataFrame As Boolean = False diff --git a/instat/dlgOptions.Designer.vb b/instat/dlgOptions.Designer.vb index 5642d7bc6bc..53fdd6c58d4 100644 --- a/instat/dlgOptions.Designer.vb +++ b/instat/dlgOptions.Designer.vb @@ -811,7 +811,7 @@ Partial Class dlgOptions 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(669, 262) + Me.Label3.Location = New System.Drawing.Point(684, 262) Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(46, 20) @@ -828,14 +828,14 @@ Partial Class dlgOptions Me.ucrNudRowUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudRowUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudRowUndoLimit.Name = "ucrNudRowUndoLimit" - Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(91, 30) + Me.ucrNudRowUndoLimit.Size = New System.Drawing.Size(106, 30) Me.ucrNudRowUndoLimit.TabIndex = 9 Me.ucrNudRowUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(629, 230) + Me.Label2.Location = New System.Drawing.Point(644, 230) Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(86, 20) @@ -862,7 +862,7 @@ Partial Class dlgOptions Me.ucrNudColUndoLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudColUndoLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudColUndoLimit.Name = "ucrNudColUndoLimit" - Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(91, 30) + Me.ucrNudColUndoLimit.Size = New System.Drawing.Size(106, 30) Me.ucrNudColUndoLimit.TabIndex = 6 Me.ucrNudColUndoLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' From da5b9cb92c4ee6dbd0329edc9f4c1fedff52b3c8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 14:01:14 +0300 Subject: [PATCH 246/273] extended undo to reorder columns --- instat/static/InstatObject/R/data_object_R6.R | 3 +++ 1 file changed, 3 insertions(+) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 062eadf87be..184112cc473 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -1414,6 +1414,9 @@ DataSheet$set("public", "get_next_default_column_name", function(prefix) { DataSheet$set("public", "reorder_columns_in_data", function(col_order) { if (ncol(self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE)) != length(col_order)) stop("Columns to order should be same as columns in the data.") + # Save the current state to history before making modifications + self$save_state_to_history() + if(is.numeric(col_order)) { if(!(identical(sort(col_order), sort(as.numeric(1:ncol(data)))))) { stop("Invalid column order") From aa1bc04e5206e19d67f6bc040a9a996dfb7c0951 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 14:34:01 +0300 Subject: [PATCH 247/273] minor bug and design change --- instat/clsInstatOptionsDefaults.vb | 2 +- instat/static/InstatObject/R/data_object_R6.R | 17 ----------------- instat/ucrDataView.vb | 8 +++++--- 3 files changed, 6 insertions(+), 21 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 8a4ee9b62cd..6c840acc498 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,7 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 184112cc473..fc5b205242e 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -197,8 +197,6 @@ DataSheet$set("public", "has_history", function() { ) DataSheet$set("public", "undo_last_action", function() { - # Track the start time - start_time <- Sys.time() # Perform the undo action if (length(private$history) > 1) { @@ -213,21 +211,6 @@ DataSheet$set("public", "undo_last_action", function() { # Trigger garbage collection to free memory gc() - # Track the end time - end_time <- Sys.time() - - # Calculate elapsed time - elapsed_time <- as.numeric(difftime(end_time, start_time, units = "secs")) - - # Define a threshold for acceptable timing (in seconds) - acceptable_time_threshold <- 1.0 # Set this to your desired threshold - - # Check if the operation took longer than the acceptable threshold - if (elapsed_time > acceptable_time_threshold) { - warning(sprintf("undo operation took too long: %f seconds.", elapsed_time)) - } else { - message(sprintf("undo operation completed successfully in %f seconds.", elapsed_time)) - } }) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index cb1ce5e43f9..d799a279cc9 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1022,7 +1022,8 @@ Public Class ucrDataView Exit Sub End If - If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse + If _clsDataBook.DataFrames.Count > 0 Then + If (GetCurrentDataFrameFocus().iTotalColumnCount >= frmMain.clsInstatOptions.iUndoColLimit) OrElse (GetCurrentDataFrameFocus().iTotalRowCount >= frmMain.clsInstatOptions.iUndoRowLimit) Then ' Retrieve the default limits for rows and columns @@ -1051,8 +1052,9 @@ Public Class ucrDataView End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then - GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() + End If End If End Sub From 493508967e9457d874f13df28ca346dd948760ed Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Fri, 18 Oct 2024 14:38:42 +0300 Subject: [PATCH 248/273] minor design change --- instat/dlgOptions.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index c85eb3672c3..76e880c2129 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -85,7 +85,7 @@ Public Class dlgOptions ucrChkShowDataonGrid.SetText("Display dialog's selected data frame in grid") ucrChkIncludeDefaultParams.SetText("Include Default Parameter Values in R Commands") ucrChkAutoSave.SetText("Auto save a backup of data") - ucrChkTurnOffUndo.SetText("Switch on Spreadsheet-Style Undo") + ucrChkTurnOffUndo.SetText("Switch off Spreadsheet-Style Undo") ucrChkShowWaitDialog.SetText("Show waiting dialog when command takes longer than") ucrChkReminder.SetText("Remind me later when R-Instat new version available") ucrChkAutoSave.AddToLinkedControls(ucrNudAutoSaveMinutes, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) From 477d89f9aca4817c8db172759f0e61d7af90e359 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 21 Oct 2024 10:00:03 +0100 Subject: [PATCH 249/273] Change made --- instat/instat.vbproj | 9 ++ instat/sdgAdditionalCondition.Designer.vb | 41 ++++++++ instat/sdgAdditionalCondition.resx | 120 ++++++++++++++++++++++ instat/sdgAdditionalCondition.vb | 3 + 4 files changed, 173 insertions(+) create mode 100644 instat/sdgAdditionalCondition.Designer.vb create mode 100644 instat/sdgAdditionalCondition.resx create mode 100644 instat/sdgAdditionalCondition.vb diff --git a/instat/instat.vbproj b/instat/instat.vbproj index 02ca60eef9b..8f72bfeb211 100644 --- a/instat/instat.vbproj +++ b/instat/instat.vbproj @@ -325,6 +325,12 @@ + + sdgAdditionalCondition.vb + + + Form + sdgClimsoft.vb @@ -3405,6 +3411,9 @@ dlgThreeVariablePivotTable.vb + + sdgAdditionalCondition.vb + sdgClimsoft.vb diff --git a/instat/sdgAdditionalCondition.Designer.vb b/instat/sdgAdditionalCondition.Designer.vb new file mode 100644 index 00000000000..158a324dc4c --- /dev/null +++ b/instat/sdgAdditionalCondition.Designer.vb @@ -0,0 +1,41 @@ + _ +Partial Class sdgAdditionalCondition + Inherits System.Windows.Forms.Form + + 'Form remplace la méthode Dispose pour nettoyer la liste des composants. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Requise par le Concepteur Windows Form + Private components As System.ComponentModel.IContainer + + 'REMARQUE : la procédure suivante est requise par le Concepteur Windows Form + 'Elle peut être modifiée à l'aide du Concepteur Windows Form. + 'Ne la modifiez pas à l'aide de l'éditeur de code. + _ + Private Sub InitializeComponent() + Me.SuspendLayout() + ' + 'sdgAdditionalCondition + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(470, 179) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "sdgAdditionalCondition" + Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen + Me.Text = "Additional Condition" + Me.ResumeLayout(False) + + End Sub +End Class diff --git a/instat/sdgAdditionalCondition.resx b/instat/sdgAdditionalCondition.resx new file mode 100644 index 00000000000..1af7de150c9 --- /dev/null +++ b/instat/sdgAdditionalCondition.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/instat/sdgAdditionalCondition.vb b/instat/sdgAdditionalCondition.vb new file mode 100644 index 00000000000..c1ed2cd129d --- /dev/null +++ b/instat/sdgAdditionalCondition.vb @@ -0,0 +1,3 @@ +Public Class sdgAdditionalCondition + +End Class \ No newline at end of file From 350b437293556a8b1b609d37f14b29af6df5fe38 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 21 Oct 2024 10:02:06 +0100 Subject: [PATCH 250/273] Change made --- instat/sdgAdditionalCondition.Designer.vb | 245 ++++++++++++++++++++++ instat/sdgAdditionalCondition.vb | 153 +++++++++++++- 2 files changed, 397 insertions(+), 1 deletion(-) diff --git a/instat/sdgAdditionalCondition.Designer.vb b/instat/sdgAdditionalCondition.Designer.vb index 158a324dc4c..65c12bbc860 100644 --- a/instat/sdgAdditionalCondition.Designer.vb +++ b/instat/sdgAdditionalCondition.Designer.vb @@ -22,13 +22,238 @@ Partial Class sdgAdditionalCondition 'Ne la modifiez pas à l'aide de l'éditeur de code. _ Private Sub InitializeComponent() + Me.ucrChkNumberOfRainyDays = New instat.ucrCheck() + Me.ucrSdgButtons = New instat.ucrButtonsSubdialogue() + Me.ucrNudDPOverallInterval = New instat.ucrNud() + Me.ucrNudDSMaximumDays = New instat.ucrNud() + Me.ucrNudDSLengthOfTime = New instat.ucrNud() + Me.lblDPOverallInterval = New System.Windows.Forms.Label() + Me.ucrNudRDMinimumDays = New instat.ucrNud() + Me.ucrNudDPRainPeriod = New instat.ucrNud() + Me.lblDPLength = New System.Windows.Forms.Label() + Me.ucrChkDryPeriod = New instat.ucrCheck() + Me.lblDSLengthofTime = New System.Windows.Forms.Label() + Me.lblDPMaxRain = New System.Windows.Forms.Label() + Me.ucrNudRDOutOfDays = New instat.ucrNud() + Me.ucrNudDPMaxRain = New instat.ucrNud() + Me.ucrChkDrySpell = New instat.ucrCheck() + Me.lblDSMaximumDays = New System.Windows.Forms.Label() + Me.lblRDMinimum = New System.Windows.Forms.Label() + Me.lblRDWidth = New System.Windows.Forms.Label() Me.SuspendLayout() ' + 'ucrChkNumberOfRainyDays + ' + Me.ucrChkNumberOfRainyDays.AutoSize = True + Me.ucrChkNumberOfRainyDays.Checked = False + Me.ucrChkNumberOfRainyDays.Location = New System.Drawing.Point(14, 12) + Me.ucrChkNumberOfRainyDays.Name = "ucrChkNumberOfRainyDays" + Me.ucrChkNumberOfRainyDays.Size = New System.Drawing.Size(161, 23) + Me.ucrChkNumberOfRainyDays.TabIndex = 81 + ' + 'ucrSdgButtons + ' + Me.ucrSdgButtons.AutoSize = True + Me.ucrSdgButtons.Location = New System.Drawing.Point(108, 138) + Me.ucrSdgButtons.Name = "ucrSdgButtons" + Me.ucrSdgButtons.Size = New System.Drawing.Size(259, 29) + Me.ucrSdgButtons.TabIndex = 80 + ' + 'ucrNudDPOverallInterval + ' + Me.ucrNudDPOverallInterval.AutoSize = True + Me.ucrNudDPOverallInterval.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDPOverallInterval.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDPOverallInterval.Location = New System.Drawing.Point(249, 104) + Me.ucrNudDPOverallInterval.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDPOverallInterval.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDPOverallInterval.Name = "ucrNudDPOverallInterval" + Me.ucrNudDPOverallInterval.Size = New System.Drawing.Size(42, 20) + Me.ucrNudDPOverallInterval.TabIndex = 79 + Me.ucrNudDPOverallInterval.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudDSMaximumDays + ' + Me.ucrNudDSMaximumDays.AutoSize = True + Me.ucrNudDSMaximumDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDSMaximumDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDSMaximumDays.Location = New System.Drawing.Point(249, 44) + Me.ucrNudDSMaximumDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDSMaximumDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDSMaximumDays.Name = "ucrNudDSMaximumDays" + Me.ucrNudDSMaximumDays.Size = New System.Drawing.Size(42, 20) + Me.ucrNudDSMaximumDays.TabIndex = 70 + Me.ucrNudDSMaximumDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudDSLengthOfTime + ' + Me.ucrNudDSLengthOfTime.AutoSize = True + Me.ucrNudDSLengthOfTime.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDSLengthOfTime.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDSLengthOfTime.Location = New System.Drawing.Point(415, 44) + Me.ucrNudDSLengthOfTime.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDSLengthOfTime.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDSLengthOfTime.Name = "ucrNudDSLengthOfTime" + Me.ucrNudDSLengthOfTime.Size = New System.Drawing.Size(42, 20) + Me.ucrNudDSLengthOfTime.TabIndex = 72 + Me.ucrNudDSLengthOfTime.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblDPOverallInterval + ' + Me.lblDPOverallInterval.AutoSize = True + Me.lblDPOverallInterval.Location = New System.Drawing.Point(128, 107) + Me.lblDPOverallInterval.Name = "lblDPOverallInterval" + Me.lblDPOverallInterval.Size = New System.Drawing.Size(117, 13) + Me.lblDPOverallInterval.TabIndex = 78 + Me.lblDPOverallInterval.Text = "Overall Interval Length:" + ' + 'ucrNudRDMinimumDays + ' + Me.ucrNudRDMinimumDays.AutoSize = True + Me.ucrNudRDMinimumDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRDMinimumDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRDMinimumDays.Location = New System.Drawing.Point(249, 12) + Me.ucrNudRDMinimumDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudRDMinimumDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRDMinimumDays.Name = "ucrNudRDMinimumDays" + Me.ucrNudRDMinimumDays.Size = New System.Drawing.Size(42, 20) + Me.ucrNudRDMinimumDays.TabIndex = 65 + Me.ucrNudRDMinimumDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudDPRainPeriod + ' + Me.ucrNudDPRainPeriod.AutoSize = True + Me.ucrNudDPRainPeriod.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDPRainPeriod.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDPRainPeriod.Location = New System.Drawing.Point(415, 77) + Me.ucrNudDPRainPeriod.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDPRainPeriod.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDPRainPeriod.Name = "ucrNudDPRainPeriod" + Me.ucrNudDPRainPeriod.Size = New System.Drawing.Size(42, 20) + Me.ucrNudDPRainPeriod.TabIndex = 77 + Me.ucrNudDPRainPeriod.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblDPLength + ' + Me.lblDPLength.AutoSize = True + Me.lblDPLength.Location = New System.Drawing.Point(313, 77) + Me.lblDPLength.Name = "lblDPLength" + Me.lblDPLength.Size = New System.Drawing.Size(100, 13) + Me.lblDPLength.TabIndex = 76 + Me.lblDPLength.Text = "Maximum Dry Days:" + ' + 'ucrChkDryPeriod + ' + Me.ucrChkDryPeriod.AutoSize = True + Me.ucrChkDryPeriod.Checked = False + Me.ucrChkDryPeriod.Location = New System.Drawing.Point(14, 77) + Me.ucrChkDryPeriod.Name = "ucrChkDryPeriod" + Me.ucrChkDryPeriod.Size = New System.Drawing.Size(138, 55) + Me.ucrChkDryPeriod.TabIndex = 73 + ' + 'lblDSLengthofTime + ' + Me.lblDSLengthofTime.AutoSize = True + Me.lblDSLengthofTime.Location = New System.Drawing.Point(296, 48) + Me.lblDSLengthofTime.Name = "lblDSLengthofTime" + Me.lblDSLengthofTime.Size = New System.Drawing.Size(117, 13) + Me.lblDSLengthofTime.TabIndex = 71 + Me.lblDSLengthofTime.Text = "Overall Interval Length:" + ' + 'lblDPMaxRain + ' + Me.lblDPMaxRain.AutoSize = True + Me.lblDPMaxRain.Location = New System.Drawing.Point(164, 79) + Me.lblDPMaxRain.Name = "lblDPMaxRain" + Me.lblDPMaxRain.Size = New System.Drawing.Size(79, 13) + Me.lblDPMaxRain.TabIndex = 74 + Me.lblDPMaxRain.Text = "Maximum Rain:" + ' + 'ucrNudRDOutOfDays + ' + Me.ucrNudRDOutOfDays.AutoSize = True + Me.ucrNudRDOutOfDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRDOutOfDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRDOutOfDays.Location = New System.Drawing.Point(415, 12) + Me.ucrNudRDOutOfDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudRDOutOfDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRDOutOfDays.Name = "ucrNudRDOutOfDays" + Me.ucrNudRDOutOfDays.Size = New System.Drawing.Size(42, 20) + Me.ucrNudRDOutOfDays.TabIndex = 67 + Me.ucrNudRDOutOfDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudDPMaxRain + ' + Me.ucrNudDPMaxRain.AutoSize = True + Me.ucrNudDPMaxRain.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDPMaxRain.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudDPMaxRain.Location = New System.Drawing.Point(249, 76) + Me.ucrNudDPMaxRain.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudDPMaxRain.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudDPMaxRain.Name = "ucrNudDPMaxRain" + Me.ucrNudDPMaxRain.Size = New System.Drawing.Size(42, 20) + Me.ucrNudDPMaxRain.TabIndex = 75 + Me.ucrNudDPMaxRain.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkDrySpell + ' + Me.ucrChkDrySpell.AutoSize = True + Me.ucrChkDrySpell.Checked = False + Me.ucrChkDrySpell.Location = New System.Drawing.Point(14, 44) + Me.ucrChkDrySpell.Name = "ucrChkDrySpell" + Me.ucrChkDrySpell.Size = New System.Drawing.Size(126, 23) + Me.ucrChkDrySpell.TabIndex = 68 + ' + 'lblDSMaximumDays + ' + Me.lblDSMaximumDays.AutoSize = True + Me.lblDSMaximumDays.Location = New System.Drawing.Point(143, 48) + Me.lblDSMaximumDays.Name = "lblDSMaximumDays" + Me.lblDSMaximumDays.Size = New System.Drawing.Size(100, 13) + Me.lblDSMaximumDays.TabIndex = 69 + Me.lblDSMaximumDays.Text = "Maximum Dry Days:" + ' + 'lblRDMinimum + ' + Me.lblRDMinimum.AutoSize = True + Me.lblRDMinimum.Location = New System.Drawing.Point(192, 15) + Me.lblRDMinimum.Name = "lblRDMinimum" + Me.lblRDMinimum.Size = New System.Drawing.Size(51, 13) + Me.lblRDMinimum.TabIndex = 64 + Me.lblRDMinimum.Text = "Minimum:" + ' + 'lblRDWidth + ' + Me.lblRDWidth.AutoSize = True + Me.lblRDWidth.Location = New System.Drawing.Point(347, 12) + Me.lblRDWidth.Name = "lblRDWidth" + Me.lblRDWidth.Size = New System.Drawing.Size(66, 13) + Me.lblRDWidth.TabIndex = 66 + Me.lblRDWidth.Text = "Out of Days:" + ' 'sdgAdditionalCondition ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(470, 179) + Me.Controls.Add(Me.ucrChkNumberOfRainyDays) + Me.Controls.Add(Me.ucrSdgButtons) + Me.Controls.Add(Me.ucrNudDPOverallInterval) + Me.Controls.Add(Me.ucrNudDSMaximumDays) + Me.Controls.Add(Me.ucrNudDSLengthOfTime) + Me.Controls.Add(Me.lblDPOverallInterval) + Me.Controls.Add(Me.ucrNudRDMinimumDays) + Me.Controls.Add(Me.ucrNudDPRainPeriod) + Me.Controls.Add(Me.lblDPLength) + Me.Controls.Add(Me.ucrChkDryPeriod) + Me.Controls.Add(Me.lblDSLengthofTime) + Me.Controls.Add(Me.lblDPMaxRain) + Me.Controls.Add(Me.ucrNudRDOutOfDays) + Me.Controls.Add(Me.ucrNudDPMaxRain) + Me.Controls.Add(Me.ucrChkDrySpell) + Me.Controls.Add(Me.lblDSMaximumDays) + Me.Controls.Add(Me.lblRDMinimum) + Me.Controls.Add(Me.lblRDWidth) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -36,6 +261,26 @@ Partial Class sdgAdditionalCondition Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Additional Condition" Me.ResumeLayout(False) + Me.PerformLayout() End Sub + + Friend WithEvents ucrChkNumberOfRainyDays As ucrCheck + Friend WithEvents ucrSdgButtons As ucrButtonsSubdialogue + Friend WithEvents ucrNudDPOverallInterval As ucrNud + Friend WithEvents ucrNudDSMaximumDays As ucrNud + Friend WithEvents ucrNudDSLengthOfTime As ucrNud + Friend WithEvents lblDPOverallInterval As Label + Friend WithEvents ucrNudRDMinimumDays As ucrNud + Friend WithEvents ucrNudDPRainPeriod As ucrNud + Friend WithEvents lblDPLength As Label + Friend WithEvents ucrChkDryPeriod As ucrCheck + Friend WithEvents lblDSLengthofTime As Label + Friend WithEvents lblDPMaxRain As Label + Friend WithEvents ucrNudRDOutOfDays As ucrNud + Friend WithEvents ucrNudDPMaxRain As ucrNud + Friend WithEvents ucrChkDrySpell As ucrCheck + Friend WithEvents lblDSMaximumDays As Label + Friend WithEvents lblRDMinimum As Label + Friend WithEvents lblRDWidth As Label End Class diff --git a/instat/sdgAdditionalCondition.vb b/instat/sdgAdditionalCondition.vb index c1ed2cd129d..69fea212509 100644 --- a/instat/sdgAdditionalCondition.vb +++ b/instat/sdgAdditionalCondition.vb @@ -1,3 +1,154 @@ -Public Class sdgAdditionalCondition +' 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 sdgAdditionalCondition + Public bFirstLoad As Boolean = True + Public bControlsInitialised As Boolean = False + Private clsCombinedList, clsCalcDrySpellRollMax, clsIsNaFirstDryPeriod, clsIsNaFirstDrySpell, clsIsNaDryPeriod, clsIsNaDrySpell, clsRainDayRollingSumFunction, clsIsNaRollSumRainDay, clsIsNaFirstRollSumRainDay, clsDrySpellPeriodRollMaxFunction, clsRollingSumRainDryPeriodFunction, clsCalcRainDayRollingSum, clsCalcRollSumNumberDryPeriod As RFunction + Private clsConditionsAndOperator, clsIsNaOperatorStartDOY, clsConditionsOrOverallOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsSumRainDryPeriodIntervalMinusOperator, clsSumRainDryPeriodOperator, clsDPCombineOperator, clsSumRainDryPeriodIntervalPlusOperator As ROperator + + Private Sub sdgAdditionalCondition_Load(sender As Object, e As EventArgs) Handles MyBase.Load + autoTranslate(Me) + InitialiseControls() + End Sub + + Public Sub InitialiseControls() + ucrChkNumberOfRainyDays.SetText("Number of Rainy Days") + ucrChkNumberOfRainyDays.SetParameter(New RParameter("rd_sub", clsCalcRainDayRollingSum, 2, False), False) + ucrChkNumberOfRainyDays.AddAdditionalCodeParameterPair(clsConditionsAndOperator, New RParameter("rain_days", clsRollingSumRainDayOperator, 2, False), iAdditionalPairNo:=1) + + ucrNudRDMinimumDays.SetParameter(New RParameter("1", 1)) + ucrNudRDMinimumDays.SetLinkedDisplayControl(lblRDMinimum) + ucrNudRDMinimumDays.SetMinMax(1, 366) + + ucrNudRDOutOfDays.SetParameter(New RParameter("n", 1)) + ucrNudRDOutOfDays.SetLinkedDisplayControl(lblRDWidth) + ucrNudRDOutOfDays.SetMinMax(1, 366) + + ucrChkNumberOfRainyDays.AddToLinkedControls(ucrNudRDMinimumDays, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=1) + ucrChkNumberOfRainyDays.AddToLinkedControls(ucrNudRDOutOfDays, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=2) + + 'Dry Spell + ucrChkDrySpell.SetText("Dry Spell") + ucrChkDrySpell.SetParameter(New RParameter("ds_sub", clsCalcDrySpellRollMax, 3, False), False) + ucrChkDrySpell.AddAdditionalCodeParameterPair(clsConditionsAndOperator, New RParameter("dry_spell", clsDSCombineOperator, 3, False), iAdditionalPairNo:=1) + ucrChkDrySpell.AddToLinkedControls(ucrNudDSLengthOfTime, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=21) + ucrChkDrySpell.AddToLinkedControls(ucrNudDSMaximumDays, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=9) + ucrNudDSLengthOfTime.SetLinkedDisplayControl(lblDSLengthofTime) + ucrNudDSMaximumDays.SetLinkedDisplayControl(lblDSMaximumDays) + + ucrNudDSLengthOfTime.SetParameter(New RParameter("n", 1)) + ucrNudDSLengthOfTime.SetMinMax(1, 366) + + ucrNudDSMaximumDays.SetParameter(New RParameter("right", 1)) + ucrNudDSMaximumDays.SetMinMax(1, 366) + ucrNudDSMaximumDays.Increment = 1 + 'ucrNudDSMaximumDays.SetRDefault(9) + + ' Dry Period + ucrChkDryPeriod.SetText("Dry Period") + ucrChkDryPeriod.SetParameter(New RParameter("dp_sub", clsCalcRollSumNumberDryPeriod, 3, False), False) + ucrChkDryPeriod.AddAdditionalCodeParameterPair(clsConditionsAndOperator, New RParameter("dry_period", clsDPCombineOperator, 4, False), iAdditionalPairNo:=1) + + ucrNudDPRainPeriod.SetParameter(New RParameter("n", 0)) + ucrNudDPRainPeriod.SetLinkedDisplayControl(lblDPLength) + ucrNudDPRainPeriod.SetMinMax(1, 366) + + ucrNudDPMaxRain.SetParameter(New RParameter("right", 1)) + ucrNudDPMaxRain.SetLinkedDisplayControl(lblDPMaxRain) + ucrNudDPMaxRain.SetMinMax(1, Integer.MaxValue) + + ucrNudDPOverallInterval.SetParameter(New RParameter("0", 0)) + ucrNudDPOverallInterval.SetLinkedDisplayControl(lblDPOverallInterval) + ucrNudDPOverallInterval.SetMinMax(1, 366) + + ucrChkDryPeriod.AddToLinkedControls(ucrNudDPMaxRain, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=40) + ucrChkDryPeriod.AddToLinkedControls(ucrNudDPOverallInterval, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=45) + ucrChkDryPeriod.AddToLinkedControls(ucrNudDPRainPeriod, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30) + End Sub + + Public Sub SetRCode(clsNewCombinedList As RFunction, clsNewCalcDrySpellRollMax As RFunction, clsNewIsNaFirstDryPeriod As RFunction, clsNewIsNaFirstDrySpell As RFunction, clsNewIsNaDryPeriod As RFunction, clsNewIsNaDrySpell As RFunction, clsNewRainDayRollingSumFunction As RFunction, clsNewIsNaRollSumRainDay As RFunction, clsNewIsNaFirstRollSumRainDay As RFunction, clsNewDrySpellPeriodRollMaxFunction As RFunction, clsNewRollingSumRainDryPeriodFunction As RFunction, clsNewCalcRainDayRollingSum As RFunction, clsNewCalcRollSumNumberDryPeriod As RFunction, clsNewConditionsAndOperator As ROperator, clsNewIsNaOperatorStartDOY As ROperator, clsNewConditionsOrOverallOperator As ROperator, clsNewRollingSumRainDayOperator As ROperator, clsNewDSCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalMinusOperator As ROperator, clsNewSumRainDryPeriodOperator As ROperator, clsNewDPCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalPlusOperator As ROperator, Optional bReset As Boolean = False) + If Not bControlsInitialised Then + InitialiseControls() + End If + clsCombinedList = clsNewCombinedList + clsCalcDrySpellRollMax = clsNewCalcDrySpellRollMax + clsIsNaFirstDryPeriod = clsNewIsNaFirstDryPeriod + clsIsNaFirstDrySpell = clsNewIsNaFirstDrySpell + clsIsNaDryPeriod = clsNewIsNaDryPeriod + clsIsNaDrySpell = clsNewIsNaDrySpell + clsRainDayRollingSumFunction = clsNewRainDayRollingSumFunction + clsIsNaRollSumRainDay = clsNewIsNaRollSumRainDay + clsIsNaFirstRollSumRainDay = clsNewIsNaFirstRollSumRainDay + clsDrySpellPeriodRollMaxFunction = clsNewDrySpellPeriodRollMaxFunction + clsRollingSumRainDryPeriodFunction = clsNewRollingSumRainDryPeriodFunction + clsCalcRainDayRollingSum = clsNewCalcRainDayRollingSum + clsCalcRollSumNumberDryPeriod = clsNewCalcRollSumNumberDryPeriod + clsConditionsAndOperator = clsNewConditionsAndOperator + clsIsNaOperatorStartDOY = clsNewIsNaOperatorStartDOY + clsConditionsOrOverallOperator = clsNewConditionsOrOverallOperator + clsRollingSumRainDayOperator = clsNewRollingSumRainDayOperator + clsDSCombineOperator = clsNewDSCombineOperator + clsSumRainDryPeriodIntervalMinusOperator = clsNewSumRainDryPeriodIntervalMinusOperator + clsSumRainDryPeriodOperator = clsNewSumRainDryPeriodOperator + clsDPCombineOperator = clsNewDPCombineOperator + clsSumRainDryPeriodIntervalPlusOperator = clsNewSumRainDryPeriodIntervalPlusOperator + + ucrNudDPRainPeriod.AddAdditionalCodeParameterPair(clsSumRainDryPeriodIntervalPlusOperator, ucrNudDPRainPeriod.GetParameter(), iAdditionalPairNo:=1) + + ucrChkNumberOfRainyDays.SetRCode(clsCombinedList, bReset, bCloneIfNeeded:=True) + ucrChkDryPeriod.SetRCode(clsCombinedList, bReset, bCloneIfNeeded:=True) + ucrChkDrySpell.SetRCode(clsCombinedList, bReset, bCloneIfNeeded:=True) + End Sub + + Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged + If ucrChkNumberOfRainyDays.Checked Then + clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) + clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("2") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + End If + End Sub + + Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged + If ucrChkDrySpell.Checked Then + clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) + clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("3") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") + End If + End Sub + + Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged + If ucrChkDryPeriod.Checked Then + clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) + clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("4") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") + End If + End Sub + + Private Sub MaximumValuesControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlContentsChanged, ucrNudDPRainPeriod.ControlContentsChanged, ucrNudDPOverallInterval.ControlContentsChanged + If ucrChkDryPeriod.Checked Then + ucrNudDPRainPeriod.Maximum = ucrNudDPOverallInterval.Value + ucrNudDPOverallInterval.Minimum = ucrNudDPRainPeriod.Value + End If + End Sub End Class \ No newline at end of file From 8eb463fbbc9fd8d6a138db03aa5570bcc94b3448 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Mon, 21 Oct 2024 10:27:25 +0100 Subject: [PATCH 251/273] Added Additional Condition Sub Dialog --- instat/dlgStartofRains.Designer.vb | 928 ++++++++++++----------------- instat/dlgStartofRains.vb | 315 +++++----- 2 files changed, 567 insertions(+), 676 deletions(-) diff --git a/instat/dlgStartofRains.Designer.vb b/instat/dlgStartofRains.Designer.vb index e5f35fb174b..77dab3d9fdf 100644 --- a/instat/dlgStartofRains.Designer.vb +++ b/instat/dlgStartofRains.Designer.vb @@ -38,474 +38,106 @@ Partial Class dlgStartofRains 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.grpConditionsForSatrtofRains = New System.Windows.Forms.GroupBox() - Me.ucrNudDPOverallInterval = New instat.ucrNud() - Me.ucrNudDSMaximumDays = New instat.ucrNud() - Me.ucrNudDSLengthOfTime = New instat.ucrNud() - Me.lblDPOverallInterval = New System.Windows.Forms.Label() - Me.ucrNudRDMinimumDays = New instat.ucrNud() - Me.ucrNudDPRainPeriod = New instat.ucrNud() - Me.lblDPLength = New System.Windows.Forms.Label() - Me.ucrChkDryPeriod = New instat.ucrCheck() - Me.lblDSLengthofTime = New System.Windows.Forms.Label() - Me.lblDPMaxRain = New System.Windows.Forms.Label() - Me.ucrNudRDOutOfDays = New instat.ucrNud() - Me.ucrNudDPMaxRain = New instat.ucrNud() - Me.ucrChkDrySpell = New instat.ucrCheck() - Me.lblDSMaximumDays = New System.Windows.Forms.Label() - Me.lblRDMinimum = New System.Windows.Forms.Label() - Me.lblTROverDays = New System.Windows.Forms.Label() - Me.lblRDWidth = New System.Windows.Forms.Label() - Me.ucrChkNumberOfRainyDays = New instat.ucrCheck() - Me.ucrNudTROverDays = New instat.ucrNud() - Me.ucrNudTRAmount = New instat.ucrNud() - Me.lblTRVal = New System.Windows.Forms.Label() - Me.ucrChkTotalRainfall = New instat.ucrCheck() - Me.ucrNudTRPercentile = New instat.ucrNud() - Me.rdoTRAmount = New System.Windows.Forms.RadioButton() - Me.rdoTRPercentile = New System.Windows.Forms.RadioButton() - Me.ucrPnlTRCalculateBy = New instat.UcrPanel() - Me.grpRainParameters = New System.Windows.Forms.GroupBox() Me.ucrInputThreshold = New instat.ucrInputComboBox() - Me.ucrInputFilterPreview = New instat.ucrInputTextBox() - Me.cmdDoyRange = New System.Windows.Forms.Button() - Me.lblThreshold = New System.Windows.Forms.Label() - Me.lblDOY = New System.Windows.Forms.Label() - Me.lblDate = New System.Windows.Forms.Label() - Me.lblYear = New System.Windows.Forms.Label() - Me.lblStation = New System.Windows.Forms.Label() Me.lblRainfall = New System.Windows.Forms.Label() + Me.lblStation = New System.Windows.Forms.Label() + Me.lblYear = New System.Windows.Forms.Label() + Me.lblDate = New System.Windows.Forms.Label() + Me.lblDOY = New System.Windows.Forms.Label() Me.grpDisplay = New System.Windows.Forms.GroupBox() Me.ucrInputNewStatusColumnName = New instat.ucrInputTextBox() Me.ucrChkAsDate = New instat.ucrCheck() Me.ucrChkStatus = New instat.ucrCheck() Me.ucrInputNewDateColumnName = New instat.ucrInputTextBox() - Me.ucrChkAsDoy = New instat.ucrCheck() + Me.ucrSelectorForStartofRains = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrInputNewDoyColumnName = New instat.ucrInputTextBox() + Me.ucrChkAsDoy = New instat.ucrCheck() Me.ucrReceiverStation = New instat.ucrReceiverSingle() Me.ucrReceiverDate = New instat.ucrReceiverSingle() Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.ucrReceiverDOY = New instat.ucrReceiverSingle() Me.ucrReceiverRainfall = New instat.ucrReceiverSingle() - Me.ucrSelectorForStartofRains = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.ucrInputFilterPreview = New instat.ucrInputTextBox() + Me.ucrReceiverDOY = New instat.ucrReceiverSingle() + Me.grpConditionsForSatrtofRains = New System.Windows.Forms.GroupBox() + Me.cmdAdditionnal = New System.Windows.Forms.Button() + Me.ucrChkAdditional = New instat.ucrCheck() + Me.ucrReceiverEvap = New instat.ucrReceiverSingle() + Me.lblFraction = New System.Windows.Forms.Label() + Me.ucrNudEvapo = New instat.ucrNud() + Me.rdoEvapo = New System.Windows.Forms.RadioButton() + Me.lblTROverDays = New System.Windows.Forms.Label() + Me.ucrNudTROverDays = New instat.ucrNud() + Me.ucrNudTRAmount = New instat.ucrNud() + Me.lblTRVal = New System.Windows.Forms.Label() + Me.ucrChkTotalRainfall = New instat.ucrCheck() + Me.ucrNudTRPercentile = New instat.ucrNud() + Me.rdoTRAmount = New System.Windows.Forms.RadioButton() + Me.rdoTRPercentile = New System.Windows.Forms.RadioButton() + Me.ucrPnlTRCalculateBy = New instat.UcrPanel() + Me.lblThreshold = New System.Windows.Forms.Label() + Me.grpRainParameters = New System.Windows.Forms.GroupBox() + Me.cmdDoyRange = New System.Windows.Forms.Button() + Me.grpDisplay.SuspendLayout() Me.grpConditionsForSatrtofRains.SuspendLayout() Me.grpRainParameters.SuspendLayout() - Me.grpDisplay.SuspendLayout() Me.SuspendLayout() ' - 'grpConditionsForSatrtofRains - ' - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudDPOverallInterval) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudDSMaximumDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudDSLengthOfTime) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblDPOverallInterval) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudRDMinimumDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudDPRainPeriod) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblDPLength) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrChkDryPeriod) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblDSLengthofTime) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblDPMaxRain) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudRDOutOfDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudDPMaxRain) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrChkDrySpell) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblDSMaximumDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblRDMinimum) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblTROverDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblRDWidth) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrChkNumberOfRainyDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudTROverDays) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudTRAmount) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblTRVal) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrChkTotalRainfall) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudTRPercentile) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.rdoTRAmount) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.rdoTRPercentile) - Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrPnlTRCalculateBy) - Me.grpConditionsForSatrtofRains.Location = New System.Drawing.Point(4, 284) - Me.grpConditionsForSatrtofRains.Name = "grpConditionsForSatrtofRains" - Me.grpConditionsForSatrtofRains.Size = New System.Drawing.Size(686, 174) - Me.grpConditionsForSatrtofRains.TabIndex = 12 - Me.grpConditionsForSatrtofRains.TabStop = False - Me.grpConditionsForSatrtofRains.Text = "Conditions for Start of Rains" - ' - 'ucrNudDPOverallInterval - ' - Me.ucrNudDPOverallInterval.AutoSize = True - Me.ucrNudDPOverallInterval.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDPOverallInterval.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDPOverallInterval.Location = New System.Drawing.Point(641, 145) - Me.ucrNudDPOverallInterval.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudDPOverallInterval.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDPOverallInterval.Name = "ucrNudDPOverallInterval" - Me.ucrNudDPOverallInterval.Size = New System.Drawing.Size(42, 20) - Me.ucrNudDPOverallInterval.TabIndex = 25 - Me.ucrNudDPOverallInterval.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudDSMaximumDays - ' - Me.ucrNudDSMaximumDays.AutoSize = True - Me.ucrNudDSMaximumDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDSMaximumDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDSMaximumDays.Location = New System.Drawing.Point(255, 112) - Me.ucrNudDSMaximumDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudDSMaximumDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDSMaximumDays.Name = "ucrNudDSMaximumDays" - Me.ucrNudDSMaximumDays.Size = New System.Drawing.Size(42, 20) - Me.ucrNudDSMaximumDays.TabIndex = 16 - Me.ucrNudDSMaximumDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudDSLengthOfTime - ' - Me.ucrNudDSLengthOfTime.AutoSize = True - Me.ucrNudDSLengthOfTime.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDSLengthOfTime.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDSLengthOfTime.Location = New System.Drawing.Point(459, 112) - Me.ucrNudDSLengthOfTime.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudDSLengthOfTime.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDSLengthOfTime.Name = "ucrNudDSLengthOfTime" - Me.ucrNudDSLengthOfTime.Size = New System.Drawing.Size(42, 20) - Me.ucrNudDSLengthOfTime.TabIndex = 18 - Me.ucrNudDSLengthOfTime.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblDPOverallInterval - ' - Me.lblDPOverallInterval.AutoSize = True - Me.lblDPOverallInterval.Location = New System.Drawing.Point(505, 147) - Me.lblDPOverallInterval.Name = "lblDPOverallInterval" - Me.lblDPOverallInterval.Size = New System.Drawing.Size(117, 13) - Me.lblDPOverallInterval.TabIndex = 24 - Me.lblDPOverallInterval.Text = "Overall Interval Length:" - ' - 'ucrNudRDMinimumDays - ' - Me.ucrNudRDMinimumDays.AutoSize = True - Me.ucrNudRDMinimumDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRDMinimumDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRDMinimumDays.Location = New System.Drawing.Point(255, 79) - Me.ucrNudRDMinimumDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudRDMinimumDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRDMinimumDays.Name = "ucrNudRDMinimumDays" - Me.ucrNudRDMinimumDays.Size = New System.Drawing.Size(42, 20) - Me.ucrNudRDMinimumDays.TabIndex = 11 - Me.ucrNudRDMinimumDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudDPRainPeriod - ' - Me.ucrNudDPRainPeriod.AutoSize = True - Me.ucrNudDPRainPeriod.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDPRainPeriod.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDPRainPeriod.Location = New System.Drawing.Point(459, 145) - Me.ucrNudDPRainPeriod.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudDPRainPeriod.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDPRainPeriod.Name = "ucrNudDPRainPeriod" - Me.ucrNudDPRainPeriod.Size = New System.Drawing.Size(42, 20) - Me.ucrNudDPRainPeriod.TabIndex = 23 - Me.ucrNudDPRainPeriod.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblDPLength - ' - Me.lblDPLength.AutoSize = True - Me.lblDPLength.Location = New System.Drawing.Point(301, 147) - Me.lblDPLength.Name = "lblDPLength" - Me.lblDPLength.Size = New System.Drawing.Size(100, 13) - Me.lblDPLength.TabIndex = 22 - Me.lblDPLength.Text = "Maximum Dry Days:" - ' - 'ucrChkDryPeriod - ' - Me.ucrChkDryPeriod.AutoSize = True - Me.ucrChkDryPeriod.Checked = False - Me.ucrChkDryPeriod.Location = New System.Drawing.Point(4, 145) - Me.ucrChkDryPeriod.Name = "ucrChkDryPeriod" - Me.ucrChkDryPeriod.Size = New System.Drawing.Size(94, 23) - Me.ucrChkDryPeriod.TabIndex = 19 - ' - 'lblDSLengthofTime - ' - Me.lblDSLengthofTime.AutoSize = True - Me.lblDSLengthofTime.Location = New System.Drawing.Point(301, 116) - Me.lblDSLengthofTime.Name = "lblDSLengthofTime" - Me.lblDSLengthofTime.Size = New System.Drawing.Size(117, 13) - Me.lblDSLengthofTime.TabIndex = 17 - Me.lblDSLengthofTime.Text = "Overall Interval Length:" - ' - 'lblDPMaxRain - ' - Me.lblDPMaxRain.AutoSize = True - Me.lblDPMaxRain.Location = New System.Drawing.Point(118, 147) - Me.lblDPMaxRain.Name = "lblDPMaxRain" - Me.lblDPMaxRain.Size = New System.Drawing.Size(79, 13) - Me.lblDPMaxRain.TabIndex = 20 - Me.lblDPMaxRain.Text = "Maximum Rain:" - ' - 'ucrNudRDOutOfDays - ' - Me.ucrNudRDOutOfDays.AutoSize = True - Me.ucrNudRDOutOfDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRDOutOfDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRDOutOfDays.Location = New System.Drawing.Point(459, 79) - Me.ucrNudRDOutOfDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudRDOutOfDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRDOutOfDays.Name = "ucrNudRDOutOfDays" - Me.ucrNudRDOutOfDays.Size = New System.Drawing.Size(42, 20) - Me.ucrNudRDOutOfDays.TabIndex = 13 - Me.ucrNudRDOutOfDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudDPMaxRain - ' - Me.ucrNudDPMaxRain.AutoSize = True - Me.ucrNudDPMaxRain.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDPMaxRain.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudDPMaxRain.Location = New System.Drawing.Point(255, 145) - Me.ucrNudDPMaxRain.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudDPMaxRain.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudDPMaxRain.Name = "ucrNudDPMaxRain" - Me.ucrNudDPMaxRain.Size = New System.Drawing.Size(42, 20) - Me.ucrNudDPMaxRain.TabIndex = 21 - Me.ucrNudDPMaxRain.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkDrySpell - ' - Me.ucrChkDrySpell.AutoSize = True - Me.ucrChkDrySpell.Checked = False - Me.ucrChkDrySpell.Location = New System.Drawing.Point(4, 112) - Me.ucrChkDrySpell.Name = "ucrChkDrySpell" - Me.ucrChkDrySpell.Size = New System.Drawing.Size(94, 23) - Me.ucrChkDrySpell.TabIndex = 14 - ' - 'lblDSMaximumDays - ' - Me.lblDSMaximumDays.AutoSize = True - Me.lblDSMaximumDays.Location = New System.Drawing.Point(97, 116) - Me.lblDSMaximumDays.Name = "lblDSMaximumDays" - Me.lblDSMaximumDays.Size = New System.Drawing.Size(100, 13) - Me.lblDSMaximumDays.TabIndex = 15 - Me.lblDSMaximumDays.Text = "Maximum Dry Days:" - ' - 'lblRDMinimum - ' - Me.lblRDMinimum.AutoSize = True - Me.lblRDMinimum.Location = New System.Drawing.Point(146, 82) - Me.lblRDMinimum.Name = "lblRDMinimum" - Me.lblRDMinimum.Size = New System.Drawing.Size(51, 13) - Me.lblRDMinimum.TabIndex = 10 - Me.lblRDMinimum.Text = "Minimum:" - ' - 'lblTROverDays - ' - Me.lblTROverDays.AutoSize = True - Me.lblTROverDays.Location = New System.Drawing.Point(144, 26) - Me.lblTROverDays.Name = "lblTROverDays" - Me.lblTROverDays.Size = New System.Drawing.Size(60, 13) - Me.lblTROverDays.TabIndex = 1 - Me.lblTROverDays.Tag = "" - Me.lblTROverDays.Text = "Over Days:" - ' - 'lblRDWidth - ' - Me.lblRDWidth.AutoSize = True - Me.lblRDWidth.Location = New System.Drawing.Point(353, 82) - Me.lblRDWidth.Name = "lblRDWidth" - Me.lblRDWidth.Size = New System.Drawing.Size(66, 13) - Me.lblRDWidth.TabIndex = 12 - Me.lblRDWidth.Text = "Out of Days:" - ' - 'ucrChkNumberOfRainyDays - ' - Me.ucrChkNumberOfRainyDays.AutoSize = True - Me.ucrChkNumberOfRainyDays.Checked = False - Me.ucrChkNumberOfRainyDays.Location = New System.Drawing.Point(4, 79) - Me.ucrChkNumberOfRainyDays.Name = "ucrChkNumberOfRainyDays" - Me.ucrChkNumberOfRainyDays.Size = New System.Drawing.Size(143, 23) - Me.ucrChkNumberOfRainyDays.TabIndex = 9 - ' - 'ucrNudTROverDays - ' - Me.ucrNudTROverDays.AutoSize = True - Me.ucrNudTROverDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTROverDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTROverDays.Location = New System.Drawing.Point(235, 22) - Me.ucrNudTROverDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTROverDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTROverDays.Name = "ucrNudTROverDays" - Me.ucrNudTROverDays.Size = New System.Drawing.Size(42, 20) - Me.ucrNudTROverDays.TabIndex = 2 - Me.ucrNudTROverDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrNudTRAmount - ' - Me.ucrNudTRAmount.AutoSize = True - Me.ucrNudTRAmount.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTRAmount.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTRAmount.Location = New System.Drawing.Point(569, 22) - Me.ucrNudTRAmount.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTRAmount.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTRAmount.Name = "ucrNudTRAmount" - Me.ucrNudTRAmount.Size = New System.Drawing.Size(42, 20) - Me.ucrNudTRAmount.TabIndex = 6 - Me.ucrNudTRAmount.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblTRVal - ' - Me.lblTRVal.AutoSize = True - Me.lblTRVal.Location = New System.Drawing.Point(276, 26) - Me.lblTRVal.Name = "lblTRVal" - Me.lblTRVal.Size = New System.Drawing.Size(136, 13) - Me.lblTRVal.TabIndex = 3 - Me.lblTRVal.Text = "Calculate Rainfall Value by:" - ' - 'ucrChkTotalRainfall - ' - Me.ucrChkTotalRainfall.AutoSize = True - Me.ucrChkTotalRainfall.Checked = False - Me.ucrChkTotalRainfall.Location = New System.Drawing.Point(4, 22) - Me.ucrChkTotalRainfall.Name = "ucrChkTotalRainfall" - Me.ucrChkTotalRainfall.Size = New System.Drawing.Size(131, 23) - Me.ucrChkTotalRainfall.TabIndex = 0 - ' - 'ucrNudTRPercentile - ' - Me.ucrNudTRPercentile.AutoSize = True - Me.ucrNudTRPercentile.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTRPercentile.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTRPercentile.Location = New System.Drawing.Point(569, 48) - Me.ucrNudTRPercentile.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudTRPercentile.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudTRPercentile.Name = "ucrNudTRPercentile" - Me.ucrNudTRPercentile.Size = New System.Drawing.Size(42, 20) - Me.ucrNudTRPercentile.TabIndex = 8 - Me.ucrNudTRPercentile.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'rdoTRAmount - ' - Me.rdoTRAmount.AutoSize = True - Me.rdoTRAmount.Location = New System.Drawing.Point(479, 24) - Me.rdoTRAmount.Name = "rdoTRAmount" - Me.rdoTRAmount.Size = New System.Drawing.Size(61, 17) - Me.rdoTRAmount.TabIndex = 5 - Me.rdoTRAmount.TabStop = True - Me.rdoTRAmount.Text = "Amount" - Me.rdoTRAmount.UseVisualStyleBackColor = True - ' - 'rdoTRPercentile - ' - Me.rdoTRPercentile.AutoSize = True - Me.rdoTRPercentile.Location = New System.Drawing.Point(479, 48) - Me.rdoTRPercentile.Name = "rdoTRPercentile" - Me.rdoTRPercentile.Size = New System.Drawing.Size(72, 17) - Me.rdoTRPercentile.TabIndex = 7 - Me.rdoTRPercentile.TabStop = True - Me.rdoTRPercentile.Text = "Percentile" - Me.rdoTRPercentile.UseVisualStyleBackColor = True - ' - 'ucrPnlTRCalculateBy - ' - Me.ucrPnlTRCalculateBy.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlTRCalculateBy.Location = New System.Drawing.Point(476, 17) - Me.ucrPnlTRCalculateBy.Name = "ucrPnlTRCalculateBy" - Me.ucrPnlTRCalculateBy.Size = New System.Drawing.Size(146, 62) - Me.ucrPnlTRCalculateBy.TabIndex = 4 - ' - 'grpRainParameters - ' - Me.grpRainParameters.Controls.Add(Me.ucrInputThreshold) - Me.grpRainParameters.Controls.Add(Me.ucrInputFilterPreview) - Me.grpRainParameters.Controls.Add(Me.cmdDoyRange) - Me.grpRainParameters.Controls.Add(Me.lblThreshold) - Me.grpRainParameters.Location = New System.Drawing.Point(4, 238) - Me.grpRainParameters.Name = "grpRainParameters" - Me.grpRainParameters.Size = New System.Drawing.Size(686, 40) - Me.grpRainParameters.TabIndex = 11 - Me.grpRainParameters.TabStop = False - ' 'ucrInputThreshold ' Me.ucrInputThreshold.AddQuotesIfUnrecognised = True Me.ucrInputThreshold.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputThreshold.GetSetSelectedIndex = -1 Me.ucrInputThreshold.IsReadOnly = False - Me.ucrInputThreshold.Location = New System.Drawing.Point(70, 11) + Me.ucrInputThreshold.Location = New System.Drawing.Point(70, 9) Me.ucrInputThreshold.Name = "ucrInputThreshold" Me.ucrInputThreshold.Size = New System.Drawing.Size(62, 21) - Me.ucrInputThreshold.TabIndex = 21 - ' - 'ucrInputFilterPreview - ' - Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True - Me.ucrInputFilterPreview.AutoSize = True - Me.ucrInputFilterPreview.IsMultiline = False - Me.ucrInputFilterPreview.IsReadOnly = True - Me.ucrInputFilterPreview.Location = New System.Drawing.Point(277, 13) - Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" - Me.ucrInputFilterPreview.Size = New System.Drawing.Size(242, 22) - Me.ucrInputFilterPreview.TabIndex = 3 - ' - 'cmdDoyRange - ' - Me.cmdDoyRange.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDoyRange.Location = New System.Drawing.Point(159, 10) - Me.cmdDoyRange.Name = "cmdDoyRange" - Me.cmdDoyRange.Size = New System.Drawing.Size(105, 26) - Me.cmdDoyRange.TabIndex = 2 - Me.cmdDoyRange.Tag = "" - Me.cmdDoyRange.Text = "Day Range" - Me.cmdDoyRange.UseVisualStyleBackColor = True - ' - 'lblThreshold - ' - Me.lblThreshold.AutoSize = True - Me.lblThreshold.Location = New System.Drawing.Point(10, 14) - Me.lblThreshold.Name = "lblThreshold" - Me.lblThreshold.Size = New System.Drawing.Size(57, 13) - Me.lblThreshold.TabIndex = 0 - Me.lblThreshold.Tag = "Threshold" - Me.lblThreshold.Text = "Threshold:" + Me.ucrInputThreshold.TabIndex = 13 ' - 'lblDOY + 'lblRainfall ' - Me.lblDOY.AutoSize = True - Me.lblDOY.Location = New System.Drawing.Point(263, 158) - Me.lblDOY.Name = "lblDOY" - Me.lblDOY.Size = New System.Drawing.Size(66, 13) - Me.lblDOY.TabIndex = 7 - Me.lblDOY.Text = "Day of Year:" + Me.lblRainfall.AutoSize = True + Me.lblRainfall.Location = New System.Drawing.Point(293, 187) + Me.lblRainfall.Name = "lblRainfall" + Me.lblRainfall.Size = New System.Drawing.Size(70, 13) + Me.lblRainfall.TabIndex = 62 + Me.lblRainfall.Text = "Rain Column:" ' - 'lblDate + 'lblStation ' - Me.lblDate.AutoSize = True - Me.lblDate.Location = New System.Drawing.Point(263, 72) - Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(33, 13) - Me.lblDate.TabIndex = 3 - Me.lblDate.Text = "Date:" + Me.lblStation.AutoSize = True + Me.lblStation.Location = New System.Drawing.Point(293, 15) + Me.lblStation.Name = "lblStation" + Me.lblStation.Size = New System.Drawing.Size(43, 13) + Me.lblStation.TabIndex = 54 + Me.lblStation.Text = "Station:" ' 'lblYear ' Me.lblYear.AutoSize = True - Me.lblYear.Location = New System.Drawing.Point(263, 115) + Me.lblYear.Location = New System.Drawing.Point(293, 101) Me.lblYear.Name = "lblYear" Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 5 + Me.lblYear.TabIndex = 58 Me.lblYear.Text = "Year:" ' - 'lblStation + 'lblDate ' - Me.lblStation.AutoSize = True - Me.lblStation.Location = New System.Drawing.Point(263, 29) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 1 - Me.lblStation.Text = "Station:" + Me.lblDate.AutoSize = True + Me.lblDate.Location = New System.Drawing.Point(293, 58) + Me.lblDate.Name = "lblDate" + Me.lblDate.Size = New System.Drawing.Size(33, 13) + Me.lblDate.TabIndex = 56 + Me.lblDate.Text = "Date:" ' - 'lblRainfall + 'lblDOY ' - Me.lblRainfall.AutoSize = True - Me.lblRainfall.Location = New System.Drawing.Point(263, 201) - Me.lblRainfall.Name = "lblRainfall" - Me.lblRainfall.Size = New System.Drawing.Size(70, 13) - Me.lblRainfall.TabIndex = 9 - Me.lblRainfall.Text = "Rain Column:" + Me.lblDOY.AutoSize = True + Me.lblDOY.Location = New System.Drawing.Point(293, 144) + Me.lblDOY.Name = "lblDOY" + Me.lblDOY.Size = New System.Drawing.Size(66, 13) + Me.lblDOY.TabIndex = 60 + Me.lblDOY.Text = "Day of Year:" ' 'grpDisplay ' @@ -513,10 +145,10 @@ Partial Class dlgStartofRains Me.grpDisplay.Controls.Add(Me.ucrChkAsDate) Me.grpDisplay.Controls.Add(Me.ucrChkStatus) Me.grpDisplay.Controls.Add(Me.ucrInputNewDateColumnName) - Me.grpDisplay.Location = New System.Drawing.Point(4, 459) + Me.grpDisplay.Location = New System.Drawing.Point(13, 465) Me.grpDisplay.Name = "grpDisplay" - Me.grpDisplay.Size = New System.Drawing.Size(686, 49) - Me.grpDisplay.TabIndex = 13 + Me.grpDisplay.Size = New System.Drawing.Size(584, 49) + Me.grpDisplay.TabIndex = 66 Me.grpDisplay.TabStop = False Me.grpDisplay.Text = "Display" ' @@ -526,28 +158,28 @@ Partial Class dlgStartofRains Me.ucrInputNewStatusColumnName.AutoSize = True Me.ucrInputNewStatusColumnName.IsMultiline = False Me.ucrInputNewStatusColumnName.IsReadOnly = False - Me.ucrInputNewStatusColumnName.Location = New System.Drawing.Point(494, 18) + Me.ucrInputNewStatusColumnName.Location = New System.Drawing.Point(461, 18) Me.ucrInputNewStatusColumnName.Name = "ucrInputNewStatusColumnName" Me.ucrInputNewStatusColumnName.Size = New System.Drawing.Size(117, 21) - Me.ucrInputNewStatusColumnName.TabIndex = 19 + Me.ucrInputNewStatusColumnName.TabIndex = 51 ' 'ucrChkAsDate ' Me.ucrChkAsDate.AutoSize = True Me.ucrChkAsDate.Checked = False - Me.ucrChkAsDate.Location = New System.Drawing.Point(227, 18) + Me.ucrChkAsDate.Location = New System.Drawing.Point(194, 18) Me.ucrChkAsDate.Name = "ucrChkAsDate" Me.ucrChkAsDate.Size = New System.Drawing.Size(51, 23) - Me.ucrChkAsDate.TabIndex = 16 + Me.ucrChkAsDate.TabIndex = 48 ' 'ucrChkStatus ' Me.ucrChkStatus.AutoSize = True Me.ucrChkStatus.Checked = False - Me.ucrChkStatus.Location = New System.Drawing.Point(405, 18) + Me.ucrChkStatus.Location = New System.Drawing.Point(372, 18) Me.ucrChkStatus.Name = "ucrChkStatus" Me.ucrChkStatus.Size = New System.Drawing.Size(84, 23) - Me.ucrChkStatus.TabIndex = 18 + Me.ucrChkStatus.TabIndex = 50 ' 'ucrInputNewDateColumnName ' @@ -555,19 +187,22 @@ Partial Class dlgStartofRains Me.ucrInputNewDateColumnName.AutoSize = True Me.ucrInputNewDateColumnName.IsMultiline = False Me.ucrInputNewDateColumnName.IsReadOnly = False - Me.ucrInputNewDateColumnName.Location = New System.Drawing.Point(281, 18) + Me.ucrInputNewDateColumnName.Location = New System.Drawing.Point(248, 18) Me.ucrInputNewDateColumnName.Name = "ucrInputNewDateColumnName" Me.ucrInputNewDateColumnName.Size = New System.Drawing.Size(115, 21) - Me.ucrInputNewDateColumnName.TabIndex = 17 + Me.ucrInputNewDateColumnName.TabIndex = 49 ' - 'ucrChkAsDoy + 'ucrSelectorForStartofRains ' - Me.ucrChkAsDoy.AutoSize = True - Me.ucrChkAsDoy.Checked = False - Me.ucrChkAsDoy.Location = New System.Drawing.Point(13, 477) - Me.ucrChkAsDoy.Name = "ucrChkAsDoy" - Me.ucrChkAsDoy.Size = New System.Drawing.Size(83, 23) - Me.ucrChkAsDoy.TabIndex = 14 + Me.ucrSelectorForStartofRains.AutoSize = True + Me.ucrSelectorForStartofRains.bDropUnusedFilterLevels = False + Me.ucrSelectorForStartofRains.bShowHiddenColumns = False + Me.ucrSelectorForStartofRains.bUseCurrentFilter = True + Me.ucrSelectorForStartofRains.Location = New System.Drawing.Point(14, 6) + Me.ucrSelectorForStartofRains.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorForStartofRains.Name = "ucrSelectorForStartofRains" + Me.ucrSelectorForStartofRains.Size = New System.Drawing.Size(213, 183) + Me.ucrSelectorForStartofRains.TabIndex = 53 ' 'ucrInputNewDoyColumnName ' @@ -575,119 +210,347 @@ Partial Class dlgStartofRains Me.ucrInputNewDoyColumnName.AutoSize = True Me.ucrInputNewDoyColumnName.IsMultiline = False Me.ucrInputNewDoyColumnName.IsReadOnly = False - Me.ucrInputNewDoyColumnName.Location = New System.Drawing.Point(99, 477) + Me.ucrInputNewDoyColumnName.Location = New System.Drawing.Point(75, 483) Me.ucrInputNewDoyColumnName.Name = "ucrInputNewDoyColumnName" Me.ucrInputNewDoyColumnName.Size = New System.Drawing.Size(127, 21) - Me.ucrInputNewDoyColumnName.TabIndex = 15 + Me.ucrInputNewDoyColumnName.TabIndex = 68 + ' + 'ucrChkAsDoy + ' + Me.ucrChkAsDoy.AutoSize = True + Me.ucrChkAsDoy.Checked = False + Me.ucrChkAsDoy.Location = New System.Drawing.Point(20, 483) + Me.ucrChkAsDoy.Name = "ucrChkAsDoy" + Me.ucrChkAsDoy.Size = New System.Drawing.Size(69, 23) + Me.ucrChkAsDoy.TabIndex = 67 ' 'ucrReceiverStation ' Me.ucrReceiverStation.AutoSize = True Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(260, 45) + Me.ucrReceiverStation.Location = New System.Drawing.Point(290, 31) Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStation.Name = "ucrReceiverStation" Me.ucrReceiverStation.Selector = Nothing Me.ucrReceiverStation.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 2 + Me.ucrReceiverStation.TabIndex = 55 Me.ucrReceiverStation.ucrSelector = Nothing ' 'ucrReceiverDate ' Me.ucrReceiverDate.AutoSize = True Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(260, 88) + Me.ucrReceiverDate.Location = New System.Drawing.Point(290, 74) Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverDate.Name = "ucrReceiverDate" Me.ucrReceiverDate.Selector = Nothing Me.ucrReceiverDate.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 4 + Me.ucrReceiverDate.TabIndex = 57 Me.ucrReceiverDate.ucrSelector = Nothing ' 'ucrReceiverYear ' Me.ucrReceiverYear.AutoSize = True Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(260, 131) + Me.ucrReceiverYear.Location = New System.Drawing.Point(290, 117) Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverYear.Name = "ucrReceiverYear" Me.ucrReceiverYear.Selector = Nothing Me.ucrReceiverYear.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 6 + Me.ucrReceiverYear.TabIndex = 59 Me.ucrReceiverYear.ucrSelector = Nothing ' - 'ucrReceiverDOY - ' - Me.ucrReceiverDOY.AutoSize = True - Me.ucrReceiverDOY.frmParent = Me - Me.ucrReceiverDOY.Location = New System.Drawing.Point(260, 174) - Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverDOY.Name = "ucrReceiverDOY" - Me.ucrReceiverDOY.Selector = Nothing - Me.ucrReceiverDOY.Size = New System.Drawing.Size(143, 20) - Me.ucrReceiverDOY.strNcFilePath = "" - Me.ucrReceiverDOY.TabIndex = 8 - Me.ucrReceiverDOY.ucrSelector = Nothing - ' 'ucrReceiverRainfall ' Me.ucrReceiverRainfall.AutoSize = True Me.ucrReceiverRainfall.frmParent = Me - Me.ucrReceiverRainfall.Location = New System.Drawing.Point(260, 217) + Me.ucrReceiverRainfall.Location = New System.Drawing.Point(290, 203) Me.ucrReceiverRainfall.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverRainfall.Name = "ucrReceiverRainfall" Me.ucrReceiverRainfall.Selector = Nothing Me.ucrReceiverRainfall.Size = New System.Drawing.Size(143, 20) Me.ucrReceiverRainfall.strNcFilePath = "" - Me.ucrReceiverRainfall.TabIndex = 10 + Me.ucrReceiverRainfall.TabIndex = 63 Me.ucrReceiverRainfall.ucrSelector = Nothing ' - 'ucrSelectorForStartofRains - ' - Me.ucrSelectorForStartofRains.AutoSize = True - Me.ucrSelectorForStartofRains.bDropUnusedFilterLevels = False - Me.ucrSelectorForStartofRains.bShowHiddenColumns = False - Me.ucrSelectorForStartofRains.bUseCurrentFilter = True - Me.ucrSelectorForStartofRains.Location = New System.Drawing.Point(5, 9) - Me.ucrSelectorForStartofRains.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorForStartofRains.Name = "ucrSelectorForStartofRains" - Me.ucrSelectorForStartofRains.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorForStartofRains.TabIndex = 0 - ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(5, 514) + Me.ucrBase.Location = New System.Drawing.Point(14, 520) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(408, 52) - Me.ucrBase.TabIndex = 20 + Me.ucrBase.TabIndex = 69 + ' + 'ucrInputFilterPreview + ' + Me.ucrInputFilterPreview.AddQuotesIfUnrecognised = True + Me.ucrInputFilterPreview.AutoSize = True + Me.ucrInputFilterPreview.IsMultiline = False + Me.ucrInputFilterPreview.IsReadOnly = True + Me.ucrInputFilterPreview.Location = New System.Drawing.Point(277, 11) + Me.ucrInputFilterPreview.Name = "ucrInputFilterPreview" + Me.ucrInputFilterPreview.Size = New System.Drawing.Size(242, 22) + Me.ucrInputFilterPreview.TabIndex = 15 + ' + 'ucrReceiverDOY + ' + Me.ucrReceiverDOY.AutoSize = True + Me.ucrReceiverDOY.frmParent = Me + Me.ucrReceiverDOY.Location = New System.Drawing.Point(290, 160) + Me.ucrReceiverDOY.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverDOY.Name = "ucrReceiverDOY" + Me.ucrReceiverDOY.Selector = Nothing + Me.ucrReceiverDOY.Size = New System.Drawing.Size(143, 20) + Me.ucrReceiverDOY.strNcFilePath = "" + Me.ucrReceiverDOY.TabIndex = 61 + Me.ucrReceiverDOY.ucrSelector = Nothing + ' + 'grpConditionsForSatrtofRains + ' + Me.grpConditionsForSatrtofRains.Controls.Add(Me.cmdAdditionnal) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrChkAdditional) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrReceiverEvap) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblFraction) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudEvapo) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.rdoEvapo) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblTROverDays) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudTROverDays) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudTRAmount) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.lblTRVal) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrChkTotalRainfall) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrNudTRPercentile) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.rdoTRAmount) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.rdoTRPercentile) + Me.grpConditionsForSatrtofRains.Controls.Add(Me.ucrPnlTRCalculateBy) + Me.grpConditionsForSatrtofRains.Location = New System.Drawing.Point(13, 270) + Me.grpConditionsForSatrtofRains.Name = "grpConditionsForSatrtofRains" + Me.grpConditionsForSatrtofRains.Size = New System.Drawing.Size(584, 185) + Me.grpConditionsForSatrtofRains.TabIndex = 65 + Me.grpConditionsForSatrtofRains.TabStop = False + Me.grpConditionsForSatrtofRains.Text = "Conditions for Start of Rains" + ' + 'cmdAdditionnal + ' + Me.cmdAdditionnal.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAdditionnal.Location = New System.Drawing.Point(159, 147) + Me.cmdAdditionnal.Name = "cmdAdditionnal" + Me.cmdAdditionnal.Size = New System.Drawing.Size(105, 26) + Me.cmdAdditionnal.TabIndex = 16 + Me.cmdAdditionnal.Tag = "" + Me.cmdAdditionnal.Text = "Add" + Me.cmdAdditionnal.UseVisualStyleBackColor = True + ' + 'ucrChkAdditional + ' + Me.ucrChkAdditional.AutoSize = True + Me.ucrChkAdditional.Checked = False + Me.ucrChkAdditional.Location = New System.Drawing.Point(4, 151) + Me.ucrChkAdditional.Name = "ucrChkAdditional" + Me.ucrChkAdditional.Size = New System.Drawing.Size(143, 23) + Me.ucrChkAdditional.TabIndex = 45 + ' + 'ucrReceiverEvap + ' + Me.ucrReceiverEvap.AutoSize = True + Me.ucrReceiverEvap.frmParent = Me + Me.ucrReceiverEvap.Location = New System.Drawing.Point(210, 81) + Me.ucrReceiverEvap.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverEvap.Name = "ucrReceiverEvap" + Me.ucrReceiverEvap.Selector = Nothing + Me.ucrReceiverEvap.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverEvap.strNcFilePath = "" + Me.ucrReceiverEvap.TabIndex = 24 + Me.ucrReceiverEvap.ucrSelector = Nothing + ' + 'lblFraction + ' + Me.lblFraction.AutoSize = True + Me.lblFraction.Location = New System.Drawing.Point(349, 83) + Me.lblFraction.Name = "lblFraction" + Me.lblFraction.Size = New System.Drawing.Size(48, 13) + Me.lblFraction.TabIndex = 25 + Me.lblFraction.Text = "Fraction:" + ' + 'ucrNudEvapo + ' + Me.ucrNudEvapo.AutoSize = True + Me.ucrNudEvapo.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudEvapo.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudEvapo.Location = New System.Drawing.Point(414, 78) + Me.ucrNudEvapo.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudEvapo.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudEvapo.Name = "ucrNudEvapo" + Me.ucrNudEvapo.Size = New System.Drawing.Size(42, 20) + Me.ucrNudEvapo.TabIndex = 26 + Me.ucrNudEvapo.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'rdoEvapo + ' + Me.rdoEvapo.AutoSize = True + Me.rdoEvapo.Location = New System.Drawing.Point(120, 83) + Me.rdoEvapo.Name = "rdoEvapo" + Me.rdoEvapo.Size = New System.Drawing.Size(82, 17) + Me.rdoEvapo.TabIndex = 23 + Me.rdoEvapo.TabStop = True + Me.rdoEvapo.Text = "Evaporation" + Me.rdoEvapo.UseVisualStyleBackColor = True + ' + 'lblTROverDays + ' + Me.lblTROverDays.AutoSize = True + Me.lblTROverDays.Location = New System.Drawing.Point(144, 25) + Me.lblTROverDays.Name = "lblTROverDays" + Me.lblTROverDays.Size = New System.Drawing.Size(60, 13) + Me.lblTROverDays.TabIndex = 18 + Me.lblTROverDays.Tag = "" + Me.lblTROverDays.Text = "Over Days:" + ' + 'ucrNudTROverDays + ' + Me.ucrNudTROverDays.AutoSize = True + Me.ucrNudTROverDays.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTROverDays.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTROverDays.Location = New System.Drawing.Point(210, 21) + Me.ucrNudTROverDays.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTROverDays.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTROverDays.Name = "ucrNudTROverDays" + Me.ucrNudTROverDays.Size = New System.Drawing.Size(42, 20) + Me.ucrNudTROverDays.TabIndex = 19 + Me.ucrNudTROverDays.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudTRAmount + ' + Me.ucrNudTRAmount.AutoSize = True + Me.ucrNudTRAmount.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTRAmount.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTRAmount.Location = New System.Drawing.Point(210, 58) + Me.ucrNudTRAmount.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTRAmount.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTRAmount.Name = "ucrNudTRAmount" + Me.ucrNudTRAmount.Size = New System.Drawing.Size(42, 20) + Me.ucrNudTRAmount.TabIndex = 22 + Me.ucrNudTRAmount.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblTRVal + ' + Me.lblTRVal.AutoSize = True + Me.lblTRVal.Location = New System.Drawing.Point(20, 60) + Me.lblTRVal.Name = "lblTRVal" + Me.lblTRVal.Size = New System.Drawing.Size(37, 13) + Me.lblTRVal.TabIndex = 20 + Me.lblTRVal.Text = "Value:" + ' + 'ucrChkTotalRainfall + ' + Me.ucrChkTotalRainfall.AutoSize = True + Me.ucrChkTotalRainfall.Checked = False + Me.ucrChkTotalRainfall.Location = New System.Drawing.Point(4, 22) + Me.ucrChkTotalRainfall.Name = "ucrChkTotalRainfall" + Me.ucrChkTotalRainfall.Size = New System.Drawing.Size(131, 23) + Me.ucrChkTotalRainfall.TabIndex = 17 + ' + 'ucrNudTRPercentile + ' + Me.ucrNudTRPercentile.AutoSize = True + Me.ucrNudTRPercentile.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTRPercentile.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudTRPercentile.Location = New System.Drawing.Point(210, 109) + Me.ucrNudTRPercentile.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudTRPercentile.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudTRPercentile.Name = "ucrNudTRPercentile" + Me.ucrNudTRPercentile.Size = New System.Drawing.Size(42, 20) + Me.ucrNudTRPercentile.TabIndex = 28 + Me.ucrNudTRPercentile.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'rdoTRAmount + ' + Me.rdoTRAmount.AutoSize = True + Me.rdoTRAmount.Location = New System.Drawing.Point(120, 60) + Me.rdoTRAmount.Name = "rdoTRAmount" + Me.rdoTRAmount.Size = New System.Drawing.Size(61, 17) + Me.rdoTRAmount.TabIndex = 21 + Me.rdoTRAmount.TabStop = True + Me.rdoTRAmount.Text = "Amount" + Me.rdoTRAmount.UseVisualStyleBackColor = True + ' + 'rdoTRPercentile + ' + Me.rdoTRPercentile.AutoSize = True + Me.rdoTRPercentile.Location = New System.Drawing.Point(120, 109) + Me.rdoTRPercentile.Name = "rdoTRPercentile" + Me.rdoTRPercentile.Size = New System.Drawing.Size(72, 17) + Me.rdoTRPercentile.TabIndex = 27 + Me.rdoTRPercentile.TabStop = True + Me.rdoTRPercentile.Text = "Percentile" + Me.rdoTRPercentile.UseVisualStyleBackColor = True + ' + 'ucrPnlTRCalculateBy + ' + Me.ucrPnlTRCalculateBy.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlTRCalculateBy.Location = New System.Drawing.Point(51, 55) + Me.ucrPnlTRCalculateBy.Name = "ucrPnlTRCalculateBy" + Me.ucrPnlTRCalculateBy.Size = New System.Drawing.Size(165, 75) + Me.ucrPnlTRCalculateBy.TabIndex = 4 + ' + 'lblThreshold + ' + Me.lblThreshold.AutoSize = True + Me.lblThreshold.Location = New System.Drawing.Point(10, 12) + Me.lblThreshold.Name = "lblThreshold" + Me.lblThreshold.Size = New System.Drawing.Size(57, 13) + Me.lblThreshold.TabIndex = 12 + Me.lblThreshold.Tag = "Threshold" + Me.lblThreshold.Text = "Threshold:" + ' + 'grpRainParameters + ' + Me.grpRainParameters.Controls.Add(Me.ucrInputThreshold) + Me.grpRainParameters.Controls.Add(Me.ucrInputFilterPreview) + Me.grpRainParameters.Controls.Add(Me.cmdDoyRange) + Me.grpRainParameters.Controls.Add(Me.lblThreshold) + Me.grpRainParameters.Location = New System.Drawing.Point(13, 222) + Me.grpRainParameters.Name = "grpRainParameters" + Me.grpRainParameters.Size = New System.Drawing.Size(584, 40) + Me.grpRainParameters.TabIndex = 64 + Me.grpRainParameters.TabStop = False + ' + 'cmdDoyRange + ' + Me.cmdDoyRange.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDoyRange.Location = New System.Drawing.Point(159, 8) + Me.cmdDoyRange.Name = "cmdDoyRange" + Me.cmdDoyRange.Size = New System.Drawing.Size(105, 26) + Me.cmdDoyRange.TabIndex = 14 + Me.cmdDoyRange.Tag = "" + Me.cmdDoyRange.Text = "Day Range" + Me.cmdDoyRange.UseVisualStyleBackColor = True ' 'dlgStartofRains ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(696, 573) + Me.ClientSize = New System.Drawing.Size(610, 582) Me.Controls.Add(Me.lblRainfall) - Me.Controls.Add(Me.ucrChkAsDoy) - Me.Controls.Add(Me.ucrInputNewDoyColumnName) Me.Controls.Add(Me.lblStation) - Me.Controls.Add(Me.ucrReceiverStation) - Me.Controls.Add(Me.ucrReceiverDate) - Me.Controls.Add(Me.ucrReceiverYear) - Me.Controls.Add(Me.ucrReceiverDOY) - Me.Controls.Add(Me.ucrReceiverRainfall) Me.Controls.Add(Me.lblYear) Me.Controls.Add(Me.lblDate) Me.Controls.Add(Me.lblDOY) - Me.Controls.Add(Me.grpRainParameters) - Me.Controls.Add(Me.grpConditionsForSatrtofRains) Me.Controls.Add(Me.ucrSelectorForStartofRains) + Me.Controls.Add(Me.ucrInputNewDoyColumnName) + Me.Controls.Add(Me.ucrChkAsDoy) + Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.ucrReceiverDate) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.ucrReceiverRainfall) Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.ucrReceiverDOY) + Me.Controls.Add(Me.grpConditionsForSatrtofRains) + Me.Controls.Add(Me.grpRainParameters) Me.Controls.Add(Me.grpDisplay) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -696,66 +559,55 @@ Partial Class dlgStartofRains Me.ShowIcon = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Start of Rains" + Me.grpDisplay.ResumeLayout(False) + Me.grpDisplay.PerformLayout() Me.grpConditionsForSatrtofRains.ResumeLayout(False) Me.grpConditionsForSatrtofRains.PerformLayout() Me.grpRainParameters.ResumeLayout(False) Me.grpRainParameters.PerformLayout() - Me.grpDisplay.ResumeLayout(False) - Me.grpDisplay.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() End Sub - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrSelectorForStartofRains As ucrSelectorByDataFrameAddRemove - Friend WithEvents grpConditionsForSatrtofRains As GroupBox - Friend WithEvents lblDSLengthofTime As Label - Friend WithEvents lblDSMaximumDays As Label - Friend WithEvents lblTRVal As Label - Friend WithEvents lblRDMinimum As Label - Friend WithEvents grpRainParameters As GroupBox - Friend WithEvents lblTROverDays As Label - Friend WithEvents lblDOY As Label - Friend WithEvents ucrReceiverRainfall As ucrReceiverSingle - Friend WithEvents ucrReceiverDOY As ucrReceiverSingle - Friend WithEvents lblRDWidth As Label - Friend WithEvents lblThreshold As Label + Friend WithEvents ucrInputThreshold As ucrInputComboBox + Friend WithEvents lblRainfall As Label + Friend WithEvents lblStation As Label + Friend WithEvents lblYear As Label Friend WithEvents lblDate As Label + Friend WithEvents lblDOY As Label + Friend WithEvents grpDisplay As GroupBox + Friend WithEvents ucrInputNewStatusColumnName As ucrInputTextBox + Friend WithEvents ucrChkAsDate As ucrCheck + Friend WithEvents ucrChkStatus As ucrCheck + Friend WithEvents ucrInputNewDateColumnName As ucrInputTextBox + Friend WithEvents ucrSelectorForStartofRains As ucrSelectorByDataFrameAddRemove + Friend WithEvents ucrInputNewDoyColumnName As ucrInputTextBox + Friend WithEvents ucrChkAsDoy As ucrCheck + Friend WithEvents ucrReceiverStation As ucrReceiverSingle Friend WithEvents ucrReceiverDate As ucrReceiverSingle Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents lblYear As Label - Friend WithEvents rdoTRPercentile As RadioButton - Friend WithEvents rdoTRAmount As RadioButton - Friend WithEvents lblDPOverallInterval As Label - Friend WithEvents lblDPLength As Label - Friend WithEvents lblDPMaxRain As Label + Friend WithEvents ucrReceiverRainfall As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverDOY As ucrReceiverSingle + Friend WithEvents grpConditionsForSatrtofRains As GroupBox + Friend WithEvents cmdAdditionnal As Button + Friend WithEvents ucrChkAdditional As ucrCheck + Friend WithEvents ucrReceiverEvap As ucrReceiverSingle + Friend WithEvents lblFraction As Label + Friend WithEvents ucrNudEvapo As ucrNud + Friend WithEvents rdoEvapo As RadioButton + Friend WithEvents lblTROverDays As Label Friend WithEvents ucrNudTROverDays As ucrNud - Friend WithEvents ucrNudTRPercentile As ucrNud - Friend WithEvents lblStation As Label - Friend WithEvents ucrReceiverStation As ucrReceiverSingle - Friend WithEvents ucrChkTotalRainfall As ucrCheck Friend WithEvents ucrNudTRAmount As ucrNud + Friend WithEvents lblTRVal As Label + Friend WithEvents ucrChkTotalRainfall As ucrCheck + Friend WithEvents ucrNudTRPercentile As ucrNud + Friend WithEvents rdoTRAmount As RadioButton + Friend WithEvents rdoTRPercentile As RadioButton Friend WithEvents ucrPnlTRCalculateBy As UcrPanel - Friend WithEvents ucrNudRDMinimumDays As ucrNud - Friend WithEvents ucrNudRDOutOfDays As ucrNud - Friend WithEvents ucrChkNumberOfRainyDays As ucrCheck - Friend WithEvents ucrNudDSLengthOfTime As ucrNud - Friend WithEvents ucrNudDSMaximumDays As ucrNud - Friend WithEvents ucrNudDPOverallInterval As ucrNud - Friend WithEvents ucrNudDPRainPeriod As ucrNud - Friend WithEvents ucrNudDPMaxRain As ucrNud - Friend WithEvents ucrChkDrySpell As ucrCheck - Friend WithEvents ucrChkDryPeriod As ucrCheck - Friend WithEvents ucrInputNewDoyColumnName As ucrInputTextBox + Friend WithEvents grpRainParameters As GroupBox Friend WithEvents ucrInputFilterPreview As ucrInputTextBox Friend WithEvents cmdDoyRange As Button - Friend WithEvents ucrInputNewDateColumnName As ucrInputTextBox - Friend WithEvents ucrChkAsDate As ucrCheck - Friend WithEvents ucrChkAsDoy As ucrCheck - Friend WithEvents lblRainfall As Label - Friend WithEvents ucrChkStatus As ucrCheck - Friend WithEvents ucrInputNewStatusColumnName As ucrInputTextBox - Friend WithEvents grpDisplay As GroupBox - Friend WithEvents ucrInputThreshold As ucrInputComboBox + Friend WithEvents lblThreshold As Label End Class \ No newline at end of file diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index b5df24820c2..516fbdcdc03 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -17,9 +17,10 @@ Imports instat.Translations Public Class dlgStartofRains - Private clsCalcRainDay, clsCalcStartDOY, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private bResetSubdialog As Boolean = True + Private clsCalcRainDay, clsCalcStartDOY, clsTailFunction, clsGetDataFrameFunction, clsListevapFunction, clsRollEvaporationFunction, clsFractionEvapFunction, clsSumEvapFunction, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction - Private clsDayFromAndToOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator + Private clsDayFromAndToOperator, clsEvapOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction Private clsSpellsFunction As New RFunction @@ -70,6 +71,8 @@ Public Class dlgStartofRains Public bFirstLoad As Boolean = True Private bReset As Boolean = True Private strWetSpell As String = "wet_spell" + Private strFactionEvap As String = "fraction_evap" + Private strSumFractionEvap As String = "roll_sum_evap" Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -130,6 +133,11 @@ Public Class dlgStartofRains ucrReceiverRainfall.SetClimaticType("rain") ucrReceiverRainfall.bAutoFill = True + ucrReceiverEvap.SetParameter(New RParameter("evap", 0, False)) + ucrReceiverEvap.SetParameterIsString() + ucrReceiverEvap.bWithQuotes = False + ucrReceiverEvap.Selector = ucrSelectorForStartofRains + ucrInputThreshold.SetParameter(New RParameter("threshold", 1)) dctInputThreshold.Add("0.85", "0.85") dctInputThreshold.Add("0.5", "0.5") @@ -140,18 +148,21 @@ Public Class dlgStartofRains ucrInputThreshold.SetLinkedDisplayControl(lblThreshold) ucrInputThreshold.SetRDefault(0.85) - - 'Total Rainfall ucrPnlTRCalculateBy.AddRadioButton(rdoTRAmount) ucrPnlTRCalculateBy.AddRadioButton(rdoTRPercentile) + ucrPnlTRCalculateBy.AddRadioButton(rdoEvapo) ucrPnlTRCalculateBy.AddParameterPresentCondition(rdoTRAmount, "tr_perc_sub", False) ucrPnlTRCalculateBy.AddParameterPresentCondition(rdoTRPercentile, "tr_perc_sub") + ucrPnlTRCalculateBy.AddParameterPresentCondition(rdoEvapo, "tr_perc_sub") ucrPnlTRCalculateBy.AddToLinkedControls(ucrNudTRPercentile, {rdoTRPercentile}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.8) ucrPnlTRCalculateBy.AddToLinkedControls(ucrNudTRAmount, {rdoTRAmount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=20) + ucrPnlTRCalculateBy.AddToLinkedControls(ucrNudEvapo, {rdoEvapo}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.5) + ucrPnlTRCalculateBy.AddToLinkedControls(ucrReceiverEvap, {rdoEvapo}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTRCalculateBy.SetLinkedDisplayControl(lblTRVal) ucrPnlTRCalculateBy.AddParameterPresentCondition(rdoTRPercentile, "tr_perc") ucrPnlTRCalculateBy.AddParameterPresentCondition(rdoTRAmount, "tr_amount") + ucrPnlTRCalculateBy.AddParameterPresentCondition(rdoEvapo, "evap") ucrNudTRAmount.SetParameter(New RParameter("tr_amount", 1, False), False) ucrNudTRAmount.SetMinMax(1, Integer.MaxValue) @@ -171,57 +182,15 @@ Public Class dlgStartofRains ucrNudTRPercentile.DecimalPlaces = 2 ucrNudTRPercentile.Increment = 0.1 - 'Number of Rainy days - ucrChkNumberOfRainyDays.SetParameter(New RParameter("rd_sub", clsCalcRainDayRollingSum, 2, False), False) - ucrChkNumberOfRainyDays.AddAdditionalCodeParameterPair(clsConditionsAndOperator, New RParameter("rain_days", clsRollingSumRainDayOperator, 2, False), iAdditionalPairNo:=1) - ucrChkNumberOfRainyDays.SetText("Number of Rainy Days") - - ucrNudRDMinimumDays.SetParameter(New RParameter("1", 1)) - ucrNudRDMinimumDays.SetLinkedDisplayControl(lblRDMinimum) - ucrNudRDMinimumDays.SetMinMax(1, 366) - - ucrNudRDOutOfDays.SetParameter(New RParameter("n", 1)) - ucrNudRDOutOfDays.SetLinkedDisplayControl(lblRDWidth) - ucrNudRDOutOfDays.SetMinMax(1, 366) - - ucrChkNumberOfRainyDays.AddToLinkedControls(ucrNudRDMinimumDays, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=1) - ucrChkNumberOfRainyDays.AddToLinkedControls(ucrNudRDOutOfDays, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=2) - - 'Dry Spell - ucrChkDrySpell.SetParameter(New RParameter("ds_sub", clsCalcDrySpellRollMax, 3, False), False) - ucrChkDrySpell.AddAdditionalCodeParameterPair(clsConditionsAndOperator, New RParameter("dry_spell", clsDSCombineOperator, 3, False), iAdditionalPairNo:=1) - ucrChkDrySpell.SetText("Dry Spell") - ucrChkDrySpell.AddToLinkedControls(ucrNudDSLengthOfTime, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=21) - ucrChkDrySpell.AddToLinkedControls(ucrNudDSMaximumDays, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=9) - ucrNudDSLengthOfTime.SetLinkedDisplayControl(lblDSLengthofTime) - ucrNudDSMaximumDays.SetLinkedDisplayControl(lblDSMaximumDays) - - ucrNudDSLengthOfTime.SetParameter(New RParameter("n", 1)) - ucrNudDSLengthOfTime.SetMinMax(1, 366) - - ucrNudDSMaximumDays.SetParameter(New RParameter("ds_max", 1)) - ucrNudDSMaximumDays.SetMinMax(1, 366) + ucrNudEvapo.SetParameter(New RParameter("frac", 1, False)) + ucrNudEvapo.SetMinMax(0.01, 10) + ucrNudEvapo.DecimalPlaces = 2 + ucrNudEvapo.Increment = 0.01 + ucrNudEvapo.SetLinkedDisplayControl(lblFraction) - ' Dry Period - ucrChkDryPeriod.SetParameter(New RParameter("dp_sub", clsCalcRollSumNumberDryPeriod, 3, False), False) - ucrChkDryPeriod.AddAdditionalCodeParameterPair(clsConditionsAndOperator, New RParameter("dry_period", clsDPCombineOperator, 4, False), iAdditionalPairNo:=1) - ucrChkDryPeriod.SetText("Dry Period") - - ucrNudDPRainPeriod.SetParameter(New RParameter("n", 0)) - ucrNudDPRainPeriod.SetLinkedDisplayControl(lblDPLength) - ucrNudDPRainPeriod.SetMinMax(1, 366) - - ucrNudDPMaxRain.SetParameter(New RParameter("right", 1)) - ucrNudDPMaxRain.SetLinkedDisplayControl(lblDPMaxRain) - ucrNudDPMaxRain.SetMinMax(1, Integer.MaxValue) - - ucrNudDPOverallInterval.SetParameter(New RParameter("0", 0)) - ucrNudDPOverallInterval.SetLinkedDisplayControl(lblDPOverallInterval) - ucrNudDPOverallInterval.SetMinMax(1, 366) - - ucrChkDryPeriod.AddToLinkedControls(ucrNudDPMaxRain, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=40) - ucrChkDryPeriod.AddToLinkedControls(ucrNudDPOverallInterval, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=45) - ucrChkDryPeriod.AddToLinkedControls(ucrNudDPRainPeriod, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30) + ucrChkAdditional.SetText("Additional") + ucrChkAdditional.AddParameterValuesCondition(True, "additional", "True") + ucrChkAdditional.AddParameterValuesCondition(False, "additional", "False") 'save ucrInputNewDoyColumnName.SetParameter(New RParameter("result_name", 2)) @@ -242,7 +211,7 @@ Public Class dlgStartofRains ucrChkAsDoy.AddParameterPresentCondition(True, "sub1", True) ucrChkAsDoy.AddParameterPresentCondition(False, "sub1", False) - ucrChkAsDoy.SetText("Day of Year") + ucrChkAsDoy.SetText("Day") ucrChkAsDate.AddParameterValuesCondition(True, "sub2", "True") ucrChkAsDate.AddParameterValuesCondition(False, "sub2", "False") @@ -251,6 +220,9 @@ Public Class dlgStartofRains ucrChkStatus.AddParameterValuesCondition(True, "sub3", "True") ucrChkStatus.AddParameterValuesCondition(False, "sub3", "False") ucrChkStatus.SetText("Occurrence") + SetReceiver() + AdditionalCondition() + ChangeDSValue() End Sub Private Sub SetDefaults() @@ -290,6 +262,11 @@ Public Class dlgStartofRains clsConvertColumnTypeFunction.Clear() clsConvertColumnType2Function.Clear() clsConvertColumnType1Function.Clear() + clsFractionEvapFunction.Clear() + clsSumEvapFunction.Clear() + clsEvapOperator.Clear() + clsRollEvaporationFunction.Clear() + clsListevapFunction.Clear() clsSpellsFunction.Clear() clsRainDaySpellsOperator.Clear() @@ -320,6 +297,8 @@ Public Class dlgStartofRains clsCalcRainRollingSum.Clear() clsRainRollingSumFunction = New RFunction + clsTailFunction = New RFunction + clsGetDataFrameFunction = New RFunction clsTRWetSpellList.Clear() clsTRWetSpell.Clear() clsTRWetSpellFunction.Clear() @@ -355,7 +334,7 @@ Public Class dlgStartofRains clsDSCombineOperator.Clear() clsDPCombineOperator.Clear() - ucrReceiverRainfall.SetMeAsReceiver() + bResetSubdialog = True ucrSelectorForStartofRains.Reset() clsDayFilterCalcFromConvert = New RFunction @@ -367,6 +346,7 @@ Public Class dlgStartofRains clsDummyFunction = New RFunction clsDummyFunction.AddParameter("sub2", "True", iPosition:=0) clsDummyFunction.AddParameter("sub3", "True", iPosition:=1) + clsDummyFunction.AddParameter("additional", "False", iPosition:=2) 'Day From and To clsDayFromAndTo.SetRCommand("instat_calculation$new") @@ -409,9 +389,6 @@ Public Class dlgStartofRains clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnType1Function.AddParameter("to_type", "year_type", iPosition:=2) - clsConvertColumnType2Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") - clsConvertColumnType2Function.AddParameter("to_type", "year_type", iPosition:=2) - 'TOTAL RAIN: associated with ucrChkTotalRainfall clsCalcRainRollingSum.SetRCommand("instat_calculation$new") clsCalcRainRollingSum.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) @@ -560,8 +537,34 @@ Public Class dlgStartofRains clsIsNaFirstDrySpell.SetRCommand("is.na") clsIsNaFirstDrySpell.AddParameter("x", clsRFunctionParameter:=clsFirstDrySpell, iPosition:=0) - 'DRY PERIOD + clsFractionEvapFunction.SetRCommand("instat_calculation$new") + clsFractionEvapFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsFractionEvapFunction.AddParameter("function_exp", clsROperatorParameter:=clsEvapOperator, iPosition:=1) + clsFractionEvapFunction.AddParameter("result_name", Chr(34) & strFactionEvap & Chr(34), iPosition:=2) + clsFractionEvapFunction.SetAssignTo(strFactionEvap) + + clsEvapOperator.SetOperation("*") + clsEvapOperator.bToScriptAsRString = True + + clsSumEvapFunction.SetRCommand("instat_calculation$new") + clsSumEvapFunction.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) + clsSumEvapFunction.AddParameter("function_exp", clsRFunctionParameter:=clsRollEvaporationFunction, iPosition:=1) + clsSumEvapFunction.AddParameter("result_name", Chr(34) & strSumFractionEvap & Chr(34), iPosition:=2) + clsSumEvapFunction.AddParameter("sub_calculations", clsRFunctionParameter:=clsListevapFunction, iPosition:=3) + clsSumEvapFunction.SetAssignTo(strSumFractionEvap) + + clsListevapFunction.SetRCommand("list") + clsListevapFunction.AddParameter("x", strFactionEvap, iPosition:=0, bIncludeArgumentName:=False) + + clsRollEvaporationFunction.SetPackageName("RcppRoll") + clsRollEvaporationFunction.SetRCommand("roll_sumr") + clsRollEvaporationFunction.AddParameter("x", strFactionEvap, iPosition:=0) + clsRollEvaporationFunction.AddParameter("n", "2", iPosition:=1) + clsRollEvaporationFunction.AddParameter("fill", "NA", iPosition:=2) + clsRollEvaporationFunction.AddParameter("na.rm", "FALSE", iPosition:=3) + clsRollEvaporationFunction.bToScriptAsRString = True + 'DRY PERIOD clsCalcRainRollingSumDryPeriod.SetRCommand("instat_calculation$new") clsCalcRainRollingSumDryPeriod.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) clsCalcRainRollingSumDryPeriod.AddParameter("function_exp", clsRFunctionParameter:=clsLeadRollingSumRainDryPeriodFunction, iPosition:=1) @@ -622,7 +625,7 @@ Public Class dlgStartofRains clsConditionsFilter.SetAssignTo("conditions_filter") clsCombinedList.SetRCommand("list") - clsCombinedList.AddParameter("tr_sub", clsRFunctionParameter:=clsCalcRainRollingSum, bIncludeArgumentName:=False) + clsCombinedList.AddParameter("tr_sub", clsRFunctionParameter:=clsCalcRainRollingSum, bIncludeArgumentName:=False, iPosition:=0) clsConditionsOrOverallOperator.SetOperation("|") clsConditionsOrOverallOperator.bToScriptAsRString = True @@ -755,6 +758,17 @@ Public Class dlgStartofRains 'Sub_Calculations List clsListSubCalc.SetRCommand("list") + clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_names") + + clsTailFunction.SetRCommand("tail") + clsTailFunction.AddParameter("x", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0, bIncludeArgumentName:=False) + clsTailFunction.AddParameter("n", "1", iPosition:=1) + clsTailFunction.SetAssignTo("last_data_name") + + clsConvertColumnType2Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") + clsConvertColumnType2Function.AddParameter("data_name", "last_data_name", iPosition:=0) + clsConvertColumnType2Function.AddParameter("to_type", "year_type", iPosition:=2) + 'Run Calculations clsListCalFunction.SetRCommand("list") clsListCalFunction.AddParameter("drop", "FALSE", iPosition:=0) @@ -764,11 +778,17 @@ Public Class dlgStartofRains clsApplyInstatFunction.AddParameter("calc", clsRFunctionParameter:=clsCombinationCalc, iPosition:=0) clsApplyInstatFunction.AddParameter("param_list", clsRFunctionParameter:=clsListCalFunction, iPosition:=2) + ucrBase.clsRsyntax.ClearCodes() + ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatFunction) ucrBase.clsRsyntax.AddToBeforeCodes(clsGetColumnDataTypeFunction, iPosition:=0) ucrBase.clsRsyntax.AddToBeforeCodes(clsConvertColumnTypeFunction, iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType1Function, iPosition:=0) - ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType2Function, iPosition:=1) + ucrBase.clsRsyntax.AddToAfterCodes(clsTailFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType1Function, iPosition:=1) + ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType2Function, iPosition:=2) + SetReceiver() + ChangeDSValue() + AdditionalCondition() End Sub Private Sub SetRCodeForControls(bReset As Boolean) @@ -781,17 +801,15 @@ Public Class dlgStartofRains ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsFirstRain, New RParameter("x", 0), iAdditionalPairNo:=4) ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=5) ucrInputThreshold.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("threshold", 1), iAdditionalPairNo:=1) - - 'clsSORStartSummary.SetControlParameters(ucrReceiverRainfall, iAdditionalPairNo:=4) - 'clsSORStatusSummary.SetControlParameters(ucrReceiverRainfall, iAdditionalPairNo:=5) - - ucrNudDPRainPeriod.AddAdditionalCodeParameterPair(clsSumRainDryPeriodIntervalPlusOperator, ucrNudDPRainPeriod.GetParameter(), iAdditionalPairNo:=1) ucrInputNewDoyColumnName.AddAdditionalCodeParameterPair(clsCalcStartDOY, New RParameter("result_name", 3), iAdditionalPairNo:=1) ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) ucrChkAsDoy.SetRCode(clsCombinationSubCalcList, bReset) ucrChkStatus.SetRCode(clsDummyFunction, bReset) ucrChkAsDate.SetRCode(clsDummyFunction, bReset) + If bReset Then + ucrChkAdditional.SetRCode(clsDummyFunction, bReset) + End If ucrInputThreshold.SetRCode(clsRainDayOperator, bReset) ucrReceiverDate.SetRCode(clsFirstDate, bReset) @@ -804,25 +822,12 @@ Public Class dlgStartofRains ucrNudTROverDays.SetRCode(clsRainRollingSumFunction, bReset) ucrNudTRPercentile.SetRCode(clsTRWetSpellFunction, bReset) ucrReceiverRainfall.SetRCode(clsRainRollingSumFunction, bReset) - - 'Rain Days - ucrChkNumberOfRainyDays.SetRCode(clsCombinedList, bReset) - ucrNudRDOutOfDays.SetRCode(clsRainDayRollingSumFunction, bReset) - - 'DrySpell - ucrChkDrySpell.SetRCode(clsCombinedList, bReset) - ucrNudDSLengthOfTime.SetRCode(clsDrySpellPeriodRollMaxFunction, bReset) - - 'DryPeriod - ucrChkDryPeriod.SetRCode(clsCombinedList, bReset) - ucrNudDPRainPeriod.SetRCode(clsRollingSumRainDryPeriodFunction, bReset) - ucrNudDPMaxRain.SetRCode(clsSumRainDryPeriodOperator, bReset) - ucrNudDPOverallInterval.SetRCode(clsSumRainDryPeriodIntervalMinusOperator, bReset) - - ' Combine - ucrNudRDMinimumDays.SetRCode(clsRollingSumRainDayOperator, bReset) - ucrNudDSMaximumDays.SetRCode(clsDSCombineOperator, bReset) ucrNudTRAmount.SetRCode(clsTRCombineOperator, bReset) + + 'Evaporation + ucrReceiverEvap.SetRCode(clsEvapOperator, bReset) + ucrNudEvapo.SetRCode(clsEvapOperator, bReset) + AdditionalCondition() End Sub Private Sub TestOKEnabled() @@ -832,25 +837,16 @@ Public Class dlgStartofRains Not ucrReceiverDOY.IsEmpty AndAlso Not ucrReceiverYear.IsEmpty AndAlso ucrInputThreshold.GetText <> "" AndAlso - ( - (ucrChkNumberOfRainyDays.Checked AndAlso ucrNudRDMinimumDays.GetText <> "" AndAlso ucrNudRDOutOfDays.GetText <> "") OrElse - Not ucrChkNumberOfRainyDays.Checked) AndAlso ( ( (ucrChkTotalRainfall.Checked AndAlso ucrNudTROverDays.GetText <> "") AndAlso - ((rdoTRAmount.Checked AndAlso ucrNudTRAmount.GetText <> "") OrElse (rdoTRPercentile.Checked AndAlso ucrNudTRPercentile.GetText <> ""))) OrElse - Not ucrChkTotalRainfall.Checked) AndAlso - ( - (ucrChkDrySpell.Checked AndAlso ucrNudDSMaximumDays.GetText <> "" AndAlso ucrNudDSLengthOfTime.GetText <> "") OrElse - Not ucrChkDrySpell.Checked) AndAlso - ( - (ucrChkDryPeriod.Checked AndAlso ucrNudDPMaxRain.GetText <> "" AndAlso ucrNudDPRainPeriod.GetText <> "" AndAlso ucrNudDPOverallInterval.GetText <> "") OrElse - Not ucrChkDryPeriod.Checked) Then + ((rdoTRAmount.Checked AndAlso ucrNudTRAmount.GetText <> "") OrElse (rdoTRPercentile.Checked AndAlso ucrNudTRPercentile.GetText <> "") OrElse (rdoEvapo.Checked AndAlso Not ucrReceiverEvap.IsEmpty AndAlso ucrNudTRPercentile.GetText <> ""))) OrElse + Not ucrChkTotalRainfall.Checked) Then bOkEnabled = True Else bOkEnabled = False End If - If Not (ucrChkTotalRainfall.Checked OrElse ucrChkNumberOfRainyDays.Checked OrElse ucrChkDrySpell.Checked OrElse ucrChkDryPeriod.Checked) Then + If Not ucrChkTotalRainfall.Checked Then bOkEnabled = False End If If Not (ucrChkAsDoy.Checked OrElse ucrChkAsDate.Checked OrElse ucrChkStatus.Checked) Then @@ -886,21 +882,43 @@ Public Class dlgStartofRains End Sub Private Sub CombinedFilter() - If ucrChkTotalRainfall.Checked Then If rdoTRAmount.Checked Then + clsTRCombineOperator.RemoveParameterByName("evap") clsCombinedList.RemoveParameterByName("tr_perc_sub") clsTRCombineOperator.RemoveParameterByName("tr_perc") + clsCombinedList.RemoveParameterByName("evap_frac") clsTRCombineOperator.AddParameter("tr_amount", ucrNudTRAmount.Value, bIncludeArgumentName:=False, iPosition:=1) - Else + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFractionEvapFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSumEvapFunction) + ElseIf rdoTRPercentile.Checked Then + clsTRCombineOperator.RemoveParameterByName("evap") clsTRCombineOperator.RemoveParameterByName("tr_amount") + clsCombinedList.RemoveParameterByName("evap_frac") clsCombinedList.AddParameter("tr_perc_sub", clsRFunctionParameter:=clsTRWetSpell, bIncludeArgumentName:=False) clsTRCombineOperator.AddParameter("tr_perc", strParameterValue:=strWetSpell, iPosition:=1) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsFractionEvapFunction) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSumEvapFunction) + Else + clsCombinedList.RemoveParameterByName("tr_perc_sub") + clsTRCombineOperator.RemoveParameterByName("tr_perc_sub") + clsTRCombineOperator.RemoveParameterByName("tr_amount") + clsCombinedList.AddParameter("evap_frac", strSumFractionEvap, bIncludeArgumentName:=False, iPosition:=1) + clsTRCombineOperator.AddParameter("evap", strParameterValue:=strSumFractionEvap, iPosition:=1, bIncludeArgumentName:=False) + If Not ucrReceiverEvap.IsEmpty Then + clsFractionEvapFunction.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverEvap.GetVariableNames & ")", iPosition:=3) + Else + clsFractionEvapFunction.RemoveParameterByName("calculated_from") + End If + ucrBase.clsRsyntax.AddToBeforeCodes(clsFractionEvapFunction, iPosition:=2) + ucrBase.clsRsyntax.AddToBeforeCodes(clsSumEvapFunction, iPosition:=3) End If Else clsTRCombineOperator.RemoveParameterByName("tr_amount") clsCombinedList.RemoveParameterByName("tr_perc_sub") + clsCombinedList.RemoveParameterByName("evap_frac") clsTRCombineOperator.RemoveParameterByName("tr_perc") + clsTRCombineOperator.RemoveParameterByName("evap") End If End Sub @@ -950,8 +968,9 @@ Public Class dlgStartofRains clsCalcRainRollingSumDryPeriod.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverRainfall.GetVariableNames & ")", iPosition:=3) End Sub - Private Sub ucrChkTotalRainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTotalRainfall.ControlValueChanged, ucrPnlTRCalculateBy.ControlValueChanged, ucrNudTRAmount.ControlValueChanged + Private Sub ucrChkTotalRainfall_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkTotalRainfall.ControlValueChanged, ucrPnlTRCalculateBy.ControlValueChanged, ucrNudTRAmount.ControlValueChanged, ucrNudEvapo.ControlValueChanged, ucrReceiverEvap.ControlValueChanged CombinedFilter() + SetReceiver() If ucrChkTotalRainfall.Checked Then clsIsNaOperatorStartDOY.AddParameter("1", clsRFunctionParameter:=clsIsNaFirstRollSumRain, iPosition:=1) clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain", clsRFunctionParameter:=clsIsNaRollSumRain, iPosition:=2) @@ -969,6 +988,7 @@ Public Class dlgStartofRains DryPeriod() GroupByStationOptions() GroupByYearOptions() + CombinedFilter() End Sub Private Sub ucrReceiverDOY_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDOY.ControlValueChanged, ucrSelectorForStartofRains.ControlValueChanged @@ -988,34 +1008,16 @@ Public Class dlgStartofRains Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStationOptions() - ConvertYearType() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged GroupByYearOptions() End Sub - Private Sub MaximumValuesControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlContentsChanged, ucrNudDPRainPeriod.ControlContentsChanged, ucrNudDPOverallInterval.ControlContentsChanged - If ucrChkDryPeriod.Checked Then - ucrNudDPRainPeriod.Maximum = ucrNudDPOverallInterval.Value - ucrNudDPOverallInterval.Minimum = ucrNudDPRainPeriod.Value - End If - TestOKEnabled() - End Sub - - Private Sub ConvertYearType() - If Not ucrReceiverStation.IsEmpty Then - clsConvertColumnType2Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_by_station_year" & Chr(34), iPosition:=0) - Else - clsConvertColumnType2Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & "_by_year" & Chr(34), iPosition:=0) - End If - End Sub - Private Sub ucrSelectorForStartofRains_DataFrameChanged() Handles ucrSelectorForStartofRains.DataFrameChanged clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) - ConvertYearType() clsDayFilterCalcFromList.ClearParameters() End Sub @@ -1058,37 +1060,74 @@ Public Class dlgStartofRains End If End Sub - Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainfall.ControlContentsChanged, ucrInputNewDoyColumnName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrInputThreshold.ControlContentsChanged, ucrChkNumberOfRainyDays.ControlContentsChanged, ucrNudRDMinimumDays.ControlContentsChanged, ucrNudRDOutOfDays.ControlContentsChanged, ucrChkTotalRainfall.ControlContentsChanged, ucrNudTROverDays.ControlContentsChanged, ucrPnlTRCalculateBy.ControlContentsChanged, ucrNudTRAmount.ControlContentsChanged, ucrNudTRPercentile.ControlContentsChanged, ucrChkDrySpell.ControlContentsChanged, ucrNudDSMaximumDays.ControlContentsChanged, ucrNudDSLengthOfTime.ControlContentsChanged, ucrNudDPMaxRain.ControlContentsChanged, ucrChkAsDoy.ControlContentsChanged, ucrChkAsDate.ControlContentsChanged, ucrInputNewDateColumnName.ControlContentsChanged, ucrChkStatus.ControlContentsChanged, ucrInputNewStatusColumnName.ControlContentsChanged + Private Sub CoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverRainfall.ControlContentsChanged, ucrInputNewDoyColumnName.ControlContentsChanged, ucrReceiverDate.ControlContentsChanged, ucrReceiverDOY.ControlContentsChanged, ucrReceiverYear.ControlContentsChanged, ucrInputThreshold.ControlContentsChanged, ucrChkTotalRainfall.ControlContentsChanged, ucrNudTROverDays.ControlContentsChanged, ucrPnlTRCalculateBy.ControlContentsChanged, ucrNudTRAmount.ControlContentsChanged, ucrNudTRPercentile.ControlContentsChanged, ucrChkAsDoy.ControlContentsChanged, ucrChkAsDate.ControlContentsChanged, ucrInputNewDateColumnName.ControlContentsChanged, ucrChkStatus.ControlContentsChanged, ucrInputNewStatusColumnName.ControlContentsChanged, ucrNudEvapo.ControlContentsChanged, ucrReceiverEvap.ControlContentsChanged TestOKEnabled() End Sub - Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged - If ucrChkNumberOfRainyDays.Checked Then - clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) - clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) + Private Sub SetReceiver() + If rdoEvapo.Checked Then + ucrReceiverEvap.SetMeAsReceiver() Else - clsIsNaOperatorStartDOY.RemoveParameterByName("2") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + ucrReceiverRainfall.SetMeAsReceiver() End If End Sub - Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged - If ucrChkDrySpell.Checked Then - clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) - clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) + Private Sub AdditionalCondition() + If ucrChkAdditional.Checked Then + cmdAdditionnal.Visible = True Else - clsIsNaOperatorStartDOY.RemoveParameterByName("3") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") + cmdAdditionnal.Visible = False End If End Sub - Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged - If ucrChkDryPeriod.Checked Then - clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) - clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) + Private Sub ucrChkAdditional_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAdditional.ControlValueChanged + AdditionalCondition() + End Sub + + Private Sub cmdAdditionnal_Click(sender As Object, e As EventArgs) Handles cmdAdditionnal.Click + sdgAdditionalCondition.SetRCode(clsNewCombinedList:=clsCombinedList, clsNewCalcDrySpellRollMax:=clsCalcDrySpellRollMax, clsNewIsNaFirstDryPeriod:=clsIsNaFirstDryPeriod, clsNewIsNaFirstDrySpell:=clsIsNaFirstDrySpell, clsNewIsNaDryPeriod:=clsIsNaDryPeriod, clsNewIsNaDrySpell:=clsIsNaDrySpell, clsNewRainDayRollingSumFunction:=clsRainDayRollingSumFunction, clsNewIsNaRollSumRainDay:=clsIsNaRollSumRainDay, clsNewIsNaFirstRollSumRainDay:=clsIsNaFirstRollSumRainDay, clsNewDrySpellPeriodRollMaxFunction:=clsDrySpellPeriodRollMaxFunction, clsNewRollingSumRainDryPeriodFunction:=clsRollingSumRainDryPeriodFunction, clsNewCalcRainDayRollingSum:=clsCalcRainDayRollingSum, clsNewCalcRollSumNumberDryPeriod:=clsCalcRollSumNumberDryPeriod, clsNewConditionsAndOperator:=clsConditionsAndOperator, clsNewIsNaOperatorStartDOY:=clsIsNaOperatorStartDOY, clsNewConditionsOrOverallOperator:=clsConditionsOrOverallOperator, clsNewRollingSumRainDayOperator:=clsRollingSumRainDayOperator, clsNewDSCombineOperator:=clsDSCombineOperator, clsNewSumRainDryPeriodIntervalMinusOperator:=clsSumRainDryPeriodIntervalMinusOperator, clsNewSumRainDryPeriodOperator:=clsSumRainDryPeriodOperator, clsNewDPCombineOperator:=clsDPCombineOperator, clsNewSumRainDryPeriodIntervalPlusOperator:=clsSumRainDryPeriodIntervalPlusOperator, bReset:=bResetSubdialog) + sdgAdditionalCondition.ShowDialog() + bResetSubdialog = False + ChangeDSValue() + End Sub + + Private Sub ChangeDSValue() + If Not sdgAdditionalCondition.ucrNudDSMaximumDays.IsEmpty Then + clsDSCombineOperator.AddParameter("ds_max", sdgAdditionalCondition.ucrNudDSMaximumDays.GetText(), iPosition:=1) + Else + clsDSCombineOperator.RemoveParameterByName("ds_max") + End If + If Not sdgAdditionalCondition.ucrNudRDMinimumDays.IsEmpty Then + clsRollingSumRainDayOperator.AddParameter("1", sdgAdditionalCondition.ucrNudRDMinimumDays.GetText(), iPosition:=1) + Else + clsRollingSumRainDayOperator.RemoveParameterByName("1") + End If + If Not sdgAdditionalCondition.ucrNudDPMaxRain.IsEmpty Then + clsSumRainDryPeriodOperator.AddParameter("right", sdgAdditionalCondition.ucrNudDPMaxRain.GetText(), iPosition:=1) + Else + clsSumRainDryPeriodOperator.RemoveParameterByName("right") + End If + If Not sdgAdditionalCondition.ucrNudDPRainPeriod.IsEmpty Then + clsRollingSumRainDryPeriodFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=1) + clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=0) + Else + clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") + clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") + End If + If Not sdgAdditionalCondition.ucrNudDPOverallInterval.IsEmpty Then + clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", sdgAdditionalCondition.ucrNudDPOverallInterval.GetText(), iPosition:=0) + Else + clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") + End If + If Not sdgAdditionalCondition.ucrNudDSLengthOfTime.IsEmpty Then + clsDrySpellPeriodRollMaxFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDSLengthOfTime.GetText(), iPosition:=0) + Else + clsDrySpellPeriodRollMaxFunction.RemoveParameterByName("n") + End If + If Not sdgAdditionalCondition.ucrNudRDOutOfDays.IsEmpty Then + clsRainDayRollingSumFunction.AddParameter("n", sdgAdditionalCondition.ucrNudRDOutOfDays.GetText(), iPosition:=1) Else - clsIsNaOperatorStartDOY.RemoveParameterByName("4") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") + clsRainDayRollingSumFunction.RemoveParameterByName("n") End If End Sub End Class From 95c67519000ed680c33fc100cf21945c5c80c647 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 21 Oct 2024 17:31:01 +0300 Subject: [PATCH 252/273] minor change for switch off undo --- instat/clsInstatOptionsDefaults.vb | 2 +- instat/ucrDataView.vb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instat/clsInstatOptionsDefaults.vb b/instat/clsInstatOptionsDefaults.vb index 6c840acc498..8a4ee9b62cd 100644 --- a/instat/clsInstatOptionsDefaults.vb +++ b/instat/clsInstatOptionsDefaults.vb @@ -47,7 +47,7 @@ Public Class clsInstatOptionsDefaults Public Shared ReadOnly DEFAULTiDigits As Integer = 4 Public Shared ReadOnly DEFAULTbShowSignifStars As Boolean = False Public Shared ReadOnly DEFAULTbAutoSaveData As Boolean = True - Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = True + Public Shared ReadOnly DEFAULTbSwitchOffUndo As Boolean = False Public Shared ReadOnly DEFAULTiAutoSaveDataMinutes As Integer = 10 Public Shared ReadOnly DEFAULTbShowWaitDialog As Boolean = True Public Shared ReadOnly DEFAULTiWaitTimeDelaySeconds As Integer = 2 diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index d799a279cc9..1c827f1c1c7 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -1016,7 +1016,7 @@ Public Class ucrDataView End Sub Public Sub Undo() - If Not frmMain.clsInstatOptions.bSwitchOffUndo Then + If frmMain.clsInstatOptions.bSwitchOffUndo Then ' Show a message box indicating that undo is turned off MsgBox("Undo is turned off, go to Tools > Options to turn it on.", vbInformation, "Undo Disabled") Exit Sub From e82885ec712dae88eff68b158b1a2560e30f44f5 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Mon, 21 Oct 2024 18:00:54 +0300 Subject: [PATCH 253/273] R code addtion --- instat/static/InstatObject/R/instat_object_R6.R | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 1fa96618a94..29e9100c280 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -11,6 +11,7 @@ DataBook <- R6::R6Class("DataBook", self$set_meta(instat_obj_metadata) self$set_objects(list()) self$set_scalars(list()) + self$set_history(list()) if (missing(data_tables) || length(data_tables) == 0) { self$set_data_objects(list()) @@ -31,6 +32,7 @@ DataBook <- R6::R6Class("DataBook", .metadata = list(), .objects = list(), .scalars = list(), + .history = list(), .links = list(), .data_sheets_changed = FALSE, .database_connection = NULL, @@ -316,6 +318,12 @@ DataBook$set("public", "set_objects", function(new_objects) { } ) +DataBook$set("public", "set_history", function(new_history) { + if (!is.list(new_history)) stop("history must be of type: list") + private$.history <- new_history +} +) + DataBook$set("public", "set_scalars", function(new_scalars) { if(!is.list(new_scalars)) stop("new_scalars must be of type: list") private$.scalars <- new_scalars From b89a0b5e3ad04ae97cceec4807a6f972f5ffcba9 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 09:33:39 +0300 Subject: [PATCH 254/273] more r code changes --- instat/Model/DataFrame/clsDataFramePage.vb | 4 +- instat/static/InstatObject/R/data_object_R6.R | 82 +++++++++---------- .../static/InstatObject/R/instat_object_R6.R | 20 +++-- instat/ucrDataView.vb | 6 +- 4 files changed, 59 insertions(+), 53 deletions(-) diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 3fb28e84784..3926bc24f29 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -213,12 +213,12 @@ Public Class clsDataFramePage End Sub - Public Function HasHistory() + Public Function HasUndoHistory() Dim expTemp As SymbolicExpression Dim bHasHistory As Boolean = False Dim clsHasHistoryFunction As New RFunction - clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_history") + clsHasHistoryFunction.SetRCommand(_clsRLink.strInstatDataObject & "$has_undo_history") clsHasHistoryFunction.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) If clsHasHistoryFunction IsNot Nothing Then expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsHasHistoryFunction.ToScript(), bSilent:=True) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index fc5b205242e..bcfe8a4c382 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, history = list(), redo_history = list()) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, undo_history = list(), redo_undo_history = list()) { # Set up the data object self$set_data(data, messages) @@ -31,7 +31,7 @@ DataSheet <- R6::R6Class("DataSheet", self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) - self$set_history(history) + self$set_undo_history(undo_history) # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index @@ -60,8 +60,8 @@ DataSheet <- R6::R6Class("DataSheet", column_selections = list(), objects = list(), keys = list(), - history = list(), - redo_history = list(), + undo_history = list(), + redo_undo_history = list(), comments = list(), calculations = list(), scalars = list(), @@ -164,8 +164,8 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name } ) -DataSheet$set("public", "save_state_to_history", function() { - self$set_history(list(private$data)) +DataSheet$set("public", "save_state_to_undo_history", function() { + self$set_undo_history(list(private$data)) }) DataSheet$set("public", "set_meta", function(new_meta) { @@ -191,19 +191,19 @@ DataSheet$set("public", "clear_metadata", function() { } ) -DataSheet$set("public", "has_history", function() { - return(length(private$history) > 1) +DataSheet$set("public", "has_undo_history", function() { + return(length(private$undo_history) > 1) } ) DataSheet$set("public", "undo_last_action", function() { # Perform the undo action - if (length(private$history) > 1) { - previous_state <- private$history[[length(private$history)]] + if (length(private$undo_history) > 1) { + previous_state <- private$undo_history[[length(private$undo_history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state - private$history <- private$history[-length(private$history)] # Remove the latest state + private$undo_history <- private$undo_history[-length(private$undo_history)] # Remove the latest state } else { message("No more actions to undo.") } @@ -216,18 +216,18 @@ DataSheet$set("public", "undo_last_action", function() { # Redo function DataSheet$set("public", "redo_last_action", function() { - if (length(private$redo_history) > 0) { - # Get the last undone state from redo history - next_state <- private$redo_history[[length(private$redo_history)]] + if (length(private$redo_undo_history) > 0) { + # Get the last undone state from redo undo_history + next_state <- private$redo_undo_history[[length(private$redo_undo_history)]] # Restore the next state self$set_data(as.data.frame(next_state)) - # Move the state back to the history - private$history <- append(private$history, list(next_state)) + # Move the state back to the undo_history + private$undo_history <- append(private$undo_history, list(next_state)) - # Remove the state from redo history - private$redo_history <- private$redo_history[-length(private$redo_history)] + # Remove the state from redo undo_history + private$redo_undo_history <- private$redo_undo_history[-length(private$redo_undo_history)] } else { message("No more actions to redo.") } @@ -290,13 +290,13 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { } ) -# Set history with memory management -DataSheet$set("public", "set_history", function(history) { - if (!is.list(history)) stop("history must be of type: list") +# Set undo_history with memory management +DataSheet$set("public", "set_undo_history", function(new_undo_history) { + if (!is.list(new_undo_history)) stop("undo_history must be of type: list") - # Define memory and history limits - MAX_HISTORY_SIZE <- 10 # Limit to last 10 history states - MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo history + # Define memory and undo_history limits + MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states + MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo undo_history # Check current memory usage current_memory <- monitor_memory() @@ -304,16 +304,16 @@ DataSheet$set("public", "set_history", function(history) { # If memory exceeds limit, remove the oldest entry if (current_memory > MAX_MEMORY_LIMIT_MB) { message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) - private$history <- private$history[-1] # Remove the oldest entry + private$undo_history <- private$undo_history[-1] # Remove the oldest entry gc() # Trigger garbage collection to free memory } - # Limit history size - if (length(private$history) >= MAX_HISTORY_SIZE) { - private$history <- private$history[-1] # Remove the oldest entry + # Limit undo_history size + if (length(private$undo_history) >= MAX_undo_history_SIZE) { + private$undo_history <- private$undo_history[-1] # Remove the oldest entry } - private$history <- append(private$history, list(history)) + private$undo_history <- append(private$undo_history, list(new_undo_history)) # Explicitly call garbage collection to release memory gc() @@ -743,8 +743,8 @@ DataSheet$set("public", "add_scalar", function(scalar_name = "", scalar_value) { ) DataSheet$set("public", "add_columns_to_data", function(col_name = "", col_data, use_col_name_as_prefix = FALSE, hidden = FALSE, before, adjacent_column = "", num_cols, require_correct_length = TRUE, keep_existing_position = TRUE) { - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() # Column name must be character if(!is.character(col_name)) stop("Column name must be of type: character") @@ -896,8 +896,8 @@ DataSheet$set("public", "cor", function(x_col_names, y_col_name, use = "everythi DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", new_col_name = "", label = "", type = "single", .fn, .cols = everything(), new_column_names_df, new_labels_df, ...) { curr_data <- self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE) - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() # Column name must be character if (type == "single") { @@ -989,8 +989,8 @@ DataSheet$set("public", "rename_column_in_data", function(curr_col_name = "", ne DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delete_all = FALSE) { - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() if(length(cols) == self$get_column_count()) { if(allow_delete_all) { @@ -1026,7 +1026,7 @@ DataSheet$set("public", "remove_columns_in_data", function(cols=c(), allow_delet DataSheet$set("public", "replace_value_in_data", function(col_names, rows, old_value, old_is_missing = FALSE, start_value = NA, end_value = NA, new_value, new_is_missing = FALSE, closed_start_value = TRUE, closed_end_value = TRUE, locf = FALSE, from_last = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() # Column name must be character if(!all(is.character(col_names))) stop("Column name must be of type: character") if (!all(col_names %in% names(curr_data))) stop("Cannot find all columns in the data.") @@ -1371,7 +1371,7 @@ DataSheet$set("public", "add_defaults_variables_metadata", function(column_names DataSheet$set("public", "remove_rows_in_data", function(row_names) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() if(!all(row_names %in% rownames(curr_data))) stop("Some of the row_names not found in data") rows_to_remove <- which(rownames(curr_data) %in% row_names) @@ -1397,8 +1397,8 @@ DataSheet$set("public", "get_next_default_column_name", function(prefix) { DataSheet$set("public", "reorder_columns_in_data", function(col_order) { if (ncol(self$get_data_frame(use_current_filter = FALSE, use_column_selection = FALSE)) != length(col_order)) stop("Columns to order should be same as columns in the data.") - # Save the current state to history before making modifications - self$save_state_to_history() + # Save the current state to undo_history before making modifications + self$save_state_to_undo_history() if(is.numeric(col_order)) { if(!(identical(sort(col_order), sort(as.numeric(1:ncol(data)))))) { @@ -1422,7 +1422,7 @@ DataSheet$set("public", "reorder_columns_in_data", function(col_order) { DataSheet$set("public", "insert_row_in_data", function(start_row, row_data = c(), number_rows = 1, before = FALSE) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() curr_row_names <- rownames(curr_data) if (!start_row %in% curr_row_names) { stop(paste(start_row, " not found in rows")) @@ -4605,7 +4605,7 @@ DataSheet$set("public", "remove_empty", function(which = c("rows", "cols")) { DataSheet$set("public", "replace_values_with_NA", function(row_index, column_index) { curr_data <- self$get_data_frame(use_current_filter = FALSE) - self$save_state_to_history() + self$save_state_to_undo_history() if(!all(row_index %in% seq_len(nrow(curr_data)))) stop("All row indexes must be within the dataframe") if(!all(column_index %in% seq_len(ncol(curr_data)))) stop("All column indexes must be within the dataframe") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 29e9100c280..8c4d49f9db6 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -11,7 +11,7 @@ DataBook <- R6::R6Class("DataBook", self$set_meta(instat_obj_metadata) self$set_objects(list()) self$set_scalars(list()) - self$set_history(list()) + self$set_undo_history(list()) if (missing(data_tables) || length(data_tables) == 0) { self$set_data_objects(list()) @@ -32,7 +32,7 @@ DataBook <- R6::R6Class("DataBook", .metadata = list(), .objects = list(), .scalars = list(), - .history = list(), + .undo_history = list(), .links = list(), .data_sheets_changed = FALSE, .database_connection = NULL, @@ -318,12 +318,18 @@ DataBook$set("public", "set_objects", function(new_objects) { } ) -DataBook$set("public", "set_history", function(new_history) { - if (!is.list(new_history)) stop("history must be of type: list") - private$.history <- new_history +DataBook$set("public", "set_undo_history", function(new_undo_history) { + if (!is.list(new_undo_history)) stop("undo_history must be of type: list") + + private$.undo_history <- new_undo_history } ) +DataSheet$set("public", "disable_undo", function() { + private$.undo_history <- list() # Clear history + self$undo_enabled <- FALSE # Disable undo functionality +}) + DataBook$set("public", "set_scalars", function(new_scalars) { if(!is.list(new_scalars)) stop("new_scalars must be of type: list") private$.scalars <- new_scalars @@ -1360,8 +1366,8 @@ DataBook$set("public","has_key", function(data_name) { } ) -DataBook$set("public","has_history", function(data_name) { - self$get_data_objects(data_name)$has_history() +DataBook$set("public","has_undo_history", function(data_name) { + self$get_data_objects(data_name)$has_undo_history() } ) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 1c827f1c1c7..152bd23aa57 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -100,7 +100,7 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False - frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasHistory + frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory RefreshDisplayInformation() End Sub @@ -275,7 +275,7 @@ Public Class ucrDataView SetDisplayLabels() UpdateNavigationButtons() SetGridVisibility(True) - frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory Else frmMain.tstatus.Text = GetTranslation("No data loaded") SetGridVisibility(False) @@ -1052,7 +1052,7 @@ Public Class ucrDataView End If - If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasHistory Then + If GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory Then GetCurrentDataFrameFocus.clsVisibleDataFramePage.Undo() End If End If From 54854f2a4f174e5cf6bd4a3c26f38e5744b13c3d Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 22 Oct 2024 10:47:29 +0100 Subject: [PATCH 255/273] Change made --- instat/dlgStartofRains.vb | 145 +++++++++++++++++++++++-------- instat/sdgAdditionalCondition.vb | 58 ++++++------- 2 files changed, 138 insertions(+), 65 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 516fbdcdc03..14932917b40 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgStartofRains Private bResetSubdialog As Boolean = True - Private clsCalcRainDay, clsCalcStartDOY, clsTailFunction, clsGetDataFrameFunction, clsListevapFunction, clsRollEvaporationFunction, clsFractionEvapFunction, clsSumEvapFunction, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private clsCalcRainDay, clsCalcStartDOY, clsPaste0Function, clsGetDataFrameFunction, clsListevapFunction, clsRollEvaporationFunction, clsFractionEvapFunction, clsSumEvapFunction, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction Private clsDayFromAndToOperator, clsEvapOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction @@ -60,7 +60,7 @@ Public Class dlgStartofRains Private clsIsNaDryPeriod As New RFunction 'Rainy Day classes - Private clsCalcRainDayRollingSum, clsRainDayRollingSumFunction, clsRDRollingRainDaysSub As New RFunction + Public clsCalcRainDayRollingSum, clsRainDayRollingSumFunction, clsRDRollingRainDaysSub As New RFunction 'Dry Spell classes Private clsCalcDrySpellRollMax, clsCalcDrySpell, clsDrySpellPeriodLeadFunction, clsDrySpellPeriodRollMaxFunction, clsDrySpellPeriodSubCalcList, clsDrySpellSubCalcList As New RFunction @@ -297,7 +297,7 @@ Public Class dlgStartofRains clsCalcRainRollingSum.Clear() clsRainRollingSumFunction = New RFunction - clsTailFunction = New RFunction + clsPaste0Function = New RFunction clsGetDataFrameFunction = New RFunction clsTRWetSpellList.Clear() clsTRWetSpell.Clear() @@ -559,7 +559,7 @@ Public Class dlgStartofRains clsRollEvaporationFunction.SetPackageName("RcppRoll") clsRollEvaporationFunction.SetRCommand("roll_sumr") clsRollEvaporationFunction.AddParameter("x", strFactionEvap, iPosition:=0) - clsRollEvaporationFunction.AddParameter("n", "2", iPosition:=1) + ' clsRollEvaporationFunction.AddParameter("n", "2", iPosition:=1) clsRollEvaporationFunction.AddParameter("fill", "NA", iPosition:=2) clsRollEvaporationFunction.AddParameter("na.rm", "FALSE", iPosition:=3) clsRollEvaporationFunction.bToScriptAsRString = True @@ -760,10 +760,13 @@ Public Class dlgStartofRains clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_names") - clsTailFunction.SetRCommand("tail") - clsTailFunction.AddParameter("x", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0, bIncludeArgumentName:=False) - clsTailFunction.AddParameter("n", "1", iPosition:=1) - clsTailFunction.SetAssignTo("last_data_name") + clsPaste0Function.SetRCommand("paste0") + 'clsPaste0Function.AddParameter("x", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0, bIncludeArgumentName:=False) + clsPaste0Function.AddParameter("n", Chr(34) & "_by_" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) + ' clsPaste0Function.AddParameter("z", "_", iPosition:=3, bIncludeArgumentName:=False) + clsPaste0Function.SetAssignTo("last_data_name") + + ' last_data_name <- paste0("dodoma", "_by_", "s_year", "_", "station") clsConvertColumnType2Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") clsConvertColumnType2Function.AddParameter("data_name", "last_data_name", iPosition:=0) @@ -783,7 +786,7 @@ Public Class dlgStartofRains ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatFunction) ucrBase.clsRsyntax.AddToBeforeCodes(clsGetColumnDataTypeFunction, iPosition:=0) ucrBase.clsRsyntax.AddToBeforeCodes(clsConvertColumnTypeFunction, iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsTailFunction, iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsPaste0Function, iPosition:=0) ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType1Function, iPosition:=1) ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType2Function, iPosition:=2) SetReceiver() @@ -802,6 +805,7 @@ Public Class dlgStartofRains ucrReceiverRainfall.AddAdditionalCodeParameterPair(clsIsNaRain, New RParameter("x", 0), iAdditionalPairNo:=5) ucrInputThreshold.AddAdditionalCodeParameterPair(clsRainDayConditionOperator, New RParameter("threshold", 1), iAdditionalPairNo:=1) ucrInputNewDoyColumnName.AddAdditionalCodeParameterPair(clsCalcStartDOY, New RParameter("result_name", 3), iAdditionalPairNo:=1) + ucrNudTROverDays.AddAdditionalCodeParameterPair(clsRollEvaporationFunction, New RParameter("n", 1), iAdditionalPairNo:=1) ucrReceiverDOY.SetRCode(clsDayToOperator, bReset) ucrChkAsDoy.SetRCode(clsCombinationSubCalcList, bReset) @@ -1008,16 +1012,19 @@ Public Class dlgStartofRains Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStationOptions() + StationVariable() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged GroupByYearOptions() + YearVariable() End Sub Private Sub ucrSelectorForStartofRains_DataFrameChanged() Handles ucrSelectorForStartofRains.DataFrameChanged clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + clsPaste0Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0, bIncludeArgumentName:=False) clsDayFilterCalcFromList.ClearParameters() End Sub @@ -1082,6 +1089,7 @@ Public Class dlgStartofRains Private Sub ucrChkAdditional_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAdditional.ControlValueChanged AdditionalCondition() + ChangeDSValue() End Sub Private Sub cmdAdditionnal_Click(sender As Object, e As EventArgs) Handles cmdAdditionnal.Click @@ -1089,45 +1097,110 @@ Public Class dlgStartofRains sdgAdditionalCondition.ShowDialog() bResetSubdialog = False ChangeDSValue() + AdditionalCondition() End Sub Private Sub ChangeDSValue() - If Not sdgAdditionalCondition.ucrNudDSMaximumDays.IsEmpty Then - clsDSCombineOperator.AddParameter("ds_max", sdgAdditionalCondition.ucrNudDSMaximumDays.GetText(), iPosition:=1) - Else - clsDSCombineOperator.RemoveParameterByName("ds_max") - End If - If Not sdgAdditionalCondition.ucrNudRDMinimumDays.IsEmpty Then - clsRollingSumRainDayOperator.AddParameter("1", sdgAdditionalCondition.ucrNudRDMinimumDays.GetText(), iPosition:=1) - Else - clsRollingSumRainDayOperator.RemoveParameterByName("1") - End If - If Not sdgAdditionalCondition.ucrNudDPMaxRain.IsEmpty Then - clsSumRainDryPeriodOperator.AddParameter("right", sdgAdditionalCondition.ucrNudDPMaxRain.GetText(), iPosition:=1) + If ucrChkAdditional.Checked Then + If sdgAdditionalCondition.ucrChkNumberOfRainyDays.Checked Then + clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) + clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("2") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + End If + If sdgAdditionalCondition.ucrChkDrySpell.Checked Then + clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) + clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("3") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") + End If + If sdgAdditionalCondition.ucrChkDryPeriod.Checked Then + clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) + clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("4") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") + End If + If Not sdgAdditionalCondition.ucrNudDSMaximumDays.IsEmpty Then + clsDSCombineOperator.AddParameter("ds_max", sdgAdditionalCondition.ucrNudDSMaximumDays.GetText(), iPosition:=1) + Else + clsDSCombineOperator.RemoveParameterByName("ds_max") + End If + If Not sdgAdditionalCondition.ucrNudRDMinimumDays.IsEmpty Then + clsRollingSumRainDayOperator.AddParameter("1", sdgAdditionalCondition.ucrNudRDMinimumDays.GetText(), iPosition:=1) + Else + clsRollingSumRainDayOperator.RemoveParameterByName("1") + End If + If Not sdgAdditionalCondition.ucrNudDPMaxRain.IsEmpty Then + clsSumRainDryPeriodOperator.AddParameter("right", sdgAdditionalCondition.ucrNudDPMaxRain.GetText(), iPosition:=1) + Else + clsSumRainDryPeriodOperator.RemoveParameterByName("right") + End If + If Not sdgAdditionalCondition.ucrNudDPRainPeriod.IsEmpty Then + clsRollingSumRainDryPeriodFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=1) + clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=0) + Else + clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") + clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") + End If + If Not sdgAdditionalCondition.ucrNudDPOverallInterval.IsEmpty Then + clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", sdgAdditionalCondition.ucrNudDPOverallInterval.GetText(), iPosition:=0) + Else + clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") + End If + If Not sdgAdditionalCondition.ucrNudDSLengthOfTime.IsEmpty Then + clsDrySpellPeriodRollMaxFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDSLengthOfTime.GetText(), iPosition:=0) + Else + clsDrySpellPeriodRollMaxFunction.RemoveParameterByName("n") + End If + If Not sdgAdditionalCondition.ucrNudRDOutOfDays.IsEmpty Then + clsRainDayRollingSumFunction.AddParameter("n", sdgAdditionalCondition.ucrNudRDOutOfDays.GetText(), iPosition:=1) + Else + clsRainDayRollingSumFunction.RemoveParameterByName("n") + End If Else + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDay) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDayRollingSum) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainRollingSumDryPeriod) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRollSumNumberDryPeriod) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpell) + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpellRollMax) + + clsIsNaOperatorStartDOY.RemoveParameterByName("4") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") + clsIsNaOperatorStartDOY.RemoveParameterByName("3") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") + clsIsNaOperatorStartDOY.RemoveParameterByName("2") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + + clsRainDayRollingSumFunction.RemoveParameterByName("n") + clsDrySpellPeriodRollMaxFunction.RemoveParameterByName("n") clsSumRainDryPeriodOperator.RemoveParameterByName("right") - End If - If Not sdgAdditionalCondition.ucrNudDPRainPeriod.IsEmpty Then - clsRollingSumRainDryPeriodFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=1) - clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=0) - Else + clsRollingSumRainDayOperator.RemoveParameterByName("1") + clsDSCombineOperator.RemoveParameterByName("ds_max") clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") - End If - If Not sdgAdditionalCondition.ucrNudDPOverallInterval.IsEmpty Then - clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", sdgAdditionalCondition.ucrNudDPOverallInterval.GetText(), iPosition:=0) - Else clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") End If - If Not sdgAdditionalCondition.ucrNudDSLengthOfTime.IsEmpty Then - clsDrySpellPeriodRollMaxFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDSLengthOfTime.GetText(), iPosition:=0) + End Sub + + Private Sub StationVariable() + If Not ucrReceiverStation.IsEmpty Then + clsPaste0Function.AddParameter("z", Chr(34) & "_" & Chr(34), iPosition:=3, bIncludeArgumentName:=False) + clsPaste0Function.AddParameter("x", ucrReceiverStation.GetVariableNames(), iPosition:=2, bIncludeArgumentName:=False) Else - clsDrySpellPeriodRollMaxFunction.RemoveParameterByName("n") + clsPaste0Function.RemoveParameterByName("x") + clsPaste0Function.RemoveParameterByName("z") End If - If Not sdgAdditionalCondition.ucrNudRDOutOfDays.IsEmpty Then - clsRainDayRollingSumFunction.AddParameter("n", sdgAdditionalCondition.ucrNudRDOutOfDays.GetText(), iPosition:=1) + End Sub + + Private Sub YearVariable() + If Not ucrReceiverYear.IsEmpty Then + clsPaste0Function.AddParameter("y", ucrReceiverYear.GetVariableNames(), iPosition:=4, bIncludeArgumentName:=False) Else - clsRainDayRollingSumFunction.RemoveParameterByName("n") + clsPaste0Function.RemoveParameterByName("y") End If End Sub End Class diff --git a/instat/sdgAdditionalCondition.vb b/instat/sdgAdditionalCondition.vb index 69fea212509..17f34d4b023 100644 --- a/instat/sdgAdditionalCondition.vb +++ b/instat/sdgAdditionalCondition.vb @@ -115,35 +115,35 @@ Public Class sdgAdditionalCondition ucrChkDrySpell.SetRCode(clsCombinedList, bReset, bCloneIfNeeded:=True) End Sub - Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged - If ucrChkNumberOfRainyDays.Checked Then - clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) - clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) - Else - clsIsNaOperatorStartDOY.RemoveParameterByName("2") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") - End If - End Sub - - Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged - If ucrChkDrySpell.Checked Then - clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) - clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) - Else - clsIsNaOperatorStartDOY.RemoveParameterByName("3") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") - End If - End Sub - - Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged - If ucrChkDryPeriod.Checked Then - clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) - clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) - Else - clsIsNaOperatorStartDOY.RemoveParameterByName("4") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") - End If - End Sub + 'Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged + ' If ucrChkNumberOfRainyDays.Checked Then + ' clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) + ' clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) + ' Else + ' clsIsNaOperatorStartDOY.RemoveParameterByName("2") + ' clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + ' End If + 'End Sub + + 'Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged + ' If ucrChkDrySpell.Checked Then + ' clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) + ' clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) + ' Else + ' clsIsNaOperatorStartDOY.RemoveParameterByName("3") + ' clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") + ' End If + 'End Sub + + 'Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged + ' If ucrChkDryPeriod.Checked Then + ' clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) + ' clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) + ' Else + ' clsIsNaOperatorStartDOY.RemoveParameterByName("4") + ' clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") + ' End If + 'End Sub Private Sub MaximumValuesControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlContentsChanged, ucrNudDPRainPeriod.ControlContentsChanged, ucrNudDPOverallInterval.ControlContentsChanged If ucrChkDryPeriod.Checked Then From 743cec73290569dfab65a6f0b1b429212154b174 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 14:39:02 +0300 Subject: [PATCH 256/273] code change --- instat/static/InstatObject/R/instat_object_R6.R | 5 ----- 1 file changed, 5 deletions(-) diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index 8c4d49f9db6..e53d37cd90d 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -325,11 +325,6 @@ DataBook$set("public", "set_undo_history", function(new_undo_history) { } ) -DataSheet$set("public", "disable_undo", function() { - private$.undo_history <- list() # Clear history - self$undo_enabled <- FALSE # Disable undo functionality -}) - DataBook$set("public", "set_scalars", function(new_scalars) { if(!is.list(new_scalars)) stop("new_scalars must be of type: list") private$.scalars <- new_scalars From fbeae0d68c2b1be6443c92f5e4b7433a9e84504a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Tue, 22 Oct 2024 13:35:24 +0100 Subject: [PATCH 257/273] Change made --- instat/dlgStartofRains.vb | 26 +++++++++---- instat/sdgAdditionalCondition.vb | 63 ++++++++++++++++---------------- 2 files changed, 50 insertions(+), 39 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 14932917b40..a45b4f2412f 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -1093,10 +1093,9 @@ Public Class dlgStartofRains End Sub Private Sub cmdAdditionnal_Click(sender As Object, e As EventArgs) Handles cmdAdditionnal.Click - sdgAdditionalCondition.SetRCode(clsNewCombinedList:=clsCombinedList, clsNewCalcDrySpellRollMax:=clsCalcDrySpellRollMax, clsNewIsNaFirstDryPeriod:=clsIsNaFirstDryPeriod, clsNewIsNaFirstDrySpell:=clsIsNaFirstDrySpell, clsNewIsNaDryPeriod:=clsIsNaDryPeriod, clsNewIsNaDrySpell:=clsIsNaDrySpell, clsNewRainDayRollingSumFunction:=clsRainDayRollingSumFunction, clsNewIsNaRollSumRainDay:=clsIsNaRollSumRainDay, clsNewIsNaFirstRollSumRainDay:=clsIsNaFirstRollSumRainDay, clsNewDrySpellPeriodRollMaxFunction:=clsDrySpellPeriodRollMaxFunction, clsNewRollingSumRainDryPeriodFunction:=clsRollingSumRainDryPeriodFunction, clsNewCalcRainDayRollingSum:=clsCalcRainDayRollingSum, clsNewCalcRollSumNumberDryPeriod:=clsCalcRollSumNumberDryPeriod, clsNewConditionsAndOperator:=clsConditionsAndOperator, clsNewIsNaOperatorStartDOY:=clsIsNaOperatorStartDOY, clsNewConditionsOrOverallOperator:=clsConditionsOrOverallOperator, clsNewRollingSumRainDayOperator:=clsRollingSumRainDayOperator, clsNewDSCombineOperator:=clsDSCombineOperator, clsNewSumRainDryPeriodIntervalMinusOperator:=clsSumRainDryPeriodIntervalMinusOperator, clsNewSumRainDryPeriodOperator:=clsSumRainDryPeriodOperator, clsNewDPCombineOperator:=clsDPCombineOperator, clsNewSumRainDryPeriodIntervalPlusOperator:=clsSumRainDryPeriodIntervalPlusOperator, bReset:=bResetSubdialog) + sdgAdditionalCondition.SetRCode(clsNewCombinedList:=clsCombinedList, clsNewCalcRainDay:=clsCalcRainDay, clsNewCalcDrySpellRollMax:=clsCalcDrySpellRollMax, clsNewIsNaFirstDryPeriod:=clsIsNaFirstDryPeriod, clsNewIsNaFirstDrySpell:=clsIsNaFirstDrySpell, clsNewIsNaDryPeriod:=clsIsNaDryPeriod, clsNewIsNaDrySpell:=clsIsNaDrySpell, clsNewRainDayRollingSumFunction:=clsRainDayRollingSumFunction, clsNewIsNaRollSumRainDay:=clsIsNaRollSumRainDay, clsNewIsNaFirstRollSumRainDay:=clsIsNaFirstRollSumRainDay, clsNewDrySpellPeriodRollMaxFunction:=clsDrySpellPeriodRollMaxFunction, clsNewRollingSumRainDryPeriodFunction:=clsRollingSumRainDryPeriodFunction, clsNewCalcRainDayRollingSum:=clsCalcRainDayRollingSum, clsNewCalcRollSumNumberDryPeriod:=clsCalcRollSumNumberDryPeriod, clsNewConditionsAndOperator:=clsConditionsAndOperator, clsNewIsNaOperatorStartDOY:=clsIsNaOperatorStartDOY, clsNewConditionsOrOverallOperator:=clsConditionsOrOverallOperator, clsNewRollingSumRainDayOperator:=clsRollingSumRainDayOperator, clsNewDSCombineOperator:=clsDSCombineOperator, clsNewSumRainDryPeriodIntervalMinusOperator:=clsSumRainDryPeriodIntervalMinusOperator, clsNewSumRainDryPeriodOperator:=clsSumRainDryPeriodOperator, clsNewDPCombineOperator:=clsDPCombineOperator, clsNewSumRainDryPeriodIntervalPlusOperator:=clsSumRainDryPeriodIntervalPlusOperator, bReset:=bResetSubdialog) sdgAdditionalCondition.ShowDialog() bResetSubdialog = False - ChangeDSValue() AdditionalCondition() End Sub @@ -1105,21 +1104,29 @@ Public Class dlgStartofRains If sdgAdditionalCondition.ucrChkNumberOfRainyDays.Checked Then clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) + 'ucrBase.clsRsyntax.AddToBeforeCodes(clsCalcRainDay, iPosition:=2) + 'ucrBase.clsRsyntax.AddToBeforeCodes(clsCalcRainDayRollingSum, iPosition:=3) + clsCombinedList.AddParameter("rd_sub", clsRFunctionParameter:=clsCalcRainDayRollingSum, bIncludeArgumentName:=False, iPosition:=1) Else + clsCombinedList.RemoveParameterByName("rd_sub") clsIsNaOperatorStartDOY.RemoveParameterByName("2") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") End If If sdgAdditionalCondition.ucrChkDrySpell.Checked Then clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) + clsCombinedList.AddParameter("ds_sub", clsRFunctionParameter:=clsCalcDrySpellRollMax, iPosition:=2, bIncludeArgumentName:=False) Else + clsCombinedList.RemoveParameterByName("ds_sub") clsIsNaOperatorStartDOY.RemoveParameterByName("3") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") End If If sdgAdditionalCondition.ucrChkDryPeriod.Checked Then clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) + clsCombinedList.AddParameter("dp_sub", clsRFunctionParameter:=clsCalcRollSumNumberDryPeriod, iPosition:=3, bIncludeArgumentName:=False) Else + clsCombinedList.RemoveParameterByName("dp_sub") clsIsNaOperatorStartDOY.RemoveParameterByName("4") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") End If @@ -1161,12 +1168,15 @@ Public Class dlgStartofRains clsRainDayRollingSumFunction.RemoveParameterByName("n") End If Else - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDay) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDayRollingSum) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainRollingSumDryPeriod) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRollSumNumberDryPeriod) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpell) - ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpellRollMax) + clsCombinedList.RemoveParameterByName("rd_sub") + clsCombinedList.RemoveParameterByName("ds_sub") + clsCombinedList.RemoveParameterByName("dp_sub") + 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDay) + 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDayRollingSum) + 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainRollingSumDryPeriod) + 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRollSumNumberDryPeriod) + 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpell) + 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpellRollMax) clsIsNaOperatorStartDOY.RemoveParameterByName("4") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") diff --git a/instat/sdgAdditionalCondition.vb b/instat/sdgAdditionalCondition.vb index 17f34d4b023..c100f4651f9 100644 --- a/instat/sdgAdditionalCondition.vb +++ b/instat/sdgAdditionalCondition.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class sdgAdditionalCondition Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False - Private clsCombinedList, clsCalcDrySpellRollMax, clsIsNaFirstDryPeriod, clsIsNaFirstDrySpell, clsIsNaDryPeriod, clsIsNaDrySpell, clsRainDayRollingSumFunction, clsIsNaRollSumRainDay, clsIsNaFirstRollSumRainDay, clsDrySpellPeriodRollMaxFunction, clsRollingSumRainDryPeriodFunction, clsCalcRainDayRollingSum, clsCalcRollSumNumberDryPeriod As RFunction + Private clsCombinedList, clsCalcDrySpellRollMax, clsCalcRainDay, clsIsNaFirstDryPeriod, clsIsNaFirstDrySpell, clsIsNaDryPeriod, clsIsNaDrySpell, clsRainDayRollingSumFunction, clsIsNaRollSumRainDay, clsIsNaFirstRollSumRainDay, clsDrySpellPeriodRollMaxFunction, clsRollingSumRainDryPeriodFunction, clsCalcRainDayRollingSum, clsCalcRollSumNumberDryPeriod As RFunction Private clsConditionsAndOperator, clsIsNaOperatorStartDOY, clsConditionsOrOverallOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsSumRainDryPeriodIntervalMinusOperator, clsSumRainDryPeriodOperator, clsDPCombineOperator, clsSumRainDryPeriodIntervalPlusOperator As ROperator Private Sub sdgAdditionalCondition_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -81,7 +81,7 @@ Public Class sdgAdditionalCondition ucrChkDryPeriod.AddToLinkedControls(ucrNudDPRainPeriod, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30) End Sub - Public Sub SetRCode(clsNewCombinedList As RFunction, clsNewCalcDrySpellRollMax As RFunction, clsNewIsNaFirstDryPeriod As RFunction, clsNewIsNaFirstDrySpell As RFunction, clsNewIsNaDryPeriod As RFunction, clsNewIsNaDrySpell As RFunction, clsNewRainDayRollingSumFunction As RFunction, clsNewIsNaRollSumRainDay As RFunction, clsNewIsNaFirstRollSumRainDay As RFunction, clsNewDrySpellPeriodRollMaxFunction As RFunction, clsNewRollingSumRainDryPeriodFunction As RFunction, clsNewCalcRainDayRollingSum As RFunction, clsNewCalcRollSumNumberDryPeriod As RFunction, clsNewConditionsAndOperator As ROperator, clsNewIsNaOperatorStartDOY As ROperator, clsNewConditionsOrOverallOperator As ROperator, clsNewRollingSumRainDayOperator As ROperator, clsNewDSCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalMinusOperator As ROperator, clsNewSumRainDryPeriodOperator As ROperator, clsNewDPCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalPlusOperator As ROperator, Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewCombinedList As RFunction, clsNewCalcDrySpellRollMax As RFunction, clsNewCalcRainDay As RFunction, clsNewIsNaFirstDryPeriod As RFunction, clsNewIsNaFirstDrySpell As RFunction, clsNewIsNaDryPeriod As RFunction, clsNewIsNaDrySpell As RFunction, clsNewRainDayRollingSumFunction As RFunction, clsNewIsNaRollSumRainDay As RFunction, clsNewIsNaFirstRollSumRainDay As RFunction, clsNewDrySpellPeriodRollMaxFunction As RFunction, clsNewRollingSumRainDryPeriodFunction As RFunction, clsNewCalcRainDayRollingSum As RFunction, clsNewCalcRollSumNumberDryPeriod As RFunction, clsNewConditionsAndOperator As ROperator, clsNewIsNaOperatorStartDOY As ROperator, clsNewConditionsOrOverallOperator As ROperator, clsNewRollingSumRainDayOperator As ROperator, clsNewDSCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalMinusOperator As ROperator, clsNewSumRainDryPeriodOperator As ROperator, clsNewDPCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalPlusOperator As ROperator, Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If @@ -92,6 +92,7 @@ Public Class sdgAdditionalCondition clsIsNaDryPeriod = clsNewIsNaDryPeriod clsIsNaDrySpell = clsNewIsNaDrySpell clsRainDayRollingSumFunction = clsNewRainDayRollingSumFunction + clsCalcRainDay = clsNewCalcRainDay clsIsNaRollSumRainDay = clsNewIsNaRollSumRainDay clsIsNaFirstRollSumRainDay = clsNewIsNaFirstRollSumRainDay clsDrySpellPeriodRollMaxFunction = clsNewDrySpellPeriodRollMaxFunction @@ -115,35 +116,35 @@ Public Class sdgAdditionalCondition ucrChkDrySpell.SetRCode(clsCombinedList, bReset, bCloneIfNeeded:=True) End Sub - 'Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged - ' If ucrChkNumberOfRainyDays.Checked Then - ' clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) - ' clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) - ' Else - ' clsIsNaOperatorStartDOY.RemoveParameterByName("2") - ' clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") - ' End If - 'End Sub - - 'Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged - ' If ucrChkDrySpell.Checked Then - ' clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) - ' clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) - ' Else - ' clsIsNaOperatorStartDOY.RemoveParameterByName("3") - ' clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") - ' End If - 'End Sub - - 'Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged - ' If ucrChkDryPeriod.Checked Then - ' clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) - ' clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) - ' Else - ' clsIsNaOperatorStartDOY.RemoveParameterByName("4") - ' clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") - ' End If - 'End Sub + Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged + If ucrChkNumberOfRainyDays.Checked Then + clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) + clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("2") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + End If + End Sub + + Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged + If ucrChkDrySpell.Checked Then + clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) + clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("3") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") + End If + End Sub + + Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged + If ucrChkDryPeriod.Checked Then + clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) + clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) + Else + clsIsNaOperatorStartDOY.RemoveParameterByName("4") + clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") + End If + End Sub Private Sub MaximumValuesControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlContentsChanged, ucrNudDPRainPeriod.ControlContentsChanged, ucrNudDPOverallInterval.ControlContentsChanged If ucrChkDryPeriod.Checked Then From d4f93ddc794393d8dfd89ae88d2eb749e5122495 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 17:38:25 +0300 Subject: [PATCH 258/273] implemented the possibility to switch on/off undo in different datasets --- instat/Interface/IDataViewGrid.vb | 2 ++ instat/Model/DataFrame/clsDataFramePage.vb | 27 +++++++++++++++++++ .../DataGrid/Linux/ucrDataViewLinuxGrid.vb | 2 ++ .../DataGrid/ReoGrid/ucrDataViewReoGrid.vb | 7 +++++ instat/dlgOptions.vb | 1 + instat/frmMain.vb | 4 +++ instat/static/InstatObject/R/data_object_R6.R | 24 +++++++++++------ .../static/InstatObject/R/instat_object_R6.R | 9 +++++++ instat/ucrDataView.vb | 19 +++++++++++++ 9 files changed, 87 insertions(+), 8 deletions(-) diff --git a/instat/Interface/IDataViewGrid.vb b/instat/Interface/IDataViewGrid.vb index 4145675170f..3bc8368f164 100644 --- a/instat/Interface/IDataViewGrid.vb +++ b/instat/Interface/IDataViewGrid.vb @@ -29,6 +29,8 @@ Public Interface IDataViewGrid Event WorksheetChanged() + Event WorksheetInserted() + Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Event FindRow() diff --git a/instat/Model/DataFrame/clsDataFramePage.vb b/instat/Model/DataFrame/clsDataFramePage.vb index 3926bc24f29..062e2216a90 100644 --- a/instat/Model/DataFrame/clsDataFramePage.vb +++ b/instat/Model/DataFrame/clsDataFramePage.vb @@ -213,6 +213,33 @@ Public Class clsDataFramePage End Sub + Public Function IsUndo(strCurrentDataFrame As String) + Dim clsIsUndoFunction As New RFunction + Dim expTemp As SymbolicExpression + clsIsUndoFunction.SetRCommand(_clsRLink.strInstatDataObject & "$is_undo") + clsIsUndoFunction.AddParameter("data_name", Chr(34) & strCurrentDataFrame & Chr(34)) + + If clsIsUndoFunction IsNot Nothing Then + expTemp = frmMain.clsRLink.RunInternalScriptGetValue(clsIsUndoFunction.ToScript(), bSilent:=True) + If expTemp IsNot Nothing AndAlso expTemp.AsCharacter(0) = "TRUE" Then + Return True + End If + End If + + Return False + End Function + + Public Sub DisableEnableUndo(bDisable As Boolean, strCurrentDataFrame As String) + Dim clsEnableDisableUndoRFunction As New RFunction + clsEnableDisableUndoRFunction.SetRCommand(_clsRLink.strInstatDataObject & "$set_enable_disable_undo") + clsEnableDisableUndoRFunction.AddParameter("data_name", Chr(34) & strCurrentDataFrame & Chr(34)) + + Dim strDisable As String = If(bDisable, "TRUE", "FALSE") + clsEnableDisableUndoRFunction.AddParameter("disable_undo", strDisable) + _clsRLink.RunScript(clsEnableDisableUndoRFunction.ToScript) + + End Sub + Public Function HasUndoHistory() Dim expTemp As SymbolicExpression Dim bHasHistory As Boolean = False diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 3977f595ba1..103d1d540d0 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -35,6 +35,8 @@ Public Class ucrDataViewLinuxGrid Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged + Public Event WorksheetInserted() Implements IDataViewGrid.WorksheetInserted + Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index af8a4ea89e3..d2b1a9cf276 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -35,6 +35,8 @@ Public Class ucrDataViewReoGrid Public Event WorksheetChanged() Implements IDataViewGrid.WorksheetChanged + Public Event WorksheetInserted() Implements IDataViewGrid.WorksheetInserted + Public Event WorksheetRemoved(worksheet As clsWorksheetAdapter) Implements IDataViewGrid.WorksheetRemoved Public Sub AddColumns(visiblePage As clsDataFramePage) Implements IDataViewGrid.AddColumns @@ -222,6 +224,11 @@ Public Class ucrDataViewReoGrid RaiseEvent WorksheetChanged() End Sub + Private Sub grdData_WorksheetInserted(sender As Object, e As EventArgs) Handles grdData.WorksheetInserted + RaiseEvent WorksheetInserted() + End Sub + + Private Sub grdData_WorksheetRemoved(sender As Object, e As WorksheetRemovedEventArgs) Handles grdData.WorksheetRemoved RaiseEvent WorksheetRemoved(New clsWorksheetAdapter(e.Worksheet)) End Sub diff --git a/instat/dlgOptions.vb b/instat/dlgOptions.vb index 76e880c2129..f1c25588dca 100644 --- a/instat/dlgOptions.vb +++ b/instat/dlgOptions.vb @@ -209,6 +209,7 @@ Public Class dlgOptions frmMain.clsInstatOptions.SetMaximumOutputsHeight(If(ucrChkMaxOutputsHeight.Checked, ucrNudMaxOutputsHeight.Value, -1)) frmMain.clsInstatOptions.ExecuteRGlobalOptions() + frmMain.DisableEnableUndo(ucrChkTurnOffUndo.Checked) End Sub Private Sub SetView() diff --git a/instat/frmMain.vb b/instat/frmMain.vb index d911c3daadc..de20ca54564 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -685,6 +685,10 @@ Public Class frmMain End If End Sub + Public Sub DisableEnableUndo(bDisable As Boolean) + ucrDataViewer.DisableEnableUndo(bDisable) + End Sub + Private Sub mnuFileNewDataFrame_Click(sender As Object, e As EventArgs) Handles mnuFileNewDataFrame.Click dlgNewDataFrame.ShowDialog() End Sub diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index bcfe8a4c382..5a241fc68b1 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -5,7 +5,7 @@ DataSheet <- R6::R6Class("DataSheet", imported_from = "", messages = TRUE, convert=TRUE, create = TRUE, start_point=1, filters = list(), column_selections = list(), objects = list(), - calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, undo_history = list(), redo_undo_history = list()) + calculations = list(), scalars = list(), keys = list(), comments = list(), keep_attributes = TRUE, undo_history = list(), redo_undo_history = list(), disable_undo = FALSE) { # Set up the data object self$set_data(data, messages) @@ -31,7 +31,6 @@ DataSheet <- R6::R6Class("DataSheet", self$set_scalars(scalars) self$set_keys(keys) self$set_comments(comments) - self$set_undo_history(undo_history) # If no name for the data.frame has been given in the list we create a default one. # Decide how to choose default name index @@ -65,7 +64,8 @@ DataSheet <- R6::R6Class("DataSheet", comments = list(), calculations = list(), scalars = list(), - changes = list(), + changes = list(), + disable_undo = FALSE, .current_filter = list(), .current_column_selection = list(), .data_changed = FALSE, @@ -163,11 +163,19 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name } } ) +DataSheet$set("public", "set_enable_disable_undo", function(disable_undo) { + private$disable_undo <- disable_undo + if(disable_undo) {private$undo_history <- list()} +}) DataSheet$set("public", "save_state_to_undo_history", function() { self$set_undo_history(list(private$data)) }) +DataSheet$set("public", "is_undo", function() { + return(private$disable_undo) +}) + DataSheet$set("public", "set_meta", function(new_meta) { meta_data_copy <- new_meta self$clear_metadata() @@ -192,14 +200,14 @@ DataSheet$set("public", "clear_metadata", function() { ) DataSheet$set("public", "has_undo_history", function() { - return(length(private$undo_history) > 1) + return(length(private$undo_history) > 0) } ) DataSheet$set("public", "undo_last_action", function() { # Perform the undo action - if (length(private$undo_history) > 1) { + if (length(private$undo_history) > 0) { previous_state <- private$undo_history[[length(private$undo_history)]] self$set_data(as.data.frame(previous_state)) # Restore the previous state @@ -293,7 +301,7 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { # Set undo_history with memory management DataSheet$set("public", "set_undo_history", function(new_undo_history) { if (!is.list(new_undo_history)) stop("undo_history must be of type: list") - + if(!private$disable_undo){ # Define memory and undo_history limits MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo undo_history @@ -314,9 +322,9 @@ DataSheet$set("public", "set_undo_history", function(new_undo_history) { } private$undo_history <- append(private$undo_history, list(new_undo_history)) - # Explicitly call garbage collection to release memory - gc() + #gc() + } }) DataSheet$set("public", "set_keys", function(new_keys) { diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index e53d37cd90d..5270526bc58 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1361,6 +1361,15 @@ DataBook$set("public","has_key", function(data_name) { } ) +DataBook$set("public","set_enable_disable_undo", function(data_name, disable_undo) { + self$get_data_objects(data_name)$set_enable_disable_undo(disable_undo) +} +) + +DataBook$set("public", "is_undo", function(data_name) { + self$get_data_objects(data_name)$is_undo() +}) + DataBook$set("public","has_undo_history", function(data_name) { self$get_data_objects(data_name)$has_undo_history() } diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 152bd23aa57..854d76580a2 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -82,6 +82,7 @@ Public Class ucrDataView Private Sub AttachEventsToGrid() AddHandler _grid.WorksheetChanged, AddressOf CurrentWorksheetChanged + AddHandler _grid.WorksheetInserted, AddressOf WorksheetInserted AddHandler _grid.WorksheetRemoved, AddressOf WorksheetRemoved AddHandler _grid.ReplaceValueInData, AddressOf ReplaceValueInData AddHandler _grid.PasteValuesToDataframe, AddressOf PasteValuesToDataFrame @@ -101,6 +102,7 @@ Public Class ucrDataView _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory + RefreshDisplayInformation() End Sub @@ -248,9 +250,14 @@ Public Class ucrDataView dlgName.ShowDialog() End Sub + Public Sub WorksheetInserted() + DisableEnableUndo(frmMain.clsInstatOptions.bSwitchOffUndo) + End Sub + Public Sub CurrentWorksheetChanged() frmMain.ucrColumnMeta.SetCurrentDataFrame(GetCurrentDataFrameNameFocus()) RefreshDisplayInformation() + IsUndo() End Sub Public Function GetFirstRowHeader() As String @@ -269,6 +276,12 @@ Public Class ucrDataView _grid.AdjustColumnWidthAfterWrapping(strColumn, bApplyWrap) End Sub + Public Sub IsUndo() + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + frmMain.clsInstatOptions.SetOffUndo(GetCurrentDataFrameFocus.clsVisibleDataFramePage.IsUndo(GetCurrentDataFrameNameFocus)) + End If + End Sub + Private Sub RefreshDisplayInformation() If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then frmMain.tstatus.Text = _grid.CurrentWorksheet.Name @@ -282,6 +295,12 @@ Public Class ucrDataView End If End Sub + Public Sub DisableEnableUndo(bDisable As Boolean) + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + GetCurrentDataFrameFocus.clsVisibleDataFramePage.DisableEnableUndo(bDisable, GetCurrentDataFrameNameFocus) + End If + End Sub + Private Sub ResizeLabels() Const iMinSize As Single = 4.5 TblPanPageDisplay.Font = New Font(TblPanPageDisplay.Font.FontFamily, 12, TblPanPageDisplay.Font.Style) From 15a8932db4038b4f85af0e8c1343f1ed1b2e47cf Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Tue, 22 Oct 2024 18:04:16 +0300 Subject: [PATCH 259/273] minor addition --- instat/static/InstatObject/R/data_object_R6.R | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 5a241fc68b1..2e9ecf7dee0 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -165,7 +165,10 @@ DataSheet$set("public", "set_data", function(new_data, messages=TRUE, check_name ) DataSheet$set("public", "set_enable_disable_undo", function(disable_undo) { private$disable_undo <- disable_undo - if(disable_undo) {private$undo_history <- list()} + if(disable_undo) { + private$undo_history <- list() + gc() + } }) DataSheet$set("public", "save_state_to_undo_history", function() { From 15a35d9cf6c9672a3aa65bc1859764afa86d6bdf Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 10:56:36 +0300 Subject: [PATCH 260/273] Call gc() to ensure memory is freed promptly for removing/resetting in the list --- instat/static/InstatObject/R/data_object_R6.R | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2e9ecf7dee0..2a2f10820bd 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -215,13 +215,13 @@ DataSheet$set("public", "undo_last_action", function() { self$set_data(as.data.frame(previous_state)) # Restore the previous state private$undo_history <- private$undo_history[-length(private$undo_history)] # Remove the latest state + + # Trigger garbage collection to free memory + gc() } else { message("No more actions to undo.") } - # Trigger garbage collection to free memory - gc() - }) @@ -322,11 +322,10 @@ DataSheet$set("public", "set_undo_history", function(new_undo_history) { # Limit undo_history size if (length(private$undo_history) >= MAX_undo_history_SIZE) { private$undo_history <- private$undo_history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory } private$undo_history <- append(private$undo_history, list(new_undo_history)) - # Explicitly call garbage collection to release memory - #gc() } }) From 4d4a6b8af4d049c4057bd3e0ed254ac774ce2286 Mon Sep 17 00:00:00 2001 From: Derrick Agorhom <76208189+derekagorhom@users.noreply.github.com> Date: Wed, 23 Oct 2024 10:01:36 +0200 Subject: [PATCH 261/273] Fixes Bug with the facets in the Mosiac dialog --- instat/dlgMosaicPlot.vb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/instat/dlgMosaicPlot.vb b/instat/dlgMosaicPlot.vb index c8b26f265e4..0b00c5c9d2d 100644 --- a/instat/dlgMosaicPlot.vb +++ b/instat/dlgMosaicPlot.vb @@ -390,6 +390,8 @@ Public Class dlgMosaicPlot If bWrap OrElse bRow OrElse bCol Then clsBaseOperator.AddParameter("facets", clsRFunctionParameter:=clsFacetFunction) + Else + clsBaseOperator.RemoveParameterByName("facets") End If If bWrap Then clsFacetFunction.SetRCommand("facet_wrap") From 3de5f6aaed4f7e77cc7c9eff93bdf0d82395e1a0 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 23 Oct 2024 11:06:17 +0100 Subject: [PATCH 262/273] Change made --- instat/dlgStartofRains.vb | 51 ++++++++++-------------------- instat/sdgAdditionalCondition.vb | 53 +++----------------------------- 2 files changed, 20 insertions(+), 84 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index a45b4f2412f..1aa3e7c2afc 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -18,7 +18,7 @@ Imports instat.Translations Public Class dlgStartofRains Private bResetSubdialog As Boolean = True - Private clsCalcRainDay, clsCalcStartDOY, clsPaste0Function, clsGetDataFrameFunction, clsListevapFunction, clsRollEvaporationFunction, clsFractionEvapFunction, clsSumEvapFunction, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction + Private clsCalcRainDay, clsCalcStartDOY, clsVectorFunction, clsGetlinkeddataFunction, clsGetDataFrameFunction, clsListevapFunction, clsRollEvaporationFunction, clsFractionEvapFunction, clsSumEvapFunction, clsConvertColumnType1Function, clsConvertColumnType2Function, clsConvertColumnTypeFunction, clsGetColumnDataTypeFunction, clsDummyFunction, clsIfelseStatusFunction, clsIfelseStatus1Function, clsFirstStatusFunction, clsIsNAStatusFunction, clsCalcStartDate, clsCombinationCalc, clsListCalFunction, clsCombinationManipList, clsCombinationSubCalcList, clsListSubCalc, clsManipulationFirstDOYPerYear, clsConditionsFilter, clsCombinedList As New RFunction Private clsDayFromAndTo, clsGroupByStation, clsGroupByYear, clsListToTalRain, clsApplyInstatFunction, clsFirstDOY, clsFirstDate As New RFunction Private clsDayFromAndToOperator, clsEvapOperator, clsDayFromOperator, clsDayToOperator, clsRainDayOperator, clsRainDayConditionOperator, clsConditionsAndOperator, clsTRCombineOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator As New ROperator Private clsDayFilterCalcFromConvert, clsDayFilterCalcFromList As New RFunction @@ -60,7 +60,7 @@ Public Class dlgStartofRains Private clsIsNaDryPeriod As New RFunction 'Rainy Day classes - Public clsCalcRainDayRollingSum, clsRainDayRollingSumFunction, clsRDRollingRainDaysSub As New RFunction + Private clsCalcRainDayRollingSum, clsRainDayRollingSumFunction, clsRDRollingRainDaysSub As New RFunction 'Dry Spell classes Private clsCalcDrySpellRollMax, clsCalcDrySpell, clsDrySpellPeriodLeadFunction, clsDrySpellPeriodRollMaxFunction, clsDrySpellPeriodSubCalcList, clsDrySpellSubCalcList As New RFunction @@ -297,7 +297,8 @@ Public Class dlgStartofRains clsCalcRainRollingSum.Clear() clsRainRollingSumFunction = New RFunction - clsPaste0Function = New RFunction + clsGetlinkeddataFunction = New RFunction + clsVectorFunction = New RFunction clsGetDataFrameFunction = New RFunction clsTRWetSpellList.Clear() clsTRWetSpell.Clear() @@ -559,7 +560,6 @@ Public Class dlgStartofRains clsRollEvaporationFunction.SetPackageName("RcppRoll") clsRollEvaporationFunction.SetRCommand("roll_sumr") clsRollEvaporationFunction.AddParameter("x", strFactionEvap, iPosition:=0) - ' clsRollEvaporationFunction.AddParameter("n", "2", iPosition:=1) clsRollEvaporationFunction.AddParameter("fill", "NA", iPosition:=2) clsRollEvaporationFunction.AddParameter("na.rm", "FALSE", iPosition:=3) clsRollEvaporationFunction.bToScriptAsRString = True @@ -760,16 +760,13 @@ Public Class dlgStartofRains clsGetDataFrameFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_data_names") - clsPaste0Function.SetRCommand("paste0") - 'clsPaste0Function.AddParameter("x", clsRFunctionParameter:=clsGetDataFrameFunction, iPosition:=0, bIncludeArgumentName:=False) - clsPaste0Function.AddParameter("n", Chr(34) & "_by_" & Chr(34), iPosition:=1, bIncludeArgumentName:=False) - ' clsPaste0Function.AddParameter("z", "_", iPosition:=3, bIncludeArgumentName:=False) - clsPaste0Function.SetAssignTo("last_data_name") + clsGetlinkeddataFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_linked_to_data_name") + clsGetlinkeddataFunction.SetAssignTo("linked_data_name") - ' last_data_name <- paste0("dodoma", "_by_", "s_year", "_", "station") + clsVectorFunction.SetRCommand("c") clsConvertColumnType2Function.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") - clsConvertColumnType2Function.AddParameter("data_name", "last_data_name", iPosition:=0) + clsConvertColumnType2Function.AddParameter("data_name", "linked_data_name", iPosition:=0) clsConvertColumnType2Function.AddParameter("to_type", "year_type", iPosition:=2) 'Run Calculations @@ -786,7 +783,7 @@ Public Class dlgStartofRains ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatFunction) ucrBase.clsRsyntax.AddToBeforeCodes(clsGetColumnDataTypeFunction, iPosition:=0) ucrBase.clsRsyntax.AddToBeforeCodes(clsConvertColumnTypeFunction, iPosition:=1) - ucrBase.clsRsyntax.AddToAfterCodes(clsPaste0Function, iPosition:=0) + ucrBase.clsRsyntax.AddToAfterCodes(clsGetlinkeddataFunction, iPosition:=0) ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType1Function, iPosition:=1) ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnType2Function, iPosition:=2) SetReceiver() @@ -1012,7 +1009,6 @@ Public Class dlgStartofRains Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStationOptions() - StationVariable() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged @@ -1024,7 +1020,7 @@ Public Class dlgStartofRains clsGetColumnDataTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) clsConvertColumnType1Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) - clsPaste0Function.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0, bIncludeArgumentName:=False) + clsGetlinkeddataFunction.AddParameter("data_name", Chr(34) & ucrSelectorForStartofRains.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0, bIncludeArgumentName:=False) clsDayFilterCalcFromList.ClearParameters() End Sub @@ -1093,10 +1089,11 @@ Public Class dlgStartofRains End Sub Private Sub cmdAdditionnal_Click(sender As Object, e As EventArgs) Handles cmdAdditionnal.Click - sdgAdditionalCondition.SetRCode(clsNewCombinedList:=clsCombinedList, clsNewCalcRainDay:=clsCalcRainDay, clsNewCalcDrySpellRollMax:=clsCalcDrySpellRollMax, clsNewIsNaFirstDryPeriod:=clsIsNaFirstDryPeriod, clsNewIsNaFirstDrySpell:=clsIsNaFirstDrySpell, clsNewIsNaDryPeriod:=clsIsNaDryPeriod, clsNewIsNaDrySpell:=clsIsNaDrySpell, clsNewRainDayRollingSumFunction:=clsRainDayRollingSumFunction, clsNewIsNaRollSumRainDay:=clsIsNaRollSumRainDay, clsNewIsNaFirstRollSumRainDay:=clsIsNaFirstRollSumRainDay, clsNewDrySpellPeriodRollMaxFunction:=clsDrySpellPeriodRollMaxFunction, clsNewRollingSumRainDryPeriodFunction:=clsRollingSumRainDryPeriodFunction, clsNewCalcRainDayRollingSum:=clsCalcRainDayRollingSum, clsNewCalcRollSumNumberDryPeriod:=clsCalcRollSumNumberDryPeriod, clsNewConditionsAndOperator:=clsConditionsAndOperator, clsNewIsNaOperatorStartDOY:=clsIsNaOperatorStartDOY, clsNewConditionsOrOverallOperator:=clsConditionsOrOverallOperator, clsNewRollingSumRainDayOperator:=clsRollingSumRainDayOperator, clsNewDSCombineOperator:=clsDSCombineOperator, clsNewSumRainDryPeriodIntervalMinusOperator:=clsSumRainDryPeriodIntervalMinusOperator, clsNewSumRainDryPeriodOperator:=clsSumRainDryPeriodOperator, clsNewDPCombineOperator:=clsDPCombineOperator, clsNewSumRainDryPeriodIntervalPlusOperator:=clsSumRainDryPeriodIntervalPlusOperator, bReset:=bResetSubdialog) + sdgAdditionalCondition.SetRCode(clsNewCombinedList:=clsCombinedList, clsNewCalcRollSumNumberDryPeriod:=clsCalcRollSumNumberDryPeriod, clsNewCalcRainDayRollingSum:=clsCalcRainDayRollingSum, clsNewCalcDrySpellRollMax:=clsCalcDrySpellRollMax, clsNewConditionsAndOperator:=clsConditionsAndOperator, clsNewRollingSumRainDayOperator:=clsRollingSumRainDayOperator, clsNewDSCombineOperator:=clsDSCombineOperator, clsNewDPCombineOperator:=clsDPCombineOperator, clsNewSumRainDryPeriodIntervalPlusOperator:=clsSumRainDryPeriodIntervalPlusOperator, bReset:=bResetSubdialog) sdgAdditionalCondition.ShowDialog() bResetSubdialog = False AdditionalCondition() + ChangeDSValue() End Sub Private Sub ChangeDSValue() @@ -1104,8 +1101,6 @@ Public Class dlgStartofRains If sdgAdditionalCondition.ucrChkNumberOfRainyDays.Checked Then clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) - 'ucrBase.clsRsyntax.AddToBeforeCodes(clsCalcRainDay, iPosition:=2) - 'ucrBase.clsRsyntax.AddToBeforeCodes(clsCalcRainDayRollingSum, iPosition:=3) clsCombinedList.AddParameter("rd_sub", clsRFunctionParameter:=clsCalcRainDayRollingSum, bIncludeArgumentName:=False, iPosition:=1) Else clsCombinedList.RemoveParameterByName("rd_sub") @@ -1171,12 +1166,6 @@ Public Class dlgStartofRains clsCombinedList.RemoveParameterByName("rd_sub") clsCombinedList.RemoveParameterByName("ds_sub") clsCombinedList.RemoveParameterByName("dp_sub") - 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDay) - 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainDayRollingSum) - 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRainRollingSumDryPeriod) - 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcRollSumNumberDryPeriod) - 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpell) - 'ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsCalcDrySpellRollMax) clsIsNaOperatorStartDOY.RemoveParameterByName("4") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") @@ -1196,21 +1185,13 @@ Public Class dlgStartofRains End If End Sub - Private Sub StationVariable() - If Not ucrReceiverStation.IsEmpty Then - clsPaste0Function.AddParameter("z", Chr(34) & "_" & Chr(34), iPosition:=3, bIncludeArgumentName:=False) - clsPaste0Function.AddParameter("x", ucrReceiverStation.GetVariableNames(), iPosition:=2, bIncludeArgumentName:=False) - Else - clsPaste0Function.RemoveParameterByName("x") - clsPaste0Function.RemoveParameterByName("z") - End If - End Sub - Private Sub YearVariable() If Not ucrReceiverYear.IsEmpty Then - clsPaste0Function.AddParameter("y", ucrReceiverYear.GetVariableNames(), iPosition:=4, bIncludeArgumentName:=False) + clsVectorFunction.AddParameter("x", ucrReceiverYear.GetVariableNames(), iPosition:=0, bIncludeArgumentName:=False) + clsGetlinkeddataFunction.AddParameter("link_cols", clsRFunctionParameter:=clsVectorFunction, iPosition:=1) Else - clsPaste0Function.RemoveParameterByName("y") + clsGetlinkeddataFunction.RemoveParameterByName("link_cols") + clsVectorFunction.RemoveParameterByName("x") End If End Sub End Class diff --git a/instat/sdgAdditionalCondition.vb b/instat/sdgAdditionalCondition.vb index c100f4651f9..e917c6a0c9c 100644 --- a/instat/sdgAdditionalCondition.vb +++ b/instat/sdgAdditionalCondition.vb @@ -18,8 +18,8 @@ Imports instat.Translations Public Class sdgAdditionalCondition Public bFirstLoad As Boolean = True Public bControlsInitialised As Boolean = False - Private clsCombinedList, clsCalcDrySpellRollMax, clsCalcRainDay, clsIsNaFirstDryPeriod, clsIsNaFirstDrySpell, clsIsNaDryPeriod, clsIsNaDrySpell, clsRainDayRollingSumFunction, clsIsNaRollSumRainDay, clsIsNaFirstRollSumRainDay, clsDrySpellPeriodRollMaxFunction, clsRollingSumRainDryPeriodFunction, clsCalcRainDayRollingSum, clsCalcRollSumNumberDryPeriod As RFunction - Private clsConditionsAndOperator, clsIsNaOperatorStartDOY, clsConditionsOrOverallOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsSumRainDryPeriodIntervalMinusOperator, clsSumRainDryPeriodOperator, clsDPCombineOperator, clsSumRainDryPeriodIntervalPlusOperator As ROperator + Private clsCombinedList, clsCalcDrySpellRollMax, clsCalcRainDayRollingSum, clsCalcRollSumNumberDryPeriod As RFunction + Private clsConditionsAndOperator, clsRollingSumRainDayOperator, clsDSCombineOperator, clsDPCombineOperator, clsSumRainDryPeriodIntervalPlusOperator As ROperator Private Sub sdgAdditionalCondition_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) @@ -57,7 +57,6 @@ Public Class sdgAdditionalCondition ucrNudDSMaximumDays.SetParameter(New RParameter("right", 1)) ucrNudDSMaximumDays.SetMinMax(1, 366) ucrNudDSMaximumDays.Increment = 1 - 'ucrNudDSMaximumDays.SetRDefault(9) ' Dry Period ucrChkDryPeriod.SetText("Dry Period") @@ -81,31 +80,17 @@ Public Class sdgAdditionalCondition ucrChkDryPeriod.AddToLinkedControls(ucrNudDPRainPeriod, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30) End Sub - Public Sub SetRCode(clsNewCombinedList As RFunction, clsNewCalcDrySpellRollMax As RFunction, clsNewCalcRainDay As RFunction, clsNewIsNaFirstDryPeriod As RFunction, clsNewIsNaFirstDrySpell As RFunction, clsNewIsNaDryPeriod As RFunction, clsNewIsNaDrySpell As RFunction, clsNewRainDayRollingSumFunction As RFunction, clsNewIsNaRollSumRainDay As RFunction, clsNewIsNaFirstRollSumRainDay As RFunction, clsNewDrySpellPeriodRollMaxFunction As RFunction, clsNewRollingSumRainDryPeriodFunction As RFunction, clsNewCalcRainDayRollingSum As RFunction, clsNewCalcRollSumNumberDryPeriod As RFunction, clsNewConditionsAndOperator As ROperator, clsNewIsNaOperatorStartDOY As ROperator, clsNewConditionsOrOverallOperator As ROperator, clsNewRollingSumRainDayOperator As ROperator, clsNewDSCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalMinusOperator As ROperator, clsNewSumRainDryPeriodOperator As ROperator, clsNewDPCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalPlusOperator As ROperator, Optional bReset As Boolean = False) + Public Sub SetRCode(clsNewCombinedList As RFunction, clsNewCalcDrySpellRollMax As RFunction, clsNewCalcRainDayRollingSum As RFunction, clsNewCalcRollSumNumberDryPeriod As RFunction, clsNewConditionsAndOperator As ROperator, clsNewRollingSumRainDayOperator As ROperator, clsNewDSCombineOperator As ROperator, clsNewDPCombineOperator As ROperator, clsNewSumRainDryPeriodIntervalPlusOperator As ROperator, Optional bReset As Boolean = False) If Not bControlsInitialised Then InitialiseControls() End If clsCombinedList = clsNewCombinedList clsCalcDrySpellRollMax = clsNewCalcDrySpellRollMax - clsIsNaFirstDryPeriod = clsNewIsNaFirstDryPeriod - clsIsNaFirstDrySpell = clsNewIsNaFirstDrySpell - clsIsNaDryPeriod = clsNewIsNaDryPeriod - clsIsNaDrySpell = clsNewIsNaDrySpell - clsRainDayRollingSumFunction = clsNewRainDayRollingSumFunction - clsCalcRainDay = clsNewCalcRainDay - clsIsNaRollSumRainDay = clsNewIsNaRollSumRainDay - clsIsNaFirstRollSumRainDay = clsNewIsNaFirstRollSumRainDay - clsDrySpellPeriodRollMaxFunction = clsNewDrySpellPeriodRollMaxFunction - clsRollingSumRainDryPeriodFunction = clsNewRollingSumRainDryPeriodFunction - clsCalcRainDayRollingSum = clsNewCalcRainDayRollingSum + clsCalcRainDayRollingSum = clsNewCalcRainDayRollingSum clsCalcRollSumNumberDryPeriod = clsNewCalcRollSumNumberDryPeriod clsConditionsAndOperator = clsNewConditionsAndOperator - clsIsNaOperatorStartDOY = clsNewIsNaOperatorStartDOY - clsConditionsOrOverallOperator = clsNewConditionsOrOverallOperator clsRollingSumRainDayOperator = clsNewRollingSumRainDayOperator clsDSCombineOperator = clsNewDSCombineOperator - clsSumRainDryPeriodIntervalMinusOperator = clsNewSumRainDryPeriodIntervalMinusOperator - clsSumRainDryPeriodOperator = clsNewSumRainDryPeriodOperator clsDPCombineOperator = clsNewDPCombineOperator clsSumRainDryPeriodIntervalPlusOperator = clsNewSumRainDryPeriodIntervalPlusOperator @@ -116,36 +101,6 @@ Public Class sdgAdditionalCondition ucrChkDrySpell.SetRCode(clsCombinedList, bReset, bCloneIfNeeded:=True) End Sub - Private Sub ucrChkNumberOfRainyDays_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkNumberOfRainyDays.ControlValueChanged - If ucrChkNumberOfRainyDays.Checked Then - clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) - clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) - Else - clsIsNaOperatorStartDOY.RemoveParameterByName("2") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") - End If - End Sub - - Private Sub ucrChkDrySpell_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDrySpell.ControlValueChanged - If ucrChkDrySpell.Checked Then - clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) - clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) - Else - clsIsNaOperatorStartDOY.RemoveParameterByName("3") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") - End If - End Sub - - Private Sub ucrChkDryPeriod_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlValueChanged - If ucrChkDryPeriod.Checked Then - clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) - clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) - Else - clsIsNaOperatorStartDOY.RemoveParameterByName("4") - clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") - End If - End Sub - Private Sub MaximumValuesControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkDryPeriod.ControlContentsChanged, ucrNudDPRainPeriod.ControlContentsChanged, ucrNudDPOverallInterval.ControlContentsChanged If ucrChkDryPeriod.Checked Then ucrNudDPRainPeriod.Maximum = ucrNudDPOverallInterval.Value From 1c26f02707ffd5a5eea64faa4e93b7072c326caa Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 23 Oct 2024 11:07:18 +0100 Subject: [PATCH 263/273] Change made --- instat/sdgAdditionalCondition.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/sdgAdditionalCondition.vb b/instat/sdgAdditionalCondition.vb index e917c6a0c9c..6dfb3e53a67 100644 --- a/instat/sdgAdditionalCondition.vb +++ b/instat/sdgAdditionalCondition.vb @@ -86,7 +86,7 @@ Public Class sdgAdditionalCondition End If clsCombinedList = clsNewCombinedList clsCalcDrySpellRollMax = clsNewCalcDrySpellRollMax - clsCalcRainDayRollingSum = clsNewCalcRainDayRollingSum + clsCalcRainDayRollingSum = clsNewCalcRainDayRollingSum clsCalcRollSumNumberDryPeriod = clsNewCalcRollSumNumberDryPeriod clsConditionsAndOperator = clsNewConditionsAndOperator clsRollingSumRainDayOperator = clsNewRollingSumRainDayOperator From aca453ad984f8d149f45e242a4a54bff94269aab Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 14:35:11 +0300 Subject: [PATCH 264/273] Added the logger and code addition --- instat/dlgCalculator.vb | 7 +++++++ instat/ucrDataView.vb | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/instat/dlgCalculator.vb b/instat/dlgCalculator.vb index b12f61d9ae4..c7eee20e0ad 100644 --- a/instat/dlgCalculator.vb +++ b/instat/dlgCalculator.vb @@ -36,8 +36,11 @@ Public Class dlgCalculator Private strDefaultKeyboard As String ' Note: This list needs to be updated when a new keyboard is added. Private strKeyboards() As String = {"Basic", "Maths", "Logical and Symbols", "Transform", "Summary", "Probability", "Factor", "Text/Strings (Character Columns)", "Dates/Times", "Circular", "Wakefield", "Goodness of Fit", "List", "Complex", "Integer", "Functions"} + Private Shared ReadOnly Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger() + Private Sub dlgCalculator_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Dim start = DateTime.Now If bFirstLoad Then InitialiseDialog() iBasicWidth = Me.Width @@ -48,6 +51,10 @@ Public Class dlgCalculator ReopenDialog() TestOKEnabled() autoTranslate(Me) + + Logger.Debug("This is in the load") + Logger.Debug(Process.GetCurrentProcess().WorkingSet64) + Logger.Debug("Time", DateTime.Now - start) End Sub Private Sub TestOKEnabled() diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 854d76580a2..53f09a8b6ac 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -101,7 +101,7 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False - frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory + 'frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory RefreshDisplayInformation() End Sub @@ -158,6 +158,7 @@ Public Class ucrDataView RefreshDisplayInformation() End If End If + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory _grid.Focus() End Sub From 28beaa27835886a6cd2ac4b9ff8104de648fd0b8 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 14:51:54 +0300 Subject: [PATCH 265/273] minor bug fix --- instat/ucrDataView.vb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 53f09a8b6ac..7b1acaca241 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -101,7 +101,6 @@ Public Class ucrDataView _grid.AddRowData(dataFrame) _grid.UpdateWorksheetStyle(fillWorkSheet) dataFrame.clsVisibleDataFramePage.HasChanged = False - 'frmMain.mnuUndo.Enabled = dataFrame.clsVisibleDataFramePage.HasUndoHistory RefreshDisplayInformation() End Sub @@ -158,8 +157,7 @@ Public Class ucrDataView RefreshDisplayInformation() End If End If - frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory - + EnableDisableUndoMenu() _grid.Focus() End Sub @@ -237,6 +235,12 @@ Public Class ucrDataView _grid.SelectAll() End Sub + Private Sub EnableDisableUndoMenu() + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory + End If + End Sub + Private Sub deleteSheet_Click(sender As Object, e As EventArgs) Handles deleteDataFrame.Click dlgDeleteDataFrames.SetDataFrameToAdd(_grid.CurrentWorksheet.Name) dlgDeleteDataFrames.ShowDialog() @@ -289,7 +293,7 @@ Public Class ucrDataView SetDisplayLabels() UpdateNavigationButtons() SetGridVisibility(True) - frmMain.mnuUndo.Enabled = GetCurrentDataFrameFocus.clsVisibleDataFramePage.HasUndoHistory + EnableDisableUndoMenu() Else frmMain.tstatus.Text = GetTranslation("No data loaded") SetGridVisibility(False) From b13f00ed24d03ab13f6a5165304eecaa7f41a2f9 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Wed, 23 Oct 2024 15:03:58 +0100 Subject: [PATCH 266/273] Change made --- instat/dlgStartofRains.vb | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 1aa3e7c2afc..65262c1a10b 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -73,6 +73,7 @@ Public Class dlgStartofRains Private strWetSpell As String = "wet_spell" Private strFactionEvap As String = "fraction_evap" Private strSumFractionEvap As String = "roll_sum_evap" + Private strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -236,7 +237,7 @@ Public Class dlgStartofRains Dim strStartDate As String = "start_rain_date" Dim strStartStatus As String = "start_rain_status" Dim strStartDoy As String = "start_rain" - Dim strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" + 'Dim strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" Dim strYearType As String = "year_type" clsDayFromAndTo.Clear() @@ -442,7 +443,7 @@ Public Class dlgStartofRains clsRollingSumRainDayOperator.SetOperation(">=") clsRollingSumRainDayOperator.AddParameter("0", strRollSumRainDay, iPosition:=0) - clsRollingSumRainDayOperator.AddParameter("1", 1, iPosition:=1) + ' clsRollingSumRainDayOperator.AddParameter("1", 1, iPosition:=1) clsFirstRollSumRainDay.SetPackageName("dplyr") clsFirstRollSumRainDay.SetRCommand("first") @@ -599,16 +600,16 @@ Public Class dlgStartofRains clsRollSumNumberDryPeriodFunction.AddParameter("na.rm", "FALSE", iPosition:=3) clsSumRainDryPeriodOperator.SetOperation("<=") - clsSumRainDryPeriodOperator.AddParameter("left", strRollSumRainDryPeriod, iPosition:=0) + ' clsSumRainDryPeriodOperator.AddParameter("left", strRollSumRainDryPeriod, iPosition:=0) clsSumRainDryPeriodOperator.AddParameter("right", 40, iPosition:=1) clsSumRainDryPeriodIntervalMinusOperator.SetOperation("-") clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", 45, iPosition:=0) - clsSumRainDryPeriodIntervalMinusOperator.AddParameter("1", clsROperatorParameter:=clsSumRainDryPeriodIntervalPlusOperator, iPosition:=1) + ' clsSumRainDryPeriodIntervalMinusOperator.AddParameter("1", clsROperatorParameter:=clsSumRainDryPeriodIntervalPlusOperator, iPosition:=1) clsSumRainDryPeriodIntervalPlusOperator.SetOperation("+") clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", 30, iPosition:=0) - clsSumRainDryPeriodIntervalPlusOperator.AddParameter("1", 1, iPosition:=1) + ' clsSumRainDryPeriodIntervalPlusOperator.AddParameter("1", 1, iPosition:=1) clsFirstDryPeriod.SetPackageName("dplyr") clsFirstDryPeriod.SetRCommand("first") @@ -1136,20 +1137,26 @@ Public Class dlgStartofRains clsRollingSumRainDayOperator.RemoveParameterByName("1") End If If Not sdgAdditionalCondition.ucrNudDPMaxRain.IsEmpty Then + clsSumRainDryPeriodOperator.AddParameter("left", strRollSumRainDryPeriod, iPosition:=0) clsSumRainDryPeriodOperator.AddParameter("right", sdgAdditionalCondition.ucrNudDPMaxRain.GetText(), iPosition:=1) Else clsSumRainDryPeriodOperator.RemoveParameterByName("right") + clsSumRainDryPeriodOperator.RemoveParameterByName("left") End If If Not sdgAdditionalCondition.ucrNudDPRainPeriod.IsEmpty Then clsRollingSumRainDryPeriodFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=1) clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=0) + clsSumRainDryPeriodIntervalPlusOperator.AddParameter("1", 1, iPosition:=1) Else clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") + clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("1") clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") End If If Not sdgAdditionalCondition.ucrNudDPOverallInterval.IsEmpty Then + clsSumRainDryPeriodIntervalMinusOperator.AddParameter("1", clsROperatorParameter:=clsSumRainDryPeriodIntervalPlusOperator, iPosition:=1) clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", sdgAdditionalCondition.ucrNudDPOverallInterval.GetText(), iPosition:=0) Else + clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("1") clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") End If If Not sdgAdditionalCondition.ucrNudDSLengthOfTime.IsEmpty Then @@ -1174,14 +1181,21 @@ Public Class dlgStartofRains clsIsNaOperatorStartDOY.RemoveParameterByName("2") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") + clsConditionsAndOperator.RemoveParameterByName("dry_period") + clsConditionsAndOperator.RemoveParameterByName("dry_spell") + clsConditionsAndOperator.RemoveParameterByName("rain_days") + clsRainDayRollingSumFunction.RemoveParameterByName("n") clsDrySpellPeriodRollMaxFunction.RemoveParameterByName("n") clsSumRainDryPeriodOperator.RemoveParameterByName("right") + clsSumRainDryPeriodOperator.RemoveParameterByName("left") clsRollingSumRainDayOperator.RemoveParameterByName("1") clsDSCombineOperator.RemoveParameterByName("ds_max") clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") + clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("1") clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") + clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("1") End If End Sub From 2c6a091dff3a3cf28cedacd54fb0937484f968e3 Mon Sep 17 00:00:00 2001 From: Ntalumeso Date: Wed, 23 Oct 2024 18:53:16 +0300 Subject: [PATCH 267/273] improved the management of metadat in undo --- instat/static/InstatObject/R/data_object_R6.R | 74 ++++++++++++------- 1 file changed, 46 insertions(+), 28 deletions(-) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index 2a2f10820bd..45145ecd644 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -172,7 +172,7 @@ DataSheet$set("public", "set_enable_disable_undo", function(disable_undo) { }) DataSheet$set("public", "save_state_to_undo_history", function() { - self$set_undo_history(list(private$data)) + self$set_undo_history(private$data, attributes(private$data)) }) DataSheet$set("public", "is_undo", function() { @@ -209,19 +209,31 @@ DataSheet$set("public", "has_undo_history", function() { DataSheet$set("public", "undo_last_action", function() { - # Perform the undo action + # Check if there's any action to undo if (length(private$undo_history) > 0) { + # Get the last state from the undo history previous_state <- private$undo_history[[length(private$undo_history)]] - self$set_data(as.data.frame(previous_state)) # Restore the previous state - private$undo_history <- private$undo_history[-length(private$undo_history)] # Remove the latest state + # Restore the data and its attributes + restored_data <- previous_state$data # Extract the dataframe + restored_attributes <- previous_state$attributes # Extract the attributes + + # Set the dataframe in the DataSheet + self$set_data(as.data.frame(restored_data)) + + # Restore attributes + restored_attributes <- previous_state$attributes # Extract the attributes + for (property in names(restored_attributes)) { + self$append_to_metadata(property, restored_attributes[[property]]) + } + # Remove the latest state from the undo history + private$undo_history <- private$undo_history[-length(private$undo_history)] # Trigger garbage collection to free memory gc() } else { message("No more actions to undo.") } - }) @@ -302,33 +314,39 @@ DataSheet$set("public", "set_scalars", function(new_scalars) { ) # Set undo_history with memory management -DataSheet$set("public", "set_undo_history", function(new_undo_history) { - if (!is.list(new_undo_history)) stop("undo_history must be of type: list") - if(!private$disable_undo){ - # Define memory and undo_history limits - MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states - MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo undo_history - - # Check current memory usage - current_memory <- monitor_memory() - - # If memory exceeds limit, remove the oldest entry - if (current_memory > MAX_MEMORY_LIMIT_MB) { - message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) - private$undo_history <- private$undo_history[-1] # Remove the oldest entry - gc() # Trigger garbage collection to free memory - } - - # Limit undo_history size - if (length(private$undo_history) >= MAX_undo_history_SIZE) { - private$undo_history <- private$undo_history[-1] # Remove the oldest entry - gc() # Trigger garbage collection to free memory - } +DataSheet$set("public", "set_undo_history", function(new_data, attributes = list()) { + if (!is.data.frame(new_data)) stop("new_data must be of type: data.frame") - private$undo_history <- append(private$undo_history, list(new_undo_history)) + if (!private$disable_undo) { + # Define memory and undo_history limits + MAX_undo_history_SIZE <- 10 # Limit to last 10 undo_history states + MAX_MEMORY_LIMIT_MB <- 1024 # Limit the memory usage for undo_history + + # Check current memory usage + current_memory <- monitor_memory() + + # If memory exceeds limit, remove the oldest entry + if (current_memory > MAX_MEMORY_LIMIT_MB) { + message(paste("Memory limit exceeded:", round(current_memory, 2), "MB. Removing oldest entry.")) + private$undo_history <- private$undo_history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory + } + + # Limit undo_history size + if (length(private$undo_history) >= MAX_undo_history_SIZE) { + private$undo_history <- private$undo_history[-1] # Remove the oldest entry + gc() # Trigger garbage collection to free memory + } + + # Package the new data and attributes into a list + new_undo_entry <- list(data = new_data, attributes = attributes) + + # Append the new entry to the undo history + private$undo_history <- append(private$undo_history, list(new_undo_entry)) } }) + DataSheet$set("public", "set_keys", function(new_keys) { if(!is.list(new_keys)) stop("new_keys must be of type: list") self$append_to_changes(list(Set_property, "keys")) From 951e1ee3a6b9ac55aa5a79c18e4870ff738f97a3 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 24 Oct 2024 09:00:46 +0100 Subject: [PATCH 268/273] hange made --- instat/dlgStartofRains.Designer.vb | 18 ++++++++--------- instat/dlgStartofRains.vb | 31 ++++++++++++++---------------- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/instat/dlgStartofRains.Designer.vb b/instat/dlgStartofRains.Designer.vb index 77dab3d9fdf..ab78e3eb6e2 100644 --- a/instat/dlgStartofRains.Designer.vb +++ b/instat/dlgStartofRains.Designer.vb @@ -357,7 +357,7 @@ Partial Class dlgStartofRains ' Me.ucrReceiverEvap.AutoSize = True Me.ucrReceiverEvap.frmParent = Me - Me.ucrReceiverEvap.Location = New System.Drawing.Point(210, 81) + Me.ucrReceiverEvap.Location = New System.Drawing.Point(289, 81) Me.ucrReceiverEvap.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverEvap.Name = "ucrReceiverEvap" Me.ucrReceiverEvap.Selector = Nothing @@ -369,7 +369,7 @@ Partial Class dlgStartofRains 'lblFraction ' Me.lblFraction.AutoSize = True - Me.lblFraction.Location = New System.Drawing.Point(349, 83) + Me.lblFraction.Location = New System.Drawing.Point(428, 83) Me.lblFraction.Name = "lblFraction" Me.lblFraction.Size = New System.Drawing.Size(48, 13) Me.lblFraction.TabIndex = 25 @@ -380,7 +380,7 @@ Partial Class dlgStartofRains Me.ucrNudEvapo.AutoSize = True Me.ucrNudEvapo.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudEvapo.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudEvapo.Location = New System.Drawing.Point(414, 78) + Me.ucrNudEvapo.Location = New System.Drawing.Point(493, 78) Me.ucrNudEvapo.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudEvapo.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudEvapo.Name = "ucrNudEvapo" @@ -391,7 +391,7 @@ Partial Class dlgStartofRains 'rdoEvapo ' Me.rdoEvapo.AutoSize = True - Me.rdoEvapo.Location = New System.Drawing.Point(120, 83) + Me.rdoEvapo.Location = New System.Drawing.Point(199, 83) Me.rdoEvapo.Name = "rdoEvapo" Me.rdoEvapo.Size = New System.Drawing.Size(82, 17) Me.rdoEvapo.TabIndex = 23 @@ -427,7 +427,7 @@ Partial Class dlgStartofRains Me.ucrNudTRAmount.AutoSize = True Me.ucrNudTRAmount.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTRAmount.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTRAmount.Location = New System.Drawing.Point(210, 58) + Me.ucrNudTRAmount.Location = New System.Drawing.Point(289, 58) Me.ucrNudTRAmount.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTRAmount.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTRAmount.Name = "ucrNudTRAmount" @@ -458,7 +458,7 @@ Partial Class dlgStartofRains Me.ucrNudTRPercentile.AutoSize = True Me.ucrNudTRPercentile.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTRPercentile.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudTRPercentile.Location = New System.Drawing.Point(210, 109) + Me.ucrNudTRPercentile.Location = New System.Drawing.Point(289, 109) Me.ucrNudTRPercentile.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudTRPercentile.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTRPercentile.Name = "ucrNudTRPercentile" @@ -469,7 +469,7 @@ Partial Class dlgStartofRains 'rdoTRAmount ' Me.rdoTRAmount.AutoSize = True - Me.rdoTRAmount.Location = New System.Drawing.Point(120, 60) + Me.rdoTRAmount.Location = New System.Drawing.Point(199, 60) Me.rdoTRAmount.Name = "rdoTRAmount" Me.rdoTRAmount.Size = New System.Drawing.Size(61, 17) Me.rdoTRAmount.TabIndex = 21 @@ -480,7 +480,7 @@ Partial Class dlgStartofRains 'rdoTRPercentile ' Me.rdoTRPercentile.AutoSize = True - Me.rdoTRPercentile.Location = New System.Drawing.Point(120, 109) + Me.rdoTRPercentile.Location = New System.Drawing.Point(199, 109) Me.rdoTRPercentile.Name = "rdoTRPercentile" Me.rdoTRPercentile.Size = New System.Drawing.Size(72, 17) Me.rdoTRPercentile.TabIndex = 27 @@ -491,7 +491,7 @@ Partial Class dlgStartofRains 'ucrPnlTRCalculateBy ' Me.ucrPnlTRCalculateBy.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlTRCalculateBy.Location = New System.Drawing.Point(51, 55) + Me.ucrPnlTRCalculateBy.Location = New System.Drawing.Point(130, 55) Me.ucrPnlTRCalculateBy.Name = "ucrPnlTRCalculateBy" Me.ucrPnlTRCalculateBy.Size = New System.Drawing.Size(165, 75) Me.ucrPnlTRCalculateBy.TabIndex = 4 diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 65262c1a10b..ac61acf3c7d 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -73,7 +73,7 @@ Public Class dlgStartofRains Private strWetSpell As String = "wet_spell" Private strFactionEvap As String = "fraction_evap" Private strSumFractionEvap As String = "roll_sum_evap" - Private strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" + 'Private strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -189,7 +189,7 @@ Public Class dlgStartofRains ucrNudEvapo.Increment = 0.01 ucrNudEvapo.SetLinkedDisplayControl(lblFraction) - ucrChkAdditional.SetText("Additional") + ucrChkAdditional.SetText("Additional Conditions") ucrChkAdditional.AddParameterValuesCondition(True, "additional", "True") ucrChkAdditional.AddParameterValuesCondition(False, "additional", "False") @@ -237,7 +237,7 @@ Public Class dlgStartofRains Dim strStartDate As String = "start_rain_date" Dim strStartStatus As String = "start_rain_status" Dim strStartDoy As String = "start_rain" - 'Dim strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" + Dim strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" Dim strYearType As String = "year_type" clsDayFromAndTo.Clear() @@ -443,7 +443,7 @@ Public Class dlgStartofRains clsRollingSumRainDayOperator.SetOperation(">=") clsRollingSumRainDayOperator.AddParameter("0", strRollSumRainDay, iPosition:=0) - ' clsRollingSumRainDayOperator.AddParameter("1", 1, iPosition:=1) + clsRollingSumRainDayOperator.AddParameter("1", 1, iPosition:=1) clsFirstRollSumRainDay.SetPackageName("dplyr") clsFirstRollSumRainDay.SetRCommand("first") @@ -600,16 +600,16 @@ Public Class dlgStartofRains clsRollSumNumberDryPeriodFunction.AddParameter("na.rm", "FALSE", iPosition:=3) clsSumRainDryPeriodOperator.SetOperation("<=") - ' clsSumRainDryPeriodOperator.AddParameter("left", strRollSumRainDryPeriod, iPosition:=0) + clsSumRainDryPeriodOperator.AddParameter("left", strRollSumRainDryPeriod, iPosition:=0) clsSumRainDryPeriodOperator.AddParameter("right", 40, iPosition:=1) clsSumRainDryPeriodIntervalMinusOperator.SetOperation("-") clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", 45, iPosition:=0) - ' clsSumRainDryPeriodIntervalMinusOperator.AddParameter("1", clsROperatorParameter:=clsSumRainDryPeriodIntervalPlusOperator, iPosition:=1) + clsSumRainDryPeriodIntervalMinusOperator.AddParameter("1", clsROperatorParameter:=clsSumRainDryPeriodIntervalPlusOperator, iPosition:=1) clsSumRainDryPeriodIntervalPlusOperator.SetOperation("+") clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", 30, iPosition:=0) - ' clsSumRainDryPeriodIntervalPlusOperator.AddParameter("1", 1, iPosition:=1) + clsSumRainDryPeriodIntervalPlusOperator.AddParameter("1", 1, iPosition:=1) clsFirstDryPeriod.SetPackageName("dplyr") clsFirstDryPeriod.SetRCommand("first") @@ -1100,28 +1100,34 @@ Public Class dlgStartofRains Private Sub ChangeDSValue() If ucrChkAdditional.Checked Then If sdgAdditionalCondition.ucrChkNumberOfRainyDays.Checked Then + clsConditionsAndOperator.AddParameter("rain_days", clsROperatorParameter:=clsRollingSumRainDayOperator, iPosition:=2, bIncludeArgumentName:=False) clsIsNaOperatorStartDOY.AddParameter("2", clsRFunctionParameter:=clsIsNaFirstRollSumRainDay, iPosition:=2) clsConditionsOrOverallOperator.AddParameter("is.na_roll_sum_rain_day", clsRFunctionParameter:=clsIsNaRollSumRainDay, iPosition:=3) clsCombinedList.AddParameter("rd_sub", clsRFunctionParameter:=clsCalcRainDayRollingSum, bIncludeArgumentName:=False, iPosition:=1) Else clsCombinedList.RemoveParameterByName("rd_sub") + clsConditionsAndOperator.RemoveParameterByName("rain_days") clsIsNaOperatorStartDOY.RemoveParameterByName("2") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_roll_sum_rain_day") End If If sdgAdditionalCondition.ucrChkDrySpell.Checked Then + clsConditionsAndOperator.AddParameter("dry_spell", clsROperatorParameter:=clsDSCombineOperator, iPosition:=3, bIncludeArgumentName:=False) clsIsNaOperatorStartDOY.AddParameter("3", clsRFunctionParameter:=clsIsNaFirstDrySpell, iPosition:=3) clsConditionsOrOverallOperator.AddParameter("is.na_dry_spell", clsRFunctionParameter:=clsIsNaDrySpell, iPosition:=4) clsCombinedList.AddParameter("ds_sub", clsRFunctionParameter:=clsCalcDrySpellRollMax, iPosition:=2, bIncludeArgumentName:=False) Else + clsConditionsAndOperator.RemoveParameterByName("dry_spell") clsCombinedList.RemoveParameterByName("ds_sub") clsIsNaOperatorStartDOY.RemoveParameterByName("3") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_spell") End If If sdgAdditionalCondition.ucrChkDryPeriod.Checked Then + clsConditionsAndOperator.AddParameter("dry_period", clsROperatorParameter:=clsDPCombineOperator, iPosition:=4, bIncludeArgumentName:=False) clsIsNaOperatorStartDOY.AddParameter("4", clsRFunctionParameter:=clsIsNaFirstDryPeriod, iPosition:=4) clsConditionsOrOverallOperator.AddParameter("is.na_dry_period", clsRFunctionParameter:=clsIsNaDryPeriod, iPosition:=5) clsCombinedList.AddParameter("dp_sub", clsRFunctionParameter:=clsCalcRollSumNumberDryPeriod, iPosition:=3, bIncludeArgumentName:=False) Else + clsConditionsAndOperator.RemoveParameterByName("dry_period") clsCombinedList.RemoveParameterByName("dp_sub") clsIsNaOperatorStartDOY.RemoveParameterByName("4") clsConditionsOrOverallOperator.RemoveParameterByName("is.na_dry_period") @@ -1137,26 +1143,20 @@ Public Class dlgStartofRains clsRollingSumRainDayOperator.RemoveParameterByName("1") End If If Not sdgAdditionalCondition.ucrNudDPMaxRain.IsEmpty Then - clsSumRainDryPeriodOperator.AddParameter("left", strRollSumRainDryPeriod, iPosition:=0) clsSumRainDryPeriodOperator.AddParameter("right", sdgAdditionalCondition.ucrNudDPMaxRain.GetText(), iPosition:=1) Else clsSumRainDryPeriodOperator.RemoveParameterByName("right") - clsSumRainDryPeriodOperator.RemoveParameterByName("left") End If If Not sdgAdditionalCondition.ucrNudDPRainPeriod.IsEmpty Then clsRollingSumRainDryPeriodFunction.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=1) clsSumRainDryPeriodIntervalPlusOperator.AddParameter("n", sdgAdditionalCondition.ucrNudDPRainPeriod.GetText(), iPosition:=0) - clsSumRainDryPeriodIntervalPlusOperator.AddParameter("1", 1, iPosition:=1) Else clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") - clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("1") clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") End If If Not sdgAdditionalCondition.ucrNudDPOverallInterval.IsEmpty Then - clsSumRainDryPeriodIntervalMinusOperator.AddParameter("1", clsROperatorParameter:=clsSumRainDryPeriodIntervalPlusOperator, iPosition:=1) clsSumRainDryPeriodIntervalMinusOperator.AddParameter("0", sdgAdditionalCondition.ucrNudDPOverallInterval.GetText(), iPosition:=0) Else - clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("1") clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") End If If Not sdgAdditionalCondition.ucrNudDSLengthOfTime.IsEmpty Then @@ -1188,14 +1188,11 @@ Public Class dlgStartofRains clsRainDayRollingSumFunction.RemoveParameterByName("n") clsDrySpellPeriodRollMaxFunction.RemoveParameterByName("n") clsSumRainDryPeriodOperator.RemoveParameterByName("right") - clsSumRainDryPeriodOperator.RemoveParameterByName("left") - clsRollingSumRainDayOperator.RemoveParameterByName("1") clsDSCombineOperator.RemoveParameterByName("ds_max") + clsRollingSumRainDayOperator.RemoveParameterByName("1") clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("n") - clsSumRainDryPeriodIntervalPlusOperator.RemoveParameterByName("1") clsRollingSumRainDryPeriodFunction.RemoveParameterByName("n") clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("0") - clsSumRainDryPeriodIntervalMinusOperator.RemoveParameterByName("1") End If End Sub From 67b12d267089e2b89c69871fc1b904af5e78c751 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 24 Oct 2024 15:00:02 +0100 Subject: [PATCH 269/273] Change made --- instat/dlgClimaticLengthOfSeason.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instat/dlgClimaticLengthOfSeason.vb b/instat/dlgClimaticLengthOfSeason.vb index 1ceeea188b1..37b25517d75 100644 --- a/instat/dlgClimaticLengthOfSeason.vb +++ b/instat/dlgClimaticLengthOfSeason.vb @@ -70,7 +70,6 @@ Public Class dlgClimaticLengthOfSeason ucrInputLengthofSeason.SetDataFrameSelector(ucrSelectorLengthofSeason.ucrAvailableDataFrames) ucrInputLengthofSeason.SetName("Length") - ucrChkType.AddParameterPresentCondition(True, "sub2", True) ucrChkType.AddParameterPresentCondition(False, "sub2", False) ucrChkType.AddToLinkedControls(ucrInputTextType, {True}, bNewLinkedHideIfParameterMissing:=True) @@ -216,6 +215,7 @@ Public Class dlgClimaticLengthOfSeason clsApplyInstatCalcFunction.AddParameter("display", "FALSE", iPosition:=1) 'Base Function + ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatCalcFunction) End Sub From 28b82ed843ee1de7fcb6996545b344454038288a Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 24 Oct 2024 15:10:43 +0100 Subject: [PATCH 270/273] Change made --- instat/dlgStartofRains.vb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index ac61acf3c7d..5b0a42b19e7 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -1010,11 +1010,12 @@ Public Class dlgStartofRains Private Sub ucrReceiverStation_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStation.ControlValueChanged GroupByStationOptions() + YearStationVariable() End Sub Private Sub ucrReceiverYear_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverYear.ControlValueChanged GroupByYearOptions() - YearVariable() + YearStationVariable() End Sub Private Sub ucrSelectorForStartofRains_DataFrameChanged() Handles ucrSelectorForStartofRains.DataFrameChanged @@ -1196,9 +1197,14 @@ Public Class dlgStartofRains End If End Sub - Private Sub YearVariable() + Private Sub YearStationVariable() If Not ucrReceiverYear.IsEmpty Then clsVectorFunction.AddParameter("x", ucrReceiverYear.GetVariableNames(), iPosition:=0, bIncludeArgumentName:=False) + If Not ucrReceiverStation.IsEmpty Then + clsVectorFunction.AddParameter("y", ucrReceiverStation.GetVariableNames(), iPosition:=1, bIncludeArgumentName:=False) + Else + clsVectorFunction.RemoveParameterByName("y") + End If clsGetlinkeddataFunction.AddParameter("link_cols", clsRFunctionParameter:=clsVectorFunction, iPosition:=1) Else clsGetlinkeddataFunction.RemoveParameterByName("link_cols") From aaab8f8349a9e4637055163d3b8aed79b95fc261 Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 24 Oct 2024 17:02:42 +0100 Subject: [PATCH 271/273] Change made --- instat/dlgClimaticLengthOfSeason.vb | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/instat/dlgClimaticLengthOfSeason.vb b/instat/dlgClimaticLengthOfSeason.vb index 37b25517d75..e6221ade614 100644 --- a/instat/dlgClimaticLengthOfSeason.vb +++ b/instat/dlgClimaticLengthOfSeason.vb @@ -20,7 +20,7 @@ Public Class dlgClimaticLengthOfSeason Private bReset As Boolean = True Private strCurrDataName As String = "" - Private clsLengthOfSeasonFunction, clsApplyInstatCalcFunction, clsAsCharacterFunction, clsCombinationCalcFunction, clsStartEndStatusFunction, clsCaseWhenFunction, clsIsNAFunction, clsIsNA1Function, clsCombinationListFunction As New RFunction + Private clsLengthOfSeasonFunction, clsConvertColumnTypeFunction, clsApplyInstatCalcFunction, clsAsCharacterFunction, clsCombinationCalcFunction, clsStartEndStatusFunction, clsCaseWhenFunction, clsIsNAFunction, clsIsNA1Function, clsCombinationListFunction As New RFunction Private clsMinusOpertor, clsAndOperator, clsOROperator, clsCaseWhenOperator, clsCaseWhen1Operator, clsCaseWhen2Operator, clsCaseWhen3Operator, clsAssignOperator, clsAssign1Operator, clsAssign2Operator, clsAssign3Operator, clsAssign4Operator, clsAnd1Operator, clsAnd2Operator As New ROperator Private Sub dlgClimaticLengthOfSeason_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -50,7 +50,6 @@ Public Class dlgClimaticLengthOfSeason ucrReceiverStartofRainsLogical.bWithQuotes = False ucrReceiverStartofRainsLogical.Selector = ucrSelectorLengthofSeason - ucrReceiverEndofRains.SetParameter(New RParameter("end_rain", 0, bNewIncludeArgumentName:=False)) ucrReceiverEndofRains.SetParameterIsString() ucrReceiverEndofRains.bWithQuotes = False @@ -107,6 +106,7 @@ Public Class dlgClimaticLengthOfSeason clsAssign4Operator.Clear() clsAnd1Operator.Clear() clsAnd2Operator.Clear() + clsConvertColumnTypeFunction.Clear() ucrSelectorLengthofSeason.Reset() ucrReceiverStartofRains.SetMeAsReceiver() @@ -214,6 +214,9 @@ Public Class dlgClimaticLengthOfSeason clsApplyInstatCalcFunction.AddParameter("calc", clsRFunctionParameter:=clsCombinationCalcFunction, iPosition:=0) clsApplyInstatCalcFunction.AddParameter("display", "FALSE", iPosition:=1) + clsConvertColumnTypeFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$convert_column_to_type") + clsConvertColumnTypeFunction.AddParameter("to_type", Chr(34) & "factor" & Chr(34), iPosition:=2) + 'Base Function ucrBase.clsRsyntax.ClearCodes() ucrBase.clsRsyntax.SetBaseRFunction(clsApplyInstatCalcFunction) @@ -229,6 +232,7 @@ Public Class dlgClimaticLengthOfSeason ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsAssign1Operator, New RParameter("start_status", 0), iAdditionalPairNo:=4) ucrReceiverEndofRainsLogical.AddAdditionalCodeParameterPair(clsAnd2Operator, New RParameter("end_status", 1), iAdditionalPairNo:=4) ucrReceiverStartofRainsLogical.AddAdditionalCodeParameterPair(clsAssign3Operator, New RParameter("start_status", 0), iAdditionalPairNo:=5) + ucrInputTextType.AddAdditionalCodeParameterPair(clsConvertColumnTypeFunction, New RParameter("col_names", 1), iAdditionalPairNo:=1) ucrReceiverStartofRains.SetRCode(clsMinusOpertor, bReset) ucrReceiverEndofRains.SetRCode(clsMinusOpertor, bReset) @@ -286,12 +290,19 @@ Public Class dlgClimaticLengthOfSeason Private Sub ucrChkType_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkType.ControlValueChanged If ucrChkType.Checked Then clsCombinationListFunction.AddParameter("sub2", clsRFunctionParameter:=clsStartEndStatusFunction, bIncludeArgumentName:=False, iPosition:=1) + ucrBase.clsRsyntax.AddToAfterCodes(clsConvertColumnTypeFunction, iPosition:=0) Else clsCombinationListFunction.RemoveParameterByName("sub2") + ucrBase.clsRsyntax.RemoveFromAfterCodes(clsConvertColumnTypeFunction) + End If End Sub Private Sub ucrChkLengthofSeason_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkLengthofSeason.ControlContentsChanged, ucrChkType.ControlContentsChanged, ucrInputLengthofSeason.ControlContentsChanged, ucrInputTextType.ControlContentsChanged, ucrReceiverStartofRains.ControlContentsChanged, ucrReceiverEndofRains.ControlContentsChanged, ucrReceiverStartofRainsLogical.ControlContentsChanged, ucrReceiverEndofRainsLogical.ControlContentsChanged TestOKEnabled() End Sub + + Private Sub ucrSelectorLengthofSeason_DataFrameChanged() Handles ucrSelectorLengthofSeason.DataFrameChanged + clsConvertColumnTypeFunction.AddParameter("data_name", Chr(34) & ucrSelectorLengthofSeason.ucrAvailableDataFrames.cboAvailableDataFrames.Text & Chr(34), iPosition:=0) + End Sub End Class \ No newline at end of file From 2ce7e1ba9450882d4064c1226e5a9a243e3800bb Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 24 Oct 2024 19:15:43 +0100 Subject: [PATCH 272/273] Change made --- instat/dlgStartofRains.vb | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/instat/dlgStartofRains.vb b/instat/dlgStartofRains.vb index 5b0a42b19e7..ca242b4e7c5 100644 --- a/instat/dlgStartofRains.vb +++ b/instat/dlgStartofRains.vb @@ -73,7 +73,6 @@ Public Class dlgStartofRains Private strWetSpell As String = "wet_spell" Private strFactionEvap As String = "fraction_evap" Private strSumFractionEvap As String = "roll_sum_evap" - 'Private strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" Private Sub dlgStartofRains_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -240,6 +239,14 @@ Public Class dlgStartofRains Dim strRollSumRainDryPeriod As String = "roll_sum_rain_dry_period" Dim strYearType As String = "year_type" + clsRainRollingSumFunction = New RFunction + clsGetlinkeddataFunction = New RFunction + clsVectorFunction = New RFunction + clsGetDataFrameFunction = New RFunction + clsDayFilterCalcFromConvert = New RFunction + clsDayFilterCalcFromList = New RFunction + clsDummyFunction = New RFunction + clsDayFromAndTo.Clear() clsDayFromAndToOperator.Clear() clsGroupByStation.Clear() @@ -297,10 +304,6 @@ Public Class dlgStartofRains clsIsNaFirstDryPeriod.Clear() clsCalcRainRollingSum.Clear() - clsRainRollingSumFunction = New RFunction - clsGetlinkeddataFunction = New RFunction - clsVectorFunction = New RFunction - clsGetDataFrameFunction = New RFunction clsTRWetSpellList.Clear() clsTRWetSpell.Clear() clsTRWetSpellFunction.Clear() @@ -339,13 +342,11 @@ Public Class dlgStartofRains bResetSubdialog = True ucrSelectorForStartofRains.Reset() - clsDayFilterCalcFromConvert = New RFunction clsDayFilterCalcFromConvert.SetRCommand("calc_from_convert") - clsDayFilterCalcFromList = New RFunction + clsDayFilterCalcFromList.SetRCommand("list") clsDayFilterCalcFromConvert.AddParameter("x", clsRFunctionParameter:=clsDayFilterCalcFromList, iPosition:=0) - clsDummyFunction = New RFunction clsDummyFunction.AddParameter("sub2", "True", iPosition:=0) clsDummyFunction.AddParameter("sub3", "True", iPosition:=1) clsDummyFunction.AddParameter("additional", "False", iPosition:=2) @@ -1078,11 +1079,7 @@ Public Class dlgStartofRains End Sub Private Sub AdditionalCondition() - If ucrChkAdditional.Checked Then - cmdAdditionnal.Visible = True - Else - cmdAdditionnal.Visible = False - End If + cmdAdditionnal.Visible = ucrChkAdditional.Checked End Sub Private Sub ucrChkAdditional_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAdditional.ControlValueChanged From 55a233bca8e364505508309ab65671e89beafbef Mon Sep 17 00:00:00 2001 From: Sophie Malla Tatchum Date: Thu, 24 Oct 2024 19:29:32 +0100 Subject: [PATCH 273/273] Change made --- instat/dlgClimaticLengthOfSeason.Designer.vb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/instat/dlgClimaticLengthOfSeason.Designer.vb b/instat/dlgClimaticLengthOfSeason.Designer.vb index 3638ded5f76..25c8f8d3eee 100644 --- a/instat/dlgClimaticLengthOfSeason.Designer.vb +++ b/instat/dlgClimaticLengthOfSeason.Designer.vb @@ -78,7 +78,7 @@ Partial Class dlgClimaticLengthOfSeason ' Me.ucrChkType.AutoSize = True Me.ucrChkType.Checked = False - Me.ucrChkType.Location = New System.Drawing.Point(5, 285) + Me.ucrChkType.Location = New System.Drawing.Point(5, 279) Me.ucrChkType.Name = "ucrChkType" Me.ucrChkType.Size = New System.Drawing.Size(87, 23) Me.ucrChkType.TabIndex = 11 @@ -98,7 +98,7 @@ Partial Class dlgClimaticLengthOfSeason Me.ucrInputTextType.AutoSize = True Me.ucrInputTextType.IsMultiline = False Me.ucrInputTextType.IsReadOnly = False - Me.ucrInputTextType.Location = New System.Drawing.Point(97, 284) + Me.ucrInputTextType.Location = New System.Drawing.Point(149, 278) Me.ucrInputTextType.Name = "ucrInputTextType" Me.ucrInputTextType.Size = New System.Drawing.Size(137, 21) Me.ucrInputTextType.TabIndex = 12 @@ -184,7 +184,7 @@ Partial Class dlgClimaticLengthOfSeason Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(5, 311) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) + Me.ucrBase.Size = New System.Drawing.Size(408, 52) Me.ucrBase.TabIndex = 13 ' 'dlgClimaticLengthOfSeason