diff --git a/instat/dlgScript.Designer.vb b/instat/dlgScript.Designer.vb index abe8f61287a..aa3987e2b19 100644 --- a/instat/dlgScript.Designer.vb +++ b/instat/dlgScript.Designer.vb @@ -24,67 +24,70 @@ Partial Class dlgScript Private Sub InitializeComponent() Me.tbFeatures = New System.Windows.Forms.TabControl() Me.tbPageSaveData = New System.Windows.Forms.TabPage() - Me.ucrChkDisplayGraph = New instat.ucrCheck() - Me.ucrChkSaveDataFrameSingle = New instat.ucrCheck() - Me.lblSaveDataFrame = New System.Windows.Forms.Label() - Me.ucrInputSaveDataFrame = New instat.ucrInputTextBox() + Me.rdoFromRFile = New System.Windows.Forms.RadioButton() + Me.rdoDataFrame = New System.Windows.Forms.RadioButton() Me.lblSaveObjectFormat = New System.Windows.Forms.Label() - Me.ucrCboSaveOutputObjectFormat = New instat.ucrInputComboBox() Me.lblSaveObjectType = New System.Windows.Forms.Label() - Me.ucrCboSaveOutputObjectType = New instat.ucrInputComboBox() Me.rdoSaveOutputObject = New System.Windows.Forms.RadioButton() Me.rdoSaveDataFrame = New System.Windows.Forms.RadioButton() Me.rdoSaveColumn = New System.Windows.Forms.RadioButton() - Me.ucrSaveObject = New instat.ucrSave() - Me.ucrDataFrameSaveOutputSelect = New instat.ucrDataFrame() - Me.ucrPnlSaveData = New instat.UcrPanel() Me.tbPageGetData = New System.Windows.Forms.TabPage() - Me.ucrReceiverGetOutputObject = New instat.ucrReceiverSingle() - Me.ucrReceiverGetColumns = New instat.ucrReceiverMultiple() Me.lblGetColumn = New System.Windows.Forms.Label() Me.lblGetObjectType = New System.Windows.Forms.Label() Me.rdoGetOutputObject = New System.Windows.Forms.RadioButton() Me.lblGetOutputObject = New System.Windows.Forms.Label() Me.rdoGetDataFrame = New System.Windows.Forms.RadioButton() Me.rdoGetColumn = New System.Windows.Forms.RadioButton() - Me.ucrDataFrameGetDF = New instat.ucrDataFrame() - Me.ucrCboGetOutputObjectType = New instat.ucrInputComboBox() - Me.ucrPnlGetData = New instat.UcrPanel() - Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() Me.tbPageCommand = New System.Windows.Forms.TabPage() - Me.ucrChkWindow = New instat.ucrCheck() Me.rdoWindow = New System.Windows.Forms.RadioButton() - Me.ucrChkInto = New instat.ucrCheck() Me.rdoListData = New System.Windows.Forms.RadioButton() - Me.ucrInputSaveData = New instat.ucrInputTextBox() - Me.ucrCboCommandDataPackage = New instat.ucrInputComboBox() - Me.ucrInputViewData = New instat.ucrInputTextBox() Me.rdoViewData = New System.Windows.Forms.RadioButton() Me.lblGraphCommand = New System.Windows.Forms.Label() - Me.ucrInputGraphCommand = New instat.ucrInputTextBox() Me.lblGraphObject = New System.Windows.Forms.Label() - Me.ucrChkOpenRFile = New instat.ucrCheck() - Me.ucrInputChooseFile = New instat.ucrInputTextBox() Me.rdoChooseFile = New System.Windows.Forms.RadioButton() - Me.ucrInputGgplotify = New instat.ucrInputTextBox() Me.rdoGgplotify = New System.Windows.Forms.RadioButton() - Me.ucrInputRemoveObjects = New instat.ucrInputTextBox() Me.rdoCommandPackage = New System.Windows.Forms.RadioButton() Me.rdoCommandObject = New System.Windows.Forms.RadioButton() - Me.ucrCboCommandPackage = New instat.ucrInputComboBox() - Me.ucrPnlCommands = New instat.UcrPanel() Me.tbPageExamples = New System.Windows.Forms.TabPage() Me.cmdHelp = New System.Windows.Forms.Button() Me.rdoExampleData = New System.Windows.Forms.RadioButton() Me.rdoExampleFunction = New System.Windows.Forms.RadioButton() - Me.ucrPnlExample = New instat.UcrPanel() Me.lstExampleCollection = New System.Windows.Forms.ListView() Me.clmDatasets = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.clmDesc = CType(New System.Windows.Forms.ColumnHeader(), System.Windows.Forms.ColumnHeader) Me.Label3 = New System.Windows.Forms.Label() - Me.ucrCboExamplePackages = New instat.ucrInputComboBox() Me.lblPreview = New System.Windows.Forms.Label() Me.txtScript = New System.Windows.Forms.TextBox() + Me.ucrInputSaveRFile = New instat.ucrInputTextBox() + Me.ucrChkDisplayGraph = New instat.ucrCheck() + Me.ucrChkSaveDataFrameSingle = New instat.ucrCheck() + Me.ucrInputSaveDataFrame = New instat.ucrInputTextBox() + Me.ucrCboSaveOutputObjectFormat = New instat.ucrInputComboBox() + Me.ucrCboSaveOutputObjectType = New instat.ucrInputComboBox() + Me.ucrSaveObject = New instat.ucrSave() + Me.ucrDataFrameSaveOutputSelect = New instat.ucrDataFrame() + Me.ucrPnlSaveData = New instat.UcrPanel() + Me.ucrPnlSaveDataFrame = New instat.UcrPanel() + Me.ucrReceiverGetOutputObject = New instat.ucrReceiverSingle() + Me.ucrReceiverGetColumns = New instat.ucrReceiverMultiple() + Me.ucrDataFrameGetDF = New instat.ucrDataFrame() + Me.ucrCboGetOutputObjectType = New instat.ucrInputComboBox() + Me.ucrPnlGetData = New instat.UcrPanel() + Me.ucrSelectorGetObject = New instat.ucrSelectorByDataFrameAddRemove() + Me.ucrChkWindow = New instat.ucrCheck() + Me.ucrChkInto = New instat.ucrCheck() + Me.ucrInputSaveData = New instat.ucrInputTextBox() + Me.ucrCboCommandDataPackage = New instat.ucrInputComboBox() + Me.ucrInputViewData = New instat.ucrInputTextBox() + Me.ucrInputGraphCommand = New instat.ucrInputTextBox() + Me.ucrChkOpenRFile = New instat.ucrCheck() + Me.ucrInputChooseFile = New instat.ucrInputTextBox() + Me.ucrInputGgplotify = New instat.ucrInputTextBox() + Me.ucrInputRemoveObjects = New instat.ucrInputTextBox() + Me.ucrCboCommandPackage = New instat.ucrInputComboBox() + Me.ucrPnlCommands = New instat.UcrPanel() + Me.ucrPnlExample = New instat.UcrPanel() + Me.ucrCboExamplePackages = New instat.ucrInputComboBox() Me.ucrBase = New instat.ucrButtons() Me.tbFeatures.SuspendLayout() Me.tbPageSaveData.SuspendLayout() @@ -107,9 +110,11 @@ Partial Class dlgScript ' 'tbPageSaveData ' + Me.tbPageSaveData.Controls.Add(Me.ucrInputSaveRFile) + Me.tbPageSaveData.Controls.Add(Me.rdoFromRFile) + Me.tbPageSaveData.Controls.Add(Me.rdoDataFrame) Me.tbPageSaveData.Controls.Add(Me.ucrChkDisplayGraph) Me.tbPageSaveData.Controls.Add(Me.ucrChkSaveDataFrameSingle) - Me.tbPageSaveData.Controls.Add(Me.lblSaveDataFrame) Me.tbPageSaveData.Controls.Add(Me.ucrInputSaveDataFrame) Me.tbPageSaveData.Controls.Add(Me.lblSaveObjectFormat) Me.tbPageSaveData.Controls.Add(Me.ucrCboSaveOutputObjectFormat) @@ -121,6 +126,7 @@ Partial Class dlgScript Me.tbPageSaveData.Controls.Add(Me.ucrSaveObject) Me.tbPageSaveData.Controls.Add(Me.ucrDataFrameSaveOutputSelect) Me.tbPageSaveData.Controls.Add(Me.ucrPnlSaveData) + Me.tbPageSaveData.Controls.Add(Me.ucrPnlSaveDataFrame) Me.tbPageSaveData.Location = New System.Drawing.Point(4, 22) Me.tbPageSaveData.Name = "tbPageSaveData" Me.tbPageSaveData.Size = New System.Drawing.Size(438, 245) @@ -128,44 +134,29 @@ Partial Class dlgScript Me.tbPageSaveData.Text = "Save Data" Me.tbPageSaveData.UseVisualStyleBackColor = True ' - 'ucrChkDisplayGraph - ' - Me.ucrChkDisplayGraph.AutoSize = True - Me.ucrChkDisplayGraph.Checked = False - Me.ucrChkDisplayGraph.Location = New System.Drawing.Point(88, 217) - Me.ucrChkDisplayGraph.Name = "ucrChkDisplayGraph" - Me.ucrChkDisplayGraph.Size = New System.Drawing.Size(113, 23) - Me.ucrChkDisplayGraph.TabIndex = 60 - ' - 'ucrChkSaveDataFrameSingle - ' - Me.ucrChkSaveDataFrameSingle.AutoSize = True - Me.ucrChkSaveDataFrameSingle.Checked = False - Me.ucrChkSaveDataFrameSingle.Location = New System.Drawing.Point(91, 101) - Me.ucrChkSaveDataFrameSingle.Name = "ucrChkSaveDataFrameSingle" - Me.ucrChkSaveDataFrameSingle.Size = New System.Drawing.Size(146, 23) - Me.ucrChkSaveDataFrameSingle.TabIndex = 59 - ' - 'lblSaveDataFrame - ' - Me.lblSaveDataFrame.AutoSize = True - Me.lblSaveDataFrame.Location = New System.Drawing.Point(89, 52) - Me.lblSaveDataFrame.Name = "lblSaveDataFrame" - Me.lblSaveDataFrame.Size = New System.Drawing.Size(65, 13) - Me.lblSaveDataFrame.TabIndex = 58 - Me.lblSaveDataFrame.Text = "Data Frame:" - ' - 'ucrInputSaveDataFrame - ' - Me.ucrInputSaveDataFrame.AddQuotesIfUnrecognised = True - Me.ucrInputSaveDataFrame.AutoSize = True - Me.ucrInputSaveDataFrame.IsMultiline = False - Me.ucrInputSaveDataFrame.IsReadOnly = False - Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(92, 70) - Me.ucrInputSaveDataFrame.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" - Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(145, 21) - Me.ucrInputSaveDataFrame.TabIndex = 57 + 'rdoFromRFile + ' + Me.rdoFromRFile.AutoSize = True + Me.rdoFromRFile.Location = New System.Drawing.Point(89, 125) + Me.rdoFromRFile.Margin = New System.Windows.Forms.Padding(2) + Me.rdoFromRFile.Name = "rdoFromRFile" + Me.rdoFromRFile.Size = New System.Drawing.Size(81, 17) + Me.rdoFromRFile.TabIndex = 63 + Me.rdoFromRFile.TabStop = True + Me.rdoFromRFile.Text = "From R File:" + Me.rdoFromRFile.UseVisualStyleBackColor = True + ' + 'rdoDataFrame + ' + Me.rdoDataFrame.AutoSize = True + Me.rdoDataFrame.Location = New System.Drawing.Point(83, 48) + Me.rdoDataFrame.Margin = New System.Windows.Forms.Padding(2) + Me.rdoDataFrame.Name = "rdoDataFrame" + Me.rdoDataFrame.Size = New System.Drawing.Size(109, 17) + Me.rdoDataFrame.TabIndex = 62 + Me.rdoDataFrame.TabStop = True + Me.rdoDataFrame.Text = "From Data Frame:" + Me.rdoDataFrame.UseVisualStyleBackColor = True ' 'lblSaveObjectFormat ' @@ -176,18 +167,6 @@ Partial Class dlgScript Me.lblSaveObjectFormat.TabIndex = 56 Me.lblSaveObjectFormat.Text = "Format:" ' - 'ucrCboSaveOutputObjectFormat - ' - Me.ucrCboSaveOutputObjectFormat.AddQuotesIfUnrecognised = True - Me.ucrCboSaveOutputObjectFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = -1 - Me.ucrCboSaveOutputObjectFormat.IsReadOnly = False - Me.ucrCboSaveOutputObjectFormat.Location = New System.Drawing.Point(88, 160) - Me.ucrCboSaveOutputObjectFormat.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSaveOutputObjectFormat.Name = "ucrCboSaveOutputObjectFormat" - Me.ucrCboSaveOutputObjectFormat.Size = New System.Drawing.Size(141, 21) - Me.ucrCboSaveOutputObjectFormat.TabIndex = 55 - ' 'lblSaveObjectType ' Me.lblSaveObjectType.AutoSize = True @@ -197,18 +176,6 @@ Partial Class dlgScript Me.lblSaveObjectType.TabIndex = 54 Me.lblSaveObjectType.Text = "Type:" ' - 'ucrCboSaveOutputObjectType - ' - Me.ucrCboSaveOutputObjectType.AddQuotesIfUnrecognised = True - Me.ucrCboSaveOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboSaveOutputObjectType.GetSetSelectedIndex = -1 - Me.ucrCboSaveOutputObjectType.IsReadOnly = False - Me.ucrCboSaveOutputObjectType.Location = New System.Drawing.Point(87, 116) - Me.ucrCboSaveOutputObjectType.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboSaveOutputObjectType.Name = "ucrCboSaveOutputObjectType" - Me.ucrCboSaveOutputObjectType.Size = New System.Drawing.Size(144, 21) - Me.ucrCboSaveOutputObjectType.TabIndex = 53 - ' 'rdoSaveOutputObject ' Me.rdoSaveOutputObject.Appearance = System.Windows.Forms.Appearance.Button @@ -260,35 +227,6 @@ Partial Class dlgScript Me.rdoSaveColumn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoSaveColumn.UseVisualStyleBackColor = True ' - 'ucrSaveObject - ' - Me.ucrSaveObject.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveObject.Location = New System.Drawing.Point(88, 193) - Me.ucrSaveObject.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) - Me.ucrSaveObject.Name = "ucrSaveObject" - Me.ucrSaveObject.Size = New System.Drawing.Size(258, 22) - Me.ucrSaveObject.TabIndex = 35 - ' - 'ucrDataFrameSaveOutputSelect - ' - Me.ucrDataFrameSaveOutputSelect.AutoSize = True - Me.ucrDataFrameSaveOutputSelect.bDropUnusedFilterLevels = False - Me.ucrDataFrameSaveOutputSelect.bUseCurrentFilter = True - Me.ucrDataFrameSaveOutputSelect.Location = New System.Drawing.Point(86, 54) - Me.ucrDataFrameSaveOutputSelect.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameSaveOutputSelect.Name = "ucrDataFrameSaveOutputSelect" - Me.ucrDataFrameSaveOutputSelect.Size = New System.Drawing.Size(224, 59) - Me.ucrDataFrameSaveOutputSelect.TabIndex = 29 - ' - 'ucrPnlSaveData - ' - Me.ucrPnlSaveData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlSaveData.Location = New System.Drawing.Point(13, 12) - Me.ucrPnlSaveData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlSaveData.Name = "ucrPnlSaveData" - Me.ucrPnlSaveData.Size = New System.Drawing.Size(402, 36) - Me.ucrPnlSaveData.TabIndex = 47 - ' 'tbPageGetData ' Me.tbPageGetData.Controls.Add(Me.ucrReceiverGetOutputObject) @@ -311,32 +249,6 @@ Partial Class dlgScript Me.tbPageGetData.Text = "Get Data" Me.tbPageGetData.UseVisualStyleBackColor = True ' - 'ucrReceiverGetOutputObject - ' - Me.ucrReceiverGetOutputObject.AutoSize = True - Me.ucrReceiverGetOutputObject.frmParent = Nothing - Me.ucrReceiverGetOutputObject.Location = New System.Drawing.Point(240, 117) - Me.ucrReceiverGetOutputObject.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverGetOutputObject.Name = "ucrReceiverGetOutputObject" - Me.ucrReceiverGetOutputObject.Selector = Nothing - Me.ucrReceiverGetOutputObject.Size = New System.Drawing.Size(138, 20) - Me.ucrReceiverGetOutputObject.strNcFilePath = "" - Me.ucrReceiverGetOutputObject.TabIndex = 27 - Me.ucrReceiverGetOutputObject.ucrSelector = Nothing - ' - 'ucrReceiverGetColumns - ' - Me.ucrReceiverGetColumns.AutoSize = True - Me.ucrReceiverGetColumns.frmParent = Nothing - Me.ucrReceiverGetColumns.Location = New System.Drawing.Point(243, 104) - Me.ucrReceiverGetColumns.Margin = New System.Windows.Forms.Padding(0) - Me.ucrReceiverGetColumns.Name = "ucrReceiverGetColumns" - Me.ucrReceiverGetColumns.Selector = Nothing - Me.ucrReceiverGetColumns.Size = New System.Drawing.Size(137, 105) - Me.ucrReceiverGetColumns.strNcFilePath = "" - Me.ucrReceiverGetColumns.TabIndex = 49 - Me.ucrReceiverGetColumns.ucrSelector = Nothing - ' 'lblGetColumn ' Me.lblGetColumn.AutoSize = True @@ -417,71 +329,27 @@ Partial Class dlgScript Me.rdoGetColumn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoGetColumn.UseVisualStyleBackColor = True ' - 'ucrDataFrameGetDF - ' - Me.ucrDataFrameGetDF.AutoSize = True - Me.ucrDataFrameGetDF.bDropUnusedFilterLevels = False - Me.ucrDataFrameGetDF.bUseCurrentFilter = True - Me.ucrDataFrameGetDF.Location = New System.Drawing.Point(81, 55) - Me.ucrDataFrameGetDF.Margin = New System.Windows.Forms.Padding(0) - Me.ucrDataFrameGetDF.Name = "ucrDataFrameGetDF" - Me.ucrDataFrameGetDF.Size = New System.Drawing.Size(224, 59) - Me.ucrDataFrameGetDF.TabIndex = 31 - ' - 'ucrCboGetOutputObjectType - ' - Me.ucrCboGetOutputObjectType.AddQuotesIfUnrecognised = True - Me.ucrCboGetOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboGetOutputObjectType.GetSetSelectedIndex = -1 - Me.ucrCboGetOutputObjectType.IsReadOnly = False - Me.ucrCboGetOutputObjectType.Location = New System.Drawing.Point(241, 72) - Me.ucrCboGetOutputObjectType.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboGetOutputObjectType.Name = "ucrCboGetOutputObjectType" - Me.ucrCboGetOutputObjectType.Size = New System.Drawing.Size(137, 21) - Me.ucrCboGetOutputObjectType.TabIndex = 47 - ' - 'ucrPnlGetData - ' - Me.ucrPnlGetData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlGetData.Location = New System.Drawing.Point(5, 10) - Me.ucrPnlGetData.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlGetData.Name = "ucrPnlGetData" - Me.ucrPnlGetData.Size = New System.Drawing.Size(402, 36) - Me.ucrPnlGetData.TabIndex = 42 - ' - 'ucrSelectorGetObject - ' - Me.ucrSelectorGetObject.AutoSize = True - Me.ucrSelectorGetObject.bDropUnusedFilterLevels = False - Me.ucrSelectorGetObject.bShowHiddenColumns = False - Me.ucrSelectorGetObject.bUseCurrentFilter = True - Me.ucrSelectorGetObject.Location = New System.Drawing.Point(9, 52) - Me.ucrSelectorGetObject.Margin = New System.Windows.Forms.Padding(0) - Me.ucrSelectorGetObject.Name = "ucrSelectorGetObject" - Me.ucrSelectorGetObject.Size = New System.Drawing.Size(320, 274) - Me.ucrSelectorGetObject.TabIndex = 34 - ' 'tbPageCommand ' Me.tbPageCommand.Controls.Add(Me.ucrChkWindow) Me.tbPageCommand.Controls.Add(Me.rdoWindow) - Me.tbPageCommand.Controls.Add(Me.ucrChkInto) Me.tbPageCommand.Controls.Add(Me.rdoListData) + Me.tbPageCommand.Controls.Add(Me.rdoViewData) + Me.tbPageCommand.Controls.Add(Me.lblGraphCommand) + Me.tbPageCommand.Controls.Add(Me.lblGraphObject) + Me.tbPageCommand.Controls.Add(Me.rdoChooseFile) + Me.tbPageCommand.Controls.Add(Me.rdoGgplotify) + Me.tbPageCommand.Controls.Add(Me.rdoCommandPackage) + Me.tbPageCommand.Controls.Add(Me.rdoCommandObject) + Me.tbPageCommand.Controls.Add(Me.ucrChkInto) Me.tbPageCommand.Controls.Add(Me.ucrInputSaveData) Me.tbPageCommand.Controls.Add(Me.ucrCboCommandDataPackage) Me.tbPageCommand.Controls.Add(Me.ucrInputViewData) - Me.tbPageCommand.Controls.Add(Me.rdoViewData) - Me.tbPageCommand.Controls.Add(Me.lblGraphCommand) Me.tbPageCommand.Controls.Add(Me.ucrInputGraphCommand) - Me.tbPageCommand.Controls.Add(Me.lblGraphObject) Me.tbPageCommand.Controls.Add(Me.ucrChkOpenRFile) Me.tbPageCommand.Controls.Add(Me.ucrInputChooseFile) - Me.tbPageCommand.Controls.Add(Me.rdoChooseFile) Me.tbPageCommand.Controls.Add(Me.ucrInputGgplotify) - Me.tbPageCommand.Controls.Add(Me.rdoGgplotify) Me.tbPageCommand.Controls.Add(Me.ucrInputRemoveObjects) - Me.tbPageCommand.Controls.Add(Me.rdoCommandPackage) - Me.tbPageCommand.Controls.Add(Me.rdoCommandObject) Me.tbPageCommand.Controls.Add(Me.ucrCboCommandPackage) Me.tbPageCommand.Controls.Add(Me.ucrPnlCommands) Me.tbPageCommand.Location = New System.Drawing.Point(4, 22) @@ -491,15 +359,6 @@ Partial Class dlgScript Me.tbPageCommand.Text = "Commands" Me.tbPageCommand.UseVisualStyleBackColor = True ' - 'ucrChkWindow - ' - Me.ucrChkWindow.AutoSize = True - Me.ucrChkWindow.Checked = False - Me.ucrChkWindow.Location = New System.Drawing.Point(233, 94) - Me.ucrChkWindow.Name = "ucrChkWindow" - Me.ucrChkWindow.Size = New System.Drawing.Size(126, 23) - Me.ucrChkWindow.TabIndex = 67 - ' 'rdoWindow ' Me.rdoWindow.AutoSize = True @@ -512,15 +371,6 @@ Partial Class dlgScript Me.rdoWindow.Text = "Output Graph Window:" Me.rdoWindow.UseVisualStyleBackColor = True ' - 'ucrChkInto - ' - Me.ucrChkInto.AutoSize = True - Me.ucrChkInto.Checked = False - Me.ucrChkInto.Location = New System.Drawing.Point(233, 33) - Me.ucrChkInto.Name = "ucrChkInto" - Me.ucrChkInto.Size = New System.Drawing.Size(84, 23) - Me.ucrChkInto.TabIndex = 63 - ' 'rdoListData ' Me.rdoListData.AutoSize = True @@ -533,43 +383,7 @@ Partial Class dlgScript Me.rdoListData.Text = "List Data:" Me.rdoListData.UseVisualStyleBackColor = True ' - 'ucrInputSaveData - ' - Me.ucrInputSaveData.AddQuotesIfUnrecognised = True - Me.ucrInputSaveData.AutoSize = True - Me.ucrInputSaveData.IsMultiline = False - Me.ucrInputSaveData.IsReadOnly = False - Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 31) - Me.ucrInputSaveData.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputSaveData.Name = "ucrInputSaveData" - Me.ucrInputSaveData.Size = New System.Drawing.Size(110, 21) - Me.ucrInputSaveData.TabIndex = 60 - ' - 'ucrCboCommandDataPackage - ' - Me.ucrCboCommandDataPackage.AddQuotesIfUnrecognised = True - Me.ucrCboCommandDataPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboCommandDataPackage.GetSetSelectedIndex = -1 - Me.ucrCboCommandDataPackage.IsReadOnly = False - Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 31) - Me.ucrCboCommandDataPackage.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboCommandDataPackage.Name = "ucrCboCommandDataPackage" - Me.ucrCboCommandDataPackage.Size = New System.Drawing.Size(117, 21) - Me.ucrCboCommandDataPackage.TabIndex = 59 - ' - 'ucrInputViewData - ' - Me.ucrInputViewData.AddQuotesIfUnrecognised = True - Me.ucrInputViewData.AutoSize = True - Me.ucrInputViewData.IsMultiline = False - Me.ucrInputViewData.IsReadOnly = False - Me.ucrInputViewData.Location = New System.Drawing.Point(156, 129) - Me.ucrInputViewData.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputViewData.Name = "ucrInputViewData" - Me.ucrInputViewData.Size = New System.Drawing.Size(145, 21) - Me.ucrInputViewData.TabIndex = 57 - ' - 'rdoViewData + 'rdoViewData ' Me.rdoViewData.AutoSize = True Me.rdoViewData.Location = New System.Drawing.Point(25, 129) @@ -590,18 +404,6 @@ Partial Class dlgScript Me.lblGraphCommand.TabIndex = 56 Me.lblGraphCommand.Text = "Graph Command:" ' - 'ucrInputGraphCommand - ' - Me.ucrInputGraphCommand.AddQuotesIfUnrecognised = True - Me.ucrInputGraphCommand.AutoSize = True - Me.ucrInputGraphCommand.IsMultiline = False - Me.ucrInputGraphCommand.IsReadOnly = False - Me.ucrInputGraphCommand.Location = New System.Drawing.Point(247, 161) - Me.ucrInputGraphCommand.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputGraphCommand.Name = "ucrInputGraphCommand" - Me.ucrInputGraphCommand.Size = New System.Drawing.Size(145, 21) - Me.ucrInputGraphCommand.TabIndex = 55 - ' 'lblGraphObject ' Me.lblGraphObject.AutoSize = True @@ -611,27 +413,6 @@ Partial Class dlgScript Me.lblGraphObject.TabIndex = 54 Me.lblGraphObject.Text = "Graph Object:" ' - 'ucrChkOpenRFile - ' - Me.ucrChkOpenRFile.AutoSize = True - Me.ucrChkOpenRFile.Checked = False - Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 64) - Me.ucrChkOpenRFile.Name = "ucrChkOpenRFile" - Me.ucrChkOpenRFile.Size = New System.Drawing.Size(100, 23) - Me.ucrChkOpenRFile.TabIndex = 53 - ' - 'ucrInputChooseFile - ' - Me.ucrInputChooseFile.AddQuotesIfUnrecognised = True - Me.ucrInputChooseFile.AutoSize = True - Me.ucrInputChooseFile.IsMultiline = False - Me.ucrInputChooseFile.IsReadOnly = False - Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 64) - Me.ucrInputChooseFile.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputChooseFile.Name = "ucrInputChooseFile" - Me.ucrInputChooseFile.Size = New System.Drawing.Size(145, 21) - Me.ucrInputChooseFile.TabIndex = 51 - ' 'rdoChooseFile ' Me.rdoChooseFile.AutoSize = True @@ -644,18 +425,6 @@ Partial Class dlgScript Me.rdoChooseFile.Text = "Choose File:" Me.rdoChooseFile.UseVisualStyleBackColor = True ' - 'ucrInputGgplotify - ' - Me.ucrInputGgplotify.AddQuotesIfUnrecognised = True - Me.ucrInputGgplotify.AutoSize = True - Me.ucrInputGgplotify.IsMultiline = False - Me.ucrInputGgplotify.IsReadOnly = False - Me.ucrInputGgplotify.Location = New System.Drawing.Point(247, 186) - Me.ucrInputGgplotify.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputGgplotify.Name = "ucrInputGgplotify" - Me.ucrInputGgplotify.Size = New System.Drawing.Size(145, 21) - Me.ucrInputGgplotify.TabIndex = 49 - ' 'rdoGgplotify ' Me.rdoGgplotify.AutoSize = True @@ -668,18 +437,6 @@ Partial Class dlgScript Me.rdoGgplotify.Text = "Ggplotify:" Me.rdoGgplotify.UseVisualStyleBackColor = True ' - 'ucrInputRemoveObjects - ' - Me.ucrInputRemoveObjects.AddQuotesIfUnrecognised = True - Me.ucrInputRemoveObjects.AutoSize = True - Me.ucrInputRemoveObjects.IsMultiline = False - Me.ucrInputRemoveObjects.IsReadOnly = False - Me.ucrInputRemoveObjects.Location = New System.Drawing.Point(156, 218) - Me.ucrInputRemoveObjects.Margin = New System.Windows.Forms.Padding(9) - Me.ucrInputRemoveObjects.Name = "ucrInputRemoveObjects" - Me.ucrInputRemoveObjects.Size = New System.Drawing.Size(145, 21) - Me.ucrInputRemoveObjects.TabIndex = 2 - ' 'rdoCommandPackage ' Me.rdoCommandPackage.AutoSize = True @@ -704,27 +461,6 @@ Partial Class dlgScript Me.rdoCommandObject.Text = "Remove Object(s):" Me.rdoCommandObject.UseVisualStyleBackColor = True ' - 'ucrCboCommandPackage - ' - Me.ucrCboCommandPackage.AddQuotesIfUnrecognised = True - Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 - Me.ucrCboCommandPackage.IsReadOnly = False - Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 5) - Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" - Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) - Me.ucrCboCommandPackage.TabIndex = 44 - ' - 'ucrPnlCommands - ' - Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlCommands.Location = New System.Drawing.Point(2, 8) - Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlCommands.Name = "ucrPnlCommands" - Me.ucrPnlCommands.Size = New System.Drawing.Size(429, 238) - Me.ucrPnlCommands.TabIndex = 47 - ' 'tbPageExamples ' Me.tbPageExamples.Controls.Add(Me.cmdHelp) @@ -784,15 +520,6 @@ Partial Class dlgScript Me.rdoExampleFunction.TextAlign = System.Drawing.ContentAlignment.MiddleCenter Me.rdoExampleFunction.UseVisualStyleBackColor = True ' - 'ucrPnlExample - ' - Me.ucrPnlExample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrPnlExample.Location = New System.Drawing.Point(7, 51) - Me.ucrPnlExample.Margin = New System.Windows.Forms.Padding(6) - Me.ucrPnlExample.Name = "ucrPnlExample" - Me.ucrPnlExample.Size = New System.Drawing.Size(402, 34) - Me.ucrPnlExample.TabIndex = 56 - ' 'lstExampleCollection ' Me.lstExampleCollection.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.clmDatasets, Me.clmDesc}) @@ -829,18 +556,6 @@ Partial Class dlgScript Me.Label3.TabIndex = 52 Me.Label3.Text = "Package" ' - 'ucrCboExamplePackages - ' - Me.ucrCboExamplePackages.AddQuotesIfUnrecognised = True - Me.ucrCboExamplePackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrCboExamplePackages.GetSetSelectedIndex = -1 - Me.ucrCboExamplePackages.IsReadOnly = False - Me.ucrCboExamplePackages.Location = New System.Drawing.Point(14, 22) - Me.ucrCboExamplePackages.Margin = New System.Windows.Forms.Padding(9) - Me.ucrCboExamplePackages.Name = "ucrCboExamplePackages" - Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) - Me.ucrCboExamplePackages.TabIndex = 51 - ' 'lblPreview ' Me.lblPreview.AutoSize = True @@ -860,6 +575,333 @@ Partial Class dlgScript Me.txtScript.Size = New System.Drawing.Size(445, 96) Me.txtScript.TabIndex = 32 ' + 'ucrInputSaveRFile + ' + Me.ucrInputSaveRFile.AddQuotesIfUnrecognised = True + Me.ucrInputSaveRFile.AutoSize = True + Me.ucrInputSaveRFile.IsMultiline = False + Me.ucrInputSaveRFile.IsReadOnly = False + Me.ucrInputSaveRFile.Location = New System.Drawing.Point(92, 150) + Me.ucrInputSaveRFile.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveRFile.Name = "ucrInputSaveRFile" + Me.ucrInputSaveRFile.Size = New System.Drawing.Size(145, 21) + Me.ucrInputSaveRFile.TabIndex = 64 + ' + 'ucrChkDisplayGraph + ' + Me.ucrChkDisplayGraph.AutoSize = True + Me.ucrChkDisplayGraph.Checked = False + Me.ucrChkDisplayGraph.Location = New System.Drawing.Point(88, 217) + Me.ucrChkDisplayGraph.Name = "ucrChkDisplayGraph" + Me.ucrChkDisplayGraph.Size = New System.Drawing.Size(113, 23) + Me.ucrChkDisplayGraph.TabIndex = 60 + ' + 'ucrChkSaveDataFrameSingle + ' + Me.ucrChkSaveDataFrameSingle.AutoSize = True + Me.ucrChkSaveDataFrameSingle.Checked = False + Me.ucrChkSaveDataFrameSingle.Location = New System.Drawing.Point(91, 101) + Me.ucrChkSaveDataFrameSingle.Name = "ucrChkSaveDataFrameSingle" + Me.ucrChkSaveDataFrameSingle.Size = New System.Drawing.Size(146, 23) + Me.ucrChkSaveDataFrameSingle.TabIndex = 59 + ' + 'ucrInputSaveDataFrame + ' + Me.ucrInputSaveDataFrame.AddQuotesIfUnrecognised = True + Me.ucrInputSaveDataFrame.AutoSize = True + Me.ucrInputSaveDataFrame.IsMultiline = False + Me.ucrInputSaveDataFrame.IsReadOnly = False + Me.ucrInputSaveDataFrame.Location = New System.Drawing.Point(92, 70) + Me.ucrInputSaveDataFrame.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveDataFrame.Name = "ucrInputSaveDataFrame" + Me.ucrInputSaveDataFrame.Size = New System.Drawing.Size(145, 21) + Me.ucrInputSaveDataFrame.TabIndex = 57 + ' + 'ucrCboSaveOutputObjectFormat + ' + Me.ucrCboSaveOutputObjectFormat.AddQuotesIfUnrecognised = True + Me.ucrCboSaveOutputObjectFormat.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSaveOutputObjectFormat.GetSetSelectedIndex = -1 + Me.ucrCboSaveOutputObjectFormat.IsReadOnly = False + Me.ucrCboSaveOutputObjectFormat.Location = New System.Drawing.Point(88, 160) + Me.ucrCboSaveOutputObjectFormat.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSaveOutputObjectFormat.Name = "ucrCboSaveOutputObjectFormat" + Me.ucrCboSaveOutputObjectFormat.Size = New System.Drawing.Size(141, 21) + Me.ucrCboSaveOutputObjectFormat.TabIndex = 55 + ' + 'ucrCboSaveOutputObjectType + ' + Me.ucrCboSaveOutputObjectType.AddQuotesIfUnrecognised = True + Me.ucrCboSaveOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboSaveOutputObjectType.GetSetSelectedIndex = -1 + Me.ucrCboSaveOutputObjectType.IsReadOnly = False + Me.ucrCboSaveOutputObjectType.Location = New System.Drawing.Point(87, 116) + Me.ucrCboSaveOutputObjectType.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboSaveOutputObjectType.Name = "ucrCboSaveOutputObjectType" + Me.ucrCboSaveOutputObjectType.Size = New System.Drawing.Size(144, 21) + Me.ucrCboSaveOutputObjectType.TabIndex = 53 + ' + 'ucrSaveObject + ' + Me.ucrSaveObject.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrSaveObject.Location = New System.Drawing.Point(88, 193) + Me.ucrSaveObject.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.ucrSaveObject.Name = "ucrSaveObject" + Me.ucrSaveObject.Size = New System.Drawing.Size(258, 22) + Me.ucrSaveObject.TabIndex = 35 + ' + 'ucrDataFrameSaveOutputSelect + ' + Me.ucrDataFrameSaveOutputSelect.AutoSize = True + Me.ucrDataFrameSaveOutputSelect.bDropUnusedFilterLevels = False + Me.ucrDataFrameSaveOutputSelect.bUseCurrentFilter = True + Me.ucrDataFrameSaveOutputSelect.Location = New System.Drawing.Point(86, 54) + Me.ucrDataFrameSaveOutputSelect.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameSaveOutputSelect.Name = "ucrDataFrameSaveOutputSelect" + Me.ucrDataFrameSaveOutputSelect.Size = New System.Drawing.Size(224, 59) + Me.ucrDataFrameSaveOutputSelect.TabIndex = 29 + ' + 'ucrPnlSaveData + ' + Me.ucrPnlSaveData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSaveData.Location = New System.Drawing.Point(13, 12) + Me.ucrPnlSaveData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlSaveData.Name = "ucrPnlSaveData" + Me.ucrPnlSaveData.Size = New System.Drawing.Size(402, 36) + Me.ucrPnlSaveData.TabIndex = 47 + ' + 'ucrPnlSaveDataFrame + ' + Me.ucrPnlSaveDataFrame.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlSaveDataFrame.Location = New System.Drawing.Point(5, 48) + Me.ucrPnlSaveDataFrame.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlSaveDataFrame.Name = "ucrPnlSaveDataFrame" + Me.ucrPnlSaveDataFrame.Size = New System.Drawing.Size(429, 134) + Me.ucrPnlSaveDataFrame.TabIndex = 65 + ' + 'ucrReceiverGetOutputObject + ' + Me.ucrReceiverGetOutputObject.AutoSize = True + Me.ucrReceiverGetOutputObject.frmParent = Nothing + Me.ucrReceiverGetOutputObject.Location = New System.Drawing.Point(240, 117) + Me.ucrReceiverGetOutputObject.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverGetOutputObject.Name = "ucrReceiverGetOutputObject" + Me.ucrReceiverGetOutputObject.Selector = Nothing + Me.ucrReceiverGetOutputObject.Size = New System.Drawing.Size(138, 20) + Me.ucrReceiverGetOutputObject.strNcFilePath = "" + Me.ucrReceiverGetOutputObject.TabIndex = 27 + Me.ucrReceiverGetOutputObject.ucrSelector = Nothing + ' + 'ucrReceiverGetColumns + ' + Me.ucrReceiverGetColumns.AutoSize = True + Me.ucrReceiverGetColumns.frmParent = Nothing + Me.ucrReceiverGetColumns.Location = New System.Drawing.Point(243, 104) + Me.ucrReceiverGetColumns.Margin = New System.Windows.Forms.Padding(0) + Me.ucrReceiverGetColumns.Name = "ucrReceiverGetColumns" + Me.ucrReceiverGetColumns.Selector = Nothing + Me.ucrReceiverGetColumns.Size = New System.Drawing.Size(137, 105) + Me.ucrReceiverGetColumns.strNcFilePath = "" + Me.ucrReceiverGetColumns.TabIndex = 49 + Me.ucrReceiverGetColumns.ucrSelector = Nothing + ' + 'ucrDataFrameGetDF + ' + Me.ucrDataFrameGetDF.AutoSize = True + Me.ucrDataFrameGetDF.bDropUnusedFilterLevels = False + Me.ucrDataFrameGetDF.bUseCurrentFilter = True + Me.ucrDataFrameGetDF.Location = New System.Drawing.Point(81, 55) + Me.ucrDataFrameGetDF.Margin = New System.Windows.Forms.Padding(0) + Me.ucrDataFrameGetDF.Name = "ucrDataFrameGetDF" + Me.ucrDataFrameGetDF.Size = New System.Drawing.Size(224, 59) + Me.ucrDataFrameGetDF.TabIndex = 31 + ' + 'ucrCboGetOutputObjectType + ' + Me.ucrCboGetOutputObjectType.AddQuotesIfUnrecognised = True + Me.ucrCboGetOutputObjectType.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboGetOutputObjectType.GetSetSelectedIndex = -1 + Me.ucrCboGetOutputObjectType.IsReadOnly = False + Me.ucrCboGetOutputObjectType.Location = New System.Drawing.Point(241, 72) + Me.ucrCboGetOutputObjectType.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboGetOutputObjectType.Name = "ucrCboGetOutputObjectType" + Me.ucrCboGetOutputObjectType.Size = New System.Drawing.Size(137, 21) + Me.ucrCboGetOutputObjectType.TabIndex = 47 + ' + 'ucrPnlGetData + ' + Me.ucrPnlGetData.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlGetData.Location = New System.Drawing.Point(5, 10) + Me.ucrPnlGetData.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlGetData.Name = "ucrPnlGetData" + Me.ucrPnlGetData.Size = New System.Drawing.Size(402, 36) + Me.ucrPnlGetData.TabIndex = 42 + ' + 'ucrSelectorGetObject + ' + Me.ucrSelectorGetObject.AutoSize = True + Me.ucrSelectorGetObject.bDropUnusedFilterLevels = False + Me.ucrSelectorGetObject.bShowHiddenColumns = False + Me.ucrSelectorGetObject.bUseCurrentFilter = True + Me.ucrSelectorGetObject.Location = New System.Drawing.Point(9, 52) + Me.ucrSelectorGetObject.Margin = New System.Windows.Forms.Padding(0) + Me.ucrSelectorGetObject.Name = "ucrSelectorGetObject" + Me.ucrSelectorGetObject.Size = New System.Drawing.Size(320, 274) + Me.ucrSelectorGetObject.TabIndex = 34 + ' + 'ucrChkWindow + ' + Me.ucrChkWindow.AutoSize = True + Me.ucrChkWindow.Checked = False + Me.ucrChkWindow.Location = New System.Drawing.Point(233, 94) + Me.ucrChkWindow.Name = "ucrChkWindow" + Me.ucrChkWindow.Size = New System.Drawing.Size(126, 23) + Me.ucrChkWindow.TabIndex = 67 + ' + 'ucrChkInto + ' + Me.ucrChkInto.AutoSize = True + Me.ucrChkInto.Checked = False + Me.ucrChkInto.Location = New System.Drawing.Point(233, 33) + Me.ucrChkInto.Name = "ucrChkInto" + Me.ucrChkInto.Size = New System.Drawing.Size(84, 23) + Me.ucrChkInto.TabIndex = 63 + ' + 'ucrInputSaveData + ' + Me.ucrInputSaveData.AddQuotesIfUnrecognised = True + Me.ucrInputSaveData.AutoSize = True + Me.ucrInputSaveData.IsMultiline = False + Me.ucrInputSaveData.IsReadOnly = False + Me.ucrInputSaveData.Location = New System.Drawing.Point(319, 31) + Me.ucrInputSaveData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputSaveData.Name = "ucrInputSaveData" + Me.ucrInputSaveData.Size = New System.Drawing.Size(110, 21) + Me.ucrInputSaveData.TabIndex = 60 + ' + 'ucrCboCommandDataPackage + ' + Me.ucrCboCommandDataPackage.AddQuotesIfUnrecognised = True + Me.ucrCboCommandDataPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboCommandDataPackage.GetSetSelectedIndex = -1 + Me.ucrCboCommandDataPackage.IsReadOnly = False + Me.ucrCboCommandDataPackage.Location = New System.Drawing.Point(109, 31) + Me.ucrCboCommandDataPackage.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboCommandDataPackage.Name = "ucrCboCommandDataPackage" + Me.ucrCboCommandDataPackage.Size = New System.Drawing.Size(117, 21) + Me.ucrCboCommandDataPackage.TabIndex = 59 + ' + 'ucrInputViewData + ' + Me.ucrInputViewData.AddQuotesIfUnrecognised = True + Me.ucrInputViewData.AutoSize = True + Me.ucrInputViewData.IsMultiline = False + Me.ucrInputViewData.IsReadOnly = False + Me.ucrInputViewData.Location = New System.Drawing.Point(156, 129) + Me.ucrInputViewData.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputViewData.Name = "ucrInputViewData" + Me.ucrInputViewData.Size = New System.Drawing.Size(145, 21) + Me.ucrInputViewData.TabIndex = 57 + ' + 'ucrInputGraphCommand + ' + Me.ucrInputGraphCommand.AddQuotesIfUnrecognised = True + Me.ucrInputGraphCommand.AutoSize = True + Me.ucrInputGraphCommand.IsMultiline = False + Me.ucrInputGraphCommand.IsReadOnly = False + Me.ucrInputGraphCommand.Location = New System.Drawing.Point(247, 161) + Me.ucrInputGraphCommand.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputGraphCommand.Name = "ucrInputGraphCommand" + Me.ucrInputGraphCommand.Size = New System.Drawing.Size(145, 21) + Me.ucrInputGraphCommand.TabIndex = 55 + ' + 'ucrChkOpenRFile + ' + Me.ucrChkOpenRFile.AutoSize = True + Me.ucrChkOpenRFile.Checked = False + Me.ucrChkOpenRFile.Location = New System.Drawing.Point(156, 64) + Me.ucrChkOpenRFile.Name = "ucrChkOpenRFile" + Me.ucrChkOpenRFile.Size = New System.Drawing.Size(100, 23) + Me.ucrChkOpenRFile.TabIndex = 53 + ' + 'ucrInputChooseFile + ' + Me.ucrInputChooseFile.AddQuotesIfUnrecognised = True + Me.ucrInputChooseFile.AutoSize = True + Me.ucrInputChooseFile.IsMultiline = False + Me.ucrInputChooseFile.IsReadOnly = False + Me.ucrInputChooseFile.Location = New System.Drawing.Point(265, 64) + Me.ucrInputChooseFile.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputChooseFile.Name = "ucrInputChooseFile" + Me.ucrInputChooseFile.Size = New System.Drawing.Size(145, 21) + Me.ucrInputChooseFile.TabIndex = 51 + ' + 'ucrInputGgplotify + ' + Me.ucrInputGgplotify.AddQuotesIfUnrecognised = True + Me.ucrInputGgplotify.AutoSize = True + Me.ucrInputGgplotify.IsMultiline = False + Me.ucrInputGgplotify.IsReadOnly = False + Me.ucrInputGgplotify.Location = New System.Drawing.Point(247, 186) + Me.ucrInputGgplotify.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputGgplotify.Name = "ucrInputGgplotify" + Me.ucrInputGgplotify.Size = New System.Drawing.Size(145, 21) + Me.ucrInputGgplotify.TabIndex = 49 + ' + 'ucrInputRemoveObjects + ' + Me.ucrInputRemoveObjects.AddQuotesIfUnrecognised = True + Me.ucrInputRemoveObjects.AutoSize = True + Me.ucrInputRemoveObjects.IsMultiline = False + Me.ucrInputRemoveObjects.IsReadOnly = False + Me.ucrInputRemoveObjects.Location = New System.Drawing.Point(156, 218) + Me.ucrInputRemoveObjects.Margin = New System.Windows.Forms.Padding(9) + Me.ucrInputRemoveObjects.Name = "ucrInputRemoveObjects" + Me.ucrInputRemoveObjects.Size = New System.Drawing.Size(145, 21) + Me.ucrInputRemoveObjects.TabIndex = 2 + ' + 'ucrCboCommandPackage + ' + Me.ucrCboCommandPackage.AddQuotesIfUnrecognised = True + Me.ucrCboCommandPackage.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboCommandPackage.GetSetSelectedIndex = -1 + Me.ucrCboCommandPackage.IsReadOnly = False + Me.ucrCboCommandPackage.Location = New System.Drawing.Point(156, 5) + Me.ucrCboCommandPackage.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboCommandPackage.Name = "ucrCboCommandPackage" + Me.ucrCboCommandPackage.Size = New System.Drawing.Size(137, 21) + Me.ucrCboCommandPackage.TabIndex = 44 + ' + 'ucrPnlCommands + ' + Me.ucrPnlCommands.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlCommands.Location = New System.Drawing.Point(2, 8) + Me.ucrPnlCommands.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlCommands.Name = "ucrPnlCommands" + Me.ucrPnlCommands.Size = New System.Drawing.Size(429, 238) + Me.ucrPnlCommands.TabIndex = 47 + ' + 'ucrPnlExample + ' + Me.ucrPnlExample.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrPnlExample.Location = New System.Drawing.Point(7, 51) + Me.ucrPnlExample.Margin = New System.Windows.Forms.Padding(6) + Me.ucrPnlExample.Name = "ucrPnlExample" + Me.ucrPnlExample.Size = New System.Drawing.Size(402, 34) + Me.ucrPnlExample.TabIndex = 56 + ' + 'ucrCboExamplePackages + ' + Me.ucrCboExamplePackages.AddQuotesIfUnrecognised = True + Me.ucrCboExamplePackages.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.ucrCboExamplePackages.GetSetSelectedIndex = -1 + Me.ucrCboExamplePackages.IsReadOnly = False + Me.ucrCboExamplePackages.Location = New System.Drawing.Point(14, 22) + Me.ucrCboExamplePackages.Margin = New System.Windows.Forms.Padding(9) + Me.ucrCboExamplePackages.Name = "ucrCboExamplePackages" + Me.ucrCboExamplePackages.Size = New System.Drawing.Size(137, 21) + Me.ucrCboExamplePackages.TabIndex = 51 + ' 'ucrBase ' Me.ucrBase.AutoSize = True @@ -943,7 +985,6 @@ Partial Class dlgScript Friend WithEvents ucrPnlCommands As UcrPanel Friend WithEvents rdoCommandPackage As RadioButton Friend WithEvents rdoCommandObject As RadioButton - Friend WithEvents lblSaveDataFrame As Label Friend WithEvents ucrInputSaveDataFrame As ucrInputTextBox Friend WithEvents ucrChkSaveDataFrameSingle As ucrCheck Friend WithEvents ucrChkDisplayGraph As ucrCheck @@ -964,4 +1005,8 @@ Partial Class dlgScript Friend WithEvents ucrChkWindow As ucrCheck Friend WithEvents rdoWindow As RadioButton Friend WithEvents cmdHelp As Button + Friend WithEvents ucrInputSaveRFile As ucrInputTextBox + Friend WithEvents rdoFromRFile As RadioButton + Friend WithEvents rdoDataFrame As RadioButton + Friend WithEvents ucrPnlSaveDataFrame As UcrPanel End Class diff --git a/instat/dlgScript.vb b/instat/dlgScript.vb index ce35d7bf66e..7f2316ef17d 100644 --- a/instat/dlgScript.vb +++ b/instat/dlgScript.vb @@ -76,9 +76,13 @@ Public Class dlgScript ucrSaveObject.SetIsComboBox() ucrSaveObject.SetDataFrameSelector(ucrDataFrameSaveOutputSelect) - ucrInputSaveDataFrame.SetLinkedDisplayControl(lblSaveDataFrame) + 'ucrInputSaveDataFrame.SetLinkedDisplayControl(lblSaveDataFrame) + ucrPnlSaveDataFrame.AddRadioButton(rdoDataFrame) + ucrPnlSaveDataFrame.AddRadioButton(rdoFromRFile) + ucrChkSaveDataFrameSingle.SetText("Single") + ucrChkDisplayGraph.SetText("Display Output") '-------------------------------- @@ -185,7 +189,7 @@ Public Class dlgScript ucrChkDisplayGraph.Checked = True ucrChkOpenRFile.Checked = False ucrChkInto.Checked = False - ucrChkDisplayGraph.Checked = False + 'ucrChkDispla.Checked = False ucrChkWindow.Checked = True ucrDataFrameSaveOutputSelect.Reset() @@ -207,12 +211,15 @@ Public Class dlgScript ucrCboSaveOutputObjectType.SetVisible(False) ucrCboSaveOutputObjectFormat.SetVisible(False) ucrSaveObject.SetVisible(False) - ucrInputSaveDataFrame.SetVisible(False) + 'ucrInputSaveDataFrame.SetVisible(False) ucrChkDisplayGraph.Visible = False - ucrChkSaveDataFrameSingle.SetVisible(False) + ucrPnlSaveDataFrame.SetVisible(False) + ' ucrChkSaveDataFrameSingle.SetVisible(False) If rdoSaveDataFrame.Checked Then - ucrInputSaveDataFrame.SetVisible(True) - ucrChkSaveDataFrameSingle.SetVisible(True) + 'ucrInputSaveDataFrame.SetVisible(True) + ' ucrChkSaveDataFrameSingle.SetVisible(True) + ucrPnlSaveDataFrame.SetVisible(True) + ucrChkDisplayGraph.Visible = False ucrInputSaveDataFrame.SetName("") ElseIf rdoSaveColumn.Checked Then @@ -265,6 +272,17 @@ Public Class dlgScript End If strScript = "# Save data frame(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRFunction.ToScript() + If ucrInputSaveRFile.IsEmpty Then + ucrChkSaveDataFrameSingle.Enabled = False + Dim clsImportRDSFunction As New RFunction + clsImportRDSFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$import_RDS") + clsImportRDSFunction.AddParameter(strParameterName:="data_RDS", strParameterValue:=strDataFrameName) + + strScript = "# Save RDS File(s) """ & strDataFrameName & """" & Environment.NewLine & clsImportRDSFunction.ToScript() + Else + ucrChkSaveDataFrameSingle.Enabled = True + + End If End If PreviewScript(strScript) @@ -730,4 +748,19 @@ Public Class dlgScript End If End Sub + Private Sub ucrPnlSaveDataFrame_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrPnlSaveDataFrame.ControlValueChanged + + ucrInputSaveRFile.SetVisible(False) + ucrInputSaveDataFrame.SetVisible(False) + ucrChkSaveDataFrameSingle.SetVisible(False) + If rdoSaveDataFrame.Checked Then + ucrInputSaveDataFrame.SetVisible(True) + ucrChkSaveDataFrameSingle.SetVisible(True) + ucrInputSaveDataFrame.OnControlValueChanged() + ucrChkSaveDataFrameSingle.OnControlValueChanged() + ElseIf rdoFromRFile.Checked Then + ucrInputSaveRFile.SetVisible(True) + ucrInputSaveRFile.OnControlValueChanged() + End If + End Sub End Class \ No newline at end of file