diff --git a/instat/dlgBarAndPieChart.Designer.vb b/instat/dlgBarAndPieChart.Designer.vb index 75763f8b7ad..5048b0ad6ff 100644 --- a/instat/dlgBarAndPieChart.Designer.vb +++ b/instat/dlgBarAndPieChart.Designer.vb @@ -189,10 +189,10 @@ Partial Class dlgBarAndPieChart Me.rdoPie.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoPie.Location = New System.Drawing.Point(115, 343) Me.rdoPie.Name = "rdoPie" - Me.rdoPie.Size = New System.Drawing.Size(40, 17) + Me.rdoPie.Size = New System.Drawing.Size(133, 17) Me.rdoPie.TabIndex = 34 Me.rdoPie.TabStop = True - Me.rdoPie.Text = "Pie" + Me.rdoPie.Text = "Pie " Me.rdoPie.UseVisualStyleBackColor = True ' 'rdoDonut @@ -201,10 +201,10 @@ Partial Class dlgBarAndPieChart Me.rdoDonut.ImeMode = System.Windows.Forms.ImeMode.NoControl Me.rdoDonut.Location = New System.Drawing.Point(115, 365) Me.rdoDonut.Name = "rdoDonut" - Me.rdoDonut.Size = New System.Drawing.Size(54, 17) + Me.rdoDonut.Size = New System.Drawing.Size(126, 17) Me.rdoDonut.TabIndex = 32 Me.rdoDonut.TabStop = True - Me.rdoDonut.Text = "Donut" + Me.rdoDonut.Text = "Donut " Me.rdoDonut.UseVisualStyleBackColor = True ' 'lblLabelPosition @@ -455,7 +455,7 @@ Partial Class dlgBarAndPieChart Me.ucrChkReorderFrequency.Checked = False Me.ucrChkReorderFrequency.Location = New System.Drawing.Point(257, 189) Me.ucrChkReorderFrequency.Name = "ucrChkReorderFrequency" - Me.ucrChkReorderFrequency.Size = New System.Drawing.Size(125, 23) + Me.ucrChkReorderFrequency.Size = New System.Drawing.Size(158, 23) Me.ucrChkReorderFrequency.TabIndex = 66 ' 'ucrInputPlace @@ -578,7 +578,7 @@ Partial Class dlgBarAndPieChart Me.ucrSaveBar.Location = New System.Drawing.Point(10, 461) Me.ucrSaveBar.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ucrSaveBar.Name = "ucrSaveBar" - Me.ucrSaveBar.Size = New System.Drawing.Size(317, 24) + Me.ucrSaveBar.Size = New System.Drawing.Size(372, 24) Me.ucrSaveBar.TabIndex = 59 ' 'ucrReceiverByFactor @@ -936,8 +936,8 @@ Partial Class dlgBarAndPieChart Me.MinimizeBox = False Me.Name = "dlgBarAndPieChart" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen - Me.Tag = "Bar_and_Pie_Chart" - Me.Text = "Bar and Pie Chart" + Me.Tag = "Bar_Chart" + Me.Text = "Bar Chart" Me.contextMenuStripOptions.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() diff --git a/instat/dlgBarAndPieChart.vb b/instat/dlgBarAndPieChart.vb index f0fb8ee349a..3884518ab16 100644 --- a/instat/dlgBarAndPieChart.vb +++ b/instat/dlgBarAndPieChart.vb @@ -235,12 +235,13 @@ Public Class dlgBarAndPieChart ucrPnlPolar.AddRadioButton(rdoDonut) ucrInputBarChartPositions.SetParameter(New RParameter("position", 0)) - dctPositionPairs.Add("Dodge", Chr(34) & "dodge" & Chr(34)) - dctPositionPairs.Add("Fill", Chr(34) & "fill" & Chr(34)) dctPositionPairs.Add("Stack", Chr(34) & "stack" & Chr(34)) + dctPositionPairs.Add("Fill", Chr(34) & "fill" & Chr(34)) + dctPositionPairs.Add("Dodge", Chr(34) & "dodge" & Chr(34)) dctPositionPairs.Add("Identity", Chr(34) & "identity" & Chr(34)) dctPositionPairs.Add("Jitter", Chr(34) & "jitter" & Chr(34)) dctPositionPairs.Add("Stack in reverse", "position_stack(reverse = TRUE)") + dctPositionPairs.Add("Fill in reverse", "position_fill(reverse = TRUE)") ucrInputBarChartPositions.SetItems(dctPositionPairs) ucrInputBarChartPositions.SetDropDownStyleAsNonEditable() ucrInputBarChartPositions.SetRDefault(Chr(34) & "stack" & Chr(34)) @@ -253,7 +254,7 @@ Public Class dlgBarAndPieChart ucrInputLabelPosition.SetParameter(New RParameter("vjust", 2)) dctLabelPositions.Add("Out", "-0.25") - dctLabelPositions.Add("In", "5") + dctLabelPositions.Add("In", "1.5") ucrInputLabelPosition.SetItems(dctLabelPositions) ucrInputLabelPosition.SetDropDownStyleAsNonEditable() @@ -322,7 +323,7 @@ Public Class dlgBarAndPieChart ucrChkReorderValue.AddFunctionNamesCondition(False, "reorder", False) ucrChkReorderValue.AddToLinkedControls(ucrInputReorderValue, {True}, bNewLinkedHideIfParameterMissing:=True) - ucrChkReorderFrequency.SetText("Reorder Frequency") + ucrChkReorderFrequency.SetText("Reorder") ucrChkReorderFrequency.SetParameter(New RParameter("Checked", iNewPosition:=0)) ucrChkReorderFrequency.SetValuesCheckedAndUnchecked("TRUE", "FALSE") ucrChkReorderFrequency.AddToLinkedControls(ucrInputReorderX, {True}, bNewLinkedHideIfParameterMissing:=True, bNewLinkedAddRemoveParameter:=True) @@ -788,8 +789,8 @@ Public Class dlgBarAndPieChart Dim strChangedTextValue As String = ucrInputAddReorder.GetText() Dim strChangeTextReorder As String = ucrInputReorderValue.GetText() If rdoFrequency.Checked Then - clsForecatsInfreq.AddParameter("f", ucrVariablesAsFactorForBarChart.GetVariableNames(False), iPosition:=0) - clsForecatsInfreqValue.AddParameter("f", ucrReceiverByFactor.GetVariableNames(False), iPosition:=0) + clsForecatsInfreq.AddParameter("f", "as.factor(" & ucrVariablesAsFactorForBarChart.GetVariableNames(False) & ")", iPosition:=0) + clsForecatsInfreqValue.AddParameter("f", "as.factor(" & ucrReceiverByFactor.GetVariableNames(False) & ")", iPosition:=0) Select Case strChangedTextFreq Case strAscending clsForecatsReverse.AddParameter("f", clsRFunctionParameter:=clsForecatsInfreq, iPosition:=0) @@ -1006,16 +1007,18 @@ Public Class dlgBarAndPieChart End Sub Private Sub SetGeomTextOptions() - If ucrInputBarChartPositions.GetText = "Dodge" Then - clsGeomTextFunction.AddParameter("position", "position_dodge(width = 0.9)", iPosition:=2) + If ucrInputBarChartPositions.GetText = "Stack" Then + clsGeomTextFunction.AddParameter("position", "position_stack(vjust = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Fill" Then clsGeomTextFunction.AddParameter("position", "position_fill(vjust = 0.9)", iPosition:=2) - ElseIf ucrInputBarChartPositions.GetText = "Stack" Then - clsGeomTextFunction.AddParameter("position", "position_stack(vjust = 0.9)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Dodge" Then + clsGeomTextFunction.AddParameter("position", "position_dodge(width = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Jitter" Then clsGeomTextFunction.AddParameter("position", "position_jitter(width = 0.9)", iPosition:=2) ElseIf ucrInputBarChartPositions.GetText = "Stack in reverse" Then clsGeomTextFunction.AddParameter("position", "position_stack(vjust = 0.5, reverse = TRUE)", iPosition:=2) + ElseIf ucrInputBarChartPositions.GetText = "Fill in reverse" Then + clsGeomTextFunction.AddParameter("position", "position_fill(reverse = TRUE)", iPosition:=2) Else clsGeomTextFunction.AddParameter("position", "position_identity()", iPosition:=2) End If @@ -1049,4 +1052,5 @@ Public Class dlgBarAndPieChart clsBaseOperator.RemoveParameterByName("geom_treemap_text") End If End Sub + End Class \ No newline at end of file diff --git a/instat/sdgPlots.vb b/instat/sdgPlots.vb index 20f3ff2601e..e2cfda9ebf6 100644 --- a/instat/sdgPlots.vb +++ b/instat/sdgPlots.vb @@ -268,10 +268,9 @@ Public Class sdgPlots 'Theme Tab Checkboxes under grpCommonOptions ucrChkLegendPosition.SetText("Legend Position") - ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="None") + ucrChkLegendPosition.AddToLinkedControls(ucrInputLegendPosition, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:="Left") ucrInputLegendPosition.SetDropDownStyleAsNonEditable() ucrInputLegendPosition.SetParameter(New RParameter("legend.position")) - dctLegendPosition.Add("None", Chr(34) & "none" & Chr(34)) dctLegendPosition.Add("Left", Chr(34) & "left" & Chr(34)) dctLegendPosition.Add("Right", Chr(34) & "right" & Chr(34)) dctLegendPosition.Add("Top", Chr(34) & "top" & Chr(34))