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.

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

updated master #474

Merged
merged 79 commits into from
Jan 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
d0de806
Merge pull request #78 from africanmathsinitiative/master
MeSophie Jun 22, 2023
d2379bb
minor Change
MeSophie Jun 22, 2023
547db2d
minor change
MeSophie Jun 22, 2023
a024f84
Add PM Constants subdialog
MeSophie Jun 26, 2023
5839a42
Minor Change
MeSophie Jun 26, 2023
33a93e6
Add HS constant
MeSophie Jun 26, 2023
52cba66
minor Change
MeSophie Jun 26, 2023
7c92eb0
minor change
MeSophie Jun 26, 2023
f6fc051
Add Location
MeSophie Jun 26, 2023
297cfff
minor change
MeSophie Jun 26, 2023
40cc2ea
Added HS missing options
MeSophie Jun 26, 2023
a27856a
minor change
MeSophie Jun 26, 2023
54fa801
minor change
MeSophie Jun 26, 2023
b3fa81f
minor change
MeSophie Jun 26, 2023
d278bee
Add PT method
MeSophie Jun 26, 2023
84928e0
minor change
MeSophie Jun 26, 2023
da8bf80
minor change
MeSophie Jun 27, 2023
e22d1e5
minor change
MeSophie Jun 27, 2023
2065829
minor changes
MeSophie Jun 30, 2023
bed39e2
minor changes
MeSophie Jul 21, 2023
108ea04
minor change
MeSophie Jul 26, 2023
7f2e032
minor change
MeSophie Nov 22, 2023
f6877f8
changes to the code
Vitalis95 Nov 23, 2023
9b35fa0
changes to the code
Vitalis95 Nov 27, 2023
cf72f96
changes to the code
Vitalis95 Nov 29, 2023
c265a44
changes to the code
Vitalis95 Nov 29, 2023
17c94f3
changes
Vitalis95 Nov 29, 2023
c632edc
changes to the code
Vitalis95 Dec 11, 2023
1fa7e56
changes to the code
Vitalis95 Dec 12, 2023
893502c
changes to the code
Vitalis95 Dec 12, 2023
ad0feb1
changes
Vitalis95 Dec 13, 2023
dd02965
changes to the code
Vitalis95 Dec 13, 2023
d8b6c4c
added key
N-thony Dec 14, 2023
df8084e
added the link
N-thony Dec 14, 2023
10f9c47
minor bug fix
N-thony Dec 14, 2023
1392b3c
minor change
N-thony Dec 14, 2023
50c44c3
changes
Vitalis95 Dec 15, 2023
5c55eab
Merge pull request #198 from africanmathsinitiative/master
Vitalis95 Dec 18, 2023
4abdd4e
Adding single receivers
Vitalis95 Dec 19, 2023
13ec44a
Merge pull request #160 from africanmathsinitiative/master
MeSophie Dec 20, 2023
5b8caf7
Minor code change
MeSophie Dec 20, 2023
33cc47b
adding buttons
Vitalis95 Dec 20, 2023
4f48d77
changes to the dialog
Vitalis95 Dec 20, 2023
ef7ae9e
corrected the translations in the database
N-thony Dec 21, 2023
c782cf7
Merge pull request #161 from africanmathsinitiative/master
MeSophie Jan 5, 2024
6d1c555
Fixed bug on added facet controls on General Graphics dialog.
MeSophie Jan 8, 2024
4a41dab
Added Add Code controls
MeSophie Jan 8, 2024
e57be2e
Merge pull request #201 from africanmathsinitiative/master
Vitalis95 Jan 10, 2024
a3084fd
Merge pull request #202 from africanmathsinitiative/master
Vitalis95 Jan 10, 2024
3c101da
change
Vitalis95 Jan 10, 2024
d16e6a2
Change made. Fixed part a), b) and d)
MeSophie Jan 10, 2024
55b4049
minor addition
N-thony Jan 11, 2024
68b2ea2
Merge pull request #163 from africanmathsinitiative/master
MeSophie Jan 11, 2024
394054e
Merge pull request #203 from N-thony/Vitalis95-homogen
Vitalis95 Jan 11, 2024
dc65e5b
minor change
MeSophie Jan 11, 2024
ce44253
minor design change
MeSophie Jan 11, 2024
70fb7cc
minor change design
MeSophie Jan 11, 2024
8cd57ee
Merge pull request #8689 from N-thony/add_key_and_link
conlooptechnologies Jan 12, 2024
45a8533
minor code change
MeSophie Jan 12, 2024
468667a
Merge pull request #8718 from MeSophie/GeneralGraphIssue8695
N-thony Jan 15, 2024
9552ffa
Changes to the code
Vitalis95 Jan 15, 2024
01cdb29
Merge pull request #8702 from N-thony/fixing_translation
conlooptechnologies Jan 15, 2024
f6c4a3e
changes
Vitalis95 Jan 15, 2024
211cf9a
Merge pull request #167 from africanmathsinitiative/master
MeSophie Jan 16, 2024
8383108
Merge pull request #8414 from MeSophie/EvapotranspirationNewBranche
N-thony Jan 16, 2024
5a6a18d
Merge pull request #168 from africanmathsinitiative/master
MeSophie Jan 16, 2024
74df76b
Minor items order change on climatic menu
MeSophie Jan 16, 2024
34efd2d
Merge pull request #8734 from MeSophie/ClimaticIssue8732
N-thony Jan 16, 2024
474b113
Changes
Vitalis95 Jan 17, 2024
bc26baa
Merge pull request #171 from africanmathsinitiative/master
MeSophie Jan 18, 2024
038d9c3
Fixed bug producing by Plot Options
MeSophie Jan 18, 2024
c648e57
Minor code change
MeSophie Jan 18, 2024
5a1fcc3
Merge pull request #8737 from MeSophie/GraphicIssue8736
N-thony Jan 19, 2024
5e067fd
changes to the code
Vitalis95 Jan 19, 2024
92262b5
changes to the code
Vitalis95 Jan 19, 2024
a256553
Merge branch 'master' into IDFcurvesfunctions
Vitalis95 Jan 19, 2024
1c3cf89
code change
Vitalis95 Jan 19, 2024
7908b34
Merge pull request #8692 from Vitalis95/IDFcurvesfunctions
N-thony Jan 22, 2024
a3d83b4
Merge pull request #8672 from Vitalis95/homogen
N-thony Jan 22, 2024
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
871 changes: 560 additions & 311 deletions instat/DlgDefineClimaticData.Designer.vb

Large diffs are not rendered by default.

173 changes: 151 additions & 22 deletions instat/DlgDefineClimaticData.vb

Large diffs are not rendered by default.

513 changes: 317 additions & 196 deletions instat/dlgEvapotranspiration.Designer.vb

Large diffs are not rendered by default.

559 changes: 386 additions & 173 deletions instat/dlgEvapotranspiration.vb

Large diffs are not rendered by default.

271 changes: 170 additions & 101 deletions instat/dlgGeneralForGraphics.Designer.vb

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions instat/dlgGeneralForGraphics.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>55</value>
</metadata>
<metadata name="contextMenuStripOptions.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>415, 13</value>
</metadata>
Expand Down
264 changes: 250 additions & 14 deletions instat/dlgGeneralForGraphics.vb

Large diffs are not rendered by default.

621 changes: 490 additions & 131 deletions instat/dlgHomogenization.Designer.vb

Large diffs are not rendered by default.

383 changes: 352 additions & 31 deletions instat/dlgHomogenization.vb

Large diffs are not rendered by default.

152 changes: 151 additions & 1 deletion instat/dlgIDFCurves.Designer.vb

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

166 changes: 165 additions & 1 deletion instat/dlgIDFCurves.vb
Original file line number Diff line number Diff line change
@@ -1,3 +1,167 @@
Public Class dlgIDFCurves
' R- Instat
' Copyright (C) 2015-2017
'
' This program is free software: you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
' the Free Software Foundation, either version 3 of the License, or
' (at your option) any later version.
'
' This program is distributed in the hope that it will be useful,
' but WITHOUT ANY WARRANTY; without even the implied warranty of
' MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
' GNU General Public License for more details.
'
' You should have received a copy of the GNU General Public License
' along with this program. If not, see <http://www.gnu.org/licenses/>.

Imports instat.Translations
Public Class dlgIDFCurves
Private bFirstLoad As Boolean = True
Private bReset As Boolean = True
Private bResetRCode As Boolean = True
Private clsIDFCurvesFunction, clsPmatchFunction, clsGetColumnsFunction, clsColumnsFunction As New RFunction
Private clsVarsColumnsOperator, clsVars1ColumnsOperator As ROperator

Private Sub dlgIDFCurves_Load(sender As Object, e As EventArgs) Handles MyBase.Load
If bFirstLoad Then
InitialiseDialog()
bFirstLoad = False
End If
If bReset Then
SetDefaults()
End If
SetRCodeForControls(bReset)
bReset = False
TestOKEnabled()
autoTranslate(Me)
End Sub

Private Sub InitialiseDialog()
ucrBase.clsRsyntax.bSeparateThread = False

ucrIDFCurvesSelector.SetParameter(New RParameter("prdat", 0))
ucrIDFCurvesSelector.SetParameterIsrfunction()

ucrReceiverDateTime.SetParameter(New RParameter("clmn", 1))
ucrReceiverDateTime.Selector = ucrIDFCurvesSelector

ucrReceiverPrec.SetParameter(New RParameter("clmn", 1))
ucrReceiverPrec.Selector = ucrIDFCurvesSelector

ucrStationName.SetParameter(New RParameter("stname", 2))

ucrNudMaxPrec.SetParameter(New RParameter("mindpy", 3))
ucrNudMaxPrec.SetMinMax(0.0, 1.0)
ucrNudMaxPrec.Increment = 0.1
ucrNudMaxPrec.DecimalPlaces = 1
ucrNudMaxPrec.SetRDefault(0.8)

ucrSave.SetPrefix("Prec_accum")
ucrSave.SetIsComboBox()
ucrSave.SetCheckBoxText("Save DataFrame")
ucrSave.SetSaveTypeAsDataFrame()
ucrSave.SetDataFrameSelector(ucrIDFCurvesSelector.ucrAvailableDataFrames)
ucrSave.SetAssignToIfUncheckedValue("last_accum")

End Sub

Private Sub SetDefaults()
clsIDFCurvesFunction = New RFunction
clsPmatchFunction = New RFunction
clsGetColumnsFunction = New RFunction

clsColumnsFunction = New RFunction

clsVarsColumnsOperator = New ROperator
clsVars1ColumnsOperator = New ROperator

ucrIDFCurvesSelector.Reset()
ucrReceiverDateTime.SetMeAsReceiver()

clsGetColumnsFunction.SetRCommand(frmMain.clsRLink.strInstatDataObject & "$get_columns_from_data")
clsGetColumnsFunction.SetAssignTo("col_data")

clsVarsColumnsOperator.SetOperation("", bBracketsTemp:=False)
clsVarsColumnsOperator.SetAssignTo("var_1")

clsVars1ColumnsOperator.SetOperation("", bBracketsTemp:=False)
clsVars1ColumnsOperator.SetAssignTo("var_2")

clsColumnsFunction.SetRCommand("colnames")

clsPmatchFunction.SetRCommand("pmatch")
clsPmatchFunction.AddParameter("elements", clsRFunctionParameter:=clsColumnsFunction, bIncludeArgumentName:=False, iPosition:=0)
clsPmatchFunction.AddParameter("duplicates.ok", "TRUE", iPosition:=1)
clsPmatchFunction.AddParameter("cols", clsROperatorParameter:=clsVars1ColumnsOperator, bIncludeArgumentName:=False, iPosition:=0)
clsPmatchFunction.SetAssignTo("data_file")

clsIDFCurvesFunction.SetPackageName("climatol")
clsIDFCurvesFunction.SetRCommand("IDFcurves")
clsIDFCurvesFunction.AddParameter("clmn", clsRFunctionParameter:=clsPmatchFunction, iPosition:=2)
clsIDFCurvesFunction.AddParameter("na.code", "NA", iPosition:=3)

ucrBase.clsRsyntax.SetBaseRFunction(clsIDFCurvesFunction)
ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = True
End Sub

Private Sub SetRCodeForControls(bReset As Boolean)
ucrIDFCurvesSelector.SetRCode(clsGetColumnsFunction, bReset)
ucrNudMaxPrec.SetRCode(clsIDFCurvesFunction, bReset)
ucrStationName.SetRCode(clsIDFCurvesFunction, bReset)
ucrSave.SetRCode(clsIDFCurvesFunction, bReset)

If bReset Then
ucrReceiverDateTime.SetRCode(clsGetColumnsFunction, bReset)
ucrReceiverPrec.SetRCode(clsGetColumnsFunction, bReset)
End If
End Sub

Private Sub TestOkEnabled()
ucrBase.OKEnabled(Not ucrReceiverDateTime.IsEmpty AndAlso Not ucrReceiverPrec.IsEmpty AndAlso Not ucrStationName.IsEmpty)
End Sub

Private Sub ucrBase_ClickReset(sender As Object, e As EventArgs) Handles ucrBase.ClickReset
SetDefaults()
SetRCodeForControls(True)
TestOkEnabled()
End Sub

Private Sub ucrReceiverPrec_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrReceiverPrec.ControlValueChanged, ucrReceiverDateTime.ControlValueChanged
If Not ucrReceiverPrec.IsEmpty AndAlso Not ucrReceiverDateTime.IsEmpty Then
clsVars1ColumnsOperator.AddParameter("cols", "c(" & ucrReceiverDateTime.GetVariableNames() & ", " & ucrReceiverPrec.GetVariableNames() & ")", iPosition:=0, bIncludeArgumentName:=False)
Else
clsVars1ColumnsOperator.RemoveParameterByName("cols")
End If
End Sub

Private Sub ucrNudMaxPrec_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudMaxPrec.ControlValueChanged
If Not ucrNudMaxPrec.IsEmpty Then
clsIDFCurvesFunction.AddParameter("mindpy", ucrNudMaxPrec.GetText, iPosition:=5)
Else
clsIDFCurvesFunction.RemoveParameterByName("mindpy")
End If
End Sub

Private Sub ucrStationName_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrStationName.ControlValueChanged
If Not ucrStationName.IsEmpty Then
clsIDFCurvesFunction.AddParameter("stname", Chr(34) & ucrStationName.GetText & Chr(34), iPosition:=4)
Else
clsIDFCurvesFunction.RemoveParameterByName("stname")
End If
End Sub

Private Sub ucrIDFCurvesSelector_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrIDFCurvesSelector.ControlValueChanged
If Not ucrIDFCurvesSelector.IsEmpty Then
clsColumnsFunction.AddParameter("data", clsRCodeStructureParameter:=ucrIDFCurvesSelector.ucrAvailableDataFrames.clsCurrDataFrame, bIncludeArgumentName:=False, iPosition:=0)
clsIDFCurvesFunction.AddParameter("data", ucrIDFCurvesSelector.ucrAvailableDataFrames.cboAvailableDataFrames.SelectedItem, bIncludeArgumentName:=False, iPosition:=0)
Else
clsColumnsFunction.RemoveParameterByName("data")
clsIDFCurvesFunction.RemoveParameterByName("data")
End If
End Sub

Private Sub ucrReceiverDateTime_ControlContentsChanged(ucrChangedControl As ucrCore) Handles ucrReceiverDateTime.ControlContentsChanged,
ucrReceiverPrec.ControlContentsChanged, ucrStationName.ControlContentsChanged
TestOkEnabled()
End Sub
End Class
Loading
Loading