diff --git a/instat/dlgClimaticCheckDataTemperature.vb b/instat/dlgClimaticCheckDataTemperature.vb index cbe577815ba..d52e9623e10 100644 --- a/instat/dlgClimaticCheckDataTemperature.vb +++ b/instat/dlgClimaticCheckDataTemperature.vb @@ -597,7 +597,6 @@ Public Class dlgClimaticCheckDataTemperature If ucrReceiverElement1.IsEmpty OrElse ucrReceiverElement2.IsEmpty Then ucrChkDifference.Enabled = False ucrNudDifference.Enabled = False - ucrChkDifference.Checked = False Else ucrChkDifference.Enabled = True ucrNudDifference.Enabled = True diff --git a/instat/dlgLinePlot.vb b/instat/dlgLinePlot.vb index 716df37157a..6a561b14e82 100644 --- a/instat/dlgLinePlot.vb +++ b/instat/dlgLinePlot.vb @@ -375,11 +375,12 @@ Public Class dlgLinePlot ucrChkSlopeLegend.AddParameterPresentCondition(True, "slopetheme") ucrChkSlopeLegend.AddParameterPresentCondition(False, "slopetheme", False) + ucrPnlOptions.AddToLinkedControls({ucrReceiverGroup}, {rdoLine, rdoSmoothing}, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkPathOrStep, ucrChkPeak, ucrChkValley, ucrChkWithSE, ucrChkLineofBestFit}, {rdoLine}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddLine, ucrInputMethod, ucrInputFormula}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrChkAddSE, ucrChkFormula, ucrChkSpan}, {rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="FALSE") ucrPnlOptions.AddToLinkedControls({ucrReceiverXEnd, ucrChkDumbbellColour, ucrChkDumbbellSize}, {rdoDumbbell}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) - ucrPnlOptions.AddToLinkedControls({ucrReceiverGroup, ucrChkAddPoints}, {rdoLine, rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlOptions.AddToLinkedControls({ucrChkAddPoints}, {rdoLine, rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrFactorOptionalReceiver}, {rdoLine, rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrReceiverSlopeY}, {rdoDumbbell, rdoSlope}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) ucrPnlOptions.AddToLinkedControls({ucrReceiverX}, {rdoLine, rdoDumbbell, rdoSmoothing}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) @@ -435,7 +436,7 @@ Public Class dlgLinePlot clsRaesFunction = New RFunction clsBaseOperator = New ROperator clsListFunction = New RFunction - clsggSlopeFunction = New RFunction + clsGgSlopeFunction = New RFunction clsSlopeThemeFunction = New RFunction clsDumbbellFunction = New RFunction @@ -470,8 +471,8 @@ Public Class dlgLinePlot clsDumbbellFunction.SetPackageName("ggalt") clsDumbbellFunction.SetRCommand("geom_dumbbell") - clsggSlopeFunction.SetRCommand("slopegraph") - clsggSlopeFunction.AddParameter("data", clsRFunctionParameter:=ucrLinePlotSelector.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) + clsGgSlopeFunction.SetRCommand("slopegraph") + clsGgSlopeFunction.AddParameter("data", clsRFunctionParameter:=ucrLinePlotSelector.ucrAvailableDataFrames.clsCurrDataFrame, iPosition:=0) clsSlopeThemeFunction.SetRCommand("slopegraph_theme") @@ -503,18 +504,17 @@ Public Class dlgLinePlot End Sub Public Sub SetRCodeForControls(bReset As Boolean) - ucrFactorOptionalReceiver.AddAdditionalCodeParameterPair(clsggSlopeFunction, New RParameter("colour", iNewPosition:=3), iAdditionalPairNo:=1) + ucrFactorOptionalReceiver.AddAdditionalCodeParameterPair(clsGgSlopeFunction, New RParameter("colour", iNewPosition:=3), iAdditionalPairNo:=1) ucrReceiverSlopeY.AddAdditionalCodeParameterPair(clsRaesFunction, New RParameter("y", iNewPosition:=1), iAdditionalPairNo:=1) ucrLinePlotSelector.SetRCode(clsRggplotFunction, bReset) ucrReceiverX.SetRCode(clsRaesFunction, bReset) - ucrReceiverSlopeY.SetRCode(clsggSlopeFunction, bReset) - ucrReceiverSlopeX.SetRCode(clsggSlopeFunction, bReset) - ucrReceiverSlopeColour.SetRCode(clsggSlopeFunction, bReset) + ucrReceiverSlopeY.SetRCode(clsGgSlopeFunction, bReset) + ucrReceiverSlopeX.SetRCode(clsGgSlopeFunction, bReset) + ucrReceiverSlopeColour.SetRCode(clsGgSlopeFunction, bReset) ucrReceiverXEnd.SetRCode(clsRaesFunction, bReset) ucrVariablesAsFactorForLinePlot.SetRCode(clsRaesFunction, bReset) ucrFactorOptionalReceiver.SetRCode(clsRaesFunction, bReset) - ucrReceiverGroup.SetRCode(clsRaesFunction, bReset) ucrSave.SetRCode(clsBaseOperator, bReset) ucrChkLineofBestFit.SetRCode(clsBaseOperator, bReset) ucrChkAddPoints.SetRCode(clsBaseOperator, bReset) @@ -531,9 +531,9 @@ Public Class dlgLinePlot ucrChkFormula.SetRCode(clsBaseOperator, bReset) ucrChkDumbbellColour.SetRCode(clsDumbbellFunction, bReset) ucrChkDumbbellSize.SetRCode(clsDumbbellFunction, bReset) - ucrChkSlopeLabelOptions.SetRCode(clsggSlopeFunction, bReset) - ucrChkSlopeTextOptions.SetRCode(clsggSlopeFunction, bReset) - ucrChkSlopeLineOptions.SetRCode(clsggSlopeFunction, bReset) + ucrChkSlopeLabelOptions.SetRCode(clsGgSlopeFunction, bReset) + ucrChkSlopeTextOptions.SetRCode(clsGgSlopeFunction, bReset) + ucrChkSlopeLineOptions.SetRCode(clsGgSlopeFunction, bReset) End Sub Private Sub TestOkEnabled() @@ -679,7 +679,7 @@ Public Class dlgLinePlot ucrSave.SetPrefix("slope") clsBaseOperator.RemoveParameterByName("ggplot") clsBaseOperator.RemoveParameterByName(strFirstParameterName) - clsBaseOperator.AddParameter("slopeplot", clsRFunctionParameter:=clsggSlopeFunction, iPosition:=0) + clsBaseOperator.AddParameter("slopeplot", clsRFunctionParameter:=clsGgSlopeFunction, iPosition:=0) If ucrChkSlopeLegend.Checked Then clsBaseOperator.RemoveParameterByName("slopetheme") Else diff --git a/instat/dlgOneVariableSummarise.vb b/instat/dlgOneVariableSummarise.vb index caaea2f902c..c714fb0fd51 100644 --- a/instat/dlgOneVariableSummarise.vb +++ b/instat/dlgOneVariableSummarise.vb @@ -30,6 +30,7 @@ Public Class dlgOneVariableSummarise Private bResetSubdialog As Boolean = False Public strDefaultDataFrame As String = "" Public strDefaultColumns() As String = Nothing + Private Const iMaxSum = 12 Private Sub dlgOneVariableSummarise_Load(sender As Object, e As EventArgs) Handles MyBase.Load If bFirstLoad Then @@ -60,7 +61,7 @@ Public Class dlgOneVariableSummarise ucrReceiverOneVarSummarise.SetMeAsReceiver() ucrNudMaxSum.SetParameter(New RParameter("maxsum", 2)) - ucrNudMaxSum.SetRDefault("7") + ucrNudMaxSum.SetMinMax(iMaxSum, Integer.MaxValue) ucrNudMaxSum.SetLinkedDisplayControl(lblMaxSum) ucrPnlSummaries.AddRadioButton(rdoDefault) @@ -69,7 +70,8 @@ Public Class dlgOneVariableSummarise ucrPnlSummaries.AddParameterValuesCondition(rdoCustomised, "checked_radio", "customised") ucrPnlSummaries.AddParameterValuesCondition(rdoDefault, "checked_radio", "defaults") ucrPnlSummaries.AddParameterValuesCondition(rdoSkim, "checked_radio", "skim") - ucrPnlSummaries.AddToLinkedControls(ucrNudMaxSum, {rdoDefault}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True) + ucrPnlSummaries.AddToLinkedControls(ucrNudMaxSum, {rdoDefault}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, + bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=iMaxSum) ucrPnlSummaries.AddToLinkedControls({ucrChkOmitMissing, ucrChkDisplaySummariesAsRows, ucrChkDisplayVariablesAsRows, ucrChkDisplayMargins}, {rdoCustomised}, bNewLinkedHideIfParameterMissing:=True) @@ -158,7 +160,7 @@ Public Class dlgOneVariableSummarise clsSummariesList.AddParameter("summary_sum", Chr(34) & "summary_sum" & Chr(34), bIncludeArgumentName:=False) clsSummaryFunction.SetRCommand("summary") - clsSummaryFunction.AddParameter("maxsum", 7) + clsSummaryFunction.AddParameter("maxsum", iMaxSum) clsSummaryFunction.AddParameter("na.rm", "FALSE", iPosition:=3) clsSummaryTableFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$summary_table") diff --git a/instat/dlgParallelCoordinatePlot.Designer.vb b/instat/dlgParallelCoordinatePlot.Designer.vb index 30777afa0d5..709f74443cc 100644 --- a/instat/dlgParallelCoordinatePlot.Designer.vb +++ b/instat/dlgParallelCoordinatePlot.Designer.vb @@ -22,48 +22,32 @@ Partial Class dlgParallelCoordinatePlot 'Do not modify it using the code editor. _ Private Sub InitializeComponent() - Me.cmdParcoordOptions = New System.Windows.Forms.Button() - Me.cmdPlotOptions = New System.Windows.Forms.Button() + Me.components = New System.ComponentModel.Container() Me.lblXVariables = New System.Windows.Forms.Label() Me.lblFactor = New System.Windows.Forms.Label() Me.lblScale = New System.Windows.Forms.Label() Me.lblTransparency = New System.Windows.Forms.Label() Me.ucrSaveGraph = New instat.ucrSave() Me.ucrNudTransparency = New instat.ucrNud() - Me.ucrChkPoints = New instat.ucrCheck() - Me.ucrChkBoxplots = New instat.ucrCheck() Me.ucrInputScale = New instat.ucrInputComboBox() Me.ucrBase = New instat.ucrButtons() Me.ucrReceiverFactor = New instat.ucrReceiverSingle() Me.ucrReceiverXVariables = New instat.ucrReceiverMultiple() Me.ucrSelectorParallelCoordinatePlot = New instat.ucrSelectorByDataFrameAddRemove() + Me.cmdOptions = New instat.ucrSplitButton() + Me.contextMenuStripOptions = New System.Windows.Forms.ContextMenuStrip(Me.components) + Me.toolStripMenuItemPlotOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.toolStripMenuItemParcoordOptions = New System.Windows.Forms.ToolStripMenuItem() + Me.ucrChkBoxplots = New instat.ucrCheck() + Me.ucrChkPoints = New instat.ucrCheck() + Me.contextMenuStripOptions.SuspendLayout() Me.SuspendLayout() ' - 'cmdParcoordOptions - ' - Me.cmdParcoordOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdParcoordOptions.Location = New System.Drawing.Point(9, 201) - Me.cmdParcoordOptions.Name = "cmdParcoordOptions" - Me.cmdParcoordOptions.Size = New System.Drawing.Size(147, 23) - Me.cmdParcoordOptions.TabIndex = 5 - Me.cmdParcoordOptions.Text = "Parcoord Options" - Me.cmdParcoordOptions.UseVisualStyleBackColor = True - ' - 'cmdPlotOptions - ' - Me.cmdPlotOptions.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.cmdPlotOptions.Location = New System.Drawing.Point(9, 230) - Me.cmdPlotOptions.Name = "cmdPlotOptions" - Me.cmdPlotOptions.Size = New System.Drawing.Size(147, 23) - Me.cmdPlotOptions.TabIndex = 6 - Me.cmdPlotOptions.Text = "Plot Options" - Me.cmdPlotOptions.UseVisualStyleBackColor = True - ' 'lblXVariables ' Me.lblXVariables.AutoSize = True Me.lblXVariables.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblXVariables.Location = New System.Drawing.Point(270, 44) + Me.lblXVariables.Location = New System.Drawing.Point(266, 44) Me.lblXVariables.Name = "lblXVariables" Me.lblXVariables.Size = New System.Drawing.Size(63, 13) Me.lblXVariables.TabIndex = 1 @@ -73,7 +57,7 @@ Partial Class dlgParallelCoordinatePlot ' Me.lblFactor.AutoSize = True Me.lblFactor.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblFactor.Location = New System.Drawing.Point(270, 186) + Me.lblFactor.Location = New System.Drawing.Point(265, 186) Me.lblFactor.Name = "lblFactor" Me.lblFactor.Size = New System.Drawing.Size(88, 13) Me.lblFactor.TabIndex = 3 @@ -83,10 +67,10 @@ Partial Class dlgParallelCoordinatePlot ' Me.lblScale.AutoSize = True Me.lblScale.ImeMode = System.Windows.Forms.ImeMode.NoControl - Me.lblScale.Location = New System.Drawing.Point(8, 268) + Me.lblScale.Location = New System.Drawing.Point(8, 237) Me.lblScale.Name = "lblScale" Me.lblScale.Size = New System.Drawing.Size(37, 13) - Me.lblScale.TabIndex = 7 + Me.lblScale.TabIndex = 8 Me.lblScale.Text = "Scale:" ' 'lblTransparency @@ -96,17 +80,17 @@ Partial Class dlgParallelCoordinatePlot Me.lblTransparency.Location = New System.Drawing.Point(265, 236) Me.lblTransparency.Name = "lblTransparency" Me.lblTransparency.Size = New System.Drawing.Size(75, 13) - Me.lblTransparency.TabIndex = 9 + Me.lblTransparency.TabIndex = 5 Me.lblTransparency.Text = "Transparency:" ' 'ucrSaveGraph ' Me.ucrSaveGraph.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrSaveGraph.Location = New System.Drawing.Point(9, 344) + Me.ucrSaveGraph.Location = New System.Drawing.Point(11, 313) Me.ucrSaveGraph.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveGraph.Name = "ucrSaveGraph" Me.ucrSaveGraph.Size = New System.Drawing.Size(324, 24) - Me.ucrSaveGraph.TabIndex = 13 + Me.ucrSaveGraph.TabIndex = 12 ' 'ucrNudTransparency ' @@ -118,46 +102,28 @@ Partial Class dlgParallelCoordinatePlot Me.ucrNudTransparency.Minimum = New Decimal(New Integer() {0, 0, 0, 0}) Me.ucrNudTransparency.Name = "ucrNudTransparency" Me.ucrNudTransparency.Size = New System.Drawing.Size(52, 20) - Me.ucrNudTransparency.TabIndex = 10 + Me.ucrNudTransparency.TabIndex = 6 Me.ucrNudTransparency.Value = New Decimal(New Integer() {0, 0, 0, 0}) ' - 'ucrChkPoints - ' - Me.ucrChkPoints.AutoSize = True - Me.ucrChkPoints.Checked = False - Me.ucrChkPoints.Location = New System.Drawing.Point(9, 318) - Me.ucrChkPoints.Name = "ucrChkPoints" - Me.ucrChkPoints.Size = New System.Drawing.Size(210, 23) - Me.ucrChkPoints.TabIndex = 12 - ' - 'ucrChkBoxplots - ' - Me.ucrChkBoxplots.AutoSize = True - Me.ucrChkBoxplots.Checked = False - Me.ucrChkBoxplots.Location = New System.Drawing.Point(9, 292) - Me.ucrChkBoxplots.Name = "ucrChkBoxplots" - Me.ucrChkBoxplots.Size = New System.Drawing.Size(210, 23) - Me.ucrChkBoxplots.TabIndex = 11 - ' 'ucrInputScale ' Me.ucrInputScale.AddQuotesIfUnrecognised = True Me.ucrInputScale.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink Me.ucrInputScale.GetSetSelectedIndex = -1 Me.ucrInputScale.IsReadOnly = False - Me.ucrInputScale.Location = New System.Drawing.Point(66, 265) + Me.ucrInputScale.Location = New System.Drawing.Point(49, 235) Me.ucrInputScale.Name = "ucrInputScale" Me.ucrInputScale.Size = New System.Drawing.Size(89, 21) - Me.ucrInputScale.TabIndex = 8 + Me.ucrInputScale.TabIndex = 9 ' 'ucrBase ' Me.ucrBase.AutoSize = True Me.ucrBase.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.ucrBase.Location = New System.Drawing.Point(9, 370) + Me.ucrBase.Location = New System.Drawing.Point(9, 342) Me.ucrBase.Name = "ucrBase" - Me.ucrBase.Size = New System.Drawing.Size(405, 52) - Me.ucrBase.TabIndex = 14 + Me.ucrBase.Size = New System.Drawing.Size(408, 52) + Me.ucrBase.TabIndex = 13 ' 'ucrReceiverFactor ' @@ -197,17 +163,67 @@ Partial Class dlgParallelCoordinatePlot Me.ucrSelectorParallelCoordinatePlot.Size = New System.Drawing.Size(213, 183) Me.ucrSelectorParallelCoordinatePlot.TabIndex = 0 ' + 'cmdOptions + ' + Me.cmdOptions.AutoSize = True + Me.cmdOptions.ContextMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.Location = New System.Drawing.Point(9, 194) + Me.cmdOptions.Name = "cmdOptions" + Me.cmdOptions.Size = New System.Drawing.Size(149, 23) + Me.cmdOptions.SplitMenuStrip = Me.contextMenuStripOptions + Me.cmdOptions.TabIndex = 7 + Me.cmdOptions.Tag = "Plot Options" + Me.cmdOptions.Text = "Plot Options" + Me.cmdOptions.UseVisualStyleBackColor = True + ' + 'contextMenuStripOptions + ' + Me.contextMenuStripOptions.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.toolStripMenuItemPlotOptions, Me.toolStripMenuItemParcoordOptions}) + Me.contextMenuStripOptions.Name = "contextMenuStripOk" + Me.contextMenuStripOptions.Size = New System.Drawing.Size(168, 48) + ' + 'toolStripMenuItemPlotOptions + ' + Me.toolStripMenuItemPlotOptions.Name = "toolStripMenuItemPlotOptions" + Me.toolStripMenuItemPlotOptions.Size = New System.Drawing.Size(167, 22) + Me.toolStripMenuItemPlotOptions.Text = "Plot Options" + ' + 'toolStripMenuItemParcoordOptions + ' + Me.toolStripMenuItemParcoordOptions.Name = "toolStripMenuItemParcoordOptions" + Me.toolStripMenuItemParcoordOptions.Size = New System.Drawing.Size(167, 22) + Me.toolStripMenuItemParcoordOptions.Text = "Parcoord Options" + ' + 'ucrChkBoxplots + ' + Me.ucrChkBoxplots.AutoSize = True + Me.ucrChkBoxplots.Checked = False + Me.ucrChkBoxplots.Location = New System.Drawing.Point(11, 265) + Me.ucrChkBoxplots.Name = "ucrChkBoxplots" + Me.ucrChkBoxplots.Size = New System.Drawing.Size(100, 23) + Me.ucrChkBoxplots.TabIndex = 10 + ' + 'ucrChkPoints + ' + Me.ucrChkPoints.AutoSize = True + Me.ucrChkPoints.Checked = False + Me.ucrChkPoints.Location = New System.Drawing.Point(11, 289) + Me.ucrChkPoints.Name = "ucrChkPoints" + Me.ucrChkPoints.Size = New System.Drawing.Size(100, 23) + Me.ucrChkPoints.TabIndex = 11 + ' 'dlgParallelCoordinatePlot ' 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, 430) + Me.ClientSize = New System.Drawing.Size(417, 399) + Me.Controls.Add(Me.ucrChkPoints) + Me.Controls.Add(Me.ucrChkBoxplots) + Me.Controls.Add(Me.cmdOptions) Me.Controls.Add(Me.ucrSaveGraph) Me.Controls.Add(Me.ucrNudTransparency) Me.Controls.Add(Me.lblTransparency) - Me.Controls.Add(Me.ucrChkPoints) - Me.Controls.Add(Me.ucrChkBoxplots) Me.Controls.Add(Me.ucrInputScale) Me.Controls.Add(Me.lblScale) Me.Controls.Add(Me.ucrBase) @@ -215,8 +231,6 @@ Partial Class dlgParallelCoordinatePlot Me.Controls.Add(Me.ucrReceiverFactor) Me.Controls.Add(Me.lblXVariables) Me.Controls.Add(Me.ucrReceiverXVariables) - Me.Controls.Add(Me.cmdPlotOptions) - Me.Controls.Add(Me.cmdParcoordOptions) Me.Controls.Add(Me.ucrSelectorParallelCoordinatePlot) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow Me.MaximizeBox = False @@ -224,14 +238,13 @@ Partial Class dlgParallelCoordinatePlot Me.Name = "dlgParallelCoordinatePlot" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Parallel Coordinate Plot" + Me.contextMenuStripOptions.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() End Sub Friend WithEvents ucrSelectorParallelCoordinatePlot As ucrSelectorByDataFrameAddRemove - Friend WithEvents cmdParcoordOptions As Button - Friend WithEvents cmdPlotOptions As Button Friend WithEvents ucrReceiverXVariables As ucrReceiverMultiple Friend WithEvents lblScale As Label Friend WithEvents ucrBase As ucrButtons @@ -240,8 +253,12 @@ Partial Class dlgParallelCoordinatePlot Friend WithEvents lblXVariables As Label Friend WithEvents ucrInputScale As ucrInputComboBox Friend WithEvents lblTransparency As Label - Friend WithEvents ucrChkPoints As ucrCheck - Friend WithEvents ucrChkBoxplots As ucrCheck Friend WithEvents ucrNudTransparency As ucrNud Friend WithEvents ucrSaveGraph As ucrSave + Friend WithEvents cmdOptions As ucrSplitButton + Friend WithEvents contextMenuStripOptions As ContextMenuStrip + Friend WithEvents toolStripMenuItemPlotOptions As ToolStripMenuItem + Friend WithEvents toolStripMenuItemParcoordOptions As ToolStripMenuItem + Friend WithEvents ucrChkPoints As ucrCheck + Friend WithEvents ucrChkBoxplots As ucrCheck End Class diff --git a/instat/dlgParallelCoordinatePlot.resx b/instat/dlgParallelCoordinatePlot.resx index 29dcb1b3a35..4f920f19046 100644 --- a/instat/dlgParallelCoordinatePlot.resx +++ b/instat/dlgParallelCoordinatePlot.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/dlgParallelCoordinatePlot.vb b/instat/dlgParallelCoordinatePlot.vb index e986dcbdb5c..693bef45b0b 100644 --- a/instat/dlgParallelCoordinatePlot.vb +++ b/instat/dlgParallelCoordinatePlot.vb @@ -174,17 +174,17 @@ Public Class dlgParallelCoordinatePlot TestOkEnabled() End Sub - Private Sub cmdParcoordOptions_Click(sender As Object, e As EventArgs) Handles cmdParcoordOptions.Click + Private Sub toolStripMenuItemParcoordOptions_Click(sender As Object, e As EventArgs) Handles toolStripMenuItemParcoordOptions.Click sdgParallelPlots.SetRCode(clsNewRFunction:=clsGGParCoordFunc, bReset:=bReset) bResetSubdialog = False sdgParallelPlots.ShowDialog() End Sub - Private Sub cmdPlotOptions_Click(sender As Object, e As EventArgs) Handles cmdPlotOptions.Click + Private Sub cmdOptions_Click(sender As Object, e As EventArgs) Handles cmdOptions.Click, toolStripMenuItemPlotOptions.Click sdgPlots.SetRCode(clsBaseOperator, clsNewThemeFunction:=clsThemeFunction, dctNewThemeFunctions:=dctThemeFunctions, clsNewXScalecontinuousFunction:=clsXScaleContinuousFunction, clsNewYScalecontinuousFunction:=clsYScaleContinuousFunction, - clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, - clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorParallelCoordinatePlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, - clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog) + clsNewScaleFillViridisFunction:=clsScaleFillViridisFunction, clsNewScaleColourViridisFunction:=clsScaleColourViridisFunction, clsNewXLabsTitleFunction:=clsXLabsFunction, clsNewYLabTitleFunction:=clsYLabsFunction, + clsNewLabsFunction:=clsLabsFunction, clsNewFacetFunction:=clsRFacetFunction, ucrNewBaseSelector:=ucrSelectorParallelCoordinatePlot, clsNewCoordPolarFunction:=clsCoordPolarFunction, clsNewCoordPolarStartOperator:=clsCoordPolarStartOperator, + clsNewXScaleDateFunction:=clsXScaleDateFunction, clsNewYScaleDateFunction:=clsYScaleDateFunction, clsNewAnnotateFunction:=clsAnnotateFunction, bReset:=bResetSubdialog) sdgPlots.ShowDialog() bResetSubdialog = False End Sub diff --git a/instat/translations/fr/fr_r_instat_menus.json b/instat/translations/fr/fr_r_instat_menus.json index 3a5b3f122c1..61f266ef94d 100644 --- a/instat/translations/fr/fr_r_instat_menus.json +++ b/instat/translations/fr/fr_r_instat_menus.json @@ -440,21 +440,21 @@ "Data Book": "Livre des données", "Add (Merge) Columns...": "Ajouter (fusionner) des colonnes...", "Column: Calculator...": "Colonne: Calculatrice...", - "Column: Numeric": "Column: Numeric", - "Rename Columns...": "Rename Columns...", - "Duplicate Rows...": "Duplicate Rows...", - "Non-Numeric Values...": "Non-Numeric Values...", - "View/Delete Labels...": "View/Delete Labels...", - "Row Sumaries...": "Row Sumaries...", - "Permute/Sample Rows...": "Permute/Sample Rows...", - "Stack (Pivot longer)...": "Stack (Pivot longer)...", - "Unstack (Pivot Wider)...": "Unstack (Pivot Wider)...", - "Merge(Join)...": "Merge(Join)...", - "Append (Bind Rows)...": "Append (Bind Rows)...", - "Random Split...": "Random Split...", - "Scale/Distance...": "Scale/Distance...", - "Rename": "Rename", - "Save": "Save", - "Import SST...": "Import SST...", - "Daily Data Editind/Entry...": "Daily Data Editind/Entry..." + "Column: Numeric": "Colonne: Numérique", + "Rename Columns...": "Renommer les colonnes...", + "Duplicate Rows...": "Dupliquer les lignes...", + "Non-Numeric Values...": "Valeurs Non Numériques...", + "View/Delete Labels...": "Afficher/supprimer les étiquettes...", + "Row Sumaries...": "Résumés de ligne...", + "Permute/Sample Rows...": "Permuter/Échantillonner des lignes...", + "Stack (Pivot longer)...": "Pile (Pivot plus long)...", + "Unstack (Pivot Wider)...": "Dépiler (Pivot plus large)...", + "Merge(Join)...": "Fusionner(Rejoindre)...", + "Append (Bind Rows)...": "Ajouter (Lier les lignes)...", + "Random Split...": "Séparation aléatoire...", + "Scale/Distance...": "Échelle/Distance...", + "Rename": "Renommer", + "Save": "Enregistrer", + "Import SST...": "Importer SST...", + "Daily Data Editind/Entry...": "Modifier/entrer de données quotidiennes..." } \ No newline at end of file diff --git a/instat/translations/fr/fr_r_instat_not_menus.json b/instat/translations/fr/fr_r_instat_not_menus.json index a7798b1377a..ce3fc83c81e 100644 --- a/instat/translations/fr/fr_r_instat_not_menus.json +++ b/instat/translations/fr/fr_r_instat_not_menus.json @@ -3603,56 +3603,56 @@ "yday": "yjour", "year": "année", "ymd": "ymd", - "Output Window": "Output Window", - "Data View": "Data View", - "Code generated by the dialog.": "Code generated by the dialog.", - "Make the Column a Key for the Data Frame": "Make the Column a Key for the Data Frame", - "Column: Numeric": "Column: Numeric", - "Rename Columns...": "Rename Columns...", - "Duplicate Column...": "Duplicate Column...", - "Select Columns...": "Select Columns...", - "Add (Merge) Columns...": "Add (Merge) Columns...", - "Data Frame": "Data Frame", - "Degrees": "Degrees", - "Use Max and Min": "Use Max and Min", - "Modified GDD:": "Modified GDD:", + "Output Window": "Fenêtre de Sortie", + "Data View": "Vue des Données", + "Code generated by the dialog.": "Code généré par la boîte de dialogue.", + "Make the Column a Key for the Data Frame": "Faire de la Colonne une Clé pour le Tableau de Données", + "Column: Numeric": "Colonne: Numérique", + "Rename Columns...": "Renommer les Colonnes...", + "Duplicate Column...": "Colonne Dupliquée...", + "Select Columns...": "Sélectionner les Colonnes...", + "Add (Merge) Columns...": "Ajouter (Fusionner) des Colonnes...", + "Data Frame": "Tableau de Données", + "Degrees": "Degrés", + "Use Max and Min": "Utiliser Max et Min", + "Modified GDD:": "GDD Modifié:", "GDD:": "GDD:", "HDD:": "HDD:", - "Tmean:": "Tmean:", - "Diurnal Range:": "Diurnal Range:", - "Jump:": "Jump:", - "Outlier:": "Outlier:", - "Difference:": "Difference:", - "Days:": "Days:", - "Acceptable Range Element1:": "Acceptable Range Element1:", - "Acceptable Range Element2:": "Acceptable Range Element2:", - "Add Not": "Add Not", - "Help": "Help", - "Add All": "Add All", - "Clear Selection": "Clear Selection", - "Add Selected": "Add Selected", - "Two Variables": "Two Variables", - "Model Name": "Model Name", - "Reverse Legend Order": "Reverse Legend Order", - "No duplicate dates.": "No duplicate dates.", - "Save As:": "Save As:", - "Start": "Start", - "New Data Frame...": "New Data Frame...", - "Import From File...": "Import From File...", - "Import From Library...": "Import From Library...", - "Recent": "Recent", - "Add To Existing": "Add To Existing", - "Add To New": "Add To New", - "Move Down": "Move Down", - "Move Up": "Move Up", - "Lebelled Convert": "Lebelled Convert", - "File with the same name will be overwritten.": "File with the same name will be overwritten.", - "Are you sure you want to close your data?": "Are you sure you want to close your data?", - "Any unsaved changes will be lost.": "Any unsaved changes will be lost.", - "Are you sure you want to exit R-Instat?": "Are you sure you want to exit R-Instat?", - "Exit": "Exit", - "Close Data": "Close Data", - "Are you sure you want to delete these column(s)?": "Are you sure you want to delete these column(s)?", + "Tmean:": "Tmoyen:", + "Diurnal Range:": "Intervalle Diurne:", + "Jump:": "Saut:", + "Outlier:": "Aberrant:", + "Difference:": "Différence:", + "Days:": "Jours:", + "Acceptable Range Element1:": "Intervalle Acceptable Élément1:", + "Acceptable Range Element2:": "Intervalle Acceptable Élément2:", + "Add Not": "Pas d'Ajout", + "Help": "Aide", + "Add All": "Tout Ajouter", + "Clear Selection": "Effacer la sélection", + "Add Selected": "Ajouter la sélection", + "Two Variables": "Deux Variables", + "Model Name": "Nom du Modèle", + "Reverse Legend Order": "Inverser l'ordre de la Légende", + "No duplicate dates.": "Aucune date dupliquée.", + "Save As:": "Enregistrer Sous:", + "Start": "Démarrer", + "New Data Frame...": "Nouveau Tableau de Données...", + "Import From File...": "Importer Depuis un Fichier...", + "Import From Library...": "Importer Depuis la Bibliothèque...", + "Recent": "Récent", + "Add To Existing": "Ajouter à l'Existant", + "Add To New": "Ajouter au Nouveau", + "Move Down": "Descendre", + "Move Up": "Monter", + "Lebelled Convert": "Conversion Libellée", + "File with the same name will be overwritten.": "Le fichier portant le même nom sera écrasé.", + "Are you sure you want to close your data?": "Voulez-vous vraiment fermer vos données ?", + "Any unsaved changes will be lost.": "Toutes les modifications non enregistrées seront perdues.", + "Are you sure you want to exit R-Instat?": "Voulez-vous vraiment quitter R-Instat ?", + "Exit": "Quitter", + "Close Data": "Fermer les Données", + "Are you sure you want to delete these column(s)?": "Êtes-vous sûr de vouloir supprimer ces colonnes?", "This action connot be undone.": "This action connot be undone.", "Are you sure you want to delete these row(s)?": "Are you sure you want to delete these rows(s)?", "Return to main dialog?": "Return to main dialog?", diff --git a/instat/ucrCalculator.vb b/instat/ucrCalculator.vb index dffd2645c41..e2702387686 100644 --- a/instat/ucrCalculator.vb +++ b/instat/ucrCalculator.vb @@ -283,19 +283,19 @@ Public Class ucrCalculator End Sub Private Sub cmdPlus_Click(sender As Object, e As EventArgs) Handles cmdPlus.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("+") + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" + ") End Sub Private Sub cmdMinus_Click(sender As Object, e As EventArgs) Handles cmdMinus.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("-") + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" - ") End Sub Private Sub cmdMultiply_Click(sender As Object, e As EventArgs) Handles cmdMultiply.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("*") + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" * ") End Sub Private Sub cmdDivide_Click(sender As Object, e As EventArgs) Handles cmdDivide.Click - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("/") + ucrReceiverForCalculation.AddToReceiverAtCursorPosition(" / ") End Sub Private Sub cmdPower_Click(sender As Object, e As EventArgs) Handles cmdPower.Click @@ -2438,9 +2438,9 @@ Public Class ucrCalculator Private Sub cmd_Click(sender As Object, e As EventArgs) Handles cmdPbirth.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbirthday(n = , classes = 365, coincident = 2))", 34) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply(X = , FUN= pbirthday, classes= 365, coincident= 2)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("pbirthday()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , pbirthday)", 13) End If End Sub @@ -2478,9 +2478,9 @@ Public Class ucrCalculator Private Sub cmdQbirth_Click(sender As Object, e As EventArgs) Handles cmdQbirth.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbirthday(prob = 0.5, classes = 365, coincident = 2))", 37) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply(X= , FUN= qbirthday, classes= 365, coincident= 2)", 47) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("qbirthday()", 1) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("sapply( , qbirthday)", 13) End If End Sub @@ -3034,9 +3034,9 @@ Public Class ucrCalculator Private Sub cmdBinary_Click(sender As Object, e As EventArgs) Handles cmdBinary.Click If chkShowParameters.Checked Then - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.integer(R.utils::intToBin(x = ))", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin(x = )", 1) Else - ucrReceiverForCalculation.AddToReceiverAtCursorPosition("as.integer(R.utils::intToBin())", 2) + ucrReceiverForCalculation.AddToReceiverAtCursorPosition("R.utils::intToBin()", 1) End If End Sub