diff --git a/docs/Download.html b/docs/Download.html index 48c57bd6c8b..2ac12ccc829 100644 --- a/docs/Download.html +++ b/docs/Download.html @@ -78,6 +78,7 @@

Download R-Instat

+

In response to the recent review of R-Instat by Bob Muenchen we are preparing to release a new version of R-Instat, version 0.7.4, on Monday 31 January 2022, which will include some new features and initial improvements from the review. Come back then to download this version, or continue with the current version below.

R-Instat 0.7.3.1 Installer 32 Bit (.exe 732MB)

If you know that you have a 64 bit computer, we suggest you download the 64 Bit version

diff --git a/instat/DlgUseDate.Designer.vb b/instat/DlgUseDate.Designer.vb index dabdc6081fd..8965843fc2f 100644 --- a/instat/DlgUseDate.Designer.vb +++ b/instat/DlgUseDate.Designer.vb @@ -217,21 +217,21 @@ Partial Class dlgUseDate ' Me.GroupBox2.Controls.Add(Me.ucrChkDaysInMonthNum) Me.GroupBox2.Controls.Add(Me.lblDaysInMonth) - Me.GroupBox2.Controls.Add(Me.ucrChkWeekName) Me.GroupBox2.Controls.Add(Me.lblDayInMonth) - Me.GroupBox2.Controls.Add(Me.ucrChkDayInMonthNum) Me.GroupBox2.Controls.Add(Me.lblNumeric) - Me.GroupBox2.Controls.Add(Me.ucrChkWeekAbbr) Me.GroupBox2.Controls.Add(Me.lblWeek) Me.GroupBox2.Controls.Add(Me.ucrChkWeekdayName) Me.GroupBox2.Controls.Add(Me.lblWeekDay) Me.GroupBox2.Controls.Add(Me.ucrChkWeekdayAbbr) Me.GroupBox2.Controls.Add(Me.lblName) - Me.GroupBox2.Controls.Add(Me.ucrChkWeekNum) Me.GroupBox2.Controls.Add(Me.lblLeapYear) Me.GroupBox2.Controls.Add(Me.ucrChkWeekdayNum) Me.GroupBox2.Controls.Add(Me.ucrChkLeapYearNum) Me.GroupBox2.Controls.Add(Me.lblAbbr) + Me.GroupBox2.Controls.Add(Me.ucrChkWeekAbbr) + Me.GroupBox2.Controls.Add(Me.ucrChkWeekName) + Me.GroupBox2.Controls.Add(Me.ucrChkWeekNum) + Me.GroupBox2.Controls.Add(Me.ucrChkDayInMonthNum) Me.GroupBox2.Location = New System.Drawing.Point(9, 337) Me.GroupBox2.Name = "GroupBox2" Me.GroupBox2.Size = New System.Drawing.Size(458, 117) @@ -649,29 +649,29 @@ Partial Class dlgUseDate Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(472, 516) + Me.Controls.Add(Me.ucrChkShiftDekadAbbr) + Me.Controls.Add(Me.ucrChkShiftDekadNum) + Me.Controls.Add(Me.ucrChkShiftPentadNum) + Me.Controls.Add(Me.ucrChkShiftQuarterNum) + Me.Controls.Add(Me.ucrChkDayInYearNum) + Me.Controls.Add(Me.ucrChkShiftDayInYearNum366) + Me.Controls.Add(Me.ucrChkShiftMonthNum) + Me.Controls.Add(Me.ucrChkShiftYearNum) + Me.Controls.Add(Me.ucrChkShiftMonthName) Me.Controls.Add(Me.ucrChkShiftYearName) Me.Controls.Add(Me.lblDayinYear366) Me.Controls.Add(Me.ucrChkShiftPentadAbbr) Me.Controls.Add(Me.lblShiftYear) - Me.Controls.Add(Me.ucrChkShiftYearNum) Me.Controls.Add(Me.lblShiftMonth) - Me.Controls.Add(Me.ucrChkShiftDekadAbbr) Me.Controls.Add(Me.lblShiftPentad) Me.Controls.Add(Me.lblDayInYear) Me.Controls.Add(Me.ucrChkShiftMonthAbbr) Me.Controls.Add(Me.lblShiftNumeric) Me.Controls.Add(Me.lblShiftQuarter) - Me.Controls.Add(Me.ucrChkShiftMonthName) Me.Controls.Add(Me.ucrChkShiftQuarterAbbr) Me.Controls.Add(Me.lblShiftAbbr) Me.Controls.Add(Me.lblShiftDekad) - Me.Controls.Add(Me.ucrChkShiftDekadNum) - Me.Controls.Add(Me.ucrChkShiftQuarterNum) - Me.Controls.Add(Me.ucrChkDayInYearNum) - Me.Controls.Add(Me.ucrChkShiftMonthNum) Me.Controls.Add(Me.lblShift) - Me.Controls.Add(Me.ucrChkShiftDayInYearNum366) - Me.Controls.Add(Me.ucrChkShiftPentadNum) Me.Controls.Add(Me.GroupBox2) Me.Controls.Add(Me.GroupBox1) Me.Controls.Add(Me.ucrReceiverUseDate) diff --git a/instat/Model/DataFrame/clsDataFrame.vb b/instat/Model/DataFrame/clsDataFrame.vb index 55cc30ab5f1..89c2c4c6773 100644 --- a/instat/Model/DataFrame/clsDataFrame.vb +++ b/instat/Model/DataFrame/clsDataFrame.vb @@ -161,7 +161,7 @@ Public Class clsDataFrame End Function ''' - ''' Updates datframe where data has changed + ''' Updates dataframe where data has changed ''' Public Sub RefreshData() If HasDataChanged() Then @@ -169,7 +169,7 @@ Public Class clsDataFrame _iTotalRowCount = _RLink.GetDataFrameLength(_strName, False) _iTotalColumnCount = _RLink.GetDataFrameColumnCount(_strName) _clsFilter.RefreshData() - If _clsFilter.bApplied Then + If _clsFilter.bFilterApplied Then _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _clsFilter.iFilteredRowCount) Else _clsVisiblePage.SetTotalRowAndColumnCounts(_iTotalColumnCount, _iTotalRowCount) diff --git a/instat/Model/DataFrame/clsDataFrameFilter.vb b/instat/Model/DataFrame/clsDataFrameFilter.vb index 8aea4723ebf..831477257b9 100644 --- a/instat/Model/DataFrame/clsDataFrameFilter.vb +++ b/instat/Model/DataFrame/clsDataFrameFilter.vb @@ -23,7 +23,8 @@ Public Class clsDataFrameFilter Protected _strDataFrameName As String Protected _RLink As RLink - Protected _bApplied As Boolean + Protected _bFilterApplied As Boolean + Protected _bColumnSelectionApplied As Boolean Protected _iFilteredRowCount As Integer Protected _strFilterName As String @@ -39,9 +40,15 @@ Public Class clsDataFrameFilter End Get End Property - Public ReadOnly Property bApplied() As Boolean + Public ReadOnly Property bFilterApplied() As Boolean Get - Return _bApplied + Return _bFilterApplied + End Get + End Property + + Public ReadOnly Property bColumnSelectionApplied() As Boolean + Get + Return _bColumnSelectionApplied End Get End Property @@ -64,9 +71,17 @@ Public Class clsDataFrameFilter Return _RLink.RunInternalScriptGetValue(clsFilterApplied.ToScript()).AsLogical(0) End Function + Private Function GetColumnSelectionAppliedFromRCommand() As Boolean + Dim clsColumnSelectionApplied As New RFunction + clsColumnSelectionApplied.SetRCommand(_RLink.strInstatDataObject & "$column_selection_applied") + clsColumnSelectionApplied.AddParameter("data_name", Chr(34) & _strDataFrameName & Chr(34)) + Return _RLink.RunInternalScriptGetValue(clsColumnSelectionApplied.ToScript()).AsLogical(0) + End Function + Public Sub RefreshData() _iFilteredRowCount = _RLink.GetDataFrameLength(_strDataFrameName, True) - _bApplied = GetFilterAppliedFromRCommand() + _bFilterApplied = GetFilterAppliedFromRCommand() + _bColumnSelectionApplied = GetColumnSelectionAppliedFromRCommand() _strFilterName = GetFilterNameFromRCommand() End Sub diff --git a/instat/Model/Output/clsOutputElement.vb b/instat/Model/Output/clsOutputElement.vb index 5297fe95b12..d897eb65dc8 100644 --- a/instat/Model/Output/clsOutputElement.vb +++ b/instat/Model/Output/clsOutputElement.vb @@ -109,7 +109,13 @@ Public Class clsOutputElement ''' Public Sub AddScript(strScript As String) Dim rScript As New clsRScript(strScript) - For Each rToken In rScript.GetLstTokens(rScript.GetLstLexemes(strScript)) 'rScript.lstTokens + Dim lstTokens As List(Of clsRToken) = rScript.GetLstTokens(rScript.GetLstLexemes(strScript)) 'rScript.lstTokens + + If lstTokens Is Nothing Then + Exit Sub + End If + + For Each rToken In lstTokens _formattedRScript.Add(New clsRScriptElement With { .Text = rToken.strTxt, diff --git a/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb b/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb index 9a4436fb92a..87546528b9c 100644 --- a/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb +++ b/instat/Model/RCommand/clsPrepareFunctionsForGrids.vb @@ -208,6 +208,15 @@ Public Class clsPrepareFunctionsForGrids _RLink.RunScript(clsRemoveFilter.ToScript(), strComment:="Right click menu: Remove Current Filter") End Sub ''' + ''' Removes current column selection + ''' + Public Sub RemoveCurrentColumnSelection() + Dim clsRemoveCurrentColumnSelection As New RFunction + clsRemoveCurrentColumnSelection.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$remove_current_column_selection") + clsRemoveCurrentColumnSelection.AddParameter("data_name", Chr(34) & _strDataFrame & Chr(34), iPosition:=0) + _RLink.RunScript(clsRemoveCurrentColumnSelection.ToScript(), strComment:="Right click menu: Remove Current Column Selection") + End Sub + ''' ''' Freeze selected columns ''' ''' diff --git a/instat/UserControl/ucrOutputPage.vb b/instat/UserControl/ucrOutputPage.vb index 79351103bb5..cfc2da4665e 100644 --- a/instat/UserControl/ucrOutputPage.vb +++ b/instat/UserControl/ucrOutputPage.vb @@ -159,6 +159,10 @@ Public Class ucrOutputPage End Sub Private Function AddElementPanel(outputElement As clsOutputElement) As Panel + If outputElement Is Nothing OrElse outputElement.FormatedRScript Is Nothing Then + Return Nothing + End If + Dim panel As New Panel With { .Height = 10, ' = 10 'small height as panel will grow .AutoSize = True, diff --git a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb index 2fb0a2ac336..9d6de5928cc 100644 --- a/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb +++ b/instat/UserControls/DataGrid/Linux/ucrDataViewLinuxGrid.vb @@ -46,7 +46,7 @@ Public Class ucrDataViewLinuxGrid Public Sub AddRowData(dataFrame As clsDataFrame) Implements IDataViewGrid.AddRowData Dim dataGrid = GetDataGridFromSelectedTab() - If dataFrame.clsFilter.bApplied Then + If dataFrame.clsFilter.bFilterApplied Then dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.Red Else dataGrid.RowHeadersDefaultCellStyle.ForeColor = Color.DarkBlue diff --git a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb index fd738b2dcb9..98e64373c90 100644 --- a/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb +++ b/instat/UserControls/DataGrid/ReoGrid/ucrDataViewReoGrid.vb @@ -51,7 +51,7 @@ Public Class ucrDataViewReoGrid grdData.CurrentWorksheet.Rows = dataFrame.iDisplayedRowCount UpdateWorksheetSettings(grdData.CurrentWorksheet) - If dataFrame.clsFilter.bApplied Then + If dataFrame.clsFilter.bFilterApplied Then textColour = Color.Red Else textColour = Color.DarkBlue diff --git a/instat/clsRLink.vb b/instat/clsRLink.vb index 00b1ed0c88b..d34261d1e00 100644 --- a/instat/clsRLink.vb +++ b/instat/clsRLink.vb @@ -14,6 +14,7 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . +Imports System.Runtime.InteropServices Imports RDotNet Imports unvell.ReoGrid Imports System.IO @@ -1296,16 +1297,22 @@ Public Class RLink thrDelay.IsBackground = True thrWaitDisplay = New Threading.Thread(Sub() If bCurrentShowWaiting Then - frmSetupLoading.Show() + If Not RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + frmSetupLoading.Show() + End If End If - While thrRScript.IsAlive + While thrRScript.IsAlive If bErrorMessageOpen Then - frmSetupLoading.Close() + If Not RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + frmSetupLoading.Close() + End If End If Threading.Thread.Sleep(5) Application.DoEvents() End While - frmSetupLoading.Close() + If Not RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + frmSetupLoading.Close() + End If evtWaitHandleWaitDisplayDone.Set() End Sub) thrWaitDisplay.IsBackground = True diff --git a/instat/clsRecentFiles.vb b/instat/clsRecentFiles.vb index 26028f7fe8f..636cddef78f 100644 --- a/instat/clsRecentFiles.vb +++ b/instat/clsRecentFiles.vb @@ -65,13 +65,7 @@ Public Class clsRecentFiles Dim arrStrPaths() As String = File.ReadAllLines(strRecentFilesPath) For Each strPath As String In arrStrPaths If Not String.IsNullOrEmpty(strPath) Then - ' Disabled this so that you can still see files that don't exist in the list - ' only add files that still exist... - 'If File.Exists(sPath) Then - ' ' add to the list of recently opened files - ' strListMRU.Add(sPath) - 'End If - lstRecentOpenedFiles.Add(strPath) + lstRecentOpenedFiles.Add(strPath.Replace("\", "/")) End If Next 'display the recently opened files if there are any items to display in the file @@ -115,6 +109,7 @@ Public Class clsRecentFiles 'remove file if it exists(helps with making sure displayed file names are rearranged) lstRecentOpenedFiles.Remove(strFilePath) 'add to recent opened files list.. + strFilePath = strFilePath.Replace("\", "/") lstRecentOpenedFiles.Add(strFilePath) 'make sure there are only ever 30 items... 'todo. add this to the general options on the number of recently files to show @@ -192,6 +187,7 @@ Public Class clsRecentFiles End If Dim strFilePathTmp As String = strFilePath.Replace("MRU:", "") + strFilePathTmp = strFilePathTmp.Replace("\", "/") If File.Exists(strFilePathTmp) Then dlgImportDataset.strFileToOpenOn = strFilePathTmp dlgImportDataset.ShowDialog() diff --git a/instat/dlgCalculator.designer.vb b/instat/dlgCalculator.designer.vb index 26cf9d43d4b..5cfe60ec0a1 100644 --- a/instat/dlgCalculator.designer.vb +++ b/instat/dlgCalculator.designer.vb @@ -65,7 +65,6 @@ Partial Class dlgCalculator ' 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(507, 421) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrCalc) diff --git a/instat/dlgClimaticBoxPlot.vb b/instat/dlgClimaticBoxPlot.vb index ed6d806881a..3b1584860a3 100644 --- a/instat/dlgClimaticBoxPlot.vb +++ b/instat/dlgClimaticBoxPlot.vb @@ -269,6 +269,7 @@ Public Class dlgClimaticBoxPlot clsRaesFunction.AddParameter("x", Chr(34) & Chr(34)) clsAsFactorFunction.SetRCommand("make_factor") + clsAsFactorFunction.AddParameter("x", Chr(34) & Chr(34), bIncludeArgumentName:=False) clsRgeomPlotFunction.SetPackageName("ggplot2") clsRgeomPlotFunction.SetRCommand("geom_boxplot") diff --git a/instat/dlgClimaticStationMaps.Designer.vb b/instat/dlgClimaticStationMaps.Designer.vb index 8704763e2c0..f30c32c0ac0 100644 --- a/instat/dlgClimaticStationMaps.Designer.vb +++ b/instat/dlgClimaticStationMaps.Designer.vb @@ -353,7 +353,6 @@ Partial Class dlgClimaticStationMaps ' 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, 441) Me.Controls.Add(Me.grpMapOutline) Me.Controls.Add(Me.grpPoints) diff --git a/instat/dlgClimdexIndices.Designer.vb b/instat/dlgClimdexIndices.Designer.vb index d2212407a94..9ac65a4fdc6 100644 --- a/instat/dlgClimdexIndices.Designer.vb +++ b/instat/dlgClimdexIndices.Designer.vb @@ -181,10 +181,10 @@ Partial Class dlgClimdexIndices Me.lblIndicesSelectedOutOf.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.lblIndicesSelectedOutOf.Location = New System.Drawing.Point(100, 361) Me.lblIndicesSelectedOutOf.Name = "lblIndicesSelectedOutOf" - Me.lblIndicesSelectedOutOf.Size = New System.Drawing.Size(113, 13) + Me.lblIndicesSelectedOutOf.Size = New System.Drawing.Size(140, 13) Me.lblIndicesSelectedOutOf.TabIndex = 17 Me.lblIndicesSelectedOutOf.Tag = "Month:" - Me.lblIndicesSelectedOutOf.Text = "indices selected out of" + Me.lblIndicesSelectedOutOf.Text = "indices selected out of" ' 'lblSelectedIndices ' diff --git a/instat/dlgCompareColumns.Designer.vb b/instat/dlgCompareColumns.Designer.vb index a4aea7b3a63..d1f44088a26 100644 --- a/instat/dlgCompareColumns.Designer.vb +++ b/instat/dlgCompareColumns.Designer.vb @@ -268,7 +268,6 @@ Partial Class dlgCompareColumns ' 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(420, 522) Me.Controls.Add(Me.grpComparisions) Me.Controls.Add(Me.lblTolerance) diff --git a/instat/dlgCompareModels.Designer.vb b/instat/dlgCompareModels.Designer.vb index 7f4914933ce..67cb49d4fe0 100644 --- a/instat/dlgCompareModels.Designer.vb +++ b/instat/dlgCompareModels.Designer.vb @@ -266,7 +266,6 @@ Partial Class dlgCompareModels ' 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(436, 384) Me.Controls.Add(Me.grpChangeLimits) Me.Controls.Add(Me.grpPlotOptions) diff --git a/instat/dlgExportDataset.Designer.vb b/instat/dlgExportDataset.Designer.vb index 1a38cddc048..a7314cf4dbe 100644 --- a/instat/dlgExportDataset.Designer.vb +++ b/instat/dlgExportDataset.Designer.vb @@ -56,7 +56,7 @@ Partial Class dlgExportDataset Me.lblConfirm.AutoSize = True Me.lblConfirm.ForeColor = System.Drawing.Color.Green Me.lblConfirm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirm.Location = New System.Drawing.Point(85, 240) + Me.lblConfirm.Location = New System.Drawing.Point(85, 245) Me.lblConfirm.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) Me.lblConfirm.Name = "lblConfirm" Me.lblConfirm.Size = New System.Drawing.Size(148, 13) @@ -119,15 +119,15 @@ Partial Class dlgExportDataset Me.ucrFilePath.AutoSize = True Me.ucrFilePath.DefaultFileSuggestionName = "" Me.ucrFilePath.FilePath = "" - Me.ucrFilePath.FilePathBrowseText = resources.GetString("ucrFilePath.FilePathBrowseText") + Me.ucrFilePath.FilePathBrowseText = "Browse" Me.ucrFilePath.FilePathDialogFilter = resources.GetString("ucrFilePath.FilePathDialogFilter") Me.ucrFilePath.FilePathDialogTitle = "Export Data File" - Me.ucrFilePath.FilePathLabel = resources.GetString("ucrFilePath.FilePathLabel") + Me.ucrFilePath.FilePathLabel = "Save As:" Me.ucrFilePath.FolderBrowse = False - Me.ucrFilePath.Location = New System.Drawing.Point(8, 211) + Me.ucrFilePath.Location = New System.Drawing.Point(8, 209) Me.ucrFilePath.Name = "ucrFilePath" Me.ucrFilePath.SelectedFileFilterIndex = 1 - Me.ucrFilePath.Size = New System.Drawing.Size(1001, 34) + Me.ucrFilePath.Size = New System.Drawing.Size(407, 34) Me.ucrFilePath.TabIndex = 5 ' 'ucrSelectorDataFrames @@ -169,7 +169,6 @@ Partial Class dlgExportDataset ' 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(441, 331) Me.Controls.Add(Me.chkSaveAsSingleFile) Me.Controls.Add(Me.cboFileType) diff --git a/instat/dlgExportDataset.resx b/instat/dlgExportDataset.resx index 81f3748134a..e280411fe39 100644 --- a/instat/dlgExportDataset.resx +++ b/instat/dlgExportDataset.resx @@ -117,15 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - Comma separated file (*.csv)|*.csv|Excel files (*.xlsx)|*.xlsx|TAB-separated data (*.tsv)|*.tsv|Pipe-separated data (*.psv)|*.psv|Feather r / Python interchange format (*.feather)|*.feather|Fixed-Width format data (*.fwf)|*.fwf|Serialized r objects (*.rds)|*.rds|Saved r objects (*.RData)|*.RData|JSON(*.json)|*.json|YAML(*.yml)|*.yml|Stata(*.dta)|*.dta|SPSS(*.sav)|*.sav|XBASE database files (*.dbf)|*.dbf| Weka Attribute - Relation File Format (*.arff)|*.arff|r syntax object (*.R)|*.R|Xml(*.xml)|*.xml|HTML(*.html)|*.html - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Export File(s):' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - \ No newline at end of file diff --git a/instat/dlgExportGraphAsImage.Designer.vb b/instat/dlgExportGraphAsImage.Designer.vb index 2a15e402ee5..fd1e85dd6e3 100644 --- a/instat/dlgExportGraphAsImage.Designer.vb +++ b/instat/dlgExportGraphAsImage.Designer.vb @@ -38,7 +38,6 @@ Partial Class dlgExportGraphAsImage 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgExportGraphAsImage)) Me.lblSelectedGraph = New System.Windows.Forms.Label() Me.ucrSelectedGraphReceiver = New instat.ucrReceiverSingle() Me.ucrSelectorGraphAsImage = New instat.ucrSelectorByDataFrameAddRemove() @@ -83,7 +82,7 @@ Partial Class dlgExportGraphAsImage 'ucrBase ' Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 224) + Me.ucrBase.Location = New System.Drawing.Point(10, 230) Me.ucrBase.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(404, 52) @@ -94,24 +93,23 @@ Partial Class dlgExportGraphAsImage Me.ucrFilePath.AutoSize = True Me.ucrFilePath.DefaultFileSuggestionName = "" Me.ucrFilePath.FilePath = "" - Me.ucrFilePath.FilePathBrowseText = resources.GetString("ucrFilePath.FilePathBrowseText") + Me.ucrFilePath.FilePathBrowseText = "Browse" Me.ucrFilePath.FilePathDialogFilter = "JPEG (*.jpeg)|*.jpeg|PNG(*.png)|*.png|BitMaP(*.bmp)|*.bmp|EPS(*.eps)|*.eps|PostSc" & "ript(*.ps)|*.ps|SVG(*.svg)|*.svg|WMF(*.wmf)|*.wmf|PDF(*.pdf)|*.pdf" Me.ucrFilePath.FilePathDialogTitle = "Save Graph As Image" - Me.ucrFilePath.FilePathLabel = resources.GetString("ucrFilePath.FilePathLabel") + Me.ucrFilePath.FilePathLabel = "Save As:" Me.ucrFilePath.FolderBrowse = False - Me.ucrFilePath.Location = New System.Drawing.Point(14, 195) + Me.ucrFilePath.Location = New System.Drawing.Point(7, 194) Me.ucrFilePath.Name = "ucrFilePath" Me.ucrFilePath.SelectedFileFilterIndex = 1 - Me.ucrFilePath.Size = New System.Drawing.Size(990, 34) + Me.ucrFilePath.Size = New System.Drawing.Size(400, 34) Me.ucrFilePath.TabIndex = 7 ' 'dlgExportGraphAsImage ' 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(418, 280) + Me.ClientSize = New System.Drawing.Size(418, 285) Me.Controls.Add(Me.ucrFilePath) Me.Controls.Add(Me.lblSelectedGraph) Me.Controls.Add(Me.ucrSelectedGraphReceiver) diff --git a/instat/dlgExportGraphAsImage.resx b/instat/dlgExportGraphAsImage.resx index 0edae6639f1..1af7de150c9 100644 --- a/instat/dlgExportGraphAsImage.resx +++ b/instat/dlgExportGraphAsImage.resx @@ -117,12 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Export File:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - \ No newline at end of file diff --git a/instat/dlgExportRObjects.Designer.vb b/instat/dlgExportRObjects.Designer.vb index 7d7c9370d19..7e46572f6a6 100644 --- a/instat/dlgExportRObjects.Designer.vb +++ b/instat/dlgExportRObjects.Designer.vb @@ -38,7 +38,6 @@ Partial Class dlgExportRObjects 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgExportRObjects)) Me.lblObjects = New System.Windows.Forms.Label() Me.ucrFilePath = New instat.ucrFilePath() Me.ucrReceiverMultipleObjects = New instat.ucrReceiverMultiple() @@ -61,15 +60,15 @@ Partial Class dlgExportRObjects Me.ucrFilePath.AutoSize = True Me.ucrFilePath.DefaultFileSuggestionName = "" Me.ucrFilePath.FilePath = "" - Me.ucrFilePath.FilePathBrowseText = resources.GetString("ucrFilePath.FilePathBrowseText") + Me.ucrFilePath.FilePathBrowseText = "Browse" Me.ucrFilePath.FilePathDialogFilter = "Saved R objects (*.RData)|*.RData|Serialized R Objects (*.rds)|*.rds" Me.ucrFilePath.FilePathDialogTitle = "Export R Objects" - Me.ucrFilePath.FilePathLabel = resources.GetString("ucrFilePath.FilePathLabel") + Me.ucrFilePath.FilePathLabel = "Save As:" Me.ucrFilePath.FolderBrowse = False - Me.ucrFilePath.Location = New System.Drawing.Point(14, 199) + Me.ucrFilePath.Location = New System.Drawing.Point(12, 196) Me.ucrFilePath.Name = "ucrFilePath" Me.ucrFilePath.SelectedFileFilterIndex = 1 - Me.ucrFilePath.Size = New System.Drawing.Size(2384, 58) + Me.ucrFilePath.Size = New System.Drawing.Size(399, 34) Me.ucrFilePath.TabIndex = 7 ' 'ucrReceiverMultipleObjects @@ -111,7 +110,6 @@ Partial Class dlgExportRObjects ' 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(423, 288) Me.Controls.Add(Me.ucrFilePath) Me.Controls.Add(Me.lblObjects) diff --git a/instat/dlgExportRObjects.resx b/instat/dlgExportRObjects.resx index 95810065ed8..1af7de150c9 100644 --- a/instat/dlgExportRObjects.resx +++ b/instat/dlgExportRObjects.resx @@ -117,16 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Export File:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - \ No newline at end of file diff --git a/instat/dlgExportRWorkspace.Designer.vb b/instat/dlgExportRWorkspace.Designer.vb index ce2834a8321..ad62eec5266 100644 --- a/instat/dlgExportRWorkspace.Designer.vb +++ b/instat/dlgExportRWorkspace.Designer.vb @@ -38,7 +38,6 @@ Partial Class dlgExportRWorkspace 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgExportRWorkspace)) Me.lblDataFrames = New System.Windows.Forms.Label() Me.lblSelectedDataFrames = New System.Windows.Forms.Label() Me.ucrSelectorForDataFrames = New instat.ucrSelectorAddRemove() @@ -135,22 +134,21 @@ Partial Class dlgExportRWorkspace Me.ucrFilePath.AutoSize = True Me.ucrFilePath.DefaultFileSuggestionName = "" Me.ucrFilePath.FilePath = "" - Me.ucrFilePath.FilePathBrowseText = resources.GetString("ucrFilePath.FilePathBrowseText") + Me.ucrFilePath.FilePathBrowseText = "Browse" Me.ucrFilePath.FilePathDialogFilter = "Saved R Objects (*.RData)|*.RData" Me.ucrFilePath.FilePathDialogTitle = "Export R Workspace" - Me.ucrFilePath.FilePathLabel = resources.GetString("ucrFilePath.FilePathLabel") + Me.ucrFilePath.FilePathLabel = "Save As:" Me.ucrFilePath.FolderBrowse = False Me.ucrFilePath.Location = New System.Drawing.Point(14, 245) Me.ucrFilePath.Name = "ucrFilePath" Me.ucrFilePath.SelectedFileFilterIndex = 1 - Me.ucrFilePath.Size = New System.Drawing.Size(2384, 58) + Me.ucrFilePath.Size = New System.Drawing.Size(400, 34) Me.ucrFilePath.TabIndex = 11 ' 'dlgExportRWorkspace ' 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(417, 335) Me.Controls.Add(Me.ucrFilePath) Me.Controls.Add(Me.lblSelectedDataFrames) diff --git a/instat/dlgExportRWorkspace.resx b/instat/dlgExportRWorkspace.resx index 8105caf210c..1af7de150c9 100644 --- a/instat/dlgExportRWorkspace.resx +++ b/instat/dlgExportRWorkspace.resx @@ -117,16 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Export File:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - \ No newline at end of file diff --git a/instat/dlgExportToCPT.vb b/instat/dlgExportToCPT.vb index 05e26bbd768..d69aa8bfc6d 100644 --- a/instat/dlgExportToCPT.vb +++ b/instat/dlgExportToCPT.vb @@ -182,7 +182,7 @@ Public Class dlgExportToCPT Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) frmMain.strSaveFilePath = ucrInputFilePath.GetText() - frmMain.clsRecentItems.addToMenu(Replace(ucrInputFilePath.GetText(), "/", "\")) + frmMain.clsRecentItems.addToMenu(Replace(ucrInputFilePath.GetText(), "\", "/")) End Sub Private Sub cmdEditorSave_Click(sender As Object, e As EventArgs) Handles cmdChooseFile.Click diff --git a/instat/dlgFromLibrary.Designer.vb b/instat/dlgFromLibrary.Designer.vb index 68f822fcfc3..0706e4d5a92 100644 --- a/instat/dlgFromLibrary.Designer.vb +++ b/instat/dlgFromLibrary.Designer.vb @@ -144,14 +144,13 @@ Partial Class dlgFromLibrary 'ucrInputPackages ' Me.ucrInputPackages.AddQuotesIfUnrecognised = True - Me.ucrInputPackages.AutoSize = True Me.ucrInputPackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputPackages.GetSetSelectedIndex = -1 Me.ucrInputPackages.IsReadOnly = False Me.ucrInputPackages.Location = New System.Drawing.Point(108, 51) Me.ucrInputPackages.Margin = New System.Windows.Forms.Padding(6, 8, 6, 8) Me.ucrInputPackages.Name = "ucrInputPackages" - Me.ucrInputPackages.Size = New System.Drawing.Size(0, 0) + Me.ucrInputPackages.Size = New System.Drawing.Size(144, 23) Me.ucrInputPackages.TabIndex = 4 ' 'ucrBase diff --git a/instat/dlgImportDataset.Designer.vb b/instat/dlgImportDataset.Designer.vb index 3bb036c72d3..ff17c79828d 100644 --- a/instat/dlgImportDataset.Designer.vb +++ b/instat/dlgImportDataset.Designer.vb @@ -50,51 +50,20 @@ 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.ucrChkColumnNamesExcel = New instat.ucrCheck() - Me.ucrChkMaxRowsExcel = New instat.ucrCheck() - Me.ucrChkTrimWSExcel = 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.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.ucrChkMaxRowsText = New instat.ucrCheck() - Me.ucrChkColumnNamesText = New instat.ucrCheck() 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.rdoSeparatortext = New System.Windows.Forms.RadioButton() Me.rdoFixedWidthText = New System.Windows.Forms.RadioButton() @@ -105,8 +74,39 @@ Partial Class dlgImportDataset 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() @@ -264,30 +264,6 @@ Partial Class dlgImportDataset 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(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 - ' 'lblNAStringsCSV ' Me.lblNAStringsCSV.AutoSize = True @@ -298,90 +274,6 @@ 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(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 - ' 'grpExcel ' Me.grpExcel.Controls.Add(Me.lblTo) @@ -417,16 +309,6 @@ 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, 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 - ' 'lblFrom ' Me.lblFrom.AutoSize = True @@ -437,141 +319,37 @@ 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(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 + 'lblMissingValueStringExcel ' - 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}) + Me.lblMissingValueStringExcel.AutoSize = True + Me.lblMissingValueStringExcel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblMissingValueStringExcel.Location = New System.Drawing.Point(2, 29) + Me.lblMissingValueStringExcel.Name = "lblMissingValueStringExcel" + Me.lblMissingValueStringExcel.Size = New System.Drawing.Size(105, 13) + Me.lblMissingValueStringExcel.TabIndex = 3 + Me.lblMissingValueStringExcel.Text = "Missing Value String:" ' - 'ucrChkColumnNamesExcel + 'lblNamedRegion ' - 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 + Me.lblNamedRegion.AutoSize = True + Me.lblNamedRegion.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblNamedRegion.Location = New System.Drawing.Point(7, 29) + Me.lblNamedRegion.Name = "lblNamedRegion" + Me.lblNamedRegion.Size = New System.Drawing.Size(93, 13) + Me.lblNamedRegion.TabIndex = 2 + Me.lblNamedRegion.Text = "or Named Region:" ' - 'ucrChkMaxRowsExcel + 'lblRowToSkipExcel ' - 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 + Me.lblRowToSkipExcel.AutoSize = True + Me.lblRowToSkipExcel.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblRowToSkipExcel.Location = New System.Drawing.Point(3, 113) + Me.lblRowToSkipExcel.Name = "lblRowToSkipExcel" + Me.lblRowToSkipExcel.Size = New System.Drawing.Size(73, 13) + Me.lblRowToSkipExcel.TabIndex = 7 + Me.lblRowToSkipExcel.Text = "Rows to Skip:" ' - '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}) - ' - 'lblMissingValueStringExcel - ' - Me.lblMissingValueStringExcel.AutoSize = True - Me.lblMissingValueStringExcel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMissingValueStringExcel.Location = New System.Drawing.Point(2, 29) - Me.lblMissingValueStringExcel.Name = "lblMissingValueStringExcel" - Me.lblMissingValueStringExcel.Size = New System.Drawing.Size(105, 13) - 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(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 - ' - 'lblNamedRegion - ' - Me.lblNamedRegion.AutoSize = True - Me.lblNamedRegion.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblNamedRegion.Location = New System.Drawing.Point(7, 29) - Me.lblNamedRegion.Name = "lblNamedRegion" - Me.lblNamedRegion.Size = New System.Drawing.Size(93, 13) - Me.lblNamedRegion.TabIndex = 2 - Me.lblNamedRegion.Text = "or Named Region:" - ' - 'lblRowToSkipExcel - ' - Me.lblRowToSkipExcel.AutoSize = True - Me.lblRowToSkipExcel.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowToSkipExcel.Location = New System.Drawing.Point(3, 113) - Me.lblRowToSkipExcel.Name = "lblRowToSkipExcel" - Me.lblRowToSkipExcel.Size = New System.Drawing.Size(73, 13) - Me.lblRowToSkipExcel.TabIndex = 7 - Me.lblRowToSkipExcel.Text = "Rows to Skip:" - ' - 'grpRDS + 'grpRDS ' Me.grpRDS.Controls.Add(Me.ucrChkOverwriteRDS) Me.grpRDS.Controls.Add(Me.ucrChkImportObjectsRDS) @@ -588,76 +366,6 @@ 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 @@ -722,40 +430,6 @@ Partial Class dlgImportDataset 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}) - ' - '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 - ' 'lblMissingValueStringText ' Me.lblMissingValueStringText.AutoSize = True @@ -766,32 +440,6 @@ 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(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 - ' 'lblLinesToSkipText ' Me.lblLinesToSkipText.AutoSize = True @@ -913,27 +561,379 @@ Partial Class dlgImportDataset Me.ucrSaveFile.Size = New System.Drawing.Size(410, 22) Me.ucrSaveFile.TabIndex = 29 ' - 'ucrNudPreviewLines + 'ucrNudMaxRowsText ' - 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.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}) - Me.ucrNudPreviewLines.Name = "ucrNudPreviewLines" - Me.ucrNudPreviewLines.Size = New System.Drawing.Size(50, 20) - Me.ucrNudPreviewLines.TabIndex = 11 - Me.ucrNudPreviewLines.Value = New Decimal(New Integer() {0, 0, 0, 0}) + 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}) ' - 'ucrPanelFixedWidthText + 'ucrChkMaxRowsText ' - Me.ucrPanelFixedWidthText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPanelFixedWidthText.Location = New System.Drawing.Point(5, 47) - Me.ucrPanelFixedWidthText.Name = "ucrPanelFixedWidthText" - Me.ucrPanelFixedWidthText.Size = New System.Drawing.Size(253, 45) - Me.ucrPanelFixedWidthText.TabIndex = 22 + 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.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}) + Me.ucrNudPreviewLines.Name = "ucrNudPreviewLines" + Me.ucrNudPreviewLines.Size = New System.Drawing.Size(50, 20) + Me.ucrNudPreviewLines.TabIndex = 11 + Me.ucrNudPreviewLines.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrPanelFixedWidthText + ' + Me.ucrPanelFixedWidthText.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPanelFixedWidthText.Location = New System.Drawing.Point(5, 47) + Me.ucrPanelFixedWidthText.Name = "ucrPanelFixedWidthText" + 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 + ' + 'ucrInputTextTo + ' + 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 ' @@ -972,8 +972,7 @@ Partial Class dlgImportDataset ' 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(673, 502) + Me.ClientSize = New System.Drawing.Size(629, 502) Me.Controls.Add(Me.ucrChkDropEmptyCols) Me.Controls.Add(Me.ucrChkMultipleFiles) Me.Controls.Add(Me.ucrSaveFile) diff --git a/instat/dlgImportDataset.vb b/instat/dlgImportDataset.vb index b5bd649c46f..383231dd382 100644 --- a/instat/dlgImportDataset.vb +++ b/instat/dlgImportDataset.vb @@ -1,4 +1,5 @@ -Imports System.IO +Imports System.Runtime.InteropServices +Imports System.IO Imports RDotNet Imports instat.Translations @@ -420,12 +421,16 @@ Public Class dlgImportDataset dlgOpen.Multiselect = False If bFromLibrary Then dlgOpen.Title = "Import from Library" - dlgOpen.InitialDirectory = strLibraryPath + ' TODO There should be a way of using Path.GetDirectoryName to avoid needing the If but couldn't get this to work + If RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + dlgOpen.InitialDirectory = Replace(strLibraryPath, "\", "/") + Else + dlgOpen.InitialDirectory = strLibraryPath + End If Else dlgOpen.Title = "Open Data from file" dlgOpen.InitialDirectory = If(String.IsNullOrEmpty(strCurrentDirectory), frmMain.clsInstatOptions.strWorkingDirectory, strCurrentDirectory) End If - If DialogResult.OK = dlgOpen.ShowDialog() Then 'always reset the multiple files checkbox ucrChkMultipleFiles.Checked = False @@ -872,7 +877,7 @@ Public Class dlgImportDataset 'add the item to the MRU (Most Recently Used) list... 'only add if its a file that was selected, don't add if folder path was selected If Not bImportFromFolder Then - frmMain.clsRecentItems.addToMenu(strFilePathSystem) + frmMain.clsRecentItems.addToMenu(Replace(strFilePathSystem, "\", "/")) End If 'Sets the current data frame as the first new data frame @@ -1025,7 +1030,6 @@ Public Class dlgImportDataset strFileExtension = "" strFilePathSystem = "" strFilePathR = "" - ucrInputFilePath.SetName("") Else If File.Exists(strFilePathSystemTemp) Then strCurrentDirectory = Path.GetDirectoryName(strFilePathSystemTemp) diff --git a/instat/dlgInventoryPlot.designer.vb b/instat/dlgInventoryPlot.designer.vb index 035533250cd..7e28352d790 100644 --- a/instat/dlgInventoryPlot.designer.vb +++ b/instat/dlgInventoryPlot.designer.vb @@ -203,7 +203,7 @@ Partial Class dlgInventoryPlot Me.grpOptions.Controls.Add(Me.ucrChkSummary) Me.grpOptions.Location = New System.Drawing.Point(7, 254) Me.grpOptions.Name = "grpOptions" - Me.grpOptions.Size = New System.Drawing.Size(376, 60) + Me.grpOptions.Size = New System.Drawing.Size(376, 63) Me.grpOptions.TabIndex = 52 Me.grpOptions.TabStop = False Me.grpOptions.Text = "Summary Options" diff --git a/instat/dlgMerge.Designer.vb b/instat/dlgMerge.Designer.vb index 02e253d4ef0..8d49d356224 100644 --- a/instat/dlgMerge.Designer.vb +++ b/instat/dlgMerge.Designer.vb @@ -174,7 +174,7 @@ Partial Class dlgMerge Me.Name = "dlgMerge" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Merge" - Me.Text = "Merge" + Me.Text = "Merge (Join)" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgNewDataFrame.Designer.vb b/instat/dlgNewDataFrame.Designer.vb index 4f7f47f01aa..152efee643d 100644 --- a/instat/dlgNewDataFrame.Designer.vb +++ b/instat/dlgNewDataFrame.Designer.vb @@ -94,7 +94,7 @@ Partial Class dlgNewDataFrame Me.rdoCommand.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoCommand.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoCommand.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCommand.Location = New System.Drawing.Point(125, 15) + Me.rdoCommand.Location = New System.Drawing.Point(218, 15) Me.rdoCommand.Name = "rdoCommand" Me.rdoCommand.Size = New System.Drawing.Size(95, 27) Me.rdoCommand.TabIndex = 2 @@ -111,7 +111,7 @@ Partial Class dlgNewDataFrame Me.rdoRandom.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoRandom.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoRandom.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRandom.Location = New System.Drawing.Point(218, 15) + Me.rdoRandom.Location = New System.Drawing.Point(312, 15) Me.rdoRandom.Name = "rdoRandom" Me.rdoRandom.Size = New System.Drawing.Size(95, 27) Me.rdoRandom.TabIndex = 3 @@ -128,7 +128,7 @@ Partial Class dlgNewDataFrame Me.rdoEmpty.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoEmpty.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoEmpty.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEmpty.Location = New System.Drawing.Point(311, 15) + Me.rdoEmpty.Location = New System.Drawing.Point(31, 15) Me.rdoEmpty.Name = "rdoEmpty" Me.rdoEmpty.Size = New System.Drawing.Size(95, 27) Me.rdoEmpty.TabIndex = 4 @@ -145,7 +145,7 @@ Partial Class dlgNewDataFrame Me.rdoConstruct.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoConstruct.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoConstruct.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoConstruct.Location = New System.Drawing.Point(32, 15) + Me.rdoConstruct.Location = New System.Drawing.Point(124, 15) Me.rdoConstruct.Name = "rdoConstruct" Me.rdoConstruct.Size = New System.Drawing.Size(95, 27) Me.rdoConstruct.TabIndex = 1 diff --git a/instat/dlgNewDataFrame.vb b/instat/dlgNewDataFrame.vb index 9d90c851030..647dfb55833 100644 --- a/instat/dlgNewDataFrame.vb +++ b/instat/dlgNewDataFrame.vb @@ -63,13 +63,13 @@ Public Class dlgNewDataFrame ucrPnlDataFrame.AddRadioButton(rdoEmpty) 'TODO:Providing conditions here may not be easy, find a way to do this properly! - ucrPnlDataFrame.AddFunctionNamesCondition(rdoConstruct, "data.frame") + 'ucrPnlDataFrame.AddFunctionNamesCondition(rdoConstruct, "data.frame") 'ucrPnlDataFrame.AddFunctionNamesCondition(rdoCommand, ucrInputCommand.GetText()) 'ucrPnlDataFrame.AddFunctionNamesCondition(rdoRandom, "") - 'ucrPnlDataFrame.AddFunctionNamesCondition(rdoEmpty, "") + ucrPnlDataFrame.AddFunctionNamesCondition(rdoEmpty, "data.frame") - ucrPnlDataFrame.AddToLinkedControls(ucrNudCols, {rdoEmpty}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=2) - ucrPnlDataFrame.AddToLinkedControls(ucrNudRows, {rdoEmpty}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=10) + ucrPnlDataFrame.AddToLinkedControls(ucrNudCols, {rdoEmpty}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlDataFrame.AddToLinkedControls(ucrNudRows, {rdoEmpty}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlDataFrame.AddToLinkedControls(ucrInputCommand, {rdoCommand, rdoRandom}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrNudRows.SetLinkedDisplayControl(lblRows) ucrNudCols.SetLinkedDisplayControl(lblColumns) @@ -106,7 +106,7 @@ Public Class dlgNewDataFrame dataGridView.Rows.Clear() dataGridView.Rows.Add(5) - ucrBase.clsRsyntax.SetBaseRFunction(clsConstructFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsEmptyOverallFunction) End Sub Private Sub TestOKEnabled() diff --git a/instat/dlgOpenNetCDF.Designer.vb b/instat/dlgOpenNetCDF.Designer.vb index d51ad3ff476..ee24982f66b 100644 --- a/instat/dlgOpenNetCDF.Designer.vb +++ b/instat/dlgOpenNetCDF.Designer.vb @@ -247,7 +247,6 @@ Partial Class dlgOpenNetCDF ' 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(821, 217) Me.Controls.Add(Me.lblFilesFound) Me.Controls.Add(Me.lblNFiles) diff --git a/instat/dlgOpenNetCDF.vb b/instat/dlgOpenNetCDF.vb index 68e104620f5..8e771e967c5 100644 --- a/instat/dlgOpenNetCDF.vb +++ b/instat/dlgOpenNetCDF.vb @@ -14,6 +14,7 @@ ' You should have received a copy of the GNU General Public License ' along with this program. If not, see . +Imports System.Runtime.InteropServices Imports instat.Translations Imports System.IO Imports RDotNet @@ -34,7 +35,7 @@ Public Class dlgOpenNetCDF Private bCloseFile As Boolean = False Private strFileAssignName As String = "nc" Private iExpandedWidth As Integer - Private strLibraryPath As String = Path.Combine(frmMain.strStaticPath, "Library", "Climatic", "_Satellite/") + Private strLibraryPath As String = frmMain.strStaticPath & "\" & "Library" & "\" & "Climatic" & "\" & "_Satellite" & "\" Private bFromLibrary As Boolean = False Private bSubDialogOKEnabled As Boolean = True Private bMultiImport As Boolean = False @@ -170,11 +171,24 @@ Public Class dlgOpenNetCDF dlgOpen.Filter = "All Data files|*.nc|NetCDF files|*.nc" dlgOpen.Title = "Open Data from file" If bFromLibrary Then - dlgOpen.InitialDirectory = Path.GetDirectoryName(Replace(strLibraryPath, "/", "\")) + ' TODO There should be a way of using Path.GetDirectoryName to avoid needing the If but couldn't get this to work + If RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + dlgOpen.InitialDirectory = Replace(strLibraryPath, "\", "/") + Else + dlgOpen.InitialDirectory = Path.GetDirectoryName(strLibraryPath) + End If ElseIf Not ucrInputPath.IsEmpty() Then - dlgOpen.InitialDirectory = Path.GetDirectoryName(Replace(ucrInputPath.GetText(), "/", "\")) + If RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + dlgOpen.InitialDirectory = Replace(Path.GetDirectoryName(ucrInputPath.GetText()), "\", "/") + Else + dlgOpen.InitialDirectory = Path.GetDirectoryName(Replace(ucrInputPath.GetText(), "/", "\")) + End If Else - dlgOpen.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory + If RuntimeInformation.IsOSPlatform(OSPlatform.Linux) Then + dlgOpen.InitialDirectory = Replace(frmMain.clsInstatOptions.strWorkingDirectory, "\", "/") + Else + dlgOpen.InitialDirectory = frmMain.clsInstatOptions.strWorkingDirectory + End If End If If dlgOpen.ShowDialog() = DialogResult.OK Then diff --git a/instat/dlgPermuteColumn.Designer.vb b/instat/dlgPermuteColumn.Designer.vb index 48ae8c47f88..5a2befaba87 100644 --- a/instat/dlgPermuteColumn.Designer.vb +++ b/instat/dlgPermuteColumn.Designer.vb @@ -167,8 +167,8 @@ Partial Class dlgPermuteColumn Me.MinimizeBox = False Me.Name = "dlgPermuteColumn" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Permute_Column" - Me.Text = "Permute Column" + Me.Tag = "Permute_Sample_Rows" + Me.Text = "Permute/Sample Rows" Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgRandomSample.designer.vb b/instat/dlgRandomSample.designer.vb index 86e50393857..47c04c79fd2 100644 --- a/instat/dlgRandomSample.designer.vb +++ b/instat/dlgRandomSample.designer.vb @@ -38,8 +38,12 @@ Partial Class dlgRandomSample 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.lblSampleSize = New System.Windows.Forms.Label() Me.lblNumberofSamples = New System.Windows.Forms.Label() + Me.ttRngKind = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrInputRngKind = New instat.ucrInputComboBox() + Me.ucrChkRngKind = New instat.ucrCheck() Me.ucrSaveRandomSample = New instat.ucrSave() Me.ucrNudNumberOfSamples = New instat.ucrNud() Me.ucrNudSeed = New instat.ucrNud() @@ -53,7 +57,7 @@ Partial Class dlgRandomSample 'lblSampleSize ' Me.lblSampleSize.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSampleSize.Location = New System.Drawing.Point(276, 155) + Me.lblSampleSize.Location = New System.Drawing.Point(259, 155) Me.lblSampleSize.Name = "lblSampleSize" Me.lblSampleSize.Size = New System.Drawing.Size(118, 13) Me.lblSampleSize.TabIndex = 6 @@ -63,13 +67,33 @@ Partial Class dlgRandomSample 'lblNumberofSamples ' Me.lblNumberofSamples.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblNumberofSamples.Location = New System.Drawing.Point(276, 128) + Me.lblNumberofSamples.Location = New System.Drawing.Point(259, 128) Me.lblNumberofSamples.Name = "lblNumberofSamples" Me.lblNumberofSamples.Size = New System.Drawing.Size(118, 13) Me.lblNumberofSamples.TabIndex = 4 Me.lblNumberofSamples.Tag = "Number_of_Samples:" Me.lblNumberofSamples.Text = "Number of Samples:" ' + 'ucrInputRngKind + ' + Me.ucrInputRngKind.AddQuotesIfUnrecognised = True + Me.ucrInputRngKind.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrInputRngKind.GetSetSelectedIndex = -1 + Me.ucrInputRngKind.IsReadOnly = False + Me.ucrInputRngKind.Location = New System.Drawing.Point(359, 74) + Me.ucrInputRngKind.Name = "ucrInputRngKind" + Me.ucrInputRngKind.Size = New System.Drawing.Size(119, 21) + Me.ucrInputRngKind.TabIndex = 11 + ' + 'ucrChkRngKind + ' + Me.ucrChkRngKind.AutoSize = True + Me.ucrChkRngKind.Checked = False + Me.ucrChkRngKind.Location = New System.Drawing.Point(262, 75) + Me.ucrChkRngKind.Name = "ucrChkRngKind" + Me.ucrChkRngKind.Size = New System.Drawing.Size(118, 23) + Me.ucrChkRngKind.TabIndex = 10 + ' 'ucrSaveRandomSample ' Me.ucrSaveRandomSample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink @@ -84,7 +108,7 @@ Partial Class dlgRandomSample Me.ucrNudNumberOfSamples.AutoSize = True Me.ucrNudNumberOfSamples.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfSamples.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfSamples.Location = New System.Drawing.Point(400, 126) + Me.ucrNudNumberOfSamples.Location = New System.Drawing.Point(359, 126) Me.ucrNudNumberOfSamples.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfSamples.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfSamples.Name = "ucrNudNumberOfSamples" @@ -97,7 +121,7 @@ Partial Class dlgRandomSample Me.ucrNudSeed.AutoSize = True Me.ucrNudSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSeed.Location = New System.Drawing.Point(400, 100) + Me.ucrNudSeed.Location = New System.Drawing.Point(359, 100) Me.ucrNudSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSeed.Name = "ucrNudSeed" @@ -109,7 +133,7 @@ Partial Class dlgRandomSample ' Me.ucrChkSetSeed.AutoSize = True Me.ucrChkSetSeed.Checked = False - Me.ucrChkSetSeed.Location = New System.Drawing.Point(276, 101) + Me.ucrChkSetSeed.Location = New System.Drawing.Point(262, 101) Me.ucrChkSetSeed.Name = "ucrChkSetSeed" Me.ucrChkSetSeed.Size = New System.Drawing.Size(118, 23) Me.ucrChkSetSeed.TabIndex = 2 @@ -117,7 +141,7 @@ Partial Class dlgRandomSample 'ucrSampleSize ' Me.ucrSampleSize.AutoSize = True - Me.ucrSampleSize.Location = New System.Drawing.Point(400, 152) + Me.ucrSampleSize.Location = New System.Drawing.Point(359, 152) Me.ucrSampleSize.Name = "ucrSampleSize" Me.ucrSampleSize.Size = New System.Drawing.Size(55, 23) Me.ucrSampleSize.TabIndex = 7 @@ -139,7 +163,7 @@ Partial Class dlgRandomSample Me.ucrDistWithParameters.AutoSize = True Me.ucrDistWithParameters.Location = New System.Drawing.Point(10, 55) Me.ucrDistWithParameters.Name = "ucrDistWithParameters" - Me.ucrDistWithParameters.Size = New System.Drawing.Size(1037, 156) + Me.ucrDistWithParameters.Size = New System.Drawing.Size(1037, 172) Me.ucrDistWithParameters.TabIndex = 1 ' 'ucrBase @@ -155,8 +179,9 @@ Partial Class dlgRandomSample ' 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(479, 300) + Me.Controls.Add(Me.ucrInputRngKind) + Me.Controls.Add(Me.ucrChkRngKind) Me.Controls.Add(Me.ucrSaveRandomSample) Me.Controls.Add(Me.ucrNudNumberOfSamples) Me.Controls.Add(Me.ucrNudSeed) @@ -188,4 +213,7 @@ Partial Class dlgRandomSample Friend WithEvents ucrNudSeed As ucrNud Friend WithEvents ucrNudNumberOfSamples As ucrNud Friend WithEvents ucrSaveRandomSample As ucrSave + Friend WithEvents ttRngKind As ToolTip + Friend WithEvents ucrChkRngKind As ucrCheck + Friend WithEvents ucrInputRngKind As ucrInputComboBox End Class diff --git a/instat/dlgRandomSample.resx b/instat/dlgRandomSample.resx index 1af7de150c9..f6a025cc395 100644 --- a/instat/dlgRandomSample.resx +++ b/instat/dlgRandomSample.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/dlgRandomSample.vb b/instat/dlgRandomSample.vb index d5ad01c6cc5..b35d577d709 100644 --- a/instat/dlgRandomSample.vb +++ b/instat/dlgRandomSample.vb @@ -21,6 +21,7 @@ Public Class dlgRandomSample Private clsMultipleSamplesFunction As New RFunction Private clsDistributionFunction As New RFunction Private clsSetSeed As New RFunction + Private clsRNGKindFunction As New RFunction Private bReset As Boolean = True Private Sub dlgRandomSample_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -38,6 +39,8 @@ Public Class dlgRandomSample End Sub Private Sub InitialiseDialog() + Dim dctRNGKind As New Dictionary(Of String, String) + ucrBase.iHelpTopicID = 376 ucrNudNumberOfSamples.SetParameter(New RParameter("n", 0)) @@ -55,6 +58,25 @@ Public Class dlgRandomSample ucrNudSeed.SetParameter(New RParameter("seed", 0)) ucrNudSeed.SetMinMax(Integer.MinValue, Integer.MaxValue) + ucrChkRngKind.SetText("RNG Kind") + ucrChkRngKind.AddRSyntaxContainsFunctionNamesCondition(True, {"RNGkind"}) + ucrChkRngKind.AddRSyntaxContainsFunctionNamesCondition(False, {"RNGkind"}, False) + ucrChkRngKind.AddToLinkedControls(ucrInputRngKind, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Default") + + ucrInputRngKind.SetParameter(New RParameter("kind", 0)) + dctRNGKind.Add("Default", Chr(34) & "default" & Chr(34)) + dctRNGKind.Add("Mersenne-Twister", Chr(34) & "Mersenne-Twister" & Chr(34)) + dctRNGKind.Add("Wichmann-Hill", Chr(34) & "Wichmann-Hill" & Chr(34)) + dctRNGKind.Add("Marsaglia-Multicarry", Chr(34) & "Marsaglia-Multicarry" & Chr(34)) + dctRNGKind.Add("Super-Duper", Chr(34) & "Super-Duper" & Chr(34)) + dctRNGKind.Add("Knuth-TAOCP-2002", Chr(34) & "Knuth-TAOCP-2002" & Chr(34)) + dctRNGKind.Add("Knuth-TAOCP", Chr(34) & "Knuth-TAOCP" & Chr(34)) + dctRNGKind.Add("L'Ecuyer-CMRG", Chr(34) & "L'Ecuyer-CMRG" & Chr(34)) + ucrInputRngKind.SetItems(dctRNGKind) + ucrInputRngKind.SetDropDownStyleAsNonEditable() + + ttRngKind.SetToolTip(ucrChkRngKind.chkCheck, "Chooses a different Random Number Generator. Can usually be ignored.") + ucrSaveRandomSample.SetSaveTypeAsColumn() ucrSaveRandomSample.SetDataFrameSelector(ucrSelectorRandomSamples) ucrSaveRandomSample.SetIsComboBox() @@ -64,6 +86,7 @@ Public Class dlgRandomSample clsSetSeed = New RFunction clsMultipleSamplesFunction = New RFunction clsDistributionFunction = New RFunction + clsRNGKindFunction = New RFunction ucrBase.clsRsyntax.ClearCodes() ucrSelectorRandomSamples.Reset() ucrSaveRandomSample.Reset() @@ -71,6 +94,8 @@ Public Class dlgRandomSample clsSetSeed.SetRCommand("set.seed") + clsRNGKindFunction.SetRCommand("RNGkind") + ucrDistWithParameters.SetRDistributions() ucrDistWithParameters.SetParameters() @@ -92,12 +117,15 @@ Public Class dlgRandomSample ucrChkSetSeed.SetRSyntax(ucrBase.clsRsyntax, bReset) ucrSaveRandomSample.SetRCode(clsMultipleSamplesFunction, bReset) ucrNudNumberOfSamples.SetRCode(clsMultipleSamplesFunction, bReset) + ucrInputRngKind.SetRCode(clsRNGKindFunction, bReset) + ucrChkRngKind.SetRSyntax(ucrBase.clsRsyntax, bReset) End Sub Private Sub TestOKEnabled() If ((ucrDistWithParameters.bParametersFilled AndAlso ucrNudNumberOfSamples.GetText <> "") AndAlso - ((Not ucrChkSetSeed.Checked) OrElse (ucrChkSetSeed.Checked AndAlso ucrNudSeed.GetText <> "")) _ - AndAlso ucrSaveRandomSample.IsComplete) Then + ((Not ucrChkSetSeed.Checked) OrElse (ucrChkSetSeed.Checked AndAlso ucrNudSeed.GetText <> "")) AndAlso + ((Not ucrChkRngKind.Checked) OrElse (ucrChkRngKind.Checked AndAlso ucrInputRngKind.GetText <> "")) AndAlso + ucrSaveRandomSample.IsComplete) Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -145,7 +173,7 @@ Public Class dlgRandomSample SetNewColumName() End Sub - Private Sub ucrSaveRandomSample_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveRandomSample.ControlContentsChanged, ucrSelectorRandomSamples.ControlContentsChanged, ucrChkSetSeed.ControlContentsChanged, ucrNudSeed.ControlContentsChanged, ucrSampleSize.ControlContentsChanged + Private Sub ucrSaveRandomSample_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrSaveRandomSample.ControlContentsChanged, ucrSelectorRandomSamples.ControlContentsChanged, ucrChkSetSeed.ControlContentsChanged, ucrNudSeed.ControlContentsChanged, ucrSampleSize.ControlContentsChanged, ucrInputRngKind.ControlContentsChanged, ucrChkRngKind.ControlContentsChanged TestOKEnabled() End Sub @@ -159,9 +187,17 @@ Public Class dlgRandomSample Private Sub ucrChkSetSeed_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSetSeed.ControlValueChanged If ucrChkSetSeed.Checked Then - ucrBase.clsRsyntax.AddToBeforeCodes(clsSetSeed, iPosition:=0) + ucrBase.clsRsyntax.AddToBeforeCodes(clsSetSeed, iPosition:=1) Else ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsSetSeed) End If End Sub + + Private Sub ucrChkRngKind_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkRngKind.ControlValueChanged + If ucrChkRngKind.Checked Then + ucrBase.clsRsyntax.AddToBeforeCodes(clsRNGKindFunction, iPosition:=0) + Else + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsRNGKindFunction) + End If + End Sub End Class \ No newline at end of file diff --git a/instat/dlgRandomSubsets.Designer.vb b/instat/dlgRandomSubsets.Designer.vb index 4c39f7ff70f..cf9974c581e 100644 --- a/instat/dlgRandomSubsets.Designer.vb +++ b/instat/dlgRandomSubsets.Designer.vb @@ -65,7 +65,7 @@ Partial Class dlgRandomSubsets 'lblSampleSize ' Me.lblSampleSize.AutoSize = True - Me.lblSampleSize.Location = New System.Drawing.Point(252, 93) + Me.lblSampleSize.Location = New System.Drawing.Point(252, 119) Me.lblSampleSize.Name = "lblSampleSize" Me.lblSampleSize.Size = New System.Drawing.Size(68, 13) Me.lblSampleSize.TabIndex = 3 @@ -75,7 +75,7 @@ Partial Class dlgRandomSubsets 'lblNumberOfColumns ' Me.lblNumberOfColumns.AutoSize = True - Me.lblNumberOfColumns.Location = New System.Drawing.Point(252, 119) + Me.lblNumberOfColumns.Location = New System.Drawing.Point(252, 143) Me.lblNumberOfColumns.Name = "lblNumberOfColumns" Me.lblNumberOfColumns.Size = New System.Drawing.Size(102, 13) Me.lblNumberOfColumns.TabIndex = 5 @@ -113,7 +113,7 @@ Partial Class dlgRandomSubsets ' Me.ucrChkSetSeed.AutoSize = True Me.ucrChkSetSeed.Checked = False - Me.ucrChkSetSeed.Location = New System.Drawing.Point(252, 141) + Me.ucrChkSetSeed.Location = New System.Drawing.Point(252, 92) Me.ucrChkSetSeed.Name = "ucrChkSetSeed" Me.ucrChkSetSeed.Size = New System.Drawing.Size(100, 23) Me.ucrChkSetSeed.TabIndex = 7 @@ -123,7 +123,7 @@ Partial Class dlgRandomSubsets Me.ucrNudSetSeed.AutoSize = True Me.ucrNudSetSeed.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSetSeed.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSetSeed.Location = New System.Drawing.Point(363, 141) + Me.ucrNudSetSeed.Location = New System.Drawing.Point(363, 89) Me.ucrNudSetSeed.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSetSeed.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSetSeed.Name = "ucrNudSetSeed" @@ -136,7 +136,7 @@ Partial Class dlgRandomSubsets Me.ucrNudNumberOfColumns.AutoSize = True Me.ucrNudNumberOfColumns.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(363, 115) + Me.ucrNudNumberOfColumns.Location = New System.Drawing.Point(363, 141) Me.ucrNudNumberOfColumns.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudNumberOfColumns.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudNumberOfColumns.Name = "ucrNudNumberOfColumns" @@ -149,7 +149,7 @@ Partial Class dlgRandomSubsets Me.ucrNudSampleSize.AutoSize = True Me.ucrNudSampleSize.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSampleSize.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSampleSize.Location = New System.Drawing.Point(363, 89) + Me.ucrNudSampleSize.Location = New System.Drawing.Point(363, 115) Me.ucrNudSampleSize.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) Me.ucrNudSampleSize.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudSampleSize.Name = "ucrNudSampleSize" @@ -189,9 +189,7 @@ Partial Class dlgRandomSubsets Me.AutoSize = True Me.ClientSize = New System.Drawing.Size(430, 282) Me.Controls.Add(Me.ucrReceiverSubsets) - Me.Controls.Add(Me.ucrChkSetSeed) Me.Controls.Add(Me.ucrChkWithReplacement) - Me.Controls.Add(Me.ucrNudSetSeed) Me.Controls.Add(Me.ucrNudNumberOfColumns) Me.Controls.Add(Me.ucrNudSampleSize) Me.Controls.Add(Me.lblNumberOfColumns) @@ -200,6 +198,8 @@ Partial Class dlgRandomSubsets Me.Controls.Add(Me.ucrSelectorRandomSubsets) Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrNewDataFrame) + Me.Controls.Add(Me.ucrChkSetSeed) + Me.Controls.Add(Me.ucrNudSetSeed) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False diff --git a/instat/dlgRandomSubsets.vb b/instat/dlgRandomSubsets.vb index f80fbad3973..5ee775df089 100644 --- a/instat/dlgRandomSubsets.vb +++ b/instat/dlgRandomSubsets.vb @@ -56,7 +56,7 @@ Public Class dlgRandomSubsets ucrNudSampleSize.SetParameter(New RParameter("size", 2)) 'Set Seed - ucrChkSetSeed.SetText("Seed") + ucrChkSetSeed.SetText("Set Seed") ucrChkSetSeed.AddFunctionNamesCondition(False, "set.seed") ucrNudSetSeed.SetParameter(New RParameter("seed", 0)) ucrNudSetSeed.SetMinMax(1, Integer.MaxValue) diff --git a/instat/dlgRecodeNumeric.Designer.vb b/instat/dlgRecodeNumeric.Designer.vb index 45c59bb96db..662d2496a51 100644 --- a/instat/dlgRecodeNumeric.Designer.vb +++ b/instat/dlgRecodeNumeric.Designer.vb @@ -38,96 +38,83 @@ Partial Class dlgRecodeNumeric 'Do not modify it using the code editor. Private Sub InitializeComponent() - Me.lblSelectedVariable = New System.Windows.Forms.Label() - Me.lblBreakPoints = New System.Windows.Forms.Label() - Me.grpClosedOn = New System.Windows.Forms.GroupBox() - Me.rdoRight = New System.Windows.Forms.RadioButton() - Me.rdoLeft = New System.Windows.Forms.RadioButton() - Me.ucrPnlClosedOn = New instat.UcrPanel() - Me.ucrSaveRecode = New instat.ucrSave() - Me.ucrMultipleNumericRecode = New instat.ucrInputTextBox() - Me.ucrInputMultipleLabels = New instat.ucrInputTextBox() + Me.components = New System.ComponentModel.Container() Me.ucrReceiverRecode = New instat.ucrReceiverSingle() - Me.ucrSelectorForRecode = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() + Me.rdoBreakPoints = New System.Windows.Forms.RadioButton() + Me.rdoMinimum = New System.Windows.Forms.RadioButton() + Me.rdoLevels = New System.Windows.Forms.RadioButton() + Me.ucrMultipleNumericRecode = New instat.ucrInputTextBox() + Me.ucrNudMinimum = New instat.ucrNud() + Me.ucrNudLevels = New instat.ucrNud() Me.ucrChkAddLabels = New instat.ucrCheck() - Me.grpClosedOn.SuspendLayout() + Me.ucrSaveRecode = New instat.ucrSave() + Me.ttMinimum = New System.Windows.Forms.ToolTip(Me.components) + Me.ucrPnlRadioButtons = New instat.UcrPanel() + Me.ucrSelectorForRecode = New instat.ucrSelectorByDataFrameAddRemove() + Me.grpQuantileGroups = New System.Windows.Forms.GroupBox() + Me.lblSelectedVariable = New System.Windows.Forms.Label() + Me.ttBreakpoint = New System.Windows.Forms.ToolTip(Me.components) + Me.ttLevels = New System.Windows.Forms.ToolTip(Me.components) + Me.grpQuantileGroups.SuspendLayout() Me.SuspendLayout() ' - 'lblSelectedVariable + 'ucrReceiverRecode ' - Me.lblSelectedVariable.AutoSize = True - Me.lblSelectedVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSelectedVariable.Location = New System.Drawing.Point(249, 46) - Me.lblSelectedVariable.Name = "lblSelectedVariable" - Me.lblSelectedVariable.Size = New System.Drawing.Size(93, 13) - Me.lblSelectedVariable.TabIndex = 1 - Me.lblSelectedVariable.Tag = "Selected_Variable" - Me.lblSelectedVariable.Text = "Selected Variable:" + Me.ucrReceiverRecode.AutoSize = True + Me.ucrReceiverRecode.frmParent = Me + Me.ucrReceiverRecode.Location = New System.Drawing.Point(232, 59) + Me.ucrReceiverRecode.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverRecode.Name = "ucrReceiverRecode" + Me.ucrReceiverRecode.Selector = Nothing + Me.ucrReceiverRecode.Size = New System.Drawing.Size(120, 20) + Me.ucrReceiverRecode.strNcFilePath = "" + Me.ucrReceiverRecode.TabIndex = 9 + Me.ucrReceiverRecode.ucrSelector = Nothing ' - 'lblBreakPoints - ' - Me.lblBreakPoints.AutoSize = True - Me.lblBreakPoints.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblBreakPoints.Location = New System.Drawing.Point(249, 92) - Me.lblBreakPoints.Name = "lblBreakPoints" - Me.lblBreakPoints.Size = New System.Drawing.Size(70, 13) - Me.lblBreakPoints.TabIndex = 3 - Me.lblBreakPoints.Tag = "Break_Points" - Me.lblBreakPoints.Text = "Break Points:" - ' - 'grpClosedOn - ' - Me.grpClosedOn.Controls.Add(Me.rdoRight) - Me.grpClosedOn.Controls.Add(Me.rdoLeft) - Me.grpClosedOn.Controls.Add(Me.ucrPnlClosedOn) - Me.grpClosedOn.Location = New System.Drawing.Point(247, 134) - Me.grpClosedOn.Name = "grpClosedOn" - Me.grpClosedOn.Size = New System.Drawing.Size(146, 89) - Me.grpClosedOn.TabIndex = 5 - Me.grpClosedOn.TabStop = False - Me.grpClosedOn.Tag = "Closed_On" - Me.grpClosedOn.Text = "Closed On" - ' - 'rdoRight - ' - Me.rdoRight.AutoSize = True - Me.rdoRight.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRight.Location = New System.Drawing.Point(6, 48) - Me.rdoRight.Name = "rdoRight" - Me.rdoRight.Size = New System.Drawing.Size(50, 17) - Me.rdoRight.TabIndex = 23 - Me.rdoRight.TabStop = True - Me.rdoRight.Text = "Right" - Me.rdoRight.UseVisualStyleBackColor = True - ' - 'rdoLeft - ' - Me.rdoLeft.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoLeft.Location = New System.Drawing.Point(6, 25) - Me.rdoLeft.Name = "rdoLeft" - Me.rdoLeft.Size = New System.Drawing.Size(90, 17) - Me.rdoLeft.TabIndex = 0 - Me.rdoLeft.TabStop = True - Me.rdoLeft.Text = "Left" - Me.rdoLeft.UseVisualStyleBackColor = True - ' - 'ucrPnlClosedOn - ' - Me.ucrPnlClosedOn.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlClosedOn.Location = New System.Drawing.Point(6, 19) - Me.ucrPnlClosedOn.Name = "ucrPnlClosedOn" - Me.ucrPnlClosedOn.Size = New System.Drawing.Size(128, 59) - Me.ucrPnlClosedOn.TabIndex = 21 + 'ucrBase ' - 'ucrSaveRecode + Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrBase.Location = New System.Drawing.Point(5, 254) + Me.ucrBase.Name = "ucrBase" + Me.ucrBase.Size = New System.Drawing.Size(410, 52) + Me.ucrBase.TabIndex = 13 ' - Me.ucrSaveRecode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveRecode.Location = New System.Drawing.Point(9, 232) - Me.ucrSaveRecode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveRecode.Name = "ucrSaveRecode" - Me.ucrSaveRecode.Size = New System.Drawing.Size(328, 22) - Me.ucrSaveRecode.TabIndex = 20 + 'rdoBreakPoints + ' + Me.rdoBreakPoints.AutoSize = True + Me.rdoBreakPoints.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoBreakPoints.Location = New System.Drawing.Point(6, 71) + Me.rdoBreakPoints.Name = "rdoBreakPoints" + Me.rdoBreakPoints.Size = New System.Drawing.Size(88, 17) + Me.rdoBreakPoints.TabIndex = 30 + Me.rdoBreakPoints.TabStop = True + Me.rdoBreakPoints.Text = "Break Points:" + Me.rdoBreakPoints.UseVisualStyleBackColor = True + ' + 'rdoMinimum + ' + Me.rdoMinimum.AutoSize = True + Me.rdoMinimum.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoMinimum.Location = New System.Drawing.Point(6, 48) + Me.rdoMinimum.Name = "rdoMinimum" + Me.rdoMinimum.Size = New System.Drawing.Size(69, 17) + Me.rdoMinimum.TabIndex = 29 + Me.rdoMinimum.TabStop = True + Me.rdoMinimum.Text = "Minimum:" + Me.rdoMinimum.UseVisualStyleBackColor = True + ' + 'rdoLevels + ' + Me.rdoLevels.AutoSize = True + Me.rdoLevels.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoLevels.Location = New System.Drawing.Point(6, 25) + Me.rdoLevels.Name = "rdoLevels" + Me.rdoLevels.Size = New System.Drawing.Size(59, 17) + Me.rdoLevels.TabIndex = 28 + Me.rdoLevels.TabStop = True + Me.rdoLevels.Text = "Levels:" + Me.rdoLevels.UseVisualStyleBackColor = True ' 'ucrMultipleNumericRecode ' @@ -135,34 +122,62 @@ Partial Class dlgRecodeNumeric Me.ucrMultipleNumericRecode.AutoSize = True Me.ucrMultipleNumericRecode.IsMultiline = False Me.ucrMultipleNumericRecode.IsReadOnly = False - Me.ucrMultipleNumericRecode.Location = New System.Drawing.Point(247, 107) + Me.ucrMultipleNumericRecode.Location = New System.Drawing.Point(99, 71) Me.ucrMultipleNumericRecode.Name = "ucrMultipleNumericRecode" Me.ucrMultipleNumericRecode.Size = New System.Drawing.Size(120, 21) Me.ucrMultipleNumericRecode.TabIndex = 4 ' - 'ucrInputMultipleLabels + 'ucrNudMinimum ' - Me.ucrInputMultipleLabels.AddQuotesIfUnrecognised = True - Me.ucrInputMultipleLabels.AutoSize = True - Me.ucrInputMultipleLabels.IsMultiline = False - Me.ucrInputMultipleLabels.IsReadOnly = False - Me.ucrInputMultipleLabels.Location = New System.Drawing.Point(118, 203) - Me.ucrInputMultipleLabels.Name = "ucrInputMultipleLabels" - Me.ucrInputMultipleLabels.Size = New System.Drawing.Size(123, 21) - Me.ucrInputMultipleLabels.TabIndex = 7 + Me.ucrNudMinimum.AutoSize = True + Me.ucrNudMinimum.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMinimum.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMinimum.Location = New System.Drawing.Point(99, 45) + Me.ucrNudMinimum.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMinimum.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMinimum.Name = "ucrNudMinimum" + Me.ucrNudMinimum.Size = New System.Drawing.Size(50, 20) + Me.ucrNudMinimum.TabIndex = 23 + Me.ucrNudMinimum.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrReceiverRecode + 'ucrNudLevels ' - Me.ucrReceiverRecode.AutoSize = True - Me.ucrReceiverRecode.frmParent = Me - Me.ucrReceiverRecode.Location = New System.Drawing.Point(247, 61) - Me.ucrReceiverRecode.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverRecode.Name = "ucrReceiverRecode" - Me.ucrReceiverRecode.Selector = Nothing - Me.ucrReceiverRecode.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverRecode.strNcFilePath = "" - Me.ucrReceiverRecode.TabIndex = 2 - Me.ucrReceiverRecode.ucrSelector = Nothing + Me.ucrNudLevels.AutoSize = True + Me.ucrNudLevels.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLevels.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLevels.Location = New System.Drawing.Point(99, 22) + Me.ucrNudLevels.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLevels.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLevels.Name = "ucrNudLevels" + Me.ucrNudLevels.Size = New System.Drawing.Size(50, 20) + Me.ucrNudLevels.TabIndex = 22 + Me.ucrNudLevels.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkAddLabels + ' + Me.ucrChkAddLabels.AutoSize = True + Me.ucrChkAddLabels.Checked = False + Me.ucrChkAddLabels.Location = New System.Drawing.Point(5, 201) + Me.ucrChkAddLabels.Name = "ucrChkAddLabels" + Me.ucrChkAddLabels.Size = New System.Drawing.Size(149, 23) + Me.ucrChkAddLabels.TabIndex = 11 + ' + 'ucrSaveRecode + ' + Me.ucrSaveRecode.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveRecode.Location = New System.Drawing.Point(5, 229) + Me.ucrSaveRecode.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveRecode.Name = "ucrSaveRecode" + Me.ucrSaveRecode.Size = New System.Drawing.Size(328, 22) + Me.ucrSaveRecode.TabIndex = 12 + ' + 'ucrPnlRadioButtons + ' + Me.ucrPnlRadioButtons.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlRadioButtons.Location = New System.Drawing.Point(5, 19) + Me.ucrPnlRadioButtons.Name = "ucrPnlRadioButtons" + Me.ucrPnlRadioButtons.Size = New System.Drawing.Size(213, 73) + Me.ucrPnlRadioButtons.TabIndex = 27 ' 'ucrSelectorForRecode ' @@ -170,46 +185,52 @@ Partial Class dlgRecodeNumeric Me.ucrSelectorForRecode.bDropUnusedFilterLevels = False Me.ucrSelectorForRecode.bShowHiddenColumns = False Me.ucrSelectorForRecode.bUseCurrentFilter = True - Me.ucrSelectorForRecode.Location = New System.Drawing.Point(10, 10) + Me.ucrSelectorForRecode.Location = New System.Drawing.Point(5, 10) Me.ucrSelectorForRecode.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForRecode.Name = "ucrSelectorForRecode" Me.ucrSelectorForRecode.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorForRecode.TabIndex = 0 + Me.ucrSelectorForRecode.TabIndex = 7 ' - 'ucrBase + 'grpQuantileGroups ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 261) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 10 + Me.grpQuantileGroups.Controls.Add(Me.rdoBreakPoints) + Me.grpQuantileGroups.Controls.Add(Me.rdoMinimum) + Me.grpQuantileGroups.Controls.Add(Me.rdoLevels) + Me.grpQuantileGroups.Controls.Add(Me.ucrMultipleNumericRecode) + Me.grpQuantileGroups.Controls.Add(Me.ucrNudMinimum) + Me.grpQuantileGroups.Controls.Add(Me.ucrNudLevels) + Me.grpQuantileGroups.Controls.Add(Me.ucrPnlRadioButtons) + Me.grpQuantileGroups.Location = New System.Drawing.Point(233, 84) + Me.grpQuantileGroups.Name = "grpQuantileGroups" + Me.grpQuantileGroups.Size = New System.Drawing.Size(226, 106) + Me.grpQuantileGroups.TabIndex = 10 + Me.grpQuantileGroups.TabStop = False + Me.grpQuantileGroups.Text = "Groups" ' - 'ucrChkAddLabels + 'lblSelectedVariable ' - Me.ucrChkAddLabels.AutoSize = True - Me.ucrChkAddLabels.Checked = False - Me.ucrChkAddLabels.Location = New System.Drawing.Point(12, 204) - Me.ucrChkAddLabels.Name = "ucrChkAddLabels" - Me.ucrChkAddLabels.Size = New System.Drawing.Size(100, 23) - Me.ucrChkAddLabels.TabIndex = 21 + Me.lblSelectedVariable.AutoSize = True + Me.lblSelectedVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblSelectedVariable.Location = New System.Drawing.Point(235, 44) + Me.lblSelectedVariable.Name = "lblSelectedVariable" + Me.lblSelectedVariable.Size = New System.Drawing.Size(93, 13) + Me.lblSelectedVariable.TabIndex = 8 + Me.lblSelectedVariable.Tag = "Selected_Variable" + Me.lblSelectedVariable.Text = "Selected Variable:" ' 'dlgRecodeNumeric ' 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(418, 316) + Me.ClientSize = New System.Drawing.Size(463, 316) + Me.Controls.Add(Me.ucrReceiverRecode) + Me.Controls.Add(Me.ucrBase) Me.Controls.Add(Me.ucrChkAddLabels) Me.Controls.Add(Me.ucrSaveRecode) - Me.Controls.Add(Me.ucrMultipleNumericRecode) - Me.Controls.Add(Me.ucrInputMultipleLabels) - Me.Controls.Add(Me.grpClosedOn) - Me.Controls.Add(Me.lblBreakPoints) - Me.Controls.Add(Me.ucrReceiverRecode) Me.Controls.Add(Me.ucrSelectorForRecode) + Me.Controls.Add(Me.grpQuantileGroups) Me.Controls.Add(Me.lblSelectedVariable) - Me.Controls.Add(Me.ucrBase) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False @@ -217,23 +238,28 @@ Partial Class dlgRecodeNumeric Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Recode_Numeric" Me.Text = "Recode Numeric" - Me.grpClosedOn.ResumeLayout(False) - Me.grpClosedOn.PerformLayout() + Me.grpQuantileGroups.ResumeLayout(False) + Me.grpQuantileGroups.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() - End Sub - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents lblSelectedVariable As Label - Friend WithEvents ucrSelectorForRecode As ucrSelectorByDataFrameAddRemove - Friend WithEvents ucrReceiverRecode As ucrReceiverSingle - Friend WithEvents lblBreakPoints As Label - Friend WithEvents grpClosedOn As GroupBox - Friend WithEvents ucrInputMultipleLabels As ucrInputTextBox - Friend WithEvents ucrMultipleNumericRecode As ucrInputTextBox - Friend WithEvents ucrSaveRecode As ucrSave - Friend WithEvents ucrPnlClosedOn As UcrPanel - Friend WithEvents rdoRight As RadioButton - Friend WithEvents rdoLeft As RadioButton + End Sub + + Friend WithEvents ucrReceiverRecode As ucrReceiverSingle + Friend WithEvents ucrBase As ucrButtons Friend WithEvents ucrChkAddLabels As ucrCheck + Friend WithEvents ucrSaveRecode As ucrSave + Friend WithEvents ucrSelectorForRecode As ucrSelectorByDataFrameAddRemove + Friend WithEvents grpQuantileGroups As GroupBox + Friend WithEvents rdoBreakPoints As RadioButton + Friend WithEvents rdoMinimum As RadioButton + Friend WithEvents rdoLevels As RadioButton + Friend WithEvents ucrMultipleNumericRecode As ucrInputTextBox + Friend WithEvents ucrNudMinimum As ucrNud + Friend WithEvents ucrNudLevels As ucrNud + Friend WithEvents ucrPnlRadioButtons As UcrPanel + Friend WithEvents lblSelectedVariable As Label + Friend WithEvents ttMinimum As ToolTip + Friend WithEvents ttBreakpoint As ToolTip + Friend WithEvents ttLevels As ToolTip End Class diff --git a/instat/dlgRecodeNumeric.resx b/instat/dlgRecodeNumeric.resx index 29dcb1b3a35..3a5e29a99c2 100644 --- a/instat/dlgRecodeNumeric.resx +++ b/instat/dlgRecodeNumeric.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 362, 17 + + + 474, 17 + + + 593, 17 + \ No newline at end of file diff --git a/instat/dlgRecodeNumeric.vb b/instat/dlgRecodeNumeric.vb index 34997207ae8..60a9c2f38b5 100644 --- a/instat/dlgRecodeNumeric.vb +++ b/instat/dlgRecodeNumeric.vb @@ -18,7 +18,8 @@ Imports instat.Translations Public Class dlgRecodeNumeric Public bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsCutFunction As New RFunction + Private clsCut2Function As New RFunction + Private clsDummyRfunction As New RFunction Public strDefaultDataFrame As String = "" Public strDefaultColumn As String = "" @@ -34,151 +35,109 @@ Public Class dlgRecodeNumeric bReset = False TestOKEnabled() autoTranslate(Me) - SetDefaultColumn() End Sub Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 43 - ucrReceiverRecode.SetParameter(New RParameter("x", iNewPosition:=2)) + ucrPnlRadioButtons.SetParameter(New RParameter("type", 0)) + ucrPnlRadioButtons.AddRadioButton(rdoLevels, "levels") + ucrPnlRadioButtons.AddRadioButton(rdoMinimum, "minimum") + ucrPnlRadioButtons.AddRadioButton(rdoBreakPoints, "points") + + ucrReceiverRecode.SetParameter(New RParameter("x", 0)) ucrReceiverRecode.SetParameterIsRFunction() ucrReceiverRecode.Selector = ucrSelectorForRecode ucrReceiverRecode.SetIncludedDataTypes({"numeric"}) ucrReceiverRecode.strSelectorHeading = "Numerics" + ucrReceiverRecode.SetMeAsReceiver() + + ucrNudLevels.SetParameter(New RParameter("g", 1)) + ucrNudLevels.SetMinMax(1) + ucrNudLevels.Value = 4 + + ucrNudMinimum.SetParameter(New RParameter("m", 2)) + ucrNudMinimum.SetMinMax(1) + + ucrMultipleNumericRecode.SetValidationTypeAsNumericList(bNewAllowInf:=True) - ucrPnlClosedOn.SetParameter(New RParameter("right", iNewPosition:=3)) - ucrPnlClosedOn.AddRadioButton(rdoLeft, "FALSE") - ucrPnlClosedOn.AddRadioButton(rdoRight, "TRUE") + ttMinimum.SetToolTip(rdoMinimum, "Splits the data into groups of at least the specified size.") + ttLevels.SetToolTip(rdoLevels, "For a value of 4, splits the data so 4 groups are produced of (roughly) equal size.") + ttBreakpoint.SetToolTip(rdoBreakPoints, "Separate values by commas. For example 20, 30, 40, 50 gives 3 groups. If minimum is less than 20 then a 4th group is added. Similarly with a maximum more than 50.") + + ucrChkAddLabels.SetParameter(New RParameter("levels.mean", 4)) + ucrChkAddLabels.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkAddLabels.SetText("Label Groups with Means") + ucrChkAddLabels.SetRDefault("FALSE") + + ucrPnlRadioButtons.AddToLinkedControls(ucrNudLevels, {rdoLevels}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="4") + ucrPnlRadioButtons.AddToLinkedControls(ucrNudMinimum, {rdoMinimum}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="5") + ucrPnlRadioButtons.AddToLinkedControls(ucrMultipleNumericRecode, {rdoBreakPoints}, bNewLinkedHideIfParameterMissing:=True) - ucrChkAddLabels.SetText("Add Labels") - ucrChkAddLabels.AddParameterPresentCondition(True, "labels", True) - ucrChkAddLabels.AddParameterPresentCondition(False, "labels", False) - ucrChkAddLabels.AddToLinkedControls(ucrInputMultipleLabels, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) - ucrSaveRecode.SetPrefix("recode") ucrSaveRecode.SetSaveTypeAsColumn() ucrSaveRecode.SetDataFrameSelector(ucrSelectorForRecode.ucrAvailableDataFrames) ucrSaveRecode.SetIsComboBox() - ucrSaveRecode.SetLabelText("New column name:") + ucrSaveRecode.SetLabelText("New Column Name:") ucrSaveRecode.setLinkedReceiver(ucrReceiverRecode) - - - ucrInputMultipleLabels.SetValidationTypeAsList() - ucrMultipleNumericRecode.SetValidationTypeAsNumericList(bNewAllowInf:=True) - End Sub - - Private Sub SetDefaultColumn() - If strDefaultDataFrame <> "" Then - ucrSelectorForRecode.SetDataframe(strDefaultDataFrame) - End If - If strDefaultColumn <> "" Then - ucrReceiverRecode.Add(strDefaultColumn, strDefaultDataFrame) - ucrSaveRecode.Focus() - End If - strDefaultDataFrame = "" - strDefaultColumn = "" End Sub Private Sub SetDefaults() - clsCutFunction = New RFunction + clsCut2Function = New RFunction + clsDummyRfunction = New RFunction ucrSelectorForRecode.Reset() ucrSaveRecode.Reset() - ucrReceiverRecode.SetMeAsReceiver() ucrMultipleNumericRecode.SetName("") - ucrInputMultipleLabels.SetName("") - clsCutFunction.SetRCommand("cut") - clsCutFunction.AddParameter("include.lowest", "TRUE", iPosition:=0) - clsCutFunction.AddParameter("dig.lab", "10", iPosition:=1) - clsCutFunction.AddParameter("right", "FALSE", iPosition:=3) + clsCut2Function.SetPackageName("Hmisc") + clsCut2Function.SetRCommand("cut2") + clsDummyRfunction.AddParameter("type", "levels", iPosition:=0) - ucrBase.clsRsyntax.SetBaseRFunction(clsCutFunction) + ucrBase.clsRsyntax.SetBaseRFunction(clsCut2Function) End Sub Private Sub SetRCodeForControls(bReset) - ucrReceiverRecode.SetRCode(clsCutFunction, bReset) - ucrSaveRecode.SetRCode(clsCutFunction, bReset) - ucrChkAddLabels.SetRCode(clsCutFunction, bReset) - ucrPnlClosedOn.SetRCode(clsCutFunction, bReset) + ucrNudMinimum.SetRCode(clsCut2Function, bReset) + ucrNudLevels.SetRCode(clsCut2Function, bReset) + ucrReceiverRecode.SetRCode(clsCut2Function, bReset) + ucrSaveRecode.SetRCode(clsCut2Function, bReset) + ucrChkAddLabels.SetRCode(clsCut2Function, bReset) + ucrPnlRadioButtons.SetRCode(clsDummyRfunction, bReset) End Sub - Private Sub TestOKEnabled() - Dim iTemp As Integer - - If Not ucrReceiverRecode.IsEmpty() AndAlso Not ucrMultipleNumericRecode.IsEmpty AndAlso ucrSaveRecode.IsComplete Then - If ucrChkAddLabels.Checked AndAlso Not ucrInputMultipleLabels.IsEmpty Then - If (ucrMultipleNumericRecode.clsRList.clsParameters.Count > 1 AndAlso (Not ucrInputMultipleLabels.clsRList.clsParameters.Count <> ucrMultipleNumericRecode.clsRList.clsParameters.Count - 1)) OrElse (ucrMultipleNumericRecode.clsRList.clsParameters.Count = 1 AndAlso Integer.TryParse(ucrMultipleNumericRecode.clsRList.clsParameters(0).strArgumentValue, iTemp) AndAlso iTemp = ucrInputMultipleLabels.clsRList.clsParameters.Count) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) - End If - Else - ucrBase.OKEnabled(True) - End If + If Not ucrReceiverRecode.IsEmpty() AndAlso ucrSaveRecode.IsComplete AndAlso (rdoMinimum.Checked AndAlso Not ucrNudMinimum.IsEmpty OrElse rdoLevels.Checked AndAlso Not ucrNudLevels.IsEmpty OrElse rdoBreakPoints.Checked AndAlso Not ucrMultipleNumericRecode.IsEmpty) Then + ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) End If End Sub - Private Sub ucrMultipleNumericRecode_NameChanged() Handles ucrMultipleNumericRecode.NameChanged - 'Warning: Apparently the event is raised twice, such that the message is sent twice... - 'This sub is sending validation errors to the user for him/her to fill in the settingsof the dialogue in an appropriate way. - 'In case he/she enters only one number in ucrMultipleNumericRecode, this number has to be greater than one, as it is the number of intervals for cut. - 'Otherwise, if the user enters the list of break points, the resulting number of intervals should be smaller than the number of labels (see - If ucrMultipleNumericRecode.GetText <> "" AndAlso ucrMultipleNumericRecode.clsRList.clsParameters.Count = 1 Then - MsgBox("If the input of break points is a single number, it is understood as the number of intervals. It has to be > 1, otherwise an error will occur.", vbOKOnly, "Validation Error") - Else - ValidateBreakPointLabelCount() - End If - ucrBase.clsRsyntax.AddParameter("breaks", clsRFunctionParameter:=ucrMultipleNumericRecode.clsRList) - End Sub - - Private Sub ucrMultipleLabels_NameChanged() Handles ucrInputMultipleLabels.NameChanged - AddLabelsParameter() - End Sub - - Private Sub ucrMultipleNumericRecode_Validated(sender As Object, e As EventArgs) Handles ucrMultipleNumericRecode.Validated, ucrInputMultipleLabels.Validated - ValidateBreakPointLabelCount() - End Sub - - Private Sub AddLabelsParameter() - If Not ucrInputMultipleLabels.IsEmpty() Then - clsCutFunction.AddParameter("labels", clsRFunctionParameter:=ucrInputMultipleLabels.clsRList) - Else - clsCutFunction.RemoveParameterByName("labels") - End If - End Sub - - Private Sub ValidateBreakPointLabelCount() - Dim iTemp As Integer - - If Not ucrMultipleNumericRecode.IsEmpty() AndAlso (Not ucrInputMultipleLabels.IsEmpty()) Then - If ucrMultipleNumericRecode.clsRList.clsParameters.Count > 1 AndAlso ucrInputMultipleLabels.clsRList.clsParameters.Count <> ucrMultipleNumericRecode.clsRList.clsParameters.Count - 1 Then - MsgBox("There must be one less label than the number of break points. Ok will not be enabled until this is resolved.", vbOKOnly, "Validation Error") - ElseIf ucrMultipleNumericRecode.clsRList.clsParameters.Count = 1 AndAlso Integer.TryParse(ucrMultipleNumericRecode.clsRList.clsParameters(0).strArgumentValue, iTemp) AndAlso iTemp <> ucrInputMultipleLabels.clsRList.clsParameters.Count Then - MsgBox("There must be the same number of labels to the number of intervals. Ok will not be enabled until this is resolved.", vbOKOnly, "Validation Error") - End If - 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 ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrMultipleNumericRecode.ControlContentsChanged, ucrInputMultipleLabels.ControlContentsChanged, ucrReceiverRecode.ControlContentsChanged, - ucrSaveRecode.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged - TestOKEnabled() - End Sub - Private Sub ucrChkAddLabels_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkAddLabels.ControlValueChanged If ucrChkAddLabels.Checked Then - AddLabelsParameter() + clsCut2Function.AddParameter("digits", "3", iPosition:=6) + Else + clsCut2Function.RemoveParameterByName("digits") + End If + End Sub + + Private Sub ucrPnlRadioButtons_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlRadioButtons.ControlValueChanged, ucrMultipleNumericRecode.ControlValueChanged + If rdoBreakPoints.Checked Then + clsCut2Function.AddParameter("cuts", clsRFunctionParameter:=ucrMultipleNumericRecode.clsRList, iPosition:=5) Else - clsCutFunction.RemoveParameterByName("labels") + clsCut2Function.RemoveParameterByName("cuts") End If End Sub + + Private Sub ucrControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrMultipleNumericRecode.ControlContentsChanged, ucrReceiverRecode.ControlContentsChanged, + ucrSaveRecode.ControlContentsChanged, ucrChkAddLabels.ControlContentsChanged, ucrNudMinimum.ControlContentsChanged, ucrNudLevels.ControlContentsChanged, ucrPnlRadioButtons.ControlContentsChanged + TestOKEnabled() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgRegularSequence.designer.vb b/instat/dlgRegularSequence.designer.vb index 96b7abeda50..12ecc3dc9b1 100644 --- a/instat/dlgRegularSequence.designer.vb +++ b/instat/dlgRegularSequence.designer.vb @@ -264,7 +264,7 @@ Partial Class dlgRegularSequence ' Me.lblPreview.AutoSize = True Me.lblPreview.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPreview.Location = New System.Drawing.Point(258, 80) + Me.lblPreview.Location = New System.Drawing.Point(258, 59) Me.lblPreview.Name = "lblPreview" Me.lblPreview.Size = New System.Drawing.Size(100, 13) Me.lblPreview.TabIndex = 5 @@ -273,7 +273,7 @@ Partial Class dlgRegularSequence ' 'txtGetPreview ' - Me.txtGetPreview.Location = New System.Drawing.Point(256, 96) + Me.txtGetPreview.Location = New System.Drawing.Point(256, 75) Me.txtGetPreview.Name = "txtGetPreview" Me.txtGetPreview.ReadOnly = True Me.txtGetPreview.Size = New System.Drawing.Size(185, 140) @@ -285,7 +285,7 @@ Partial Class dlgRegularSequence Me.lblMessage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle Me.lblMessage.Font = New System.Drawing.Font("Microsoft Sans Serif", 9.75!) Me.lblMessage.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMessage.Location = New System.Drawing.Point(256, 243) + Me.lblMessage.Location = New System.Drawing.Point(255, 218) Me.lblMessage.Name = "lblMessage" Me.lblMessage.Size = New System.Drawing.Size(185, 52) Me.lblMessage.TabIndex = 7 diff --git a/instat/dlgRegularSequence.vb b/instat/dlgRegularSequence.vb index 8b777de8308..3b08ec379a5 100644 --- a/instat/dlgRegularSequence.vb +++ b/instat/dlgRegularSequence.vb @@ -373,7 +373,9 @@ Public Class dlgRegularSequence End Sub Private Sub ucrInputComboDatesBy_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputComboDatesBy.ControlValueChanged - ResetNumberFromToByParameters() + If bUpdateBy Then + ResetNumberFromToByParameters() + End If End Sub Private Sub lblPreview_Click(sender As Object, e As EventArgs) Handles lblPreview.Click diff --git a/instat/dlgSaveAs.Designer.vb b/instat/dlgSaveAs.Designer.vb index b3875c681c9..86c7ed5c09c 100644 --- a/instat/dlgSaveAs.Designer.vb +++ b/instat/dlgSaveAs.Designer.vb @@ -38,7 +38,6 @@ Partial Class dlgSaveAs 'Do not modify it using the code editor. Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgSaveAs)) Me.lblConfirm = New System.Windows.Forms.Label() Me.ucrBase = New instat.ucrButtons() Me.ucrFilePath = New instat.ucrFilePath() @@ -48,7 +47,7 @@ Partial Class dlgSaveAs ' Me.lblConfirm.AutoSize = True Me.lblConfirm.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblConfirm.Location = New System.Drawing.Point(96, 40) + Me.lblConfirm.Location = New System.Drawing.Point(96, 44) Me.lblConfirm.Name = "lblConfirm" Me.lblConfirm.Size = New System.Drawing.Size(140, 13) Me.lblConfirm.TabIndex = 3 @@ -69,22 +68,21 @@ Partial Class dlgSaveAs Me.ucrFilePath.AutoSize = True Me.ucrFilePath.DefaultFileSuggestionName = "" Me.ucrFilePath.FilePath = "" - Me.ucrFilePath.FilePathBrowseText = resources.GetString("ucrFilePath.FilePathBrowseText") + Me.ucrFilePath.FilePathBrowseText = "Browse" Me.ucrFilePath.FilePathDialogFilter = "RDS Data file (*.RDS)|*.RDS" Me.ucrFilePath.FilePathDialogTitle = "Save Data File" - Me.ucrFilePath.FilePathLabel = resources.GetString("ucrFilePath.FilePathLabel") + Me.ucrFilePath.FilePathLabel = "Save As:" Me.ucrFilePath.FolderBrowse = False Me.ucrFilePath.Location = New System.Drawing.Point(1, 11) Me.ucrFilePath.Name = "ucrFilePath" Me.ucrFilePath.SelectedFileFilterIndex = 1 - Me.ucrFilePath.Size = New System.Drawing.Size(3099, 71) + Me.ucrFilePath.Size = New System.Drawing.Size(429, 34) Me.ucrFilePath.TabIndex = 7 ' 'dlgSaveAs ' 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(434, 124) Me.Controls.Add(Me.ucrFilePath) Me.Controls.Add(Me.lblConfirm) diff --git a/instat/dlgSaveAs.resx b/instat/dlgSaveAs.resx index ba710e5708b..29dcb1b3a35 100644 --- a/instat/dlgSaveAs.resx +++ b/instat/dlgSaveAs.resx @@ -117,18 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Browse' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - - - Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Unable to load DLL 'SQLite.Interop.dll': The specified module could not be found. (Exception from HRESULT: 0x8007007E) -A problem occured attempting to translate string 'Save Data To:' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db.' to language en using database C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE/translations\rInstatTranslations.db. - \ No newline at end of file diff --git a/instat/dlgSaveAs.vb b/instat/dlgSaveAs.vb index 096daa62dc3..c6766389fc2 100644 --- a/instat/dlgSaveAs.vb +++ b/instat/dlgSaveAs.vb @@ -75,7 +75,7 @@ Public Class dlgSaveAs Private Sub ucrBase_ClickOk(sender As Object, e As EventArgs) Handles ucrBase.ClickOk frmMain.strSaveFilePath = ucrFilePath.FilePath - frmMain.clsRecentItems.addToMenu(Replace(ucrFilePath.FilePath, "/", "\")) + frmMain.clsRecentItems.addToMenu(Replace(ucrFilePath.FilePath, "\", "/")) frmMain.bDataSaved = True End Sub diff --git a/instat/dlgSeasonalPlot.vb b/instat/dlgSeasonalPlot.vb index b75cde55f8e..5ba9cf126e6 100644 --- a/instat/dlgSeasonalPlot.vb +++ b/instat/dlgSeasonalPlot.vb @@ -192,7 +192,7 @@ Public Class dlgSeasonalPlot ucrInputSmoothing.AddRCodeIsRFunctionCondition("Periodic Splines", bNewIsPositive:=False) ucrInputSmoothing.AddParameterValueFunctionNamesCondition("Periodic Splines", strParameterName:="1", strFunctionName:="pbs") ucrInputSmoothing.AddRCodeIsRFunctionCondition("Natural Splines", bNewIsPositive:=False) - ucrInputSmoothing.AddParameterValueFunctionNamesCondition("Natural Splines", strParameterName:="1", strFunctionName:="ns") + ucrInputSmoothing.AddParameterValueFunctionNamesCondition("Natural Splines", strParameterName:="1", strFunctionName:="naturalSpline") ucrInputSmoothing.AddRCodeIsRFunctionCondition("LOESS", bNewIsPositive:=False) ucrInputSmoothing.AddParameterIsStringCondition("LOESS", "1") @@ -450,8 +450,8 @@ Public Class dlgSeasonalPlot clsPbsFunction.AddParameter("x", "x", bIncludeArgumentName:=False, iPosition:=0) clsPbsFunction.AddParameter("df", 6, iPosition:=1) - clsNsFunction.SetPackageName("splines") - clsNsFunction.SetRCommand("ns") + clsNsFunction.SetPackageName("splines2") + clsNsFunction.SetRCommand("naturalSpline") clsNsFunction.AddParameter("x", "x", bIncludeArgumentName:=False, iPosition:=0) clsNsFunction.AddParameter("df", 6, iPosition:=1) diff --git a/instat/dlgShowModel.Designer.vb b/instat/dlgShowModel.Designer.vb index 57df65e8d7b..43ab36472b6 100644 --- a/instat/dlgShowModel.Designer.vb +++ b/instat/dlgShowModel.Designer.vb @@ -197,7 +197,7 @@ Partial Class dlgShowModel Me.ucrDistributionAndParameters.AutoSize = True Me.ucrDistributionAndParameters.Location = New System.Drawing.Point(241, 101) Me.ucrDistributionAndParameters.Name = "ucrDistributionAndParameters" - Me.ucrDistributionAndParameters.Size = New System.Drawing.Size(1037, 147) + Me.ucrDistributionAndParameters.Size = New System.Drawing.Size(1037, 172) Me.ucrDistributionAndParameters.TabIndex = 6 ' 'ucrSelectorShowModel @@ -238,7 +238,6 @@ Partial Class dlgShowModel ' 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(500, 372) Me.Controls.Add(Me.ucrSaveNewColumn) Me.Controls.Add(Me.rdoValues) diff --git a/instat/dlgSplitText.Designer.vb b/instat/dlgSplitText.Designer.vb index 53e7a93bc93..66455e9b7d1 100644 --- a/instat/dlgSplitText.Designer.vb +++ b/instat/dlgSplitText.Designer.vb @@ -52,9 +52,10 @@ Partial Class dlgSplitText Me.ucrReceiverSplitTextColumn = New instat.ucrReceiverSingle() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlTextComponents = New instat.UcrPanel() - Me.ucrChkAddKeyboard = New instat.ucrCheck() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrSelectorSplitTextColumn = New instat.ucrSelectorByDataFrameAddRemove() + Me.cmdAddkeyboard = New System.Windows.Forms.Button() + Me.ucrInputRegexPattern = New instat.ucrInputTextBox() Me.SuspendLayout() ' 'lblSelectedFactor @@ -219,15 +220,6 @@ Partial Class dlgSplitText Me.ucrPnlTextComponents.Size = New System.Drawing.Size(205, 63) Me.ucrPnlTextComponents.TabIndex = 8 ' - 'ucrChkAddKeyboard - ' - Me.ucrChkAddKeyboard.AutoSize = True - Me.ucrChkAddKeyboard.Checked = False - Me.ucrChkAddKeyboard.Location = New System.Drawing.Point(249, 273) - Me.ucrChkAddKeyboard.Name = "ucrChkAddKeyboard" - Me.ucrChkAddKeyboard.Size = New System.Drawing.Size(158, 23) - Me.ucrChkAddKeyboard.TabIndex = 23 - ' 'ucrChkIncludeRegularExpressions ' Me.ucrChkIncludeRegularExpressions.AutoSize = True @@ -249,14 +241,35 @@ Partial Class dlgSplitText Me.ucrSelectorSplitTextColumn.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorSplitTextColumn.TabIndex = 24 ' + 'cmdAddkeyboard + ' + Me.cmdAddkeyboard.Location = New System.Drawing.Point(272, 273) + Me.cmdAddkeyboard.Name = "cmdAddkeyboard" + Me.cmdAddkeyboard.Size = New System.Drawing.Size(105, 23) + Me.cmdAddkeyboard.TabIndex = 25 + Me.cmdAddkeyboard.Text = "Add Keyboard" + Me.cmdAddkeyboard.UseVisualStyleBackColor = True + ' + 'ucrInputRegexPattern + ' + Me.ucrInputRegexPattern.AddQuotesIfUnrecognised = True + Me.ucrInputRegexPattern.AutoSize = True + Me.ucrInputRegexPattern.IsMultiline = False + Me.ucrInputRegexPattern.IsReadOnly = False + Me.ucrInputRegexPattern.Location = New System.Drawing.Point(257, 124) + Me.ucrInputRegexPattern.Name = "ucrInputRegexPattern" + Me.ucrInputRegexPattern.Size = New System.Drawing.Size(137, 21) + Me.ucrInputRegexPattern.TabIndex = 26 + ' 'dlgSplitText ' 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(453, 392) + Me.Controls.Add(Me.ucrInputRegexPattern) + Me.Controls.Add(Me.cmdAddkeyboard) Me.Controls.Add(Me.ucrSelectorSplitTextColumn) - Me.Controls.Add(Me.ucrChkAddKeyboard) Me.Controls.Add(Me.ucrChkIncludeRegularExpressions) Me.Controls.Add(Me.rdoFixedNumberOfComponents) Me.Controls.Add(Me.rdoMaximumNumberOfComponents) @@ -298,7 +311,8 @@ Partial Class dlgSplitText Friend WithEvents rdoFixedNumberOfComponents As RadioButton Friend WithEvents rdoMaximumNumberOfComponents As RadioButton Friend WithEvents ucrPnlTextComponents As UcrPanel - Friend WithEvents ucrChkAddKeyboard As ucrCheck Friend WithEvents ucrChkIncludeRegularExpressions As ucrCheck Friend WithEvents ucrSelectorSplitTextColumn As ucrSelectorByDataFrameAddRemove + Friend WithEvents cmdAddkeyboard As Button + Friend WithEvents ucrInputRegexPattern As ucrInputTextBox End Class \ No newline at end of file diff --git a/instat/dlgSplitText.vb b/instat/dlgSplitText.vb index 01a874526de..8ef13276916 100644 --- a/instat/dlgSplitText.vb +++ b/instat/dlgSplitText.vb @@ -57,6 +57,7 @@ Public Class dlgSplitText ucrPnlSplitText.AddToLinkedControls(ucrSaveColumn, {rdoTextComponents}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlSplitText.AddToLinkedControls(ucrChkIncludeRegularExpressions, {rdoTextComponents}, bNewLinkedHideIfParameterMissing:=True) ucrPnlSplitText.AddToLinkedControls(ucrPnlTextComponents, {rdoTextComponents}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=rdoFixedNumberOfComponents) + ucrChkIncludeRegularExpressions.AddToLinkedControls(ucrInputRegexPattern, {True}, bNewLinkedHideIfParameterMissing:=True) ucrNudPieces.SetLinkedDisplayControl(lblNumberofPiecesToReturn) ucrReceiverSplitTextColumn.SetParameter(New RParameter("string", 0)) @@ -74,20 +75,16 @@ Public Class dlgSplitText dctPatternPairs.Add("Hyphen -", Chr(34) & "-" & Chr(34)) dctPatternPairs.Add("Underscore _", Chr(34) & "_" & Chr(34)) ucrInputPattern.SetItems(dctPatternPairs) - ucrInputPattern.SetRDefault(Chr(34) & "," & Chr(34)) + ucrInputPattern.bAllowNonConditionValues = True ucrNudPieces.SetParameter(New RParameter("n", 2)) ucrNudPieces.SetMinMax(2, Integer.MaxValue) ucrChkIncludeRegularExpressions.SetText("Include Regular Expressions") ucrChkIncludeRegularExpressions.SetParameter(New RParameter("checked", 0)) - ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked(True, False) ucrChkIncludeRegularExpressions.SetRDefault("FALSE") - 'This is not yet implemented - ucrChkAddKeyboard.SetText("Add keyboard") - ucrChkAddKeyboard.Enabled = False - ucrChkAddKeyboard.Visible = False ucrSaveColumn.SetSaveTypeAsColumn() ucrSaveColumn.SetDataFrameSelector(ucrSelectorSplitTextColumn.ucrAvailableDataFrames) @@ -107,6 +104,12 @@ Public Class dlgSplitText ucrSelectorSplitTextColumn.Reset() + ucrInputRegexPattern.SetName("") + + clsSplitDummyFunction.AddParameter("checked", False, iPosition:=0) + + clsPatternDummyFunction.AddParameter("pattern", Chr(34) & "," & Chr(34), iPosition:=1) + clsStringCollFunction.SetPackageName("stringr") clsStringCollFunction.SetRCommand("coll") clsStringCollFunction.AddParameter("pattern", Chr(34) & "," & Chr(34), iPosition:=0) @@ -156,14 +159,23 @@ Public Class dlgSplitText SetDefaults() SetRCodeForControls(True) TestOKEnabled() + sdgConstructRegexExpression.ucrReceiverForRegex.Clear() + End Sub + + Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click + sdgConstructRegexExpression.ShowDialog() + ucrInputRegexPattern.SetName(sdgConstructRegexExpression.ucrReceiverForRegex.GetText()) End Sub Private Sub ucrPnlSplitText_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSplitText.ControlValueChanged If rdoBinaryColumns.Checked Then + cmdAddkeyboard.Visible = False ucrBase.clsRsyntax.SetBaseRFunction(clsBinaryColumns) ElseIf rdoTextComponents.Checked Then SplitTextOptions() End If + + SetVisibleAddKeyboardButton() ChangeParametersValues() End Sub @@ -172,6 +184,14 @@ Public Class dlgSplitText ChangeParametersValues() End Sub + Private Sub SetVisibleAddKeyboardButton() + If rdoBinaryColumns.Checked Then + cmdAddkeyboard.Visible = False + Else + cmdAddkeyboard.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) + End If + End Sub + Private Sub ChangeParametersValues() Dim strPattern As String @@ -184,8 +204,8 @@ Public Class dlgSplitText clsTextComponentsMaximum.RemoveParameterByName("pattern") clsBinaryColumns.AddParameter("split.char", strPattern, iPosition:=1) If ucrChkIncludeRegularExpressions.Checked Then - clsTextComponentsFixed.AddParameter("pattern", strPattern, iPosition:=1) - clsTextComponentsMaximum.AddParameter("pattern", strPattern, iPosition:=1) + clsTextComponentsFixed.AddParameter("pattern", Chr(34) & ucrInputRegexPattern.GetText & Chr(34), iPosition:=1) + clsTextComponentsMaximum.AddParameter("pattern", Chr(34) & ucrInputRegexPattern.GetText & Chr(34), iPosition:=1) Else clsStringCollFunction.AddParameter("pattern", strPattern, iPosition:=0) clsTextComponentsFixed.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) @@ -201,11 +221,12 @@ Public Class dlgSplitText End If End Sub - Private Sub ucrChkIncludeRegularExpressions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverSplitTextColumn.ControlValueChanged, ucrInputPattern.ControlValueChanged + Private Sub ucrChkIncludeRegularExpressions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverSplitTextColumn.ControlValueChanged, ucrInputPattern.ControlValueChanged, ucrInputRegexPattern.ControlValueChanged ChangeParametersValues() + SetVisibleAddKeyboardButton() End Sub - Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputPattern.ControlContentsChanged, ucrReceiverSplitTextColumn.ControlContentsChanged, ucrNudPieces.ControlContentsChanged, ucrSaveColumn.ControlContentsChanged, ucrPnlSplitText.ControlContentsChanged + Private Sub Controls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverSplitTextColumn.ControlContentsChanged, ucrNudPieces.ControlContentsChanged, ucrSaveColumn.ControlContentsChanged, ucrPnlSplitText.ControlContentsChanged TestOKEnabled() End Sub End Class \ No newline at end of file diff --git a/instat/dlgStringHandling.Designer.vb b/instat/dlgStringHandling.Designer.vb index 86a0d85cdd2..24754beacfb 100644 --- a/instat/dlgStringHandling.Designer.vb +++ b/instat/dlgStringHandling.Designer.vb @@ -41,41 +41,35 @@ Partial Class dlgStringHandling Me.lblColumn = New System.Windows.Forms.Label() Me.lblReplaceBy = New System.Windows.Forms.Label() Me.lblPattern = New System.Windows.Forms.Label() - Me.rdoCount = New System.Windows.Forms.RadioButton() + Me.rdoDetect = New System.Windows.Forms.RadioButton() + Me.rdoRemove = New System.Windows.Forms.RadioButton() + Me.rdoReplaceNa = New System.Windows.Forms.RadioButton() Me.rdoReplace = New System.Windows.Forms.RadioButton() + Me.rdoFind = New System.Windows.Forms.RadioButton() + Me.grpModifiers = New System.Windows.Forms.GroupBox() + Me.cmdAddkeyboard = New System.Windows.Forms.Button() + Me.grpDetectOptions = New System.Windows.Forms.GroupBox() + Me.grpFindOptions = New System.Windows.Forms.GroupBox() Me.rdoLocate = New System.Windows.Forms.RadioButton() Me.rdoExtract = New System.Windows.Forms.RadioButton() - Me.rdoDetect = New System.Windows.Forms.RadioButton() - Me.rdoReplaceAll = New System.Windows.Forms.RadioButton() - Me.grpRegex = New System.Windows.Forms.GroupBox() - Me.cmdClear = New System.Windows.Forms.Button() - Me.cmdBackSlash = New System.Windows.Forms.Button() - Me.cmdWBackSlash = New System.Windows.Forms.Button() - Me.cmdDollarSign = New System.Windows.Forms.Button() - Me.cmdOpenCloseParenthesis = New System.Windows.Forms.Button() - Me.cmdBackSlashd = New System.Windows.Forms.Button() - Me.cmdBackSlashs = New System.Windows.Forms.Button() - Me.cmdPower = New System.Windows.Forms.Button() - Me.cmdOpenBracketCaretClosedBracket = New System.Windows.Forms.Button() - Me.cmdPlus = New System.Windows.Forms.Button() - Me.cmdBackSlashw = New System.Windows.Forms.Button() - Me.cmdMultiply = New System.Windows.Forms.Button() - Me.cmdOpenCloseBrace = New System.Windows.Forms.Button() - Me.cmdOpenClosedBracket = New System.Windows.Forms.Button() - Me.cmdSingleQuote = New System.Windows.Forms.Button() - Me.cmdQuote = New System.Windows.Forms.Button() - Me.cmdQuestionMark = New System.Windows.Forms.Button() - Me.cmdDBackSlah = New System.Windows.Forms.Button() - Me.cmdStar = New System.Windows.Forms.Button() - Me.cmdBbackSlash = New System.Windows.Forms.Button() - Me.cmdBackSlashb = New System.Windows.Forms.Button() - Me.cmdSbackSlash = New System.Windows.Forms.Button() - Me.cmdOr = New System.Windows.Forms.Button() - Me.rdoRegex = New System.Windows.Forms.RadioButton() - Me.rdoFixed = New System.Windows.Forms.RadioButton() - Me.ucrPnlFixedRegex = New instat.UcrPanel() + Me.rdoCount = New System.Windows.Forms.RadioButton() + Me.rdoEnds = New System.Windows.Forms.RadioButton() + Me.rdoStarts = New System.Windows.Forms.RadioButton() + Me.rdoDetects = New System.Windows.Forms.RadioButton() + Me.ucrChkAll = New instat.ucrCheck() + Me.ucrPnlFindOptions = New instat.UcrPanel() + Me.ucrChkReplaceAll = New instat.ucrCheck() + Me.ucrChkRemoveAll = New instat.ucrCheck() + Me.ucrInputReplaceNaBy = New instat.ucrInputTextBox() + Me.ucrChkReplaceBy = New instat.ucrCheck() + Me.ucrChkNegate = New instat.ucrCheck() + Me.ucrPnlDetectOptions = New instat.UcrPanel() + Me.ucrInputBoundary = New instat.ucrInputTextBox() + Me.ucrChkBoundary = New instat.ucrCheck() + Me.ucrChkIgnoreCase = New instat.ucrCheck() + Me.ucrChkComments = New instat.ucrCheck() + Me.ucrChkMultiline = New instat.ucrCheck() Me.ucrSaveStringHandling = New instat.ucrSave() - Me.ucrReceiverForRegexExpression = New instat.ucrReceiverExpression() Me.ucrChkIncludeRegularExpressions = New instat.ucrCheck() Me.ucrReceiverStringHandling = New instat.ucrReceiverSingle() Me.ucrInputReplaceBy = New instat.ucrInputTextBox() @@ -83,15 +77,16 @@ Partial Class dlgStringHandling Me.ucrSelectorStringHandling = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlStringHandling = New instat.UcrPanel() - Me.ucrChkAddKeyboard = New instat.ucrCheck() - Me.grpRegex.SuspendLayout() + Me.grpModifiers.SuspendLayout() + Me.grpDetectOptions.SuspendLayout() + Me.grpFindOptions.SuspendLayout() Me.SuspendLayout() ' 'lblColumn ' Me.lblColumn.AutoSize = True Me.lblColumn.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumn.Location = New System.Drawing.Point(263, 80) + Me.lblColumn.Location = New System.Drawing.Point(263, 55) Me.lblColumn.Name = "lblColumn" Me.lblColumn.Size = New System.Drawing.Size(45, 13) Me.lblColumn.TabIndex = 8 @@ -101,7 +96,7 @@ Partial Class dlgStringHandling ' Me.lblReplaceBy.AutoSize = True Me.lblReplaceBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblReplaceBy.Location = New System.Drawing.Point(264, 168) + Me.lblReplaceBy.Location = New System.Drawing.Point(264, 143) Me.lblReplaceBy.Name = "lblReplaceBy" Me.lblReplaceBy.Size = New System.Drawing.Size(65, 13) Me.lblReplaceBy.TabIndex = 12 @@ -111,28 +106,62 @@ Partial Class dlgStringHandling ' Me.lblPattern.AutoSize = True Me.lblPattern.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPattern.Location = New System.Drawing.Point(264, 122) + Me.lblPattern.Location = New System.Drawing.Point(263, 97) Me.lblPattern.Name = "lblPattern" Me.lblPattern.Size = New System.Drawing.Size(44, 13) Me.lblPattern.TabIndex = 10 Me.lblPattern.Text = "Pattern:" ' - 'rdoCount + 'rdoDetect ' - Me.rdoCount.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoCount.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCount.FlatAppearance.BorderSize = 2 - Me.rdoCount.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoCount.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCount.Location = New System.Drawing.Point(10, 4) - Me.rdoCount.Name = "rdoCount" - Me.rdoCount.Size = New System.Drawing.Size(86, 41) - Me.rdoCount.TabIndex = 1 - Me.rdoCount.TabStop = True - Me.rdoCount.Text = " Word Count" - Me.rdoCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoCount.UseVisualStyleBackColor = True + Me.rdoDetect.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoDetect.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDetect.FlatAppearance.BorderSize = 2 + Me.rdoDetect.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDetect.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoDetect.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoDetect.Location = New System.Drawing.Point(20, 4) + Me.rdoDetect.Name = "rdoDetect" + Me.rdoDetect.Size = New System.Drawing.Size(86, 41) + Me.rdoDetect.TabIndex = 1 + Me.rdoDetect.TabStop = True + Me.rdoDetect.Text = "Detect" + Me.rdoDetect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoDetect.UseVisualStyleBackColor = True + ' + 'rdoRemove + ' + Me.rdoRemove.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoRemove.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRemove.FlatAppearance.BorderSize = 2 + Me.rdoRemove.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoRemove.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoRemove.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoRemove.Location = New System.Drawing.Point(338, 4) + Me.rdoRemove.Name = "rdoRemove" + Me.rdoRemove.Size = New System.Drawing.Size(80, 41) + Me.rdoRemove.TabIndex = 5 + Me.rdoRemove.TabStop = True + Me.rdoRemove.Text = "Remove" + Me.rdoRemove.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoRemove.UseVisualStyleBackColor = True + ' + 'rdoReplaceNa + ' + Me.rdoReplaceNa.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoReplaceNa.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoReplaceNa.FlatAppearance.BorderSize = 2 + Me.rdoReplaceNa.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoReplaceNa.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoReplaceNa.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoReplaceNa.Location = New System.Drawing.Point(260, 4) + Me.rdoReplaceNa.Name = "rdoReplaceNa" + Me.rdoReplaceNa.Size = New System.Drawing.Size(80, 41) + Me.rdoReplaceNa.TabIndex = 4 + Me.rdoReplaceNa.TabStop = True + Me.rdoReplaceNa.Text = "Replace NA" + Me.rdoReplaceNa.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoReplaceNa.UseVisualStyleBackColor = True ' 'rdoReplace ' @@ -142,432 +171,279 @@ Partial Class dlgStringHandling Me.rdoReplace.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption Me.rdoReplace.FlatStyle = System.Windows.Forms.FlatStyle.Flat Me.rdoReplace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoReplace.Location = New System.Drawing.Point(328, 4) + Me.rdoReplace.Location = New System.Drawing.Point(182, 4) Me.rdoReplace.Name = "rdoReplace" Me.rdoReplace.Size = New System.Drawing.Size(80, 41) - Me.rdoReplace.TabIndex = 5 + Me.rdoReplace.TabIndex = 3 Me.rdoReplace.TabStop = True Me.rdoReplace.Text = "Replace" Me.rdoReplace.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoReplace.UseVisualStyleBackColor = True ' + 'rdoFind + ' + Me.rdoFind.Appearance = System.Windows.Forms.Appearance.Button + Me.rdoFind.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoFind.FlatAppearance.BorderSize = 2 + Me.rdoFind.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoFind.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.rdoFind.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.rdoFind.Location = New System.Drawing.Point(104, 4) + Me.rdoFind.Name = "rdoFind" + Me.rdoFind.Size = New System.Drawing.Size(80, 41) + Me.rdoFind.TabIndex = 2 + Me.rdoFind.TabStop = True + Me.rdoFind.Text = "Find" + Me.rdoFind.TextAlign = System.Drawing.ContentAlignment.MiddleCenter + Me.rdoFind.UseVisualStyleBackColor = True + ' + 'grpModifiers + ' + Me.grpModifiers.Controls.Add(Me.ucrChkComments) + Me.grpModifiers.Controls.Add(Me.ucrChkMultiline) + Me.grpModifiers.Location = New System.Drawing.Point(10, 231) + Me.grpModifiers.Name = "grpModifiers" + Me.grpModifiers.Size = New System.Drawing.Size(181, 77) + Me.grpModifiers.TabIndex = 34 + Me.grpModifiers.TabStop = False + Me.grpModifiers.Text = "Modifiers" + ' + 'cmdAddkeyboard + ' + Me.cmdAddkeyboard.Location = New System.Drawing.Point(267, 373) + Me.cmdAddkeyboard.Name = "cmdAddkeyboard" + Me.cmdAddkeyboard.Size = New System.Drawing.Size(100, 23) + Me.cmdAddkeyboard.TabIndex = 33 + Me.cmdAddkeyboard.Text = "Add Keyboard" + Me.cmdAddkeyboard.UseVisualStyleBackColor = True + ' + 'grpDetectOptions + ' + Me.grpDetectOptions.Controls.Add(Me.rdoEnds) + Me.grpDetectOptions.Controls.Add(Me.rdoStarts) + Me.grpDetectOptions.Controls.Add(Me.rdoDetects) + Me.grpDetectOptions.Controls.Add(Me.ucrChkNegate) + Me.grpDetectOptions.Controls.Add(Me.ucrPnlDetectOptions) + Me.grpDetectOptions.Location = New System.Drawing.Point(261, 193) + Me.grpDetectOptions.Name = "grpDetectOptions" + Me.grpDetectOptions.Size = New System.Drawing.Size(165, 124) + Me.grpDetectOptions.TabIndex = 38 + Me.grpDetectOptions.TabStop = False + Me.grpDetectOptions.Text = "Detect Options" + ' + 'grpFindOptions + ' + Me.grpFindOptions.Controls.Add(Me.ucrChkAll) + Me.grpFindOptions.Controls.Add(Me.rdoLocate) + Me.grpFindOptions.Controls.Add(Me.rdoExtract) + Me.grpFindOptions.Controls.Add(Me.rdoCount) + Me.grpFindOptions.Controls.Add(Me.ucrPnlFindOptions) + Me.grpFindOptions.Location = New System.Drawing.Point(260, 209) + Me.grpFindOptions.Name = "grpFindOptions" + Me.grpFindOptions.Size = New System.Drawing.Size(171, 122) + Me.grpFindOptions.TabIndex = 41 + Me.grpFindOptions.TabStop = False + Me.grpFindOptions.Text = "Find Options" + ' 'rdoLocate ' - Me.rdoLocate.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoLocate.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoLocate.FlatAppearance.BorderSize = 2 - Me.rdoLocate.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoLocate.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoLocate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoLocate.Location = New System.Drawing.Point(250, 4) + Me.rdoLocate.AutoSize = True + Me.rdoLocate.Location = New System.Drawing.Point(7, 67) Me.rdoLocate.Name = "rdoLocate" - Me.rdoLocate.Size = New System.Drawing.Size(80, 41) - Me.rdoLocate.TabIndex = 4 + Me.rdoLocate.Size = New System.Drawing.Size(58, 17) + Me.rdoLocate.TabIndex = 3 Me.rdoLocate.TabStop = True Me.rdoLocate.Text = "Locate" - Me.rdoLocate.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoLocate.UseVisualStyleBackColor = True ' 'rdoExtract ' - Me.rdoExtract.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoExtract.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoExtract.FlatAppearance.BorderSize = 2 - Me.rdoExtract.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoExtract.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoExtract.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoExtract.Location = New System.Drawing.Point(172, 4) + Me.rdoExtract.AutoSize = True + Me.rdoExtract.Location = New System.Drawing.Point(7, 42) Me.rdoExtract.Name = "rdoExtract" - Me.rdoExtract.Size = New System.Drawing.Size(80, 41) - Me.rdoExtract.TabIndex = 3 + Me.rdoExtract.Size = New System.Drawing.Size(58, 17) + Me.rdoExtract.TabIndex = 2 Me.rdoExtract.TabStop = True Me.rdoExtract.Text = "Extract" - Me.rdoExtract.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoExtract.UseVisualStyleBackColor = True ' - 'rdoDetect + 'rdoCount ' - Me.rdoDetect.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoDetect.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoDetect.FlatAppearance.BorderSize = 2 - Me.rdoDetect.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoDetect.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoDetect.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoDetect.Location = New System.Drawing.Point(94, 4) - Me.rdoDetect.Name = "rdoDetect" - Me.rdoDetect.Size = New System.Drawing.Size(80, 41) - Me.rdoDetect.TabIndex = 2 - Me.rdoDetect.TabStop = True - Me.rdoDetect.Text = "Detect" - Me.rdoDetect.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoDetect.UseVisualStyleBackColor = True + Me.rdoCount.AutoSize = True + Me.rdoCount.Location = New System.Drawing.Point(7, 19) + Me.rdoCount.Name = "rdoCount" + Me.rdoCount.Size = New System.Drawing.Size(53, 17) + Me.rdoCount.TabIndex = 1 + Me.rdoCount.TabStop = True + Me.rdoCount.Text = "Count" + Me.rdoCount.UseVisualStyleBackColor = True ' - 'rdoReplaceAll - ' - Me.rdoReplaceAll.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoReplaceAll.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoReplaceAll.FlatAppearance.BorderSize = 2 - Me.rdoReplaceAll.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoReplaceAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoReplaceAll.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoReplaceAll.Location = New System.Drawing.Point(404, 4) - Me.rdoReplaceAll.Name = "rdoReplaceAll" - Me.rdoReplaceAll.Size = New System.Drawing.Size(85, 41) - Me.rdoReplaceAll.TabIndex = 6 - Me.rdoReplaceAll.TabStop = True - Me.rdoReplaceAll.Text = "Replace All" - Me.rdoReplaceAll.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoReplaceAll.UseVisualStyleBackColor = True - ' - 'grpRegex - ' - Me.grpRegex.Controls.Add(Me.cmdClear) - Me.grpRegex.Controls.Add(Me.cmdBackSlash) - Me.grpRegex.Controls.Add(Me.cmdWBackSlash) - Me.grpRegex.Controls.Add(Me.cmdDollarSign) - Me.grpRegex.Controls.Add(Me.cmdOpenCloseParenthesis) - Me.grpRegex.Controls.Add(Me.cmdBackSlashd) - Me.grpRegex.Controls.Add(Me.cmdBackSlashs) - Me.grpRegex.Controls.Add(Me.cmdPower) - Me.grpRegex.Controls.Add(Me.cmdOpenBracketCaretClosedBracket) - Me.grpRegex.Controls.Add(Me.cmdPlus) - Me.grpRegex.Controls.Add(Me.cmdBackSlashw) - Me.grpRegex.Controls.Add(Me.cmdMultiply) - Me.grpRegex.Controls.Add(Me.cmdOpenCloseBrace) - Me.grpRegex.Controls.Add(Me.cmdOpenClosedBracket) - Me.grpRegex.Controls.Add(Me.cmdSingleQuote) - Me.grpRegex.Controls.Add(Me.cmdQuote) - Me.grpRegex.Controls.Add(Me.cmdQuestionMark) - Me.grpRegex.Controls.Add(Me.cmdDBackSlah) - Me.grpRegex.Controls.Add(Me.cmdStar) - Me.grpRegex.Controls.Add(Me.cmdBbackSlash) - Me.grpRegex.Controls.Add(Me.cmdBackSlashb) - Me.grpRegex.Controls.Add(Me.cmdSbackSlash) - Me.grpRegex.Controls.Add(Me.cmdOr) - Me.grpRegex.Location = New System.Drawing.Point(423, 81) - Me.grpRegex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpRegex.Name = "grpRegex" - Me.grpRegex.Padding = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.grpRegex.Size = New System.Drawing.Size(239, 141) - Me.grpRegex.TabIndex = 18 - Me.grpRegex.TabStop = False - Me.grpRegex.Text = "Regex Keyboard" - ' - 'cmdClear - ' - Me.cmdClear.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.75!) - Me.cmdClear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdClear.Location = New System.Drawing.Point(198, 75) - Me.cmdClear.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdClear.Name = "cmdClear" - Me.cmdClear.Size = New System.Drawing.Size(37, 60) - Me.cmdClear.TabIndex = 17 - Me.cmdClear.Text = "Clear" - Me.cmdClear.UseVisualStyleBackColor = True - ' - 'cmdBackSlash - ' - Me.cmdBackSlash.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBackSlash.Location = New System.Drawing.Point(159, 105) - Me.cmdBackSlash.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdBackSlash.Name = "cmdBackSlash" - Me.cmdBackSlash.Size = New System.Drawing.Size(38, 30) - Me.cmdBackSlash.TabIndex = 22 - Me.cmdBackSlash.Text = "\ " - Me.cmdBackSlash.UseVisualStyleBackColor = True - ' - 'cmdWBackSlash - ' - Me.cmdWBackSlash.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdWBackSlash.Location = New System.Drawing.Point(159, 75) - Me.cmdWBackSlash.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdWBackSlash.Name = "cmdWBackSlash" - Me.cmdWBackSlash.Size = New System.Drawing.Size(38, 30) - Me.cmdWBackSlash.TabIndex = 16 - Me.cmdWBackSlash.Text = "\ W" - Me.cmdWBackSlash.UseVisualStyleBackColor = True - ' - 'cmdDollarSign - ' - Me.cmdDollarSign.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDollarSign.Location = New System.Drawing.Point(198, 45) - Me.cmdDollarSign.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdDollarSign.Name = "cmdDollarSign" - Me.cmdDollarSign.Size = New System.Drawing.Size(38, 30) - Me.cmdDollarSign.TabIndex = 11 - Me.cmdDollarSign.Text = "$" - Me.cmdDollarSign.UseVisualStyleBackColor = True - ' - 'cmdOpenCloseParenthesis - ' - Me.cmdOpenCloseParenthesis.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpenCloseParenthesis.Location = New System.Drawing.Point(198, 15) - Me.cmdOpenCloseParenthesis.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdOpenCloseParenthesis.Name = "cmdOpenCloseParenthesis" - Me.cmdOpenCloseParenthesis.Size = New System.Drawing.Size(38, 30) - Me.cmdOpenCloseParenthesis.TabIndex = 5 - Me.cmdOpenCloseParenthesis.Text = "( )" - Me.cmdOpenCloseParenthesis.UseVisualStyleBackColor = True - ' - 'cmdBackSlashd - ' - Me.cmdBackSlashd.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBackSlashd.Location = New System.Drawing.Point(81, 105) - Me.cmdBackSlashd.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdBackSlashd.Name = "cmdBackSlashd" - Me.cmdBackSlashd.Size = New System.Drawing.Size(38, 30) - Me.cmdBackSlashd.TabIndex = 20 - Me.cmdBackSlashd.Text = "\ d" - Me.cmdBackSlashd.UseVisualStyleBackColor = True - ' - 'cmdBackSlashs - ' - Me.cmdBackSlashs.Font = New System.Drawing.Font("Microsoft Sans Serif", 6.0!) - Me.cmdBackSlashs.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBackSlashs.Location = New System.Drawing.Point(3, 105) - Me.cmdBackSlashs.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdBackSlashs.Name = "cmdBackSlashs" - Me.cmdBackSlashs.Size = New System.Drawing.Size(38, 30) - Me.cmdBackSlashs.TabIndex = 18 - Me.cmdBackSlashs.Tag = "Del" - Me.cmdBackSlashs.Text = "\ s" - Me.cmdBackSlashs.UseVisualStyleBackColor = True - ' - 'cmdPower - ' - Me.cmdPower.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPower.Location = New System.Drawing.Point(159, 45) - Me.cmdPower.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdPower.Name = "cmdPower" - Me.cmdPower.Size = New System.Drawing.Size(38, 30) - Me.cmdPower.TabIndex = 10 - Me.cmdPower.Text = "^" - Me.cmdPower.UseVisualStyleBackColor = True - ' - 'cmdOpenBracketCaretClosedBracket - ' - Me.cmdOpenBracketCaretClosedBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpenBracketCaretClosedBracket.Location = New System.Drawing.Point(120, 15) - Me.cmdOpenBracketCaretClosedBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdOpenBracketCaretClosedBracket.Name = "cmdOpenBracketCaretClosedBracket" - Me.cmdOpenBracketCaretClosedBracket.Size = New System.Drawing.Size(38, 30) - Me.cmdOpenBracketCaretClosedBracket.TabIndex = 3 - Me.cmdOpenBracketCaretClosedBracket.Text = "[ ^ ]" - Me.cmdOpenBracketCaretClosedBracket.UseVisualStyleBackColor = True - ' - 'cmdPlus - ' - Me.cmdPlus.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlus.Location = New System.Drawing.Point(42, 45) - Me.cmdPlus.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdPlus.Name = "cmdPlus" - Me.cmdPlus.Size = New System.Drawing.Size(38, 30) - Me.cmdPlus.TabIndex = 7 - Me.cmdPlus.Text = "+" - Me.cmdPlus.UseVisualStyleBackColor = True - ' - 'cmdBackSlashw - ' - Me.cmdBackSlashw.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBackSlashw.Location = New System.Drawing.Point(120, 75) - Me.cmdBackSlashw.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdBackSlashw.Name = "cmdBackSlashw" - Me.cmdBackSlashw.Size = New System.Drawing.Size(38, 30) - Me.cmdBackSlashw.TabIndex = 15 - Me.cmdBackSlashw.Text = "\ w" - Me.cmdBackSlashw.UseVisualStyleBackColor = True - ' - 'cmdMultiply - ' - Me.cmdMultiply.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdMultiply.Location = New System.Drawing.Point(120, 45) - Me.cmdMultiply.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdMultiply.Name = "cmdMultiply" - Me.cmdMultiply.Size = New System.Drawing.Size(38, 30) - Me.cmdMultiply.TabIndex = 9 - Me.cmdMultiply.Text = "." - Me.cmdMultiply.UseVisualStyleBackColor = True - ' - 'cmdOpenCloseBrace - ' - Me.cmdOpenCloseBrace.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpenCloseBrace.Location = New System.Drawing.Point(159, 15) - Me.cmdOpenCloseBrace.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdOpenCloseBrace.Name = "cmdOpenCloseBrace" - Me.cmdOpenCloseBrace.Size = New System.Drawing.Size(38, 30) - Me.cmdOpenCloseBrace.TabIndex = 4 - Me.cmdOpenCloseBrace.Text = "{ }" - Me.cmdOpenCloseBrace.UseVisualStyleBackColor = True - ' - 'cmdOpenClosedBracket - ' - Me.cmdOpenClosedBracket.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOpenClosedBracket.Location = New System.Drawing.Point(81, 15) - Me.cmdOpenClosedBracket.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdOpenClosedBracket.Name = "cmdOpenClosedBracket" - Me.cmdOpenClosedBracket.Size = New System.Drawing.Size(38, 30) - Me.cmdOpenClosedBracket.TabIndex = 2 - Me.cmdOpenClosedBracket.Text = "[ ]" - Me.cmdOpenClosedBracket.UseVisualStyleBackColor = True - ' - 'cmdSingleQuote - ' - Me.cmdSingleQuote.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSingleQuote.Location = New System.Drawing.Point(42, 15) - Me.cmdSingleQuote.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdSingleQuote.Name = "cmdSingleQuote" - Me.cmdSingleQuote.Size = New System.Drawing.Size(38, 30) - Me.cmdSingleQuote.TabIndex = 1 - Me.cmdSingleQuote.Text = "' '" - Me.cmdSingleQuote.UseVisualStyleBackColor = True - ' - 'cmdQuote - ' - Me.cmdQuote.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuote.Location = New System.Drawing.Point(3, 15) - Me.cmdQuote.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdQuote.Name = "cmdQuote" - Me.cmdQuote.Size = New System.Drawing.Size(38, 30) - Me.cmdQuote.TabIndex = 0 - Me.cmdQuote.Text = """ """ - Me.cmdQuote.UseVisualStyleBackColor = True - ' - 'cmdQuestionMark - ' - Me.cmdQuestionMark.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdQuestionMark.Location = New System.Drawing.Point(81, 45) - Me.cmdQuestionMark.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdQuestionMark.Name = "cmdQuestionMark" - Me.cmdQuestionMark.Size = New System.Drawing.Size(38, 30) - Me.cmdQuestionMark.TabIndex = 8 - Me.cmdQuestionMark.Text = "?" - Me.cmdQuestionMark.UseVisualStyleBackColor = True - ' - 'cmdDBackSlah - ' - Me.cmdDBackSlah.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdDBackSlah.Location = New System.Drawing.Point(120, 105) - Me.cmdDBackSlah.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdDBackSlah.Name = "cmdDBackSlah" - Me.cmdDBackSlah.Size = New System.Drawing.Size(38, 30) - Me.cmdDBackSlah.TabIndex = 21 - Me.cmdDBackSlah.Text = "\ D" - Me.cmdDBackSlah.UseVisualStyleBackColor = True - ' - 'cmdStar - ' - Me.cmdStar.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdStar.Location = New System.Drawing.Point(3, 45) - Me.cmdStar.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdStar.Name = "cmdStar" - Me.cmdStar.Size = New System.Drawing.Size(38, 30) - Me.cmdStar.TabIndex = 6 - Me.cmdStar.Text = "*" - Me.cmdStar.UseVisualStyleBackColor = True - ' - 'cmdBbackSlash - ' - Me.cmdBbackSlash.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBbackSlash.Location = New System.Drawing.Point(81, 75) - Me.cmdBbackSlash.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdBbackSlash.Name = "cmdBbackSlash" - Me.cmdBbackSlash.Size = New System.Drawing.Size(38, 30) - Me.cmdBbackSlash.TabIndex = 14 - Me.cmdBbackSlash.Text = "\ B" - Me.cmdBbackSlash.UseVisualStyleBackColor = True - ' - 'cmdBackSlashb - ' - Me.cmdBackSlashb.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdBackSlashb.Location = New System.Drawing.Point(42, 75) - Me.cmdBackSlashb.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdBackSlashb.Name = "cmdBackSlashb" - Me.cmdBackSlashb.Size = New System.Drawing.Size(38, 30) - Me.cmdBackSlashb.TabIndex = 13 - Me.cmdBackSlashb.Text = "\ b" - Me.cmdBackSlashb.UseVisualStyleBackColor = True - ' - 'cmdSbackSlash - ' - Me.cmdSbackSlash.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdSbackSlash.Location = New System.Drawing.Point(42, 105) - Me.cmdSbackSlash.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdSbackSlash.Name = "cmdSbackSlash" - Me.cmdSbackSlash.Size = New System.Drawing.Size(38, 30) - Me.cmdSbackSlash.TabIndex = 19 - Me.cmdSbackSlash.Text = "\ S" - Me.cmdSbackSlash.UseVisualStyleBackColor = True - ' - 'cmdOr - ' - Me.cmdOr.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdOr.Location = New System.Drawing.Point(3, 75) - Me.cmdOr.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.cmdOr.Name = "cmdOr" - Me.cmdOr.Size = New System.Drawing.Size(38, 30) - Me.cmdOr.TabIndex = 12 - Me.cmdOr.Text = "|," - Me.cmdOr.UseVisualStyleBackColor = True - ' - 'rdoRegex - ' - Me.rdoRegex.AutoSize = True - Me.rdoRegex.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRegex.Location = New System.Drawing.Point(535, 232) - Me.rdoRegex.Name = "rdoRegex" - Me.rdoRegex.Size = New System.Drawing.Size(56, 17) - Me.rdoRegex.TabIndex = 17 - Me.rdoRegex.TabStop = True - Me.rdoRegex.Text = "Regex" - Me.rdoRegex.UseVisualStyleBackColor = True - ' - 'rdoFixed - ' - Me.rdoFixed.AutoSize = True - Me.rdoFixed.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoFixed.Location = New System.Drawing.Point(465, 232) - Me.rdoFixed.Name = "rdoFixed" - Me.rdoFixed.Size = New System.Drawing.Size(50, 17) - Me.rdoFixed.TabIndex = 16 - Me.rdoFixed.TabStop = True - Me.rdoFixed.Text = "Fixed" - Me.rdoFixed.UseVisualStyleBackColor = True - ' - 'ucrPnlFixedRegex - ' - Me.ucrPnlFixedRegex.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlFixedRegex.Location = New System.Drawing.Point(457, 227) - Me.ucrPnlFixedRegex.Name = "ucrPnlFixedRegex" - Me.ucrPnlFixedRegex.Size = New System.Drawing.Size(150, 28) - Me.ucrPnlFixedRegex.TabIndex = 15 + 'rdoEnds + ' + Me.rdoEnds.AutoSize = True + Me.rdoEnds.Location = New System.Drawing.Point(6, 69) + Me.rdoEnds.Name = "rdoEnds" + Me.rdoEnds.Size = New System.Drawing.Size(49, 17) + Me.rdoEnds.TabIndex = 4 + Me.rdoEnds.TabStop = True + Me.rdoEnds.Text = "Ends" + Me.rdoEnds.UseVisualStyleBackColor = True + ' + 'rdoStarts + ' + Me.rdoStarts.AutoSize = True + Me.rdoStarts.Location = New System.Drawing.Point(6, 45) + Me.rdoStarts.Name = "rdoStarts" + Me.rdoStarts.Size = New System.Drawing.Size(52, 17) + Me.rdoStarts.TabIndex = 3 + Me.rdoStarts.TabStop = True + Me.rdoStarts.Text = "Starts" + Me.rdoStarts.UseVisualStyleBackColor = True + ' + 'rdoDetects + ' + Me.rdoDetects.AutoSize = True + Me.rdoDetects.Location = New System.Drawing.Point(6, 20) + Me.rdoDetects.Name = "rdoDetects" + Me.rdoDetects.Size = New System.Drawing.Size(57, 17) + Me.rdoDetects.TabIndex = 2 + Me.rdoDetects.TabStop = True + Me.rdoDetects.Text = "Detect" + Me.rdoDetects.UseVisualStyleBackColor = True + ' + 'ucrChkAll + ' + Me.ucrChkAll.AutoSize = True + Me.ucrChkAll.Checked = False + Me.ucrChkAll.Location = New System.Drawing.Point(7, 93) + Me.ucrChkAll.Name = "ucrChkAll" + Me.ucrChkAll.Size = New System.Drawing.Size(147, 23) + Me.ucrChkAll.TabIndex = 4 + ' + 'ucrPnlFindOptions + ' + Me.ucrPnlFindOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlFindOptions.Location = New System.Drawing.Point(5, 16) + Me.ucrPnlFindOptions.Name = "ucrPnlFindOptions" + Me.ucrPnlFindOptions.Size = New System.Drawing.Size(159, 75) + Me.ucrPnlFindOptions.TabIndex = 0 + ' + 'ucrChkReplaceAll + ' + Me.ucrChkReplaceAll.AutoSize = True + Me.ucrChkReplaceAll.Checked = False + Me.ucrChkReplaceAll.Location = New System.Drawing.Point(261, 186) + Me.ucrChkReplaceAll.Name = "ucrChkReplaceAll" + Me.ucrChkReplaceAll.Size = New System.Drawing.Size(165, 23) + Me.ucrChkReplaceAll.TabIndex = 42 + ' + 'ucrChkRemoveAll + ' + Me.ucrChkRemoveAll.AutoSize = True + Me.ucrChkRemoveAll.Checked = False + Me.ucrChkRemoveAll.Location = New System.Drawing.Point(261, 145) + Me.ucrChkRemoveAll.Name = "ucrChkRemoveAll" + Me.ucrChkRemoveAll.Size = New System.Drawing.Size(157, 23) + Me.ucrChkRemoveAll.TabIndex = 41 + ' + 'ucrInputReplaceNaBy + ' + Me.ucrInputReplaceNaBy.AddQuotesIfUnrecognised = True + Me.ucrInputReplaceNaBy.AutoSize = True + Me.ucrInputReplaceNaBy.IsMultiline = False + Me.ucrInputReplaceNaBy.IsReadOnly = False + Me.ucrInputReplaceNaBy.Location = New System.Drawing.Point(350, 103) + Me.ucrInputReplaceNaBy.Name = "ucrInputReplaceNaBy" + Me.ucrInputReplaceNaBy.Size = New System.Drawing.Size(85, 21) + Me.ucrInputReplaceNaBy.TabIndex = 40 + ' + 'ucrChkReplaceBy + ' + Me.ucrChkReplaceBy.AutoSize = True + Me.ucrChkReplaceBy.Checked = False + Me.ucrChkReplaceBy.Location = New System.Drawing.Point(261, 103) + Me.ucrChkReplaceBy.Name = "ucrChkReplaceBy" + Me.ucrChkReplaceBy.Size = New System.Drawing.Size(84, 23) + Me.ucrChkReplaceBy.TabIndex = 39 + ' + 'ucrChkNegate + ' + Me.ucrChkNegate.AutoSize = True + Me.ucrChkNegate.Checked = False + Me.ucrChkNegate.Location = New System.Drawing.Point(7, 95) + Me.ucrChkNegate.Name = "ucrChkNegate" + Me.ucrChkNegate.Size = New System.Drawing.Size(150, 23) + Me.ucrChkNegate.TabIndex = 1 + ' + 'ucrPnlDetectOptions + ' + Me.ucrPnlDetectOptions.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlDetectOptions.Location = New System.Drawing.Point(3, 16) + Me.ucrPnlDetectOptions.Name = "ucrPnlDetectOptions" + Me.ucrPnlDetectOptions.Size = New System.Drawing.Size(156, 75) + Me.ucrPnlDetectOptions.TabIndex = 0 + ' + 'ucrInputBoundary + ' + Me.ucrInputBoundary.AddQuotesIfUnrecognised = True + Me.ucrInputBoundary.AutoSize = True + Me.ucrInputBoundary.IsMultiline = False + Me.ucrInputBoundary.IsReadOnly = False + Me.ucrInputBoundary.Location = New System.Drawing.Point(172, 342) + Me.ucrInputBoundary.Name = "ucrInputBoundary" + Me.ucrInputBoundary.Size = New System.Drawing.Size(137, 21) + Me.ucrInputBoundary.TabIndex = 37 + ' + 'ucrChkBoundary + ' + Me.ucrChkBoundary.AutoSize = True + Me.ucrChkBoundary.Checked = False + Me.ucrChkBoundary.Location = New System.Drawing.Point(10, 343) + Me.ucrChkBoundary.Name = "ucrChkBoundary" + Me.ucrChkBoundary.Size = New System.Drawing.Size(140, 23) + Me.ucrChkBoundary.TabIndex = 36 + ' + 'ucrChkIgnoreCase + ' + Me.ucrChkIgnoreCase.AutoSize = True + Me.ucrChkIgnoreCase.Checked = False + Me.ucrChkIgnoreCase.Location = New System.Drawing.Point(10, 313) + Me.ucrChkIgnoreCase.Name = "ucrChkIgnoreCase" + Me.ucrChkIgnoreCase.Size = New System.Drawing.Size(229, 23) + Me.ucrChkIgnoreCase.TabIndex = 35 + ' + 'ucrChkComments + ' + Me.ucrChkComments.AutoSize = True + Me.ucrChkComments.Checked = False + Me.ucrChkComments.Location = New System.Drawing.Point(6, 47) + Me.ucrChkComments.Name = "ucrChkComments" + Me.ucrChkComments.Size = New System.Drawing.Size(142, 23) + Me.ucrChkComments.TabIndex = 29 + ' + 'ucrChkMultiline + ' + Me.ucrChkMultiline.AutoSize = True + Me.ucrChkMultiline.Checked = False + Me.ucrChkMultiline.Location = New System.Drawing.Point(6, 17) + Me.ucrChkMultiline.Name = "ucrChkMultiline" + Me.ucrChkMultiline.Size = New System.Drawing.Size(142, 23) + Me.ucrChkMultiline.TabIndex = 28 ' 'ucrSaveStringHandling ' Me.ucrSaveStringHandling.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveStringHandling.Location = New System.Drawing.Point(10, 260) + Me.ucrSaveStringHandling.Location = New System.Drawing.Point(10, 402) Me.ucrSaveStringHandling.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveStringHandling.Name = "ucrSaveStringHandling" Me.ucrSaveStringHandling.Size = New System.Drawing.Size(366, 22) Me.ucrSaveStringHandling.TabIndex = 19 ' - 'ucrReceiverForRegexExpression - ' - Me.ucrReceiverForRegexExpression.AutoSize = True - Me.ucrReceiverForRegexExpression.frmParent = Me - Me.ucrReceiverForRegexExpression.Location = New System.Drawing.Point(261, 139) - Me.ucrReceiverForRegexExpression.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) - Me.ucrReceiverForRegexExpression.Name = "ucrReceiverForRegexExpression" - Me.ucrReceiverForRegexExpression.Selector = Nothing - Me.ucrReceiverForRegexExpression.Size = New System.Drawing.Size(158, 28) - Me.ucrReceiverForRegexExpression.strNcFilePath = "" - Me.ucrReceiverForRegexExpression.TabIndex = 11 - Me.ucrReceiverForRegexExpression.ucrSelector = Nothing - ' 'ucrChkIncludeRegularExpressions ' Me.ucrChkIncludeRegularExpressions.AutoSize = True Me.ucrChkIncludeRegularExpressions.Checked = False - Me.ucrChkIncludeRegularExpressions.Location = New System.Drawing.Point(10, 232) + Me.ucrChkIncludeRegularExpressions.Location = New System.Drawing.Point(10, 373) Me.ucrChkIncludeRegularExpressions.Name = "ucrChkIncludeRegularExpressions" Me.ucrChkIncludeRegularExpressions.Size = New System.Drawing.Size(239, 23) Me.ucrChkIncludeRegularExpressions.TabIndex = 14 @@ -576,7 +452,7 @@ Partial Class dlgStringHandling ' Me.ucrReceiverStringHandling.AutoSize = True Me.ucrReceiverStringHandling.frmParent = Me - Me.ucrReceiverStringHandling.Location = New System.Drawing.Point(261, 95) + Me.ucrReceiverStringHandling.Location = New System.Drawing.Point(261, 70) Me.ucrReceiverStringHandling.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverStringHandling.Name = "ucrReceiverStringHandling" Me.ucrReceiverStringHandling.Selector = Nothing @@ -591,7 +467,7 @@ Partial Class dlgStringHandling Me.ucrInputReplaceBy.AutoSize = True Me.ucrInputReplaceBy.IsMultiline = False Me.ucrInputReplaceBy.IsReadOnly = False - Me.ucrInputReplaceBy.Location = New System.Drawing.Point(261, 183) + Me.ucrInputReplaceBy.Location = New System.Drawing.Point(261, 158) Me.ucrInputReplaceBy.Name = "ucrInputReplaceBy" Me.ucrInputReplaceBy.Size = New System.Drawing.Size(158, 20) Me.ucrInputReplaceBy.TabIndex = 13 @@ -602,7 +478,7 @@ Partial Class dlgStringHandling Me.ucrInputPattern.AutoSize = True Me.ucrInputPattern.IsMultiline = False Me.ucrInputPattern.IsReadOnly = False - Me.ucrInputPattern.Location = New System.Drawing.Point(261, 139) + Me.ucrInputPattern.Location = New System.Drawing.Point(261, 114) Me.ucrInputPattern.Name = "ucrInputPattern" Me.ucrInputPattern.Size = New System.Drawing.Size(158, 20) Me.ucrInputPattern.TabIndex = 12 @@ -623,7 +499,7 @@ Partial Class dlgStringHandling ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 289) + Me.ucrBase.Location = New System.Drawing.Point(10, 428) Me.ucrBase.Name = "ucrBase" Me.ucrBase.Size = New System.Drawing.Size(405, 52) Me.ucrBase.TabIndex = 20 @@ -631,40 +507,35 @@ Partial Class dlgStringHandling 'ucrPnlStringHandling ' Me.ucrPnlStringHandling.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlStringHandling.Location = New System.Drawing.Point(10, 1) + Me.ucrPnlStringHandling.Location = New System.Drawing.Point(16, 1) Me.ucrPnlStringHandling.Name = "ucrPnlStringHandling" - Me.ucrPnlStringHandling.Size = New System.Drawing.Size(532, 46) + Me.ucrPnlStringHandling.Size = New System.Drawing.Size(409, 46) Me.ucrPnlStringHandling.TabIndex = 0 ' - 'ucrChkAddKeyboard - ' - Me.ucrChkAddKeyboard.AutoSize = True - Me.ucrChkAddKeyboard.Checked = False - Me.ucrChkAddKeyboard.Location = New System.Drawing.Point(250, 232) - Me.ucrChkAddKeyboard.Name = "ucrChkAddKeyboard" - Me.ucrChkAddKeyboard.Size = New System.Drawing.Size(158, 23) - Me.ucrChkAddKeyboard.TabIndex = 21 - ' 'dlgStringHandling ' 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(673, 346) - Me.Controls.Add(Me.ucrChkAddKeyboard) - Me.Controls.Add(Me.rdoRegex) - Me.Controls.Add(Me.rdoFixed) - Me.Controls.Add(Me.ucrPnlFixedRegex) + Me.ClientSize = New System.Drawing.Size(438, 483) + Me.Controls.Add(Me.grpFindOptions) + Me.Controls.Add(Me.ucrChkReplaceAll) + Me.Controls.Add(Me.ucrChkRemoveAll) + Me.Controls.Add(Me.ucrInputReplaceNaBy) + Me.Controls.Add(Me.ucrChkReplaceBy) + Me.Controls.Add(Me.grpDetectOptions) + Me.Controls.Add(Me.ucrInputBoundary) + Me.Controls.Add(Me.ucrChkBoundary) + Me.Controls.Add(Me.ucrChkIgnoreCase) + Me.Controls.Add(Me.grpModifiers) + Me.Controls.Add(Me.cmdAddkeyboard) Me.Controls.Add(Me.ucrSaveStringHandling) - Me.Controls.Add(Me.ucrReceiverForRegexExpression) - Me.Controls.Add(Me.grpRegex) Me.Controls.Add(Me.ucrChkIncludeRegularExpressions) - Me.Controls.Add(Me.rdoReplaceAll) - Me.Controls.Add(Me.rdoDetect) - Me.Controls.Add(Me.rdoExtract) - Me.Controls.Add(Me.rdoLocate) + Me.Controls.Add(Me.rdoFind) Me.Controls.Add(Me.rdoReplace) - Me.Controls.Add(Me.rdoCount) + Me.Controls.Add(Me.rdoReplaceNa) + Me.Controls.Add(Me.rdoRemove) + Me.Controls.Add(Me.rdoDetect) Me.Controls.Add(Me.ucrReceiverStringHandling) Me.Controls.Add(Me.lblPattern) Me.Controls.Add(Me.lblReplaceBy) @@ -679,8 +550,13 @@ Partial Class dlgStringHandling Me.MinimizeBox = False Me.Name = "dlgStringHandling" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "String Handling" - Me.grpRegex.ResumeLayout(False) + Me.Text = "Find/Replace" + Me.grpModifiers.ResumeLayout(False) + Me.grpModifiers.PerformLayout() + Me.grpDetectOptions.ResumeLayout(False) + Me.grpDetectOptions.PerformLayout() + Me.grpFindOptions.ResumeLayout(False) + Me.grpFindOptions.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -694,42 +570,35 @@ Partial Class dlgStringHandling Friend WithEvents lblReplaceBy As Label Friend WithEvents lblPattern As Label Friend WithEvents ucrReceiverStringHandling As ucrReceiverSingle - Friend WithEvents rdoDetect As RadioButton - Friend WithEvents rdoExtract As RadioButton - Friend WithEvents rdoLocate As RadioButton + Friend WithEvents rdoFind As RadioButton Friend WithEvents rdoReplace As RadioButton - Friend WithEvents rdoCount As RadioButton + Friend WithEvents rdoReplaceNa As RadioButton + Friend WithEvents rdoRemove As RadioButton + Friend WithEvents rdoDetect As RadioButton Friend WithEvents ucrPnlStringHandling As UcrPanel - Friend WithEvents rdoReplaceAll As RadioButton Friend WithEvents ucrChkIncludeRegularExpressions As ucrCheck - Friend WithEvents grpRegex As GroupBox - Friend WithEvents cmdOpenCloseParenthesis As Button - Friend WithEvents cmdBackSlashd As Button - Friend WithEvents cmdBackSlashs As Button - Friend WithEvents cmdPower As Button - Friend WithEvents cmdOpenBracketCaretClosedBracket As Button - Friend WithEvents cmdPlus As Button - Friend WithEvents cmdBackSlashw As Button - Friend WithEvents cmdMultiply As Button - Friend WithEvents cmdOpenCloseBrace As Button - Friend WithEvents cmdOpenClosedBracket As Button - Friend WithEvents cmdSingleQuote As Button - Friend WithEvents cmdQuote As Button - Friend WithEvents cmdQuestionMark As Button - Friend WithEvents cmdDBackSlah As Button - Friend WithEvents cmdStar As Button - Friend WithEvents cmdBbackSlash As Button - Friend WithEvents cmdBackSlashb As Button - Friend WithEvents cmdSbackSlash As Button - Friend WithEvents cmdOr As Button - Friend WithEvents cmdDollarSign As Button - Friend WithEvents cmdWBackSlash As Button - Friend WithEvents cmdBackSlash As Button - Friend WithEvents ucrReceiverForRegexExpression As ucrReceiverExpression - Friend WithEvents cmdClear As Button Friend WithEvents ucrSaveStringHandling As ucrSave - Friend WithEvents rdoRegex As RadioButton - Friend WithEvents rdoFixed As RadioButton - Friend WithEvents ucrPnlFixedRegex As UcrPanel - Friend WithEvents ucrChkAddKeyboard As ucrCheck + Friend WithEvents ucrInputBoundary As ucrInputTextBox + Friend WithEvents ucrChkBoundary As ucrCheck + Friend WithEvents ucrChkIgnoreCase As ucrCheck + Friend WithEvents grpModifiers As GroupBox + Friend WithEvents ucrChkComments As ucrCheck + Friend WithEvents ucrChkMultiline As ucrCheck + Friend WithEvents cmdAddkeyboard As Button + Friend WithEvents grpDetectOptions As GroupBox + Friend WithEvents rdoEnds As RadioButton + Friend WithEvents rdoStarts As RadioButton + Friend WithEvents rdoDetects As RadioButton + Friend WithEvents ucrChkNegate As ucrCheck + Friend WithEvents ucrPnlDetectOptions As UcrPanel + Friend WithEvents ucrInputReplaceNaBy As ucrInputTextBox + Friend WithEvents ucrChkReplaceBy As ucrCheck + Friend WithEvents grpFindOptions As GroupBox + Friend WithEvents ucrPnlFindOptions As UcrPanel + Friend WithEvents ucrChkAll As ucrCheck + Friend WithEvents rdoLocate As RadioButton + Friend WithEvents rdoExtract As RadioButton + Friend WithEvents rdoCount As RadioButton + Friend WithEvents ucrChkRemoveAll As ucrCheck + Friend WithEvents ucrChkReplaceAll As ucrCheck End Class diff --git a/instat/dlgStringHandling.vb b/instat/dlgStringHandling.vb index 0cde18425f1..7b2eb814027 100644 --- a/instat/dlgStringHandling.vb +++ b/instat/dlgStringHandling.vb @@ -18,14 +18,15 @@ Imports instat.Translations Public Class dlgStringHandling Private bFirstload As Boolean = True Private bReset As Boolean = True - Private clsCountFunction, clsExtractFunction, clsDetectFunction, clsLocateFunction, clsReplaceFunction, clsReplaceAllFunction, clsFixedFunction, clsRegexFunction, clsStringCollFunction As New RFunction - Private iFullWidth As Integer + Private clsCountFunction, clsExtractFunction, clsDetectFunction, clsLocateFunction, clsReplaceFunction, clsReplaceAllFunction, + clsFixedFunction, clsRegexFunction, clsStringCollFunction, clsBoundaryFunction, clsRemoveFunction, clsReplaceNaFunction, + clsStartsFunction, clsEndsFunction, clsMatchAllFunction, clsExtractAllFunction, clsLocateAllFunction, clsRemoveAllFunction As New RFunction + Private clsDummyFunction, clsDetectDummyFunction, clsFindDummyFunction, clsAllDummyFunction, clsReplaceAllDummyFunction, clsRemoveAllDummyFunction As New RFunction Private Sub dlgStringHandling_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstload Then InitialiseDialog() bFirstload = False - iFullWidth = Me.Width End If If bReset Then SetDefaults() @@ -37,43 +38,65 @@ Public Class dlgStringHandling End Sub Private Sub InitialiseDialog() + Dim dctBoundaryPairs As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 406 - 'ucrReceiver ucrReceiverStringHandling.SetParameter(New RParameter("string", 0)) ucrReceiverStringHandling.SetParameterIsRFunction() ucrReceiverStringHandling.Selector = ucrSelectorStringHandling ucrReceiverStringHandling.bUseFilteredData = False ucrReceiverStringHandling.SetMeAsReceiver() - 'ucrRdoOptions - ucrPnlStringHandling.AddRadioButton(rdoCount) - ucrPnlStringHandling.AddRadioButton(rdoExtract) ucrPnlStringHandling.AddRadioButton(rdoDetect) - ucrPnlStringHandling.AddRadioButton(rdoLocate) ucrPnlStringHandling.AddRadioButton(rdoReplace) - ucrPnlStringHandling.AddRadioButton(rdoReplaceAll) + ucrPnlStringHandling.AddRadioButton(rdoFind) + ucrPnlStringHandling.AddRadioButton(rdoReplaceNa) + ucrPnlStringHandling.AddRadioButton(rdoRemove) - 'ucrRdofixedRegex - ucrPnlFixedRegex.AddRadioButton(rdoFixed) - ucrPnlFixedRegex.AddRadioButton(rdoRegex) + ucrPnlStringHandling.AddFunctionNamesCondition(rdoDetect, {"str_detect", "str_starts", "str_ends"}) + ucrPnlStringHandling.AddFunctionNamesCondition(rdoReplace, {"str_replace", "str_replace_all"}) + ucrPnlStringHandling.AddFunctionNamesCondition(rdoFind, {"str_find", "str_count", "str_extract", "str_extract_all", "str_locate", "str_locate_all"}) + ucrPnlStringHandling.AddFunctionNamesCondition(rdoReplaceNa, "str_replace_na") + ucrPnlStringHandling.AddFunctionNamesCondition(rdoRemove, {"str_remove", "str_remove_all"}) - ucrPnlStringHandling.AddFunctionNamesCondition(rdoCount, "str_count") - ucrPnlStringHandling.AddFunctionNamesCondition(rdoExtract, "str_extract") - ucrPnlStringHandling.AddFunctionNamesCondition(rdoDetect, "str_detect") - ucrPnlStringHandling.AddFunctionNamesCondition(rdoLocate, "str_locate") - ucrPnlStringHandling.AddFunctionNamesCondition(rdoReplace, "str_replace") - ucrPnlStringHandling.AddFunctionNamesCondition(rdoReplaceAll, "str_replace_all") + ucrPnlDetectOptions.AddRadioButton(rdoDetects) + ucrPnlDetectOptions.AddRadioButton(rdoStarts) + ucrPnlDetectOptions.AddRadioButton(rdoEnds) + + ucrPnlDetectOptions.AddParameterValuesCondition(rdoDetects, "checked", "str_detect") + ucrPnlDetectOptions.AddParameterValuesCondition(rdoStarts, "checked", "str_starts") + ucrPnlDetectOptions.AddParameterValuesCondition(rdoEnds, "checked", "str_ends") + + ucrPnlFindOptions.AddRadioButton(rdoCount) + ucrPnlFindOptions.AddRadioButton(rdoExtract) + ucrPnlFindOptions.AddRadioButton(rdoLocate) + + ucrPnlFindOptions.AddParameterValuesCondition(rdoCount, "checked", "str_count") + ucrPnlFindOptions.AddParameterValuesCondition(rdoExtract, "checked", "str_extract") + ucrPnlFindOptions.AddParameterValuesCondition(rdoLocate, "checked", "str_locate") + + ucrChkAll.SetText("All") + ucrChkAll.SetParameter(New RParameter("checked", 0)) + ucrChkAll.SetValuesCheckedAndUnchecked(True, False) + + ucrChkReplaceAll.SetText("Replace All") + ucrChkReplaceAll.SetParameter(New RParameter("checked", 0)) + ucrChkReplaceAll.SetValuesCheckedAndUnchecked(True, False) + + ucrChkRemoveAll.SetText("Remove All") + ucrChkRemoveAll.SetParameter(New RParameter("checked", 0)) + ucrChkRemoveAll.SetValuesCheckedAndUnchecked(True, False) + + ucrChkNegate.SetText("Negate") + ucrChkNegate.SetParameter(New RParameter("negate", 2)) + ucrChkNegate.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrInputPattern.SetParameter(New RParameter("pattern", 1)) ucrInputReplaceBy.SetParameter(New RParameter("replacement", 2)) - 'disabling replaceby input text box - ucrPnlStringHandling.AddToLinkedControls({ucrInputReplaceBy}, {rdoReplace, rdoReplaceAll}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrInputReplaceBy.SetLinkedDisplayControl(lblReplaceBy) - ucrPnlFixedRegex.AddToLinkedControls(ucrReceiverForRegexExpression, {rdoRegex}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrChkReplaceBy.SetText("Replace By:") + ucrChkReplaceBy.SetParameter(New RParameter("replacement", 1), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrInputReplaceNaBy.SetParameter(New RParameter("replacement", 1)) - 'ucrSave ucrSaveStringHandling.SetPrefix("count") ucrSaveStringHandling.SetSaveTypeAsColumn() ucrSaveStringHandling.SetDataFrameSelector(ucrSelectorStringHandling.ucrAvailableDataFrames) @@ -81,21 +104,51 @@ Public Class dlgStringHandling ucrSaveStringHandling.SetLabelText("New Column:") ucrSaveStringHandling.setLinkedReceiver(ucrReceiverStringHandling) 'added - 'ucrChkIncludeRegularExpressions - ucrChkIncludeRegularExpressions.SetText("Include Regular Expressions") - ucrChkIncludeRegularExpressions.SetDefaultState(False) + ucrChkIgnoreCase.SetText("Ignore Case") + ucrChkIgnoreCase.SetParameter(New RParameter("ignore_case", 3)) + ucrChkIgnoreCase.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrInputBoundary.SetParameter(New RParameter("type", 0)) + dctBoundaryPairs.Add("character", Chr(34) & "character" & Chr(34)) + dctBoundaryPairs.Add("line_break", Chr(34) & "line_break" & Chr(34)) + dctBoundaryPairs.Add("sentence", Chr(34) & "sentence" & Chr(34)) + dctBoundaryPairs.Add("word", Chr(34) & "word" & Chr(34)) + 'ucrInputBoundary.SetItems(dctBoundaryPairs) + 'ucrInputBoundary.SetDropDownStyleAsNonEditable() + ucrInputBoundary.Visible = False - ucrPnlFixedRegex.AddFunctionNamesCondition(rdoFixed, "fixed") - ucrPnlFixedRegex.AddFunctionNamesCondition(rdoRegex, "regex") - ucrPnlFixedRegex.Visible = False + ucrChkBoundary.SetText("Boundary") + ucrChkBoundary.SetParameter(New RParameter("checked", 0)) + ucrChkBoundary.SetValuesCheckedAndUnchecked(True, False) + ucrChkBoundary.Enabled = False - ucrChkAddKeyboard.SetText("Add keyboard") + ucrChkIncludeRegularExpressions.SetText("Include Regular Expressions") - 'temporary disabling - grpRegex.Enabled = False - ucrChkAddKeyboard.Enabled = False - 'hiding the Regex group box - grpRegex.Hide() + ucrChkIncludeRegularExpressions.SetParameter(New RParameter("checked", 0)) + ucrChkIncludeRegularExpressions.SetValuesCheckedAndUnchecked(True, False) + + ucrChkMultiline.SetText("Multiline") + ucrChkMultiline.SetParameter(New RParameter("multiline", 4)) + ucrChkMultiline.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrChkComments.SetText("Comments") + ucrChkComments.SetParameter(New RParameter("comments", 5)) + ucrChkComments.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + + ucrChkReplaceBy.AddToLinkedControls(ucrInputReplaceNaBy, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="NA") + ucrPnlStringHandling.AddToLinkedControls({ucrInputReplaceBy, ucrChkReplaceAll}, {rdoReplace}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStringHandling.AddToLinkedControls({ucrInputPattern, ucrChkIgnoreCase, ucrChkIncludeRegularExpressions}, {rdoDetect, rdoFind, rdoReplace, rdoRemove}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStringHandling.AddToLinkedControls(ucrChkBoundary, {rdoDetect, rdoFind}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStringHandling.AddToLinkedControls(ucrPnlDetectOptions, {rdoDetect}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStringHandling.AddToLinkedControls(ucrPnlFindOptions, {rdoFind}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStringHandling.AddToLinkedControls(ucrChkReplaceBy, {rdoReplaceNa}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlStringHandling.AddToLinkedControls(ucrChkRemoveAll, {rdoRemove}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlFindOptions.AddToLinkedControls(ucrChkAll, {rdoExtract, rdoLocate}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlFindOptions.SetLinkedDisplayControl(grpFindOptions) + ucrPnlDetectOptions.SetLinkedDisplayControl(grpDetectOptions) + ucrInputReplaceBy.SetLinkedDisplayControl(lblReplaceBy) + ucrInputPattern.SetLinkedDisplayControl(lblPattern) + ucrChkBoundary.AddToLinkedControls(ucrInputBoundary, {True}, bNewLinkedHideIfParameterMissing:=True) End Sub Private Sub SetDefaults() @@ -108,21 +161,39 @@ Public Class dlgStringHandling clsFixedFunction = New RFunction clsRegexFunction = New RFunction clsStringCollFunction = New RFunction + clsBoundaryFunction = New RFunction + clsDummyFunction = New RFunction + clsDetectDummyFunction = New RFunction + clsRemoveFunction = New RFunction + clsStartsFunction = New RFunction + clsEndsFunction = New RFunction + clsReplaceNaFunction = New RFunction + clsFindDummyFunction = New RFunction + clsMatchAllFunction = New RFunction + clsExtractAllFunction = New RFunction + clsLocateAllFunction = New RFunction + clsRemoveAllFunction = New RFunction + clsAllDummyFunction = New RFunction + clsReplaceAllDummyFunction = New RFunction + clsRemoveAllDummyFunction = New RFunction ucrSelectorStringHandling.Reset() - 'temporaryfix - ucrChkIncludeRegularExpressions.Checked = False - rdoFixed.Checked = True - rdoCount.Checked = True - VisibleRdo() - ucrInputReplaceBy.Reset() ucrSaveStringHandling.Reset() ucrInputReplaceBy.SetName("") ucrInputPattern.SetName("") - ucrInputPattern.Reset() - ucrReceiverForRegexExpression.ResetText() + + clsDummyFunction.AddParameter("checked", False, iPosition:=0) + clsAllDummyFunction.AddParameter("checked", False, iPosition:=0) + clsReplaceAllDummyFunction.AddParameter("checked", False, iPosition:=0) + clsRemoveAllDummyFunction.AddParameter("checked", False, iPosition:=0) + clsDetectDummyFunction.AddParameter("checked", "str_detect", iPosition:=0) + clsFindDummyFunction.AddParameter("checked", "str_count", iPosition:=0) + + clsBoundaryFunction.SetPackageName("stringr") + clsBoundaryFunction.SetRCommand("boundary") + clsBoundaryFunction.AddParameter("type", Chr(34) & "character" & Chr(34), iPosition:=0) clsFixedFunction.SetPackageName("stringr") clsFixedFunction.SetRCommand("fixed") @@ -130,72 +201,110 @@ Public Class dlgStringHandling clsRegexFunction.SetPackageName("stringr") clsRegexFunction.SetRCommand("regex") - clsRegexFunction.AddParameter("ignore_case", "TRUE") + clsRegexFunction.AddParameter("ignore_case", "FALSE", bIncludeArgumentName:=False, iPosition:=3) + clsRegexFunction.AddParameter("multiline", "FALSE", iPosition:=4) + clsRegexFunction.AddParameter("comments", "FALSE", iPosition:=5) clsStringCollFunction.SetPackageName("stringr") clsStringCollFunction.SetRCommand("coll") + clsStringCollFunction.AddParameter("ignore_case", "FALSE", bIncludeArgumentName:=False, iPosition:=3) - ucrReceiverForRegexExpression.SetText("") - AddRemoveParameters() + clsStartsFunction.SetPackageName("stringr") + clsStartsFunction.SetRCommand("str_starts") + clsStartsFunction.AddParameter("negate", "FALSE", iPosition:=2) + + clsEndsFunction.SetPackageName("stringr") + clsEndsFunction.SetRCommand("str_ends") + clsEndsFunction.AddParameter("negate", "FALSE", iPosition:=2) clsCountFunction.SetPackageName("stringr") clsCountFunction.SetRCommand("str_count") clsExtractFunction.SetPackageName("stringr") clsExtractFunction.SetRCommand("str_extract") + clsExtractAllFunction.SetPackageName("stringr") + clsExtractAllFunction.SetRCommand("str_extract_all") + clsMatchAllFunction.SetPackageName("stringr") + clsMatchAllFunction.SetRCommand("str_match_all") clsDetectFunction.SetPackageName("stringr") clsDetectFunction.SetRCommand("str_detect") clsLocateFunction.SetPackageName("stringr") clsLocateFunction.SetRCommand("str_locate") + clsLocateAllFunction.SetPackageName("stringr") + clsLocateAllFunction.SetRCommand("str_locate_all") clsReplaceFunction.SetPackageName("stringr") clsReplaceFunction.SetRCommand("str_replace") clsReplaceAllFunction.SetPackageName("stringr") clsReplaceAllFunction.SetRCommand("str_replace_all") - ChangePrefixName() - clsCountFunction.SetAssignTo(ucrSaveStringHandling.GetText, strTempDataframe:=ucrSelectorStringHandling.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveStringHandling.GetText, bAssignToIsPrefix:=True) - ucrBase.clsRsyntax.SetBaseRFunction(clsCountFunction) + clsReplaceNaFunction.SetPackageName("stringr") + clsReplaceNaFunction.SetRCommand("str_replace_na") + clsRemoveFunction.SetPackageName("stringr") + clsRemoveFunction.SetRCommand("str_remove") + clsRemoveAllFunction.SetPackageName("stringr") + clsRemoveAllFunction.SetRCommand("str_remove_all") + + clsDetectFunction.SetAssignTo(ucrSaveStringHandling.GetText, strTempDataframe:=ucrSelectorStringHandling.ucrAvailableDataFrames.cboAvailableDataFrames.Text, strTempColumn:=ucrSaveStringHandling.GetText, bAssignToIsPrefix:=True) + ucrBase.clsRsyntax.SetBaseRFunction(clsDetectFunction) NewColumnName() End Sub - 'temporary fix. - Private Sub VisibleRdo() - If ucrChkIncludeRegularExpressions.Checked Then - rdoRegex.Visible = True - rdoFixed.Visible = True - Else - rdoRegex.Visible = False - rdoFixed.Visible = False - End If - End Sub - Private Sub SetRCodeForControls(bReset As Boolean) - ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsDetectFunction, New RParameter("string", 0), iAdditionalPairNo:=1) + ucrPnlStringHandling.SetRCode(ucrBase.clsRsyntax.clsBaseFunction, bReset) + + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsCountFunction, New RParameter("string", 0), iAdditionalPairNo:=1) ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsExtractFunction, New RParameter("string", 0), iAdditionalPairNo:=2) ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsLocateFunction, New RParameter("string", 0), iAdditionalPairNo:=3) ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsReplaceFunction, New RParameter("string", 0), iAdditionalPairNo:=4) ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsReplaceAllFunction, New RParameter("string", 0), iAdditionalPairNo:=5) - + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsStartsFunction, New RParameter("string", 0), iAdditionalPairNo:=6) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsEndsFunction, New RParameter("string", 0), iAdditionalPairNo:=7) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsRemoveFunction, New RParameter("string", 0), iAdditionalPairNo:=8) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsReplaceNaFunction, New RParameter("string", 0), iAdditionalPairNo:=9) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsExtractAllFunction, New RParameter("string", 0), iAdditionalPairNo:=10) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsMatchAllFunction, New RParameter("string", 0), iAdditionalPairNo:=11) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsLocateAllFunction, New RParameter("string", 0), iAdditionalPairNo:=12) + ucrReceiverStringHandling.AddAdditionalCodeParameterPair(clsRemoveAllFunction, New RParameter("string", 0), iAdditionalPairNo:=13) ucrInputReplaceBy.AddAdditionalCodeParameterPair(clsReplaceFunction, New RParameter("replacement", 2), iAdditionalPairNo:=1) - ucrSaveStringHandling.AddAdditionalRCode(clsDetectFunction, iAdditionalPairNo:=1) + ucrChkIgnoreCase.AddAdditionalCodeParameterPair(clsRegexFunction, ucrChkIgnoreCase.GetParameter(), iAdditionalPairNo:=1) + ucrChkNegate.AddAdditionalCodeParameterPair(clsStartsFunction, ucrChkNegate.GetParameter(), iAdditionalPairNo:=1) + ucrChkNegate.AddAdditionalCodeParameterPair(clsEndsFunction, ucrChkNegate.GetParameter(), iAdditionalPairNo:=2) + + ucrSaveStringHandling.AddAdditionalRCode(clsCountFunction, iAdditionalPairNo:=1) ucrSaveStringHandling.AddAdditionalRCode(clsExtractFunction, iAdditionalPairNo:=2) ucrSaveStringHandling.AddAdditionalRCode(clsLocateFunction, iAdditionalPairNo:=3) ucrSaveStringHandling.AddAdditionalRCode(clsReplaceFunction, iAdditionalPairNo:=4) ucrSaveStringHandling.AddAdditionalRCode(clsReplaceAllFunction, iAdditionalPairNo:=5) - - ucrReceiverStringHandling.SetRCode(clsCountFunction, bReset) - ucrInputPattern.SetRCode(clsStringCollFunction, bReset) + ucrSaveStringHandling.AddAdditionalRCode(clsStartsFunction, iAdditionalPairNo:=6) + ucrSaveStringHandling.AddAdditionalRCode(clsEndsFunction, iAdditionalPairNo:=7) + ucrSaveStringHandling.AddAdditionalRCode(clsRemoveFunction, iAdditionalPairNo:=8) + ucrSaveStringHandling.AddAdditionalRCode(clsReplaceNaFunction, iAdditionalPairNo:=9) + ucrSaveStringHandling.AddAdditionalRCode(clsExtractAllFunction, iAdditionalPairNo:=10) + ucrSaveStringHandling.AddAdditionalRCode(clsLocateAllFunction, iAdditionalPairNo:=11) + ucrSaveStringHandling.AddAdditionalRCode(clsMatchAllFunction, iAdditionalPairNo:=12) + ucrSaveStringHandling.AddAdditionalRCode(clsRemoveAllFunction, iAdditionalPairNo:=13) + + ucrReceiverStringHandling.SetRCode(clsDetectFunction, bReset) ucrInputReplaceBy.SetRCode(clsReplaceAllFunction, bReset) - ucrSaveStringHandling.SetRCode(clsCountFunction, bReset) + ucrChkIncludeRegularExpressions.SetRCode(clsDummyFunction, bReset) + ucrChkReplaceAll.SetRCode(clsReplaceAllDummyFunction, bReset) + ucrChkRemoveAll.SetRCode(clsRemoveAllDummyFunction, bReset) + ucrChkAll.SetRCode(clsAllDummyFunction, bReset) + ucrChkIgnoreCase.SetRCode(clsStringCollFunction, bReset) + ucrInputBoundary.SetRCode(clsBoundaryFunction, bReset) + ucrChkComments.SetRCode(clsRegexFunction, bReset) + ucrChkMultiline.SetRCode(clsRegexFunction, bReset) + ucrSaveStringHandling.SetRCode(clsDetectFunction, bReset) + ucrChkNegate.SetRCode(clsDetectFunction, bReset) + ucrChkReplaceBy.SetRCode(clsReplaceNaFunction, bReset) + ucrInputReplaceNaBy.SetRCode(clsReplaceNaFunction, bReset) + ucrPnlFindOptions.SetRCode(clsFindDummyFunction, bReset) + ucrPnlDetectOptions.SetRCode(clsDetectDummyFunction, bReset) End Sub Private Sub TestOkEnabled() - If (rdoCount.Checked OrElse rdoDetect.Checked OrElse rdoExtract.Checked OrElse rdoLocate.Checked) AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() AndAlso Not ucrInputPattern.IsEmpty() Then - ucrBase.OKEnabled(True) - ElseIf (rdoReplace.Checked OrElse rdoReplaceAll.Checked) AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() AndAlso Not ucrInputPattern.IsEmpty Then - ucrBase.OKEnabled(True) - ElseIf (rdoCount.Checked OrElse rdoDetect.Checked OrElse rdoExtract.Checked OrElse rdoLocate.Checked) AndAlso ucrChkIncludeRegularExpressions.Checked AndAlso rdoRegex.Checked AndAlso Not ucrReceiverForRegexExpression.IsEmpty AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() Then + If (rdoDetect.Checked OrElse rdoFind.Checked OrElse rdoReplace.Checked OrElse rdoRemove.Checked) AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() Then ucrBase.OKEnabled(True) - ElseIf (rdoReplace.Checked OrElse rdoReplaceAll.Checked) AndAlso ucrChkIncludeRegularExpressions.Checked AndAlso rdoFixed.Checked AndAlso Not ucrReceiverForRegexExpression.IsEmpty AndAlso ucrSaveStringHandling.IsComplete() AndAlso Not ucrReceiverStringHandling.IsEmpty() AndAlso Not ucrInputReplaceBy.IsEmpty Then + ElseIf rdoReplaceNa.Checked AndAlso ucrSaveStringHandling.IsComplete() Then ucrBase.OKEnabled(True) Else ucrBase.OKEnabled(False) @@ -209,7 +318,7 @@ Public Class dlgStringHandling End Sub Private Sub NewColumnName() - If rdoLocate.Checked Then + If rdoReplaceNa.Checked Then ucrSaveStringHandling.SetLabelText("Prefix for New Column:") Else ucrSaveStringHandling.SetLabelText("New Column Name:") @@ -217,68 +326,100 @@ Public Class dlgStringHandling End Sub Private Sub AddRemoveParameters() + clsStringCollFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) + clsRegexFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), bIncludeArgumentName:=False, iPosition:=1) If ucrChkIncludeRegularExpressions.Checked Then - clsCountFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), iPosition:=1) - clsDetectFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), iPosition:=1) - clsExtractFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), iPosition:=1) - clsLocateFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), iPosition:=1) - clsReplaceFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), iPosition:=1) - clsReplaceAllFunction.AddParameter("pattern", Chr(34) & ucrInputPattern.GetText & Chr(34), iPosition:=1) + clsCountFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsRemoveFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsDetectFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsStartsFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsEndsFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsExtractFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsLocateFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsReplaceFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsReplaceAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsLocateAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsExtractAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsMatchAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) + clsRemoveAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsRegexFunction, bIncludeArgumentName:=False, iPosition:=1) Else - clsCountFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) - clsDetectFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) - clsExtractFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) - clsLocateFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) - clsReplaceFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) - clsReplaceAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, iPosition:=1) + clsCountFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsRemoveFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsDetectFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsStartsFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsEndsFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsExtractFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsLocateFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsReplaceFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsReplaceAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsLocateAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsMatchAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsExtractAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) + clsRemoveAllFunction.AddParameter("pattern", clsRFunctionParameter:=clsStringCollFunction, bIncludeArgumentName:=False, iPosition:=1) End If End Sub - Private Sub ucrPnlStringHandling_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStringHandling.ControlValueChanged - If rdoCount.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsCountFunction) - ElseIf rdoDetect.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsDetectFunction) - ElseIf rdoExtract.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsExtractFunction) - ElseIf rdoLocate.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsLocateFunction) - ElseIf rdoReplace.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceFunction) - ElseIf rdoReplaceAll.Checked Then - ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceAllFunction) - End If - NewColumnName() - ChangePrefixName() - End Sub - - Private Sub ChangeSize() - If rdoRegex.Checked Then - grpRegex.Visible = True - Me.Size = New Size(iFullWidth, Me.Height) - Else - grpRegex.Visible = False - Me.Size = New Size(iFullWidth / 1.29, Me.Height) - End If - End Sub - - Private Sub ChangePrefixName() - If Not ucrSaveStringHandling.bUserTyped Then + Private Sub ucrPnlStringHandling_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlStringHandling.ControlValueChanged, ucrPnlDetectOptions.ControlValueChanged, ucrChkAll.ControlValueChanged, ucrPnlFindOptions.ControlValueChanged, ucrChkReplaceAll.ControlValueChanged, ucrChkRemoveAll.ControlValueChanged, ucrInputReplaceNaBy.ControlValueChanged + If rdoDetect.Checked Then + If rdoDetects.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsDetectFunction) + ElseIf rdoStarts.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsStartsFunction) + ElseIf rdoEnds.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsEndsFunction) + End If + ucrSaveStringHandling.SetPrefix("detect") + ElseIf rdoFind.Checked Then If rdoCount.Checked Then + clsFindDummyFunction.AddParameter("checked", "str_count", iPosition:=0) + ucrBase.clsRsyntax.SetBaseRFunction(clsCountFunction) ucrSaveStringHandling.SetPrefix("count") - ElseIf rdoDetect.Checked Then - ucrSaveStringHandling.SetPrefix("detect") ElseIf rdoExtract.Checked Then - ucrSaveStringHandling.SetPrefix("extract") + clsFindDummyFunction.AddParameter("checked", "str_extract", iPosition:=0) + If ucrChkAll.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsExtractAllFunction) + ucrSaveStringHandling.SetPrefix("extract_all") + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsExtractFunction) + ucrSaveStringHandling.SetPrefix("extract") + End If ElseIf rdoLocate.Checked Then - ucrSaveStringHandling.SetPrefix("") - ucrSaveStringHandling.SetName("locate") - ElseIf rdoReplace.Checked Then - ucrSaveStringHandling.SetPrefix("replace") - ElseIf rdoReplaceAll.Checked Then + clsFindDummyFunction.AddParameter("checked", "str_locate", iPosition:=0) + If ucrChkAll.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsLocateAllFunction) + ucrSaveStringHandling.SetPrefix("locate_all") + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsLocateFunction) + ucrSaveStringHandling.SetPrefix("locate") + End If + End If + ElseIf rdoReplace.Checked Then + If ucrChkReplaceAll.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceAllFunction) ucrSaveStringHandling.SetPrefix("replace_all") + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceFunction) + ucrSaveStringHandling.SetPrefix("replace") + End If + ElseIf rdoReplaceNa.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsReplaceNaFunction) + ucrSaveStringHandling.SetPrefix("replace_na") + ElseIf rdoRemove.Checked Then + If ucrChkRemoveAll.Checked Then + ucrBase.clsRsyntax.SetBaseRFunction(clsRemoveAllFunction) + ucrSaveStringHandling.SetPrefix("remove_all") + Else + ucrBase.clsRsyntax.SetBaseRFunction(clsRemoveFunction) + ucrSaveStringHandling.SetPrefix("remove") End If End If + + NewColumnName() + ChangePrefixName() + AddRemoveParameters() + End Sub + + Private Sub ChangePrefixName() If rdoLocate.Checked Then ucrSaveStringHandling.SetAssignToBooleans(bTempAssignToIsPrefix:=True) Else @@ -286,109 +427,28 @@ Public Class dlgStringHandling End If End Sub - Private Sub cmdQuote_Click(sender As Object, e As EventArgs) Handles cmdQuote.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition(" "" ") + Private Sub cmdAddkeyboard_Click(sender As Object, e As EventArgs) Handles cmdAddkeyboard.Click + sdgConstructRegexExpression.ShowDialog() + ucrInputPattern.SetName(sdgConstructRegexExpression.ucrReceiverForRegex.GetText()) End Sub - Private Sub cmdSingleQuote_Click(sender As Object, e As EventArgs) Handles cmdSingleQuote.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition(" ' ' ") - End Sub - - Private Sub cmdOpenClosedBracket_Click(sender As Object, e As EventArgs) Handles cmdOpenClosedBracket.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("[ ] ") - End Sub - - Private Sub cmdOpenBracketCaretClosedBracket_Click(sender As Object, e As EventArgs) Handles cmdOpenBracketCaretClosedBracket.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("[ ^ ] ") - End Sub - - Private Sub cmdOpenCloseBrace_Click(sender As Object, e As EventArgs) Handles cmdOpenCloseBrace.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("{ }") - End Sub - - Private Sub cmdOpenCloseParenthesis_Click(sender As Object, e As EventArgs) Handles cmdOpenCloseParenthesis.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("*") - End Sub - - Private Sub cmdPlus_Click(sender As Object, e As EventArgs) Handles cmdPlus.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("+") - End Sub - - Private Sub cmdQuestionMark_Click(sender As Object, e As EventArgs) Handles cmdQuestionMark.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("?") - End Sub - - Private Sub cmdMultiply_Click(sender As Object, e As EventArgs) Handles cmdMultiply.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition(".") - End Sub - - Private Sub cmdPower_Click(sender As Object, e As EventArgs) Handles cmdPower.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("^") - End Sub - - Private Sub cmdDollarSign_Click(sender As Object, e As EventArgs) Handles cmdDollarSign.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("$") - End Sub - - Private Sub cmdOr_Click(sender As Object, e As EventArgs) Handles cmdOr.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("|,") - End Sub - - Private Sub cmdBackSlashb_Click(sender As Object, e As EventArgs) Handles cmdBackSlashb.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\b") - End Sub - - Private Sub cmdBbackSlash_Click(sender As Object, e As EventArgs) Handles cmdBbackSlash.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\B") - End Sub - - Private Sub cmdBackSlashw_Click(sender As Object, e As EventArgs) Handles cmdBackSlashw.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\w") - End Sub - - Private Sub cmdWBackSlash_Click(sender As Object, e As EventArgs) Handles cmdWBackSlash.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\W") - End Sub - - Private Sub cmdBackSlashs_Click(sender As Object, e As EventArgs) Handles cmdBackSlashs.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\s") - End Sub - - Private Sub cmdSbackSlash_Click(sender As Object, e As EventArgs) Handles cmdSbackSlash.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\S") - End Sub - - Private Sub cmdBackSlashd_Click(sender As Object, e As EventArgs) Handles cmdBackSlashd.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\d") - End Sub - - Private Sub cmdDBackSlah_Click(sender As Object, e As EventArgs) Handles cmdDBackSlah.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\D") - End Sub - - Private Sub cmdBackSlash_Click(sender As Object, e As EventArgs) Handles cmdBackSlash.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("\") - End Sub - - Private Sub cmdStar_Click(sender As Object, e As EventArgs) Handles cmdStar.Click - ucrReceiverForRegexExpression.AddToReceiverAtCursorPosition("*") - End Sub - - Private Sub cmdClear_Click(sender As Object, e As EventArgs) Handles cmdClear.Click - ucrReceiverForRegexExpression.Clear() + Private Sub ucrPnlDetectOptions_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlDetectOptions.ControlContentsChanged + If rdoDetects.Checked Then + clsDetectDummyFunction.AddParameter("checked", "str_detect", iPosition:=0) + ElseIf rdoStarts.Checked Then + clsDetectDummyFunction.AddParameter("checked", "str_starts", iPosition:=0) + ElseIf rdoEnds.Checked Then + clsDetectDummyFunction.AddParameter("checked", "str_ends", iPosition:=0) + End If End Sub - Private Sub ucrAll_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged, ucrReceiverForRegexExpression.ControlValueChanged, ucrInputPattern.ControlValueChanged - VisibleRdo() + Private Sub ucrChkIncludeRegularExpressions_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkIncludeRegularExpressions.ControlValueChanged, ucrInputBoundary.ControlValueChanged, ucrChkBoundary.ControlValueChanged, ucrInputPattern.ControlValueChanged AddRemoveParameters() + cmdAddkeyboard.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) + grpModifiers.Visible = If(ucrChkIncludeRegularExpressions.Checked, True, False) End Sub - Private Sub ucrPnlFixedRegex_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlFixedRegex.ControlContentsChanged - VisibleRdo() - ChangeSize() - End Sub - - Private Sub ucrReceiverStringHandling_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStringHandling.ControlContentsChanged, ucrPnlStringHandling.ControlContentsChanged, ucrInputPattern.ControlContentsChanged, ucrReceiverForRegexExpression.ControlContentsChanged, ucrPnlFixedRegex.ControlContentsChanged, ucrChkIncludeRegularExpressions.ControlContentsChanged, ucrSaveStringHandling.ControlContentsChanged + Private Sub ucrReceiverStringHandling_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverStringHandling.ControlContentsChanged, ucrPnlStringHandling.ControlContentsChanged, ucrSaveStringHandling.ControlContentsChanged TestOkEnabled() End Sub End Class \ No newline at end of file diff --git a/instat/dlgTransformClimatic.Designer.vb b/instat/dlgTransformClimatic.Designer.vb index 095d109fbaa..7013f304a84 100644 --- a/instat/dlgTransformClimatic.Designer.vb +++ b/instat/dlgTransformClimatic.Designer.vb @@ -1,741 +1,792 @@ -' 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 . - - -Partial Class dlgTransformClimatic - 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.lblYear = New System.Windows.Forms.Label() - Me.lblDate = New System.Windows.Forms.Label() - Me.lblStation = New System.Windows.Forms.Label() - Me.lblData = New System.Windows.Forms.Label() - Me.rdoSpell = New System.Windows.Forms.RadioButton() - Me.rdoMoving = New System.Windows.Forms.RadioButton() - Me.rdoCount = New System.Windows.Forms.RadioButton() - Me.rdoWaterBalance = New System.Windows.Forms.RadioButton() - Me.lblSumRows = New System.Windows.Forms.Label() - Me.lblSumOver = New System.Windows.Forms.Label() - Me.lblCountOver = New System.Windows.Forms.Label() - Me.grpTransform = New System.Windows.Forms.GroupBox() - Me.ucrReceiverEvap = New instat.ucrReceiverSingle() - Me.ucrInputEvaporation = New instat.ucrInputTextBox() - Me.ucrChkGroupByYear = New instat.ucrCheck() - Me.rdoEvapVariable = New System.Windows.Forms.RadioButton() - Me.rdoEvapValue = New System.Windows.Forms.RadioButton() - Me.ucrPnlEvap = New instat.UcrPanel() - Me.ucrInputCumulative = New instat.ucrInputComboBox() - Me.ucrInputCircularPosition = New instat.ucrInputComboBox() - Me.lblPosition = New System.Windows.Forms.Label() - Me.ucrInputPosition = New instat.ucrInputComboBox() - Me.ucrChkCircular = New instat.ucrCheck() - Me.ucrNudMultSpells = New instat.ucrNud() - Me.lblRowsMultSpells = New System.Windows.Forms.Label() - Me.ucrInputSpellUpper = New instat.ucrInputTextBox() - Me.ucrInputCondition = New instat.ucrInputComboBox() - Me.lblCondition = New System.Windows.Forms.Label() - Me.lblWBEvaporation = New System.Windows.Forms.Label() - Me.ucrInputSpellLower = New instat.ucrInputTextBox() - Me.ucrNudSumOver = New instat.ucrNud() - Me.lblWBCapacity = New System.Windows.Forms.Label() - Me.ucrNudWBCapacity = New instat.ucrNud() - Me.ucrInputSum = New instat.ucrInputComboBox() - Me.ucrNudCountOver = New instat.ucrNud() - Me.rdoMultSpells = New System.Windows.Forms.RadioButton() - Me.rdoCumulative = New System.Windows.Forms.RadioButton() - Me.ucrSaveColumn = New instat.ucrSave() - Me.ucrPnlTransform = New instat.UcrPanel() - Me.ucrReceiverDate = New instat.ucrReceiverSingle() - Me.ucrReceiverYear = New instat.ucrReceiverSingle() - Me.ucrReceiverStation = New instat.ucrReceiverSingle() - Me.ucrReceiverData = New instat.ucrReceiverSingle() - Me.ucrSelectorTransform = New instat.ucrSelectorByDataFrameAddRemove() - Me.ucrBase = New instat.ucrButtons() - Me.grpTransform.SuspendLayout() - Me.SuspendLayout() - ' - 'lblYear - ' - Me.lblYear.AutoSize = True - Me.lblYear.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblYear.Location = New System.Drawing.Point(272, 164) - Me.lblYear.Name = "lblYear" - Me.lblYear.Size = New System.Drawing.Size(32, 13) - Me.lblYear.TabIndex = 12 - Me.lblYear.Text = "Year:" - ' - 'lblDate - ' - Me.lblDate.AutoSize = True - Me.lblDate.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblDate.Location = New System.Drawing.Point(272, 117) - Me.lblDate.Name = "lblDate" - Me.lblDate.Size = New System.Drawing.Size(33, 13) - Me.lblDate.TabIndex = 8 - Me.lblDate.Text = "Date:" - ' - 'lblStation - ' - Me.lblStation.AutoSize = True - Me.lblStation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblStation.Location = New System.Drawing.Point(272, 67) - Me.lblStation.Name = "lblStation" - Me.lblStation.Size = New System.Drawing.Size(43, 13) - Me.lblStation.TabIndex = 6 - Me.lblStation.Text = "Station:" - ' - 'lblData - ' - Me.lblData.AutoSize = True - Me.lblData.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblData.Location = New System.Drawing.Point(272, 212) - Me.lblData.Name = "lblData" - Me.lblData.Size = New System.Drawing.Size(48, 13) - Me.lblData.TabIndex = 16 - Me.lblData.Text = "Element:" - ' - 'rdoSpell - ' - Me.rdoSpell.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoSpell.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoSpell.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSpell.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSpell.FlatAppearance.BorderSize = 2 - Me.rdoSpell.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSpell.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSpell.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoSpell.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSpell.Location = New System.Drawing.Point(283, 15) - Me.rdoSpell.Name = "rdoSpell" - Me.rdoSpell.Size = New System.Drawing.Size(64, 28) - Me.rdoSpell.TabIndex = 3 - Me.rdoSpell.Text = "Spell" - Me.rdoSpell.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoSpell.UseVisualStyleBackColor = True - ' - 'rdoMoving - ' - Me.rdoMoving.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoMoving.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoMoving.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoMoving.Cursor = System.Windows.Forms.Cursors.Default - Me.rdoMoving.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMoving.FlatAppearance.BorderSize = 2 - Me.rdoMoving.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMoving.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoMoving.ForeColor = System.Drawing.SystemColors.ControlText - Me.rdoMoving.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoMoving.Location = New System.Drawing.Point(194, 15) - Me.rdoMoving.Name = "rdoMoving" - Me.rdoMoving.Size = New System.Drawing.Size(91, 28) - Me.rdoMoving.TabIndex = 2 - Me.rdoMoving.Text = "Moving" - Me.rdoMoving.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoMoving.UseVisualStyleBackColor = True - ' - 'rdoCount - ' - Me.rdoCount.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoCount.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoCount.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCount.FlatAppearance.BorderSize = 2 - Me.rdoCount.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoCount.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoCount.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCount.Location = New System.Drawing.Point(105, 15) - Me.rdoCount.Name = "rdoCount" - Me.rdoCount.Size = New System.Drawing.Size(91, 28) - Me.rdoCount.TabIndex = 1 - Me.rdoCount.Text = "Count" - Me.rdoCount.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoCount.UseVisualStyleBackColor = True - ' - 'rdoWaterBalance - ' - Me.rdoWaterBalance.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoWaterBalance.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoWaterBalance.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoWaterBalance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoWaterBalance.FlatAppearance.BorderSize = 2 - Me.rdoWaterBalance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoWaterBalance.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoWaterBalance.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoWaterBalance.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoWaterBalance.Location = New System.Drawing.Point(434, 15) - Me.rdoWaterBalance.Name = "rdoWaterBalance" - Me.rdoWaterBalance.Size = New System.Drawing.Size(117, 28) - Me.rdoWaterBalance.TabIndex = 4 - Me.rdoWaterBalance.Text = "Water Balance" - Me.rdoWaterBalance.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoWaterBalance.UseVisualStyleBackColor = True - ' - 'lblSumRows - ' - Me.lblSumRows.AutoSize = True - Me.lblSumRows.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSumRows.Location = New System.Drawing.Point(245, 24) - Me.lblSumRows.Name = "lblSumRows" - Me.lblSumRows.Size = New System.Drawing.Size(34, 13) - Me.lblSumRows.TabIndex = 5 - Me.lblSumRows.Tag = "Rows" - Me.lblSumRows.Text = "Rows" - ' - 'lblSumOver - ' - Me.lblSumOver.AutoSize = True - Me.lblSumOver.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblSumOver.Location = New System.Drawing.Point(157, 24) - Me.lblSumOver.Name = "lblSumOver" - Me.lblSumOver.Size = New System.Drawing.Size(30, 13) - Me.lblSumOver.TabIndex = 3 - Me.lblSumOver.Tag = "Over" - Me.lblSumOver.Text = "Over" - ' - 'lblCountOver - ' - Me.lblCountOver.AutoSize = True - Me.lblCountOver.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCountOver.Location = New System.Drawing.Point(12, 24) - Me.lblCountOver.Name = "lblCountOver" - Me.lblCountOver.Size = New System.Drawing.Size(106, 13) - Me.lblCountOver.TabIndex = 8 - Me.lblCountOver.Tag = "Rows_to_Count_Over:" - Me.lblCountOver.Text = "Rows to Count Over:" - ' - 'grpTransform - ' - Me.grpTransform.Controls.Add(Me.ucrReceiverEvap) - Me.grpTransform.Controls.Add(Me.ucrInputEvaporation) - Me.grpTransform.Controls.Add(Me.ucrChkGroupByYear) - Me.grpTransform.Controls.Add(Me.rdoEvapVariable) - Me.grpTransform.Controls.Add(Me.rdoEvapValue) - Me.grpTransform.Controls.Add(Me.ucrPnlEvap) - Me.grpTransform.Controls.Add(Me.ucrInputCumulative) - Me.grpTransform.Controls.Add(Me.ucrInputCircularPosition) - Me.grpTransform.Controls.Add(Me.lblPosition) - Me.grpTransform.Controls.Add(Me.ucrInputPosition) - Me.grpTransform.Controls.Add(Me.ucrChkCircular) - Me.grpTransform.Controls.Add(Me.ucrNudMultSpells) - Me.grpTransform.Controls.Add(Me.lblRowsMultSpells) - Me.grpTransform.Controls.Add(Me.ucrInputSpellUpper) - Me.grpTransform.Controls.Add(Me.lblSumRows) - Me.grpTransform.Controls.Add(Me.ucrInputCondition) - Me.grpTransform.Controls.Add(Me.lblCondition) - Me.grpTransform.Controls.Add(Me.lblWBEvaporation) - Me.grpTransform.Controls.Add(Me.ucrInputSpellLower) - Me.grpTransform.Controls.Add(Me.lblCountOver) - Me.grpTransform.Controls.Add(Me.ucrNudSumOver) - Me.grpTransform.Controls.Add(Me.lblWBCapacity) - Me.grpTransform.Controls.Add(Me.ucrNudWBCapacity) - Me.grpTransform.Controls.Add(Me.ucrInputSum) - Me.grpTransform.Controls.Add(Me.lblSumOver) - Me.grpTransform.Controls.Add(Me.ucrNudCountOver) - Me.grpTransform.Location = New System.Drawing.Point(10, 261) - Me.grpTransform.Name = "grpTransform" - Me.grpTransform.Size = New System.Drawing.Size(376, 142) - Me.grpTransform.TabIndex = 18 - Me.grpTransform.TabStop = False - Me.grpTransform.Text = "Options" - ' - 'ucrReceiverEvap - ' - Me.ucrReceiverEvap.AutoSize = True - Me.ucrReceiverEvap.frmParent = Me - Me.ucrReceiverEvap.Location = New System.Drawing.Point(155, 79) - Me.ucrReceiverEvap.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverEvap.Name = "ucrReceiverEvap" - Me.ucrReceiverEvap.Selector = Nothing - Me.ucrReceiverEvap.Size = New System.Drawing.Size(103, 20) - Me.ucrReceiverEvap.strNcFilePath = "" - Me.ucrReceiverEvap.TabIndex = 37 - Me.ucrReceiverEvap.ucrSelector = Nothing - ' - 'ucrInputEvaporation - ' - Me.ucrInputEvaporation.AddQuotesIfUnrecognised = True - Me.ucrInputEvaporation.AutoSize = True - Me.ucrInputEvaporation.IsMultiline = False - Me.ucrInputEvaporation.IsReadOnly = False - Me.ucrInputEvaporation.Location = New System.Drawing.Point(155, 53) - Me.ucrInputEvaporation.Name = "ucrInputEvaporation" - Me.ucrInputEvaporation.Size = New System.Drawing.Size(103, 21) - Me.ucrInputEvaporation.TabIndex = 31 - ' - 'ucrChkGroupByYear - ' - Me.ucrChkGroupByYear.AutoSize = True - Me.ucrChkGroupByYear.Checked = False - Me.ucrChkGroupByYear.Location = New System.Drawing.Point(24, 112) - Me.ucrChkGroupByYear.Name = "ucrChkGroupByYear" - Me.ucrChkGroupByYear.Size = New System.Drawing.Size(174, 23) - Me.ucrChkGroupByYear.TabIndex = 22 - ' - 'rdoEvapVariable - ' - Me.rdoEvapVariable.AutoSize = True - Me.rdoEvapVariable.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEvapVariable.Location = New System.Drawing.Point(87, 82) - Me.rdoEvapVariable.Name = "rdoEvapVariable" - Me.rdoEvapVariable.Size = New System.Drawing.Size(66, 17) - Me.rdoEvapVariable.TabIndex = 36 - Me.rdoEvapVariable.TabStop = True - Me.rdoEvapVariable.Text = "Variable:" - Me.rdoEvapVariable.UseVisualStyleBackColor = True - ' - 'rdoEvapValue - ' - Me.rdoEvapValue.AutoSize = True - Me.rdoEvapValue.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoEvapValue.Location = New System.Drawing.Point(87, 54) - Me.rdoEvapValue.Name = "rdoEvapValue" - Me.rdoEvapValue.Size = New System.Drawing.Size(55, 17) - Me.rdoEvapValue.TabIndex = 35 - Me.rdoEvapValue.TabStop = True - Me.rdoEvapValue.Text = "Value:" - Me.rdoEvapValue.UseVisualStyleBackColor = True - ' - 'ucrPnlEvap - ' - Me.ucrPnlEvap.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlEvap.Location = New System.Drawing.Point(86, 43) - Me.ucrPnlEvap.Name = "ucrPnlEvap" - Me.ucrPnlEvap.Size = New System.Drawing.Size(63, 57) - Me.ucrPnlEvap.TabIndex = 29 - ' - 'ucrInputCumulative - ' - Me.ucrInputCumulative.AddQuotesIfUnrecognised = True - Me.ucrInputCumulative.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCumulative.GetSetSelectedIndex = -1 - Me.ucrInputCumulative.IsReadOnly = False - Me.ucrInputCumulative.Location = New System.Drawing.Point(24, 21) - Me.ucrInputCumulative.Name = "ucrInputCumulative" - Me.ucrInputCumulative.Size = New System.Drawing.Size(112, 21) - Me.ucrInputCumulative.TabIndex = 26 - ' - 'ucrInputCircularPosition - ' - Me.ucrInputCircularPosition.AddQuotesIfUnrecognised = True - Me.ucrInputCircularPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCircularPosition.GetSetSelectedIndex = -1 - Me.ucrInputCircularPosition.IsReadOnly = False - Me.ucrInputCircularPosition.Location = New System.Drawing.Point(199, 55) - Me.ucrInputCircularPosition.Name = "ucrInputCircularPosition" - Me.ucrInputCircularPosition.Size = New System.Drawing.Size(137, 21) - Me.ucrInputCircularPosition.TabIndex = 27 - ' - 'lblPosition - ' - Me.lblPosition.AutoSize = True - Me.lblPosition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblPosition.Location = New System.Drawing.Point(151, 59) - Me.lblPosition.Name = "lblPosition" - Me.lblPosition.Size = New System.Drawing.Size(47, 13) - Me.lblPosition.TabIndex = 25 - Me.lblPosition.Text = "Position:" - ' - 'ucrInputPosition - ' - Me.ucrInputPosition.AddQuotesIfUnrecognised = True - Me.ucrInputPosition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputPosition.GetSetSelectedIndex = -1 - Me.ucrInputPosition.IsReadOnly = False - Me.ucrInputPosition.Location = New System.Drawing.Point(199, 55) - Me.ucrInputPosition.Name = "ucrInputPosition" - Me.ucrInputPosition.Size = New System.Drawing.Size(137, 21) - Me.ucrInputPosition.TabIndex = 24 - ' - 'ucrChkCircular - ' - Me.ucrChkCircular.AutoSize = True - Me.ucrChkCircular.Checked = False - Me.ucrChkCircular.Location = New System.Drawing.Point(24, 58) - Me.ucrChkCircular.Name = "ucrChkCircular" - Me.ucrChkCircular.Size = New System.Drawing.Size(100, 23) - Me.ucrChkCircular.TabIndex = 26 - ' - 'ucrNudMultSpells - ' - Me.ucrNudMultSpells.AutoSize = True - Me.ucrNudMultSpells.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMultSpells.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudMultSpells.Location = New System.Drawing.Point(194, 21) - Me.ucrNudMultSpells.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudMultSpells.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudMultSpells.Name = "ucrNudMultSpells" - Me.ucrNudMultSpells.Size = New System.Drawing.Size(50, 20) - Me.ucrNudMultSpells.TabIndex = 15 - Me.ucrNudMultSpells.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblRowsMultSpells - ' - Me.lblRowsMultSpells.AutoSize = True - Me.lblRowsMultSpells.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblRowsMultSpells.Location = New System.Drawing.Point(12, 25) - Me.lblRowsMultSpells.Name = "lblRowsMultSpells" - Me.lblRowsMultSpells.Size = New System.Drawing.Size(126, 13) - Me.lblRowsMultSpells.TabIndex = 14 - Me.lblRowsMultSpells.Tag = "Rows_to_Take_Over:" - Me.lblRowsMultSpells.Text = "Rows to Take Max Over:" - ' - 'ucrInputSpellUpper - ' - Me.ucrInputSpellUpper.AddQuotesIfUnrecognised = True - Me.ucrInputSpellUpper.AutoSize = True - Me.ucrInputSpellUpper.IsMultiline = False - Me.ucrInputSpellUpper.IsReadOnly = False - Me.ucrInputSpellUpper.Location = New System.Drawing.Point(285, 50) - Me.ucrInputSpellUpper.Name = "ucrInputSpellUpper" - Me.ucrInputSpellUpper.Size = New System.Drawing.Size(49, 21) - Me.ucrInputSpellUpper.TabIndex = 13 - ' - 'ucrInputCondition - ' - Me.ucrInputCondition.AddQuotesIfUnrecognised = True - Me.ucrInputCondition.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputCondition.GetSetSelectedIndex = -1 - Me.ucrInputCondition.IsReadOnly = False - Me.ucrInputCondition.Location = New System.Drawing.Point(124, 50) - Me.ucrInputCondition.Name = "ucrInputCondition" - Me.ucrInputCondition.Size = New System.Drawing.Size(155, 21) - Me.ucrInputCondition.TabIndex = 12 - ' - 'lblCondition - ' - Me.lblCondition.AutoSize = True - Me.lblCondition.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCondition.Location = New System.Drawing.Point(12, 53) - Me.lblCondition.Name = "lblCondition" - Me.lblCondition.Size = New System.Drawing.Size(54, 13) - Me.lblCondition.TabIndex = 10 - Me.lblCondition.Tag = "Condition:" - Me.lblCondition.Text = "Condition:" - ' - 'lblWBEvaporation - ' - Me.lblWBEvaporation.AutoSize = True - Me.lblWBEvaporation.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWBEvaporation.Location = New System.Drawing.Point(13, 55) - Me.lblWBEvaporation.Name = "lblWBEvaporation" - Me.lblWBEvaporation.Size = New System.Drawing.Size(67, 13) - Me.lblWBEvaporation.TabIndex = 6 - Me.lblWBEvaporation.Tag = "Evaporation" - Me.lblWBEvaporation.Text = "Evaporation:" - ' - 'ucrInputSpellLower - ' - Me.ucrInputSpellLower.AddQuotesIfUnrecognised = True - Me.ucrInputSpellLower.AutoSize = True - Me.ucrInputSpellLower.IsMultiline = False - Me.ucrInputSpellLower.IsReadOnly = False - Me.ucrInputSpellLower.Location = New System.Drawing.Point(69, 50) - Me.ucrInputSpellLower.Name = "ucrInputSpellLower" - Me.ucrInputSpellLower.Size = New System.Drawing.Size(49, 21) - Me.ucrInputSpellLower.TabIndex = 11 - ' - 'ucrNudSumOver - ' - Me.ucrNudSumOver.AutoSize = True - Me.ucrNudSumOver.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSumOver.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudSumOver.Location = New System.Drawing.Point(193, 21) - Me.ucrNudSumOver.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudSumOver.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudSumOver.Name = "ucrNudSumOver" - Me.ucrNudSumOver.Size = New System.Drawing.Size(50, 20) - Me.ucrNudSumOver.TabIndex = 4 - Me.ucrNudSumOver.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'lblWBCapacity - ' - Me.lblWBCapacity.AutoSize = True - Me.lblWBCapacity.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblWBCapacity.Location = New System.Drawing.Point(13, 25) - Me.lblWBCapacity.Name = "lblWBCapacity" - Me.lblWBCapacity.Size = New System.Drawing.Size(51, 13) - Me.lblWBCapacity.TabIndex = 1 - Me.lblWBCapacity.Tag = "Capacity" - Me.lblWBCapacity.Text = "Capacity:" - ' - 'ucrNudWBCapacity - ' - Me.ucrNudWBCapacity.AutoSize = True - Me.ucrNudWBCapacity.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWBCapacity.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudWBCapacity.Location = New System.Drawing.Point(86, 21) - Me.ucrNudWBCapacity.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudWBCapacity.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudWBCapacity.Name = "ucrNudWBCapacity" - Me.ucrNudWBCapacity.Size = New System.Drawing.Size(50, 20) - Me.ucrNudWBCapacity.TabIndex = 2 - Me.ucrNudWBCapacity.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'ucrInputSum - ' - Me.ucrInputSum.AddQuotesIfUnrecognised = True - Me.ucrInputSum.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrInputSum.GetSetSelectedIndex = -1 - Me.ucrInputSum.IsReadOnly = False - Me.ucrInputSum.Location = New System.Drawing.Point(24, 21) - Me.ucrInputSum.Name = "ucrInputSum" - Me.ucrInputSum.Size = New System.Drawing.Size(112, 21) - Me.ucrInputSum.TabIndex = 0 - ' - 'ucrNudCountOver - ' - Me.ucrNudCountOver.AutoSize = True - Me.ucrNudCountOver.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudCountOver.Increment = New Decimal(New Integer() {1, 0, 0, 0}) - Me.ucrNudCountOver.Location = New System.Drawing.Point(134, 21) - Me.ucrNudCountOver.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) - Me.ucrNudCountOver.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) - Me.ucrNudCountOver.Name = "ucrNudCountOver" - Me.ucrNudCountOver.Size = New System.Drawing.Size(50, 20) - Me.ucrNudCountOver.TabIndex = 9 - Me.ucrNudCountOver.Value = New Decimal(New Integer() {0, 0, 0, 0}) - ' - 'rdoMultSpells - ' - Me.rdoMultSpells.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoMultSpells.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoMultSpells.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoMultSpells.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMultSpells.FlatAppearance.BorderSize = 2 - Me.rdoMultSpells.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMultSpells.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoMultSpells.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoMultSpells.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoMultSpells.Location = New System.Drawing.Point(345, 15) - Me.rdoMultSpells.Name = "rdoMultSpells" - Me.rdoMultSpells.Size = New System.Drawing.Size(91, 28) - Me.rdoMultSpells.TabIndex = 23 - Me.rdoMultSpells.Text = "Multiple Spells" - Me.rdoMultSpells.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoMultSpells.UseVisualStyleBackColor = True - ' - 'rdoCumulative - ' - Me.rdoCumulative.Appearance = System.Windows.Forms.Appearance.Button - Me.rdoCumulative.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None - Me.rdoCumulative.CheckAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.FlatAppearance.BorderSize = 2 - Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoCumulative.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoCumulative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText - Me.rdoCumulative.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoCumulative.Location = New System.Drawing.Point(16, 15) - Me.rdoCumulative.Name = "rdoCumulative" - Me.rdoCumulative.Size = New System.Drawing.Size(91, 28) - Me.rdoCumulative.TabIndex = 25 - Me.rdoCumulative.Text = "Cumulative" - Me.rdoCumulative.TextAlign = System.Drawing.ContentAlignment.MiddleCenter - Me.rdoCumulative.UseVisualStyleBackColor = True - ' - 'ucrSaveColumn - ' - Me.ucrSaveColumn.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveColumn.Location = New System.Drawing.Point(11, 411) - Me.ucrSaveColumn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveColumn.Name = "ucrSaveColumn" - Me.ucrSaveColumn.Size = New System.Drawing.Size(335, 21) - Me.ucrSaveColumn.TabIndex = 20 - ' - 'ucrPnlTransform - ' - Me.ucrPnlTransform.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlTransform.Location = New System.Drawing.Point(12, 9) - Me.ucrPnlTransform.Name = "ucrPnlTransform" - Me.ucrPnlTransform.Size = New System.Drawing.Size(543, 49) - Me.ucrPnlTransform.TabIndex = 0 - ' - 'ucrReceiverDate - ' - Me.ucrReceiverDate.AutoSize = True - Me.ucrReceiverDate.frmParent = Me - Me.ucrReceiverDate.Location = New System.Drawing.Point(275, 130) - Me.ucrReceiverDate.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverDate.Name = "ucrReceiverDate" - Me.ucrReceiverDate.Selector = Nothing - Me.ucrReceiverDate.Size = New System.Drawing.Size(137, 20) - Me.ucrReceiverDate.strNcFilePath = "" - Me.ucrReceiverDate.TabIndex = 9 - Me.ucrReceiverDate.ucrSelector = Nothing - ' - 'ucrReceiverYear - ' - Me.ucrReceiverYear.AutoSize = True - Me.ucrReceiverYear.frmParent = Me - Me.ucrReceiverYear.Location = New System.Drawing.Point(275, 177) - Me.ucrReceiverYear.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverYear.Name = "ucrReceiverYear" - Me.ucrReceiverYear.Selector = Nothing - Me.ucrReceiverYear.Size = New System.Drawing.Size(137, 20) - Me.ucrReceiverYear.strNcFilePath = "" - Me.ucrReceiverYear.TabIndex = 13 - Me.ucrReceiverYear.ucrSelector = Nothing - ' - 'ucrReceiverStation - ' - Me.ucrReceiverStation.AutoSize = True - Me.ucrReceiverStation.frmParent = Me - Me.ucrReceiverStation.Location = New System.Drawing.Point(275, 80) - Me.ucrReceiverStation.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverStation.Name = "ucrReceiverStation" - Me.ucrReceiverStation.Selector = Nothing - Me.ucrReceiverStation.Size = New System.Drawing.Size(137, 20) - Me.ucrReceiverStation.strNcFilePath = "" - Me.ucrReceiverStation.TabIndex = 7 - Me.ucrReceiverStation.ucrSelector = Nothing - ' - 'ucrReceiverData - ' - Me.ucrReceiverData.AutoSize = True - Me.ucrReceiverData.frmParent = Me - Me.ucrReceiverData.Location = New System.Drawing.Point(275, 225) - Me.ucrReceiverData.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverData.Name = "ucrReceiverData" - Me.ucrReceiverData.Selector = Nothing - Me.ucrReceiverData.Size = New System.Drawing.Size(137, 20) - Me.ucrReceiverData.strNcFilePath = "" - Me.ucrReceiverData.TabIndex = 17 - Me.ucrReceiverData.ucrSelector = Nothing - ' - 'ucrSelectorTransform - ' - Me.ucrSelectorTransform.AutoSize = True - Me.ucrSelectorTransform.bDropUnusedFilterLevels = False - Me.ucrSelectorTransform.bShowHiddenColumns = False - Me.ucrSelectorTransform.bUseCurrentFilter = True - Me.ucrSelectorTransform.Location = New System.Drawing.Point(10, 61) - Me.ucrSelectorTransform.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorTransform.Name = "ucrSelectorTransform" - Me.ucrSelectorTransform.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorTransform.TabIndex = 5 - ' - 'ucrBase - ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(10, 437) - Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 21 - ' - 'dlgTransformClimatic - ' - 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(566, 490) - Me.Controls.Add(Me.ucrSaveColumn) - Me.Controls.Add(Me.rdoCumulative) - Me.Controls.Add(Me.rdoMultSpells) - Me.Controls.Add(Me.grpTransform) - Me.Controls.Add(Me.rdoWaterBalance) - Me.Controls.Add(Me.rdoSpell) - Me.Controls.Add(Me.rdoMoving) - Me.Controls.Add(Me.rdoCount) - Me.Controls.Add(Me.ucrPnlTransform) - Me.Controls.Add(Me.lblStation) - Me.Controls.Add(Me.ucrReceiverDate) - Me.Controls.Add(Me.ucrReceiverYear) - Me.Controls.Add(Me.ucrReceiverStation) - Me.Controls.Add(Me.ucrReceiverData) - Me.Controls.Add(Me.ucrSelectorTransform) - Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.lblYear) - Me.Controls.Add(Me.lblDate) - Me.Controls.Add(Me.lblData) - Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow - Me.MaximizeBox = False - Me.MinimizeBox = False - Me.Name = "dlgTransformClimatic" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Transform" - Me.grpTransform.ResumeLayout(False) - Me.grpTransform.PerformLayout() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - - Friend WithEvents ucrBase As ucrButtons - Friend WithEvents ucrReceiverYear As ucrReceiverSingle - Friend WithEvents lblYear As Label - Friend WithEvents lblDate As Label - Friend WithEvents ucrReceiverDate As ucrReceiverSingle - Friend WithEvents lblStation As Label - Friend WithEvents ucrReceiverStation As ucrReceiverSingle - Friend WithEvents ucrSelectorTransform As ucrSelectorByDataFrameAddRemove - Friend WithEvents lblData As Label - Friend WithEvents ucrReceiverData As ucrReceiverSingle - Friend WithEvents rdoWaterBalance As RadioButton - Friend WithEvents rdoSpell As RadioButton - Friend WithEvents rdoMoving As RadioButton - Friend WithEvents rdoCount As RadioButton - Friend WithEvents ucrPnlTransform As UcrPanel - Friend WithEvents lblSumRows As Label - Friend WithEvents ucrNudSumOver As ucrNud - Friend WithEvents lblSumOver As Label - Friend WithEvents ucrInputSum As ucrInputComboBox - Friend WithEvents ucrNudCountOver As ucrNud - Friend WithEvents lblCountOver As Label - Friend WithEvents lblWBEvaporation As Label - Friend WithEvents ucrNudWBCapacity As ucrNud - Friend WithEvents lblWBCapacity As Label - Friend WithEvents grpTransform As GroupBox - Friend WithEvents ucrInputSpellLower As ucrInputTextBox - Friend WithEvents ucrInputSpellUpper As ucrInputTextBox - Friend WithEvents ucrInputCondition As ucrInputComboBox - Friend WithEvents lblCondition As Label - Friend WithEvents rdoMultSpells As RadioButton - Friend WithEvents ucrChkGroupByYear As ucrCheck - Friend WithEvents ucrNudMultSpells As ucrNud - Friend WithEvents lblRowsMultSpells As Label - Friend WithEvents ucrInputEvaporation As ucrInputTextBox - Friend WithEvents ucrPnlEvap As UcrPanel - Friend WithEvents ucrReceiverEvap As ucrReceiverSingle - Friend WithEvents rdoEvapVariable As RadioButton - Friend WithEvents rdoEvapValue As RadioButton - Friend WithEvents lblPosition As Label - Friend WithEvents ucrInputPosition As ucrInputComboBox - Friend WithEvents ucrChkCircular As ucrCheck - Friend WithEvents ucrInputCircularPosition As ucrInputComboBox - Friend WithEvents rdoCumulative As RadioButton - Friend WithEvents ucrInputCumulative As ucrInputComboBox - Friend WithEvents ucrSaveColumn As ucrSave -End Class +' 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 . + + +Partial Class dlgTransformClimatic + 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.components = New System.ComponentModel.Container() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgTransformClimatic)) + Me.lblYear = New System.Windows.Forms.Label() + Me.lblDate = New System.Windows.Forms.Label() + Me.lblStation = New System.Windows.Forms.Label() + Me.lblData = New System.Windows.Forms.Label() + Me.rdoSpell = New System.Windows.Forms.RadioButton() + Me.rdoMoving = New System.Windows.Forms.RadioButton() + Me.rdoCount = New System.Windows.Forms.RadioButton() + Me.rdoWaterBalance = New System.Windows.Forms.RadioButton() + Me.lblSumRows = New System.Windows.Forms.Label() + Me.lblSumOver = New System.Windows.Forms.Label() + Me.lblCountOver = New System.Windows.Forms.Label() + Me.grpTransform = New System.Windows.Forms.GroupBox() + Me.ucrInputSpellLower = New instat.ucrInputComboBox() + Me.ucrChkOptions = New instat.ucrCheck() + Me.ucrReceiverEvap = New instat.ucrReceiverSingle() + Me.ucrInputEvaporation = New instat.ucrInputTextBox() + Me.ucrChkGroupByYear = New instat.ucrCheck() + Me.rdoEvapVariable = New System.Windows.Forms.RadioButton() + Me.rdoEvapValue = New System.Windows.Forms.RadioButton() + Me.ucrPnlEvap = New instat.UcrPanel() + Me.ucrInputCircularPosition = New instat.ucrInputComboBox() + Me.lblPosition = New System.Windows.Forms.Label() + Me.ucrInputPosition = New instat.ucrInputComboBox() + Me.ucrChkCircular = New instat.ucrCheck() + Me.ucrNudMultSpells = New instat.ucrNud() + Me.lblRowsMultSpells = New System.Windows.Forms.Label() + Me.ucrInputSpellUpper = New instat.ucrInputTextBox() + Me.ucrInputCondition = New instat.ucrInputComboBox() + Me.lblCondition = New System.Windows.Forms.Label() + Me.lblWBEvaporation = New System.Windows.Forms.Label() + Me.ucrNudSumOver = New instat.ucrNud() + Me.lblWBCapacity = New System.Windows.Forms.Label() + Me.ucrNudWBCapacity = New instat.ucrNud() + Me.ucrInputSum = New instat.ucrInputComboBox() + Me.ucrNudCountOver = New instat.ucrNud() + Me.ucrInputCumulative = New instat.ucrInputComboBox() + Me.lblTMin = New System.Windows.Forms.Label() + Me.grpDegree = New System.Windows.Forms.GroupBox() + Me.ucrNudLimit = New instat.ucrNud() + Me.ucrNudMgdd = New instat.ucrNud() + Me.lblBaselineMgdd = New System.Windows.Forms.Label() + Me.lblLimit = New System.Windows.Forms.Label() + Me.rdoModifiedGDD = New System.Windows.Forms.RadioButton() + Me.lblBaselineGDD = New System.Windows.Forms.Label() + Me.rdoGrowingDegreeDays = New System.Windows.Forms.RadioButton() + Me.lblBaselineHDD = New System.Windows.Forms.Label() + Me.rdoHeatingDegreeDays = New System.Windows.Forms.RadioButton() + Me.ucrNudGDD = New instat.ucrNud() + Me.rdoTMean = New System.Windows.Forms.RadioButton() + Me.ucrNudHDD = New instat.ucrNud() + Me.rdoDiurnalRange = New System.Windows.Forms.RadioButton() + Me.ucrPnlDegree = New instat.UcrPanel() + Me.rdoMultSpells = New System.Windows.Forms.RadioButton() + Me.rdoCumulative = New System.Windows.Forms.RadioButton() + Me.rdoDegree = New System.Windows.Forms.RadioButton() + Me.lblTMax = New System.Windows.Forms.Label() + Me.lblTMean = New System.Windows.Forms.Label() + Me.ucrSaveColumn = New instat.ucrSave() + Me.ucrPnlTransform = New instat.UcrPanel() + Me.ucrReceiverDate = New instat.ucrReceiverSingle() + Me.ucrReceiverStation = New instat.ucrReceiverSingle() + Me.ucrSelectorTransform = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrBase = New instat.ucrButtons() + Me.ucrReceiverTMin = New instat.ucrReceiverSingle() + Me.ucrReceiverTMean = New instat.ucrReceiverSingle() + Me.ucrReceiverTMax = New instat.ucrReceiverSingle() + Me.ucrReceiverData = New instat.ucrReceiverSingle() + Me.ucrReceiverYear = New instat.ucrReceiverSingle() + Me.ucrChkUseMaxMin = New instat.ucrCheck() + Me.ttRdoRange = New System.Windows.Forms.ToolTip(Me.components) + Me.ttRdoTMean = New System.Windows.Forms.ToolTip(Me.components) + Me.ttRdoHdd = New System.Windows.Forms.ToolTip(Me.components) + Me.ttRdoGdd = New System.Windows.Forms.ToolTip(Me.components) + Me.ttRdoMgdd = New System.Windows.Forms.ToolTip(Me.components) + Me.grpTransform.SuspendLayout() + Me.grpDegree.SuspendLayout() + Me.SuspendLayout() + ' + 'lblYear + ' + resources.ApplyResources(Me.lblYear, "lblYear") + Me.lblYear.Name = "lblYear" + ' + 'lblDate + ' + resources.ApplyResources(Me.lblDate, "lblDate") + Me.lblDate.Name = "lblDate" + ' + 'lblStation + ' + resources.ApplyResources(Me.lblStation, "lblStation") + Me.lblStation.Name = "lblStation" + ' + 'lblData + ' + resources.ApplyResources(Me.lblData, "lblData") + Me.lblData.Name = "lblData" + ' + 'rdoSpell + ' + resources.ApplyResources(Me.rdoSpell, "rdoSpell") + Me.rdoSpell.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSpell.FlatAppearance.BorderSize = 2 + Me.rdoSpell.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoSpell.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoSpell.Name = "rdoSpell" + Me.rdoSpell.UseVisualStyleBackColor = True + ' + 'rdoMoving + ' + resources.ApplyResources(Me.rdoMoving, "rdoMoving") + Me.rdoMoving.Cursor = System.Windows.Forms.Cursors.Default + Me.rdoMoving.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoMoving.FlatAppearance.BorderSize = 2 + Me.rdoMoving.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoMoving.ForeColor = System.Drawing.SystemColors.ControlText + Me.rdoMoving.Name = "rdoMoving" + Me.rdoMoving.UseVisualStyleBackColor = True + ' + 'rdoCount + ' + resources.ApplyResources(Me.rdoCount, "rdoCount") + Me.rdoCount.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCount.FlatAppearance.BorderSize = 2 + Me.rdoCount.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCount.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoCount.Name = "rdoCount" + Me.rdoCount.UseVisualStyleBackColor = True + ' + 'rdoWaterBalance + ' + resources.ApplyResources(Me.rdoWaterBalance, "rdoWaterBalance") + Me.rdoWaterBalance.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoWaterBalance.FlatAppearance.BorderSize = 2 + Me.rdoWaterBalance.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoWaterBalance.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoWaterBalance.Name = "rdoWaterBalance" + Me.rdoWaterBalance.UseVisualStyleBackColor = True + ' + 'lblSumRows + ' + resources.ApplyResources(Me.lblSumRows, "lblSumRows") + Me.lblSumRows.Name = "lblSumRows" + Me.lblSumRows.Tag = "Rows" + ' + 'lblSumOver + ' + resources.ApplyResources(Me.lblSumOver, "lblSumOver") + Me.lblSumOver.Name = "lblSumOver" + Me.lblSumOver.Tag = "Over" + ' + 'lblCountOver + ' + resources.ApplyResources(Me.lblCountOver, "lblCountOver") + Me.lblCountOver.Name = "lblCountOver" + Me.lblCountOver.Tag = "Rows_to_Count_Over:" + ' + 'grpTransform + ' + Me.grpTransform.Controls.Add(Me.ucrInputSpellLower) + Me.grpTransform.Controls.Add(Me.ucrChkOptions) + Me.grpTransform.Controls.Add(Me.ucrReceiverEvap) + Me.grpTransform.Controls.Add(Me.ucrInputEvaporation) + Me.grpTransform.Controls.Add(Me.ucrChkGroupByYear) + Me.grpTransform.Controls.Add(Me.rdoEvapVariable) + Me.grpTransform.Controls.Add(Me.rdoEvapValue) + Me.grpTransform.Controls.Add(Me.ucrPnlEvap) + Me.grpTransform.Controls.Add(Me.ucrInputCircularPosition) + Me.grpTransform.Controls.Add(Me.lblPosition) + Me.grpTransform.Controls.Add(Me.ucrInputPosition) + Me.grpTransform.Controls.Add(Me.ucrChkCircular) + Me.grpTransform.Controls.Add(Me.ucrNudMultSpells) + Me.grpTransform.Controls.Add(Me.lblRowsMultSpells) + Me.grpTransform.Controls.Add(Me.ucrInputSpellUpper) + Me.grpTransform.Controls.Add(Me.lblSumRows) + Me.grpTransform.Controls.Add(Me.ucrInputCondition) + Me.grpTransform.Controls.Add(Me.lblCondition) + Me.grpTransform.Controls.Add(Me.lblWBEvaporation) + Me.grpTransform.Controls.Add(Me.lblCountOver) + Me.grpTransform.Controls.Add(Me.ucrNudSumOver) + Me.grpTransform.Controls.Add(Me.lblWBCapacity) + Me.grpTransform.Controls.Add(Me.ucrNudWBCapacity) + Me.grpTransform.Controls.Add(Me.ucrInputSum) + Me.grpTransform.Controls.Add(Me.lblSumOver) + Me.grpTransform.Controls.Add(Me.ucrNudCountOver) + Me.grpTransform.Controls.Add(Me.ucrInputCumulative) + resources.ApplyResources(Me.grpTransform, "grpTransform") + Me.grpTransform.Name = "grpTransform" + Me.grpTransform.TabStop = False + ' + 'ucrInputSpellLower + ' + Me.ucrInputSpellLower.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputSpellLower, "ucrInputSpellLower") + Me.ucrInputSpellLower.GetSetSelectedIndex = -1 + Me.ucrInputSpellLower.IsReadOnly = False + Me.ucrInputSpellLower.Name = "ucrInputSpellLower" + ' + 'ucrChkOptions + ' + resources.ApplyResources(Me.ucrChkOptions, "ucrChkOptions") + Me.ucrChkOptions.Checked = False + Me.ucrChkOptions.Name = "ucrChkOptions" + ' + 'ucrReceiverEvap + ' + resources.ApplyResources(Me.ucrReceiverEvap, "ucrReceiverEvap") + Me.ucrReceiverEvap.frmParent = Me + Me.ucrReceiverEvap.Name = "ucrReceiverEvap" + Me.ucrReceiverEvap.Selector = Nothing + Me.ucrReceiverEvap.strNcFilePath = "" + Me.ucrReceiverEvap.ucrSelector = Nothing + ' + 'ucrInputEvaporation + ' + Me.ucrInputEvaporation.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputEvaporation, "ucrInputEvaporation") + Me.ucrInputEvaporation.IsMultiline = False + Me.ucrInputEvaporation.IsReadOnly = False + Me.ucrInputEvaporation.Name = "ucrInputEvaporation" + ' + 'ucrChkGroupByYear + ' + resources.ApplyResources(Me.ucrChkGroupByYear, "ucrChkGroupByYear") + Me.ucrChkGroupByYear.Checked = False + Me.ucrChkGroupByYear.Name = "ucrChkGroupByYear" + ' + 'rdoEvapVariable + ' + resources.ApplyResources(Me.rdoEvapVariable, "rdoEvapVariable") + Me.rdoEvapVariable.Name = "rdoEvapVariable" + Me.rdoEvapVariable.TabStop = True + Me.rdoEvapVariable.UseVisualStyleBackColor = True + ' + 'rdoEvapValue + ' + resources.ApplyResources(Me.rdoEvapValue, "rdoEvapValue") + Me.rdoEvapValue.Name = "rdoEvapValue" + Me.rdoEvapValue.TabStop = True + Me.rdoEvapValue.UseVisualStyleBackColor = True + ' + 'ucrPnlEvap + ' + resources.ApplyResources(Me.ucrPnlEvap, "ucrPnlEvap") + Me.ucrPnlEvap.Name = "ucrPnlEvap" + ' + 'ucrInputCircularPosition + ' + Me.ucrInputCircularPosition.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputCircularPosition, "ucrInputCircularPosition") + Me.ucrInputCircularPosition.GetSetSelectedIndex = -1 + Me.ucrInputCircularPosition.IsReadOnly = False + Me.ucrInputCircularPosition.Name = "ucrInputCircularPosition" + ' + 'lblPosition + ' + resources.ApplyResources(Me.lblPosition, "lblPosition") + Me.lblPosition.Name = "lblPosition" + ' + 'ucrInputPosition + ' + Me.ucrInputPosition.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputPosition, "ucrInputPosition") + Me.ucrInputPosition.GetSetSelectedIndex = -1 + Me.ucrInputPosition.IsReadOnly = False + Me.ucrInputPosition.Name = "ucrInputPosition" + ' + 'ucrChkCircular + ' + resources.ApplyResources(Me.ucrChkCircular, "ucrChkCircular") + Me.ucrChkCircular.Checked = False + Me.ucrChkCircular.Name = "ucrChkCircular" + ' + 'ucrNudMultSpells + ' + resources.ApplyResources(Me.ucrNudMultSpells, "ucrNudMultSpells") + Me.ucrNudMultSpells.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMultSpells.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMultSpells.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMultSpells.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMultSpells.Name = "ucrNudMultSpells" + Me.ucrNudMultSpells.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblRowsMultSpells + ' + resources.ApplyResources(Me.lblRowsMultSpells, "lblRowsMultSpells") + Me.lblRowsMultSpells.Name = "lblRowsMultSpells" + Me.lblRowsMultSpells.Tag = "Rows_to_Take_Over:" + ' + 'ucrInputSpellUpper + ' + Me.ucrInputSpellUpper.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputSpellUpper, "ucrInputSpellUpper") + Me.ucrInputSpellUpper.IsMultiline = False + Me.ucrInputSpellUpper.IsReadOnly = False + Me.ucrInputSpellUpper.Name = "ucrInputSpellUpper" + ' + 'ucrInputCondition + ' + Me.ucrInputCondition.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputCondition, "ucrInputCondition") + Me.ucrInputCondition.GetSetSelectedIndex = -1 + Me.ucrInputCondition.IsReadOnly = False + Me.ucrInputCondition.Name = "ucrInputCondition" + ' + 'lblCondition + ' + resources.ApplyResources(Me.lblCondition, "lblCondition") + Me.lblCondition.Name = "lblCondition" + Me.lblCondition.Tag = "Condition:" + ' + 'lblWBEvaporation + ' + resources.ApplyResources(Me.lblWBEvaporation, "lblWBEvaporation") + Me.lblWBEvaporation.Name = "lblWBEvaporation" + Me.lblWBEvaporation.Tag = "Evaporation" + ' + 'ucrNudSumOver + ' + resources.ApplyResources(Me.ucrNudSumOver, "ucrNudSumOver") + Me.ucrNudSumOver.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSumOver.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudSumOver.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudSumOver.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudSumOver.Name = "ucrNudSumOver" + Me.ucrNudSumOver.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblWBCapacity + ' + resources.ApplyResources(Me.lblWBCapacity, "lblWBCapacity") + Me.lblWBCapacity.Name = "lblWBCapacity" + Me.lblWBCapacity.Tag = "Capacity" + ' + 'ucrNudWBCapacity + ' + resources.ApplyResources(Me.ucrNudWBCapacity, "ucrNudWBCapacity") + Me.ucrNudWBCapacity.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWBCapacity.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudWBCapacity.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudWBCapacity.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudWBCapacity.Name = "ucrNudWBCapacity" + Me.ucrNudWBCapacity.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputSum + ' + Me.ucrInputSum.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputSum, "ucrInputSum") + Me.ucrInputSum.GetSetSelectedIndex = -1 + Me.ucrInputSum.IsReadOnly = False + Me.ucrInputSum.Name = "ucrInputSum" + ' + 'ucrNudCountOver + ' + resources.ApplyResources(Me.ucrNudCountOver, "ucrNudCountOver") + Me.ucrNudCountOver.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudCountOver.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudCountOver.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudCountOver.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudCountOver.Name = "ucrNudCountOver" + Me.ucrNudCountOver.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrInputCumulative + ' + Me.ucrInputCumulative.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputCumulative, "ucrInputCumulative") + Me.ucrInputCumulative.GetSetSelectedIndex = -1 + Me.ucrInputCumulative.IsReadOnly = False + Me.ucrInputCumulative.Name = "ucrInputCumulative" + ' + 'lblTMin + ' + resources.ApplyResources(Me.lblTMin, "lblTMin") + Me.lblTMin.Name = "lblTMin" + ' + 'grpDegree + ' + Me.grpDegree.Controls.Add(Me.ucrNudLimit) + Me.grpDegree.Controls.Add(Me.ucrNudMgdd) + Me.grpDegree.Controls.Add(Me.lblBaselineMgdd) + Me.grpDegree.Controls.Add(Me.lblLimit) + Me.grpDegree.Controls.Add(Me.rdoModifiedGDD) + Me.grpDegree.Controls.Add(Me.lblBaselineGDD) + Me.grpDegree.Controls.Add(Me.rdoGrowingDegreeDays) + Me.grpDegree.Controls.Add(Me.lblBaselineHDD) + Me.grpDegree.Controls.Add(Me.rdoHeatingDegreeDays) + Me.grpDegree.Controls.Add(Me.ucrNudGDD) + Me.grpDegree.Controls.Add(Me.rdoTMean) + Me.grpDegree.Controls.Add(Me.ucrNudHDD) + Me.grpDegree.Controls.Add(Me.rdoDiurnalRange) + Me.grpDegree.Controls.Add(Me.ucrPnlDegree) + resources.ApplyResources(Me.grpDegree, "grpDegree") + Me.grpDegree.Name = "grpDegree" + Me.grpDegree.TabStop = False + ' + 'ucrNudLimit + ' + resources.ApplyResources(Me.ucrNudLimit, "ucrNudLimit") + Me.ucrNudLimit.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLimit.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudLimit.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudLimit.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudLimit.Name = "ucrNudLimit" + Me.ucrNudLimit.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrNudMgdd + ' + resources.ApplyResources(Me.ucrNudMgdd, "ucrNudMgdd") + Me.ucrNudMgdd.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMgdd.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudMgdd.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudMgdd.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudMgdd.Name = "ucrNudMgdd" + Me.ucrNudMgdd.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'lblBaselineMgdd + ' + resources.ApplyResources(Me.lblBaselineMgdd, "lblBaselineMgdd") + Me.lblBaselineMgdd.Name = "lblBaselineMgdd" + Me.lblBaselineMgdd.Tag = "Over" + ' + 'lblLimit + ' + resources.ApplyResources(Me.lblLimit, "lblLimit") + Me.lblLimit.Name = "lblLimit" + Me.lblLimit.Tag = "Over" + ' + 'rdoModifiedGDD + ' + resources.ApplyResources(Me.rdoModifiedGDD, "rdoModifiedGDD") + Me.rdoModifiedGDD.Name = "rdoModifiedGDD" + Me.rdoModifiedGDD.TabStop = True + Me.rdoModifiedGDD.UseVisualStyleBackColor = True + ' + 'lblBaselineGDD + ' + resources.ApplyResources(Me.lblBaselineGDD, "lblBaselineGDD") + Me.lblBaselineGDD.Name = "lblBaselineGDD" + Me.lblBaselineGDD.Tag = "Over" + ' + 'rdoGrowingDegreeDays + ' + resources.ApplyResources(Me.rdoGrowingDegreeDays, "rdoGrowingDegreeDays") + Me.rdoGrowingDegreeDays.Name = "rdoGrowingDegreeDays" + Me.rdoGrowingDegreeDays.TabStop = True + Me.rdoGrowingDegreeDays.UseVisualStyleBackColor = True + ' + 'lblBaselineHDD + ' + resources.ApplyResources(Me.lblBaselineHDD, "lblBaselineHDD") + Me.lblBaselineHDD.Name = "lblBaselineHDD" + Me.lblBaselineHDD.Tag = "Over" + ' + 'rdoHeatingDegreeDays + ' + resources.ApplyResources(Me.rdoHeatingDegreeDays, "rdoHeatingDegreeDays") + Me.rdoHeatingDegreeDays.Name = "rdoHeatingDegreeDays" + Me.rdoHeatingDegreeDays.TabStop = True + Me.rdoHeatingDegreeDays.UseVisualStyleBackColor = True + ' + 'ucrNudGDD + ' + resources.ApplyResources(Me.ucrNudGDD, "ucrNudGDD") + Me.ucrNudGDD.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudGDD.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudGDD.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudGDD.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudGDD.Name = "ucrNudGDD" + Me.ucrNudGDD.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'rdoTMean + ' + resources.ApplyResources(Me.rdoTMean, "rdoTMean") + Me.rdoTMean.Name = "rdoTMean" + Me.rdoTMean.TabStop = True + Me.rdoTMean.UseVisualStyleBackColor = True + ' + 'ucrNudHDD + ' + resources.ApplyResources(Me.ucrNudHDD, "ucrNudHDD") + Me.ucrNudHDD.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHDD.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudHDD.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudHDD.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudHDD.Name = "ucrNudHDD" + Me.ucrNudHDD.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'rdoDiurnalRange + ' + resources.ApplyResources(Me.rdoDiurnalRange, "rdoDiurnalRange") + Me.rdoDiurnalRange.Name = "rdoDiurnalRange" + Me.rdoDiurnalRange.TabStop = True + Me.rdoDiurnalRange.UseVisualStyleBackColor = True + ' + 'ucrPnlDegree + ' + resources.ApplyResources(Me.ucrPnlDegree, "ucrPnlDegree") + Me.ucrPnlDegree.Name = "ucrPnlDegree" + ' + 'rdoMultSpells + ' + resources.ApplyResources(Me.rdoMultSpells, "rdoMultSpells") + Me.rdoMultSpells.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoMultSpells.FlatAppearance.BorderSize = 2 + Me.rdoMultSpells.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoMultSpells.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoMultSpells.Name = "rdoMultSpells" + Me.rdoMultSpells.UseVisualStyleBackColor = True + ' + 'rdoCumulative + ' + resources.ApplyResources(Me.rdoCumulative, "rdoCumulative") + Me.rdoCumulative.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.FlatAppearance.BorderSize = 2 + Me.rdoCumulative.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoCumulative.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoCumulative.Name = "rdoCumulative" + Me.rdoCumulative.UseVisualStyleBackColor = True + ' + 'rdoDegree + ' + resources.ApplyResources(Me.rdoDegree, "rdoDegree") + Me.rdoDegree.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDegree.FlatAppearance.BorderSize = 2 + Me.rdoDegree.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption + Me.rdoDegree.ForeColor = System.Drawing.SystemColors.ActiveCaptionText + Me.rdoDegree.Name = "rdoDegree" + Me.rdoDegree.UseVisualStyleBackColor = True + ' + 'lblTMax + ' + resources.ApplyResources(Me.lblTMax, "lblTMax") + Me.lblTMax.Name = "lblTMax" + ' + 'lblTMean + ' + resources.ApplyResources(Me.lblTMean, "lblTMean") + Me.lblTMean.Name = "lblTMean" + ' + 'ucrSaveColumn + ' + resources.ApplyResources(Me.ucrSaveColumn, "ucrSaveColumn") + Me.ucrSaveColumn.Name = "ucrSaveColumn" + ' + 'ucrPnlTransform + ' + resources.ApplyResources(Me.ucrPnlTransform, "ucrPnlTransform") + Me.ucrPnlTransform.Name = "ucrPnlTransform" + ' + 'ucrReceiverDate + ' + resources.ApplyResources(Me.ucrReceiverDate, "ucrReceiverDate") + Me.ucrReceiverDate.frmParent = Me + Me.ucrReceiverDate.Name = "ucrReceiverDate" + Me.ucrReceiverDate.Selector = Nothing + Me.ucrReceiverDate.strNcFilePath = "" + Me.ucrReceiverDate.ucrSelector = Nothing + ' + 'ucrReceiverStation + ' + resources.ApplyResources(Me.ucrReceiverStation, "ucrReceiverStation") + Me.ucrReceiverStation.frmParent = Me + Me.ucrReceiverStation.Name = "ucrReceiverStation" + Me.ucrReceiverStation.Selector = Nothing + Me.ucrReceiverStation.strNcFilePath = "" + Me.ucrReceiverStation.ucrSelector = Nothing + ' + 'ucrSelectorTransform + ' + resources.ApplyResources(Me.ucrSelectorTransform, "ucrSelectorTransform") + Me.ucrSelectorTransform.bDropUnusedFilterLevels = False + Me.ucrSelectorTransform.bShowHiddenColumns = False + Me.ucrSelectorTransform.bUseCurrentFilter = True + Me.ucrSelectorTransform.Name = "ucrSelectorTransform" + ' + 'ucrBase + ' + resources.ApplyResources(Me.ucrBase, "ucrBase") + Me.ucrBase.Name = "ucrBase" + ' + 'ucrReceiverTMin + ' + resources.ApplyResources(Me.ucrReceiverTMin, "ucrReceiverTMin") + Me.ucrReceiverTMin.frmParent = Me + Me.ucrReceiverTMin.Name = "ucrReceiverTMin" + Me.ucrReceiverTMin.Selector = Nothing + Me.ucrReceiverTMin.strNcFilePath = "" + Me.ucrReceiverTMin.ucrSelector = Nothing + ' + 'ucrReceiverTMean + ' + resources.ApplyResources(Me.ucrReceiverTMean, "ucrReceiverTMean") + Me.ucrReceiverTMean.frmParent = Me + Me.ucrReceiverTMean.Name = "ucrReceiverTMean" + Me.ucrReceiverTMean.Selector = Nothing + Me.ucrReceiverTMean.strNcFilePath = "" + Me.ucrReceiverTMean.ucrSelector = Nothing + ' + 'ucrReceiverTMax + ' + resources.ApplyResources(Me.ucrReceiverTMax, "ucrReceiverTMax") + Me.ucrReceiverTMax.frmParent = Me + Me.ucrReceiverTMax.Name = "ucrReceiverTMax" + Me.ucrReceiverTMax.Selector = Nothing + Me.ucrReceiverTMax.strNcFilePath = "" + Me.ucrReceiverTMax.ucrSelector = Nothing + ' + 'ucrReceiverData + ' + resources.ApplyResources(Me.ucrReceiverData, "ucrReceiverData") + Me.ucrReceiverData.frmParent = Me + Me.ucrReceiverData.Name = "ucrReceiverData" + Me.ucrReceiverData.Selector = Nothing + Me.ucrReceiverData.strNcFilePath = "" + Me.ucrReceiverData.ucrSelector = Nothing + ' + 'ucrReceiverYear + ' + resources.ApplyResources(Me.ucrReceiverYear, "ucrReceiverYear") + Me.ucrReceiverYear.frmParent = Me + Me.ucrReceiverYear.Name = "ucrReceiverYear" + Me.ucrReceiverYear.Selector = Nothing + Me.ucrReceiverYear.strNcFilePath = "" + Me.ucrReceiverYear.ucrSelector = Nothing + ' + 'ucrChkUseMaxMin + ' + resources.ApplyResources(Me.ucrChkUseMaxMin, "ucrChkUseMaxMin") + Me.ucrChkUseMaxMin.Checked = True + Me.ucrChkUseMaxMin.Name = "ucrChkUseMaxMin" + ' + 'dlgTransformClimatic + ' + resources.ApplyResources(Me, "$this") + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi + Me.Controls.Add(Me.rdoDegree) + Me.Controls.Add(Me.ucrSaveColumn) + Me.Controls.Add(Me.rdoCumulative) + Me.Controls.Add(Me.rdoMultSpells) + Me.Controls.Add(Me.rdoWaterBalance) + Me.Controls.Add(Me.rdoSpell) + Me.Controls.Add(Me.rdoMoving) + Me.Controls.Add(Me.rdoCount) + Me.Controls.Add(Me.ucrPnlTransform) + Me.Controls.Add(Me.lblStation) + Me.Controls.Add(Me.ucrReceiverDate) + Me.Controls.Add(Me.ucrReceiverStation) + Me.Controls.Add(Me.ucrSelectorTransform) + Me.Controls.Add(Me.ucrBase) + Me.Controls.Add(Me.lblYear) + Me.Controls.Add(Me.lblDate) + Me.Controls.Add(Me.ucrReceiverTMin) + Me.Controls.Add(Me.grpDegree) + Me.Controls.Add(Me.ucrReceiverTMean) + Me.Controls.Add(Me.lblTMin) + Me.Controls.Add(Me.lblTMax) + Me.Controls.Add(Me.ucrReceiverTMax) + Me.Controls.Add(Me.ucrReceiverData) + Me.Controls.Add(Me.ucrReceiverYear) + Me.Controls.Add(Me.ucrChkUseMaxMin) + Me.Controls.Add(Me.lblTMean) + Me.Controls.Add(Me.lblData) + Me.Controls.Add(Me.grpTransform) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow + Me.MaximizeBox = False + Me.MinimizeBox = False + Me.Name = "dlgTransformClimatic" + Me.grpTransform.ResumeLayout(False) + Me.grpTransform.PerformLayout() + Me.grpDegree.ResumeLayout(False) + Me.grpDegree.PerformLayout() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents ucrBase As ucrButtons + Friend WithEvents ucrReceiverYear As ucrReceiverSingle + Friend WithEvents lblYear As Label + Friend WithEvents lblDate As Label + Friend WithEvents ucrReceiverDate As ucrReceiverSingle + Friend WithEvents lblStation As Label + Friend WithEvents ucrReceiverStation As ucrReceiverSingle + Friend WithEvents ucrSelectorTransform As ucrSelectorByDataFrameAddRemove + Friend WithEvents lblData As Label + Friend WithEvents ucrReceiverData As ucrReceiverSingle + Friend WithEvents rdoWaterBalance As RadioButton + Friend WithEvents rdoSpell As RadioButton + Friend WithEvents rdoMoving As RadioButton + Friend WithEvents rdoCount As RadioButton + Friend WithEvents ucrPnlTransform As UcrPanel + Friend WithEvents lblSumRows As Label + Friend WithEvents ucrNudSumOver As ucrNud + Friend WithEvents lblSumOver As Label + Friend WithEvents ucrInputSum As ucrInputComboBox + Friend WithEvents ucrNudCountOver As ucrNud + Friend WithEvents lblCountOver As Label + Friend WithEvents lblWBEvaporation As Label + Friend WithEvents ucrNudWBCapacity As ucrNud + Friend WithEvents lblWBCapacity As Label + Friend WithEvents grpTransform As GroupBox + Friend WithEvents ucrInputSpellUpper As ucrInputTextBox + Friend WithEvents ucrInputCondition As ucrInputComboBox + Friend WithEvents lblCondition As Label + Friend WithEvents rdoMultSpells As RadioButton + Friend WithEvents ucrChkGroupByYear As ucrCheck + Friend WithEvents ucrNudMultSpells As ucrNud + Friend WithEvents lblRowsMultSpells As Label + Friend WithEvents ucrInputEvaporation As ucrInputTextBox + Friend WithEvents ucrPnlEvap As UcrPanel + Friend WithEvents ucrReceiverEvap As ucrReceiverSingle + Friend WithEvents rdoEvapVariable As RadioButton + Friend WithEvents rdoEvapValue As RadioButton + Friend WithEvents lblPosition As Label + Friend WithEvents ucrInputPosition As ucrInputComboBox + Friend WithEvents ucrChkCircular As ucrCheck + Friend WithEvents ucrInputCircularPosition As ucrInputComboBox + Friend WithEvents rdoCumulative As RadioButton + Friend WithEvents ucrInputCumulative As ucrInputComboBox + Friend WithEvents ucrSaveColumn As ucrSave + Friend WithEvents ucrReceiverTMean As ucrReceiverSingle + Friend WithEvents lblTMean As Label + Friend WithEvents ucrReceiverTMin As ucrReceiverSingle + Friend WithEvents lblTMax As Label + Friend WithEvents ucrReceiverTMax As ucrReceiverSingle + Friend WithEvents lblTMin As Label + Friend WithEvents ucrChkUseMaxMin As ucrCheck + Friend WithEvents rdoDegree As RadioButton + Friend WithEvents rdoDiurnalRange As RadioButton + Friend WithEvents ucrPnlDegree As UcrPanel + Friend WithEvents rdoModifiedGDD As RadioButton + Friend WithEvents rdoGrowingDegreeDays As RadioButton + Friend WithEvents rdoHeatingDegreeDays As RadioButton + Friend WithEvents rdoTMean As RadioButton + Friend WithEvents grpDegree As GroupBox + Friend WithEvents lblBaselineGDD As Label + Friend WithEvents lblBaselineHDD As Label + Friend WithEvents ucrNudGDD As ucrNud + Friend WithEvents ucrNudHDD As ucrNud + Friend WithEvents lblLimit As Label + Friend WithEvents ucrChkOptions As ucrCheck + Friend WithEvents ucrInputSpellLower As ucrInputComboBox + Friend WithEvents ucrNudMgdd As ucrNud + Friend WithEvents lblBaselineMgdd As Label + Friend WithEvents ucrNudLimit As ucrNud + Friend WithEvents ttRdoRange As ToolTip + Friend WithEvents ttRdoTMean As ToolTip + Friend WithEvents ttRdoHdd As ToolTip + Friend WithEvents ttRdoGdd As ToolTip + Friend WithEvents ttRdoMgdd As ToolTip +End Class diff --git a/instat/dlgTransformClimatic.resx b/instat/dlgTransformClimatic.resx index 29dcb1b3a35..b4905822802 100644 --- a/instat/dlgTransformClimatic.resx +++ b/instat/dlgTransformClimatic.resx @@ -1,120 +1,2163 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + + NoControl + + + + 272, 167 + + + 32, 13 + + + 12 + + + Year: + + + lblYear + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 14 + + + True + + + NoControl + + + 272, 117 + + + 33, 13 + + + 8 + + + Date: + + + lblDate + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + True + + + NoControl + + + 272, 67 + + + 43, 13 + + + 6 + + + Station: + + + lblStation + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 9 + + + True + + + NoControl + + + 272, 217 + + + 48, 13 + + + 16 + + + Element: + + + lblData + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 26 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 221, 15 + + + 71, 40 + + + 3 + + + Spell + + + MiddleCenter + + + rdoSpell + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 152, 15 + + + 71, 40 + + + 2 + + + Moving + + + MiddleCenter + + + rdoMoving + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Button + + + None + + + Flat + + + NoControl + + + 14, 15 + + + 71, 40 + + + 1 + + + Count + + + MiddleCenter + + + rdoCount + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 359, 15 + + + 71, 40 + + + 4 + + + Water Balance + + + MiddleCenter + + + rdoWaterBalance + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + NoControl + + + 245, 24 + + + 34, 13 + + + 5 + + + Rows + + + lblSumRows + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 15 + + + True + + + NoControl + + + 157, 24 + + + 30, 13 + + + 3 + + + Over + + + lblSumOver + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 24 + + + True + + + NoControl + + + 12, 24 + + + 106, 13 + + + 8 + + + Rows to Count Over: + + + lblCountOver + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 19 + + + GrowAndShrink + + + 71, 51 + + + 49, 21 + + + 43 + + + ucrInputSpellLower + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 0 + + + True + + + 266, 112 + + + 76, 23 + + + 38 + + + False + + + ucrChkOptions + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 1 + + + True + + + True + + + 96, 96 + + + True + + + 516, 490 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 428, 15 + + + 71, 40 + + + 26 + + + Degrees + + + MiddleCenter + + + rdoDegree + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + GrowAndShrink + + + 11, 411 + + + 4, 5, 4, 5 + + + 335, 21 + + + 20 + + + ucrSaveColumn + + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 83, 15 + + + 71, 40 + + + 25 + + + Cumulative + + + MiddleCenter + + + rdoCumulative + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 2 + + + Button + + + None + + + MiddleCenter + + + Flat + + + NoControl + + + 290, 15 + + + 71, 40 + + + 23 + + + Multiple Spells + + + MiddleCenter + + + rdoMultSpells + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + + + GrowAndShrink + + + 11, 9 + + + 497, 49 + + + 0 + + + ucrPnlTransform + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 8 + + + True + + + 275, 130 + + + 0, 0, 0, 0 + + + 137, 20 + + + 9 + + + ucrReceiverDate + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 10 + + + True + + + 275, 80 + + + 0, 0, 0, 0 + + + 137, 20 + + + 7 + + + ucrReceiverStation + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 11 + + + True + + + 10, 61 + + + 0, 0, 0, 0 + + + 213, 183 + + + 5 + + + ucrSelectorTransform + + + instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 12 + + + True + + + GrowAndShrink + + + 10, 437 + + + 405, 52 + + + 21 + + + ucrBase + + + instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 13 + + + True + + + 275, 280 + + + 0, 0, 0, 0 + + + 137, 20 + + + 31 + + + ucrReceiverTMin + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 16 + + + True + + + 177, 122 + + + 50, 20 + + + 45 + + + ucrNudLimit + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 0 + + + True + + + 177, 97 + + + 50, 20 + + + 44 + + + ucrNudMgdd + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 1 + + + True + + + NoControl + + + 123, 100 + + + 50, 13 + + + 45 + + + Baseline: + + + lblBaselineMgdd + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 2 + + + True + + + NoControl + + + 136, 124 + + + 31, 13 + + + 44 + + + Limit: + + + lblLimit + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 3 + + + True + + + NoControl + + + 15, 122 + + + 95, 17 + + + 41 + + + Modified GDD: + + + rdoModifiedGDD + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 4 + + + True + + + NoControl + + + 123, 100 + + + 50, 13 + + + 43 + + + Baseline: + + + lblBaselineGDD + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 5 + + + True + + + NoControl + + + 15, 99 + + + 52, 17 + + + 40 + + + GDD: + + + rdoGrowingDegreeDays + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 6 + + + True + + + NoControl + + + 123, 77 + + + 50, 13 + + + 43 + + + Baseline: + + + lblBaselineHDD + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 7 + + + True + + + NoControl + + + 15, 76 + + + 52, 17 + + + 39 + + + HDD: + + + rdoHeatingDegreeDays + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 8 + + + True + + + 177, 97 + + + 50, 20 + + + 43 + + + ucrNudGDD + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 9 + + + True + + + NoControl + + + 15, 53 + + + 61, 17 + + + 38 + + + Tmean: + + + rdoTMean + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 10 + + + True + + + 177, 73 + + + 50, 20 + + + 43 + + + ucrNudHDD + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 11 + + + True + + + NoControl + + + 15, 30 + + + 96, 17 + + + 37 + + + Diurnal Range: + + + rdoDiurnalRange + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpDegree + + + 12 + + + GrowAndShrink + + + 6, 19 + + + 119, 127 + + + 34 + + + ucrPnlDegree + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpDegree + + + 13 + + + 9, 252 + + + 237, 151 + + + 42 + + + Options: + + + grpDegree + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 17 + + + True + + + 275, 230 + + + 0, 0, 0, 0 + + + 137, 20 + + + 33 + + + ucrReceiverTMean + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 18 + + + True + + + NoControl + + + 272, 267 + + + 33, 13 + + + 28 + + + Tmin: + + + lblTMin + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 19 + + + True + + + NoControl + + + 272, 217 + + + 36, 13 + + + 30 + + + Tmax: + + + lblTMax + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 20 + + + True + + + 275, 230 + + + 0, 0, 0, 0 + + + 137, 20 + + + 29 + + + ucrReceiverTMax + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 21 + + + True + + + 275, 230 + + + 0, 0, 0, 0 + + + 137, 20 + + + 17 + + + ucrReceiverData + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 22 + + + True + + + 275, 180 + + + 0, 0, 0, 0 + + + 137, 20 + + + 13 + + + ucrReceiverYear + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 23 + + + True + + + 275, 180 + + + 137, 24 + + + 27 + + + ucrChkUseMaxMin + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 24 + + + True + + + NoControl + + + 272, 217 + + + 43, 13 + + + 32 + + + Tmean: + + + lblTMean + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 25 + + + CenterScreen + + + Transform + + + ttRdoRange + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ttRdoTMean + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ttRdoHdd + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ttRdoGdd + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ttRdoMgdd + + + System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + dlgTransformClimatic + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 155, 79 + + + 0, 0, 0, 0 + + + 103, 20 + + + 37 + + + ucrReceiverEvap + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 2 + + + True + + + 155, 53 + + + 103, 21 + + + 31 + + + ucrInputEvaporation + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 3 + + + True + + + 24, 112 + + + 174, 23 + + + 22 + + + ucrChkGroupByYear + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 4 + + + True + + + NoControl + + + 82, 81 + + + 66, 17 + + + 36 + + + Variable: + + + rdoEvapVariable + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 5 + + + True + + + NoControl + + + 86, 55 + + + 55, 17 + + + 35 + + + Value: + + + rdoEvapValue + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 6 + + + GrowAndShrink + + + 82, 47 + + + 67, 57 + + + 29 + + + ucrPnlEvap + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 7 + + + GrowAndShrink + + + 199, 55 + + + 137, 21 + + + 27 + + + ucrInputCircularPosition + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 8 + + + True + + + NoControl + + + 151, 59 + + + 47, 13 + + + 25 + + + Position: + + + lblPosition + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 9 + + + GrowAndShrink + + + 199, 55 + + + 137, 21 + + + 24 + + + ucrInputPosition + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 10 + + + True + + + 24, 58 + + + 100, 23 + + + 26 + + + ucrChkCircular + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 11 + + + True + + + 194, 21 + + + 50, 20 + + + 15 + + + ucrNudMultSpells + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 12 + + + True + + + NoControl + + + 12, 25 + + + 126, 13 + + + 14 + + + Rows to Take Max Over: + + + lblRowsMultSpells + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 13 + + + True + + + 285, 50 + + + 49, 21 + + + 13 + + + ucrInputSpellUpper + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 14 + + + GrowAndShrink + + + 124, 50 + + + 155, 21 + + + 12 + + + ucrInputCondition + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 16 + + + True + + + NoControl + + + 12, 53 + + + 54, 13 + + + 10 + + + Condition: + + + lblCondition + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 17 + + + True + + + NoControl + + + 13, 55 + + + 67, 13 + + + 6 + + + Evaporation: + + + lblWBEvaporation + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 18 + + + True + + + 193, 21 + + + 50, 20 + + + 4 + + + ucrNudSumOver + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 20 + + + True + + + NoControl + + + 13, 25 + + + 51, 13 + + + 1 + + + Capacity: + + + lblWBCapacity + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTransform + + + 21 + + + True + + + 86, 21 + + + 50, 20 + + + 2 + + + ucrNudWBCapacity + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 22 + + + GrowAndShrink + + + 24, 21 + + + 112, 21 + + + 0 + + + ucrInputSum + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 23 + + + True + + + 134, 21 + + + 50, 20 + + + 9 + + + ucrNudCountOver + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 25 + + + GrowAndShrink + + + 24, 21 + + + 112, 21 + + + 26 + + + ucrInputCumulative + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTransform + + + 26 + + + 10, 261 + + + 376, 142 + + + 18 + + + Options + + + grpTransform + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 27 + + + 17, 17 + + + 133, 17 + + + 252, 17 + + + 357, 17 + + + 462, 17 + \ No newline at end of file diff --git a/instat/dlgTransformClimatic.vb b/instat/dlgTransformClimatic.vb index 75ca2f3e022..d87429466ca 100644 --- a/instat/dlgTransformClimatic.vb +++ b/instat/dlgTransformClimatic.vb @@ -21,6 +21,8 @@ Public Class dlgTransformClimatic Private clsRTransform, clsOverallTransformFunction, clsTransformManipulationsFunc, clsGroupByYear, clsGroupByStation, clsReplaceNAasElement, clsRTransformCountSpellSub As New RFunction Private clsTransformCheck As New RFunction + 'dummy + Private clsDummyFunction As New RFunction 'Cumulative Private clsCumulativeSum, clsCumulativeMaximum, clsCumulativeMinimum As New RFunction @@ -36,6 +38,15 @@ Public Class dlgTransformClimatic Private clsPMinFunctionMax, clsPMaxFunctionMax, clsRWaterBalanceFunction As New RFunction Private clsPMaxOperatorMax, clsReduceOpEvapValue As New ROperator + 'Degree + Private clsDiurnalRangeOperator, clsTMeanAddOperator, clsTMeanDivideOperator As New ROperator + Private clsHeatingDegreeDiffOperator, clsHeatingDegreeLogicOperator, clsHeatingDegreeOperator As New ROperator + Private clsGrowingDegreDiffOperator, clsGrowingDegreeLogicOperator, clsGrowingDegreeOperator As New ROperator + Private clsModifiedMinfunction As New RFunction + Private clsModifiedDiffOperator, clsModifiedLogicOperator, clsModifiedGDDOperator As New ROperator + Private clsLogicalRFunction, clsLogicalGDDRFunction, clsLogicalMgddRFunction As New RFunction + Private clsMeanAddOperator, clsMeanDivideByOperator As New ROperator + Private strCurrDataName As String = "" Private strRainDay As String = "rain_day" @@ -65,6 +76,7 @@ Public Class dlgTransformClimatic Dim dctInputSumPairs As New Dictionary(Of String, String) Dim dctInputPosition As New Dictionary(Of String, String) Dim dctInputCircularPosition As New Dictionary(Of String, String) + Dim dctInputLowerSpell As New Dictionary(Of String, String) ucrBase.iHelpTopicID = 358 @@ -75,6 +87,7 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddRadioButton(rdoSpell) ucrPnlTransform.AddRadioButton(rdoMultSpells) ucrPnlTransform.AddRadioButton(rdoWaterBalance) + ucrPnlTransform.AddRadioButton(rdoDegree) ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCumulative, "function_exp", {"cumsum", "cummin", "cummax"}) ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCount, "function_exp", "rollapply") @@ -84,12 +97,31 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddParameterIsStringCondition(rdoSpell, "function_exp") ucrPnlTransform.AddFunctionNamesCondition(rdoMultSpells, "rollapply") ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoWaterBalance, "function_exp", "Reduce") + ucrPnlTransform.AddParameterIsROperatorCondition(rdoDegree, "function_exp") ucrPnlEvap.AddRadioButton(rdoEvapValue) ucrPnlEvap.AddRadioButton(rdoEvapVariable) ucrPnlEvap.AddParameterPresentCondition(rdoEvapValue, "evaporation.value") ucrPnlEvap.AddParameterPresentCondition(rdoEvapVariable, "evaporation.value", False) + ucrPnlDegree.AddRadioButton(rdoTMean) + ucrPnlDegree.AddRadioButton(rdoHeatingDegreeDays) + ucrPnlDegree.AddRadioButton(rdoGrowingDegreeDays) + ucrPnlDegree.AddRadioButton(rdoDiurnalRange) + ucrPnlDegree.AddRadioButton(rdoModifiedGDD) + + ucrPnlDegree.AddParameterValuesCondition(rdoModifiedGDD, "checked", "mgdd") + ucrPnlDegree.AddParameterValuesCondition(rdoDiurnalRange, "checked", "diurnal") + ucrPnlDegree.AddParameterValuesCondition(rdoTMean, "checked", "mean") + ucrPnlDegree.AddParameterValuesCondition(rdoHeatingDegreeDays, "checked", "hdd") + ucrPnlDegree.AddParameterValuesCondition(rdoGrowingDegreeDays, "checked", "gdd") + + ttRdoRange.SetToolTip(rdoDiurnalRange, "Diurnal Range is the difference between Tmax And Tmin, (Tmax - Tmin)") + ttRdoTMean.SetToolTip(rdoTMean, "Tmean is the average daily temperature, (Tmax + Tmin)/2") + ttRdoHdd.SetToolTip(rdoHeatingDegreeDays, "Heating Degree Days. If the baseline = 15 degrees then HDD is (15 - tmean). HDD = 0 if tmean is more than 15.") + ttRdoGdd.SetToolTip(rdoGrowingDegreeDays, "Growing (or Cooling) Degree Days. If the baseline = 15 degrees, then GDD = (tmean - 15), or 0 if tmean is less than 15") + ttRdoMgdd.SetToolTip(rdoModifiedGDD, "Modified GDD is just GDD if tmean is less than the upper limit. If baseline = 15 degrees and limit = 30 degrees, then Modified GDD = 30 - 15 if tmean is more than 30 degrees.") + 'ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoMoving, "sub1", "instat_calculation$new", False) ' clsRRainday 'ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoCount, "sub1", "instat_calculation$new") 'ucrPnlTransform.AddParameterValueFunctionNamesCondition(rdoSpell, "sub1", "instat_calculation$new") @@ -119,6 +151,7 @@ Public Class dlgTransformClimatic ucrReceiverData.Selector = ucrSelectorTransform ucrReceiverData.strSelectorHeading = "Numerics" ucrReceiverData.SetIncludedDataTypes({"numeric"}) + ucrReceiverData.SetLinkedDisplayControl(lblData) ucrReceiverEvap.Selector = ucrSelectorTransform ucrReceiverEvap.SetParameter(New RParameter("right", 1, bNewIncludeArgumentName:=False)) @@ -127,6 +160,27 @@ Public Class dlgTransformClimatic ucrReceiverEvap.strSelectorHeading = "Numerics" ucrReceiverEvap.SetIncludedDataTypes({"numeric"}) + ucrReceiverTMin.Selector = ucrSelectorTransform + ucrReceiverTMin.SetParameter(New RParameter("tmin", 1, bNewIncludeArgumentName:=False)) + ucrReceiverTMin.strSelectorHeading = "Numerics" + ucrReceiverTMin.SetDataType("numeric") + ucrReceiverTMin.SetParameterIsRFunction() + ucrReceiverTMin.SetLinkedDisplayControl(lblTMin) + + ucrReceiverTMax.Selector = ucrSelectorTransform + ucrReceiverTMax.SetParameter(New RParameter("tmax", 0, bNewIncludeArgumentName:=False)) + ucrReceiverTMax.strSelectorHeading = "Numerics" + ucrReceiverTMax.SetDataType("numeric") + ucrReceiverTMax.SetParameterIsRFunction() + ucrReceiverTMax.SetLinkedDisplayControl(lblTMax) + + ucrReceiverTMean.Selector = ucrSelectorTransform + ucrReceiverTMean.SetParameter(New RParameter("tmean", 1, bNewIncludeArgumentName:=False)) + ucrReceiverTMean.strSelectorHeading = "Numerics" + ucrReceiverTMean.SetDataType("numeric") + ucrReceiverTMean.SetParameterIsRFunction() + ucrReceiverTMean.SetLinkedDisplayControl(lblTMean) + ucrChkGroupByYear.SetText("Calculate by Year") 'Cumulative @@ -179,7 +233,13 @@ Public Class dlgTransformClimatic ucrInputCondition.SetDropDownStyleAsNonEditable() ucrInputSpellLower.SetParameter(New RParameter("min", 1)) - ucrInputSpellLower.SetValidationTypeAsNumeric() + dctInputLowerSpell.Add("0.85", "0.85") + dctInputLowerSpell.Add("0", "0") + dctInputLowerSpell.Add("2.45", "2.45") + dctInputLowerSpell.Add("4.85", "4.85") + dctInputLowerSpell.Add("9.85", "9.85") + dctInputLowerSpell.Add("24.85", "24.85") + ucrInputSpellLower.SetItems(dctInputLowerSpell) ucrInputSpellLower.AddQuotesIfUnrecognised = False ucrInputSpellLower.SetLinkedDisplayControl(lblCondition) @@ -203,6 +263,35 @@ Public Class dlgTransformClimatic ucrInputEvaporation.SetValidationTypeAsNumeric() ucrInputEvaporation.AddQuotesIfUnrecognised = False + 'Degree + ucrChkUseMaxMin.SetText("Use Max and Min") + ucrChkUseMaxMin.AddToLinkedControls({ucrReceiverTMin, ucrReceiverTMax}, {True}, bNewLinkedHideIfParameterMissing:=True) + ucrChkUseMaxMin.AddToLinkedControls(ucrReceiverTMean, {False}, bNewLinkedHideIfParameterMissing:=True) + + ucrNudHDD.SetParameter(New RParameter("baseline", 0, bNewIncludeArgumentName:=False)) + ucrNudHDD.SetMinMax(Integer.MinValue, Integer.MaxValue) + ucrNudHDD.Increment = 0.1 + ucrNudHDD.DecimalPlaces = 1 + ucrNudHDD.SetLinkedDisplayControl(lblBaselineHDD) + + ucrNudGDD.SetParameter(New RParameter("baseline", 1, bNewIncludeArgumentName:=False)) + ucrNudGDD.SetMinMax(Integer.MinValue, Integer.MaxValue) + ucrNudGDD.Increment = 0.1 + ucrNudGDD.DecimalPlaces = 1 + ucrNudGDD.SetLinkedDisplayControl(lblBaselineGDD) + + ucrNudMgdd.SetParameter(New RParameter("baseline", 1, bNewIncludeArgumentName:=False)) + ucrNudMgdd.SetMinMax(Integer.MinValue, Integer.MaxValue) + ucrNudMgdd.Increment = 0.1 + ucrNudMgdd.DecimalPlaces = 1 + ucrNudMgdd.SetLinkedDisplayControl(lblBaselineMgdd) + + ucrNudLimit.SetParameter(New RParameter("limit", 0, bNewIncludeArgumentName:=False)) + ucrNudLimit.SetMinMax(Integer.MinValue, Integer.MaxValue) + ucrNudLimit.Increment = 0.1 + ucrNudLimit.DecimalPlaces = 1 + ucrNudLimit.SetLinkedDisplayControl(lblLimit) + 'save control ucrSaveColumn.SetIsComboBox() ucrSaveColumn.SetSaveTypeAsColumn() @@ -216,6 +305,11 @@ Public Class dlgTransformClimatic ucrPnlEvap.AddToLinkedControls(ucrReceiverEvap, {rdoEvapVariable}, bNewLinkedHideIfParameterMissing:=True) ucrPnlEvap.SetLinkedDisplayControl(lblWBEvaporation) + ucrPnlDegree.AddToLinkedControls(ucrNudGDD, {rdoGrowingDegreeDays}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=15.0) + ucrPnlDegree.AddToLinkedControls(ucrNudMgdd, {rdoModifiedGDD}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=15.0) + ucrPnlDegree.AddToLinkedControls(ucrNudHDD, {rdoHeatingDegreeDays}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=15.0) + ucrPnlDegree.AddToLinkedControls(ucrNudLimit, {rdoModifiedGDD}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=30.0) + ucrPnlTransform.AddToLinkedControls({ucrInputCumulative}, {rdoCumulative}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Sum") ucrPnlTransform.AddToLinkedControls({ucrNudCountOver}, {rdoCount}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=1) ucrPnlTransform.AddToLinkedControls({ucrInputCondition}, {rdoCount, rdoSpell, rdoMultSpells}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=">=") @@ -226,13 +320,18 @@ Public Class dlgTransformClimatic ucrPnlTransform.AddToLinkedControls(ucrPnlEvap, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlTransform.AddToLinkedControls(ucrNudWBCapacity, {rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=60) ucrPnlTransform.AddToLinkedControls(ucrChkGroupByYear, {rdoCount, rdoMoving, rdoSpell, rdoMultSpells, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlTransform.AddToLinkedControls({ucrReceiverYear, ucrReceiverData, ucrChkOptions}, {rdoCumulative, rdoCount, rdoMoving, rdoMultSpells, rdoSpell, rdoWaterBalance}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlTransform.AddToLinkedControls({ucrChkUseMaxMin, ucrPnlDegree}, {rdoDegree}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrChkCircular.AddToLinkedControls(ucrInputCircularPosition, {True}, bNewLinkedHideIfParameterMissing:=True) ucrChkCircular.AddToLinkedControls(ucrInputPosition, {False}, bNewLinkedHideIfParameterMissing:=True) - ucrInputCondition.AddToLinkedControls(ucrInputSpellUpper, {"<=", "Between", "Outer"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.85) - ucrInputCondition.AddToLinkedControls(ucrInputSpellLower, {"Between", "Outer", ">="}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) - ucrReceiverYear.SetLinkedDisplayControl(grpTransform) + ucrInputCondition.AddToLinkedControls(ucrInputSpellUpper, {"<=", "Between", "Outer"}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0) + ucrInputCondition.AddToLinkedControls(ucrInputSpellLower, {"Between", "Outer", ">="}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=0.85) + ucrReceiverYear.SetLinkedDisplayControl(lblYear) + 'Temporary fix: ucrChkOptions is only used in linking + ucrChkOptions.SetLinkedDisplayControl(grpTransform) + ucrPnlDegree.SetLinkedDisplayControl(grpDegree) End Sub Private Sub SetDefaults() @@ -241,6 +340,8 @@ Public Class dlgTransformClimatic clsTransformManipulationsFunc = New RFunction clsRTransformCountSpellSub = New RFunction + clsDummyFunction = New RFunction + clsCumulativeSum = New RFunction clsCumulativeMaximum = New RFunction clsCumulativeMinimum = New RFunction @@ -257,6 +358,25 @@ Public Class dlgTransformClimatic clsRRaindayUpperOperator = New ROperator clsRRaindayLowerOperator = New ROperator + clsDiurnalRangeOperator = New ROperator + clsTMeanAddOperator = New ROperator + clsTMeanDivideOperator = New ROperator + clsHeatingDegreeDiffOperator = New ROperator + clsHeatingDegreeLogicOperator = New ROperator + clsHeatingDegreeOperator = New ROperator + clsGrowingDegreDiffOperator = New ROperator + clsGrowingDegreeLogicOperator = New ROperator + clsGrowingDegreeOperator = New ROperator + clsModifiedMinfunction = New RFunction + clsModifiedDiffOperator = New ROperator + clsModifiedLogicOperator = New ROperator + clsModifiedGDDOperator = New ROperator + clsLogicalRFunction = New RFunction + clsLogicalGDDRFunction = New RFunction + clsLogicalMgddRFunction = New RFunction + clsMeanAddOperator = New ROperator + clsMeanDivideByOperator = New ROperator + clsPMinFunctionMax = New RFunction clsPMaxFunctionMax = New RFunction clsPMaxOperatorMax = New ROperator @@ -287,7 +407,7 @@ Public Class dlgTransformClimatic clsRRaindayUpperOperator.SetOperation("<=") clsRRaindayAndOperator.AddParameter("lower", clsROperatorParameter:=clsRRaindayLowerOperator, iPosition:=1) clsRRaindayLowerOperator.SetOperation(">=") - + clsRRaindayLowerOperator.AddParameter("min", 0.85, iPosition:=1) clsRRaindayOrOperator.SetOperation("|") clsRRaindayOrOperator.AddParameter("upper", clsROperatorParameter:=clsGreaterThanOperator, iPosition:=0) @@ -311,9 +431,9 @@ Public Class dlgTransformClimatic clsRCountFunction.SetRCommand("rollapply") clsRCountFunction.AddParameter("data", strRainDay, iPosition:=0) clsRCountFunction.AddParameter("width", 1, iPosition:=1) - clsRCountFunction.AddParameter("FUN", "sum", iPosition:=2) clsRCountFunction.AddParameter("align", Chr(39) & "right" & Chr(39), iPosition:=4) clsRCountFunction.AddParameter("fill", "NA", iPosition:=5) + clsRCountFunction.AddParameter("FUN", "sum", iPosition:=2) ' Spell ' this is run as a string Chr(34) & "cumsum(" & strRainDay & ")-cummax((" & strRainDay & "==0)*cumsum(" & strRainDay & "))" & Chr(34)) @@ -363,6 +483,85 @@ Public Class dlgTransformClimatic clsRWaterBalanceFunction.AddParameter("accumulate", "TRUE", iPosition:=2) '"Reduce(function(x, y) pmin(pmax(x + y - " & ucrInputEvaporation.GetText & ", 0), " & ucrNudCapacity.Value & "), Rain, accumulate=TRUE)" & Chr(34)) + ' Degree + clsDiurnalRangeOperator.SetOperation("-") + clsDiurnalRangeOperator.AddParameter("tmax", "tmax", iPosition:=0) + clsDiurnalRangeOperator.AddParameter("tmin", "tmin", iPosition:=1) + clsDiurnalRangeOperator.bToScriptAsRString = True + + clsTMeanAddOperator.SetOperation("+") + clsTMeanAddOperator.AddParameter("tmax", "tmax", iPosition:=0) + clsTMeanAddOperator.AddParameter("tmin", "tmin", iPosition:=1) + clsTMeanDivideOperator.SetOperation("/") + clsTMeanDivideOperator.AddParameter("x", clsROperatorParameter:=clsTMeanAddOperator, iPosition:=0, bIncludeArgumentName:=False) + clsTMeanDivideOperator.AddParameter("y", 2, iPosition:=1, bIncludeArgumentName:=False) + clsTMeanDivideOperator.bToScriptAsRString = True + + clsMeanAddOperator.SetOperation("+") + clsMeanAddOperator.AddParameter("tmax", "tmax", iPosition:=0) + clsMeanAddOperator.AddParameter("tmin", "tmin", iPosition:=1) + clsMeanDivideByOperator.SetOperation("/") + clsMeanDivideByOperator.AddParameter("x", clsROperatorParameter:=clsMeanAddOperator, iPosition:=0, bIncludeArgumentName:=False) + clsMeanDivideByOperator.AddParameter("y", 2, iPosition:=1, bIncludeArgumentName:=False) + clsMeanDivideByOperator.SetAssignTo("mean") + clsMeanDivideByOperator.bBrackets = True + + clsHeatingDegreeDiffOperator.SetOperation("-") + clsHeatingDegreeDiffOperator.AddParameter("tmean", "tmean", iPosition:=1) + + clsHeatingDegreeLogicOperator.SetOperation("<") + clsHeatingDegreeLogicOperator.AddParameter("tmean", "tmean", iPosition:=0) + clsHeatingDegreeLogicOperator.AddParameter("baseline", "15", iPosition:=1) + + 'This introduces brackets to the logic operator ie. (tmean < baseline) + clsLogicalRFunction.SetRCommand("") + clsLogicalRFunction.AddParameter("logical", clsROperatorParameter:=clsHeatingDegreeLogicOperator, iPosition:=0, bIncludeArgumentName:=False) + + clsHeatingDegreeOperator.SetOperation("*") + clsHeatingDegreeOperator.AddParameter("x", clsROperatorParameter:=clsHeatingDegreeDiffOperator, iPosition:=0, bIncludeArgumentName:=False) + clsHeatingDegreeOperator.AddParameter("y", clsRFunctionParameter:=clsLogicalRFunction, iPosition:=1, bIncludeArgumentName:=False) + clsHeatingDegreeOperator.bToScriptAsRString = True + + clsGrowingDegreDiffOperator.SetOperation("-") + clsGrowingDegreDiffOperator.AddParameter("tmean", "tmean", iPosition:=0) + clsGrowingDegreDiffOperator.AddParameter("baseline", "15", iPosition:=1) + + clsGrowingDegreeLogicOperator.SetOperation(">") + clsGrowingDegreeLogicOperator.AddParameter("tmean", "tmean", iPosition:=0) + clsGrowingDegreeLogicOperator.AddParameter("baseline", 15, iPosition:=1) + + 'This introduces brackets to the logic operator ie. (tmean > baseline) + clsLogicalGDDRFunction.SetRCommand("") + clsLogicalGDDRFunction.AddParameter("logical", clsROperatorParameter:=clsGrowingDegreeLogicOperator, iPosition:=0, bIncludeArgumentName:=False) + + clsGrowingDegreeOperator.SetOperation("*") + clsGrowingDegreeOperator.AddParameter("x", clsROperatorParameter:=clsGrowingDegreDiffOperator, iPosition:=0, bIncludeArgumentName:=False) + clsGrowingDegreeOperator.AddParameter("y", clsRFunctionParameter:=clsLogicalGDDRFunction, iPosition:=1, bIncludeArgumentName:=False) + clsGrowingDegreeOperator.bToScriptAsRString = True + + clsModifiedMinfunction.SetRCommand("pmin") + clsModifiedMinfunction.AddParameter("limit", 30, iPosition:=0, bIncludeArgumentName:=False) + clsModifiedMinfunction.AddParameter("tmean", "tmean", iPosition:=1, bIncludeArgumentName:=False) + + clsModifiedDiffOperator.SetOperation("-") + clsModifiedDiffOperator.AddParameter("x", clsRFunctionParameter:=clsModifiedMinfunction, iPosition:=0, bIncludeArgumentName:=False) + clsModifiedDiffOperator.AddParameter("baseline", 15, iPosition:=1) + + clsModifiedLogicOperator.SetOperation(">") + clsModifiedLogicOperator.AddParameter("tmean", "tmean", iPosition:=0) + clsModifiedLogicOperator.AddParameter("baseline", 15, iPosition:=1) + + 'This introduces brackets to the logic operator ie. (tmean > baseline) + clsLogicalMgddRFunction.SetRCommand("") + clsLogicalMgddRFunction.AddParameter("logical", clsROperatorParameter:=clsModifiedLogicOperator, iPosition:=0, bIncludeArgumentName:=False) + + clsModifiedGDDOperator.SetOperation("*") + clsModifiedGDDOperator.AddParameter("x", clsROperatorParameter:=clsModifiedDiffOperator, iPosition:=0, bIncludeArgumentName:=False) + clsModifiedGDDOperator.AddParameter("y", clsRFunctionParameter:=clsLogicalMgddRFunction, iPosition:=1, bIncludeArgumentName:=False) + clsModifiedGDDOperator.bToScriptAsRString = True + + clsDummyFunction.AddParameter("checked", "diurnal", iPosition:=0) + ' Group options clsGroupByYear.SetRCommand("instat_calculation$new") clsGroupByYear.AddParameter("type", Chr(34) & "by" & Chr(34), iPosition:=0) @@ -382,8 +581,9 @@ Public Class dlgTransformClimatic clsRTransform.SetRCommand("instat_calculation$new") clsRTransform.AddParameter("type", Chr(34) & "calculation" & Chr(34), iPosition:=0) - clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsCumulativeSum, iPosition:=1) ' changes depending on the rdo - clsRTransform.AddParameter("result_name", Chr(34) & "cumsum" & Chr(34), iPosition:=2) + clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsRCountFunction, iPosition:=1) ' changes depending on the rdo + clsRTransform.AddParameter("result_name", Chr(34) & "count" & Chr(34), iPosition:=2) + clsRTransform.AddParameter("sub_calculations", clsRFunctionParameter:=clsRTransformCountSpellSub, iPosition:=4) clsRTransform.AddParameter("manipulations", clsRFunctionParameter:=clsTransformManipulationsFunc, iPosition:=5) clsRTransform.AddParameter("save", 2, iPosition:=6) clsRTransform.SetAssignTo("transform_calculation") @@ -414,6 +614,18 @@ Public Class dlgTransformClimatic ucrInputSum.AddAdditionalCodeParameterPair(clsRasterFuction, New RParameter("fun", 2), iAdditionalPairNo:=1) ucrInputSpellUpper.AddAdditionalCodeParameterPair(clsGreaterThanOperator, New RParameter("max", 1), iAdditionalPairNo:=1) ucrInputSpellLower.AddAdditionalCodeParameterPair(clsLessThanOperator, New RParameter("min", 1), iAdditionalPairNo:=1) + ucrReceiverTMin.AddAdditionalCodeParameterPair(clsTMeanAddOperator, New RParameter("tmin", 1), iAdditionalPairNo:=1) + ucrReceiverTMax.AddAdditionalCodeParameterPair(clsTMeanAddOperator, New RParameter("tmax", 0), iAdditionalPairNo:=1) + ucrReceiverTMean.AddAdditionalCodeParameterPair(clsGrowingDegreDiffOperator, New RParameter("tmean", 0), iAdditionalPairNo:=1) + ucrReceiverTMean.AddAdditionalCodeParameterPair(clsHeatingDegreeLogicOperator, New RParameter("tmean", 0), iAdditionalPairNo:=2) + ucrReceiverTMean.AddAdditionalCodeParameterPair(clsGrowingDegreeLogicOperator, New RParameter("tmean", 0), iAdditionalPairNo:=3) + ucrReceiverTMean.AddAdditionalCodeParameterPair(clsModifiedMinfunction, New RParameter("tmean", 1), iAdditionalPairNo:=4) + ucrReceiverTMean.AddAdditionalCodeParameterPair(clsModifiedLogicOperator, New RParameter("tmean", 0), iAdditionalPairNo:=5) + ucrNudHDD.AddAdditionalCodeParameterPair(clsHeatingDegreeLogicOperator, New RParameter("baseline", ucrNudHDD.GetText, 1), iAdditionalPairNo:=1) + ucrNudGDD.AddAdditionalCodeParameterPair(clsGrowingDegreeLogicOperator, New RParameter("baseline", ucrNudGDD.GetText, 1), iAdditionalPairNo:=1) + ucrNudMgdd.AddAdditionalCodeParameterPair(clsModifiedLogicOperator, New RParameter("baseline", ucrNudMgdd.GetText, 1), iAdditionalPairNo:=1) + ucrReceiverTMax.AddAdditionalCodeParameterPair(clsMeanAddOperator, New RParameter("tmax", 0), iAdditionalPairNo:=2) + ucrReceiverTMin.AddAdditionalCodeParameterPair(clsMeanAddOperator, New RParameter("tmin", 1), iAdditionalPairNo:=2) ucrPnlTransform.SetRCode(clsTransformCheck, bReset) @@ -439,15 +651,49 @@ Public Class dlgTransformClimatic ucrReceiverEvap.SetRCode(clsReduceOpEvapValue, bReset) ucrNudWBCapacity.SetRCode(clsPMinFunctionMax, bReset) - ucrSaveColumn.SetRCode(clsRTransform, bReset) + 'Degree + ucrReceiverTMin.SetRCode(clsDiurnalRangeOperator, bReset) + ucrReceiverTMax.SetRCode(clsDiurnalRangeOperator, bReset) + ucrReceiverTMean.SetRCode(clsHeatingDegreeDiffOperator, bReset) + ucrNudHDD.SetRCode(clsHeatingDegreeDiffOperator, bReset) + ucrNudGDD.SetRCode(clsGrowingDegreDiffOperator, bReset) + ucrNudLimit.SetRCode(clsModifiedMinfunction, bReset) + ucrNudMgdd.SetRCode(clsModifiedDiffOperator, bReset) + ucrPnlDegree.SetRCode(clsDummyFunction, bReset) + ucrSaveColumn.SetRCode(clsRTransform, bReset) End Sub Private Sub TestOkEnabled() - If Not ucrReceiverData.IsEmpty AndAlso ucrSaveColumn.IsComplete AndAlso ((rdoCount.Checked AndAlso ucrNudCountOver.GetText <> "" AndAlso (((ucrInputCondition.GetText = "Between" OrElse ucrInputCondition.GetText = "Outer") AndAlso Not ucrInputSpellLower.IsEmpty AndAlso Not ucrInputSpellUpper.IsEmpty) OrElse (ucrInputCondition.GetText = "<=" AndAlso Not ucrInputSpellUpper.IsEmpty) OrElse (ucrInputCondition.GetText = ">=" AndAlso Not ucrInputSpellUpper.IsEmpty))) OrElse (rdoCumulative.Checked AndAlso Not ucrInputCumulative.IsEmpty) OrElse (rdoMoving.Checked AndAlso Not ucrInputSum.IsEmpty AndAlso ucrNudSumOver.GetText <> "") OrElse (rdoSpell.Checked AndAlso (((ucrInputCondition.GetText = "Between" OrElse ucrInputCondition.GetText = "Outer") AndAlso Not ucrInputSpellLower.IsEmpty AndAlso Not ucrInputSpellUpper.IsEmpty) OrElse (ucrInputCondition.GetText = "<=" AndAlso Not ucrInputSpellUpper.IsEmpty) OrElse (ucrInputCondition.GetText = ">=" AndAlso Not ucrInputSpellUpper.IsEmpty))) OrElse (rdoMultSpells.Checked AndAlso ucrNudMultSpells.GetText <> "" AndAlso (((ucrInputCondition.GetText = "Between" OrElse ucrInputCondition.GetText = "Outer") AndAlso Not ucrInputSpellLower.IsEmpty AndAlso Not ucrInputSpellUpper.IsEmpty) OrElse (ucrInputCondition.GetText = "<=" AndAlso Not ucrInputSpellUpper.IsEmpty) OrElse (ucrInputCondition.GetText = ">=" AndAlso Not ucrInputSpellUpper.IsEmpty))) OrElse (rdoWaterBalance.Checked AndAlso ucrNudWBCapacity.GetText <> "" AndAlso ((rdoEvapValue.Checked AndAlso Not ucrInputEvaporation.IsEmpty) OrElse (rdoEvapVariable.Checked AndAlso Not ucrReceiverEvap.IsEmpty)))) Then - ucrBase.OKEnabled(True) - Else - ucrBase.OKEnabled(False) + If rdoCount.Checked OrElse rdoCumulative.Checked OrElse rdoMoving.Checked _ + OrElse rdoMultSpells.Checked OrElse rdoSpell.Checked _ + OrElse rdoWaterBalance.Checked Then + Dim betweenOuterOk As Boolean = Not ucrInputSpellUpper.IsEmpty _ + AndAlso ( + ((ucrInputCondition.GetText = "Between" OrElse ucrInputCondition.GetText = "Outer") _ + AndAlso Not ucrInputSpellLower.IsEmpty) _ + OrElse (ucrInputCondition.GetText = "<=") _ + OrElse (ucrInputCondition.GetText = ">=")) + If Not ucrReceiverData.IsEmpty AndAlso ucrSaveColumn.IsComplete _ + AndAlso ((rdoCount.Checked AndAlso ucrNudCountOver.GetText <> "" AndAlso betweenOuterOk) _ + OrElse (rdoCumulative.Checked AndAlso Not ucrInputCumulative.IsEmpty) _ + OrElse (rdoMoving.Checked AndAlso Not ucrInputSum.IsEmpty AndAlso ucrNudSumOver.GetText <> "") _ + OrElse (rdoSpell.Checked AndAlso betweenOuterOk) _ + OrElse (rdoMultSpells.Checked AndAlso ucrNudMultSpells.GetText <> "" AndAlso betweenOuterOk) _ + OrElse (rdoWaterBalance.Checked AndAlso ucrNudWBCapacity.GetText <> "" _ + AndAlso ((rdoEvapValue.Checked AndAlso Not ucrInputEvaporation.IsEmpty) _ + OrElse (rdoEvapVariable.Checked AndAlso Not ucrReceiverEvap.IsEmpty)))) Then + ucrBase.OKEnabled(True) + Else + ucrBase.OKEnabled(False) + End If + ElseIf rdoDegree.Checked Then + If (ucrChkUseMaxMin.Checked AndAlso (ucrReceiverTMin.IsEmpty OrElse ucrReceiverTMax.IsEmpty)) OrElse + (ucrChkUseMaxMin.Checked = False AndAlso ucrReceiverTMean.IsEmpty) OrElse Not ucrSaveColumn.IsComplete Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If End If End Sub @@ -487,7 +733,7 @@ Public Class dlgTransformClimatic End Select End Sub - Private Sub ucrPnlTransform_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTransform.ControlValueChanged + Private Sub ucrPnlTransform_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlTransform.ControlValueChanged, ucrPnlDegree.ControlValueChanged If rdoCumulative.Checked Then CumulativeFunctions() clsRTransform.RemoveParameterByName("sub_calculations") @@ -515,13 +761,39 @@ Public Class dlgTransformClimatic clsRTransform.AddParameter("function_exp", clsRFunctionParameter:=clsRWaterBalanceFunction, iPosition:=1) clsRTransform.RemoveParameterByName("sub_calculations") clsTransformCheck = clsRTransform + ElseIf rdoDegree.Checked Then + DegreeFunctions() + clsRTransform.RemoveParameterByName("sub_calculations") + clsTransformCheck = clsRTransform End If Evaporation() AddCalculate() SetAssignName() + GroupByStation() GroupByYear() + SetAsReceiver() + ChangeFunctions() + AddRemoveMeanOperator() End Sub + Private Sub DegreeFunctions() + If rdoDiurnalRange.Checked Then + clsDummyFunction.AddParameter("checked", "diurnal", iPosition:=0) + clsRTransform.AddParameter("function_exp", clsROperatorParameter:=clsDiurnalRangeOperator, iPosition:=1) + ElseIf rdoTMean.Checked Then + clsDummyFunction.AddParameter("checked", "mean", iPosition:=0) + clsRTransform.AddParameter("function_exp", clsROperatorParameter:=clsTMeanDivideOperator, iPosition:=1) + ElseIf rdoHeatingDegreeDays.Checked Then + clsDummyFunction.AddParameter("checked", "hdd", iPosition:=0) + clsRTransform.AddParameter("function_exp", clsROperatorParameter:=clsHeatingDegreeOperator, iPosition:=1) + ElseIf rdoGrowingDegreeDays.Checked Then + clsDummyFunction.AddParameter("checked", "gdd", iPosition:=0) + clsRTransform.AddParameter("function_exp", clsROperatorParameter:=clsGrowingDegreeOperator, iPosition:=1) + ElseIf rdoModifiedGDD.Checked Then + clsDummyFunction.AddParameter("checked", "mgdd", iPosition:=0) + clsRTransform.AddParameter("function_exp", clsROperatorParameter:=clsModifiedGDDOperator, iPosition:=1) + End If + End Sub Private Sub SetAssignName() If rdoCumulative.Checked Then CumulativeColNames() @@ -535,6 +807,18 @@ Public Class dlgTransformClimatic ucrSaveColumn.SetName("spells") ElseIf rdoWaterBalance.Checked Then ucrSaveColumn.SetName("water") + ElseIf rdoDegree.Checked Then + If rdoDiurnalRange.Checked Then + ucrSaveColumn.SetName("range") + ElseIf rdoTMean.Checked Then + ucrSaveColumn.SetName("tmean") + ElseIf rdoHeatingDegreeDays.Checked Then + ucrSaveColumn.SetName("hdd") + ElseIf rdoGrowingDegreeDays.Checked Then + ucrSaveColumn.SetName("gdd") + ElseIf rdoModifiedGDD.Checked Then + ucrSaveColumn.SetName("mgdd") + End If End If End Sub @@ -586,12 +870,16 @@ Public Class dlgTransformClimatic End Sub Private Sub GroupByStation() - If Not ucrReceiverStation.IsEmpty() Then - clsGroupByStation.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverStation.GetVariableNames & ")", iPosition:=3) - clsTransformManipulationsFunc.AddParameter("group_by_station", clsRFunctionParameter:=clsGroupByStation, bIncludeArgumentName:=False, iPosition:=0) - Else + If rdoDegree.Checked OrElse ucrReceiverStation.IsEmpty() Then clsGroupByStation.RemoveParameterByName("calculated_from") clsTransformManipulationsFunc.RemoveParameterByName("group_by_station") + Else + clsGroupByStation.AddParameter("calculated_from", + "list(" & strCurrDataName & "=" & ucrReceiverStation.GetVariableNames & ")", + iPosition:=3) + clsTransformManipulationsFunc.AddParameter("group_by_station", + clsRFunctionParameter:=clsGroupByStation, bIncludeArgumentName:=False, + iPosition:=0) End If End Sub @@ -613,20 +901,19 @@ Public Class dlgTransformClimatic clsRWaterBalanceFunction.AddParameter("replace_na", clsROperatorParameter:=clsReduceOpEvapValue, iPosition:=1, bIncludeArgumentName:=False) clsPMaxOperatorMax.RemoveParameterByName("evaporation.value") End If - Else - ucrReceiverData.SetMeAsReceiver() End If End Sub - Private Sub ucrSelectorTransform_ControlContentsChanged(ucrchangedControl As ucrCore) Handles ucrSelectorTransform.ControlContentsChanged + Private Sub ucrSelectorTransform_ControlValueChanged(ucrchangedControl As ucrCore) Handles ucrSelectorTransform.ControlValueChanged strCurrDataName = Chr(34) & ucrSelectorTransform.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem & Chr(34) RainDays() GroupByYear() GroupByStation() Evaporation() + ChangeFunctions() End Sub - Private Sub ucrInputSpellLower_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSpellLower.ControlValueChanged, ucrInputSpellUpper.ControlValueChanged, ucrInputCondition.ControlValueChanged + Private Sub ucrInputSpellLower_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputSpellUpper.ControlValueChanged, ucrInputCondition.ControlValueChanged InputConditionOptions() End Sub @@ -653,7 +940,7 @@ Public Class dlgTransformClimatic CheckGroupByYearEnabled() End Sub - Private Sub ucrInputEvaporation_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlContentsChanged, ucrPnlEvap.ControlValueChanged + Private Sub ucrInputEvaporation_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrInputEvaporation.ControlContentsChanged, ucrPnlEvap.ControlContentsChanged Evaporation() End Sub @@ -667,7 +954,7 @@ Public Class dlgTransformClimatic End If End Sub - Private Sub ucrChkCircular_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCircular.ControlValueChanged, ucrPnlTransform.ControlValueChanged + Private Sub ucrChkCircular_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCircular.ControlValueChanged RasterFunction() End Sub @@ -701,10 +988,44 @@ Public Class dlgTransformClimatic Private Sub AddCalculate() If rdoCumulative.Checked OrElse rdoMoving.Checked Then clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverData.GetVariableNames & ")") + ElseIf rdoDegree.Checked Then + If rdoDiurnalRange.Checked OrElse rdoTMean.Checked Then + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverTMin.GetVariableNames & "," & strCurrDataName & "=" & ucrReceiverTMax.GetVariableNames & ")") + ElseIf rdoHeatingDegreeDays.Checked OrElse rdoGrowingDegreeDays.Checked OrElse rdoModifiedGDD.Checked Then + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverTMean.GetVariableNames & ")") + End If End If End Sub - Private Sub ucrPnlEvap_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvap.ControlContentsChanged, ucrInputSum.ControlContentsChanged, ucrPnlTransform.ControlContentsChanged, ucrReceiverData.ControlContentsChanged, ucrNudSumOver.ControlContentsChanged, ucrNudCountOver.ControlContentsChanged, ucrInputSpellLower.ControlContentsChanged, ucrInputSpellUpper.ControlContentsChanged, ucrInputCondition.ControlContentsChanged, ucrSaveColumn.ControlContentsChanged, ucrNudWBCapacity.ControlContentsChanged, ucrReceiverEvap.ControlContentsChanged, ucrInputEvaporation.ControlContentsChanged, ucrNudMultSpells.ControlContentsChanged + Private Sub ChangeFunctions() + If Not rdoDegree.Checked Then + Exit Sub + End If + If ucrChkUseMaxMin.Checked Then + AlternativeFunctions() + End If + End Sub + + Private Sub AlternativeFunctions() + If rdoGrowingDegreeDays.Checked Then + clsGrowingDegreDiffOperator.AddParameter("tmean", "mean", iPosition:=0, bIncludeArgumentName:=False) + clsGrowingDegreeLogicOperator.AddParameter("tmean", "mean", iPosition:=0, bIncludeArgumentName:=False) + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverTMax.GetVariableNames & + "," & strCurrDataName & "=" & ucrReceiverTMin.GetVariableNames & ")") + ElseIf rdoHeatingDegreeDays.Checked Then + clsHeatingDegreeDiffOperator.AddParameter("tmean", "mean", iPosition:=1, bIncludeArgumentName:=False) + clsHeatingDegreeLogicOperator.AddParameter("tmean", "mean", iPosition:=0, bIncludeArgumentName:=False) + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverTMax.GetVariableNames & + "," & strCurrDataName & "=" & ucrReceiverTMin.GetVariableNames & ")") + ElseIf rdoModifiedGDD.Checked Then + clsModifiedMinfunction.AddParameter("tmean", "mean", iPosition:=1, bIncludeArgumentName:=False) + clsModifiedLogicOperator.AddParameter("tmean", "mean", iPosition:=0, bIncludeArgumentName:=False) + clsRTransform.AddParameter("calculated_from", "list(" & strCurrDataName & "=" & ucrReceiverTMax.GetVariableNames & + "," & strCurrDataName & "=" & ucrReceiverTMin.GetVariableNames & ")") + End If + End Sub + Private Sub ucrPnlEvap_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrPnlEvap.ControlContentsChanged, ucrInputSum.ControlContentsChanged, ucrPnlTransform.ControlContentsChanged, ucrReceiverData.ControlContentsChanged, ucrNudSumOver.ControlContentsChanged, ucrNudCountOver.ControlContentsChanged, ucrInputSpellUpper.ControlContentsChanged, ucrInputCondition.ControlContentsChanged, ucrSaveColumn.ControlContentsChanged, ucrNudWBCapacity.ControlContentsChanged, ucrReceiverEvap.ControlContentsChanged, ucrInputEvaporation.ControlContentsChanged, ucrNudMultSpells.ControlContentsChanged, + ucrChkUseMaxMin.ControlContentsChanged, ucrReceiverTMin.ControlContentsChanged, ucrReceiverTMean.ControlContentsChanged, ucrReceiverTMax.ControlContentsChanged, ucrPnlDegree.ControlContentsChanged, ucrNudGDD.ControlContentsChanged, ucrNudHDD.ControlContentsChanged, ucrNudMgdd.ControlContentsChanged TestOkEnabled() End Sub @@ -713,4 +1034,42 @@ Public Class dlgTransformClimatic clsRTransform.AddParameter(strParameterName:="result_name", strParameterValue:=Chr(34) & ucrSaveColumn.GetText & Chr(34), iPosition:=2) End Sub + Private Sub SetAsReceiver() + If Not rdoDegree.Checked Then + Exit Sub + End If + If ucrChkUseMaxMin.Checked Then + rdoDiurnalRange.Enabled = True + rdoTMean.Enabled = True + If ucrReceiverTMax.IsEmpty Then + ucrReceiverTMax.SetMeAsReceiver() + Else + ucrReceiverTMin.SetMeAsReceiver() + End If + Else + rdoDiurnalRange.Enabled = False + rdoTMean.Enabled = False + ucrReceiverTMean.SetMeAsReceiver() + End If + End Sub + + Private Sub AddRemoveMeanOperator() + If rdoDegree.Checked AndAlso ucrChkUseMaxMin.Checked AndAlso (rdoHeatingDegreeDays.Checked OrElse rdoGrowingDegreeDays.Checked Or rdoModifiedGDD.Checked) Then + ucrBase.clsRsyntax.AddToBeforeCodes(clsMeanDivideByOperator) + Else + ucrBase.clsRsyntax.RemoveFromBeforeCodes(clsMeanDivideByOperator) + End If + End Sub + + Private Sub ucrChkUseMaxMin_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkUseMaxMin.ControlValueChanged, ucrNudGDD.ControlValueChanged, ucrNudHDD.ControlValueChanged, ucrNudMgdd.ControlValueChanged + AddRemoveMeanOperator() + SetAsReceiver() + ChangeFunctions() + End Sub + + Private Sub ucrReceiverTMax_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverTMax.ControlValueChanged, ucrReceiverTMean.ControlValueChanged, ucrReceiverTMin.ControlValueChanged + ChangeFunctions() + AddRemoveMeanOperator() + AddCalculate() + End Sub End Class \ No newline at end of file diff --git a/instat/dlgUnstack.Designer.vb b/instat/dlgUnstack.Designer.vb index 1524c38968d..02218f3897d 100644 --- a/instat/dlgUnstack.Designer.vb +++ b/instat/dlgUnstack.Designer.vb @@ -37,249 +37,200 @@ Partial Class dlgUnstack 'Do not modify it using the code editor. Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(dlgUnstack)) Me.lblFactorToUnstackBy = New System.Windows.Forms.Label() - Me.lblCarryColumns = New System.Windows.Forms.Label() Me.rdoSingle = New System.Windows.Forms.RadioButton() Me.rdoMultiple = New System.Windows.Forms.RadioButton() Me.rdoRestoreHierarchy = New System.Windows.Forms.RadioButton() Me.lblMultipleColumns = New System.Windows.Forms.Label() + Me.lblColumnToUnstack = New System.Windows.Forms.Label() + Me.ucrInputTextPrefix = New instat.ucrInputTextBox() + Me.ucrChkCarryColumns = New instat.ucrCheck() + Me.ucrNudValuesFill = New instat.ucrNud() + Me.ucrReceiverColumnToUnstack = New instat.ucrReceiverSingle() Me.ucrNewDFName = New instat.ucrSave() - Me.ucrChkDropMissingCombinations = New instat.ucrCheck() Me.ucrReceiverCarryColumns = New instat.ucrReceiverMultiple() Me.ucrReceiverFactorToUnstackby = New instat.ucrReceiverSingle() Me.ucrSelectorForUnstack = New instat.ucrSelectorByDataFrameAddRemove() Me.ucrBase = New instat.ucrButtons() Me.ucrPnlUnstackCol = New instat.UcrPanel() Me.ucrMultipleColumnsReceiver = New instat.ucrReceiverMultiple() - Me.ucrReceiverColumnToUnstack = New instat.ucrReceiverSingle() - Me.lblColumnToUnstack = New System.Windows.Forms.Label() + Me.ucrChkValuesFill = New instat.ucrCheck() + Me.ucrChkAddPrefix = New instat.ucrCheck() Me.SuspendLayout() ' 'lblFactorToUnstackBy ' - Me.lblFactorToUnstackBy.AutoSize = True - Me.lblFactorToUnstackBy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFactorToUnstackBy.Location = New System.Drawing.Point(272, 63) + resources.ApplyResources(Me.lblFactorToUnstackBy, "lblFactorToUnstackBy") Me.lblFactorToUnstackBy.Name = "lblFactorToUnstackBy" - Me.lblFactorToUnstackBy.Size = New System.Drawing.Size(109, 13) - Me.lblFactorToUnstackBy.TabIndex = 5 Me.lblFactorToUnstackBy.Tag = "Factor_to_Unstack_By" - Me.lblFactorToUnstackBy.Text = "Factor to Unstack by:" - ' - 'lblCarryColumns - ' - Me.lblCarryColumns.AutoSize = True - Me.lblCarryColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblCarryColumns.Location = New System.Drawing.Point(269, 154) - Me.lblCarryColumns.Name = "lblCarryColumns" - Me.lblCarryColumns.Size = New System.Drawing.Size(77, 13) - Me.lblCarryColumns.TabIndex = 9 - Me.lblCarryColumns.Tag = "ID_Columns" - Me.lblCarryColumns.Text = "Carry Columns:" ' 'rdoSingle ' - Me.rdoSingle.Appearance = System.Windows.Forms.Appearance.Button + resources.ApplyResources(Me.rdoSingle, "rdoSingle") Me.rdoSingle.BackColor = System.Drawing.SystemColors.Control Me.rdoSingle.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption Me.rdoSingle.FlatAppearance.BorderSize = 2 Me.rdoSingle.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoSingle.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoSingle.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoSingle.Location = New System.Drawing.Point(47, 13) Me.rdoSingle.Name = "rdoSingle" - Me.rdoSingle.Size = New System.Drawing.Size(100, 28) - Me.rdoSingle.TabIndex = 1 Me.rdoSingle.TabStop = True - Me.rdoSingle.Text = "Single" - Me.rdoSingle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSingle.UseVisualStyleBackColor = False ' 'rdoMultiple ' - Me.rdoMultiple.Appearance = System.Windows.Forms.Appearance.Button + resources.ApplyResources(Me.rdoMultiple, "rdoMultiple") Me.rdoMultiple.BackColor = System.Drawing.SystemColors.Control - Me.rdoMultiple.Enabled = False Me.rdoMultiple.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption Me.rdoMultiple.FlatAppearance.BorderSize = 2 Me.rdoMultiple.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoMultiple.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoMultiple.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoMultiple.Location = New System.Drawing.Point(145, 13) Me.rdoMultiple.Name = "rdoMultiple" - Me.rdoMultiple.Size = New System.Drawing.Size(100, 28) - Me.rdoMultiple.TabIndex = 2 Me.rdoMultiple.TabStop = True - Me.rdoMultiple.Text = "Multiple" - Me.rdoMultiple.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoMultiple.UseVisualStyleBackColor = False ' 'rdoRestoreHierarchy ' - Me.rdoRestoreHierarchy.Appearance = System.Windows.Forms.Appearance.Button + resources.ApplyResources(Me.rdoRestoreHierarchy, "rdoRestoreHierarchy") Me.rdoRestoreHierarchy.FlatAppearance.BorderColor = System.Drawing.SystemColors.ActiveCaption Me.rdoRestoreHierarchy.FlatAppearance.BorderSize = 2 Me.rdoRestoreHierarchy.FlatAppearance.CheckedBackColor = System.Drawing.SystemColors.ActiveCaption - Me.rdoRestoreHierarchy.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.rdoRestoreHierarchy.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.rdoRestoreHierarchy.Location = New System.Drawing.Point(243, 13) Me.rdoRestoreHierarchy.Name = "rdoRestoreHierarchy" - Me.rdoRestoreHierarchy.Size = New System.Drawing.Size(126, 28) - Me.rdoRestoreHierarchy.TabIndex = 3 Me.rdoRestoreHierarchy.TabStop = True - Me.rdoRestoreHierarchy.Text = "Restore Hierarchy" - Me.rdoRestoreHierarchy.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoRestoreHierarchy.UseVisualStyleBackColor = True ' 'lblMultipleColumns ' - Me.lblMultipleColumns.AutoSize = True - Me.lblMultipleColumns.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblMultipleColumns.Location = New System.Drawing.Point(272, 156) + resources.ApplyResources(Me.lblMultipleColumns, "lblMultipleColumns") Me.lblMultipleColumns.Name = "lblMultipleColumns" - Me.lblMultipleColumns.Size = New System.Drawing.Size(105, 13) - Me.lblMultipleColumns.TabIndex = 10 - Me.lblMultipleColumns.Text = "Columns to Unstack:" ' - 'ucrNewDFName + 'lblColumnToUnstack ' - Me.ucrNewDFName.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrNewDFName.Location = New System.Drawing.Point(10, 282) - Me.ucrNewDFName.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrNewDFName.Name = "ucrNewDFName" - Me.ucrNewDFName.Size = New System.Drawing.Size(266, 24) - Me.ucrNewDFName.TabIndex = 14 + resources.ApplyResources(Me.lblColumnToUnstack, "lblColumnToUnstack") + Me.lblColumnToUnstack.Name = "lblColumnToUnstack" + Me.lblColumnToUnstack.Tag = "Column_to_Unstack:" + ' + 'ucrInputTextPrefix + ' + Me.ucrInputTextPrefix.AddQuotesIfUnrecognised = True + resources.ApplyResources(Me.ucrInputTextPrefix, "ucrInputTextPrefix") + Me.ucrInputTextPrefix.IsMultiline = False + Me.ucrInputTextPrefix.IsReadOnly = False + Me.ucrInputTextPrefix.Name = "ucrInputTextPrefix" + ' + 'ucrChkCarryColumns + ' + resources.ApplyResources(Me.ucrChkCarryColumns, "ucrChkCarryColumns") + Me.ucrChkCarryColumns.Checked = False + Me.ucrChkCarryColumns.Name = "ucrChkCarryColumns" + ' + 'ucrNudValuesFill + ' + resources.ApplyResources(Me.ucrNudValuesFill, "ucrNudValuesFill") + Me.ucrNudValuesFill.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudValuesFill.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudValuesFill.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudValuesFill.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudValuesFill.Name = "ucrNudValuesFill" + Me.ucrNudValuesFill.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrReceiverColumnToUnstack ' - 'ucrChkDropMissingCombinations + resources.ApplyResources(Me.ucrReceiverColumnToUnstack, "ucrReceiverColumnToUnstack") + Me.ucrReceiverColumnToUnstack.frmParent = Me + Me.ucrReceiverColumnToUnstack.Name = "ucrReceiverColumnToUnstack" + Me.ucrReceiverColumnToUnstack.Selector = Nothing + Me.ucrReceiverColumnToUnstack.strNcFilePath = "" + Me.ucrReceiverColumnToUnstack.ucrSelector = Nothing ' - Me.ucrChkDropMissingCombinations.AutoSize = True - Me.ucrChkDropMissingCombinations.Checked = False - Me.ucrChkDropMissingCombinations.Location = New System.Drawing.Point(10, 256) - Me.ucrChkDropMissingCombinations.Name = "ucrChkDropMissingCombinations" - Me.ucrChkDropMissingCombinations.Size = New System.Drawing.Size(235, 23) - Me.ucrChkDropMissingCombinations.TabIndex = 13 + 'ucrNewDFName + ' + resources.ApplyResources(Me.ucrNewDFName, "ucrNewDFName") + Me.ucrNewDFName.Name = "ucrNewDFName" ' 'ucrReceiverCarryColumns ' - Me.ucrReceiverCarryColumns.AutoSize = True + resources.ApplyResources(Me.ucrReceiverCarryColumns, "ucrReceiverCarryColumns") Me.ucrReceiverCarryColumns.frmParent = Me - Me.ucrReceiverCarryColumns.Location = New System.Drawing.Point(272, 169) - Me.ucrReceiverCarryColumns.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverCarryColumns.Name = "ucrReceiverCarryColumns" Me.ucrReceiverCarryColumns.Selector = Nothing - Me.ucrReceiverCarryColumns.Size = New System.Drawing.Size(120, 104) Me.ucrReceiverCarryColumns.strNcFilePath = "" - Me.ucrReceiverCarryColumns.TabIndex = 12 Me.ucrReceiverCarryColumns.ucrSelector = Nothing ' 'ucrReceiverFactorToUnstackby ' - Me.ucrReceiverFactorToUnstackby.AutoSize = True + resources.ApplyResources(Me.ucrReceiverFactorToUnstackby, "ucrReceiverFactorToUnstackby") Me.ucrReceiverFactorToUnstackby.frmParent = Me - Me.ucrReceiverFactorToUnstackby.Location = New System.Drawing.Point(272, 78) - Me.ucrReceiverFactorToUnstackby.Margin = New System.Windows.Forms.Padding(0) Me.ucrReceiverFactorToUnstackby.Name = "ucrReceiverFactorToUnstackby" Me.ucrReceiverFactorToUnstackby.Selector = Nothing - Me.ucrReceiverFactorToUnstackby.Size = New System.Drawing.Size(120, 20) Me.ucrReceiverFactorToUnstackby.strNcFilePath = "" - Me.ucrReceiverFactorToUnstackby.TabIndex = 6 Me.ucrReceiverFactorToUnstackby.ucrSelector = Nothing ' 'ucrSelectorForUnstack ' - Me.ucrSelectorForUnstack.AutoSize = True + resources.ApplyResources(Me.ucrSelectorForUnstack, "ucrSelectorForUnstack") Me.ucrSelectorForUnstack.bDropUnusedFilterLevels = False Me.ucrSelectorForUnstack.bShowHiddenColumns = False Me.ucrSelectorForUnstack.bUseCurrentFilter = True - Me.ucrSelectorForUnstack.Location = New System.Drawing.Point(9, 59) - Me.ucrSelectorForUnstack.Margin = New System.Windows.Forms.Padding(0) Me.ucrSelectorForUnstack.Name = "ucrSelectorForUnstack" - Me.ucrSelectorForUnstack.Size = New System.Drawing.Size(213, 183) - Me.ucrSelectorForUnstack.TabIndex = 4 ' 'ucrBase ' - Me.ucrBase.AutoSize = True - Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(7, 316) + resources.ApplyResources(Me.ucrBase, "ucrBase") Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 15 ' 'ucrPnlUnstackCol ' - Me.ucrPnlUnstackCol.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlUnstackCol.Location = New System.Drawing.Point(40, 5) + resources.ApplyResources(Me.ucrPnlUnstackCol, "ucrPnlUnstackCol") Me.ucrPnlUnstackCol.Name = "ucrPnlUnstackCol" - Me.ucrPnlUnstackCol.Size = New System.Drawing.Size(337, 52) - Me.ucrPnlUnstackCol.TabIndex = 0 ' 'ucrMultipleColumnsReceiver ' - Me.ucrMultipleColumnsReceiver.AutoSize = True + resources.ApplyResources(Me.ucrMultipleColumnsReceiver, "ucrMultipleColumnsReceiver") Me.ucrMultipleColumnsReceiver.frmParent = Me - Me.ucrMultipleColumnsReceiver.Location = New System.Drawing.Point(271, 169) - Me.ucrMultipleColumnsReceiver.Margin = New System.Windows.Forms.Padding(0) Me.ucrMultipleColumnsReceiver.Name = "ucrMultipleColumnsReceiver" Me.ucrMultipleColumnsReceiver.Selector = Nothing - Me.ucrMultipleColumnsReceiver.Size = New System.Drawing.Size(120, 100) Me.ucrMultipleColumnsReceiver.strNcFilePath = "" - Me.ucrMultipleColumnsReceiver.TabIndex = 11 Me.ucrMultipleColumnsReceiver.ucrSelector = Nothing ' - 'ucrReceiverColumnToUnstack + 'ucrChkValuesFill ' - Me.ucrReceiverColumnToUnstack.AutoSize = True - Me.ucrReceiverColumnToUnstack.frmParent = Me - Me.ucrReceiverColumnToUnstack.Location = New System.Drawing.Point(272, 125) - Me.ucrReceiverColumnToUnstack.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverColumnToUnstack.Name = "ucrReceiverColumnToUnstack" - Me.ucrReceiverColumnToUnstack.Selector = Nothing - Me.ucrReceiverColumnToUnstack.Size = New System.Drawing.Size(120, 20) - Me.ucrReceiverColumnToUnstack.strNcFilePath = "" - Me.ucrReceiverColumnToUnstack.TabIndex = 8 - Me.ucrReceiverColumnToUnstack.ucrSelector = Nothing + resources.ApplyResources(Me.ucrChkValuesFill, "ucrChkValuesFill") + Me.ucrChkValuesFill.Checked = False + Me.ucrChkValuesFill.Name = "ucrChkValuesFill" ' - 'lblColumnToUnstack + 'ucrChkAddPrefix ' - Me.lblColumnToUnstack.AutoSize = True - Me.lblColumnToUnstack.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblColumnToUnstack.Location = New System.Drawing.Point(272, 110) - Me.lblColumnToUnstack.Name = "lblColumnToUnstack" - Me.lblColumnToUnstack.Size = New System.Drawing.Size(100, 13) - Me.lblColumnToUnstack.TabIndex = 7 - Me.lblColumnToUnstack.Tag = "Column_to_Unstack:" - Me.lblColumnToUnstack.Text = "Column to Unstack:" + resources.ApplyResources(Me.ucrChkAddPrefix, "ucrChkAddPrefix") + Me.ucrChkAddPrefix.Checked = False + Me.ucrChkAddPrefix.Name = "ucrChkAddPrefix" ' 'dlgUnstack ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(414, 370) + Me.Controls.Add(Me.ucrInputTextPrefix) + Me.Controls.Add(Me.ucrChkCarryColumns) + Me.Controls.Add(Me.ucrNudValuesFill) Me.Controls.Add(Me.ucrReceiverColumnToUnstack) Me.Controls.Add(Me.lblColumnToUnstack) Me.Controls.Add(Me.rdoRestoreHierarchy) Me.Controls.Add(Me.rdoMultiple) Me.Controls.Add(Me.rdoSingle) Me.Controls.Add(Me.ucrNewDFName) - Me.Controls.Add(Me.ucrChkDropMissingCombinations) Me.Controls.Add(Me.ucrReceiverCarryColumns) Me.Controls.Add(Me.ucrReceiverFactorToUnstackby) Me.Controls.Add(Me.lblFactorToUnstackBy) Me.Controls.Add(Me.ucrSelectorForUnstack) Me.Controls.Add(Me.ucrBase) - Me.Controls.Add(Me.lblCarryColumns) Me.Controls.Add(Me.ucrPnlUnstackCol) Me.Controls.Add(Me.lblMultipleColumns) Me.Controls.Add(Me.ucrMultipleColumnsReceiver) + Me.Controls.Add(Me.ucrChkValuesFill) + Me.Controls.Add(Me.ucrChkAddPrefix) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "dlgUnstack" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Tag = "Unstack_Columns" - Me.Text = "Unstack (Pivot Wider)" Me.ResumeLayout(False) Me.PerformLayout() @@ -289,15 +240,18 @@ Partial Class dlgUnstack Friend WithEvents lblFactorToUnstackBy As Label Friend WithEvents ucrReceiverFactorToUnstackby As ucrReceiverSingle Friend WithEvents ucrReceiverCarryColumns As ucrReceiverMultiple - Friend WithEvents lblCarryColumns As Label Friend WithEvents ucrNewDFName As ucrSave - Friend WithEvents ucrChkDropMissingCombinations As ucrCheck Friend WithEvents rdoRestoreHierarchy As RadioButton Friend WithEvents rdoMultiple As RadioButton Friend WithEvents rdoSingle As RadioButton Friend WithEvents lblMultipleColumns As Label Friend WithEvents ucrMultipleColumnsReceiver As ucrReceiverMultiple Friend WithEvents ucrPnlUnstackCol As UcrPanel - Friend WithEvents ucrReceiverColumnToUnstack As ucrReceiverSingle Friend WithEvents lblColumnToUnstack As Label + Friend WithEvents ucrInputTextPrefix As ucrInputTextBox + Friend WithEvents ucrReceiverColumnToUnstack As ucrReceiverSingle + Friend WithEvents ucrChkAddPrefix As ucrCheck + Friend WithEvents ucrNudValuesFill As ucrNud + Friend WithEvents ucrChkValuesFill As ucrCheck + Friend WithEvents ucrChkCarryColumns As ucrCheck End Class \ No newline at end of file diff --git a/instat/dlgUnstack.resx b/instat/dlgUnstack.resx index 29dcb1b3a35..f224c2811a5 100644 --- a/instat/dlgUnstack.resx +++ b/instat/dlgUnstack.resx @@ -117,4 +117,568 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + NoControl + + + + 294, 66 + + + 109, 13 + + + 5 + + + Factor to Unstack by: + + + lblFactorToUnstackBy + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 11 + + + Button + + + Flat + + + NoControl + + + 47, 13 + + + 100, 28 + + + 1 + + + Single + + + MiddleCenter + + + rdoSingle + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 7 + + + Button + + + Flat + + + NoControl + + + 145, 13 + + + 100, 28 + + + 2 + + + Multiple + + + MiddleCenter + + + rdoMultiple + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 6 + + + Button + + + Flat + + + NoControl + + + 243, 13 + + + 126, 28 + + + 3 + + + Restore Hierarchy + + + MiddleCenter + + + rdoRestoreHierarchy + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 5 + + + True + + + NoControl + + + 294, 110 + + + 105, 13 + + + 10 + + + Columns to Unstack: + + + lblMultipleColumns + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 15 + + + True + + + NoControl + + + 294, 109 + + + 100, 13 + + + 7 + + + Column to Unstack: + + + lblColumnToUnstack + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 145, 331 + + + 115, 21 + + + 18 + + + ucrInputTextPrefix + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 0 + + + True + + + 294, 235 + + + 4, 4, 4, 4 + + + 120, 23 + + + 26 + + + ucrChkCarryColumns + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + True + + + 154, 279 + + + 50, 20 + + + 22 + + + ucrNudValuesFill + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 2 + + + True + + + True + + + 96, 96 + + + True + + + 426, 474 + + + GrowAndShrink + + + 9, 381 + + + 4, 5, 4, 5 + + + 399, 24 + + + 14 + + + ucrNewDFName + + + instat.ucrSave, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 8 + + + True + + + 294, 262 + + + 0, 0, 0, 0 + + + 120, 104 + + + 12 + + + ucrReceiverCarryColumns + + + instat.ucrReceiverMultiple, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 9 + + + True + + + 294, 83 + + + 0, 0, 0, 0 + + + 120, 20 + + + 6 + + + ucrReceiverFactorToUnstackby + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 10 + + + True + + + 9, 59 + + + 0, 0, 0, 0 + + + 213, 183 + + + 4 + + + ucrSelectorForUnstack + + + instat.ucrSelectorByDataFrameAddRemove, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 12 + + + True + + + GrowAndShrink + + + 9, 412 + + + 405, 52 + + + 15 + + + ucrBase + + + instat.ucrButtons, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 13 + + + GrowAndShrink + + + 40, 5 + + + 337, 52 + + + 0 + + + ucrPnlUnstackCol + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 14 + + + True + + + 294, 128 + + + 0, 0, 0, 0 + + + 120, 100 + + + 11 + + + ucrMultipleColumnsReceiver + + + instat.ucrReceiverMultiple, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 16 + + + True + + + 9, 279 + + + 210, 23 + + + 24 + + + ucrChkValuesFill + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 17 + + + True + + + 9, 331 + + + 257, 23 + + + 20 + + + ucrChkAddPrefix + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 18 + + + NoControl + + + CenterScreen + + + Unstack (Pivot Wider) + + + dlgUnstack + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 294, 127 + + + 0, 0, 0, 0 + + + 120, 23 + + + 8 + + + ucrReceiverColumnToUnstack + + + instat.ucrReceiverSingle, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 3 + \ No newline at end of file diff --git a/instat/dlgUnstack.vb b/instat/dlgUnstack.vb index 0929e9b0c7f..da19bceda13 100644 --- a/instat/dlgUnstack.vb +++ b/instat/dlgUnstack.vb @@ -19,20 +19,21 @@ Imports instat.Translations Public Class dlgUnstack Public bFirstLoad As Boolean = True Private bReset As Boolean = True - Private clsFormula As New ROperator Private clsCarryColumnsOperator As New ROperator Private clsSelectFunction As New RFunction - Private clsUnstackedOperator, clsCommaOperator As New ROperator + 'clsDummyFunction controls the state of the UcrpnlUnstackCol + Private clsDummyFunction As New RFunction + Private clsDummyCarryFunction As New RFunction + Private clsHierachyFunction As New RFunction + Private clsSelectDataFunction As New RFunction + Private clsUnstackedOperator, clsCommaOperator, clsformulaOperator, clspipeOperator As New ROperator Private clsDcastFunction As New RFunction Private clsBaseRCode As New RCodeStructure - Private iReceiverMaxY As Integer - Private iReceiverLabelMaxY As Integer + Private iCarryClomunsY As Integer Private Sub dlgunstack_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then - iReceiverMaxY = ucrReceiverCarryColumns.Location.Y - iReceiverLabelMaxY = lblCarryColumns.Location.Y InitialiseDialog() bFirstLoad = False End If @@ -41,18 +42,21 @@ Public Class dlgUnstack End If SetRCodeforControls(bReset) bReset = False + TestOKEnabled() autoTranslate(Me) End Sub Private Sub InitialiseDialog() ucrBase.iHelpTopicID = 58 + iReceiverMaxY = ucrReceiverCarryColumns.Location.Y + iCarryClomunsY = ucrChkCarryColumns.Location.Y 'ucrSelector ucrSelectorForUnstack.SetParameter(New RParameter("data", 0)) ucrSelectorForUnstack.SetParameterIsrfunction() 'ucrFactor - ucrReceiverFactorToUnstackby.SetParameter(New RParameter("right", 1)) + ucrReceiverFactorToUnstackby.SetParameter(New RParameter("names_from", 1)) ucrReceiverFactorToUnstackby.SetParameterIsString() ucrReceiverFactorToUnstackby.bWithQuotes = False ucrReceiverFactorToUnstackby.Selector = ucrSelectorForUnstack @@ -60,26 +64,33 @@ Public Class dlgUnstack ucrReceiverFactorToUnstackby.strSelectorHeading = "Factors" 'ucrColumn - ucrReceiverColumnToUnstack.SetParameter(New RParameter("value.var", 4)) - ucrReceiverColumnToUnstack.SetParameterIsString() ucrReceiverColumnToUnstack.Selector = ucrSelectorForUnstack - ''ucrMultipleColumnsReceiver - 'ucrMultipleColumnsReceiver.SetParameter(New RParameter("value.var", 1)) - 'ucrMultipleColumnsReceiver.SetParameterIsString() - 'ucrMultipleColumnsReceiver.Selector = ucrSelectorForUnstack + 'ucrMultipleColumnsReceiver + ucrMultipleColumnsReceiver.Selector = ucrSelectorForUnstack + + ucrChkCarryColumns.SetText("Columns to Carry:") + ucrChkCarryColumns.SetParameter(New RParameter("checked", iNewPosition:=0)) + ucrChkCarryColumns.SetValuesCheckedAndUnchecked("TRUE", "FALSE") + ucrChkCarryColumns.AddToLinkedControls(ucrReceiverCarryColumns, {True}, bNewLinkedHideIfParameterMissing:=True) 'ucrCarryColumns - ucrReceiverCarryColumns.SetParameter(New RParameter("y", 1, bNewIncludeArgumentName:=False)) - ucrReceiverCarryColumns.SetParameterIsString() - ucrReceiverCarryColumns.bWithQuotes = False ucrReceiverCarryColumns.Selector = ucrSelectorForUnstack - 'chkbox - ucrChkDropMissingCombinations.SetParameter(New RParameter("drop", 3)) - ucrChkDropMissingCombinations.SetText("Drop Missing Combinations") - ucrChkDropMissingCombinations.SetValuesCheckedAndUnchecked("TRUE", "FALSE") - ucrChkDropMissingCombinations.SetRDefault("TRUE") + ucrChkValuesFill.SetText("Fill Missing Values:") + ucrChkValuesFill.AddParameterPresentCondition(True, "values_fill", True) + ucrChkValuesFill.AddParameterPresentCondition(False, "values_fill", False) + ucrChkValuesFill.AddToLinkedControls(ucrNudValuesFill, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, objNewDefaultState:=0, bNewLinkedChangeToDefaultState:=True) + + ucrNudValuesFill.SetMinMax(iNewMin:=0) + + 'ucrAddprefix + ucrChkAddPrefix.SetText("Add Prefix:") + ucrChkAddPrefix.AddParameterPresentCondition(True, "names_prefix", True) + ucrChkAddPrefix.AddParameterPresentCondition(False, "names_prefix", False) + ucrChkAddPrefix.AddToLinkedControls(ucrInputTextPrefix, {True}, bNewLinkedUpdateFunction:=True, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + + ucrInputTextPrefix.SetParameter(New RParameter("names_prefix", iNewPosition:=5)) 'ucrSave ucrNewDFName.SetSaveTypeAsDataFrame() @@ -87,16 +98,18 @@ Public Class dlgUnstack ucrNewDFName.SetLabelText("New Data Frame Name:") ucrNewDFName.SetIsTextBox() - ucrPnlUnstackCol.AddRadioButton(rdoSingle) + ucrPnlUnstackCol.AddRadioButton(rdoSingle) ucrPnlUnstackCol.AddRadioButton(rdoMultiple) ucrPnlUnstackCol.AddRadioButton(rdoRestoreHierarchy) - ucrPnlUnstackCol.AddFunctionNamesCondition(rdoSingle, "dcast") - ucrPnlUnstackCol.AddRCodeIsRFunctionCondition(rdoRestoreHierarchy, bNewIsPositive:=False) - 'TODO add function name condition for rdoMultiple + ucrPnlUnstackCol.AddParameterValuesCondition(rdoSingle, "checked", "single") + ucrPnlUnstackCol.AddParameterValuesCondition(rdoMultiple, "checked", "multiple") + ucrPnlUnstackCol.AddParameterValuesCondition(rdoRestoreHierarchy, "checked", "hierarchy") ucrPnlUnstackCol.AddToLinkedControls(ucrReceiverColumnToUnstack, {rdoSingle}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) ucrPnlUnstackCol.AddToLinkedControls(ucrMultipleColumnsReceiver, {rdoMultiple}, bNewLinkedHideIfParameterMissing:=True) + ucrPnlUnstackCol.AddToLinkedControls(ucrChkAddPrefix, {rdoSingle, rdoMultiple}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlUnstackCol.AddToLinkedControls(ucrChkValuesFill, {rdoMultiple, rdoSingle}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrReceiverColumnToUnstack.SetLinkedDisplayControl(lblColumnToUnstack) ucrMultipleColumnsReceiver.SetLinkedDisplayControl(lblMultipleColumns) End Sub @@ -104,55 +117,140 @@ Public Class dlgUnstack Private Sub SetDefaults() clsDcastFunction = New RFunction clsSelectFunction = New RFunction + clsHierachyFunction = New RFunction clsUnstackedOperator = New ROperator clsCommaOperator = New ROperator - clsFormula = New ROperator clsCarryColumnsOperator = New ROperator + clsformulaOperator = New ROperator + clsDummyFunction = New RFunction + clsDummyCarryFunction = New RFunction + + clsDummyCarryFunction.AddParameter("checked", "FALSE", iPosition:=0) + + clsDummyFunction.AddParameter("checked", "single", iPosition:=0) + ucrReceiverFactorToUnstackby.SetMeAsReceiver() ucrSelectorForUnstack.Reset() ucrNewDFName.Reset() - ucrReceiverFactorToUnstackby.SetMeAsReceiver() ' Operations - clsFormula.SetOperation("~") - clsFormula.bBrackets = False + clsformulaOperator.SetOperation("~") + clsformulaOperator.bBrackets = False + + clsSelectDataFunction.SetPackageName("dplyr") + clsSelectDataFunction.SetRCommand("select") + + clspipeOperator.SetOperation(" %>% ") + clspipeOperator.AddParameter("left", clsRFunctionParameter:=ucrSelectorForUnstack.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + clspipeOperator.AddParameter("right", clsRFunctionParameter:=clsSelectDataFunction, iPosition:=1) + clsCarryColumnsOperator.bBrackets = False clsCarryColumnsOperator.SetOperation("+") - clsDcastFunction.SetPackageName("reshape2") - clsDcastFunction.SetRCommand("dcast") - clsDcastFunction.AddParameter("formula", clsROperatorParameter:=clsFormula, iPosition:=1) + clsDcastFunction.SetPackageName("tidyr") + clsDcastFunction.SetRCommand("pivot_wider") + + clsHierachyFunction.SetPackageName("data.table") + clsHierachyFunction.SetRCommand("dcast") + clsHierachyFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorForUnstack.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + clsHierachyFunction.AddParameter("formula", clsROperatorParameter:=clsformulaOperator, iPosition:=1) clsSelectFunction.SetPackageName("dplyr") clsSelectFunction.SetRCommand("select") - clsSelectFunction.AddParameter("comma", clsROperatorParameter:=clsCommaOperator, bIncludeArgumentName:=False) + clsSelectFunction.AddParameter("comma", clsROperatorParameter:=clsCommaOperator, bIncludeArgumentName:=False, iPosition:=0) clsCommaOperator.SetOperation(",") clsUnstackedOperator.SetOperation("%>%") - clsUnstackedOperator.AddParameter("left", clsRFunctionParameter:=clsDcastFunction, iPosition:=0) + clsUnstackedOperator.AddParameter("left", clsRFunctionParameter:=clsHierachyFunction, iPosition:=0) clsUnstackedOperator.AddParameter("right", clsRFunctionParameter:=clsSelectFunction, iPosition:=1) + AddRemoveDataOrPipeOperator() + ValuesfillParameter() + clsBaseRCode = clsDcastFunction ucrBase.clsRsyntax.SetBaseRFunction(clsDcastFunction) End Sub Private Sub SetRCodeforControls(bReset As Boolean) - ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsCommaOperator, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsformulaOperator, New RParameter("right", 1, bNewIncludeArgumentName:=False), iAdditionalPairNo:=1) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsCommaOperator, New RParameter("x", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=2) + ucrReceiverFactorToUnstackby.AddAdditionalCodeParameterPair(clsSelectDataFunction, New RParameter("factor", 0, bNewIncludeArgumentName:=False), iAdditionalPairNo:=3) ucrNewDFName.AddAdditionalRCode(clsUnstackedOperator, iAdditionalPairNo:=1) - ucrSelectorForUnstack.SetRCode(clsDcastFunction, bReset) - ucrReceiverColumnToUnstack.SetRCode(clsDcastFunction, bReset) - ucrPnlUnstackCol.SetRCode(clsBaseRCode, bReset) + + ucrPnlUnstackCol.SetRCode(clsDummyFunction, bReset) + ucrReceiverFactorToUnstackby.SetRCode(clsDcastFunction, bReset) + ucrChkAddPrefix.SetRCode(clsDcastFunction, bReset) + ucrChkValuesFill.SetRCode(clsDcastFunction, bReset) + ucrChkCarryColumns.SetRCode(clsDummyCarryFunction, bReset) ucrNewDFName.SetRCode(clsBaseRCode, bReset) - ucrReceiverCarryColumns.SetRCode(clsCommaOperator, bReset) - ucrChkDropMissingCombinations.SetRCode(clsDcastFunction, bReset) - ucrReceiverFactorToUnstackby.SetRCode(clsFormula, bReset) End Sub - Private Sub TestOKEnabled() - If Not ucrReceiverFactorToUnstackby.IsEmpty() AndAlso ucrNewDFName.IsComplete Then - ucrBase.OKEnabled(True) + Private Sub ucrReceiverFactorToUnstackby_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverFactorToUnstackby.ControlValueChanged + SetFormula() + End Sub + + Private Sub ucrReceiverColumnToUnstack_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverColumnToUnstack.ControlValueChanged + ValuesfillParameter() + End Sub + + Private Sub ucrMultipleColumnsReceiver_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrMultipleColumnsReceiver.ControlValueChanged + ValuesfillParameter() + End Sub + + Private Sub ucrChkCarryColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkCarryColumns.ControlValueChanged + AddRemoveDataOrPipeOperator() + CarryColumnsParameter() + SetFormula() + End Sub + + Private Sub ValuesfillParameter() + Dim clsCommaMultiple As New ROperator + clsCommaMultiple.SetOperation(",") + Dim position As Integer + position = 0 + If rdoSingle.Checked Then + clsSelectDataFunction.RemoveParameterByName("Multiple_Values") + clsDcastFunction.AddParameter("values_from", ucrReceiverColumnToUnstack.GetVariableNames(False), iPosition:=2) + clsSelectDataFunction.AddParameter("single", ucrReceiverColumnToUnstack.GetVariableNames(False), iPosition:=1, bIncludeArgumentName:=False) + ElseIf rdoMultiple.Checked Then + clsSelectDataFunction.RemoveParameterByName("single") + For Each strMultiple In ucrMultipleColumnsReceiver.GetVariableNamesAsList() + clsCommaMultiple.AddParameter(strMultiple, strMultiple, iPosition:=position) + position = position + 1 + Next + clsSelectDataFunction.AddParameter("Multiple_Values", clsROperatorParameter:=clsCommaMultiple, iPosition:=4, bIncludeArgumentName:=False) + clsDcastFunction.AddParameter("values_from", ucrMultipleColumnsReceiver.GetVariableNames(False), iPosition:=2) + End If + TestOKEnabled() + End Sub + + Private Sub AddRemoveDataOrPipeOperator() + If Not ucrChkCarryColumns.Checked Then + clsDcastFunction.AddParameter("data", clsRFunctionParameter:=ucrSelectorForUnstack.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) Else - ucrBase.OKEnabled(False) + clsDcastFunction.AddParameter("data", clsROperatorParameter:=clspipeOperator, iPosition:=0) + End If + End Sub + + Private Sub TestOKEnabled() + If rdoSingle.Checked Then + If ucrReceiverFactorToUnstackby.IsEmpty OrElse ucrReceiverColumnToUnstack.IsEmpty OrElse Not ucrNewDFName.IsComplete OrElse (ucrReceiverCarryColumns.IsEmpty AndAlso ucrChkCarryColumns.Checked) OrElse (ucrInputTextPrefix.IsEmpty AndAlso ucrChkAddPrefix.Checked) Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + ElseIf rdoMultiple.Checked Then + If ucrReceiverFactorToUnstackby.IsEmpty OrElse ucrMultipleColumnsReceiver.IsEmpty OrElse Not ucrNewDFName.IsComplete OrElse (ucrReceiverCarryColumns.IsEmpty AndAlso ucrChkCarryColumns.Checked) OrElse (ucrInputTextPrefix.IsEmpty AndAlso ucrChkAddPrefix.Checked) Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If + ElseIf rdoRestoreHierarchy.Checked Then + If ucrReceiverFactorToUnstackby.IsEmpty OrElse Not ucrNewDFName.IsComplete OrElse (ucrReceiverCarryColumns.IsEmpty AndAlso ucrChkCarryColumns.Checked) Then + ucrBase.OKEnabled(False) + Else + ucrBase.OKEnabled(True) + End If End If End Sub @@ -168,60 +266,117 @@ Public Class dlgUnstack End If End Sub - Private Sub SetFormula() - Dim i As Integer = 0 + Private Sub ucrSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForUnstack.ControlValueChanged + NewDefaultName() + AddRemoveDataOrPipeOperator() + End Sub + Private Sub SetFormula() + Dim i As Integer = 1 + Dim strcoll As String = ucrReceiverFactorToUnstackby.GetVariableNames(False) If Not ucrReceiverFactorToUnstackby.IsEmpty Then clsCarryColumnsOperator.ClearParameters() - If rdoRestoreHierarchy.Checked Then - clsCarryColumnsOperator.AddParameter(i, ucrReceiverFactorToUnstackby.GetVariableNames(False), iPosition:=i) - i = i + 1 - End If - If rdoSingle.Checked AndAlso ucrReceiverCarryColumns.IsEmpty Then - clsFormula.AddParameter("left", ".", iPosition:=0) - Else + If ucrChkCarryColumns.Checked Then + clsCarryColumnsOperator.AddParameter("factor", ucrReceiverFactorToUnstackby.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) For Each strIndicatorVar As String In ucrReceiverCarryColumns.GetVariableNamesAsList clsCarryColumnsOperator.AddParameter(i, strIndicatorVar, iPosition:=i) i = i + 1 Next - clsFormula.AddParameter("left", clsROperatorParameter:=clsCarryColumnsOperator, iPosition:=0) + If ucrReceiverCarryColumns.GetVariableNamesAsList.Contains(strcoll) Then + clsCarryColumnsOperator.RemoveParameterByName("factor") + End If + clsformulaOperator.AddParameter("left", clsROperatorParameter:=clsCarryColumnsOperator, iPosition:=0) + Else + clsformulaOperator.RemoveParameterByName("left") + clsformulaOperator.AddParameter("left", ucrReceiverFactorToUnstackby.GetVariableNames(False), iPosition:=0, bIncludeArgumentName:=False) End If End If End Sub - Private Sub ucrSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrSelectorForUnstack.ControlValueChanged - NewDefaultName() - End Sub + Private Sub CarryColumnsParameter() + Dim clsTempCommaOperator As New ROperator + clsTempCommaOperator.SetOperation(",") + Dim iposition As Integer = 0 + + If ucrChkCarryColumns.Checked Then + ucrReceiverCarryColumns.SetMeAsReceiver() + For Each strcolumn In ucrReceiverCarryColumns.GetVariableNamesAsList + clsTempCommaOperator.AddParameter(strcolumn, strcolumn, iPosition:=iposition) + iposition = iposition + 1 + Next + + If rdoSingle.Checked Then + clsSelectDataFunction.AddParameter("comma", clsROperatorParameter:=clsTempCommaOperator, iPosition:=3, bIncludeArgumentName:=False) + ElseIf rdoMultiple.Checked Then + clsTempCommaOperator.ClearParameters() + For Each strcolumn In ucrReceiverCarryColumns.GetVariableNamesAsList + If Not ucrMultipleColumnsReceiver.GetVariableNamesAsList.Contains(strcolumn) Then + clsTempCommaOperator.AddParameter(strcolumn, strcolumn, iPosition:=iposition) + iposition = iposition + 1 + End If + Next + clsSelectDataFunction.AddParameter("comma", clsROperatorParameter:=clsTempCommaOperator, iPosition:=3, bIncludeArgumentName:=False) + + ElseIf rdoRestoreHierarchy.Checked Then + clsCommaOperator.AddParameter("comma", clsROperatorParameter:=clsTempCommaOperator, iPosition:=1) + End If + Else + ucrReceiverFactorToUnstackby.SetMeAsReceiver() + clsSelectDataFunction.RemoveParameterByName("comma") + clsCommaOperator.RemoveParameterByName("comma") + End If - Private Sub ucrReceiverCarryColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverCarryColumns.ControlValueChanged, ucrReceiverFactorToUnstackby.ControlValueChanged + End Sub + Private Sub ucrReceiverCarryColumns_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverCarryColumns.ControlValueChanged SetFormula() + CarryColumnsParameter() End Sub Private Sub ucrPnlUnstackCol_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlUnstackCol.ControlValueChanged - If rdoSingle.Checked Then + If rdoSingle.Checked OrElse rdoMultiple.Checked Then clsBaseRCode = clsDcastFunction ucrBase.clsRsyntax.SetBaseRFunction(clsDcastFunction) + If rdoSingle.Checked Then + clsDummyFunction.AddParameter("checked", "single", iPosition:=0) + ElseIf rdoMultiple.Checked Then + clsDummyFunction.AddParameter("checked", "multiple", iPosition:=0) + End If ElseIf rdoRestoreHierarchy.Checked Then clsBaseRCode = clsUnstackedOperator + clsDummyFunction.AddParameter("checked", "hierarchy", iPosition:=0) ucrBase.clsRsyntax.SetBaseROperator(clsUnstackedOperator) clsDcastFunction.RemoveAssignTo() End If ucrNewDFName.SetRCode(clsBaseRCode) CarryColumnsLabelReceiverLocation() SetFormula() + ValuesfillParameter() + CarryColumnsParameter() End Sub Private Sub CarryColumnsLabelReceiverLocation() If rdoRestoreHierarchy.Checked Then - lblCarryColumns.Location = New Point(lblCarryColumns.Location.X, iReceiverLabelMaxY / 1.4) - ucrReceiverCarryColumns.Location = New Point(ucrReceiverCarryColumns.Location.X, iReceiverMaxY / 1.35) + ucrReceiverCarryColumns.Location = New Point(ucrReceiverCarryColumns.Location.X, iReceiverMaxY / 1.8) + ucrChkCarryColumns.Location = New Point(ucrChkCarryColumns.Location.X, iCarryClomunsY / 2) + ElseIf rdoSingle.Checked Then + ucrReceiverCarryColumns.Location = New Point(ucrReceiverCarryColumns.Location.X, iReceiverMaxY / 1.45) + ucrChkCarryColumns.Location = New Point(ucrChkCarryColumns.Location.X, iCarryClomunsY / 1.5) Else - lblCarryColumns.Location = New Point(lblCarryColumns.Location.X, iReceiverLabelMaxY) ucrReceiverCarryColumns.Location = New Point(ucrReceiverCarryColumns.Location.X, iReceiverMaxY) + ucrChkCarryColumns.Location = New Point(ucrChkCarryColumns.Location.X, iCarryClomunsY) + End If + + End Sub + + Private Sub ucrChkValuesFill_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkValuesFill.ControlValueChanged, ucrNudValuesFill.ControlValueChanged + If ucrChkValuesFill.Checked Then + clsDcastFunction.AddParameter(New RParameter("values_fill", ucrNudValuesFill.GetText, iNewPosition:=7)) + Else + clsDcastFunction.RemoveParameterByName("values_fill") End If End Sub - Private Sub ucrCoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNewDFName.ControlContentsChanged, ucrReceiverFactorToUnstackby.ControlContentsChanged, ucrReceiverCarryColumns.ControlContentsChanged + Private Sub ucrCoreControls_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrNewDFName.ControlContentsChanged, ucrReceiverFactorToUnstackby.ControlContentsChanged, ucrReceiverCarryColumns.ControlContentsChanged, ucrNudValuesFill.ControlContentsChanged, ucrInputTextPrefix.ControlContentsChanged, ucrChkAddPrefix.ControlContentsChanged, ucrChkValuesFill.ControlContentsChanged, ucrMultipleColumnsReceiver.ControlContentsChanged, ucrReceiverColumnToUnstack.ControlContentsChanged, ucrChkCarryColumns.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 7e70ecd03f9..823cf675f30 100644 --- a/instat/frmMain.Designer.vb +++ b/instat/frmMain.Designer.vb @@ -3670,59 +3670,59 @@ Partial Class frmMain 'mnuPrepareColumnNumericRegularSequence ' Me.mnuPrepareColumnNumericRegularSequence.Name = "mnuPrepareColumnNumericRegularSequence" - Me.mnuPrepareColumnNumericRegularSequence.Size = New System.Drawing.Size(179, 22) + 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(179, 22) + 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(176, 6) + Me.ToolStripSeparator25.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRowSummaries ' Me.mnuPrepareColumnNumericRowSummaries.Name = "mnuPrepareColumnNumericRowSummaries" - Me.mnuPrepareColumnNumericRowSummaries.Size = New System.Drawing.Size(179, 22) + 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(179, 22) + 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(179, 22) + 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(176, 6) + Me.ToolStripSeparator56.Size = New System.Drawing.Size(200, 6) ' 'mnuPrepareColumnNumericRandomSamples ' Me.mnuPrepareColumnNumericRandomSamples.Name = "mnuPrepareColumnNumericRandomSamples" - Me.mnuPrepareColumnNumericRandomSamples.Size = New System.Drawing.Size(179, 22) + 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(179, 22) + Me.mnuPrepareColumnNumericPermuteRows.Size = New System.Drawing.Size(203, 22) Me.mnuPrepareColumnNumericPermuteRows.Tag = "Permute_Rows..." - Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute Columns..." + Me.mnuPrepareColumnNumericPermuteRows.Text = "Permute/Sample Rows..." ' 'mnuPrepareColumnFactor ' @@ -4008,8 +4008,8 @@ Partial Class frmMain ' Me.mnuPrepareColumnReshapeMerge.Name = "mnuPrepareColumnReshapeMerge" Me.mnuPrepareColumnReshapeMerge.Size = New System.Drawing.Size(197, 22) - Me.mnuPrepareColumnReshapeMerge.Tag = "Merge..." - Me.mnuPrepareColumnReshapeMerge.Text = "Merge..." + Me.mnuPrepareColumnReshapeMerge.Tag = "Merge (Join)..." + Me.mnuPrepareColumnReshapeMerge.Text = "Merge (Join)..." ' 'ToolStripSeparator11 ' diff --git a/instat/frmMain.vb b/instat/frmMain.vb index b9924b905b3..3e099b26ff8 100644 --- a/instat/frmMain.vb +++ b/instat/frmMain.vb @@ -83,9 +83,6 @@ Public Class frmMain Dim prdCustom As New clsCustomRenderer(New clsCustomColourTable) Dim bClose As Boolean = False - ' Note: this must change when R version changes - Dim strRPackagesPath As String = Path.Combine(My.Computer.FileSystem.SpecialDirectories.MyDocuments, "R\win-library\3.6") - mnuBar.Renderer = prdCustom Tool_strip.Renderer = prdCustom SetMainMenusEnabled(False) @@ -120,18 +117,6 @@ Public Class frmMain strStaticPath = String.Concat(Application.StartupPath, "\static") strAppDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "RInstat\") - ' We need to create the likely R package installation directory before R.NET connection is initialised - ' because of a bug in R.NET 1.8.2 where pop ups to create directories do not appear. - ' This assumes that R packages will be installed in "Documents" folder and also that - ' this is detected by "SpecialDirectories.MyDocuments". - ' If either of these fail then R packages will need to be installed from R/RStudio first. - Try - If Not Directory.Exists(strRPackagesPath) Then - System.IO.Directory.CreateDirectory(strRPackagesPath) - End If - Catch ex As Exception - ' This may fail for many reasons. We may want to inform users this may lead to packages not installing. - End Try bClose = AutoRecoverAndStartREngine() If bClose Then @@ -1593,14 +1578,13 @@ Public Class frmMain Private Sub mnuFileCloseData_Click(sender As Object, e As EventArgs) Handles mnuFileCloseData.Click If Not bDataSaved Then - If DialogResult.No = MsgBox("Are you sure you want to close you data?" & + If ucrDataViewer.GetWorkSheetCount() = 0 OrElse DialogResult.Yes = MsgBox("Are you sure you want to close your data?" & Environment.NewLine & "Any unsaved changes will be lost.", MessageBoxButtons.YesNo, "Close Data") Then - Exit Sub + clsRLink.CloseData() + strSaveFilePath = "" End If End If - clsRLink.CloseData() - strSaveFilePath = "" End Sub Private Sub mnuPrepareCheckDataDuplicates_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataDuplicates.Click diff --git a/instat/sdgAddNewDistribution.Designer.vb b/instat/sdgAddNewDistribution.Designer.vb index bc58a87c519..3250fec2697 100644 --- a/instat/sdgAddNewDistribution.Designer.vb +++ b/instat/sdgAddNewDistribution.Designer.vb @@ -201,7 +201,6 @@ Partial Class sdgAddNewDistribution ' 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(395, 375) Me.Controls.Add(Me.lblAddedDistribution) Me.Controls.Add(Me.lstAddedDistribution) diff --git a/instat/sdgClimaticDataEntry.Designer.vb b/instat/sdgClimaticDataEntry.Designer.vb index 066cbfc3531..d8f39facc4c 100644 --- a/instat/sdgClimaticDataEntry.Designer.vb +++ b/instat/sdgClimaticDataEntry.Designer.vb @@ -127,15 +127,15 @@ Partial Class sdgClimaticDataEntry ' Me.ucrChkAddFlagFieldData.AutoSize = True Me.ucrChkAddFlagFieldData.Checked = False - Me.ucrChkAddFlagFieldData.Location = New System.Drawing.Point(185, 10) + Me.ucrChkAddFlagFieldData.Location = New System.Drawing.Point(231, 9) Me.ucrChkAddFlagFieldData.Name = "ucrChkAddFlagFieldData" - Me.ucrChkAddFlagFieldData.Size = New System.Drawing.Size(146, 23) + Me.ucrChkAddFlagFieldData.Size = New System.Drawing.Size(130, 23) Me.ucrChkAddFlagFieldData.TabIndex = 91 ' 'cmdComment ' Me.cmdComment.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdComment.Location = New System.Drawing.Point(337, 7) + Me.cmdComment.Location = New System.Drawing.Point(364, 7) Me.cmdComment.Name = "cmdComment" Me.cmdComment.Size = New System.Drawing.Size(90, 24) Me.cmdComment.TabIndex = 90 @@ -146,7 +146,7 @@ Partial Class sdgClimaticDataEntry ' Me.cmdTransform.Enabled = False Me.cmdTransform.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdTransform.Location = New System.Drawing.Point(431, 7) + Me.cmdTransform.Location = New System.Drawing.Point(457, 7) Me.cmdTransform.Name = "cmdTransform" Me.cmdTransform.Size = New System.Drawing.Size(104, 24) Me.cmdTransform.TabIndex = 89 @@ -157,7 +157,7 @@ Partial Class sdgClimaticDataEntry 'cmdReset ' Me.cmdReset.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdReset.Location = New System.Drawing.Point(541, 7) + Me.cmdReset.Location = New System.Drawing.Point(564, 7) Me.cmdReset.Name = "cmdReset" Me.cmdReset.Size = New System.Drawing.Size(72, 24) Me.cmdReset.TabIndex = 88 @@ -168,7 +168,7 @@ Partial Class sdgClimaticDataEntry 'ucrSdgBaseButtons ' Me.ucrSdgBaseButtons.AutoSize = True - Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(13, 6) + Me.ucrSdgBaseButtons.Location = New System.Drawing.Point(5, 6) Me.ucrSdgBaseButtons.Margin = New System.Windows.Forms.Padding(4) Me.ucrSdgBaseButtons.Name = "ucrSdgBaseButtons" Me.ucrSdgBaseButtons.Size = New System.Drawing.Size(224, 30) diff --git a/instat/sdgConstructRegexExpression.Designer.vb b/instat/sdgConstructRegexExpression.Designer.vb index bed8a6518e8..129ec4bc504 100644 --- a/instat/sdgConstructRegexExpression.Designer.vb +++ b/instat/sdgConstructRegexExpression.Designer.vb @@ -22,33 +22,299 @@ Partial Class sdgConstructRegexExpression 'Do not modify it using the code editor. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Me.ucrBaseSubdialog = New instat.ucrButtonsSubdialogue() + Me.ucrReceiverForRegex = New instat.ucrReceiverExpression() + Me.lblExpression = New System.Windows.Forms.Label() + Me.grpSymbols = New System.Windows.Forms.GroupBox() + Me.cmdOr3 = New System.Windows.Forms.Button() + Me.cmdEscape = New System.Windows.Forms.Button() + Me.cmdPlusZero = New System.Windows.Forms.Button() + Me.cmdZero = New System.Windows.Forms.Button() + Me.cmdPlusOne = New System.Windows.Forms.Button() + Me.cmdZeroOrOne = New System.Windows.Forms.Button() + Me.cmdNumbers = New System.Windows.Forms.Button() + Me.cmdNot1 = New System.Windows.Forms.Button() + Me.cmdOr2 = New System.Windows.Forms.Button() + Me.cmdOr1 = New System.Windows.Forms.Button() + Me.cmdSpace = New System.Windows.Forms.Button() + Me.cmdDigit = New System.Windows.Forms.Button() + Me.cmdEnd1 = New System.Windows.Forms.Button() + Me.cmdbegin = New System.Windows.Forms.Button() + Me.cmdAny1 = New System.Windows.Forms.Button() + Me.ttAddKeyboard = New System.Windows.Forms.ToolTip(Me.components) + Me.grpSymbols.SuspendLayout() Me.SuspendLayout() ' 'ucrBaseSubdialog ' Me.ucrBaseSubdialog.AutoSize = True - Me.ucrBaseSubdialog.Location = New System.Drawing.Point(94, 266) + Me.ucrBaseSubdialog.Location = New System.Drawing.Point(55, 168) Me.ucrBaseSubdialog.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrBaseSubdialog.Name = "ucrBaseSubdialog" Me.ucrBaseSubdialog.Size = New System.Drawing.Size(224, 30) Me.ucrBaseSubdialog.TabIndex = 8 ' + 'ucrReceiverForRegex + ' + Me.ucrReceiverForRegex.AutoSize = True + Me.ucrReceiverForRegex.frmParent = Me + Me.ucrReceiverForRegex.Location = New System.Drawing.Point(69, 12) + Me.ucrReceiverForRegex.Margin = New System.Windows.Forms.Padding(2, 3, 2, 3) + Me.ucrReceiverForRegex.Name = "ucrReceiverForRegex" + Me.ucrReceiverForRegex.Selector = Nothing + Me.ucrReceiverForRegex.Size = New System.Drawing.Size(281, 29) + Me.ucrReceiverForRegex.strNcFilePath = "" + Me.ucrReceiverForRegex.TabIndex = 122 + Me.ucrReceiverForRegex.ucrSelector = Nothing + ' + 'lblExpression + ' + Me.lblExpression.AutoSize = True + Me.lblExpression.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.lblExpression.Location = New System.Drawing.Point(5, 16) + Me.lblExpression.Margin = New System.Windows.Forms.Padding(2, 0, 2, 0) + Me.lblExpression.Name = "lblExpression" + Me.lblExpression.Size = New System.Drawing.Size(61, 13) + Me.lblExpression.TabIndex = 121 + Me.lblExpression.Tag = "Expression" + Me.lblExpression.Text = "Expression:" + ' + 'grpSymbols + ' + Me.grpSymbols.Controls.Add(Me.cmdOr3) + Me.grpSymbols.Controls.Add(Me.cmdEscape) + Me.grpSymbols.Controls.Add(Me.cmdPlusZero) + Me.grpSymbols.Controls.Add(Me.cmdZero) + Me.grpSymbols.Controls.Add(Me.cmdPlusOne) + Me.grpSymbols.Controls.Add(Me.cmdZeroOrOne) + Me.grpSymbols.Controls.Add(Me.cmdNumbers) + Me.grpSymbols.Controls.Add(Me.cmdNot1) + Me.grpSymbols.Controls.Add(Me.cmdOr2) + Me.grpSymbols.Controls.Add(Me.cmdOr1) + Me.grpSymbols.Controls.Add(Me.cmdSpace) + Me.grpSymbols.Controls.Add(Me.cmdDigit) + Me.grpSymbols.Controls.Add(Me.cmdEnd1) + Me.grpSymbols.Controls.Add(Me.cmdbegin) + Me.grpSymbols.Controls.Add(Me.cmdAny1) + Me.grpSymbols.Location = New System.Drawing.Point(20, 46) + Me.grpSymbols.Margin = New System.Windows.Forms.Padding(2) + Me.grpSymbols.Name = "grpSymbols" + Me.grpSymbols.Padding = New System.Windows.Forms.Padding(2) + Me.grpSymbols.Size = New System.Drawing.Size(316, 112) + Me.grpSymbols.TabIndex = 194 + Me.grpSymbols.TabStop = False + Me.grpSymbols.Text = "Symbols" + ' + 'cmdOr3 + ' + Me.cmdOr3.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdOr3.Location = New System.Drawing.Point(127, 46) + Me.cmdOr3.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr3.Name = "cmdOr3" + Me.cmdOr3.Size = New System.Drawing.Size(63, 30) + Me.cmdOr3.TabIndex = 16 + Me.cmdOr3.Text = "| or" + Me.cmdOr3.UseVisualStyleBackColor = True + ' + 'cmdEscape + ' + Me.cmdEscape.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdEscape.Location = New System.Drawing.Point(189, 75) + Me.cmdEscape.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEscape.Name = "cmdEscape" + Me.cmdEscape.Size = New System.Drawing.Size(63, 30) + Me.cmdEscape.TabIndex = 14 + Me.cmdEscape.Text = "\\ escape" + Me.cmdEscape.UseVisualStyleBackColor = True + ' + 'cmdPlusZero + ' + Me.cmdPlusZero.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPlusZero.Location = New System.Drawing.Point(251, 75) + Me.cmdPlusZero.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPlusZero.Name = "cmdPlusZero" + Me.cmdPlusZero.Size = New System.Drawing.Size(63, 30) + Me.cmdPlusZero.TabIndex = 15 + Me.cmdPlusZero.Text = "- to" + Me.cmdPlusZero.UseVisualStyleBackColor = True + ' + 'cmdZero + ' + Me.cmdZero.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdZero.Location = New System.Drawing.Point(127, 75) + Me.cmdZero.Margin = New System.Windows.Forms.Padding(2) + Me.cmdZero.Name = "cmdZero" + Me.cmdZero.Size = New System.Drawing.Size(63, 30) + Me.cmdZero.TabIndex = 13 + Me.cmdZero.Text = "* 0+" + Me.cmdZero.UseVisualStyleBackColor = True + ' + 'cmdPlusOne + ' + Me.cmdPlusOne.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdPlusOne.Location = New System.Drawing.Point(64, 75) + Me.cmdPlusOne.Margin = New System.Windows.Forms.Padding(2) + Me.cmdPlusOne.Name = "cmdPlusOne" + Me.cmdPlusOne.Size = New System.Drawing.Size(63, 30) + Me.cmdPlusOne.TabIndex = 12 + Me.cmdPlusOne.Text = "+ 1+" + Me.cmdPlusOne.UseVisualStyleBackColor = True + ' + 'cmdZeroOrOne + ' + Me.cmdZeroOrOne.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdZeroOrOne.Location = New System.Drawing.Point(2, 75) + Me.cmdZeroOrOne.Margin = New System.Windows.Forms.Padding(2) + Me.cmdZeroOrOne.Name = "cmdZeroOrOne" + Me.cmdZeroOrOne.Size = New System.Drawing.Size(63, 30) + Me.cmdZeroOrOne.TabIndex = 11 + Me.cmdZeroOrOne.Text = "? 0 or 1" + Me.cmdZeroOrOne.UseVisualStyleBackColor = True + ' + 'cmdNumbers + ' + Me.cmdNumbers.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdNumbers.Location = New System.Drawing.Point(251, 46) + Me.cmdNumbers.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNumbers.Name = "cmdNumbers" + Me.cmdNumbers.Size = New System.Drawing.Size(63, 30) + Me.cmdNumbers.TabIndex = 10 + Me.cmdNumbers.Text = "{ m,n } " + Me.cmdNumbers.UseVisualStyleBackColor = True + ' + 'cmdNot1 + ' + Me.cmdNot1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdNot1.Location = New System.Drawing.Point(64, 46) + Me.cmdNot1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdNot1.Name = "cmdNot1" + Me.cmdNot1.Size = New System.Drawing.Size(63, 30) + Me.cmdNot1.TabIndex = 8 + Me.cmdNot1.Text = "[^ ] not" + Me.cmdNot1.UseVisualStyleBackColor = True + ' + 'cmdOr2 + ' + Me.cmdOr2.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdOr2.Location = New System.Drawing.Point(189, 46) + Me.cmdOr2.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr2.Name = "cmdOr2" + Me.cmdOr2.Size = New System.Drawing.Size(63, 30) + Me.cmdOr2.TabIndex = 9 + Me.cmdOr2.Text = "{ n} " + Me.cmdOr2.UseVisualStyleBackColor = True + ' + 'cmdOr1 + ' + Me.cmdOr1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdOr1.Location = New System.Drawing.Point(2, 46) + Me.cmdOr1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdOr1.Name = "cmdOr1" + Me.cmdOr1.Size = New System.Drawing.Size(63, 30) + Me.cmdOr1.TabIndex = 7 + Me.cmdOr1.Text = "[ ] or" + Me.cmdOr1.UseVisualStyleBackColor = True + ' + 'cmdSpace + ' + Me.cmdSpace.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdSpace.Location = New System.Drawing.Point(251, 16) + Me.cmdSpace.Margin = New System.Windows.Forms.Padding(2) + Me.cmdSpace.Name = "cmdSpace" + Me.cmdSpace.Size = New System.Drawing.Size(63, 30) + Me.cmdSpace.TabIndex = 6 + Me.cmdSpace.Text = "\\s space" + Me.cmdSpace.UseVisualStyleBackColor = True + ' + 'cmdDigit + ' + Me.cmdDigit.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdDigit.Location = New System.Drawing.Point(189, 16) + Me.cmdDigit.Margin = New System.Windows.Forms.Padding(2) + Me.cmdDigit.Name = "cmdDigit" + Me.cmdDigit.Size = New System.Drawing.Size(63, 30) + Me.cmdDigit.TabIndex = 5 + Me.cmdDigit.Text = "\\d digit" + Me.cmdDigit.UseVisualStyleBackColor = True + ' + 'cmdEnd1 + ' + Me.cmdEnd1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdEnd1.Location = New System.Drawing.Point(127, 16) + Me.cmdEnd1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdEnd1.Name = "cmdEnd1" + Me.cmdEnd1.Size = New System.Drawing.Size(63, 30) + Me.cmdEnd1.TabIndex = 4 + Me.cmdEnd1.Text = "$ end" + Me.cmdEnd1.UseVisualStyleBackColor = True + ' + 'cmdbegin + ' + Me.cmdbegin.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdbegin.Location = New System.Drawing.Point(64, 16) + Me.cmdbegin.Margin = New System.Windows.Forms.Padding(2) + Me.cmdbegin.Name = "cmdbegin" + Me.cmdbegin.Size = New System.Drawing.Size(63, 30) + Me.cmdbegin.TabIndex = 3 + Me.cmdbegin.Text = "^ begin" + Me.cmdbegin.UseVisualStyleBackColor = True + ' + 'cmdAny1 + ' + Me.cmdAny1.ImeMode = System.Windows.Forms.ImeMode.NoControl + Me.cmdAny1.Location = New System.Drawing.Point(2, 16) + Me.cmdAny1.Margin = New System.Windows.Forms.Padding(2) + Me.cmdAny1.Name = "cmdAny1" + Me.cmdAny1.Size = New System.Drawing.Size(63, 30) + Me.cmdAny1.TabIndex = 2 + Me.cmdAny1.Text = ". any" + Me.cmdAny1.UseVisualStyleBackColor = True + ' + 'ttAddKeyboard + ' + Me.ttAddKeyboard.AutoPopDelay = 10000 + Me.ttAddKeyboard.InitialDelay = 500 + Me.ttAddKeyboard.ReshowDelay = 100 + ' 'sdgConstructRegexExpression ' 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(361, 301) + Me.ClientSize = New System.Drawing.Size(361, 215) + Me.Controls.Add(Me.grpSymbols) + Me.Controls.Add(Me.ucrReceiverForRegex) + Me.Controls.Add(Me.lblExpression) Me.Controls.Add(Me.ucrBaseSubdialog) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.Name = "sdgConstructRegexExpression" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Construct regex expression" + Me.grpSymbols.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents ucrBaseSubdialog As ucrButtonsSubdialogue + Friend WithEvents ucrReceiverForRegex As ucrReceiverExpression + Friend WithEvents lblExpression As Label + Friend WithEvents grpSymbols As GroupBox + Friend WithEvents cmdOr3 As Button + Friend WithEvents cmdEscape As Button + Friend WithEvents cmdPlusZero As Button + Friend WithEvents cmdZero As Button + Friend WithEvents cmdPlusOne As Button + Friend WithEvents cmdZeroOrOne As Button + Friend WithEvents cmdNumbers As Button + Friend WithEvents cmdNot1 As Button + Friend WithEvents cmdOr2 As Button + Friend WithEvents cmdOr1 As Button + Friend WithEvents cmdSpace As Button + Friend WithEvents cmdDigit As Button + Friend WithEvents cmdEnd1 As Button + Friend WithEvents cmdbegin As Button + Friend WithEvents cmdAny1 As Button + Friend WithEvents ttAddKeyboard As ToolTip End Class diff --git a/instat/sdgConstructRegexExpression.resx b/instat/sdgConstructRegexExpression.resx index 1af7de150c9..23ee4aff696 100644 --- a/instat/sdgConstructRegexExpression.resx +++ b/instat/sdgConstructRegexExpression.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/sdgConstructRegexExpression.vb b/instat/sdgConstructRegexExpression.vb index 3dc5991104b..7edefc89d35 100644 --- a/instat/sdgConstructRegexExpression.vb +++ b/instat/sdgConstructRegexExpression.vb @@ -1,3 +1,104 @@ -Public Class sdgConstructRegexExpression +' 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 . +Public Class sdgConstructRegexExpression + + Private Sub sdgConstructRegexExpression_Load(sender As Object, e As EventArgs) Handles MyBase.Load + ttAddKeyboard.SetToolTip(cmdAny1, "Matches any character. For example,str_count(c(""rss"",""r.s.t""),""."") gives 3 5. Using \\. Gives 0 2") + ttAddKeyboard.SetToolTip(cmdbegin, "Start of the string. For example, str_count(c(""rss"",""r.s.t""),""^r\\."") gives 0 1") + ttAddKeyboard.SetToolTip(cmdEnd1, "End of the string. For example, str_count(c(""rss"",""r.s.t""),""s$"") gives 1 0") + ttAddKeyboard.SetToolTip(cmdDigit, "Digit (0 to 9), For example, str_replace_all(c(""rs5"",""r19s20t""),""[^\\d]"","") gives 5 1920") + ttAddKeyboard.SetToolTip(cmdSpace, "space. For example. str_remove_all(c(""r ss"",""r s t""),""\\s"") gives ""rss"" ""rst""") + ttAddKeyboard.SetToolTip(cmdOr1, "or. For example, str_count(c(""rss"", ""rsstt""),""[st]"") gives 2 4") + ttAddKeyboard.SetToolTip(cmdNot1, "not any. For example, str_remove_all(c(""rs5"",""r19s20t""),""[^\\d]"") gives 5 1920") + ttAddKeyboard.SetToolTip(cmdOr3, "or. For example, str_count(c(""-abc"",""67""),""-|\\d"") gives 1 2") + ttAddKeyboard.SetToolTip(cmdOr2, "n times. For example, str_count(c(""bt"",""bat"",""boot"",""boat""),""b[ao]{1}t"") gives 0 1 0 0") + ttAddKeyboard.SetToolTip(cmdNumbers, "between. For example, str_count(c(""bt"",""bat"",""boot"",""boat""),""b[ao]{0,2}t"") gives 1 1 1 1") + ttAddKeyboard.SetToolTip(cmdZeroOrOne, "0 or 1 times. For example, str_count(c(""bt"",""bat"",""boot"",""boat""),""b[ao]?t"") gives 1 1 0 0") + ttAddKeyboard.SetToolTip(cmdPlusOne, "1 or more times. For example, str_count(c(""bt"",""bat"",""boot"",""boat""),""b[ao]+t"") gives 0 1 1 1") + ttAddKeyboard.SetToolTip(cmdZero, "0 or more times. For example, str_count(c(""bt"",""bat"",""boot"",""boat""),""b[ao]*t"") gives 1 1 1 1") + ttAddKeyboard.SetToolTip(cmdEscape, "Escape (with +*.? etc). For example, str_detect(c(""b$t"",""bat?"",""3*4""),""[\\?\\$\\*]"") gives TRUE TRUE TRUE") + ttAddKeyboard.SetToolTip(cmdPlusZero, "range of values. For example, str_count(c(""b$t"",""Bat?""),""[a-zA-Z]"") gives 2 3") + End Sub + + Public Sub Reset() + ucrReceiverForRegex.Clear() + End Sub + + Private Sub cmdAny1_Click(sender As Object, e As EventArgs) Handles cmdAny1.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition(".", 1) + End Sub + + Private Sub cmdbegin_Click(sender As Object, e As EventArgs) Handles cmdbegin.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("^", 1) + End Sub + + Private Sub cmdEnd1_Click(sender As Object, e As EventArgs) Handles cmdEnd1.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("$") + End Sub + + Private Sub cmdDigit_Click(sender As Object, e As EventArgs) Handles cmdDigit.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("\\d") + End Sub + + Private Sub cmdSpace_Click(sender As Object, e As EventArgs) Handles cmdSpace.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("\\s") + End Sub + + Private Sub cmdOr1_Click(sender As Object, e As EventArgs) Handles cmdOr1.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("[]", 1) + End Sub + + Private Sub cmdNot1_Click(sender As Object, e As EventArgs) Handles cmdNot1.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("[^ ]", 3) + End Sub + + Private Sub cmdOr3_Click(sender As Object, e As EventArgs) Handles cmdOr3.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("|", 1) + End Sub + + Private Sub cmdOr2_Click(sender As Object, e As EventArgs) Handles cmdOr2.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("{}", 1) + End Sub + + Private Sub cmdNumbers_Click(sender As Object, e As EventArgs) Handles cmdNumbers.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("{,}", 2) + End Sub + + Private Sub cmdZeroOrOne_Click(sender As Object, e As EventArgs) Handles cmdZeroOrOne.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("?") + End Sub + + Private Sub cmdPlusOne_Click(sender As Object, e As EventArgs) Handles cmdPlusOne.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("+") + End Sub + + Private Sub cmdZero_Click(sender As Object, e As EventArgs) Handles cmdZero.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("+") + End Sub + + Private Sub cmdEscape_Click(sender As Object, e As EventArgs) Handles cmdEscape.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("\\") + End Sub + + Private Sub cmdPlusZero_Click(sender As Object, e As EventArgs) Handles cmdPlusZero.Click + ucrReceiverForRegex.AddToReceiverAtCursorPosition("-") + End Sub + + Private Sub ucrBaseSubdialog_ClickReturn(sender As Object, e As EventArgs) Handles ucrBaseSubdialog.ClickReturn + ucrReceiverForRegex.AddtoCombobox(ucrReceiverForRegex.GetText) + End Sub End Class \ No newline at end of file diff --git a/instat/sdgInventoryPlot.Designer.vb b/instat/sdgInventoryPlot.Designer.vb index dba7523f18e..5262624ffd3 100644 --- a/instat/sdgInventoryPlot.Designer.vb +++ b/instat/sdgInventoryPlot.Designer.vb @@ -25,6 +25,10 @@ Partial Class sdgInventoryPlot Me.components = New System.ComponentModel.Container() Me.tbInventory = New System.Windows.Forms.TabControl() Me.tpFacets = New System.Windows.Forms.TabPage() + Me.ucrNudFacetXAngle = New instat.ucrNud() + Me.ucrChkFacetXAngle = New instat.ucrCheck() + Me.ucrNudFacetYAngle = New instat.ucrNud() + Me.ucrChkFacetYAngle = New instat.ucrCheck() Me.ucrNudNumberofRows = New instat.ucrNud() Me.ucrChkNoOfRowsOrColumns = New instat.ucrCheck() Me.rdoHorizontal = New System.Windows.Forms.RadioButton() @@ -124,6 +128,10 @@ Partial Class sdgInventoryPlot ' 'tpFacets ' + Me.tpFacets.Controls.Add(Me.ucrNudFacetXAngle) + Me.tpFacets.Controls.Add(Me.ucrChkFacetXAngle) + Me.tpFacets.Controls.Add(Me.ucrNudFacetYAngle) + Me.tpFacets.Controls.Add(Me.ucrChkFacetYAngle) Me.tpFacets.Controls.Add(Me.ucrNudNumberofRows) Me.tpFacets.Controls.Add(Me.ucrChkNoOfRowsOrColumns) Me.tpFacets.Controls.Add(Me.rdoHorizontal) @@ -143,6 +151,50 @@ Partial Class sdgInventoryPlot Me.tpFacets.Text = "Facets" Me.tpFacets.UseVisualStyleBackColor = True ' + 'ucrNudFacetXAngle + ' + Me.ucrNudFacetXAngle.AutoSize = True + Me.ucrNudFacetXAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFacetXAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudFacetXAngle.Location = New System.Drawing.Point(392, 18) + Me.ucrNudFacetXAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudFacetXAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFacetXAngle.Name = "ucrNudFacetXAngle" + Me.ucrNudFacetXAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFacetXAngle.TabIndex = 64 + Me.ucrNudFacetXAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkFacetXAngle + ' + Me.ucrChkFacetXAngle.AutoSize = True + Me.ucrChkFacetXAngle.Checked = False + Me.ucrChkFacetXAngle.Location = New System.Drawing.Point(245, 18) + Me.ucrChkFacetXAngle.Name = "ucrChkFacetXAngle" + Me.ucrChkFacetXAngle.Size = New System.Drawing.Size(128, 23) + Me.ucrChkFacetXAngle.TabIndex = 63 + ' + 'ucrNudFacetYAngle + ' + Me.ucrNudFacetYAngle.AutoSize = True + Me.ucrNudFacetYAngle.DecimalPlaces = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFacetYAngle.Increment = New Decimal(New Integer() {1, 0, 0, 0}) + Me.ucrNudFacetYAngle.Location = New System.Drawing.Point(392, 44) + Me.ucrNudFacetYAngle.Maximum = New Decimal(New Integer() {100, 0, 0, 0}) + Me.ucrNudFacetYAngle.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) + Me.ucrNudFacetYAngle.Name = "ucrNudFacetYAngle" + Me.ucrNudFacetYAngle.Size = New System.Drawing.Size(50, 20) + Me.ucrNudFacetYAngle.TabIndex = 62 + Me.ucrNudFacetYAngle.Value = New Decimal(New Integer() {0, 0, 0, 0}) + ' + 'ucrChkFacetYAngle + ' + Me.ucrChkFacetYAngle.AutoSize = True + Me.ucrChkFacetYAngle.Checked = False + Me.ucrChkFacetYAngle.Location = New System.Drawing.Point(246, 44) + Me.ucrChkFacetYAngle.Name = "ucrChkFacetYAngle" + Me.ucrChkFacetYAngle.Size = New System.Drawing.Size(128, 23) + Me.ucrChkFacetYAngle.TabIndex = 61 + ' 'ucrNudNumberofRows ' Me.ucrNudNumberofRows.AutoSize = True @@ -1084,4 +1136,8 @@ Partial Class sdgInventoryPlot Friend WithEvents lblYAxisSize As Label Friend WithEvents ucrChkSpecifyXAxisTickMarks As ucrCheck Friend WithEvents grpYAxis As GroupBox + Friend WithEvents ucrNudFacetYAngle As ucrNud + Friend WithEvents ucrChkFacetYAngle As ucrCheck + Friend WithEvents ucrNudFacetXAngle As ucrNud + Friend WithEvents ucrChkFacetXAngle As ucrCheck End Class diff --git a/instat/sdgInventoryPlot.vb b/instat/sdgInventoryPlot.vb index 1f1b4172f1a..053979464b9 100644 --- a/instat/sdgInventoryPlot.vb +++ b/instat/sdgInventoryPlot.vb @@ -24,23 +24,32 @@ Public Class sdgInventoryPlot Private Sub sdgInventoryPlot_Load(sender As Object, e As EventArgs) Handles MyBase.Load autoTranslate(Me) End Sub + Public Sub InitialiseControls() Dim dctLegendPosition As New Dictionary(Of String, String) Dim dctScale As New Dictionary(Of String, String) Dim dctLabelForDays As New Dictionary(Of String, String) Dim dctDateTimePeriods As New Dictionary(Of String, String) - 'facets tab - ucrChkFacetXSize.SetText("Size X-Axis") + ucrChkFacetXSize.SetText("Size X-Axis Label") ucrChkFacetXSize.SetParameter(New RParameter("facet_xsize"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrNudFacetXSize.SetParameter(New RParameter("facet_xsize")) - ucrChkFacetXSize.AddToLinkedControls(ucrNudFacetXSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=7) + ucrChkFacetXSize.AddToLinkedControls(ucrNudFacetXSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=9) - ucrChkFacetYSize.SetText("Size Y-Axis") + ucrChkFacetYSize.SetText("Size Y-Axis Label") ucrChkFacetYSize.SetParameter(New RParameter("facet_ysize"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) ucrNudFacetYSize.SetParameter(New RParameter("facet_ysize")) - ucrChkFacetYSize.AddToLinkedControls(ucrNudFacetYSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=11) + ucrChkFacetYSize.AddToLinkedControls(ucrNudFacetYSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=9) + + ucrChkFacetXAngle.SetText("Angle X-Axis Label") + ucrChkFacetXAngle.SetParameter(New RParameter("facet_xangle"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrNudFacetXAngle.SetParameter(New RParameter("facet_xangle")) + ucrChkFacetXAngle.AddToLinkedControls(ucrNudFacetXAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=90) + ucrChkFacetYAngle.SetText("Angle Y-Axis Label") + ucrChkFacetYAngle.SetParameter(New RParameter("facet_yangle"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) + ucrNudFacetYAngle.SetParameter(New RParameter("facet_yangle")) + ucrChkFacetYAngle.AddToLinkedControls(ucrNudFacetYAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=90) ucrChkScales.SetText("Scales") ucrChkScales.SetParameter(New RParameter("scale"), bNewChangeParameterValue:=False, bNewAddRemoveParameter:=True) @@ -53,8 +62,6 @@ Public Class sdgInventoryPlot dctScale.Add("Fixed", Chr(34) & "fixed" & Chr(34)) ucrInputScale.SetItems(dctScale) ucrInputScale.SetDropDownStyleAsNonEditable() - ' ucrChkScales.AddParameterPresentCondition(True, "scale") - ' ucrChkScales.AddParameterPresentCondition(False, "scale", False) ucrNudNumberofRows.SetParameter(New RParameter("nrow")) ucrNudNumberofRows.SetMinMax(1, Integer.MaxValue) @@ -132,15 +139,9 @@ Public Class sdgInventoryPlot ucrChkXAxisAngle.AddToLinkedControls(ucrNudXAxisAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=90) ucrChkXAxisLabelSize.AddToLinkedControls(ucrNudXAxisLabelSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=12) - ucrInputXInStepsOf.SetParameter(New RParameter("byXaxis")) ucrInputXInStepsOf.SetValidationTypeAsNumeric() - ucrInputXInStepsOf.AddQuotesIfUnrecognised = False - ucrInputXFrom.SetParameter(New RParameter("fromXAxis")) ucrInputXFrom.SetValidationTypeAsNumeric() - ucrInputXFrom.AddQuotesIfUnrecognised = False - ucrInputXTo.SetParameter(New RParameter("toXAxis")) ucrInputXTo.SetValidationTypeAsNumeric() - ucrInputXTo.AddQuotesIfUnrecognised = False ucrChkSpecifyXAxisTickMarks.SetText("Specify Breaks") ucrChkSpecifyXAxisTickMarks.SetRDefault("TRUE") @@ -153,7 +154,6 @@ Public Class sdgInventoryPlot ucrInputXTo.SetLinkedDisplayControl(lblXTo) ucrInputXInStepsOf.SetLinkedDisplayControl(lblXInStepsOf) - dctLabelForDays.Add("Day Number (1-366)", Chr(34) & "%j" & Chr(34)) dctLabelForDays.Add("Day Month (1 Jan)", Chr(34) & "%d %b" & Chr(34)) dctLabelForDays.Add("Day Month Full (1 January)", Chr(34) & "%d %B" & Chr(34)) @@ -211,6 +211,7 @@ Public Class sdgInventoryPlot bControlsInitialised = True End Sub + Public Sub SetRCode(clsInventoryNew As RFunction, Optional bReset As Boolean = False) clsInventory = clsInventoryNew bRCodeSet = False @@ -233,13 +234,14 @@ Public Class sdgInventoryPlot ucrNudYAxisTitleSize.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrInputXAxisTitle.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrChkSpecifyXAxisTickMarks.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) - ucrInputXFrom.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) - ucrInputXTo.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) - ucrInputXInStepsOf.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrChkSpecifyDateBreaks.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrNudDateBreakNumber.SetRCode(clsInventoryNew, bReset, bCloneIfNeeded:=True) ucrChkFacetXSize.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrChkFacetYSize.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) + ucrChkFacetXAngle.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) + ucrChkFacetYAngle.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) + ucrNudFacetXAngle.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) + ucrNudFacetYAngle.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrChkYAxisAngle.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrInputDateDisplayFormat.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) ucrInputDateBreakTime.SetRCode(clsInventory, bReset, bCloneIfNeeded:=True) @@ -292,12 +294,10 @@ Public Class sdgInventoryPlot Private Sub SetFacetParameters() If rdoHorizontal.Checked Then ucrChkNoOfRowsOrColumns.SetText("Fixed Number of Rows") - ' ucrChkNoOfRowsOrColumns.ChangeParameterName("nrow") ucrNudNumberofRows.ChangeParameterName("nrow") clsInventory.AddParameter("dir", Chr(34) & "h" & Chr(34)) ElseIf rdoVertical.Checked Then ucrChkNoOfRowsOrColumns.SetText("Fixed Number of Columns") - ' ucrChkNoOfRowsOrColumns.ChangeParameterName("ncol") ucrNudNumberofRows.ChangeParameterName("ncol") clsInventory.AddParameter("dir", Chr(34) & "v" & Chr(34)) Else @@ -309,6 +309,7 @@ Public Class sdgInventoryPlot clsInventory.RemoveParameter(ucrNudNumberofRows.GetParameter()) End If End Sub + Private Sub AddRemoveRowColumnNumber() If bRCodeSet Then If ucrChkNoOfRowsOrColumns.Checked Then @@ -326,6 +327,24 @@ Public Class sdgInventoryPlot Else clsInventory.RemoveParameterByName("scale_xdate") End If + + If Not ucrInputXFrom.IsEmpty Then + clsInventory.AddParameter("fromXAxis", ucrInputXFrom.GetText()) + Else + clsInventory.RemoveParameterByName("fromXAxis") + End If + + If Not ucrInputXTo.IsEmpty Then + clsInventory.AddParameter("toXAxis", ucrInputXTo.GetText()) + Else + clsInventory.RemoveParameterByName("toXAxis") + End If + + If Not ucrInputXInStepsOf.IsEmpty Then + clsInventory.AddParameter("byXaxis", ucrInputXInStepsOf.GetText()) + Else + clsInventory.RemoveParameterByName("byXaxis") + End If End If End Sub @@ -346,7 +365,7 @@ Public Class sdgInventoryPlot SetFacetParameters() End Sub - Private Sub ucrChkSpecifyXAxisTickMarks_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrInputXFrom.ControlValueChanged, ucrInputXTo.ControlValueChanged, ucrInputXInStepsOf.ControlValueChanged + Private Sub ucrChkSpecifyXAxisTickMarks_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrChkSpecifyXAxisTickMarks.ControlValueChanged, ucrInputXFrom.ControlValueChanged, ucrInputXTo.ControlValueChanged, ucrInputXInStepsOf.ControlValueChanged AddRemoveXAxisBreaks() End Sub End Class \ No newline at end of file diff --git a/instat/sdgTwoWayFrequencies.Designer.vb b/instat/sdgTwoWayFrequencies.Designer.vb index b4cfa152f53..b092c548c0c 100644 --- a/instat/sdgTwoWayFrequencies.Designer.vb +++ b/instat/sdgTwoWayFrequencies.Designer.vb @@ -38,33 +38,37 @@ Partial Class sdgTwoWayFrequencies 'Do not modify it using the code editor. Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(sdgTwoWayFrequencies)) Me.tbpTwoWayFrequencies = New System.Windows.Forms.TabControl() Me.tbpTable = New System.Windows.Forms.TabPage() Me.grpTableOptions = New System.Windows.Forms.GroupBox() Me.lblNumberOfDecimals = New System.Windows.Forms.Label() - Me.ucrNudDecimalPlaces = New instat.ucrNud() Me.lblGraphTitle = New System.Windows.Forms.Label() + Me.tbpGraph = New System.Windows.Forms.TabPage() + Me.grpGraphOptions = New System.Windows.Forms.GroupBox() + Me.lblTitle = New System.Windows.Forms.Label() + Me.lblHjust = New System.Windows.Forms.Label() + Me.lblVjust = New System.Windows.Forms.Label() + Me.grpGraphType = New System.Windows.Forms.GroupBox() + Me.rdoLineGraph = New System.Windows.Forms.RadioButton() + Me.rdoViolinPlot = New System.Windows.Forms.RadioButton() + Me.rdoBoxPlot = New System.Windows.Forms.RadioButton() + Me.rdoDot = New System.Windows.Forms.RadioButton() + Me.rdoBar = New System.Windows.Forms.RadioButton() + Me.ucrNudDecimalPlaces = New instat.ucrNud() Me.ucrInputTableTitle = New instat.ucrInputTextBox() Me.ucrChkTotalColumnName = New instat.ucrCheck() Me.ucrInputTotalsName = New instat.ucrInputTextBox() Me.ucrChkMissingValues = New instat.ucrCheck() Me.ucrChkBackgroundColour = New instat.ucrCheck() Me.ucrChkShowSummary = New instat.ucrCheck() - Me.tbpGraph = New System.Windows.Forms.TabPage() - Me.grpGraphOptions = New System.Windows.Forms.GroupBox() Me.ucrChkStack = New instat.ucrCheck() - Me.lblTitle = New System.Windows.Forms.Label() - Me.lblHjust = New System.Windows.Forms.Label() - Me.lblVjust = New System.Windows.Forms.Label() Me.ucrInputGraphTitle = New instat.ucrInputTextBox() Me.ucrInputHorizontalLabels = New instat.ucrInputComboBox() Me.ucrInputVerticalLabels = New instat.ucrInputComboBox() Me.ucrChkShowModelSummary = New instat.ucrCheck() Me.ucrChkShowPercentage = New instat.ucrCheck() Me.ucrChkShowCount = New instat.ucrCheck() - Me.grpGraphType = New System.Windows.Forms.GroupBox() - Me.rdoLine = New System.Windows.Forms.RadioButton() - Me.rdoBar = New System.Windows.Forms.RadioButton() Me.ucrPnlGraphType = New instat.UcrPanel() Me.ucrBaseSubDialogue = New instat.ucrButtonsSubdialogue() Me.tbpTwoWayFrequencies.SuspendLayout() @@ -79,21 +83,15 @@ Partial Class sdgTwoWayFrequencies ' Me.tbpTwoWayFrequencies.Controls.Add(Me.tbpTable) Me.tbpTwoWayFrequencies.Controls.Add(Me.tbpGraph) - Me.tbpTwoWayFrequencies.Location = New System.Drawing.Point(8, 8) + resources.ApplyResources(Me.tbpTwoWayFrequencies, "tbpTwoWayFrequencies") Me.tbpTwoWayFrequencies.Name = "tbpTwoWayFrequencies" Me.tbpTwoWayFrequencies.SelectedIndex = 0 - Me.tbpTwoWayFrequencies.Size = New System.Drawing.Size(321, 283) - Me.tbpTwoWayFrequencies.TabIndex = 0 ' 'tbpTable ' Me.tbpTable.Controls.Add(Me.grpTableOptions) - Me.tbpTable.Location = New System.Drawing.Point(4, 22) + resources.ApplyResources(Me.tbpTable, "tbpTable") Me.tbpTable.Name = "tbpTable" - Me.tbpTable.Padding = New System.Windows.Forms.Padding(3) - Me.tbpTable.Size = New System.Drawing.Size(313, 257) - Me.tbpTable.TabIndex = 0 - Me.tbpTable.Text = "Table" Me.tbpTable.UseVisualStyleBackColor = True ' 'grpTableOptions @@ -107,301 +105,230 @@ Partial Class sdgTwoWayFrequencies Me.grpTableOptions.Controls.Add(Me.ucrChkMissingValues) Me.grpTableOptions.Controls.Add(Me.ucrChkBackgroundColour) Me.grpTableOptions.Controls.Add(Me.ucrChkShowSummary) - Me.grpTableOptions.Location = New System.Drawing.Point(6, 6) + resources.ApplyResources(Me.grpTableOptions, "grpTableOptions") Me.grpTableOptions.Name = "grpTableOptions" - Me.grpTableOptions.Size = New System.Drawing.Size(304, 189) - Me.grpTableOptions.TabIndex = 0 Me.grpTableOptions.TabStop = False - Me.grpTableOptions.Text = "More Options" ' 'lblNumberOfDecimals ' - Me.lblNumberOfDecimals.AutoSize = True - Me.lblNumberOfDecimals.Location = New System.Drawing.Point(8, 101) + resources.ApplyResources(Me.lblNumberOfDecimals, "lblNumberOfDecimals") Me.lblNumberOfDecimals.Name = "lblNumberOfDecimals" - Me.lblNumberOfDecimals.Size = New System.Drawing.Size(161, 13) - Me.lblNumberOfDecimals.TabIndex = 3 - Me.lblNumberOfDecimals.Text = "Decimal Places for Percentages:" + ' + 'lblGraphTitle + ' + resources.ApplyResources(Me.lblGraphTitle, "lblGraphTitle") + Me.lblGraphTitle.Name = "lblGraphTitle" + ' + 'tbpGraph + ' + Me.tbpGraph.Controls.Add(Me.grpGraphOptions) + Me.tbpGraph.Controls.Add(Me.rdoViolinPlot) + Me.tbpGraph.Controls.Add(Me.grpGraphType) + resources.ApplyResources(Me.tbpGraph, "tbpGraph") + Me.tbpGraph.Name = "tbpGraph" + Me.tbpGraph.UseVisualStyleBackColor = True + ' + 'grpGraphOptions + ' + Me.grpGraphOptions.Controls.Add(Me.ucrChkStack) + Me.grpGraphOptions.Controls.Add(Me.lblTitle) + Me.grpGraphOptions.Controls.Add(Me.lblHjust) + Me.grpGraphOptions.Controls.Add(Me.lblVjust) + Me.grpGraphOptions.Controls.Add(Me.ucrInputGraphTitle) + Me.grpGraphOptions.Controls.Add(Me.ucrInputHorizontalLabels) + Me.grpGraphOptions.Controls.Add(Me.ucrInputVerticalLabels) + Me.grpGraphOptions.Controls.Add(Me.ucrChkShowModelSummary) + Me.grpGraphOptions.Controls.Add(Me.ucrChkShowPercentage) + Me.grpGraphOptions.Controls.Add(Me.ucrChkShowCount) + resources.ApplyResources(Me.grpGraphOptions, "grpGraphOptions") + Me.grpGraphOptions.Name = "grpGraphOptions" + Me.grpGraphOptions.TabStop = False + ' + 'lblTitle + ' + resources.ApplyResources(Me.lblTitle, "lblTitle") + Me.lblTitle.Name = "lblTitle" + ' + 'lblHjust + ' + resources.ApplyResources(Me.lblHjust, "lblHjust") + Me.lblHjust.Name = "lblHjust" + ' + 'lblVjust + ' + resources.ApplyResources(Me.lblVjust, "lblVjust") + Me.lblVjust.Name = "lblVjust" + ' + 'grpGraphType + ' + Me.grpGraphType.Controls.Add(Me.rdoLineGraph) + Me.grpGraphType.Controls.Add(Me.rdoBoxPlot) + Me.grpGraphType.Controls.Add(Me.rdoDot) + Me.grpGraphType.Controls.Add(Me.rdoBar) + Me.grpGraphType.Controls.Add(Me.ucrPnlGraphType) + resources.ApplyResources(Me.grpGraphType, "grpGraphType") + Me.grpGraphType.Name = "grpGraphType" + Me.grpGraphType.TabStop = False + ' + 'rdoLineGraph + ' + resources.ApplyResources(Me.rdoLineGraph, "rdoLineGraph") + Me.rdoLineGraph.Name = "rdoLineGraph" + Me.rdoLineGraph.TabStop = True + Me.rdoLineGraph.UseVisualStyleBackColor = True + ' + 'rdoViolinPlot + ' + resources.ApplyResources(Me.rdoViolinPlot, "rdoViolinPlot") + Me.rdoViolinPlot.Name = "rdoViolinPlot" + Me.rdoViolinPlot.TabStop = True + Me.rdoViolinPlot.UseVisualStyleBackColor = True + ' + 'rdoBoxPlot + ' + resources.ApplyResources(Me.rdoBoxPlot, "rdoBoxPlot") + Me.rdoBoxPlot.Name = "rdoBoxPlot" + Me.rdoBoxPlot.TabStop = True + Me.rdoBoxPlot.UseVisualStyleBackColor = True + ' + 'rdoDot + ' + resources.ApplyResources(Me.rdoDot, "rdoDot") + Me.rdoDot.Name = "rdoDot" + Me.rdoDot.TabStop = True + Me.rdoDot.UseVisualStyleBackColor = True + ' + 'rdoBar + ' + resources.ApplyResources(Me.rdoBar, "rdoBar") + Me.rdoBar.Name = "rdoBar" + Me.rdoBar.TabStop = True + Me.rdoBar.UseVisualStyleBackColor = True ' 'ucrNudDecimalPlaces ' - Me.ucrNudDecimalPlaces.AutoSize = True + resources.ApplyResources(Me.ucrNudDecimalPlaces, "ucrNudDecimalPlaces") 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(176, 100) 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 = 4 Me.ucrNudDecimalPlaces.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'lblGraphTitle - ' - Me.lblGraphTitle.AutoSize = True - Me.lblGraphTitle.Location = New System.Drawing.Point(8, 157) - Me.lblGraphTitle.Name = "lblGraphTitle" - Me.lblGraphTitle.Size = New System.Drawing.Size(60, 13) - Me.lblGraphTitle.TabIndex = 7 - Me.lblGraphTitle.Text = "Table Title:" - ' 'ucrInputTableTitle ' Me.ucrInputTableTitle.AddQuotesIfUnrecognised = True - Me.ucrInputTableTitle.AutoSize = True + resources.ApplyResources(Me.ucrInputTableTitle, "ucrInputTableTitle") Me.ucrInputTableTitle.IsMultiline = False Me.ucrInputTableTitle.IsReadOnly = False - Me.ucrInputTableTitle.Location = New System.Drawing.Point(120, 153) Me.ucrInputTableTitle.Name = "ucrInputTableTitle" - Me.ucrInputTableTitle.Size = New System.Drawing.Size(178, 21) - Me.ucrInputTableTitle.TabIndex = 8 ' 'ucrChkTotalColumnName ' - Me.ucrChkTotalColumnName.AutoSize = True + resources.ApplyResources(Me.ucrChkTotalColumnName, "ucrChkTotalColumnName") Me.ucrChkTotalColumnName.Checked = False - Me.ucrChkTotalColumnName.Location = New System.Drawing.Point(10, 126) Me.ucrChkTotalColumnName.Name = "ucrChkTotalColumnName" - Me.ucrChkTotalColumnName.Size = New System.Drawing.Size(160, 23) - Me.ucrChkTotalColumnName.TabIndex = 5 ' 'ucrInputTotalsName ' Me.ucrInputTotalsName.AddQuotesIfUnrecognised = True - Me.ucrInputTotalsName.AutoSize = True + resources.ApplyResources(Me.ucrInputTotalsName, "ucrInputTotalsName") Me.ucrInputTotalsName.IsMultiline = False Me.ucrInputTotalsName.IsReadOnly = False - Me.ucrInputTotalsName.Location = New System.Drawing.Point(176, 126) Me.ucrInputTotalsName.Name = "ucrInputTotalsName" - Me.ucrInputTotalsName.Size = New System.Drawing.Size(122, 21) - Me.ucrInputTotalsName.TabIndex = 6 ' 'ucrChkMissingValues ' - Me.ucrChkMissingValues.AutoSize = True + resources.ApplyResources(Me.ucrChkMissingValues, "ucrChkMissingValues") Me.ucrChkMissingValues.Checked = False - Me.ucrChkMissingValues.Location = New System.Drawing.Point(10, 45) Me.ucrChkMissingValues.Name = "ucrChkMissingValues" - Me.ucrChkMissingValues.Size = New System.Drawing.Size(233, 23) - Me.ucrChkMissingValues.TabIndex = 1 ' 'ucrChkBackgroundColour ' - Me.ucrChkBackgroundColour.AutoSize = True + resources.ApplyResources(Me.ucrChkBackgroundColour, "ucrChkBackgroundColour") Me.ucrChkBackgroundColour.Checked = False - Me.ucrChkBackgroundColour.Location = New System.Drawing.Point(10, 71) Me.ucrChkBackgroundColour.Name = "ucrChkBackgroundColour" - Me.ucrChkBackgroundColour.Size = New System.Drawing.Size(290, 23) - Me.ucrChkBackgroundColour.TabIndex = 2 ' 'ucrChkShowSummary ' - Me.ucrChkShowSummary.AutoSize = True + resources.ApplyResources(Me.ucrChkShowSummary, "ucrChkShowSummary") Me.ucrChkShowSummary.Checked = False - Me.ucrChkShowSummary.Location = New System.Drawing.Point(10, 19) Me.ucrChkShowSummary.Name = "ucrChkShowSummary" - Me.ucrChkShowSummary.Size = New System.Drawing.Size(233, 23) - Me.ucrChkShowSummary.TabIndex = 0 - ' - 'tbpGraph - ' - Me.tbpGraph.Controls.Add(Me.grpGraphOptions) - Me.tbpGraph.Controls.Add(Me.grpGraphType) - Me.tbpGraph.Location = New System.Drawing.Point(4, 22) - Me.tbpGraph.Name = "tbpGraph" - Me.tbpGraph.Padding = New System.Windows.Forms.Padding(3) - Me.tbpGraph.Size = New System.Drawing.Size(313, 257) - Me.tbpGraph.TabIndex = 1 - Me.tbpGraph.Text = "Graph" - Me.tbpGraph.UseVisualStyleBackColor = True - ' - 'grpGraphOptions - ' - Me.grpGraphOptions.Controls.Add(Me.ucrChkStack) - Me.grpGraphOptions.Controls.Add(Me.lblTitle) - Me.grpGraphOptions.Controls.Add(Me.lblHjust) - Me.grpGraphOptions.Controls.Add(Me.lblVjust) - Me.grpGraphOptions.Controls.Add(Me.ucrInputGraphTitle) - Me.grpGraphOptions.Controls.Add(Me.ucrInputHorizontalLabels) - Me.grpGraphOptions.Controls.Add(Me.ucrInputVerticalLabels) - Me.grpGraphOptions.Controls.Add(Me.ucrChkShowModelSummary) - Me.grpGraphOptions.Controls.Add(Me.ucrChkShowPercentage) - Me.grpGraphOptions.Controls.Add(Me.ucrChkShowCount) - Me.grpGraphOptions.Location = New System.Drawing.Point(6, 59) - Me.grpGraphOptions.Name = "grpGraphOptions" - Me.grpGraphOptions.Size = New System.Drawing.Size(300, 195) - Me.grpGraphOptions.TabIndex = 1 - Me.grpGraphOptions.TabStop = False - Me.grpGraphOptions.Text = "Graph Options" ' 'ucrChkStack ' - Me.ucrChkStack.AutoSize = True + resources.ApplyResources(Me.ucrChkStack, "ucrChkStack") Me.ucrChkStack.Checked = False - Me.ucrChkStack.Location = New System.Drawing.Point(10, 92) Me.ucrChkStack.Name = "ucrChkStack" - Me.ucrChkStack.Size = New System.Drawing.Size(281, 23) - Me.ucrChkStack.TabIndex = 3 - ' - 'lblTitle - ' - Me.lblTitle.AutoSize = True - Me.lblTitle.Location = New System.Drawing.Point(10, 169) - Me.lblTitle.Name = "lblTitle" - Me.lblTitle.Size = New System.Drawing.Size(62, 13) - Me.lblTitle.TabIndex = 9 - Me.lblTitle.Text = "Graph Title:" - ' - 'lblHjust - ' - Me.lblHjust.AutoSize = True - Me.lblHjust.Location = New System.Drawing.Point(10, 143) - Me.lblHjust.Name = "lblHjust" - Me.lblHjust.Size = New System.Drawing.Size(126, 13) - Me.lblHjust.TabIndex = 7 - Me.lblHjust.Text = "Horizontal Label Position:" - ' - 'lblVjust - ' - Me.lblVjust.AutoSize = True - Me.lblVjust.Location = New System.Drawing.Point(10, 117) - Me.lblVjust.Name = "lblVjust" - Me.lblVjust.Size = New System.Drawing.Size(114, 13) - Me.lblVjust.TabIndex = 4 - Me.lblVjust.Text = "Vertical Label Position:" ' 'ucrInputGraphTitle ' Me.ucrInputGraphTitle.AddQuotesIfUnrecognised = True - Me.ucrInputGraphTitle.AutoSize = True + resources.ApplyResources(Me.ucrInputGraphTitle, "ucrInputGraphTitle") Me.ucrInputGraphTitle.IsMultiline = False Me.ucrInputGraphTitle.IsReadOnly = False - Me.ucrInputGraphTitle.Location = New System.Drawing.Point(125, 168) Me.ucrInputGraphTitle.Name = "ucrInputGraphTitle" - Me.ucrInputGraphTitle.Size = New System.Drawing.Size(166, 21) - Me.ucrInputGraphTitle.TabIndex = 0 ' 'ucrInputHorizontalLabels ' Me.ucrInputHorizontalLabels.AddQuotesIfUnrecognised = True - Me.ucrInputHorizontalLabels.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + resources.ApplyResources(Me.ucrInputHorizontalLabels, "ucrInputHorizontalLabels") Me.ucrInputHorizontalLabels.GetSetSelectedIndex = -1 Me.ucrInputHorizontalLabels.IsReadOnly = False - Me.ucrInputHorizontalLabels.Location = New System.Drawing.Point(181, 143) - Me.ucrInputHorizontalLabels.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputHorizontalLabels.Name = "ucrInputHorizontalLabels" - Me.ucrInputHorizontalLabels.Size = New System.Drawing.Size(110, 21) - Me.ucrInputHorizontalLabels.TabIndex = 8 ' 'ucrInputVerticalLabels ' Me.ucrInputVerticalLabels.AddQuotesIfUnrecognised = True - Me.ucrInputVerticalLabels.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + resources.ApplyResources(Me.ucrInputVerticalLabels, "ucrInputVerticalLabels") Me.ucrInputVerticalLabels.GetSetSelectedIndex = -1 Me.ucrInputVerticalLabels.IsReadOnly = False - Me.ucrInputVerticalLabels.Location = New System.Drawing.Point(181, 117) - Me.ucrInputVerticalLabels.Margin = New System.Windows.Forms.Padding(21, 17, 21, 17) Me.ucrInputVerticalLabels.Name = "ucrInputVerticalLabels" - Me.ucrInputVerticalLabels.Size = New System.Drawing.Size(110, 21) - Me.ucrInputVerticalLabels.TabIndex = 6 ' 'ucrChkShowModelSummary ' - Me.ucrChkShowModelSummary.AutoSize = True + resources.ApplyResources(Me.ucrChkShowModelSummary, "ucrChkShowModelSummary") Me.ucrChkShowModelSummary.Checked = False - Me.ucrChkShowModelSummary.Location = New System.Drawing.Point(10, 68) Me.ucrChkShowModelSummary.Name = "ucrChkShowModelSummary" - Me.ucrChkShowModelSummary.Size = New System.Drawing.Size(281, 23) - Me.ucrChkShowModelSummary.TabIndex = 2 ' 'ucrChkShowPercentage ' - Me.ucrChkShowPercentage.AutoSize = True + resources.ApplyResources(Me.ucrChkShowPercentage, "ucrChkShowPercentage") Me.ucrChkShowPercentage.Checked = False - Me.ucrChkShowPercentage.Location = New System.Drawing.Point(10, 20) Me.ucrChkShowPercentage.Name = "ucrChkShowPercentage" - Me.ucrChkShowPercentage.Size = New System.Drawing.Size(281, 23) - Me.ucrChkShowPercentage.TabIndex = 0 ' 'ucrChkShowCount ' - Me.ucrChkShowCount.AutoSize = True + resources.ApplyResources(Me.ucrChkShowCount, "ucrChkShowCount") Me.ucrChkShowCount.Checked = False - Me.ucrChkShowCount.Location = New System.Drawing.Point(10, 44) Me.ucrChkShowCount.Name = "ucrChkShowCount" - Me.ucrChkShowCount.Size = New System.Drawing.Size(281, 23) - Me.ucrChkShowCount.TabIndex = 1 - ' - 'grpGraphType - ' - Me.grpGraphType.Controls.Add(Me.rdoLine) - Me.grpGraphType.Controls.Add(Me.rdoBar) - Me.grpGraphType.Controls.Add(Me.ucrPnlGraphType) - Me.grpGraphType.Location = New System.Drawing.Point(6, 6) - Me.grpGraphType.Name = "grpGraphType" - Me.grpGraphType.Size = New System.Drawing.Size(300, 48) - Me.grpGraphType.TabIndex = 0 - Me.grpGraphType.TabStop = False - Me.grpGraphType.Text = "Type of Graph" - ' - 'rdoLine - ' - Me.rdoLine.AutoSize = True - Me.rdoLine.Location = New System.Drawing.Point(167, 19) - Me.rdoLine.Name = "rdoLine" - Me.rdoLine.Size = New System.Drawing.Size(77, 17) - Me.rdoLine.TabIndex = 2 - Me.rdoLine.TabStop = True - Me.rdoLine.Text = "Line Graph" - Me.rdoLine.UseVisualStyleBackColor = True - ' - 'rdoBar - ' - Me.rdoBar.AutoSize = True - Me.rdoBar.Location = New System.Drawing.Point(12, 19) - Me.rdoBar.Name = "rdoBar" - Me.rdoBar.Size = New System.Drawing.Size(73, 17) - Me.rdoBar.TabIndex = 1 - Me.rdoBar.TabStop = True - Me.rdoBar.Text = "Bar Graph" - Me.rdoBar.UseVisualStyleBackColor = True ' 'ucrPnlGraphType ' - Me.ucrPnlGraphType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGraphType.Location = New System.Drawing.Point(6, 7) + resources.ApplyResources(Me.ucrPnlGraphType, "ucrPnlGraphType") Me.ucrPnlGraphType.Name = "ucrPnlGraphType" - Me.ucrPnlGraphType.Size = New System.Drawing.Size(288, 35) - Me.ucrPnlGraphType.TabIndex = 0 ' 'ucrBaseSubDialogue ' - Me.ucrBaseSubDialogue.AutoSize = True - Me.ucrBaseSubDialogue.Location = New System.Drawing.Point(89, 297) + resources.ApplyResources(Me.ucrBaseSubDialogue, "ucrBaseSubDialogue") Me.ucrBaseSubDialogue.Name = "ucrBaseSubDialogue" - Me.ucrBaseSubDialogue.RightToLeft = System.Windows.Forms.RightToLeft.No - Me.ucrBaseSubDialogue.Size = New System.Drawing.Size(224, 30) - Me.ucrBaseSubDialogue.TabIndex = 0 ' 'sdgTwoWayFrequencies ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) + resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.AutoSize = True - Me.ClientSize = New System.Drawing.Size(339, 328) Me.Controls.Add(Me.tbpTwoWayFrequencies) Me.Controls.Add(Me.ucrBaseSubDialogue) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False Me.MinimizeBox = False Me.Name = "sdgTwoWayFrequencies" - Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Text = "Frequency Table & Graph Options" Me.tbpTwoWayFrequencies.ResumeLayout(False) Me.tbpTable.ResumeLayout(False) Me.grpTableOptions.ResumeLayout(False) Me.grpTableOptions.PerformLayout() Me.tbpGraph.ResumeLayout(False) + Me.tbpGraph.PerformLayout() Me.grpGraphOptions.ResumeLayout(False) Me.grpGraphOptions.PerformLayout() Me.grpGraphType.ResumeLayout(False) @@ -431,7 +358,7 @@ Partial Class sdgTwoWayFrequencies Friend WithEvents ucrChkShowPercentage As ucrCheck Friend WithEvents ucrChkShowCount As ucrCheck Friend WithEvents grpGraphType As GroupBox - Friend WithEvents rdoLine As RadioButton + Friend WithEvents rdoDot As RadioButton Friend WithEvents rdoBar As RadioButton Friend WithEvents ucrPnlGraphType As UcrPanel Friend WithEvents ucrChkStack As ucrCheck @@ -439,4 +366,7 @@ Partial Class sdgTwoWayFrequencies Friend WithEvents ucrInputTableTitle As ucrInputTextBox Friend WithEvents lblNumberOfDecimals As Label Friend WithEvents ucrNudDecimalPlaces As ucrNud + Friend WithEvents rdoBoxPlot As RadioButton + Friend WithEvents rdoViolinPlot As RadioButton + Friend WithEvents rdoLineGraph As RadioButton End Class \ No newline at end of file diff --git a/instat/sdgTwoWayFrequencies.resx b/instat/sdgTwoWayFrequencies.resx index 29dcb1b3a35..733db1b7c2a 100644 --- a/instat/sdgTwoWayFrequencies.resx +++ b/instat/sdgTwoWayFrequencies.resx @@ -117,4 +117,874 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + + NoControl + + + + 8, 101 + + + 161, 13 + + + 3 + + + Decimal Places for Percentages: + + + lblNumberOfDecimals + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTableOptions + + + 0 + + + True + + + 176, 100 + + + 50, 20 + + + 4 + + + ucrNudDecimalPlaces + + + instat.ucrNud, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 1 + + + True + + + NoControl + + + 8, 157 + + + 60, 13 + + + 7 + + + Table Title: + + + lblGraphTitle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpTableOptions + + + 2 + + + True + + + 120, 153 + + + 178, 21 + + + 8 + + + ucrInputTableTitle + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 3 + + + True + + + 10, 126 + + + 160, 23 + + + 5 + + + ucrChkTotalColumnName + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 4 + + + True + + + 176, 126 + + + 122, 21 + + + 6 + + + ucrInputTotalsName + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 5 + + + True + + + 10, 45 + + + 233, 23 + + + 1 + + + ucrChkMissingValues + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 6 + + + True + + + 10, 71 + + + 290, 23 + + + 2 + + + ucrChkBackgroundColour + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 7 + + + True + + + 10, 19 + + + 233, 23 + + + 0 + + + ucrChkShowSummary + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpTableOptions + + + 8 + + + 6, 6 + + + 304, 189 + + + 0 + + + More Options + + + grpTableOptions + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbpTable + + + 0 + + + 4, 22 + + + 3, 3, 3, 3 + + + 404, 257 + + + 0 + + + Table + + + tbpTable + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbpTwoWayFrequencies + + + 0 + + + True + + + 10, 92 + + + 281, 23 + + + 3 + + + ucrChkStack + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 0 + + + True + + + NoControl + + + 10, 169 + + + 62, 13 + + + 9 + + + Graph Title: + + + lblTitle + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphOptions + + + 1 + + + True + + + NoControl + + + 10, 143 + + + 126, 13 + + + 7 + + + Horizontal Label Position: + + + lblHjust + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphOptions + + + 2 + + + True + + + NoControl + + + 10, 117 + + + 114, 13 + + + 4 + + + Vertical Label Position: + + + lblVjust + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphOptions + + + 3 + + + True + + + 125, 168 + + + 166, 21 + + + 0 + + + ucrInputGraphTitle + + + instat.ucrInputTextBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 4 + + + GrowAndShrink + + + 181, 143 + + + 21, 17, 21, 17 + + + 110, 21 + + + 8 + + + ucrInputHorizontalLabels + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 5 + + + GrowAndShrink + + + 181, 117 + + + 21, 17, 21, 17 + + + 110, 21 + + + 6 + + + ucrInputVerticalLabels + + + instat.ucrInputComboBox, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 6 + + + True + + + 10, 68 + + + 281, 23 + + + 2 + + + ucrChkShowModelSummary + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 7 + + + True + + + 10, 20 + + + 281, 23 + + + 0 + + + ucrChkShowPercentage + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 8 + + + True + + + 10, 44 + + + 281, 23 + + + 1 + + + ucrChkShowCount + + + instat.ucrCheck, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphOptions + + + 9 + + + 6, 59 + + + 300, 195 + + + 1 + + + Graph Options + + + grpGraphOptions + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbpGraph + + + 0 + + + True + + + NoControl + + + 308, 19 + + + 71, 17 + + + 4 + + + Violin Plot + + + rdoViolinPlot + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbpGraph + + + 1 + + + True + + + NoControl + + + 87, 19 + + + 77, 17 + + + 5 + + + Line Graph + + + rdoLineGraph + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphType + + + 0 + + + True + + + NoControl + + + 167, 19 + + + 64, 17 + + + 3 + + + Box Plot + + + rdoBoxPlot + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphType + + + 1 + + + True + + + NoControl + + + 237, 19 + + + 63, 17 + + + 2 + + + Dot Plot + + + rdoDot + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphType + + + 2 + + + True + + + NoControl + + + 12, 19 + + + 73, 17 + + + 1 + + + Bar Graph + + + rdoBar + + + System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + grpGraphType + + + 3 + + + GrowAndShrink + + + 6, 7 + + + 386, 35 + + + 0 + + + ucrPnlGraphType + + + instat.UcrPanel, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + grpGraphType + + + 4 + + + 6, 6 + + + 377, 48 + + + 0 + + + Type of Graph + + + grpGraphType + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbpGraph + + + 2 + + + 4, 22 + + + 3, 3, 3, 3 + + + 404, 257 + + + 1 + + + Graph + + + tbpGraph + + + System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + tbpTwoWayFrequencies + + + 1 + + + 8, 8 + + + 412, 283 + + + 0 + + + tbpTwoWayFrequencies + + + System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + True + + + 89, 297 + + + No + + + 224, 30 + + + 0 + + + ucrBaseSubDialogue + + + instat.ucrButtonsSubdialogue, instat, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 1 + + + True + + + 96, 96 + + + True + + + 430, 328 + + + NoControl + + + CenterScreen + + + Frequency Table & Graph Options + + + sdgTwoWayFrequencies + + + System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/instat/sdgTwoWayFrequencies.vb b/instat/sdgTwoWayFrequencies.vb index 16ec3ad02d7..dbd58d47209 100644 --- a/instat/sdgTwoWayFrequencies.vb +++ b/instat/sdgTwoWayFrequencies.vb @@ -100,7 +100,12 @@ Public Class sdgTwoWayFrequencies 'Setting Plot parameter ucrPnlGraphType.SetParameter(New RParameter("type", 8)) ucrPnlGraphType.AddRadioButton(rdoBar, Chr(34) & "bar" & Chr(34)) - ucrPnlGraphType.AddRadioButton(rdoLine, Chr(34) & "line" & Chr(34)) + ucrPnlGraphType.AddRadioButton(rdoLineGraph, Chr(34) & "line" & Chr(34)) + ucrPnlGraphType.AddRadioButton(rdoDot, Chr(34) & "dot" & Chr(34)) + ucrPnlGraphType.AddRadioButton(rdoBoxPlot, Chr(34) & "boxplot" & Chr(34)) + ucrPnlGraphType.AddRadioButton(rdoViolinPlot, Chr(34) & "violin" & Chr(34)) + ucrPnlGraphType.AddToLinkedControls(ucrChkShowPercentage, {rdoBar, rdoDot, rdoLineGraph, rdoViolinPlot}, bNewLinkedAddRemoveParameter:=True, bNewLinkedDisabledIfParameterMissing:=True) + ucrPnlGraphType.SetRDefault(Chr(34) & "bar" & Chr(34)) 'Setting Plot parameter @@ -116,7 +121,7 @@ Public Class sdgTwoWayFrequencies ucrPnlGraphType.AddToLinkedControls(ucrChkStack, {rdoBar}, bNewLinkedAddRemoveParameter:=True, bNewLinkedDisabledIfParameterMissing:=True) InitialiseTabs() 'TODO: Investigate why when some variables are used for line graph this error is given "Breaks and labels are of different lengths" - rdoLine.Enabled = False + rdoDot.Enabled = True bControlsInitialised = True End Sub 'Linking the subdialog to the functions main dialogue @@ -129,6 +134,23 @@ Public Class sdgTwoWayFrequencies clsGraphOperator = clsNewGraphOperator bUseTitle = bNewUseTitle + If clsTwoWayGraphFreq.ContainsParameter("fun") Then + If clsTwoWayGraphFreq.GetParameter("fun").strArgumentValue = Chr(34) & "xtab" & Chr(34) Then + rdoViolinPlot.Enabled = False + rdoDot.Enabled = False + rdoBoxPlot.Enabled = False + rdoLineGraph.Enabled = True + rdoBar.Enabled = True + clsTwoWayGraphFreq.RemoveParameterByName("facet.grid") + ElseIf clsTwoWayGraphFreq.GetParameter("fun").strArgumentValue = Chr(34) & "grpfrq" & Chr(34) Then + rdoViolinPlot.Enabled = True + rdoDot.Enabled = True + rdoBoxPlot.Enabled = True + rdoLineGraph.Enabled = False + rdoBar.Enabled = True + End If + End If + 'Setting Rcode for the sub dialogue ucrChkShowSummary.SetRCode(clsTwoWayTableFreq, bReset, bCloneIfNeeded:=True) ucrChkBackgroundColour.SetRCode(clsTwoWayTableFreq, bReset, bCloneIfNeeded:=True) @@ -170,6 +192,7 @@ Public Class sdgTwoWayFrequencies clsTwoWayGraphFreq.RemoveParameterByName("show.values") End If End Sub + Private Sub InitialiseTabs() For i = 0 To tbpTwoWayFrequencies.TabCount - 1 tbpTwoWayFrequencies.SelectedIndex = i diff --git a/instat/static/InstatObject/R/Backend_Components/summary_functions.R b/instat/static/InstatObject/R/Backend_Components/summary_functions.R index 588b10f3e89..74ea5945fda 100644 --- a/instat/static/InstatObject/R/Backend_Components/summary_functions.R +++ b/instat/static/InstatObject/R/Backend_Components/summary_functions.R @@ -1364,8 +1364,8 @@ DataBook$set("public", "summary_table", function(data_name, columns_to_summarise grps <- nrow(cell_values) cell_values <- reshape2:::melt.data.frame(cell_values, id.vars = factors, variable.name = "summary-variable", value.name = "value") if (treat_columns_as_factor) { - cell_values[["variable"]] <- rep(rev(columns_to_summarise), each = nrow(cell_values) / length(columns_to_summarise)) - cell_values[["summary"]] <- rep(rev(summaries_display), each = grps, length.out = nrow(cell_values)) + cell_values[["variable"]] <- rep(columns_to_summarise, each = nrow(cell_values) / length(columns_to_summarise)) + cell_values[["summary"]] <- rep(summaries_display, each = grps, length.out = nrow(cell_values)) cell_values[["summary-variable"]] <- NULL } shaped_cell_values <- cell_values %>% dplyr::relocate(value, .after = last_col()) @@ -1456,7 +1456,12 @@ DataBook$set("public", "summary_table", function(data_name, columns_to_summarise } } shaped_cell_values <- shaped_cell_values %>% dplyr::mutate(value = round(value, signif_fig)) - if (store_table) { +if (treat_columns_as_factor){ + shaped_cell_values <- shaped_cell_values %>% + dplyr::mutate(summary = as.factor(summary)) %>% dplyr::mutate(summary = forcats::fct_relevel(summary, summaries_display)) %>% + dplyr::mutate(variable = as.factor(variable)) %>% dplyr::mutate(variable= forcats::fct_relevel(variable, columns_to_summarise)) +} +if (store_table) { data_book$import_data(data_tables = list(shaped_cell_values = shaped_cell_values)) } return(shaped_cell_values) diff --git a/instat/static/InstatObject/R/data_object_R6.R b/instat/static/InstatObject/R/data_object_R6.R index a5313b2b394..5b78af702d8 100644 --- a/instat/static/InstatObject/R/data_object_R6.R +++ b/instat/static/InstatObject/R/data_object_R6.R @@ -2476,35 +2476,6 @@ DataSheet$set("public","set_contrasts_of_factor", function(col_name, new_contras } ) -# Returns a three-letter string representing a specific quarter in a year (e.g. "JFM", "AMJ" etc.). -# -# Parameters: -# quarter - The quarter of the year (first, second etc.), must be an integer between 1 and 4 inclusive. -# start_month - The month when the year is considered to start (January, February etc.), must be -# an integer between 1 and 12 inclusive. -# -# Examples (quarter, start_month, returned value) -# 1, 1, "JFM" -# 1, 2, "FMA" -# 1, 12, "DJF" -# 2, 1, "AMJ" -# 2, 6, "SON" -DataSheet$set("public", "get_quarter_label", function(quarter, start_month){ - mabb <- c("J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D", "J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D") - quarters <- seq(1,4) - s_month <- seq(1,12) - if (quarter %in% quarters && start_month %in% s_month){ - switch(quarter, - "1"={ qtr <- paste(mabb[start_month:(start_month+2)],collapse="")}, - "2"={ qtr <- paste(mabb[(start_month+3):(start_month+5)],collapse="")}, - "3"={ qtr <- paste(mabb[(start_month+6):(start_month+8)],collapse="")}, - "4"={ qtr <- paste(mabb[(start_month+9):(start_month+11)],collapse="")} - ) - return(qtr) - } - else stop("The quarter or starting month is not valid") -}) - #This method gets a date column and extracts part of the information such as year, month, week, weekday etc(depending on which parameters are set) and creates their respective new column(s) DataSheet$set("public","split_date", function(col_name = "", year_val = FALSE, year_name = FALSE, leap_year = FALSE, month_val = FALSE, month_abbr = FALSE, month_name = FALSE, week_val = FALSE, week_abbr = FALSE, week_name = FALSE, weekday_val = FALSE, weekday_abbr = FALSE, weekday_name = FALSE, day = FALSE, day_in_month = FALSE, day_in_year = FALSE, day_in_year_366 = FALSE, pentad_val = FALSE, pentad_abbr = FALSE, dekad_val = FALSE, dekad_abbr = FALSE, quarter_val = FALSE, quarter_abbr = FALSE, with_year = FALSE, s_start_month = 1, s_start_day_in_month = 1, days_in_month = FALSE) { col_data <- self$get_columns_from_data(col_name, use_current_filter = FALSE) @@ -2591,23 +2562,16 @@ DataSheet$set("public","split_date", function(col_name = "", year_val = FALSE, y self$add_columns_to_data(col_name = col_name, col_data = dekad_val_vector, adjacent_column = adjacent_column, before = FALSE) } if(quarter_abbr){ - quarter_labels <- c() if(s_shift) { s_quarter_val_vector <- lubridate::quarter(col_data, with_year = with_year, fiscal_start = s_start_month) - for(num in s_quarter_val_vector){ - s_quarter_label_vector <- self$get_quarter_label(num, s_start_month) - quarter_labels <- c(quarter_labels, s_quarter_label_vector) - } + quarter_labels <- get_quarter_label(s_quarter_val_vector, s_start_month) col_name <- next_default_item(prefix = "s_quarter", existing_names = self$get_column_names(), include_index = FALSE) self$add_columns_to_data(col_name = col_name, col_data = quarter_labels, adjacent_column = adjacent_column, before = FALSE) self$append_to_variables_metadata(col_names = col_name, property = label_label, new_val = paste("Shifted quarter starting on day", s_start_day)) } else { quarter_val_vector <- lubridate::quarter(col_data, with_year = with_year) - for(num in quarter_val_vector){ - quarter_label_vector <- self$get_quarter_label(num, s_start_month) - quarter_labels <- c(quarter_labels, quarter_label_vector) - } + quarter_labels <- get_quarter_label(quarter_val_vector, s_start_month) col_name <- next_default_item(prefix = "quarter_abbr", existing_names = self$get_column_names(), include_index = FALSE) self$add_columns_to_data(col_name = col_name, col_data = quarter_labels, adjacent_column = adjacent_column, before = FALSE) } @@ -2850,8 +2814,8 @@ DataSheet$set("public","append_climatic_types", function(types) { #Method for creating inventory plot DataSheet$set("public","make_inventory_plot", function(date_col, station_col = NULL, year_col = NULL, doy_col = NULL, element_cols = NULL, add_to_data = FALSE, - year_doy_plot = FALSE, coord_flip = FALSE, facet_by = NULL, facet_xsize = 7, facet_ysize = 11, - graph_title = "Inventory Plot", graph_subtitle = NULL, graph_caption = NULL, title_size = NULL, + year_doy_plot = FALSE, coord_flip = FALSE, facet_by = NULL, facet_xsize = 9, facet_ysize = 9, facet_xangle = 90, + facet_yangle = 90, graph_title = "Inventory Plot", graph_subtitle = NULL, graph_caption = NULL, title_size = NULL, subtitle_size = NULL, caption_size = NULL, labelXAxis, labelYAxis, xSize = NULL, ySize = NULL, Xangle = NULL, Yangle = NULL, scale_xdate, fromXAxis = NULL, toXAxis = NULL, byXaxis = NULL, date_ylabels, legend_position = NULL, xlabelsize = NULL, ylabelsize = NULL, scale = NULL, dir = "", row_col_number, @@ -3050,7 +3014,7 @@ DataSheet$set("public","make_inventory_plot", function(date_col, station_col = N } if(!missing(labelXAxis)){g <- g + ggplot2::xlab(labelXAxis)}else{g <- g + ggplot2::xlab(NULL)} if(!missing(labelYAxis)){g <- g + ggplot2::ylab(labelYAxis)}else{g <- g + ggplot2::ylab(NULL)} - return(g + ggplot2::labs(title = graph_title, subtitle = graph_subtitle, caption = graph_caption) + ggplot2::theme(strip.text.x = element_text(margin = margin(1, 0, 1, 0), size = facet_xsize), strip.text.y = element_text(margin = margin(1, 0, 1, 0), size = facet_ysize), legend.position=legend_position, plot.title = ggplot2::element_text(hjust = 0.5, size = title_size), plot.subtitle = ggplot2::element_text(size = subtitle_size), plot.caption = ggplot2::element_text(size = caption_size), axis.text.x = ggplot2::element_text(size=xSize, angle = Xangle, vjust = 0.6), axis.title.x = ggplot2::element_text(size=xlabelsize), axis.title.y = ggplot2::element_text(size=ylabelsize), axis.text.y = ggplot2::element_text(size = ySize, angle = Yangle, hjust = 0.6))) + return(g + ggplot2::labs(title = graph_title, subtitle = graph_subtitle, caption = graph_caption) + ggplot2::theme(strip.text.x = element_text(margin = margin(1, 0, 1, 0), size = facet_xsize, angle = facet_xangle), strip.text.y = element_text(margin = margin(1, 0, 1, 0), size = facet_ysize, angle = facet_yangle), legend.position=legend_position, plot.title = ggplot2::element_text(hjust = 0.5, size = title_size), plot.subtitle = ggplot2::element_text(size = subtitle_size), plot.caption = ggplot2::element_text(size = caption_size), axis.text.x = ggplot2::element_text(size=xSize, angle = Xangle, vjust = 0.6), axis.title.x = ggplot2::element_text(size=xlabelsize), axis.title.y = ggplot2::element_text(size=ylabelsize), axis.text.y = ggplot2::element_text(size = ySize, angle = Yangle, hjust = 0.6))) } ) diff --git a/instat/static/InstatObject/R/install_packages.R b/instat/static/InstatObject/R/install_packages.R index ddccb38862b..2f128426971 100644 --- a/instat/static/InstatObject/R/install_packages.R +++ b/instat/static/InstatObject/R/install_packages.R @@ -1,7 +1,7 @@ require("miniCRAN") r_version <- "4.1" # Specify list of packages to download -pkgs <- c("reshape2", "lubridate","plyr", "dplyr", "rtf", "openxlsx", "ggplot2", "extRemes", "GGally", "agridat", "DAAG", "FactoMineR", "plotrix", "candisc", "R6", "openair", "circular", "survival", "Evapotranspiration", "clifro", "devtools", "factoextra", "circlize", "CircStats", "gridExtra", "ggfortify", "rio", "readxl", "lme4", "dummies", "ggthemes", "lazyeval", "stringr", "httr", "jsonlite", "fitdistrplus", "visreg", "climdex.pcic", "mosaic", "ncdf4", "ncdf4.helpers", "getPass", "RMySQL", "DBI", "EnvStats", "signmedian.test", "sjPlot", "sjmisc", "plotly", "svglite", "htmlTable", "rje", "tidyr", "faraway", "rrefine", "dae", "gapminder", "questionr", "nycflights13", "Lahman", "RcppRoll", "cmsaf", "sjlabelled", "maptools", "RColorBrewer", "colorRamps", "mapdata", "rworldmap", "rworldxtra", "e1071", "robustbase", "wakefield", "Hmisc", "SPEI", "agricolae", "sf", "weathermetrics", "geosphere", "ggmosaic", "readODS", "ggalt", "ggpmisc", "treemapify", "stringdist", "imputeTS", "chillR", "patchwork", "changepoint", "trend", "pbs", "visdat", "texmex", "zyp", "DescTools", "MKinfer", "ggplotify", "clipr", "ecmwfr", "hydroGOF", "lemon", "HistData", "caret", "rpivotTable", "gcookbook", "tidytext", "janitor", "ggwordcloud") +pkgs <- c("reshape2", "lubridate","plyr", "dplyr", "rtf", "openxlsx", "ggplot2", "extRemes", "GGally", "agridat", "DAAG", "FactoMineR", "plotrix", "candisc", "R6", "openair", "circular", "survival", "Evapotranspiration", "clifro", "devtools", "factoextra", "circlize", "CircStats", "gridExtra", "ggfortify", "rio", "readxl", "lme4", "dummies", "ggthemes", "lazyeval", "stringr", "httr", "jsonlite", "fitdistrplus", "visreg", "climdex.pcic", "mosaic", "ncdf4", "ncdf4.helpers", "getPass", "RMySQL", "DBI", "EnvStats", "signmedian.test", "sjPlot", "sjmisc", "plotly", "svglite", "htmlTable", "rje", "tidyr", "faraway", "rrefine", "dae", "gapminder", "questionr", "nycflights13", "Lahman", "RcppRoll", "cmsaf", "sjlabelled", "maptools", "RColorBrewer", "colorRamps", "mapdata", "rworldmap", "rworldxtra", "e1071", "robustbase", "wakefield", "Hmisc", "SPEI", "agricolae", "sf", "weathermetrics", "geosphere", "ggmosaic", "readODS", "ggalt", "ggpmisc", "treemapify", "stringdist", "imputeTS", "chillR", "patchwork", "changepoint", "trend", "pbs", "visdat", "texmex", "zyp", "DescTools", "MKinfer", "ggplotify", "clipr", "ecmwfr", "hydroGOF", "lemon", "HistData", "caret", "rpivotTable", "gcookbook", "tidytext", "janitor", "ggwordcloud", "splines2") pkgList <- pkgDep(pkgs, type="win.binary", repos = "https://cran.rstudio.com/", suggests = FALSE, includeBasePkgs = FALSE, Rversion = r_version) pth <- "C:/Users/Danny/Documents/RPackages" makeRepo(pkgList, path = pth, type = "win.binary", Rversion = r_version, repos = "https://cran.rstudio.com/") diff --git a/instat/static/InstatObject/R/instat_object_R6.R b/instat/static/InstatObject/R/instat_object_R6.R index db4524d66a4..9a0c56c4ac2 100644 --- a/instat/static/InstatObject/R/instat_object_R6.R +++ b/instat/static/InstatObject/R/instat_object_R6.R @@ -1457,8 +1457,18 @@ DataBook$set("public", "import_SST", function(dataset, data_from = 5, data_names } ) -DataBook$set("public","make_inventory_plot", function(data_name, date_col, station_col = NULL, year_col = NULL, doy_col = NULL, element_cols = NULL, add_to_data = FALSE, year_doy_plot = FALSE, coord_flip = FALSE, facet_by = NULL, graph_title = "Inventory Plot", graph_subtitle = NULL, graph_caption = NULL, title_size = NULL, subtitle_size = NULL, caption_size = NULL, labelXAxis, labelYAxis, xSize = NULL, ySize = NULL, Xangle = NULL, Yangle = NULL, scale_xdate, fromXAxis = NULL, toXAxis = NULL, byXaxis = NULL, date_ylabels, legend_position = NULL, xlabelsize = NULL, ylabelsize = NULL, scale = NULL, dir = "", row_col_number, nrow = NULL, ncol = NULL, key_colours = c("red", "grey"), display_rain_days = FALSE, facet_xsize = 7, facet_ysize = 11, scale_ydate = FALSE, date_ybreaks, step = 1, rain_cats = list(breaks = c(0, 0.85, Inf), labels = c("Dry", "Rain"), key_colours = c("tan3", "blue"))) { - self$get_data_objects(data_name)$make_inventory_plot(date_col = date_col, station_col = station_col, year_col = year_col, doy_col = doy_col, element_cols = element_cols, add_to_data = add_to_data, year_doy_plot = year_doy_plot, coord_flip = coord_flip, facet_by = facet_by, graph_title = graph_title, key_colours = key_colours, display_rain_days = display_rain_days, rain_cats = rain_cats, graph_subtitle = graph_subtitle, graph_caption = graph_caption, title_size = title_size, subtitle_size = subtitle_size, caption_size = caption_size, labelXAxis = labelXAxis, labelYAxis = labelYAxis, xSize = xSize, ySize = ySize, Xangle = Xangle, Yangle = Yangle, scale_xdate = scale_xdate, fromXAxis = fromXAxis, toXAxis = toXAxis, byXaxis = byXaxis, xlabelsize = xlabelsize, scale_ydate = scale_ydate, date_ybreaks = date_ybreaks, step = step, ylabelsize = ylabelsize, date_ylabels = date_ylabels, legend_position = legend_position, dir = dir, row_col_number = row_col_number, nrow = nrow, ncol = ncol, scale = scale, facet_xsize = facet_xsize, facet_ysize = facet_ysize) +DataBook$set("public","make_inventory_plot", function(data_name, date_col, station_col = NULL, year_col = NULL, doy_col = NULL, element_cols = NULL, add_to_data = FALSE, year_doy_plot = FALSE, coord_flip = FALSE, facet_by = NULL, graph_title = "Inventory Plot", graph_subtitle = NULL, graph_caption = NULL, title_size = NULL, subtitle_size = NULL, caption_size = NULL, labelXAxis, labelYAxis, xSize = NULL, ySize = NULL, Xangle = NULL, Yangle = NULL, scale_xdate, fromXAxis = NULL, toXAxis = NULL, byXaxis = NULL, date_ylabels, legend_position = NULL, xlabelsize = NULL, ylabelsize = NULL, scale = NULL, dir = "", row_col_number, nrow = NULL, ncol = NULL, key_colours = c("red", "grey"), display_rain_days = FALSE, facet_xsize = 9, facet_ysize = 9, facet_xangle = 90, facet_yangle = 90, scale_ydate = FALSE, date_ybreaks, step = 1, rain_cats = list(breaks = c(0, 0.85, Inf), labels = c("Dry", "Rain"), key_colours = c("tan3", "blue"))) { + self$get_data_objects(data_name)$make_inventory_plot(date_col = date_col, station_col = station_col, year_col = year_col, doy_col = doy_col, + element_cols = element_cols, add_to_data = add_to_data, year_doy_plot = year_doy_plot, + coord_flip = coord_flip, facet_by = facet_by, graph_title = graph_title, key_colours = key_colours, + display_rain_days = display_rain_days, rain_cats = rain_cats, graph_subtitle = graph_subtitle, + graph_caption = graph_caption, title_size = title_size, subtitle_size = subtitle_size, + caption_size = caption_size, labelXAxis = labelXAxis, labelYAxis = labelYAxis, xSize = xSize, + ySize = ySize, Xangle = Xangle, Yangle = Yangle, scale_xdate = scale_xdate, fromXAxis = fromXAxis, + toXAxis = toXAxis, byXaxis = byXaxis, xlabelsize = xlabelsize, scale_ydate = scale_ydate, date_ybreaks = date_ybreaks, + step = step, ylabelsize = ylabelsize, date_ylabels = date_ylabels, legend_position = legend_position, + dir = dir, row_col_number = row_col_number, nrow = nrow, ncol = ncol, scale = scale, facet_xsize = facet_xsize, + facet_ysize = facet_ysize, facet_xangle = facet_xangle, facet_yangle = facet_yangle) } ) @@ -2663,7 +2673,8 @@ DataBook$set("public", "import_from_cds", function(user, dataset, elements, star all_dates <- seq(start_date, end_date, by = 1) all_periods <- unique(paste(lubridate::year(all_dates), sprintf("%02d", lubridate::month(all_dates)), sep = "-")) area <- c(lat[2], lon[1], lat[1], lon[2]) - pb <- winProgressBar(title = "Requesting data from CDS", min = 0, max = length(all_periods)) + is_win <- Sys.info()['sysname'] == "Windows" + if (is_win) pb <- winProgressBar(title = "Requesting data from CDS", min = 0, max = length(all_periods)) nc_files <- vector(mode = "character", length = length(all_periods)) for (i in seq_along(all_periods)) { y <- substr(all_periods[i], 1, 4) @@ -2683,7 +2694,7 @@ DataBook$set("public", "import_from_cds", function(user, dataset, elements, star target = paste0(dataset, "-", paste(elements, collapse = "_"), "-", all_periods[i], ".nc") ) info <- paste0("Requesting data for ", all_periods[i], " - ", round(100 * i / length(all_periods)), "%") - setWinProgressBar(pb, value = i, title = info, label = info) + if (is_win) setWinProgressBar(pb, value = i, title = info, label = info) ncfile <- ecmwfr::wf_request(user = user, request = request, transfer = TRUE, path = path, time_out = 3 * 3600) @@ -2693,7 +2704,7 @@ DataBook$set("public", "import_from_cds", function(user, dataset, elements, star ncdf4::nc_close(nc = nc) } } - close(pb) + if (is_win) close(pb) }) DataBook$set("public", "add_flag_fields", function(data_name, col_names, key_column_names) { diff --git a/instat/static/InstatObject/R/stand_alone_functions.R b/instat/static/InstatObject/R/stand_alone_functions.R index 3c6955d6814..ca8290f9b76 100644 --- a/instat/static/InstatObject/R/stand_alone_functions.R +++ b/instat/static/InstatObject/R/stand_alone_functions.R @@ -613,16 +613,17 @@ multiple_nc_as_data_frame <- function(path, vars, keep_raw_time = TRUE, include_ nc_list <- list() n_files <- length(filepaths) - pb <- winProgressBar(title = "Reading files", min = 0, max = n_files) + is_win <- Sys.info()['sysname'] == "Windows" + if (is_win) pb <- winProgressBar(title = "Reading files", min = 0, max = n_files) for(i in seq_along(filepaths)) { nc <- ncdf4::nc_open(filename = filepaths[i]) dat <- nc_as_data_frame(nc = nc, vars = vars, keep_raw_time = keep_raw_time, include_metadata = include_metadata, boundary = boundary, lon_points = lon_points, lat_points = lat_points, id_points = id_points, show_requested_points = show_requested_points, great_circle_dist = great_circle_dist) nc_list[[length(nc_list) + 1]] <- dat ncdf4::nc_close(nc) info <- paste0("Reading file ", i, " of ", n_files, " - ", round(100*i/n_files), "%") - setWinProgressBar(pb, value = i, title = info, label = info) + if (is_win) setWinProgressBar(pb, value = i, title = info, label = info) } - close(pb) + if (is_win) close(pb) names(nc_list) <- tools::file_path_sans_ext(filenames) merged_data <- dplyr::bind_rows(nc_list, .id = id) return(merged_data) @@ -2506,4 +2507,14 @@ slopegraph <- function(data, x, y, colour, data_label = NULL, force = 0.5, max.iter = 3000) + ggplot2::geom_label(ggplot2::aes_string(label = Ndata_label), size = data_text_size, label.padding = unit(data_label_padding, "lines"), label.size = data_label_line_size, colour = data_text_colour, fill = data_label_fill_colour) -} \ No newline at end of file +} + +# Returns a three-letter string representing a specific quarter in a year (e.g. "JFM", "AMJ" etc.). +get_quarter_label <- function(quarter, start_month){ + if (!start_month %in% 1:12) stop(start_month, " is an invalid start month, must be in range of 1:12") + if (!all(quarter %in% 1:4)) stop(quarter, " is an invalid quarter, must be in range of 1:4") + mabb <- rep(substr(month.abb, 1, 1), times = 2)[start_month:(11 + start_month)] + qtr <- sapply(quarter, function(x){start_pos <- 1 + ((x-1) * 3) + paste(mabb[start_pos:(start_pos+2)], collapse = "")}) + return(factor(x = qtr, levels = unique(qtr))) +} diff --git a/instat/translations/rInstatTranslations.db b/instat/translations/rInstatTranslations.db index 4bbc8163eef..cf0ef3283a4 100644 Binary files a/instat/translations/rInstatTranslations.db and b/instat/translations/rInstatTranslations.db differ diff --git a/instat/translations/translateIgnore.txt b/instat/translations/translateIgnore.txt index bd69ef41bff..d57aa9caed7 100644 --- a/instat/translations/translateIgnore.txt +++ b/instat/translations/translateIgnore.txt @@ -78,9 +78,19 @@ dlgSplitText_ucrInputPattern% # In the 'Filter' dialog, the 'Selected Filter Preview' should not be translated. # Fixes issue #6949, related to PR #6956 -dlgRestrict_ucrInputFilterPreview +dlgRestrict_ucrInputFilterPreview% # In the 'Evapotranspiration' dialog, the 'Penman-Monteith' and 'Hargreaves-Samani' buttons should not be translated. # Partially fixes issue #7026, related to PR #7035 dlgEvapotranspiration_%_rdoPenmanMonteith dlgEvapotranspiration_%_rdoHargreavesSamani + +# In the 'Boxplot' dialog, the selected 'Facet' either for Station, Year or Within Year should not be translated +# Fixes issue #6185, item a), related to PR #7058 +dlgClimaticBoxPlot_ucrInputStation% +dlgClimaticBoxPlot_ucrInputYear% +dlgClimaticBoxPlot_ucrInputWithinYear% + +# In the 'InventoryPlot' dialog, the selected 'Facet' should not be translated +# Partially fixes issue #6989, related to PR #7070 +dlgInventoryPlot_ucrInputFacetBy% diff --git a/instat/translations/translationsManuallyEntered.csv b/instat/translations/translationsManuallyEntered.csv index dd54019b9ee..080a9fc08d9 100644 --- a/instat/translations/translationsManuallyEntered.csv +++ b/instat/translations/translationsManuallyEntered.csv @@ -28,3 +28,4 @@ Reset to Default Layout,en,Reset to Default Layout View Interactive Plot,en,View Interactive Plot Data Frame Metadata,en,Data Frame Metadata Script Window,en,Script Window +Count,en,Count diff --git a/instat/ucrColumnMetadata.Designer.vb b/instat/ucrColumnMetadata.Designer.vb index d6a9c9f0afc..9cda5c05b9c 100644 --- a/instat/ucrColumnMetadata.Designer.vb +++ b/instat/ucrColumnMetadata.Designer.vb @@ -74,8 +74,8 @@ Partial Class ucrColumnMetadata Me.mnuSort = New System.Windows.Forms.ToolStripMenuItem() Me.mnuAddComment = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnFilter = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuSelection = New System.Windows.Forms.ToolStripMenuItem() - Me.mnuRemoveCurrentSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClearColumnFilter = New System.Windows.Forms.ToolStripMenuItem() Me.columnContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.cellContextMenuStrip.SuspendLayout() @@ -220,133 +220,133 @@ Partial Class ucrColumnMetadata 'mnuColumnRename ' Me.mnuColumnRename.Name = "mnuColumnRename" - Me.mnuColumnRename.Size = New System.Drawing.Size(212, 22) + Me.mnuColumnRename.Size = New System.Drawing.Size(214, 22) Me.mnuColumnRename.Text = "Rename Column..." ' 'mnuDuplicateColumn ' Me.mnuDuplicateColumn.Name = "mnuDuplicateColumn" - Me.mnuDuplicateColumn.Size = New System.Drawing.Size(212, 22) + Me.mnuDuplicateColumn.Size = New System.Drawing.Size(214, 22) Me.mnuDuplicateColumn.Text = "Duplicate Column..." ' 'mnuReorderColumns ' Me.mnuReorderColumns.Name = "mnuReorderColumns" - Me.mnuReorderColumns.Size = New System.Drawing.Size(212, 22) + Me.mnuReorderColumns.Size = New System.Drawing.Size(214, 22) Me.mnuReorderColumns.Text = "Reorder Column(s)..." ' 'mnuInsertColsBefore ' Me.mnuInsertColsBefore.Name = "mnuInsertColsBefore" - Me.mnuInsertColsBefore.Size = New System.Drawing.Size(212, 22) + Me.mnuInsertColsBefore.Size = New System.Drawing.Size(214, 22) Me.mnuInsertColsBefore.Text = "Insert Column(s) Before" ' 'mnuInsertColsAfter ' Me.mnuInsertColsAfter.Name = "mnuInsertColsAfter" - Me.mnuInsertColsAfter.Size = New System.Drawing.Size(212, 22) + Me.mnuInsertColsAfter.Size = New System.Drawing.Size(214, 22) Me.mnuInsertColsAfter.Text = "Insert Column(s) After" ' 'mnuDeleteCol ' Me.mnuDeleteCol.Name = "mnuDeleteCol" - Me.mnuDeleteCol.Size = New System.Drawing.Size(212, 22) + Me.mnuDeleteCol.Size = New System.Drawing.Size(214, 22) Me.mnuDeleteCol.Text = "Delete Column(s)" ' 'toolStripMenuItem2 ' Me.toolStripMenuItem2.Name = "toolStripMenuItem2" - Me.toolStripMenuItem2.Size = New System.Drawing.Size(209, 6) + Me.toolStripMenuItem2.Size = New System.Drawing.Size(211, 6) ' 'mnuConvertToFactor ' Me.mnuConvertToFactor.Name = "mnuConvertToFactor" - Me.mnuConvertToFactor.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToFactor.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToFactor.Text = "Convert to Factor" ' 'mnuCovertToOrderedFactors ' Me.mnuCovertToOrderedFactors.Name = "mnuCovertToOrderedFactors" - Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(212, 22) + Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(214, 22) Me.mnuCovertToOrderedFactors.Text = "Convert to Ordered Factor" ' 'mnuConvertText ' Me.mnuConvertText.Name = "mnuConvertText" - Me.mnuConvertText.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertText.Size = New System.Drawing.Size(214, 22) Me.mnuConvertText.Text = "Convert to Character" ' 'mnuConvertToLogical ' Me.mnuConvertToLogical.Name = "mnuConvertToLogical" - Me.mnuConvertToLogical.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToLogical.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToLogical.Text = "Convert to Logical" ' 'mnuConvertVariate ' Me.mnuConvertVariate.Name = "mnuConvertVariate" - Me.mnuConvertVariate.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertVariate.Size = New System.Drawing.Size(214, 22) Me.mnuConvertVariate.Text = "Convert to Numeric" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(211, 6) ' 'mnuLevelsLabels ' Me.mnuLevelsLabels.Name = "mnuLevelsLabels" - Me.mnuLevelsLabels.Size = New System.Drawing.Size(212, 22) + Me.mnuLevelsLabels.Size = New System.Drawing.Size(214, 22) Me.mnuLevelsLabels.Text = "Levels/Labels..." Me.mnuLevelsLabels.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 6) ' 'mnuSort ' Me.mnuSort.Name = "mnuSort" - Me.mnuSort.Size = New System.Drawing.Size(212, 22) + Me.mnuSort.Size = New System.Drawing.Size(214, 22) Me.mnuSort.Text = "Sort..." ' 'mnuAddComment ' Me.mnuAddComment.Name = "mnuAddComment" - Me.mnuAddComment.Size = New System.Drawing.Size(212, 22) + Me.mnuAddComment.Size = New System.Drawing.Size(214, 22) Me.mnuAddComment.Text = "Add Comment..." ' 'mnuColumnFilter ' Me.mnuColumnFilter.Name = "mnuColumnFilter" - Me.mnuColumnFilter.Size = New System.Drawing.Size(212, 22) + Me.mnuColumnFilter.Size = New System.Drawing.Size(214, 22) Me.mnuColumnFilter.Text = "Filter..." ' - 'mnuSelection + 'mnuColumnContextColumnSelection ' - Me.mnuSelection.Name = "mnuSelection" - Me.mnuSelection.Size = New System.Drawing.Size(212, 22) - Me.mnuSelection.Text = "Selection..." + Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" + Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextColumnSelection.Text = "Column Selection..." ' - 'mnuRemoveCurrentSelection + 'mnuColumnContextRemoveCurrentColumnSelection ' - Me.mnuRemoveCurrentSelection.Name = "mnuRemoveCurrentSelection" - Me.mnuRemoveCurrentSelection.Size = New System.Drawing.Size(212, 22) - Me.mnuRemoveCurrentSelection.Text = "Remove Current Selection" + Me.mnuColumnContextRemoveCurrentColumnSelection.Name = "mnuColumnContextRemoveCurrentColumnSelection" + Me.mnuColumnContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" ' 'mnuClearColumnFilter ' Me.mnuClearColumnFilter.Name = "mnuClearColumnFilter" - Me.mnuClearColumnFilter.Size = New System.Drawing.Size(212, 22) + Me.mnuClearColumnFilter.Size = New System.Drawing.Size(214, 22) Me.mnuClearColumnFilter.Text = "Remove Current Filter" ' 'columnContextMenuStrip ' Me.columnContextMenuStrip.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator2, Me.mnuLevelsLabels, Me.ToolStripSeparator1, Me.mnuSort, Me.mnuAddComment, Me.mnuColumnFilter, Me.mnuSelection, Me.mnuRemoveCurrentSelection, Me.mnuClearColumnFilter}) + Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator2, Me.mnuLevelsLabels, Me.ToolStripSeparator1, Me.mnuSort, Me.mnuAddComment, Me.mnuColumnFilter, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" - Me.columnContextMenuStrip.Size = New System.Drawing.Size(213, 418) + Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 440) ' 'ucrColumnMetadata ' @@ -400,8 +400,8 @@ Partial Class ucrColumnMetadata Friend WithEvents mnuSort As ToolStripMenuItem Friend WithEvents mnuAddComment As ToolStripMenuItem Private WithEvents mnuColumnFilter As ToolStripMenuItem - Friend WithEvents mnuSelection As ToolStripMenuItem - Friend WithEvents mnuRemoveCurrentSelection As ToolStripMenuItem + Friend WithEvents mnuColumnContextColumnSelection As ToolStripMenuItem + Friend WithEvents mnuColumnContextRemoveCurrentColumnSelection As ToolStripMenuItem Private WithEvents mnuClearColumnFilter As ToolStripMenuItem Friend WithEvents columnContextMenuStrip As ContextMenuStrip End Class diff --git a/instat/ucrColumnMetadata.resx b/instat/ucrColumnMetadata.resx index 18967d0e64a..bf166f921ca 100644 --- a/instat/ucrColumnMetadata.resx +++ b/instat/ucrColumnMetadata.resx @@ -130,6 +130,6 @@ 17, 17 - 124 + 81 \ No newline at end of file diff --git a/instat/ucrColumnMetadata.vb b/instat/ucrColumnMetadata.vb index 76a3e69b274..299aa21bf0b 100644 --- a/instat/ucrColumnMetadata.vb +++ b/instat/ucrColumnMetadata.vb @@ -352,7 +352,8 @@ Public Class ucrColumnMetadata mnuInsertColsBefore.Text = "Insert " & _grid.GetSelectedColumns.Count & " Columns Before" mnuInsertColsAfter.Text = "Insert " & _grid.GetSelectedColumns.Count & " Columns After" End If - mnuClearColumnFilter.Enabled = GetCurrentDataFrameFocus().clsFilter.bApplied + mnuClearColumnFilter.Enabled = GetCurrentDataFrameFocus().clsFilter.bFilterApplied + mnuColumnContextRemoveCurrentColumnSelection.Enabled = GetCurrentDataFrameFocus().clsFilter.bColumnSelectionApplied End Sub Private Sub mnuReorderColumns_Click(sender As Object, e As EventArgs) Handles mnuReorderColumns.Click @@ -424,4 +425,14 @@ Public Class ucrColumnMetadata dlgAddComment.ShowDialog() End Sub + Private Sub mnuColumnContextColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuColumnContextColumnSelection.Click + dlgSelect.SetDefaultDataFrame(_grid.CurrentWorksheet.Name) + dlgSelect.ShowDialog() + End Sub + + Private Sub mnuColumnContextRemoveCurrentColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuColumnContextRemoveCurrentColumnSelection.Click + StartWait() + GetCurrentDataFrameFocus().clsPrepareFunctions.RemoveCurrentColumnSelection() + EndWait() + End Sub End Class \ No newline at end of file diff --git a/instat/ucrDataView.Designer.vb b/instat/ucrDataView.Designer.vb index 6ff9a40ab7d..5f8e794edff 100644 --- a/instat/ucrDataView.Designer.vb +++ b/instat/ucrDataView.Designer.vb @@ -59,6 +59,8 @@ Partial Class ucrDataView Me.mnuSort = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnAddComment = New System.Windows.Forms.ToolStripMenuItem() Me.mnuColumnFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuColumnContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuClearColumnFilter = New System.Windows.Forms.ToolStripMenuItem() Me.cellContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() @@ -78,6 +80,8 @@ Partial Class ucrDataView Me.mnuSorts = New System.Windows.Forms.ToolStripMenuItem() Me.mnuComment = New System.Windows.Forms.ToolStripMenuItem() Me.mnuFilters = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuCellContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuCellContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRemoveCurrentFilters = New System.Windows.Forms.ToolStripMenuItem() Me.rowContextMenuStrip = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.mnuInsertRowsBefore = New System.Windows.Forms.ToolStripMenuItem() @@ -87,6 +91,8 @@ Partial Class ucrDataView Me.mnuAddComment = New System.Windows.Forms.ToolStripMenuItem() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.mnuFilter = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuRowContextColumnSelection = New System.Windows.Forms.ToolStripMenuItem() + Me.mnuRowContextRemoveCurrentColumnSelection = New System.Windows.Forms.ToolStripMenuItem() Me.mnuRemoveCurrentFilter = New System.Windows.Forms.ToolStripMenuItem() Me.statusColumnMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.deleteDataFrame = New System.Windows.Forms.ToolStripMenuItem() @@ -142,290 +148,326 @@ Partial Class ucrDataView 'columnContextMenuStrip ' 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.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilter, Me.mnuClearColumnFilter}) + Me.columnContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.mnuColumnRename, Me.mnuDuplicateColumn, Me.mnuReorderColumns, Me.mnuInsertColsBefore, Me.mnuInsertColsAfter, Me.mnuDeleteCol, Me.mnuPaste, Me.toolStripMenuItem2, Me.mnuConvertToFactor, Me.mnuCovertToOrderedFactors, Me.mnuConvertText, Me.mnuConvertToLogical, Me.mnuConvertVariate, Me.ToolStripSeparator1, Me.mnuLevelsLabels, Me.toolStripMenuItem21, Me.mnuSort, Me.mnuColumnAddComment, Me.mnuColumnFilter, Me.mnuColumnContextColumnSelection, Me.mnuColumnContextRemoveCurrentColumnSelection, Me.mnuClearColumnFilter}) Me.columnContextMenuStrip.Name = "columnContextMenuStrip" - Me.columnContextMenuStrip.Size = New System.Drawing.Size(213, 396) + Me.columnContextMenuStrip.Size = New System.Drawing.Size(215, 440) ' 'mnuColumnRename ' Me.mnuColumnRename.Name = "mnuColumnRename" - Me.mnuColumnRename.Size = New System.Drawing.Size(212, 22) + Me.mnuColumnRename.Size = New System.Drawing.Size(214, 22) Me.mnuColumnRename.Text = "Rename Column..." ' 'mnuDuplicateColumn ' Me.mnuDuplicateColumn.Name = "mnuDuplicateColumn" - Me.mnuDuplicateColumn.Size = New System.Drawing.Size(212, 22) + Me.mnuDuplicateColumn.Size = New System.Drawing.Size(214, 22) Me.mnuDuplicateColumn.Text = "Duplicate Column..." ' 'mnuReorderColumns ' Me.mnuReorderColumns.Name = "mnuReorderColumns" - Me.mnuReorderColumns.Size = New System.Drawing.Size(212, 22) + Me.mnuReorderColumns.Size = New System.Drawing.Size(214, 22) Me.mnuReorderColumns.Text = "Reorder Column(s)..." ' 'mnuInsertColsBefore ' Me.mnuInsertColsBefore.Name = "mnuInsertColsBefore" - Me.mnuInsertColsBefore.Size = New System.Drawing.Size(212, 22) + Me.mnuInsertColsBefore.Size = New System.Drawing.Size(214, 22) Me.mnuInsertColsBefore.Text = "Insert Column(s) Before" ' 'mnuInsertColsAfter ' Me.mnuInsertColsAfter.Name = "mnuInsertColsAfter" - Me.mnuInsertColsAfter.Size = New System.Drawing.Size(212, 22) + Me.mnuInsertColsAfter.Size = New System.Drawing.Size(214, 22) Me.mnuInsertColsAfter.Text = "Insert Column(s) After" ' 'mnuDeleteCol ' Me.mnuDeleteCol.Name = "mnuDeleteCol" - Me.mnuDeleteCol.Size = New System.Drawing.Size(212, 22) + Me.mnuDeleteCol.Size = New System.Drawing.Size(214, 22) Me.mnuDeleteCol.Text = "Delete Column(s)" ' 'mnuPaste ' Me.mnuPaste.Name = "mnuPaste" - Me.mnuPaste.Size = New System.Drawing.Size(212, 22) + Me.mnuPaste.Size = New System.Drawing.Size(214, 22) Me.mnuPaste.Text = "Paste" ' 'toolStripMenuItem2 ' Me.toolStripMenuItem2.Name = "toolStripMenuItem2" - Me.toolStripMenuItem2.Size = New System.Drawing.Size(209, 6) + Me.toolStripMenuItem2.Size = New System.Drawing.Size(211, 6) ' 'mnuConvertToFactor ' Me.mnuConvertToFactor.Name = "mnuConvertToFactor" - Me.mnuConvertToFactor.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToFactor.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToFactor.Text = "Convert to Factor" ' 'mnuCovertToOrderedFactors ' Me.mnuCovertToOrderedFactors.Name = "mnuCovertToOrderedFactors" - Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(212, 22) + Me.mnuCovertToOrderedFactors.Size = New System.Drawing.Size(214, 22) Me.mnuCovertToOrderedFactors.Text = "Convert to Ordered Factor" ' 'mnuConvertText ' Me.mnuConvertText.Name = "mnuConvertText" - Me.mnuConvertText.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertText.Size = New System.Drawing.Size(214, 22) Me.mnuConvertText.Text = "Convert to Character" ' 'mnuConvertToLogical ' Me.mnuConvertToLogical.Name = "mnuConvertToLogical" - Me.mnuConvertToLogical.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToLogical.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToLogical.Text = "Convert to Logical" ' 'mnuConvertVariate ' Me.mnuConvertVariate.Name = "mnuConvertVariate" - Me.mnuConvertVariate.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertVariate.Size = New System.Drawing.Size(214, 22) Me.mnuConvertVariate.Text = "Convert to Numeric" ' 'ToolStripSeparator1 ' Me.ToolStripSeparator1.Name = "ToolStripSeparator1" - Me.ToolStripSeparator1.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator1.Size = New System.Drawing.Size(211, 6) ' 'mnuLevelsLabels ' Me.mnuLevelsLabels.Name = "mnuLevelsLabels" - Me.mnuLevelsLabels.Size = New System.Drawing.Size(212, 22) + Me.mnuLevelsLabels.Size = New System.Drawing.Size(214, 22) Me.mnuLevelsLabels.Text = "Levels/Labels..." ' 'toolStripMenuItem21 ' Me.toolStripMenuItem21.Name = "toolStripMenuItem21" - Me.toolStripMenuItem21.Size = New System.Drawing.Size(209, 6) + Me.toolStripMenuItem21.Size = New System.Drawing.Size(211, 6) ' 'mnuSort ' Me.mnuSort.Name = "mnuSort" - Me.mnuSort.Size = New System.Drawing.Size(212, 22) + Me.mnuSort.Size = New System.Drawing.Size(214, 22) Me.mnuSort.Text = "Sort..." ' 'mnuColumnAddComment ' Me.mnuColumnAddComment.Name = "mnuColumnAddComment" - Me.mnuColumnAddComment.Size = New System.Drawing.Size(212, 22) + Me.mnuColumnAddComment.Size = New System.Drawing.Size(214, 22) Me.mnuColumnAddComment.Text = "Add Comment..." ' 'mnuColumnFilter ' Me.mnuColumnFilter.Name = "mnuColumnFilter" - Me.mnuColumnFilter.Size = New System.Drawing.Size(212, 22) + Me.mnuColumnFilter.Size = New System.Drawing.Size(214, 22) Me.mnuColumnFilter.Text = "Filter..." ' + 'mnuColumnContextColumnSelection + ' + Me.mnuColumnContextColumnSelection.Name = "mnuColumnContextColumnSelection" + Me.mnuColumnContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextColumnSelection.Text = "Column Selection..." + ' + 'mnuColumnContextRemoveCurrentColumnSelection + ' + Me.mnuColumnContextRemoveCurrentColumnSelection.Name = "mnuColumnContextRemoveCurrentColumnSelection" + Me.mnuColumnContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuColumnContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" + ' 'mnuClearColumnFilter ' Me.mnuClearColumnFilter.Name = "mnuClearColumnFilter" - Me.mnuClearColumnFilter.Size = New System.Drawing.Size(212, 22) + Me.mnuClearColumnFilter.Size = New System.Drawing.Size(214, 22) Me.mnuClearColumnFilter.Text = "Remove Current Filter" ' 'cellContextMenuStrip ' Me.cellContextMenuStrip.ImageScalingSize = New System.Drawing.Size(20, 20) - Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator3, Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilters, Me.mnuRemoveCurrentFilters}) + Me.cellContextMenuStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator3, Me.mnuRenameColumn, Me.mnuDuplColumn, Me.mnuReorderColumn, Me.mnuCellPasteRange, Me.ToolStripSeparator5, Me.mnuConvertToFact, Me.mnuConvertToOrderedFactor, Me.mnuConvertToCharacter, Me.mnuConvertToLogic, Me.mnuConvertToNumeric, Me.ToolStripSeparator6, Me.mnuLabelsLevel, Me.ToolStripSeparator7, Me.mnuSorts, Me.mnuComment, Me.mnuFilters, Me.mnuCellContextColumnSelection, Me.mnuCellContextRemoveCurrentColumnSelection, Me.mnuRemoveCurrentFilters}) Me.cellContextMenuStrip.Name = "cellContextMenuStrip" - Me.cellContextMenuStrip.Size = New System.Drawing.Size(213, 336) + Me.cellContextMenuStrip.Size = New System.Drawing.Size(215, 380) ' 'ToolStripSeparator3 ' Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator3.Size = New System.Drawing.Size(211, 6) ' 'mnuRenameColumn ' Me.mnuRenameColumn.Name = "mnuRenameColumn" - Me.mnuRenameColumn.Size = New System.Drawing.Size(212, 22) + Me.mnuRenameColumn.Size = New System.Drawing.Size(214, 22) Me.mnuRenameColumn.Text = "Rename Column..." ' 'mnuDuplColumn ' Me.mnuDuplColumn.Name = "mnuDuplColumn" - Me.mnuDuplColumn.Size = New System.Drawing.Size(212, 22) + Me.mnuDuplColumn.Size = New System.Drawing.Size(214, 22) Me.mnuDuplColumn.Text = "Duplicate Column..." ' 'mnuReorderColumn ' Me.mnuReorderColumn.Name = "mnuReorderColumn" - Me.mnuReorderColumn.Size = New System.Drawing.Size(212, 22) + Me.mnuReorderColumn.Size = New System.Drawing.Size(214, 22) Me.mnuReorderColumn.Text = "Reorder Column(s)..." ' 'mnuCellPasteRange ' Me.mnuCellPasteRange.Name = "mnuCellPasteRange" - Me.mnuCellPasteRange.Size = New System.Drawing.Size(212, 22) + Me.mnuCellPasteRange.Size = New System.Drawing.Size(214, 22) Me.mnuCellPasteRange.Text = "Paste" ' 'ToolStripSeparator5 ' Me.ToolStripSeparator5.Name = "ToolStripSeparator5" - Me.ToolStripSeparator5.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator5.Size = New System.Drawing.Size(211, 6) ' 'mnuConvertToFact ' Me.mnuConvertToFact.Name = "mnuConvertToFact" - Me.mnuConvertToFact.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToFact.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToFact.Text = "Convert to Factor" ' 'mnuConvertToOrderedFactor ' Me.mnuConvertToOrderedFactor.Name = "mnuConvertToOrderedFactor" - Me.mnuConvertToOrderedFactor.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToOrderedFactor.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToOrderedFactor.Text = "Convert to Ordered Factor" ' 'mnuConvertToCharacter ' Me.mnuConvertToCharacter.Name = "mnuConvertToCharacter" - Me.mnuConvertToCharacter.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToCharacter.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToCharacter.Text = "Convert to Character" ' 'mnuConvertToLogic ' Me.mnuConvertToLogic.Name = "mnuConvertToLogic" - Me.mnuConvertToLogic.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToLogic.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToLogic.Text = "Convert to Logical" ' 'mnuConvertToNumeric ' Me.mnuConvertToNumeric.Name = "mnuConvertToNumeric" - Me.mnuConvertToNumeric.Size = New System.Drawing.Size(212, 22) + Me.mnuConvertToNumeric.Size = New System.Drawing.Size(214, 22) Me.mnuConvertToNumeric.Text = "Convert to Numeric" ' 'ToolStripSeparator6 ' Me.ToolStripSeparator6.Name = "ToolStripSeparator6" - Me.ToolStripSeparator6.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator6.Size = New System.Drawing.Size(211, 6) ' 'mnuLabelsLevel ' Me.mnuLabelsLevel.Name = "mnuLabelsLevel" - Me.mnuLabelsLevel.Size = New System.Drawing.Size(212, 22) + Me.mnuLabelsLevel.Size = New System.Drawing.Size(214, 22) Me.mnuLabelsLevel.Text = "Levels/Labels..." ' 'ToolStripSeparator7 ' Me.ToolStripSeparator7.Name = "ToolStripSeparator7" - Me.ToolStripSeparator7.Size = New System.Drawing.Size(209, 6) + Me.ToolStripSeparator7.Size = New System.Drawing.Size(211, 6) ' 'mnuSorts ' Me.mnuSorts.Name = "mnuSorts" - Me.mnuSorts.Size = New System.Drawing.Size(212, 22) + Me.mnuSorts.Size = New System.Drawing.Size(214, 22) Me.mnuSorts.Text = "Sort..." ' 'mnuComment ' Me.mnuComment.Name = "mnuComment" - Me.mnuComment.Size = New System.Drawing.Size(212, 22) + Me.mnuComment.Size = New System.Drawing.Size(214, 22) Me.mnuComment.Text = "Add Comment..." ' 'mnuFilters ' Me.mnuFilters.Name = "mnuFilters" - Me.mnuFilters.Size = New System.Drawing.Size(212, 22) + Me.mnuFilters.Size = New System.Drawing.Size(214, 22) Me.mnuFilters.Text = "Filter..." ' + 'mnuCellContextColumnSelection + ' + Me.mnuCellContextColumnSelection.Name = "mnuCellContextColumnSelection" + Me.mnuCellContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuCellContextColumnSelection.Text = "Column Selection..." + ' + 'mnuCellContextRemoveCurrentColumnSelection + ' + Me.mnuCellContextRemoveCurrentColumnSelection.Name = "mnuCellContextRemoveCurrentColumnSelection" + Me.mnuCellContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuCellContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" + ' 'mnuRemoveCurrentFilters ' Me.mnuRemoveCurrentFilters.Name = "mnuRemoveCurrentFilters" - Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(212, 22) + Me.mnuRemoveCurrentFilters.Size = New System.Drawing.Size(214, 22) Me.mnuRemoveCurrentFilters.Text = "Remove Current Filter" ' 'rowContextMenuStrip ' 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.mnuRemoveCurrentFilter}) + 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.rowContextMenuStrip.Name = "columnContextMenuStrip" - Me.rowContextMenuStrip.Size = New System.Drawing.Size(190, 148) + Me.rowContextMenuStrip.Size = New System.Drawing.Size(215, 214) ' 'mnuInsertRowsBefore ' Me.mnuInsertRowsBefore.Name = "mnuInsertRowsBefore" - Me.mnuInsertRowsBefore.Size = New System.Drawing.Size(189, 22) + Me.mnuInsertRowsBefore.Size = New System.Drawing.Size(214, 22) Me.mnuInsertRowsBefore.Text = "Insert Row(s) Before" ' 'mnuInsertRowsAfter ' Me.mnuInsertRowsAfter.Name = "mnuInsertRowsAfter" - Me.mnuInsertRowsAfter.Size = New System.Drawing.Size(189, 22) + Me.mnuInsertRowsAfter.Size = New System.Drawing.Size(214, 22) Me.mnuInsertRowsAfter.Text = "Insert Row(s) After" ' 'mnuDeleteRows ' Me.mnuDeleteRows.Name = "mnuDeleteRows" - Me.mnuDeleteRows.Size = New System.Drawing.Size(189, 22) + Me.mnuDeleteRows.Size = New System.Drawing.Size(214, 22) Me.mnuDeleteRows.Text = "Delete Row(s)" ' 'ToolStripSeparator2 ' Me.ToolStripSeparator2.Name = "ToolStripSeparator2" - Me.ToolStripSeparator2.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator2.Size = New System.Drawing.Size(211, 6) ' 'mnuAddComment ' Me.mnuAddComment.Name = "mnuAddComment" - Me.mnuAddComment.Size = New System.Drawing.Size(189, 22) + Me.mnuAddComment.Size = New System.Drawing.Size(214, 22) Me.mnuAddComment.Text = "Add Comment..." ' 'ToolStripSeparator4 ' Me.ToolStripSeparator4.Name = "ToolStripSeparator4" - Me.ToolStripSeparator4.Size = New System.Drawing.Size(186, 6) + Me.ToolStripSeparator4.Size = New System.Drawing.Size(211, 6) ' 'mnuFilter ' Me.mnuFilter.Name = "mnuFilter" - Me.mnuFilter.Size = New System.Drawing.Size(189, 22) + Me.mnuFilter.Size = New System.Drawing.Size(214, 22) Me.mnuFilter.Tag = "Filter..." Me.mnuFilter.Text = "Filter..." ' + 'mnuRowContextColumnSelection + ' + Me.mnuRowContextColumnSelection.Name = "mnuRowContextColumnSelection" + Me.mnuRowContextColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuRowContextColumnSelection.Text = "Column Selection..." + ' + 'mnuRowContextRemoveCurrentColumnSelection + ' + Me.mnuRowContextRemoveCurrentColumnSelection.Name = "mnuRowContextRemoveCurrentColumnSelection" + Me.mnuRowContextRemoveCurrentColumnSelection.Size = New System.Drawing.Size(214, 22) + Me.mnuRowContextRemoveCurrentColumnSelection.Text = "Remove Column Selection" + ' 'mnuRemoveCurrentFilter ' Me.mnuRemoveCurrentFilter.Name = "mnuRemoveCurrentFilter" - Me.mnuRemoveCurrentFilter.Size = New System.Drawing.Size(189, 22) + Me.mnuRemoveCurrentFilter.Size = New System.Drawing.Size(214, 22) Me.mnuRemoveCurrentFilter.Tag = "Remove_Current_Filter" Me.mnuRemoveCurrentFilter.Text = "Remove Current Filter" ' @@ -984,4 +1026,10 @@ Partial Class ucrDataView Friend WithEvents linkStartOpenLibrary As LinkLabel Friend WithEvents ucrReoGrid As ucrDataViewReoGrid Friend WithEvents ucrLinuxGrid As ucrDataViewLinuxGrid + Friend WithEvents mnuColumnContextColumnSelection As ToolStripMenuItem + Friend WithEvents mnuColumnContextRemoveCurrentColumnSelection As ToolStripMenuItem + Friend WithEvents mnuCellContextColumnSelection As ToolStripMenuItem + Friend WithEvents mnuCellContextRemoveCurrentColumnSelection As ToolStripMenuItem + Friend WithEvents mnuRowContextColumnSelection As ToolStripMenuItem + Friend WithEvents mnuRowContextRemoveCurrentColumnSelection As ToolStripMenuItem End Class diff --git a/instat/ucrDataView.vb b/instat/ucrDataView.vb index 198a0aa2ad5..24825936138 100644 --- a/instat/ucrDataView.vb +++ b/instat/ucrDataView.vb @@ -217,8 +217,12 @@ Public Class ucrDataView RefreshDisplayInformation() End Sub + Public Function GetWorkSheetCount() As Integer + Return _grid.GetWorksheetCount + End Function + Private Sub RefreshDisplayInformation() - If _grid.GetWorksheetCount <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then + If GetWorkSheetCount() <> 0 AndAlso _clsDataBook IsNot Nothing AndAlso GetCurrentDataFrameFocus() IsNot Nothing Then frmMain.strCurrentDataFrame = _grid.CurrentWorksheet.Name frmMain.tstatus.Text = _grid.CurrentWorksheet.Name SetDisplayLabels() @@ -251,6 +255,15 @@ Public Class ucrDataView tlpTableContainer.ColumnStyles(1).Width = 0 tlpTableContainer.ColumnStyles(2).SizeType = SizeType.Percent tlpTableContainer.ColumnStyles(2).Width = 100 + 'when the TableLayoutPanel column for the reogrid gets set to 0, + 'the SheetTabWidth gets set to 60 pixels + 'this makes the sheet names invisible when data is loaded into the grid. + 'this check is meant to be a quick fix to this. + 'Other possible solutions can implemented later + If ucrReoGrid.grdData.SheetTabWidth < 450 Then + '450 pixels is the ideal width for displaying mutliple sheet names loaded to the grid + ucrReoGrid.grdData.SheetTabWidth = 450 + End If Else tlpTableContainer.ColumnStyles(1).SizeType = SizeType.Percent tlpTableContainer.ColumnStyles(1).Width = 100 @@ -270,7 +283,7 @@ Public Class ucrDataView Private Sub SetDisplayLabels() lblRowDisplay.Text = "Showing rows " & GetCurrentDataFrameFocus().clsVisiblePage.intStartRow & " to " & GetCurrentDataFrameFocus().clsVisiblePage.intEndRow & " of " - If GetCurrentDataFrameFocus().clsFilter.bApplied Then + If GetCurrentDataFrameFocus().clsFilter.bFilterApplied Then lblRowDisplay.Text &= GetCurrentDataFrameFocus().clsFilter.iFilteredRowCount & " (" & GetCurrentDataFrameFocus().iTotalRowCount & ")" & " | Active filter: " & GetCurrentDataFrameFocus().clsFilter.strName Else @@ -497,7 +510,8 @@ Public Class ucrDataView mnuInsertColsBefore.Text = "Insert " & GetSelectedColumns.Count & " Columns Before" mnuInsertColsAfter.Text = "Insert " & GetSelectedColumns.Count & " Columns After" End If - mnuClearColumnFilter.Enabled = GetCurrentDataFrameFocus().clsFilter.bApplied + mnuClearColumnFilter.Enabled = GetCurrentDataFrameFocus().clsFilter.bFilterApplied + mnuColumnContextRemoveCurrentColumnSelection.Enabled = GetCurrentDataFrameFocus().clsFilter.bColumnSelectionApplied End Sub Private Sub HideSheet_Click(sender As Object, e As EventArgs) Handles HideSheet.Click @@ -511,7 +525,7 @@ Public Class ucrDataView End Sub Private Sub statusColumnMenu_Opening(sender As Object, e As CancelEventArgs) Handles statusColumnMenu.Opening - HideSheet.Enabled = (_grid.GetWorksheetCount > 1) + HideSheet.Enabled = (GetWorkSheetCount() > 1) End Sub Private Sub mnuReorderColumns_Click(sender As Object, e As EventArgs) Handles mnuReorderColumns.Click @@ -654,7 +668,7 @@ Public Class ucrDataView panelRecentMenuItems.Controls.Add(linkMenuItem) 'add the label control. will be besides each other on the same Y axis - lblMenuItemPath.Text = If(String.IsNullOrEmpty(linkMenuItem.Tag), "", Path.GetDirectoryName(linkMenuItem.Tag)) + lblMenuItemPath.Text = If(String.IsNullOrEmpty(linkMenuItem.Tag), "", Path.GetDirectoryName(linkMenuItem.Tag).Replace("\", "/")) lblMenuItemPath.Location = New Point(linkMenuItem.Width + 10, position) lblMenuItemPath.Height = 13 lblMenuItemPath.AutoSize = True @@ -681,7 +695,7 @@ Public Class ucrDataView End Sub Private Sub linkHelpIntroduction_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpIntroduction.LinkClicked - Help.ShowHelp(frmMain, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "0") + Help.ShowHelp(frmMain, frmMain.strStaticPath & "/" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "0") End Sub Private Sub linkHelpRpackages_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles linkHelpRpackages.LinkClicked @@ -693,12 +707,14 @@ Public Class ucrDataView End Sub Private Sub rowContextMenuStrip_Opening(sender As Object, e As CancelEventArgs) Handles rowContextMenuStrip.Opening - mnuRemoveCurrentFilter.Enabled = GetCurrentDataFrameFocus().clsFilter.bApplied + mnuRemoveCurrentFilter.Enabled = GetCurrentDataFrameFocus().clsFilter.bFilterApplied + mnuRowContextRemoveCurrentColumnSelection.Enabled = GetCurrentDataFrameFocus().clsFilter.bColumnSelectionApplied End Sub Private Sub cellContextMenuStrip_Opening(sender As Object, e As CancelEventArgs) Handles cellContextMenuStrip.Opening mnuLabelsLevel.Enabled = IsOnlyOneColumnSelected() AndAlso IsOnlyOneColumnSelected() - mnuRemoveCurrentFilters.Enabled = GetCurrentDataFrameFocus().clsFilter.bApplied + mnuRemoveCurrentFilters.Enabled = GetCurrentDataFrameFocus().clsFilter.bFilterApplied + mnuCellContextRemoveCurrentColumnSelection.Enabled = GetCurrentDataFrameFocus().clsFilter.bColumnSelectionApplied End Sub Private Sub mnuColumnAddComment_Click(sender As Object, e As EventArgs) Handles mnuColumnAddComment.Click @@ -784,6 +800,41 @@ Public Class ucrDataView RefreshWorksheet(_grid.CurrentWorksheet, GetCurrentDataFrameFocus()) End Sub + Private Sub mnuColumnContextColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuColumnContextColumnSelection.Click + LoadColumnSelectionDialog() + End Sub + + Private Sub mnuColumnContextRemoveCurrentColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuColumnContextRemoveCurrentColumnSelection.Click + RemoveCurrentColumnSelection() + End Sub + + Private Sub mnuRowContextColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuRowContextColumnSelection.Click + LoadColumnSelectionDialog() + End Sub + + Private Sub mnuRowContextRemoveCurrentColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuRowContextRemoveCurrentColumnSelection.Click + RemoveCurrentColumnSelection() + End Sub + + Private Sub mnuCellContextColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuCellContextColumnSelection.Click + LoadColumnSelectionDialog() + End Sub + + Private Sub mnuCellContextRemoveCurrentColumnSelection_Click(sender As Object, e As EventArgs) Handles mnuCellContextRemoveCurrentColumnSelection.Click + RemoveCurrentColumnSelection() + End Sub + + Private Sub LoadColumnSelectionDialog() + dlgSelect.SetDefaultDataFrame(_grid.CurrentWorksheet.Name) + dlgSelect.ShowDialog() + End Sub + + Private Sub RemoveCurrentColumnSelection() + StartWait() + GetCurrentDataFrameFocus().clsPrepareFunctions.RemoveCurrentColumnSelection() + EndWait() + End Sub + Private Sub ucrDataView_Resize(sender As Object, e As EventArgs) Handles TblPanPageDisplay.Resize ResizeLabels() End Sub diff --git a/instat/ucrFilePath.Designer.vb b/instat/ucrFilePath.Designer.vb index 5e28dfbc7aa..ef2a8fe1e34 100644 --- a/instat/ucrFilePath.Designer.vb +++ b/instat/ucrFilePath.Designer.vb @@ -47,7 +47,6 @@ Partial Class ucrFilePath Me.ucrInputFilePath.AddQuotesIfUnrecognised = True Me.ucrInputFilePath.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.ucrInputFilePath.AutoSize = True Me.ucrInputFilePath.IsMultiline = False Me.ucrInputFilePath.IsReadOnly = True Me.ucrInputFilePath.Location = New System.Drawing.Point(136, 3) @@ -69,7 +68,6 @@ Partial Class ucrFilePath ' 'lblName ' - Me.lblName.AutoSize = True Me.lblName.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.lblName.Location = New System.Drawing.Point(2, 6) Me.lblName.Name = "lblName" @@ -81,14 +79,12 @@ Partial Class ucrFilePath ' Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi - Me.AutoSize = True Me.Controls.Add(Me.ucrInputFilePath) Me.Controls.Add(Me.btnBrowse) Me.Controls.Add(Me.lblName) Me.Name = "ucrFilePath" Me.Size = New System.Drawing.Size(392, 34) Me.ResumeLayout(False) - Me.PerformLayout() End Sub diff --git a/instat/ucrSave.Designer.vb b/instat/ucrSave.Designer.vb index cdd972cbf32..43f0625f36a 100644 --- a/instat/ucrSave.Designer.vb +++ b/instat/ucrSave.Designer.vb @@ -67,15 +67,14 @@ Partial Class ucrSave 'ucrInputComboSave ' Me.ucrInputComboSave.AddQuotesIfUnrecognised = True - Me.ucrInputComboSave.AutoSize = True Me.ucrInputComboSave.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputComboSave.Dock = System.Windows.Forms.DockStyle.Right Me.ucrInputComboSave.GetSetSelectedIndex = -1 Me.ucrInputComboSave.IsReadOnly = False - Me.ucrInputComboSave.Location = New System.Drawing.Point(349, 0) + Me.ucrInputComboSave.Location = New System.Drawing.Point(194, 0) Me.ucrInputComboSave.Margin = New System.Windows.Forms.Padding(9, 12, 9, 12) Me.ucrInputComboSave.Name = "ucrInputComboSave" - Me.ucrInputComboSave.Size = New System.Drawing.Size(0, 34) + Me.ucrInputComboSave.Size = New System.Drawing.Size(155, 34) Me.ucrInputComboSave.TabIndex = 4 ' 'ucrInputTextSave diff --git a/instat/ucrTry.vb b/instat/ucrTry.vb index f01b8c84b5a..201957df359 100644 --- a/instat/ucrTry.vb +++ b/instat/ucrTry.vb @@ -68,7 +68,7 @@ Public Class ucrTry If bIsCommand Then CommandModel = "Command" ElseIf bIsModel Then - CommandModel = "model" + CommandModel = "Model" End If End Sub Private Sub cmdTry_Click(sender As Object, e As EventArgs) Handles cmdTry.Click