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

Segmented keyboard#5584 #5586

Merged
merged 7 commits into from
Nov 26, 2019
Merged

Segmented keyboard#5584 #5586

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4403504
Merge pull request #57 from africanmathsinitiative/master
Ivanluv Oct 1, 2019
90652fe
Merge pull request #59 from africanmathsinitiative/master
Ivanluv Oct 29, 2019
2607a5d
Merge pull request #61 from africanmathsinitiative/master
Ivanluv Nov 15, 2019
f8fb351
Adding the segmented keyboad to the useModel dialogue
Ivanluv Nov 19, 2019
df45ae9
Minor modifications
Ivanluv Nov 21, 2019
8205325
Minor additions
Ivanluv Nov 22, 2019
33524df
changing from plot lines to plot
Ivanluv Nov 25, 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
244 changes: 228 additions & 16 deletions instat/dlgUseModel.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 60 additions & 1 deletion instat/dlgUseModel.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Public Class dlgUseModel
ucrReceiverForTestColumn.Selector = ucrSelectorUseModel
ucrReceiverForTestColumn.SetMeAsReceiver()

ucrInputComboRPackage.SetItems({"General", "Prediction", "extRemes"})
ucrInputComboRPackage.SetItems({"General", "Prediction", "extRemes", "segmented"})
ucrInputComboRPackage.SetDropDownStyleAsNonEditable()

ucrInputTryMessage.Hide()
Expand Down Expand Up @@ -117,13 +117,16 @@ Public Class dlgUseModel
grpGeneral.Visible = False
grpPrediction.Visible = False
grpExtrRemes.Visible = False
grpSegmented.Visible = False
Select Case ucrInputComboRPackage.GetText
Case "General"
grpGeneral.Visible = True
Case "Prediction"
grpPrediction.Visible = True
Case "extRemes"
grpExtrRemes.Visible = True
Case "segmented"
grpSegmented.Visible = True
End Select
End Sub

Expand Down Expand Up @@ -229,4 +232,60 @@ Public Class dlgUseModel
Private Sub cmdClear_Click(sender As Object, e As EventArgs) Handles cmdClear.Click
ucrReceiverForTestColumn.Clear()
End Sub

Private Sub cmdSegmented_Click(sender As Object, e As EventArgs) Handles cmdSegmented.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::segmented()", 1)
End Sub

Private Sub cmdAapc_Click(sender As Object, e As EventArgs) Handles cmdAapc.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::aapc()", 1)
End Sub

Private Sub cmdSegmentedPrint_Click(sender As Object, e As EventArgs) Handles cmdSegmentedPrint.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" print()", 1)
End Sub

Private Sub cmdPscore_Click(sender As Object, e As EventArgs) Handles cmdPscore.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::pscore.test()", 1)
End Sub

Private Sub cmdSegmentedSummary_Click(sender As Object, e As EventArgs) Handles cmdSegmentedSummary.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" summary()", 1)
End Sub

Private Sub cmdConfint_Click(sender As Object, e As EventArgs) Handles cmdConfint.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" confint()", 1)
End Sub

Private Sub cmdVcov_Click(sender As Object, e As EventArgs) Handles cmdVcov.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" vcov()", 1)
End Sub

Private Sub cmdSlope_Click(sender As Object, e As EventArgs) Handles cmdSlope.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::slope()", 1)
End Sub

Private Sub cmdSegmentedPredict_Click(sender As Object, e As EventArgs) Handles cmdSegmentedPredict.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" predict()", 1)
End Sub

Private Sub cmdPlotLines_Click(sender As Object, e As EventArgs) Handles cmdPlotLines.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" plot lines()", 1)
End Sub

Private Sub cmdPoints_Click(sender As Object, e As EventArgs) Handles cmdPoints.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" points()", 1)
End Sub
Copy link
Contributor

@maxwellfundi maxwellfundi Nov 20, 2019 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Ivanluv this looks good, Just a point of curiosity, why do we have consistent spaces when you add things to the receiver? is this to make sure there is proper spacing?

if so @dannyparsons can we use chr(32) just to be consistent with what we do for quotes - chr(34)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we don't need the spacings @maxwellfundi .Thank you for noticing this,am correcting this now


Private Sub cmdBroken_Click(sender As Object, e As EventArgs) Handles cmdBroken.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::broken.line()", 1)
End Sub

Private Sub cmdDavies_Click(sender As Object, e As EventArgs) Handles cmdDavies.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::davies.test()", 1)
End Sub

Private Sub cmdIntercept_Click(sender As Object, e As EventArgs) Handles cmdIntercept.Click
ucrReceiverForTestColumn.AddToReceiverAtCursorPosition(" segmented::intercept()", 1)
End Sub
End Class