Skip to content

Commit

Permalink
Merge pull request IDEMSInternational#272 from africanmathsinitiative…
Browse files Browse the repository at this point in the history
…/master

updated from the master
  • Loading branch information
conlooptechnologies authored Jun 30, 2021
2 parents 1c1a5e9 + f0967a4 commit 0b19852
Show file tree
Hide file tree
Showing 8 changed files with 4,733 additions and 692 deletions.
139 changes: 66 additions & 73 deletions instat/frmMain.Designer.vb

Large diffs are not rendered by default.

1,123 changes: 572 additions & 551 deletions instat/frmMain.resx

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions instat/frmMain.vb
Original file line number Diff line number Diff line change
Expand Up @@ -438,11 +438,11 @@ Public Class frmMain
Me.Close()
End Sub

Private Sub mnuFileOpenFromFile_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromFile.Click
Private Sub mnuFileOpenFromFile_Click(sender As Object, e As EventArgs) Handles mnuFileImportFromFile.Click
dlgImportDataset.ShowDialog()
End Sub

Private Sub mnuFileOpenFromLibrary_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromLibrary.Click
Private Sub mnuFileOpenFromLibrary_Click(sender As Object, e As EventArgs) Handles mnuFileImportFromLibrary.Click
dlgFromLibrary.ShowDialog()
End Sub

Expand Down Expand Up @@ -1056,11 +1056,11 @@ Public Class frmMain
dlgDescribeTwoVarGraph.ShowDialog()
End Sub

Private Sub mnuClimaticFileOpensst_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileOpensst.Click
Private Sub mnuClimaticFileOpensst_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportSST.Click
dlgOpenSST.ShowDialog()
End Sub

Private Sub mnuFileOpenFromODK_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromODK.Click
Private Sub mnuFileOpenFromODK_Click(sender As Object, e As EventArgs) Handles mnuFileImportFromODK.Click
dlgImportFromODK.ShowDialog()
End Sub

Expand Down Expand Up @@ -1112,19 +1112,19 @@ Public Class frmMain
End Sub


Private Sub mnuDescribeSpecificScatterPlot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificScatterPlot.Click
Private Sub mnuDescribeSpecificScatterPlot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificPointPlot.Click
dlgScatterPlot.ShowDialog()
End Sub

Private Sub mnuDescribeSpecificLinePlot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificLinePlot.Click
dlgLinePlot.ShowDialog()
End Sub

Private Sub mnuDescribeSpecificHistogram_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificHistogram.Click
Private Sub mnuDescribeSpecificHistogram_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificHistogramDensityFrequencyPlot.Click
dlgHistogram.ShowDialog()
End Sub

Private Sub mnuDescribeSpecificBoxplot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificBoxplot.Click
Private Sub mnuDescribeSpecificBoxplot_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificBoxplotJitterViolinPlot.Click
dlgBoxplot.ShowDialog()
End Sub

Expand All @@ -1136,7 +1136,7 @@ Public Class frmMain
dlgRugPlot.ShowDialog()
End Sub

Private Sub mnuDescribeSpecificBarChart_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificBarChart.Click
Private Sub mnuDescribeSpecificBarChart_Click(sender As Object, e As EventArgs) Handles mnuDescribeSpecificBarPieChart.Click
dlgBarAndPieChart.ShowDialog()
End Sub

Expand Down Expand Up @@ -1261,7 +1261,7 @@ Public Class frmMain
dlgClimsoftWizard.ShowDialog()
End Sub

Private Sub mnuClimaticFileImportFromCliData_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportFromCliData.Click
Private Sub mnuClimaticFileImportFromCliData_Click(sender As Object, e As EventArgs) Handles mnuClimaticFileImportfromCliData.Click
dlgCliData.ShowDialog()
End Sub

Expand Down Expand Up @@ -1358,7 +1358,7 @@ Public Class frmMain
dlgTwoWayFrequencies.ShowDialog()
End Sub

Private Sub mnuFileOpenFromCSPRO_Click(sender As Object, e As EventArgs) Handles mnuFileOpenFromCSPRO.Click
Private Sub mnuFileOpenFromCSPRO_Click(sender As Object, e As EventArgs) Handles mnuFileImportFromCSPRO.Click
dlgImportFromCSPRO.ShowDialog()
End Sub

Expand Down
Binary file modified instat/translations/rInstatTranslations.db
Binary file not shown.
Loading

0 comments on commit 0b19852

Please sign in to comment.