Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plot Options Subdialog. X-Axis and Y-Axis unshown options #5556

Merged
merged 3 commits into from
Oct 26, 2019
Merged

Plot Options Subdialog. X-Axis and Y-Axis unshown options #5556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da4f496
Merge pull request #119 from africanmathsinitiative/master
conlooptechnologies Sep 11, 2019
fad067f
Merge pull request #121 from africanmathsinitiative/master
conlooptechnologies Oct 16, 2019
c120b14
Fixed showing of X-Axis and Y-axis additional options
conlooptechnologies Oct 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions instat/sdgPlots.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Public Class sdgPlots
Dim clsCoordEqualParam As New RParameter

ucrBaseSubdialog.iHelpTopicID = 136
'facets tab
'facets tab
'Links the factor receivers, used for creating facets, with the selector. The variables need to be factors.
ucr1stFactorReceiver.Selector = ucrFacetSelector
ucr1stFactorReceiver.SetIncludedDataTypes({"factor"})
Expand Down Expand Up @@ -287,13 +287,13 @@ Public Class sdgPlots


ucrChkXaxisAngle.SetText("X axis Tick Labels Angle")
ucrChkXaxisAngle.AddToLinkedControls(ucrNudXAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=10, bNewLinkedChangeParameterValue:=True)
ucrChkXaxisAngle.AddToLinkedControls(ucrNudXAngle, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=10, bNewLinkedChangeParameterValue:=True)
ucrNudXAngle.SetParameter(New RParameter("angle"))
ucrChkXaxisAngle.AddParameterPresentCondition(True, "angle")
ucrChkXaxisAngle.AddParameterPresentCondition(False, "angle", False)

ucrChkXaxisSize.SetText("X axis Label Size")
ucrChkXaxisSize.AddToLinkedControls(ucrNudXSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=10, bNewLinkedChangeParameterValue:=True)
ucrChkXaxisSize.AddToLinkedControls(ucrNudXSize, {True}, bNewLinkedAddRemoveParameter:=True, bNewLinkedHideIfParameterMissing:=True, bNewLinkedChangeToDefaultState:=True, objNewDefaultState:=10, bNewLinkedChangeParameterValue:=True)
ucrNudXSize.SetParameter(New RParameter("size"))
ucrNudXSize.DecimalPlaces = 1
ucrNudXSize.Increment = 0.1
Expand Down Expand Up @@ -349,7 +349,9 @@ Public Class sdgPlots
clsThemeFunction = clsNewThemeFunction
clsCoordPolarFunc = clsNewCoordPolarFunction
clsCoordPolarStartOperator = clsNewCoordPolarStartOperator
clsCoordPolarFunc.AddParameter("start", clsROperatorParameter:=clsCoordPolarStartOperator, iPosition:=1)
If Not IsNothing(clsCoordPolarStartOperator) Then
clsCoordPolarFunc.AddParameter("start", clsROperatorParameter:=clsCoordPolarStartOperator, iPosition:=1)
End If
dctThemeFunctions = dctNewThemeFunctions
dctThemeFunctions.TryGetValue("axis.text.x", clsXElementText)
dctThemeFunctions.TryGetValue("axis.title.x", clsXElementTitle)
Expand Down
6 changes: 3 additions & 3 deletions instat/ucrAxes.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,15 +341,15 @@ Public Class ucrAxes
grpMajorBreaks.Hide()
grpMinorBreaks.Hide()
grpScales.Hide()
If strAxisType = "Continuous" Then
If strAxisType.ToLower = "continuous" Then
'show continous panels
maxwellfundi marked this conversation as resolved.
Show resolved Hide resolved
'TODO put controls in panels so group boxes can be used for multiple cases
grpMajorBreaks.Show()
grpMinorBreaks.Show()
grpScales.Show()
ElseIf strAxisType = "Discrete" Then
ElseIf strAxisType.ToLower = "discrete" Then
'show discrete panels
ElseIf strAxisType = "Date" Then
ElseIf strAxisType.ToLower = "date" Then
'show date panels
End If
End Sub
Expand Down