diff --git a/instat/dlgHistogram.vb b/instat/dlgHistogram.vb index 6fbc9a9c47c..b799177c28e 100644 --- a/instat/dlgHistogram.vb +++ b/instat/dlgHistogram.vb @@ -218,6 +218,32 @@ Public Class dlgHistogram TestOkEnabled() End Sub + Private Sub cmdHistogramOptions_Click(sender As Object, e As EventArgs) Handles cmdHistogramOptions.Click + sdgLayerOptions.SetupLayer(clsNewGgPlot:=clsRggplotFunction, clsNewGeomFunc:=clsRgeomPlotFunction, clsNewGlobalAesFunc:=clsRaesFunction, clsNewLocalAes:=clsLocalRaesFunction, bFixGeom:=True, ucrNewBaseSelector:=ucrHistogramSelector, bApplyAesGlobally:=True, bReset:=bResetHistLayerSubdialog) + sdgLayerOptions.ShowDialog() + bResetHistLayerSubdialog = False + For Each clsParam In clsRaesFunction.clsParameters + If clsParam.strArgumentName = "x" AndAlso (clsParam.strArgumentValue <> "value" OrElse ucrVariablesAsFactorforHist.bSingleVariable) Then + ucrVariablesAsFactorforHist.Add(clsParam.strArgumentValue) + ElseIf (clsParam.strArgumentName = "fill" AndAlso rdoHistogram.Checked) OrElse (clsParam.strArgumentName = "colour" AndAlso (rdoFrequencyPolygon.Checked OrElse (rdoDensity_ridges.Checked AndAlso Not ucrChkRidges.Checked))) OrElse (clsParam.strArgumentName = "y" AndAlso (rdoDensity_ridges.Checked AndAlso ucrChkRidges.Checked)) Then + ucrFactorReceiver.Add(clsParam.strArgumentValue) + End If + Next + 'this is here because of the subdialog + clsRgeomPlotFunction.AddParameter("mapping", clsRFunctionParameter:=clsHistAesFunction) + TestOkEnabled() + End Sub + + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click + sdgPlots.SetRCode(clsBaseOperator, clsNewYScalecontinuousFunction:=clsYScalecontinuousFunction, clsNewXScalecontinuousFunction:=clsXScalecontinuousFunction, clsNewXLabsTitleFunction:=clsXlabsFunction, + clsNewYLabTitleFunction:=clsYlabFunction, clsNewLabsFunction:=clsLabsFunction, clsNewThemeFunction:=clsThemeFunction, clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, + clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrHistogramSelector, + clsNewGlobalAesFunction:=clsRaesFunction, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, clsNewXScaleDateFunction:=clsXScaleDateFunction, + clsNewAnnotateFunction:=clsAnnotateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, strMainDialogGeomParameterNames:=strGeomParameterNames, bReset:=bResetSubdialog) + sdgPlots.ShowDialog() + bResetSubdialog = False + End Sub + Private Sub SetDialogOptions() clsHistAesFunction.RemoveParameterByName("x") clsHistAesFunction.RemoveParameterByName("y") @@ -260,6 +286,16 @@ Public Class dlgHistogram autoTranslate(Me) End Sub + Private Sub TempOptionsDisabledInMultipleVariablesCase() + If ucrVariablesAsFactorforHist.bSingleVariable Then + cmdHistogramOptions.Enabled = True + cmdOptions.Enabled = True + Else + cmdHistogramOptions.Enabled = False + cmdOptions.Enabled = False + End If + End Sub + Private Sub ucrPnlOptions_Control() Handles ucrPnlOptions.ControlValueChanged, ucrChkDisplayAsDotPlot.ControlValueChanged, ucrChkRidges.ControlValueChanged, ucrFactorReceiver.ControlValueChanged, ucrVariablesAsFactorforHist.ControlValueChanged toolStripMenuItemHistogramOptions.Enabled = rdoHistogram.Checked AndAlso Not ucrChkDisplayAsDotPlot.Checked toolStripMenuItemDotOptions.Enabled = rdoHistogram.Checked AndAlso ucrChkDisplayAsDotPlot.Checked diff --git a/instat/dlgImportDataset.Designer.vb b/instat/dlgImportDataset.Designer.vb index 533b3147fb0..3ab46effc51 100644 --- a/instat/dlgImportDataset.Designer.vb +++ b/instat/dlgImportDataset.Designer.vb @@ -52,21 +52,52 @@ Partial Class dlgImportDataset Me.lblLinesToSkipCSV = New System.Windows.Forms.Label() Me.cmdBrowse = New System.Windows.Forms.Button() Me.grpCSV = New System.Windows.Forms.GroupBox() + Me.ucrNudMaxRowsCSV = New instat.ucrNud() + Me.ucrChkMaxRowsCSV = New instat.ucrCheck() Me.lblNAStringsCSV = New System.Windows.Forms.Label() + Me.ucrChkStringsAsFactorsCSV = New instat.ucrCheck() + Me.ucrNudRowsToSkipCSV = New instat.ucrNud() + Me.ucrInputHeadersCSV = New instat.ucrInputComboBox() + Me.ucrInputMissingValueStringCSV = New instat.ucrInputTextBox() + Me.ucrInputDecimalCSV = New instat.ucrInputComboBox() + Me.ucrInputSeparatorCSV = New instat.ucrInputComboBox() + Me.ucrInputEncodingCSV = New instat.ucrInputComboBox() Me.grpExcel = New System.Windows.Forms.GroupBox() Me.lblTo = New System.Windows.Forms.Label() + Me.ucrChkRange = New instat.ucrCheck() Me.lblFrom = New System.Windows.Forms.Label() + Me.ucrInputTextTo = New instat.ucrInputTextBox() + Me.ucrInputTextFrom = New instat.ucrInputTextBox() + Me.ucrNudMaxRowsExcel = New instat.ucrNud() + Me.ucrChkMaxRowsExcel = New instat.ucrCheck() + Me.ucrNudRowsToSkipExcel = New instat.ucrNud() Me.lblMissingValueStringExcel = New System.Windows.Forms.Label() + Me.ucrInputMissingValueStringExcel = New instat.ucrInputTextBox() + Me.ucrInputNamedRegions = New instat.ucrInputComboBox() Me.lblNamedRegion = New System.Windows.Forms.Label() Me.lblRowToSkipExcel = New System.Windows.Forms.Label() + Me.ucrChkColumnNamesExcel = New instat.ucrCheck() + Me.ucrChkTrimWSExcel = New instat.ucrCheck() Me.grpRDS = New System.Windows.Forms.GroupBox() + Me.ucrChkOverwriteRDS = New instat.ucrCheck() + Me.ucrChkImportObjectsRDS = New instat.ucrCheck() + Me.ucrChkImportCalculationsRDS = New instat.ucrCheck() + Me.ucrChkImportChangesLogRDS = New instat.ucrCheck() + Me.ucrChkImportFiltersRDS = New instat.ucrCheck() + Me.ucrChkImportMetadataRDS = New instat.ucrCheck() + Me.ucrChkKeepExistingDataRDS = New instat.ucrCheck() Me.lblCannotImport = New System.Windows.Forms.Label() Me.lblNoPreview = New System.Windows.Forms.Label() Me.lblLinesToPreview = New System.Windows.Forms.Label() Me.cmdRefreshPreview = New System.Windows.Forms.Button() Me.grpText = New System.Windows.Forms.GroupBox() + Me.ucrNudMaxRowsText = New instat.ucrNud() Me.lblMissingValueStringText = New System.Windows.Forms.Label() + Me.ucrNudRowsToSkipText = New instat.ucrNud() + Me.ucrInputMissingValueStringText = New instat.ucrInputTextBox() Me.lblLinesToSkipText = New System.Windows.Forms.Label() + Me.ucrChkColumnNamesText = New instat.ucrCheck() + Me.ucrChkMaxRowsText = New instat.ucrCheck() Me.rdoSeparatortext = New System.Windows.Forms.RadioButton() Me.rdoFixedWidthText = New System.Windows.Forms.RadioButton() Me.rdoFixedWidthWhiteSpacesText = New System.Windows.Forms.RadioButton() @@ -75,45 +106,14 @@ Partial Class dlgImportDataset Me.lblImportingSheets = New System.Windows.Forms.Label() Me.cmdStepBack = New System.Windows.Forms.Button() Me.ttCmdStepBack = New System.Windows.Forms.ToolTip(Me.components) - Me.ucrChkDropEmptyCols = New instat.ucrCheck() Me.ucrChkMultipleFiles = New instat.ucrCheck() - Me.ucrSaveFile = New instat.ucrSave() - Me.ucrNudMaxRowsText = New instat.ucrNud() - Me.ucrChkMaxRowsText = New instat.ucrCheck() - Me.ucrChkColumnNamesText = New instat.ucrCheck() - Me.ucrNudRowsToSkipText = New instat.ucrNud() - Me.ucrInputMissingValueStringText = New instat.ucrInputTextBox() Me.ucrNudPreviewLines = New instat.ucrNud() Me.ucrPanelFixedWidthText = New instat.UcrPanel() - Me.ucrChkRange = New instat.ucrCheck() - Me.ucrInputTextTo = New instat.ucrInputTextBox() - Me.ucrInputTextFrom = New instat.ucrInputTextBox() - Me.ucrNudMaxRowsExcel = New instat.ucrNud() - Me.ucrChkColumnNamesExcel = New instat.ucrCheck() - Me.ucrChkMaxRowsExcel = New instat.ucrCheck() - Me.ucrChkTrimWSExcel = New instat.ucrCheck() - Me.ucrNudRowsToSkipExcel = New instat.ucrNud() - Me.ucrInputMissingValueStringExcel = New instat.ucrInputTextBox() - Me.ucrInputNamedRegions = New instat.ucrInputComboBox() - Me.ucrChkOverwriteRDS = New instat.ucrCheck() - Me.ucrChkImportObjectsRDS = New instat.ucrCheck() - Me.ucrChkImportCalculationsRDS = New instat.ucrCheck() - Me.ucrChkImportChangesLogRDS = New instat.ucrCheck() - Me.ucrChkImportFiltersRDS = New instat.ucrCheck() - Me.ucrChkImportMetadataRDS = New instat.ucrCheck() - Me.ucrChkKeepExistingDataRDS = New instat.ucrCheck() - Me.ucrNudMaxRowsCSV = New instat.ucrNud() - Me.ucrChkMaxRowsCSV = New instat.ucrCheck() - Me.ucrChkStringsAsFactorsCSV = New instat.ucrCheck() - Me.ucrNudRowsToSkipCSV = New instat.ucrNud() - Me.ucrInputHeadersCSV = New instat.ucrInputComboBox() - Me.ucrInputMissingValueStringCSV = New instat.ucrInputTextBox() - Me.ucrInputDecimalCSV = New instat.ucrInputComboBox() - Me.ucrInputSeparatorCSV = New instat.ucrInputComboBox() - Me.ucrInputEncodingCSV = New instat.ucrInputComboBox() Me.ucrInputFilePath = New instat.ucrInputTextBox() Me.ucrBase = New instat.ucrButtons() Me.ucrChkSheetsCheckAll = New instat.ucrCheck() + Me.ucrChkDropEmptyCols = New instat.ucrCheck() + Me.ucrSaveFile = New instat.ucrSave() Me.grpCSV.SuspendLayout() Me.grpExcel.SuspendLayout() Me.grpRDS.SuspendLayout() @@ -124,7 +124,7 @@ Partial Class dlgImportDataset ' Me.lblTextFilePreview.AutoSize = True Me.lblTextFilePreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTextFilePreview.Location = New System.Drawing.Point(264, 49) + Me.lblTextFilePreview.Location = New System.Drawing.Point(349, 51) Me.lblTextFilePreview.Name = "lblTextFilePreview" Me.lblTextFilePreview.Size = New System.Drawing.Size(91, 13) Me.lblTextFilePreview.TabIndex = 7 @@ -135,7 +135,7 @@ Partial Class dlgImportDataset ' Me.lblDataFrame.AutoSize = True Me.lblDataFrame.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDataFrame.Location = New System.Drawing.Point(264, 230) + Me.lblDataFrame.Location = New System.Drawing.Point(305, 230) Me.lblDataFrame.Name = "lblDataFrame" Me.lblDataFrame.Size = New System.Drawing.Size(106, 13) Me.lblDataFrame.TabIndex = 9 @@ -188,7 +188,7 @@ Partial Class dlgImportDataset ' 'txtTextFilePreview ' - Me.txtTextFilePreview.Location = New System.Drawing.Point(267, 66) + Me.txtTextFilePreview.Location = New System.Drawing.Point(307, 68) Me.txtTextFilePreview.Multiline = True Me.txtTextFilePreview.Name = "txtTextFilePreview" Me.txtTextFilePreview.ScrollBars = System.Windows.Forms.ScrollBars.Both @@ -200,7 +200,7 @@ Partial Class dlgImportDataset Me.grdDataPreview.BackColor = System.Drawing.Color.White Me.grdDataPreview.ColumnHeaderContextMenuStrip = Nothing Me.grdDataPreview.LeadHeaderContextMenuStrip = Nothing - Me.grdDataPreview.Location = New System.Drawing.Point(267, 251) + Me.grdDataPreview.Location = New System.Drawing.Point(309, 252) Me.grdDataPreview.Name = "grdDataPreview" Me.grdDataPreview.Readonly = True Me.grdDataPreview.RowHeaderContextMenuStrip = Nothing @@ -216,9 +216,9 @@ Partial Class dlgImportDataset 'lblFileOpenPath ' Me.lblFileOpenPath.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFileOpenPath.Location = New System.Drawing.Point(8, 20) + Me.lblFileOpenPath.Location = New System.Drawing.Point(7, 20) Me.lblFileOpenPath.Name = "lblFileOpenPath" - Me.lblFileOpenPath.Size = New System.Drawing.Size(38, 13) + Me.lblFileOpenPath.Size = New System.Drawing.Size(52, 13) Me.lblFileOpenPath.TabIndex = 0 Me.lblFileOpenPath.Text = "File:" ' @@ -235,7 +235,7 @@ Partial Class dlgImportDataset 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(401, 18) + Me.cmdBrowse.Location = New System.Drawing.Point(403, 16) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(66, 23) Me.cmdBrowse.TabIndex = 2 @@ -262,12 +262,36 @@ Partial Class dlgImportDataset Me.grpCSV.Controls.Add(Me.lblDecimalCSV) Me.grpCSV.Location = New System.Drawing.Point(9, 99) Me.grpCSV.Name = "grpCSV" - Me.grpCSV.Size = New System.Drawing.Size(239, 268) + Me.grpCSV.Size = New System.Drawing.Size(294, 268) Me.grpCSV.TabIndex = 4 Me.grpCSV.TabStop = False Me.grpCSV.Text = "Import csv Options" Me.grpCSV.Visible = False ' + 'ucrNudMaxRowsCSV + ' + Me.ucrNudMaxRowsCSV.AutoSize = True + Me.ucrNudMaxRowsCSV.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxRowsCSV.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxRowsCSV.Location = New System.Drawing.Point(212, 237) + Me.ucrNudMaxRowsCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudMaxRowsCSV.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxRowsCSV.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxRowsCSV.Name = "ucrNudMaxRowsCSV" + Me.ucrNudMaxRowsCSV.Size = New System.Drawing.Size(70, 20) + Me.ucrNudMaxRowsCSV.TabIndex = 19 + Me.ucrNudMaxRowsCSV.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkMaxRowsCSV + ' + Me.ucrChkMaxRowsCSV.AutoSize = True + Me.ucrChkMaxRowsCSV.Checked = False + Me.ucrChkMaxRowsCSV.Location = New System.Drawing.Point(4, 237) + Me.ucrChkMaxRowsCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkMaxRowsCSV.Name = "ucrChkMaxRowsCSV" + Me.ucrChkMaxRowsCSV.Size = New System.Drawing.Size(206, 23) + Me.ucrChkMaxRowsCSV.TabIndex = 17 + ' 'lblNAStringsCSV ' Me.lblNAStringsCSV.AutoSize = True @@ -278,6 +302,90 @@ Partial Class dlgImportDataset Me.lblNAStringsCSV.TabIndex = 12 Me.lblNAStringsCSV.Text = "Missing Value String:" ' + 'ucrChkStringsAsFactorsCSV + ' + Me.ucrChkStringsAsFactorsCSV.AutoSize = True + Me.ucrChkStringsAsFactorsCSV.Checked = False + Me.ucrChkStringsAsFactorsCSV.Location = New System.Drawing.Point(4, 180) + Me.ucrChkStringsAsFactorsCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkStringsAsFactorsCSV.Name = "ucrChkStringsAsFactorsCSV" + Me.ucrChkStringsAsFactorsCSV.Size = New System.Drawing.Size(269, 23) + Me.ucrChkStringsAsFactorsCSV.TabIndex = 16 + ' + 'ucrNudRowsToSkipCSV + ' + Me.ucrNudRowsToSkipCSV.AutoSize = True + Me.ucrNudRowsToSkipCSV.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowsToSkipCSV.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRowsToSkipCSV.Location = New System.Drawing.Point(105, 207) + Me.ucrNudRowsToSkipCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudRowsToSkipCSV.Maximum = New Decimal(New Integer() {1000000, 0, 0, 0}) + Me.ucrNudRowsToSkipCSV.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowsToSkipCSV.Name = "ucrNudRowsToSkipCSV" + Me.ucrNudRowsToSkipCSV.Size = New System.Drawing.Size(70, 20) + Me.ucrNudRowsToSkipCSV.TabIndex = 15 + Me.ucrNudRowsToSkipCSV.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputHeadersCSV + ' + Me.ucrInputHeadersCSV.AddQuotesIfUnrecognised = True + Me.ucrInputHeadersCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputHeadersCSV.GetSetSelectedIndex = -1 + Me.ucrInputHeadersCSV.IsReadOnly = False + Me.ucrInputHeadersCSV.Location = New System.Drawing.Point(219, 50) + Me.ucrInputHeadersCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputHeadersCSV.Name = "ucrInputHeadersCSV" + Me.ucrInputHeadersCSV.Size = New System.Drawing.Size(71, 21) + Me.ucrInputHeadersCSV.TabIndex = 3 + ' + 'ucrInputMissingValueStringCSV + ' + Me.ucrInputMissingValueStringCSV.AddQuotesIfUnrecognised = True + Me.ucrInputMissingValueStringCSV.AutoSize = True + Me.ucrInputMissingValueStringCSV.IsMultiline = False + Me.ucrInputMissingValueStringCSV.IsReadOnly = False + Me.ucrInputMissingValueStringCSV.Location = New System.Drawing.Point(173, 145) + Me.ucrInputMissingValueStringCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputMissingValueStringCSV.Name = "ucrInputMissingValueStringCSV" + Me.ucrInputMissingValueStringCSV.Size = New System.Drawing.Size(117, 21) + Me.ucrInputMissingValueStringCSV.TabIndex = 13 + ' + 'ucrInputDecimalCSV + ' + Me.ucrInputDecimalCSV.AddQuotesIfUnrecognised = True + Me.ucrInputDecimalCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputDecimalCSV.GetSetSelectedIndex = -1 + Me.ucrInputDecimalCSV.IsReadOnly = False + Me.ucrInputDecimalCSV.Location = New System.Drawing.Point(133, 115) + Me.ucrInputDecimalCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputDecimalCSV.Name = "ucrInputDecimalCSV" + Me.ucrInputDecimalCSV.Size = New System.Drawing.Size(157, 21) + Me.ucrInputDecimalCSV.TabIndex = 11 + ' + 'ucrInputSeparatorCSV + ' + Me.ucrInputSeparatorCSV.AddQuotesIfUnrecognised = True + Me.ucrInputSeparatorCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputSeparatorCSV.GetSetSelectedIndex = -1 + Me.ucrInputSeparatorCSV.IsReadOnly = False + Me.ucrInputSeparatorCSV.Location = New System.Drawing.Point(134, 83) + Me.ucrInputSeparatorCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputSeparatorCSV.Name = "ucrInputSeparatorCSV" + Me.ucrInputSeparatorCSV.Size = New System.Drawing.Size(157, 21) + Me.ucrInputSeparatorCSV.TabIndex = 9 + ' + 'ucrInputEncodingCSV + ' + Me.ucrInputEncodingCSV.AddQuotesIfUnrecognised = True + Me.ucrInputEncodingCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputEncodingCSV.GetSetSelectedIndex = -1 + Me.ucrInputEncodingCSV.IsReadOnly = False + Me.ucrInputEncodingCSV.Location = New System.Drawing.Point(133, 22) + Me.ucrInputEncodingCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputEncodingCSV.Name = "ucrInputEncodingCSV" + Me.ucrInputEncodingCSV.Size = New System.Drawing.Size(157, 21) + Me.ucrInputEncodingCSV.TabIndex = 1 + ' 'grpExcel ' Me.grpExcel.Controls.Add(Me.lblTo) @@ -286,18 +394,18 @@ Partial Class dlgImportDataset Me.grpExcel.Controls.Add(Me.ucrInputTextTo) Me.grpExcel.Controls.Add(Me.ucrInputTextFrom) Me.grpExcel.Controls.Add(Me.ucrNudMaxRowsExcel) - Me.grpExcel.Controls.Add(Me.ucrChkColumnNamesExcel) Me.grpExcel.Controls.Add(Me.ucrChkMaxRowsExcel) - Me.grpExcel.Controls.Add(Me.ucrChkTrimWSExcel) Me.grpExcel.Controls.Add(Me.ucrNudRowsToSkipExcel) Me.grpExcel.Controls.Add(Me.lblMissingValueStringExcel) Me.grpExcel.Controls.Add(Me.ucrInputMissingValueStringExcel) Me.grpExcel.Controls.Add(Me.ucrInputNamedRegions) Me.grpExcel.Controls.Add(Me.lblNamedRegion) Me.grpExcel.Controls.Add(Me.lblRowToSkipExcel) + Me.grpExcel.Controls.Add(Me.ucrChkColumnNamesExcel) + Me.grpExcel.Controls.Add(Me.ucrChkTrimWSExcel) Me.grpExcel.Location = New System.Drawing.Point(9, 50) Me.grpExcel.Name = "grpExcel" - Me.grpExcel.Size = New System.Drawing.Size(239, 241) + Me.grpExcel.Size = New System.Drawing.Size(291, 241) Me.grpExcel.TabIndex = 5 Me.grpExcel.TabStop = False Me.grpExcel.Text = "Import Excel Options" @@ -313,6 +421,16 @@ Partial Class dlgImportDataset Me.lblTo.TabIndex = 32 Me.lblTo.Text = "To:" ' + 'ucrChkRange + ' + Me.ucrChkRange.AutoSize = True + Me.ucrChkRange.Checked = False + Me.ucrChkRange.Location = New System.Drawing.Point(8, 137) + Me.ucrChkRange.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkRange.Name = "ucrChkRange" + Me.ucrChkRange.Size = New System.Drawing.Size(170, 23) + Me.ucrChkRange.TabIndex = 7 + ' 'lblFrom ' Me.lblFrom.AutoSize = True @@ -323,6 +441,66 @@ Partial Class dlgImportDataset Me.lblFrom.TabIndex = 31 Me.lblFrom.Text = "From:" ' + 'ucrInputTextTo + ' + Me.ucrInputTextTo.AddQuotesIfUnrecognised = True + Me.ucrInputTextTo.AutoSize = True + Me.ucrInputTextTo.IsMultiline = False + Me.ucrInputTextTo.IsReadOnly = False + Me.ucrInputTextTo.Location = New System.Drawing.Point(166, 184) + Me.ucrInputTextTo.Name = "ucrInputTextTo" + Me.ucrInputTextTo.Size = New System.Drawing.Size(62, 20) + Me.ucrInputTextTo.TabIndex = 30 + ' + 'ucrInputTextFrom + ' + Me.ucrInputTextFrom.AddQuotesIfUnrecognised = True + Me.ucrInputTextFrom.AutoSize = True + Me.ucrInputTextFrom.IsMultiline = False + Me.ucrInputTextFrom.IsReadOnly = False + Me.ucrInputTextFrom.Location = New System.Drawing.Point(8, 183) + Me.ucrInputTextFrom.Name = "ucrInputTextFrom" + Me.ucrInputTextFrom.Size = New System.Drawing.Size(62, 20) + Me.ucrInputTextFrom.TabIndex = 29 + ' + 'ucrNudMaxRowsExcel + ' + Me.ucrNudMaxRowsExcel.AutoSize = True + Me.ucrNudMaxRowsExcel.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxRowsExcel.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxRowsExcel.Location = New System.Drawing.Point(168, 214) + Me.ucrNudMaxRowsExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudMaxRowsExcel.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxRowsExcel.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxRowsExcel.Name = "ucrNudMaxRowsExcel" + Me.ucrNudMaxRowsExcel.Size = New System.Drawing.Size(62, 20) + Me.ucrNudMaxRowsExcel.TabIndex = 13 + Me.ucrNudMaxRowsExcel.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkMaxRowsExcel + ' + Me.ucrChkMaxRowsExcel.AutoSize = True + Me.ucrChkMaxRowsExcel.Checked = False + Me.ucrChkMaxRowsExcel.Location = New System.Drawing.Point(8, 214) + Me.ucrChkMaxRowsExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkMaxRowsExcel.Name = "ucrChkMaxRowsExcel" + Me.ucrChkMaxRowsExcel.Size = New System.Drawing.Size(173, 23) + Me.ucrChkMaxRowsExcel.TabIndex = 9 + ' + 'ucrNudRowsToSkipExcel + ' + Me.ucrNudRowsToSkipExcel.AutoSize = True + Me.ucrNudRowsToSkipExcel.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowsToSkipExcel.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRowsToSkipExcel.Location = New System.Drawing.Point(148, 111) + Me.ucrNudRowsToSkipExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudRowsToSkipExcel.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudRowsToSkipExcel.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowsToSkipExcel.Name = "ucrNudRowsToSkipExcel" + Me.ucrNudRowsToSkipExcel.Size = New System.Drawing.Size(62, 20) + Me.ucrNudRowsToSkipExcel.TabIndex = 8 + Me.ucrNudRowsToSkipExcel.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblMissingValueStringExcel ' Me.lblMissingValueStringExcel.AutoSize = True @@ -333,6 +511,30 @@ Partial Class dlgImportDataset Me.lblMissingValueStringExcel.TabIndex = 3 Me.lblMissingValueStringExcel.Text = "Missing Value String:" ' + 'ucrInputMissingValueStringExcel + ' + Me.ucrInputMissingValueStringExcel.AddQuotesIfUnrecognised = True + Me.ucrInputMissingValueStringExcel.AutoSize = True + Me.ucrInputMissingValueStringExcel.IsMultiline = False + Me.ucrInputMissingValueStringExcel.IsReadOnly = False + Me.ucrInputMissingValueStringExcel.Location = New System.Drawing.Point(157, 25) + Me.ucrInputMissingValueStringExcel.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputMissingValueStringExcel.Name = "ucrInputMissingValueStringExcel" + Me.ucrInputMissingValueStringExcel.Size = New System.Drawing.Size(125, 21) + Me.ucrInputMissingValueStringExcel.TabIndex = 5 + ' + 'ucrInputNamedRegions + ' + Me.ucrInputNamedRegions.AddQuotesIfUnrecognised = True + Me.ucrInputNamedRegions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputNamedRegions.GetSetSelectedIndex = -1 + Me.ucrInputNamedRegions.IsReadOnly = False + Me.ucrInputNamedRegions.Location = New System.Drawing.Point(148, 25) + Me.ucrInputNamedRegions.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputNamedRegions.Name = "ucrInputNamedRegions" + Me.ucrInputNamedRegions.Size = New System.Drawing.Size(82, 21) + Me.ucrInputNamedRegions.TabIndex = 4 + ' 'lblNamedRegion ' Me.lblNamedRegion.AutoSize = True @@ -353,7 +555,27 @@ Partial Class dlgImportDataset Me.lblRowToSkipExcel.TabIndex = 7 Me.lblRowToSkipExcel.Text = "Rows to Skip:" ' - 'grpRDS + 'ucrChkColumnNamesExcel + ' + Me.ucrChkColumnNamesExcel.AutoSize = True + Me.ucrChkColumnNamesExcel.Checked = False + Me.ucrChkColumnNamesExcel.Location = New System.Drawing.Point(8, 52) + Me.ucrChkColumnNamesExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkColumnNamesExcel.Name = "ucrChkColumnNamesExcel" + Me.ucrChkColumnNamesExcel.Size = New System.Drawing.Size(173, 23) + Me.ucrChkColumnNamesExcel.TabIndex = 11 + ' + 'ucrChkTrimWSExcel + ' + Me.ucrChkTrimWSExcel.AutoSize = True + Me.ucrChkTrimWSExcel.Checked = False + Me.ucrChkTrimWSExcel.Location = New System.Drawing.Point(8, 82) + Me.ucrChkTrimWSExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkTrimWSExcel.Name = "ucrChkTrimWSExcel" + Me.ucrChkTrimWSExcel.Size = New System.Drawing.Size(170, 23) + Me.ucrChkTrimWSExcel.TabIndex = 6 + ' + 'grpRDS ' Me.grpRDS.Controls.Add(Me.ucrChkOverwriteRDS) Me.grpRDS.Controls.Add(Me.ucrChkImportObjectsRDS) @@ -370,12 +592,82 @@ Partial Class dlgImportDataset Me.grpRDS.Text = "Import RDS Options" Me.grpRDS.Visible = False ' + 'ucrChkOverwriteRDS + ' + Me.ucrChkOverwriteRDS.AutoSize = True + Me.ucrChkOverwriteRDS.Checked = False + Me.ucrChkOverwriteRDS.Location = New System.Drawing.Point(8, 175) + Me.ucrChkOverwriteRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkOverwriteRDS.Name = "ucrChkOverwriteRDS" + Me.ucrChkOverwriteRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkOverwriteRDS.TabIndex = 6 + ' + 'ucrChkImportObjectsRDS + ' + Me.ucrChkImportObjectsRDS.AutoSize = True + Me.ucrChkImportObjectsRDS.Checked = False + Me.ucrChkImportObjectsRDS.Location = New System.Drawing.Point(8, 71) + Me.ucrChkImportObjectsRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkImportObjectsRDS.Name = "ucrChkImportObjectsRDS" + Me.ucrChkImportObjectsRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkImportObjectsRDS.TabIndex = 2 + ' + 'ucrChkImportCalculationsRDS + ' + Me.ucrChkImportCalculationsRDS.AutoSize = True + Me.ucrChkImportCalculationsRDS.Checked = False + Me.ucrChkImportCalculationsRDS.Location = New System.Drawing.Point(8, 123) + Me.ucrChkImportCalculationsRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkImportCalculationsRDS.Name = "ucrChkImportCalculationsRDS" + Me.ucrChkImportCalculationsRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkImportCalculationsRDS.TabIndex = 4 + ' + 'ucrChkImportChangesLogRDS + ' + Me.ucrChkImportChangesLogRDS.AutoSize = True + Me.ucrChkImportChangesLogRDS.Checked = False + Me.ucrChkImportChangesLogRDS.Location = New System.Drawing.Point(8, 149) + Me.ucrChkImportChangesLogRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkImportChangesLogRDS.Name = "ucrChkImportChangesLogRDS" + Me.ucrChkImportChangesLogRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkImportChangesLogRDS.TabIndex = 5 + ' + 'ucrChkImportFiltersRDS + ' + Me.ucrChkImportFiltersRDS.AutoSize = True + Me.ucrChkImportFiltersRDS.Checked = False + Me.ucrChkImportFiltersRDS.Location = New System.Drawing.Point(8, 97) + Me.ucrChkImportFiltersRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkImportFiltersRDS.Name = "ucrChkImportFiltersRDS" + Me.ucrChkImportFiltersRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkImportFiltersRDS.TabIndex = 3 + ' + 'ucrChkImportMetadataRDS + ' + Me.ucrChkImportMetadataRDS.AutoSize = True + Me.ucrChkImportMetadataRDS.Checked = False + Me.ucrChkImportMetadataRDS.Location = New System.Drawing.Point(8, 45) + Me.ucrChkImportMetadataRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkImportMetadataRDS.Name = "ucrChkImportMetadataRDS" + Me.ucrChkImportMetadataRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkImportMetadataRDS.TabIndex = 1 + ' + 'ucrChkKeepExistingDataRDS + ' + Me.ucrChkKeepExistingDataRDS.AutoSize = True + Me.ucrChkKeepExistingDataRDS.Checked = False + Me.ucrChkKeepExistingDataRDS.Location = New System.Drawing.Point(8, 21) + Me.ucrChkKeepExistingDataRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkKeepExistingDataRDS.Name = "ucrChkKeepExistingDataRDS" + Me.ucrChkKeepExistingDataRDS.Size = New System.Drawing.Size(205, 23) + Me.ucrChkKeepExistingDataRDS.TabIndex = 0 + ' 'lblCannotImport ' Me.lblCannotImport.AutoSize = True Me.lblCannotImport.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!, System.Drawing.FontStyle.Bold) Me.lblCannotImport.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCannotImport.Location = New System.Drawing.Point(253, 289) + Me.lblCannotImport.Location = New System.Drawing.Point(297, 290) Me.lblCannotImport.Name = "lblCannotImport" Me.lblCannotImport.Size = New System.Drawing.Size(366, 36) Me.lblCannotImport.TabIndex = 13 @@ -389,7 +681,7 @@ Partial Class dlgImportDataset Me.lblNoPreview.AutoSize = True Me.lblNoPreview.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!) Me.lblNoPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblNoPreview.Location = New System.Drawing.Point(286, 290) + Me.lblNoPreview.Location = New System.Drawing.Point(276, 329) Me.lblNoPreview.Name = "lblNoPreview" Me.lblNoPreview.Size = New System.Drawing.Size(298, 18) Me.lblNoPreview.TabIndex = 14 @@ -401,7 +693,7 @@ Partial Class dlgImportDataset ' Me.lblLinesToPreview.AutoSize = True Me.lblLinesToPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblLinesToPreview.Location = New System.Drawing.Point(467, 230) + Me.lblLinesToPreview.Location = New System.Drawing.Point(472, 230) Me.lblLinesToPreview.Name = "lblLinesToPreview" Me.lblLinesToPreview.Size = New System.Drawing.Size(88, 13) Me.lblLinesToPreview.TabIndex = 10 @@ -410,7 +702,7 @@ Partial Class dlgImportDataset 'cmdRefreshPreview ' Me.cmdRefreshPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdRefreshPreview.Location = New System.Drawing.Point(511, 412) + Me.cmdRefreshPreview.Location = New System.Drawing.Point(549, 412) Me.cmdRefreshPreview.Name = "cmdRefreshPreview" Me.cmdRefreshPreview.Size = New System.Drawing.Size(94, 23) Me.cmdRefreshPreview.TabIndex = 16 @@ -420,20 +712,34 @@ Partial Class dlgImportDataset 'grpText ' Me.grpText.Controls.Add(Me.ucrNudMaxRowsText) - Me.grpText.Controls.Add(Me.ucrChkMaxRowsText) - Me.grpText.Controls.Add(Me.ucrChkColumnNamesText) Me.grpText.Controls.Add(Me.lblMissingValueStringText) Me.grpText.Controls.Add(Me.ucrNudRowsToSkipText) Me.grpText.Controls.Add(Me.ucrInputMissingValueStringText) Me.grpText.Controls.Add(Me.lblLinesToSkipText) - Me.grpText.Location = New System.Drawing.Point(9, 99) + Me.grpText.Controls.Add(Me.ucrChkColumnNamesText) + Me.grpText.Controls.Add(Me.ucrChkMaxRowsText) + Me.grpText.Location = New System.Drawing.Point(9, 93) Me.grpText.Name = "grpText" - Me.grpText.Size = New System.Drawing.Size(239, 132) + Me.grpText.Size = New System.Drawing.Size(256, 132) Me.grpText.TabIndex = 17 Me.grpText.TabStop = False Me.grpText.Text = "Import Text Options" Me.grpText.Visible = False ' + 'ucrNudMaxRowsText + ' + Me.ucrNudMaxRowsText.AutoSize = True + Me.ucrNudMaxRowsText.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxRowsText.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMaxRowsText.Location = New System.Drawing.Point(168, 104) + Me.ucrNudMaxRowsText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudMaxRowsText.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMaxRowsText.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMaxRowsText.Name = "ucrNudMaxRowsText" + Me.ucrNudMaxRowsText.Size = New System.Drawing.Size(62, 20) + Me.ucrNudMaxRowsText.TabIndex = 12 + Me.ucrNudMaxRowsText.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' 'lblMissingValueStringText ' Me.lblMissingValueStringText.AutoSize = True @@ -444,6 +750,32 @@ Partial Class dlgImportDataset Me.lblMissingValueStringText.TabIndex = 12 Me.lblMissingValueStringText.Text = "Missing Value String:" ' + 'ucrNudRowsToSkipText + ' + Me.ucrNudRowsToSkipText.AutoSize = True + Me.ucrNudRowsToSkipText.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowsToSkipText.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudRowsToSkipText.Location = New System.Drawing.Point(118, 74) + Me.ucrNudRowsToSkipText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrNudRowsToSkipText.Maximum = New Decimal(New Integer() {1000000, 0, 0, 0}) + Me.ucrNudRowsToSkipText.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudRowsToSkipText.Name = "ucrNudRowsToSkipText" + Me.ucrNudRowsToSkipText.Size = New System.Drawing.Size(63, 20) + Me.ucrNudRowsToSkipText.TabIndex = 15 + Me.ucrNudRowsToSkipText.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputMissingValueStringText + ' + Me.ucrInputMissingValueStringText.AddQuotesIfUnrecognised = True + Me.ucrInputMissingValueStringText.AutoSize = True + Me.ucrInputMissingValueStringText.IsMultiline = False + Me.ucrInputMissingValueStringText.IsReadOnly = False + Me.ucrInputMissingValueStringText.Location = New System.Drawing.Point(138, 44) + Me.ucrInputMissingValueStringText.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputMissingValueStringText.Name = "ucrInputMissingValueStringText" + Me.ucrInputMissingValueStringText.Size = New System.Drawing.Size(112, 21) + Me.ucrInputMissingValueStringText.TabIndex = 13 + ' 'lblLinesToSkipText ' Me.lblLinesToSkipText.AutoSize = True @@ -454,6 +786,26 @@ Partial Class dlgImportDataset Me.lblLinesToSkipText.TabIndex = 14 Me.lblLinesToSkipText.Text = "Lines To Skip:" ' + 'ucrChkColumnNamesText + ' + Me.ucrChkColumnNamesText.AutoSize = True + Me.ucrChkColumnNamesText.Checked = False + Me.ucrChkColumnNamesText.Location = New System.Drawing.Point(8, 21) + Me.ucrChkColumnNamesText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkColumnNamesText.Name = "ucrChkColumnNamesText" + Me.ucrChkColumnNamesText.Size = New System.Drawing.Size(206, 23) + Me.ucrChkColumnNamesText.TabIndex = 17 + ' + 'ucrChkMaxRowsText + ' + Me.ucrChkMaxRowsText.AutoSize = True + Me.ucrChkMaxRowsText.Checked = False + Me.ucrChkMaxRowsText.Location = New System.Drawing.Point(8, 104) + Me.ucrChkMaxRowsText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkMaxRowsText.Name = "ucrChkMaxRowsText" + Me.ucrChkMaxRowsText.Size = New System.Drawing.Size(173, 23) + Me.ucrChkMaxRowsText.TabIndex = 21 + ' 'rdoSeparatortext ' Me.rdoSeparatortext.Appearance = System.Windows.Forms.Appearance.Button @@ -510,7 +862,7 @@ Partial Class dlgImportDataset Me.clbSheets.CheckOnClick = True Me.clbSheets.FormattingEnabled = True Me.clbSheets.HorizontalScrollbar = True - Me.clbSheets.Location = New System.Drawing.Point(267, 94) + Me.clbSheets.Location = New System.Drawing.Point(307, 93) Me.clbSheets.Name = "clbSheets" Me.clbSheets.Size = New System.Drawing.Size(255, 124) Me.clbSheets.TabIndex = 26 @@ -519,7 +871,7 @@ Partial Class dlgImportDataset ' Me.lblSelectSheets.AutoSize = True Me.lblSelectSheets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelectSheets.Location = New System.Drawing.Point(267, 50) + Me.lblSelectSheets.Location = New System.Drawing.Point(350, 50) Me.lblSelectSheets.Name = "lblSelectSheets" Me.lblSelectSheets.Size = New System.Drawing.Size(76, 13) Me.lblSelectSheets.TabIndex = 27 @@ -530,7 +882,7 @@ Partial Class dlgImportDataset ' Me.lblImportingSheets.Font = New System.Drawing.Font("Microsoft Sans Serif", 11.25!) Me.lblImportingSheets.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblImportingSheets.Location = New System.Drawing.Point(267, 263) + Me.lblImportingSheets.Location = New System.Drawing.Point(308, 263) Me.lblImportingSheets.Name = "lblImportingSheets" Me.lblImportingSheets.Size = New System.Drawing.Size(338, 114) Me.lblImportingSheets.TabIndex = 28 @@ -548,100 +900,21 @@ Partial Class dlgImportDataset Me.cmdStepBack.TabIndex = 32 Me.cmdStepBack.UseVisualStyleBackColor = True ' - 'ucrChkDropEmptyCols - ' - Me.ucrChkDropEmptyCols.AutoSize = True - Me.ucrChkDropEmptyCols.Checked = False - Me.ucrChkDropEmptyCols.Location = New System.Drawing.Point(8, 377) - Me.ucrChkDropEmptyCols.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkDropEmptyCols.Name = "ucrChkDropEmptyCols" - Me.ucrChkDropEmptyCols.Size = New System.Drawing.Size(250, 23) - Me.ucrChkDropEmptyCols.TabIndex = 31 - ' 'ucrChkMultipleFiles ' Me.ucrChkMultipleFiles.AutoSize = True Me.ucrChkMultipleFiles.Checked = False - Me.ucrChkMultipleFiles.Location = New System.Drawing.Point(470, 20) + Me.ucrChkMultipleFiles.Location = New System.Drawing.Point(472, 19) Me.ucrChkMultipleFiles.Name = "ucrChkMultipleFiles" - Me.ucrChkMultipleFiles.Size = New System.Drawing.Size(132, 23) + Me.ucrChkMultipleFiles.Size = New System.Drawing.Size(173, 23) Me.ucrChkMultipleFiles.TabIndex = 30 ' - 'ucrSaveFile - ' - Me.ucrSaveFile.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveFile.Location = New System.Drawing.Point(9, 412) - Me.ucrSaveFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveFile.Name = "ucrSaveFile" - Me.ucrSaveFile.Size = New System.Drawing.Size(410, 22) - Me.ucrSaveFile.TabIndex = 29 - ' - 'ucrNudMaxRowsText - ' - Me.ucrNudMaxRowsText.AutoSize = True - Me.ucrNudMaxRowsText.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaxRowsText.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxRowsText.Location = New System.Drawing.Point(168, 104) - Me.ucrNudMaxRowsText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudMaxRowsText.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMaxRowsText.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaxRowsText.Name = "ucrNudMaxRowsText" - Me.ucrNudMaxRowsText.Size = New System.Drawing.Size(62, 20) - Me.ucrNudMaxRowsText.TabIndex = 12 - Me.ucrNudMaxRowsText.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkMaxRowsText - ' - Me.ucrChkMaxRowsText.AutoSize = True - Me.ucrChkMaxRowsText.Checked = False - Me.ucrChkMaxRowsText.Location = New System.Drawing.Point(8, 104) - Me.ucrChkMaxRowsText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkMaxRowsText.Name = "ucrChkMaxRowsText" - Me.ucrChkMaxRowsText.Size = New System.Drawing.Size(173, 23) - Me.ucrChkMaxRowsText.TabIndex = 21 - ' - 'ucrChkColumnNamesText - ' - Me.ucrChkColumnNamesText.AutoSize = True - Me.ucrChkColumnNamesText.Checked = False - Me.ucrChkColumnNamesText.Location = New System.Drawing.Point(8, 21) - Me.ucrChkColumnNamesText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkColumnNamesText.Name = "ucrChkColumnNamesText" - Me.ucrChkColumnNamesText.Size = New System.Drawing.Size(206, 23) - Me.ucrChkColumnNamesText.TabIndex = 17 - ' - 'ucrNudRowsToSkipText - ' - Me.ucrNudRowsToSkipText.AutoSize = True - Me.ucrNudRowsToSkipText.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToSkipText.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRowsToSkipText.Location = New System.Drawing.Point(118, 74) - Me.ucrNudRowsToSkipText.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudRowsToSkipText.Maximum = New Decimal(New Integer() {1000000, 0, 0, 0}) - Me.ucrNudRowsToSkipText.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToSkipText.Name = "ucrNudRowsToSkipText" - Me.ucrNudRowsToSkipText.Size = New System.Drawing.Size(63, 20) - Me.ucrNudRowsToSkipText.TabIndex = 15 - Me.ucrNudRowsToSkipText.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputMissingValueStringText - ' - Me.ucrInputMissingValueStringText.AddQuotesIfUnrecognised = True - Me.ucrInputMissingValueStringText.AutoSize = True - Me.ucrInputMissingValueStringText.IsMultiline = False - Me.ucrInputMissingValueStringText.IsReadOnly = False - Me.ucrInputMissingValueStringText.Location = New System.Drawing.Point(118, 44) - Me.ucrInputMissingValueStringText.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputMissingValueStringText.Name = "ucrInputMissingValueStringText" - Me.ucrInputMissingValueStringText.Size = New System.Drawing.Size(112, 21) - Me.ucrInputMissingValueStringText.TabIndex = 13 - ' 'ucrNudPreviewLines ' Me.ucrNudPreviewLines.AutoSize = True Me.ucrNudPreviewLines.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudPreviewLines.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudPreviewLines.Location = New System.Drawing.Point(555, 227) + Me.ucrNudPreviewLines.Location = New System.Drawing.Point(595, 227) Me.ucrNudPreviewLines.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrNudPreviewLines.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudPreviewLines.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) @@ -658,365 +931,92 @@ Partial Class dlgImportDataset Me.ucrPanelFixedWidthText.Size = New System.Drawing.Size(253, 45) Me.ucrPanelFixedWidthText.TabIndex = 22 ' - 'ucrChkRange - ' - Me.ucrChkRange.AutoSize = True - Me.ucrChkRange.Checked = False - Me.ucrChkRange.Location = New System.Drawing.Point(8, 139) - Me.ucrChkRange.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkRange.Name = "ucrChkRange" - Me.ucrChkRange.Size = New System.Drawing.Size(170, 23) - Me.ucrChkRange.TabIndex = 7 + 'ucrInputFilePath ' - 'ucrInputTextTo + Me.ucrInputFilePath.AddQuotesIfUnrecognised = True + Me.ucrInputFilePath.AutoSize = True + Me.ucrInputFilePath.IsMultiline = False + Me.ucrInputFilePath.IsReadOnly = False + Me.ucrInputFilePath.Location = New System.Drawing.Point(63, 17) + Me.ucrInputFilePath.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) + Me.ucrInputFilePath.Name = "ucrInputFilePath" + Me.ucrInputFilePath.RightToLeft = System.Windows.Forms.RightToLeft.Yes + Me.ucrInputFilePath.Size = New System.Drawing.Size(336, 21) + Me.ucrInputFilePath.TabIndex = 1 ' - Me.ucrInputTextTo.AddQuotesIfUnrecognised = True - Me.ucrInputTextTo.AutoSize = True - Me.ucrInputTextTo.IsMultiline = False - Me.ucrInputTextTo.IsReadOnly = False - Me.ucrInputTextTo.Location = New System.Drawing.Point(109, 184) - Me.ucrInputTextTo.Name = "ucrInputTextTo" - Me.ucrInputTextTo.Size = New System.Drawing.Size(62, 20) - Me.ucrInputTextTo.TabIndex = 30 - ' - 'ucrInputTextFrom - ' - Me.ucrInputTextFrom.AddQuotesIfUnrecognised = True - Me.ucrInputTextFrom.AutoSize = True - Me.ucrInputTextFrom.IsMultiline = False - Me.ucrInputTextFrom.IsReadOnly = False - Me.ucrInputTextFrom.Location = New System.Drawing.Point(8, 183) - Me.ucrInputTextFrom.Name = "ucrInputTextFrom" - Me.ucrInputTextFrom.Size = New System.Drawing.Size(62, 20) - Me.ucrInputTextFrom.TabIndex = 29 - ' - 'ucrNudMaxRowsExcel - ' - Me.ucrNudMaxRowsExcel.AutoSize = True - Me.ucrNudMaxRowsExcel.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaxRowsExcel.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxRowsExcel.Location = New System.Drawing.Point(168, 214) - Me.ucrNudMaxRowsExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudMaxRowsExcel.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMaxRowsExcel.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaxRowsExcel.Name = "ucrNudMaxRowsExcel" - Me.ucrNudMaxRowsExcel.Size = New System.Drawing.Size(62, 20) - Me.ucrNudMaxRowsExcel.TabIndex = 13 - Me.ucrNudMaxRowsExcel.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkColumnNamesExcel - ' - Me.ucrChkColumnNamesExcel.AutoSize = True - Me.ucrChkColumnNamesExcel.Checked = False - Me.ucrChkColumnNamesExcel.Location = New System.Drawing.Point(8, 52) - Me.ucrChkColumnNamesExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkColumnNamesExcel.Name = "ucrChkColumnNamesExcel" - Me.ucrChkColumnNamesExcel.Size = New System.Drawing.Size(173, 23) - Me.ucrChkColumnNamesExcel.TabIndex = 11 - ' - 'ucrChkMaxRowsExcel - ' - Me.ucrChkMaxRowsExcel.AutoSize = True - Me.ucrChkMaxRowsExcel.Checked = False - Me.ucrChkMaxRowsExcel.Location = New System.Drawing.Point(8, 214) - Me.ucrChkMaxRowsExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkMaxRowsExcel.Name = "ucrChkMaxRowsExcel" - Me.ucrChkMaxRowsExcel.Size = New System.Drawing.Size(173, 23) - Me.ucrChkMaxRowsExcel.TabIndex = 9 - ' - 'ucrChkTrimWSExcel - ' - Me.ucrChkTrimWSExcel.AutoSize = True - Me.ucrChkTrimWSExcel.Checked = False - Me.ucrChkTrimWSExcel.Location = New System.Drawing.Point(8, 82) - Me.ucrChkTrimWSExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkTrimWSExcel.Name = "ucrChkTrimWSExcel" - Me.ucrChkTrimWSExcel.Size = New System.Drawing.Size(170, 23) - Me.ucrChkTrimWSExcel.TabIndex = 6 - ' - 'ucrNudRowsToSkipExcel - ' - Me.ucrNudRowsToSkipExcel.AutoSize = True - Me.ucrNudRowsToSkipExcel.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToSkipExcel.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRowsToSkipExcel.Location = New System.Drawing.Point(109, 110) - Me.ucrNudRowsToSkipExcel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudRowsToSkipExcel.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudRowsToSkipExcel.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToSkipExcel.Name = "ucrNudRowsToSkipExcel" - Me.ucrNudRowsToSkipExcel.Size = New System.Drawing.Size(62, 20) - Me.ucrNudRowsToSkipExcel.TabIndex = 8 - Me.ucrNudRowsToSkipExcel.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputMissingValueStringExcel - ' - Me.ucrInputMissingValueStringExcel.AddQuotesIfUnrecognised = True - Me.ucrInputMissingValueStringExcel.AutoSize = True - Me.ucrInputMissingValueStringExcel.IsMultiline = False - Me.ucrInputMissingValueStringExcel.IsReadOnly = False - Me.ucrInputMissingValueStringExcel.Location = New System.Drawing.Point(109, 25) - Me.ucrInputMissingValueStringExcel.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputMissingValueStringExcel.Name = "ucrInputMissingValueStringExcel" - Me.ucrInputMissingValueStringExcel.Size = New System.Drawing.Size(121, 21) - Me.ucrInputMissingValueStringExcel.TabIndex = 5 - ' - 'ucrInputNamedRegions - ' - Me.ucrInputNamedRegions.AddQuotesIfUnrecognised = True - Me.ucrInputNamedRegions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputNamedRegions.GetSetSelectedIndex = -1 - Me.ucrInputNamedRegions.IsReadOnly = False - Me.ucrInputNamedRegions.Location = New System.Drawing.Point(109, 25) - Me.ucrInputNamedRegions.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputNamedRegions.Name = "ucrInputNamedRegions" - Me.ucrInputNamedRegions.Size = New System.Drawing.Size(121, 21) - Me.ucrInputNamedRegions.TabIndex = 4 - ' - 'ucrChkOverwriteRDS - ' - Me.ucrChkOverwriteRDS.AutoSize = True - Me.ucrChkOverwriteRDS.Checked = False - Me.ucrChkOverwriteRDS.Location = New System.Drawing.Point(8, 175) - Me.ucrChkOverwriteRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkOverwriteRDS.Name = "ucrChkOverwriteRDS" - Me.ucrChkOverwriteRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkOverwriteRDS.TabIndex = 6 - ' - 'ucrChkImportObjectsRDS - ' - Me.ucrChkImportObjectsRDS.AutoSize = True - Me.ucrChkImportObjectsRDS.Checked = False - Me.ucrChkImportObjectsRDS.Location = New System.Drawing.Point(8, 71) - Me.ucrChkImportObjectsRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkImportObjectsRDS.Name = "ucrChkImportObjectsRDS" - Me.ucrChkImportObjectsRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkImportObjectsRDS.TabIndex = 2 - ' - 'ucrChkImportCalculationsRDS - ' - Me.ucrChkImportCalculationsRDS.AutoSize = True - Me.ucrChkImportCalculationsRDS.Checked = False - Me.ucrChkImportCalculationsRDS.Location = New System.Drawing.Point(8, 123) - Me.ucrChkImportCalculationsRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkImportCalculationsRDS.Name = "ucrChkImportCalculationsRDS" - Me.ucrChkImportCalculationsRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkImportCalculationsRDS.TabIndex = 4 - ' - 'ucrChkImportChangesLogRDS - ' - Me.ucrChkImportChangesLogRDS.AutoSize = True - Me.ucrChkImportChangesLogRDS.Checked = False - Me.ucrChkImportChangesLogRDS.Location = New System.Drawing.Point(8, 149) - Me.ucrChkImportChangesLogRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkImportChangesLogRDS.Name = "ucrChkImportChangesLogRDS" - Me.ucrChkImportChangesLogRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkImportChangesLogRDS.TabIndex = 5 - ' - 'ucrChkImportFiltersRDS - ' - Me.ucrChkImportFiltersRDS.AutoSize = True - Me.ucrChkImportFiltersRDS.Checked = False - Me.ucrChkImportFiltersRDS.Location = New System.Drawing.Point(8, 97) - Me.ucrChkImportFiltersRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkImportFiltersRDS.Name = "ucrChkImportFiltersRDS" - Me.ucrChkImportFiltersRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkImportFiltersRDS.TabIndex = 3 - ' - 'ucrChkImportMetadataRDS - ' - Me.ucrChkImportMetadataRDS.AutoSize = True - Me.ucrChkImportMetadataRDS.Checked = False - Me.ucrChkImportMetadataRDS.Location = New System.Drawing.Point(8, 45) - Me.ucrChkImportMetadataRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkImportMetadataRDS.Name = "ucrChkImportMetadataRDS" - Me.ucrChkImportMetadataRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkImportMetadataRDS.TabIndex = 1 - ' - 'ucrChkKeepExistingDataRDS - ' - Me.ucrChkKeepExistingDataRDS.AutoSize = True - Me.ucrChkKeepExistingDataRDS.Checked = False - Me.ucrChkKeepExistingDataRDS.Location = New System.Drawing.Point(8, 21) - Me.ucrChkKeepExistingDataRDS.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkKeepExistingDataRDS.Name = "ucrChkKeepExistingDataRDS" - Me.ucrChkKeepExistingDataRDS.Size = New System.Drawing.Size(205, 23) - Me.ucrChkKeepExistingDataRDS.TabIndex = 0 - ' - 'ucrNudMaxRowsCSV - ' - Me.ucrNudMaxRowsCSV.AutoSize = True - Me.ucrNudMaxRowsCSV.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaxRowsCSV.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMaxRowsCSV.Location = New System.Drawing.Point(158, 237) - Me.ucrNudMaxRowsCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudMaxRowsCSV.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMaxRowsCSV.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMaxRowsCSV.Name = "ucrNudMaxRowsCSV" - Me.ucrNudMaxRowsCSV.Size = New System.Drawing.Size(70, 20) - Me.ucrNudMaxRowsCSV.TabIndex = 19 - Me.ucrNudMaxRowsCSV.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrChkMaxRowsCSV - ' - Me.ucrChkMaxRowsCSV.AutoSize = True - Me.ucrChkMaxRowsCSV.Checked = False - Me.ucrChkMaxRowsCSV.Location = New System.Drawing.Point(4, 237) - Me.ucrChkMaxRowsCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkMaxRowsCSV.Name = "ucrChkMaxRowsCSV" - Me.ucrChkMaxRowsCSV.Size = New System.Drawing.Size(173, 23) - Me.ucrChkMaxRowsCSV.TabIndex = 17 - ' - 'ucrChkStringsAsFactorsCSV - ' - Me.ucrChkStringsAsFactorsCSV.AutoSize = True - Me.ucrChkStringsAsFactorsCSV.Checked = False - Me.ucrChkStringsAsFactorsCSV.Location = New System.Drawing.Point(4, 180) - Me.ucrChkStringsAsFactorsCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrChkStringsAsFactorsCSV.Name = "ucrChkStringsAsFactorsCSV" - Me.ucrChkStringsAsFactorsCSV.Size = New System.Drawing.Size(206, 23) - Me.ucrChkStringsAsFactorsCSV.TabIndex = 16 - ' - 'ucrNudRowsToSkipCSV - ' - Me.ucrNudRowsToSkipCSV.AutoSize = True - Me.ucrNudRowsToSkipCSV.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToSkipCSV.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudRowsToSkipCSV.Location = New System.Drawing.Point(111, 207) - Me.ucrNudRowsToSkipCSV.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNudRowsToSkipCSV.Maximum = New Decimal(New Integer() {1000000, 0, 0, 0}) - Me.ucrNudRowsToSkipCSV.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudRowsToSkipCSV.Name = "ucrNudRowsToSkipCSV" - Me.ucrNudRowsToSkipCSV.Size = New System.Drawing.Size(70, 20) - Me.ucrNudRowsToSkipCSV.TabIndex = 15 - Me.ucrNudRowsToSkipCSV.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputHeadersCSV - ' - Me.ucrInputHeadersCSV.AddQuotesIfUnrecognised = True - Me.ucrInputHeadersCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputHeadersCSV.GetSetSelectedIndex = -1 - Me.ucrInputHeadersCSV.IsReadOnly = False - Me.ucrInputHeadersCSV.Location = New System.Drawing.Point(147, 52) - Me.ucrInputHeadersCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputHeadersCSV.Name = "ucrInputHeadersCSV" - Me.ucrInputHeadersCSV.Size = New System.Drawing.Size(81, 21) - Me.ucrInputHeadersCSV.TabIndex = 3 - ' - 'ucrInputMissingValueStringCSV - ' - Me.ucrInputMissingValueStringCSV.AddQuotesIfUnrecognised = True - Me.ucrInputMissingValueStringCSV.AutoSize = True - Me.ucrInputMissingValueStringCSV.IsMultiline = False - Me.ucrInputMissingValueStringCSV.IsReadOnly = False - Me.ucrInputMissingValueStringCSV.Location = New System.Drawing.Point(111, 145) - Me.ucrInputMissingValueStringCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputMissingValueStringCSV.Name = "ucrInputMissingValueStringCSV" - Me.ucrInputMissingValueStringCSV.Size = New System.Drawing.Size(117, 21) - Me.ucrInputMissingValueStringCSV.TabIndex = 13 - ' - 'ucrInputDecimalCSV - ' - Me.ucrInputDecimalCSV.AddQuotesIfUnrecognised = True - Me.ucrInputDecimalCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputDecimalCSV.GetSetSelectedIndex = -1 - Me.ucrInputDecimalCSV.IsReadOnly = False - Me.ucrInputDecimalCSV.Location = New System.Drawing.Point(71, 115) - Me.ucrInputDecimalCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputDecimalCSV.Name = "ucrInputDecimalCSV" - Me.ucrInputDecimalCSV.Size = New System.Drawing.Size(157, 21) - Me.ucrInputDecimalCSV.TabIndex = 11 - ' - 'ucrInputSeparatorCSV - ' - Me.ucrInputSeparatorCSV.AddQuotesIfUnrecognised = True - Me.ucrInputSeparatorCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSeparatorCSV.GetSetSelectedIndex = -1 - Me.ucrInputSeparatorCSV.IsReadOnly = False - Me.ucrInputSeparatorCSV.Location = New System.Drawing.Point(71, 83) - Me.ucrInputSeparatorCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputSeparatorCSV.Name = "ucrInputSeparatorCSV" - Me.ucrInputSeparatorCSV.Size = New System.Drawing.Size(157, 21) - Me.ucrInputSeparatorCSV.TabIndex = 9 - ' - 'ucrInputEncodingCSV - ' - Me.ucrInputEncodingCSV.AddQuotesIfUnrecognised = True - Me.ucrInputEncodingCSV.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputEncodingCSV.GetSetSelectedIndex = -1 - Me.ucrInputEncodingCSV.IsReadOnly = False - Me.ucrInputEncodingCSV.Location = New System.Drawing.Point(71, 20) - Me.ucrInputEncodingCSV.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputEncodingCSV.Name = "ucrInputEncodingCSV" - Me.ucrInputEncodingCSV.Size = New System.Drawing.Size(157, 21) - Me.ucrInputEncodingCSV.TabIndex = 1 - ' - 'ucrInputFilePath - ' - Me.ucrInputFilePath.AddQuotesIfUnrecognised = True - Me.ucrInputFilePath.AutoSize = True - Me.ucrInputFilePath.IsMultiline = False - Me.ucrInputFilePath.IsReadOnly = False - Me.ucrInputFilePath.Location = New System.Drawing.Point(45, 17) - Me.ucrInputFilePath.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) - Me.ucrInputFilePath.Name = "ucrInputFilePath" - Me.ucrInputFilePath.RightToLeft = System.Windows.Forms.RightToLeft.Yes - Me.ucrInputFilePath.Size = New System.Drawing.Size(352, 21) - Me.ucrInputFilePath.TabIndex = 1 - ' - 'ucrBase + 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(9, 445) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) 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 = 15 ' 'ucrChkSheetsCheckAll ' Me.ucrChkSheetsCheckAll.AutoSize = True Me.ucrChkSheetsCheckAll.Checked = False - Me.ucrChkSheetsCheckAll.Location = New System.Drawing.Point(270, 66) + Me.ucrChkSheetsCheckAll.Location = New System.Drawing.Point(348, 66) Me.ucrChkSheetsCheckAll.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrChkSheetsCheckAll.Name = "ucrChkSheetsCheckAll" Me.ucrChkSheetsCheckAll.Size = New System.Drawing.Size(129, 23) Me.ucrChkSheetsCheckAll.TabIndex = 22 ' + 'ucrChkDropEmptyCols + ' + Me.ucrChkDropEmptyCols.AutoSize = True + Me.ucrChkDropEmptyCols.Checked = False + Me.ucrChkDropEmptyCols.Location = New System.Drawing.Point(8, 377) + Me.ucrChkDropEmptyCols.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrChkDropEmptyCols.Name = "ucrChkDropEmptyCols" + Me.ucrChkDropEmptyCols.Size = New System.Drawing.Size(274, 23) + Me.ucrChkDropEmptyCols.TabIndex = 31 + ' + 'ucrSaveFile + ' + Me.ucrSaveFile.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveFile.Location = New System.Drawing.Point(9, 412) + Me.ucrSaveFile.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveFile.Name = "ucrSaveFile" + Me.ucrSaveFile.Size = New System.Drawing.Size(510, 22) + Me.ucrSaveFile.TabIndex = 29 + ' 'dlgImportDataset ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.ClientSize = New System.Drawing.Size(629, 502) + Me.ClientSize = New System.Drawing.Size(660, 502) Me.Controls.Add(Me.cmdStepBack) - Me.Controls.Add(Me.ucrChkDropEmptyCols) Me.Controls.Add(Me.ucrChkMultipleFiles) - Me.Controls.Add(Me.ucrSaveFile) - Me.Controls.Add(Me.lblImportingSheets) Me.Controls.Add(Me.lblSelectSheets) Me.Controls.Add(Me.clbSheets) Me.Controls.Add(Me.rdoFixedWidthWhiteSpacesText) Me.Controls.Add(Me.rdoSeparatortext) Me.Controls.Add(Me.rdoFixedWidthText) - Me.Controls.Add(Me.grpText) Me.Controls.Add(Me.cmdRefreshPreview) Me.Controls.Add(Me.lblLinesToPreview) Me.Controls.Add(Me.ucrNudPreviewLines) Me.Controls.Add(Me.ucrPanelFixedWidthText) - Me.Controls.Add(Me.grpExcel) - Me.Controls.Add(Me.grpRDS) Me.Controls.Add(Me.lblNoPreview) - Me.Controls.Add(Me.grpCSV) Me.Controls.Add(Me.ucrInputFilePath) Me.Controls.Add(Me.lblCannotImport) Me.Controls.Add(Me.cmdBrowse) Me.Controls.Add(Me.lblFileOpenPath) - Me.Controls.Add(Me.grdDataPreview) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.txtTextFilePreview) Me.Controls.Add(Me.lblDataFrame) Me.Controls.Add(Me.lblTextFilePreview) Me.Controls.Add(Me.ucrChkSheetsCheckAll) + Me.Controls.Add(Me.ucrChkDropEmptyCols) + Me.Controls.Add(Me.ucrSaveFile) + Me.Controls.Add(Me.grpText) + Me.Controls.Add(Me.grpExcel) + Me.Controls.Add(Me.grpRDS) + Me.Controls.Add(Me.grpCSV) + Me.Controls.Add(Me.grdDataPreview) + Me.Controls.Add(Me.lblImportingSheets) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -1053,7 +1053,6 @@ Partial Class dlgImportDataset Friend WithEvents grpExcel As GroupBox Friend WithEvents lblRowToSkipExcel As Label Friend WithEvents lblNamedRegion As Label - Friend WithEvents ucrInputNamedRegions As ucrInputComboBox Friend WithEvents lblCannotImport As Label Friend WithEvents ucrInputFilePath As ucrInputTextBox Friend WithEvents ucrInputEncodingCSV As ucrInputComboBox @@ -1111,4 +1110,5 @@ Partial Class dlgImportDataset Friend WithEvents ucrChkDropEmptyCols As ucrCheck Friend WithEvents cmdStepBack As Button Friend WithEvents ttCmdStepBack As ToolTip + Friend WithEvents ucrInputNamedRegions As ucrInputComboBox End Class diff --git a/instat/dlgImportShapeFiles.Designer.vb b/instat/dlgImportShapeFiles.Designer.vb index f9d4fe7f0ed..c7bdb85d72f 100644 --- a/instat/dlgImportShapeFiles.Designer.vb +++ b/instat/dlgImportShapeFiles.Designer.vb @@ -33,18 +33,17 @@ Partial Class dlgImportShapeFiles ' 'lblFile ' - Me.lblFile.AutoSize = True Me.lblFile.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.lblFile.Location = New System.Drawing.Point(7, 23) Me.lblFile.Name = "lblFile" - Me.lblFile.Size = New System.Drawing.Size(26, 13) + Me.lblFile.Size = New System.Drawing.Size(41, 14) Me.lblFile.TabIndex = 0 Me.lblFile.Text = "File:" ' 'cmdBrowse ' Me.cmdBrowse.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBrowse.Location = New System.Drawing.Point(291, 18) + Me.cmdBrowse.Location = New System.Drawing.Point(291, 17) Me.cmdBrowse.Name = "cmdBrowse" Me.cmdBrowse.Size = New System.Drawing.Size(122, 23) Me.cmdBrowse.TabIndex = 2 @@ -87,7 +86,7 @@ Partial Class dlgImportShapeFiles Me.ucrBase.Location = New System.Drawing.Point(7, 120) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) 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 = 6 ' 'ucrInputFilePath @@ -96,10 +95,10 @@ Partial Class dlgImportShapeFiles Me.ucrInputFilePath.AutoSize = True Me.ucrInputFilePath.IsMultiline = False Me.ucrInputFilePath.IsReadOnly = False - Me.ucrInputFilePath.Location = New System.Drawing.Point(49, 18) + Me.ucrInputFilePath.Location = New System.Drawing.Point(52, 18) Me.ucrInputFilePath.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputFilePath.Name = "ucrInputFilePath" - Me.ucrInputFilePath.Size = New System.Drawing.Size(239, 23) + Me.ucrInputFilePath.Size = New System.Drawing.Size(236, 23) Me.ucrInputFilePath.TabIndex = 1 ' 'dlgImportShapeFiles diff --git a/instat/dlgMakeDate.Designer.vb b/instat/dlgMakeDate.Designer.vb index 6dfc08855ab..81f91a36f60 100644 --- a/instat/dlgMakeDate.Designer.vb +++ b/instat/dlgMakeDate.Designer.vb @@ -41,6 +41,7 @@ Partial Class dlgMakeDate Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgMakeDate)) Me.grpTwoColumns = New System.Windows.Forms.GroupBox() + Me.lblTypicalLength = New System.Windows.Forms.Label() Me.ucrChkTwoDigitYear = New instat.ucrCheck() Me.ucrNudCutoff = New instat.ucrNud() Me.lblCutOffTwo = New System.Windows.Forms.Label() @@ -103,7 +104,6 @@ Partial Class dlgMakeDate Me.ucrSaveDate = New instat.ucrSave() Me.ucrBase = New instat.ucrButtons() Me.ucrSelectorMakeDate = New instat.ucrSelectorByDataFrameAddRemove() - Me.lblTypicalLength = New System.Windows.Forms.Label() Me.grpTwoColumns.SuspendLayout() Me.grpSingleColumn.SuspendLayout() Me.grpFormats.SuspendLayout() @@ -129,13 +129,23 @@ Partial Class dlgMakeDate Me.grpTwoColumns.TabStop = False Me.grpTwoColumns.Text = "Two Columns" ' + 'lblTypicalLength + ' + Me.lblTypicalLength.AutoSize = True + Me.lblTypicalLength.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTypicalLength.Location = New System.Drawing.Point(130, 95) + Me.lblTypicalLength.Name = "lblTypicalLength" + Me.lblTypicalLength.Size = New System.Drawing.Size(111, 13) + Me.lblTypicalLength.TabIndex = 12 + Me.lblTypicalLength.Text = "No. of Days in a Year:" + ' 'ucrChkTwoDigitYear ' Me.ucrChkTwoDigitYear.AutoSize = True Me.ucrChkTwoDigitYear.Checked = False Me.ucrChkTwoDigitYear.Location = New System.Drawing.Point(133, 34) Me.ucrChkTwoDigitYear.Name = "ucrChkTwoDigitYear" - Me.ucrChkTwoDigitYear.Size = New System.Drawing.Size(88, 23) + Me.ucrChkTwoDigitYear.Size = New System.Drawing.Size(128, 23) Me.ucrChkTwoDigitYear.TabIndex = 2 ' 'ucrNudCutoff @@ -852,7 +862,7 @@ Partial Class dlgMakeDate Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrBase.Location = New System.Drawing.Point(10, 422) 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 = 11 ' 'ucrSelectorMakeDate @@ -867,16 +877,6 @@ Partial Class dlgMakeDate Me.ucrSelectorMakeDate.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorMakeDate.TabIndex = 4 ' - 'lblTypicalLength - ' - Me.lblTypicalLength.AutoSize = True - Me.lblTypicalLength.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblTypicalLength.Location = New System.Drawing.Point(130, 95) - Me.lblTypicalLength.Name = "lblTypicalLength" - Me.lblTypicalLength.Size = New System.Drawing.Size(111, 13) - Me.lblTypicalLength.TabIndex = 12 - Me.lblTypicalLength.Text = "No. of Days in a Year:" - ' 'dlgMakeDate ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) diff --git a/instat/dlgPICSARainfall.Designer.vb b/instat/dlgPICSARainfall.Designer.vb index f29ef0b9b0d..b10e43b5f27 100644 --- a/instat/dlgPICSARainfall.Designer.vb +++ b/instat/dlgPICSARainfall.Designer.vb @@ -100,7 +100,7 @@ Partial Class dlgPICSARainfall Me.cmdPICSAOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.cmdPICSAOptions.Location = New System.Drawing.Point(9, 195) Me.cmdPICSAOptions.Name = "cmdPICSAOptions" - Me.cmdPICSAOptions.Size = New System.Drawing.Size(126, 23) + Me.cmdPICSAOptions.Size = New System.Drawing.Size(151, 23) Me.cmdPICSAOptions.TabIndex = 12 Me.cmdPICSAOptions.Tag = "" Me.cmdPICSAOptions.Text = "PICSA Options" @@ -223,9 +223,9 @@ Partial Class dlgPICSARainfall ' Me.cmdOptions.AutoSize = True Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions - Me.cmdOptions.Location = New System.Drawing.Point(9, 223) + Me.cmdOptions.Location = New System.Drawing.Point(9, 219) Me.cmdOptions.Name = "cmdOptions" - Me.cmdOptions.Size = New System.Drawing.Size(126, 23) + Me.cmdOptions.Size = New System.Drawing.Size(151, 23) Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions Me.cmdOptions.TabIndex = 13 Me.cmdOptions.Tag = "Plot Options" diff --git a/instat/sdgPICSARainfallGraph.Designer.vb b/instat/sdgPICSARainfallGraph.Designer.vb index 93d2929c53b..093e3feff17 100644 --- a/instat/sdgPICSARainfallGraph.Designer.vb +++ b/instat/sdgPICSARainfallGraph.Designer.vb @@ -1,27 +1,27 @@  -Partial Class sdgPICSARainfallGraph - Inherits System.Windows.Forms.Form - - 'Form overrides dispose to clean up the component list. +Partial Class sdgPICSARainfallGraph + 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. + 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() + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.lblXTo = New System.Windows.Forms.Label() Me.lblXFrom = New System.Windows.Forms.Label() @@ -1299,6 +1299,7 @@ Partial Class sdgPICSARainfallGraph ' Me.lblTercilesLineType.AutoSize = True Me.lblTercilesLineType.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblTercilesLineType.Location = New System.Drawing.Point(358, 148) Me.lblTercilesLineType.Location = New System.Drawing.Point(370, 144) Me.lblTercilesLineType.Name = "lblTercilesLineType" Me.lblTercilesLineType.Size = New System.Drawing.Size(63, 13) @@ -1319,6 +1320,7 @@ Partial Class sdgPICSARainfallGraph ' Me.lblMedianLineType.AutoSize = True Me.lblMedianLineType.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMedianLineType.Location = New System.Drawing.Point(358, 78) Me.lblMedianLineType.Location = New System.Drawing.Point(370, 78) Me.lblMedianLineType.Name = "lblMedianLineType" Me.lblMedianLineType.Size = New System.Drawing.Size(63, 13) @@ -1339,6 +1341,7 @@ Partial Class sdgPICSARainfallGraph ' Me.lblMeanLineType.AutoSize = True Me.lblMeanLineType.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMeanLineType.Location = New System.Drawing.Point(358, 13) Me.lblMeanLineType.Location = New System.Drawing.Point(370, 10) Me.lblMeanLineType.Name = "lblMeanLineType" Me.lblMeanLineType.Size = New System.Drawing.Size(63, 13) @@ -1393,6 +1396,7 @@ Partial Class sdgPICSARainfallGraph Me.ucrInputTercilesLabelType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputTercilesLabelType.GetSetSelectedIndex = -1 Me.ucrInputTercilesLabelType.IsReadOnly = False + Me.ucrInputTercilesLabelType.Location = New System.Drawing.Point(477, 144) Me.ucrInputTercilesLabelType.Location = New System.Drawing.Point(480, 140) Me.ucrInputTercilesLabelType.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputTercilesLabelType.Name = "ucrInputTercilesLabelType" @@ -1417,6 +1421,7 @@ Partial Class sdgPICSARainfallGraph Me.ucrInputMedianLabelType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputMedianLabelType.GetSetSelectedIndex = -1 Me.ucrInputMedianLabelType.IsReadOnly = False + Me.ucrInputMedianLabelType.Location = New System.Drawing.Point(477, 74) Me.ucrInputMedianLabelType.Location = New System.Drawing.Point(476, 70) Me.ucrInputMedianLabelType.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputMedianLabelType.Name = "ucrInputMedianLabelType" @@ -1439,6 +1444,7 @@ Partial Class sdgPICSARainfallGraph ' Me.ucrChkAddTercilesLabel.AutoSize = True Me.ucrChkAddTercilesLabel.Checked = False + Me.ucrChkAddTercilesLabel.Location = New System.Drawing.Point(210, 144) Me.ucrChkAddTercilesLabel.Location = New System.Drawing.Point(216, 140) Me.ucrChkAddTercilesLabel.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkAddTercilesLabel.Name = "ucrChkAddTercilesLabel" @@ -1449,6 +1455,7 @@ Partial Class sdgPICSARainfallGraph ' Me.ucrChkAddMedianLabel.AutoSize = True Me.ucrChkAddMedianLabel.Checked = False + Me.ucrChkAddMedianLabel.Location = New System.Drawing.Point(210, 75) Me.ucrChkAddMedianLabel.Location = New System.Drawing.Point(216, 71) Me.ucrChkAddMedianLabel.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkAddMedianLabel.Name = "ucrChkAddMedianLabel" @@ -1461,6 +1468,7 @@ Partial Class sdgPICSARainfallGraph Me.ucrInputMeanLabelType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputMeanLabelType.GetSetSelectedIndex = -1 Me.ucrInputMeanLabelType.IsReadOnly = False + Me.ucrInputMeanLabelType.Location = New System.Drawing.Point(477, 9) Me.ucrInputMeanLabelType.Location = New System.Drawing.Point(476, 9) Me.ucrInputMeanLabelType.Margin = New System.Windows.Forms.Padding(7, 6, 7, 6) Me.ucrInputMeanLabelType.Name = "ucrInputMeanLabelType" @@ -1474,6 +1482,7 @@ Partial Class sdgPICSARainfallGraph Me.ucrChkAddMean.Location = New System.Drawing.Point(5, 10) Me.ucrChkAddMean.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkAddMean.Name = "ucrChkAddMean" + Me.ucrChkAddMean.Size = New System.Drawing.Size(200, 23) Me.ucrChkAddMean.Size = New System.Drawing.Size(204, 23) Me.ucrChkAddMean.TabIndex = 1 ' @@ -1481,6 +1490,7 @@ Partial Class sdgPICSARainfallGraph ' Me.ucrChkAddMeanLabel.AutoSize = True Me.ucrChkAddMeanLabel.Checked = False + Me.ucrChkAddMeanLabel.Location = New System.Drawing.Point(210, 10) Me.ucrChkAddMeanLabel.Location = New System.Drawing.Point(216, 10) Me.ucrChkAddMeanLabel.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkAddMeanLabel.Name = "ucrChkAddMeanLabel" @@ -1494,6 +1504,7 @@ Partial Class sdgPICSARainfallGraph Me.ucrChkAddMedian.Location = New System.Drawing.Point(5, 74) Me.ucrChkAddMedian.Margin = New System.Windows.Forms.Padding(5) Me.ucrChkAddMedian.Name = "ucrChkAddMedian" + Me.ucrChkAddMedian.Size = New System.Drawing.Size(200, 23) Me.ucrChkAddMedian.Size = New System.Drawing.Size(204, 23) Me.ucrChkAddMedian.TabIndex = 1 ' @@ -2159,20 +2170,20 @@ Partial Class sdgPICSARainfallGraph Me.ResumeLayout(False) Me.PerformLayout() - End Sub - - Friend WithEvents ucrSdgPICSARainfalbuttons As ucrButtonsSubdialogue - Friend WithEvents ucrChkAddMean As ucrCheck - Friend WithEvents ucrChkAddMedian As ucrCheck - Friend WithEvents ucrChkAddTerciles As ucrCheck - Friend WithEvents ucrNudXAxisAngle As ucrNud - Friend WithEvents ucrNudXaxisLabelSize As ucrNud - Friend WithEvents lblXTo As Label - Friend WithEvents lblXFrom As Label - Friend WithEvents lblXInStepsOf As Label - Friend WithEvents ucrInputXFrom As ucrInputTextBox - Friend WithEvents ucrInputXTo As ucrInputTextBox - Friend WithEvents ucrInputXInStepsOf As ucrInputTextBox + End Sub + + Friend WithEvents ucrSdgPICSARainfalbuttons As ucrButtonsSubdialogue + Friend WithEvents ucrChkAddMean As ucrCheck + Friend WithEvents ucrChkAddMedian As ucrCheck + Friend WithEvents ucrChkAddTerciles As ucrCheck + Friend WithEvents ucrNudXAxisAngle As ucrNud + Friend WithEvents ucrNudXaxisLabelSize As ucrNud + Friend WithEvents lblXTo As Label + Friend WithEvents lblXFrom As Label + Friend WithEvents lblXInStepsOf As Label + Friend WithEvents ucrInputXFrom As ucrInputTextBox + Friend WithEvents ucrInputXTo As ucrInputTextBox + Friend WithEvents ucrInputXInStepsOf As ucrInputTextBox Friend WithEvents tbPICSA As TabControl Friend WithEvents tpTitles As TabPage Friend WithEvents tpXAxis As TabPage @@ -2321,4 +2332,4 @@ Partial Class sdgPICSARainfallGraph Friend WithEvents lblLabelXCor As Label Friend WithEvents lblLabelYCor As Label Friend WithEvents lblLabelXReg As Label -End Class +End Class diff --git a/instat/sdgPICSARainfallGraph.vb b/instat/sdgPICSARainfallGraph.vb index db6648e5a70..adf29b6b0e5 100644 --- a/instat/sdgPICSARainfallGraph.vb +++ b/instat/sdgPICSARainfallGraph.vb @@ -1384,10 +1384,13 @@ Public Class sdgPICSARainfallGraph Select Case dlgPICSARainfall.enumPICSAMode Case dlgPICSARainfall.PICSAMode.Temperature + Me.Text = "PICSA Temperature Graphs" tbPICSA.TabPages.Add(tbPageSlope) Case dlgPICSARainfall.PICSAMode.Rainfall + Me.Text = "PICSA Rainfall Graphs" tbPICSA.TabPages.Add(tbPageLines) Case dlgPICSARainfall.PICSAMode.General + Me.Text = "PICSA General Graphs" tbPICSA.TabPages.Add(tbPageLines) tbPICSA.TabPages.Add(tbPageSlope) End Select diff --git a/instat/translations/en/r_instat_not_menus.json b/instat/translations/en/r_instat_not_menus.json index e550882d8b2..8ddc8cdc0b2 100644 --- a/instat/translations/en/r_instat_not_menus.json +++ b/instat/translations/en/r_instat_not_menus.json @@ -401,7 +401,7 @@ "Column Selection": "Column Selection", "Column Statistics": "Column Statistics", "Column Structure": "Column Structure", - "Column Type:": "Column Type", + "Column Type:": "Column Type:", "Column Variable(s) (Factor):": "Column Variable(s) (Factor):", "Column Width:": "Column Width:", "Column to Duplicate:": "Column to Duplicate:", @@ -755,6 +755,7 @@ "Drop Unused Levels": "Drop Unused Levels", "Drop empty factor levels": "Drop empty factor levels", "Dry Month": "Dry Month", + "Drop Empty Rows and Columns": "Drop Empty Rows and Columns", "Dry Period": "Dry Period", "Dry Spell": "Dry Spell", "Dummy Variables": "Dummy Variables", @@ -1709,6 +1710,7 @@ "No of Clusters:": "No of Clusters:", "No package with this name.": "No package with this name.", "No preview available.": "No preview available.", + "No file selected.": "No file selected.", "No sheet selected.": "No sheet selected.", "No. Bids Received:": "No. Bids Received:", "No. Considered Bids:": "No. Considered Bids:", @@ -1867,10 +1869,12 @@ "PCA Options": "PCA Options", "PELT": "PELT", "PICSA Crops": "PICSA Crops", + "PICSA General Graphs": "PICSA General Graphs", "PICSA Options": "PICSA Options", "PICSA Rainfall Graph": "PICSA Rainfall Graph", "PICSA Rainfall Graphs": "PICSA Rainfall Graphs", "PICSA Temperature": "PICSA Temperature", + "PICSA Temperature Graphs": "PICSA Temperature Graphs", "PP": "PP", "PP-Plot": "PP-Plot", "PPP Adjusted Contract Value:": "PPP Adjusted Contract Value:", diff --git a/instat/translations/fr/fr_r_instat_not_menus.json b/instat/translations/fr/fr_r_instat_not_menus.json index e90c0087847..98852d5a1af 100644 --- a/instat/translations/fr/fr_r_instat_not_menus.json +++ b/instat/translations/fr/fr_r_instat_not_menus.json @@ -401,7 +401,7 @@ "Column Selection": "Sélection de colonne", "Column Statistics": "Statistiques de colonnes", "Column Structure": "Structure de la colonne", - "Column Type:": "Type de colonne", + "Column Type:": "Type de colonne:", "Column Variable(s) (Factor):": "Variable(s) de colonne (acteurs):", "Column Width:": "Largeur de la colonne:", "Column to Duplicate:": "Colonne à dupliquer:", @@ -755,6 +755,7 @@ "Drop Unused Levels": "Abandonner les niveaux inutilisés", "Drop empty factor levels": "Abandonner des niveaux de facteurs vides", "Dry Month": "Mois sec", + "Drop Empty Rows and Columns": "Drop Empty Rows and Columns", "Dry Period": "Période sèche", "Dry Spell": "Sort sec", "Dummy Variables": "Variables factices", @@ -1451,7 +1452,7 @@ "Main ID:": "ID principal:", "Main Measurement:": "Mesure principale:", "Main Option:": "Option principale:", - "Major Grid Lines": "Grandes lignes de la grille", + "Major Grid Lines": "Lignes de grille principales", "Major Tick Marks": "Graduations principales", "Major grid lines ": "Lignes de grille principales ", "Make": "Créer", @@ -1709,6 +1710,7 @@ "No of Clusters:": "Pas de groupes:", "No package with this name.": "Aucun paquet avec ce nom.", "No preview available.": "Aucun aperçu disponible.", + "No file selected.": "No file selected.", "No sheet selected.": "Aucune feuille sélectionnée.", "No. Bids Received:": "N° Soumissions reçues:", "No. Considered Bids:": "N° Examiné les soumissions:", @@ -1867,10 +1869,12 @@ "PCA Options": "Options de l’APC", "PELT": "PELT", "PICSA Crops": "PICSA Crops", + "PICSA General Graphs": "PICSA General Graphs", "PICSA Options": "Options de PICSA", "PICSA Rainfall Graph": "PICSA précipitation graphique", "PICSA Rainfall Graphs": "Graphiques de précipitations PICSA", "PICSA Temperature": "Température PICSA", + "PICSA Temperature Graphs": "PICSA Temperature Graphs", "PP": "PP", "PP-Plot": "PP-graphique", "PPP Adjusted Contract Value:": "PPP ajusté la valeur du contrat:", @@ -2848,7 +2852,7 @@ "Vertical": "Verticale", "Vertical Label Position:": "Position de l’étiquette verticale:", "Vertical X Tick Markers": "Marqueurs verticaux en X ticks", - "Vertical major grid lines ": "Grille principale verticale ", + "Vertical major grid lines ": "Lignes verticales principales ", "Vertical minor grid lines": "Ligne de grille mineure verticale", "Vertically": "Verticalement", "View Data": "Afficher les données", diff --git a/instat/translations/pt/pt_r_instat_not_menus.json b/instat/translations/pt/pt_r_instat_not_menus.json index 0cc1a522f8c..ab6070e6522 100644 --- a/instat/translations/pt/pt_r_instat_not_menus.json +++ b/instat/translations/pt/pt_r_instat_not_menus.json @@ -401,7 +401,7 @@ "Column Selection": "Seleção de coluna", "Column Statistics": "Estatísticas de coluna", "Column Structure": "Estrutura da coluna", - "Column Type:": "Column Type", + "Column Type:": "Column Type:", "Column Variable(s) (Factor):": "Variável(s) de coluna (Factor):", "Column Width:": "Largura da Coluna:", "Column to Duplicate:": "Coluna para duplicar:", @@ -755,6 +755,7 @@ "Drop Unused Levels": "Níveis não utilizados", "Drop empty factor levels": "Soltar níveis de fatores vazios", "Dry Month": "Mês seco", + "Drop Empty Rows and Columns": "Drop Empty Rows and Columns", "Dry Period": "Período seco", "Dry Spell": "Dry Spell", "Dummy Variables": "Variáveis de prova", @@ -1709,6 +1710,7 @@ "No of Clusters:": "Número de Clusters:", "No package with this name.": "Nenhum pacote com esse nome.", "No preview available.": "Pré-visualização não disponível.", + "No file selected.": "No file selected.", "No sheet selected.": "Nenhuma folha selecionada.", "No. Bids Received:": "Não. Ofertas recebidas:", "No. Considered Bids:": "Não. Considerado Lids:", @@ -1867,10 +1869,12 @@ "PCA Options": "Opções de PCA", "PELT": "PELT", "PICSA Crops": "PICSA Crops", + "PICSA General Graphs": "PICSA General Graphs", "PICSA Options": "Opções do PICSA", "PICSA Rainfall Graph": "Gráfico da chuva PICSA", "PICSA Rainfall Graphs": "Gráficos de chuva PICSA", "PICSA Temperature": "Temperatura PICSA", + "PICSA Temperature Graphs": "PICSA Temperature Graphs", "PP": "PP", "PP-Plot": "Plotagem", "PPP Adjusted Contract Value:": "Valor do contrato atualizado com PPP:", diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index f5de91e0d7c..9e8a51bdc4a 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/translations/sw/sw_r_instat_not_menus.json b/instat/translations/sw/sw_r_instat_not_menus.json index d7e2f55bda1..cd8bf643a10 100644 --- a/instat/translations/sw/sw_r_instat_not_menus.json +++ b/instat/translations/sw/sw_r_instat_not_menus.json @@ -401,7 +401,7 @@ "Column Selection": "Uteuzi wa safu wima", "Column Statistics": "Takwimu za safu", "Column Structure": "Muundo wa safu wima", - "Column Type:": "Column Type", + "Column Type:": "Column Type:", "Column Variable(s) (Factor):": "Vigezo vya Safu wima (Nambari Kamilifu):", "Column Width:": "Upana wa Safu wima:", "Column to Duplicate:": "Safu wima ya Kunakili:", @@ -755,6 +755,7 @@ "Drop Unused Levels": "Dondoa Viwango zisizotumiwa", "Drop empty factor levels": "Dondosha viwango tupu vya Nambari Kamilifu", "Dry Month": "Mwezi Mkavu", + "Drop Empty Rows and Columns": "Drop Empty Rows and Columns", "Dry Period": "Kipindi Kikavu", "Dry Spell": "Msimu kavu", "Dummy Variables": "Vigezo bandia", @@ -1709,6 +1710,7 @@ "No of Clusters:": "Hakuna nguzo:", "No package with this name.": "Hakuna kifurushi kilicho na jina hili.", "No preview available.": "Hakuna hakikisho linalopatikana.", + "No file selected.": "No file selected.", "No sheet selected.": "Hakuna ukurasa uliyochaguliwa", "No. Bids Received:": "Zabuni Zilizopokelewa:", "No. Considered Bids:": "Zabuni zilizozingatiwa:", @@ -1867,10 +1869,12 @@ "PCA Options": "Chaguzi za PCA", "PELT": "PELT", "PICSA Crops": "Mazao ya PICSA", + "PICSA General Graphs": "PICSA General Graphs", "PICSA Options": "Chaguzi za PICSA", "PICSA Rainfall Graph": "Grafu ya Mvua ya PICSA", "PICSA Rainfall Graphs": "Grafu za Mvua za PICSA", "PICSA Temperature": "Joto za PICSA", + "PICSA Temperature Graphs": "PICSA Temperature Graphs", "PP": "PP", "PP-Plot": "PP-Plot", "PPP Adjusted Contract Value:": "Thamani ya Mkataba Iliyorekebishwa ya PPP:", diff --git a/instat/ucrAxes.Designer.vb b/instat/ucrAxes.Designer.vb index a112a00cf1b..fb5f10ce71b 100644 --- a/instat/ucrAxes.Designer.vb +++ b/instat/ucrAxes.Designer.vb @@ -213,7 +213,7 @@ Partial Class ucrAxes Me.ucrChkLabels.Checked = False Me.ucrChkLabels.Location = New System.Drawing.Point(5, 133) Me.ucrChkLabels.Name = "ucrChkLabels" - Me.ucrChkLabels.Size = New System.Drawing.Size(65, 23) + Me.ucrChkLabels.Size = New System.Drawing.Size(87, 23) Me.ucrChkLabels.TabIndex = 22 ' 'ucrInputMajorBreaksLabels @@ -222,9 +222,9 @@ Partial Class ucrAxes Me.ucrInputMajorBreaksLabels.AutoSize = True Me.ucrInputMajorBreaksLabels.IsMultiline = False Me.ucrInputMajorBreaksLabels.IsReadOnly = False - Me.ucrInputMajorBreaksLabels.Location = New System.Drawing.Point(74, 132) + Me.ucrInputMajorBreaksLabels.Location = New System.Drawing.Point(98, 132) Me.ucrInputMajorBreaksLabels.Name = "ucrInputMajorBreaksLabels" - Me.ucrInputMajorBreaksLabels.Size = New System.Drawing.Size(170, 21) + Me.ucrInputMajorBreaksLabels.Size = New System.Drawing.Size(146, 21) Me.ucrInputMajorBreaksLabels.TabIndex = 4 ' 'rdoMajorBreaksSeq @@ -255,7 +255,7 @@ Partial Class ucrAxes Me.ucrInputMajorBreaksInStepsOf.AutoSize = True Me.ucrInputMajorBreaksInStepsOf.IsMultiline = False Me.ucrInputMajorBreaksInStepsOf.IsReadOnly = False - Me.ucrInputMajorBreaksInStepsOf.Location = New System.Drawing.Point(74, 99) + Me.ucrInputMajorBreaksInStepsOf.Location = New System.Drawing.Point(114, 99) Me.ucrInputMajorBreaksInStepsOf.Name = "ucrInputMajorBreaksInStepsOf" Me.ucrInputMajorBreaksInStepsOf.Size = New System.Drawing.Size(47, 21) Me.ucrInputMajorBreaksInStepsOf.TabIndex = 19 @@ -277,7 +277,7 @@ Partial Class ucrAxes Me.ucrInputMajorBreaksTo.AutoSize = True Me.ucrInputMajorBreaksTo.IsMultiline = False Me.ucrInputMajorBreaksTo.IsReadOnly = False - Me.ucrInputMajorBreaksTo.Location = New System.Drawing.Point(74, 72) + Me.ucrInputMajorBreaksTo.Location = New System.Drawing.Point(114, 72) Me.ucrInputMajorBreaksTo.Name = "ucrInputMajorBreaksTo" Me.ucrInputMajorBreaksTo.Size = New System.Drawing.Size(47, 21) Me.ucrInputMajorBreaksTo.TabIndex = 19 @@ -288,7 +288,7 @@ Partial Class ucrAxes Me.ucrInputMajorBreaksFrom.AutoSize = True Me.ucrInputMajorBreaksFrom.IsMultiline = False Me.ucrInputMajorBreaksFrom.IsReadOnly = False - Me.ucrInputMajorBreaksFrom.Location = New System.Drawing.Point(74, 46) + Me.ucrInputMajorBreaksFrom.Location = New System.Drawing.Point(114, 46) Me.ucrInputMajorBreaksFrom.Name = "ucrInputMajorBreaksFrom" Me.ucrInputMajorBreaksFrom.Size = New System.Drawing.Size(47, 21) Me.ucrInputMajorBreaksFrom.TabIndex = 19 @@ -709,7 +709,7 @@ Partial Class ucrAxes Me.ucrInputMinorBreaksFrom.AutoSize = True Me.ucrInputMinorBreaksFrom.IsMultiline = False Me.ucrInputMinorBreaksFrom.IsReadOnly = False - Me.ucrInputMinorBreaksFrom.Location = New System.Drawing.Point(74, 45) + Me.ucrInputMinorBreaksFrom.Location = New System.Drawing.Point(125, 43) Me.ucrInputMinorBreaksFrom.Name = "ucrInputMinorBreaksFrom" Me.ucrInputMinorBreaksFrom.Size = New System.Drawing.Size(47, 21) Me.ucrInputMinorBreaksFrom.TabIndex = 30 @@ -770,12 +770,12 @@ Partial Class ucrAxes Me.grpMinorBreaks.Controls.Add(Me.lblMinorBreaksInStepsOf) Me.grpMinorBreaks.Controls.Add(Me.rdoMinorBreaksSeq) Me.grpMinorBreaks.Controls.Add(Me.lblMinorBreaksTo) - Me.grpMinorBreaks.Controls.Add(Me.ucrInputMinorBreaksCustom) Me.grpMinorBreaks.Controls.Add(Me.rdoMinorBreaksCustom) Me.grpMinorBreaks.Controls.Add(Me.ucrPnlMinorBreaks) Me.grpMinorBreaks.Controls.Add(Me.ucrInputMinorBreaksFrom) Me.grpMinorBreaks.Controls.Add(Me.ucrInputMinorBreaksInStepsOf) Me.grpMinorBreaks.Controls.Add(Me.ucrInputMinorBreaksTo) + Me.grpMinorBreaks.Controls.Add(Me.ucrInputMinorBreaksCustom) Me.grpMinorBreaks.Location = New System.Drawing.Point(310, 197) Me.grpMinorBreaks.Name = "grpMinorBreaks" Me.grpMinorBreaks.Size = New System.Drawing.Size(354, 121)