Skip to content

Commit

Permalink
Merge pull request #31 from africanmathsinitiative/master
Browse files Browse the repository at this point in the history
Updating master
  • Loading branch information
jackykemboi authored Oct 1, 2018
2 parents 3a8b914 + 2638c12 commit 09ee176
Show file tree
Hide file tree
Showing 20 changed files with 621 additions and 587 deletions.
1 change: 1 addition & 0 deletions instat/dlgCalculateTreatmentDifferences.vb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Public Class dlgCalculateTreatmentDifferences
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 581
ucrChkCalculateDiffCategories.SetText("Calculate Difference Categories")
ucrChkCalculateDiffCategories.AddToLinkedControls(ucrInputBreakPoints, {True}, bNewLinkedHideIfParameterMissing:=True)
ucrChkCalculateDiffCategories.AddToLinkedControls(ucrInputLabels, {True}, bNewLinkedHideIfParameterMissing:=True)
Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticCheckDataRain.vb
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ Public Class dlgClimaticCheckDataRain
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 511
Dim lstControls As New List(Of Control)
lstControls.AddRange({lblMissingThreshold, cmdOmitMonths, lblThresholdmm})

Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticCheckDataTemperature.vb
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Public Class dlgClimaticCheckDataTemperature
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 559
'TODO: Not yet implemented.
rdoMultiple.Enabled = False
rdoSatelite.Enabled = False
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgClimaticLengthOfSeason.vb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ Public Class dlgClimaticLengthOfSeason
End Sub

Private Sub InitialiseDialog()

ucrBase.iHelpTopicID = 564
ucrReceiverStartofRains.SetParameter(New RParameter("start_doy", 1, bNewIncludeArgumentName:=False))
ucrReceiverStartofRains.SetParameterIsString()
ucrReceiverStartofRains.bWithQuotes = False
Expand Down
1 change: 1 addition & 0 deletions instat/dlgClimaticStationMaps.vb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Public Class dlgClimaticStationMaps
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 558
ucrBase.clsRsyntax.iCallType = 3
ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False

Expand Down
1 change: 1 addition & 0 deletions instat/dlgCompare.vb
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Public Class dlgCompare
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 562
ucrPnlCompare.AddRadioButton(rdoDifferences)
ucrPnlCompare.AddRadioButton(rdoAnomalies)
ucrPnlCompare.AddParameterPresentCondition(rdoDifferences, "manipulations", False)
Expand Down
3 changes: 2 additions & 1 deletion instat/dlgCompareTreatmentLines.vb
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ Public Class dlgCompareTreatmentLines
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 585
ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
'ucrBase.iHelpTopicID =

ucrBase.clsRsyntax.iCallType = 3

ucrSelectorPlot.SetParameter(New RParameter("data", 0))
Expand Down
1 change: 1 addition & 0 deletions instat/dlgConversions.vb
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ Public Class dlgConversions
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 563
Dim dctPrecipitationUnits As New Dictionary(Of String, String)
Dim dctTemperatureUnits As New Dictionary(Of String, String)
Dim dctWindSpeedUnits As New Dictionary(Of String, String)
Expand Down
1 change: 1 addition & 0 deletions instat/dlgDefineOptionsByContext.vb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Public Class dlgDefineOptionsByContext
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 572
'TODO not yet implemented
lblKeyColumns.Hide()
ucrInputKeyCheck.Hide()
Expand Down
2 changes: 2 additions & 0 deletions instat/dlgDisplayDailyData.vb
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ Public Class dlgDisplayDailyData
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 361

Dim dctBarColour As New Dictionary(Of String, String)
Dim dctRugColour As New Dictionary(Of String, String)
Dim dctSummary As New Dictionary(Of String, String)
Expand Down
3 changes: 2 additions & 1 deletion instat/dlgEvapotranspiration.vb
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ Public Class dlgEvapotranspiration
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 565
ucrBase.clsRsyntax.iCallType = 2
'ucrBase.iHelpTopicID = 510

Dim dctInputCrops As New Dictionary(Of String, String)
Dim dctInputTimeStep As New Dictionary(Of String, String)
Dim dctInputSolar As New Dictionary(Of String, String)
Expand Down
1 change: 1 addition & 0 deletions instat/dlgExportToCMSAF.vb
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Public Class dlgExportToCMSAF
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 569
ucrReceiverStation.Selector = ucrSelectorImportToCMSAF
ucrReceiverDate.Selector = ucrSelectorImportToCMSAF
ucrReceiverLongitude.Selector = ucrSelectorImportToCMSAF
Expand Down
7 changes: 3 additions & 4 deletions instat/dlgPICSARainfall.vb
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@ Public Class dlgPICSARainfall
TestOkEnabled()
End Sub
Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 118
ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
ucrBase.clsRsyntax.iCallType = 3

'ucrBase.iHelpTopicID=

ucrBase.clsRsyntax.iCallType = 3

ucrPICSARainfallSelector.SetParameter(New RParameter("data", 0))
ucrPICSARainfallSelector.SetParameterIsrfunction()

Expand Down
1 change: 1 addition & 0 deletions instat/dlgPlotRegion.vb
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ Public Class dlgPlotRegion
End Sub

Private Sub InitialiseDialog()
ucrBase.iHelpTopicID = 568
ucrBase.clsRsyntax.iCallType = 3

ucrReceiverLongitude.SetParameter(New RParameter("lon", 1))
Expand Down
2 changes: 1 addition & 1 deletion instat/dlgSPI.vb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Public Class dlgSPI

Private Sub InitialiseDialog()
ucrBase.clsRsyntax.iCallType = 2
ucrBase.iHelpTopicID = 510
ucrBase.iHelpTopicID = 566

ucrSelectorVariable.SetParameterIsString()

Expand Down
2 changes: 2 additions & 0 deletions instat/dlgTidyDailyData.vb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ Public Class dlgTidyDailyData
End Sub

Private Sub InitialiseDialog()

ucrBase.iHelpTopicID = 561
ucrBase.clsRsyntax.iCallType = 2

ucrPnlReshapeClimaticData.AddRadioButton(rdoYear)
Expand Down
72 changes: 43 additions & 29 deletions instat/frmMain.Designer.vb

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

Loading

0 comments on commit 09ee176

Please sign in to comment.