Skip to content

Commit

Permalink
Merge pull request IDEMSInternational#8414 from MeSophie/Evapotranspi…
Browse files Browse the repository at this point in the history
…rationNewBranche

Improve Evapotranspiration Dialog
  • Loading branch information
N-thony authored Jan 16, 2024
2 parents 01cdb29 + 211cf9a commit 8383108
Show file tree
Hide file tree
Showing 22 changed files with 3,742 additions and 736 deletions.
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.

45 changes: 45 additions & 0 deletions instat/instat.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -289,12 +289,42 @@
</Compile>
<Compile Include="Enum\RObjectFormat.vb" />
<Compile Include="Enum\RObjectTypeLabel.vb" />
<Compile Include="sdgHSConstants.Designer.vb">
<DependentUpon>sdgHSConstants.vb</DependentUpon>
</Compile>
<Compile Include="sdgHSConstants.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgHSMissingOptions.Designer.vb">
<DependentUpon>sdgHSMissingOptions.vb</DependentUpon>
</Compile>
<Compile Include="sdgHSMissingOptions.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgLocation.Designer.vb">
<DependentUpon>sdgLocation.vb</DependentUpon>
</Compile>
<Compile Include="sdgLocation.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgPairPlotOptions.Designer.vb">
<DependentUpon>sdgPairPlotOptions.vb</DependentUpon>
</Compile>
<Compile Include="sdgPairPlotOptions.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgPMConstants.Designer.vb">
<DependentUpon>sdgPMConstants.vb</DependentUpon>
</Compile>
<Compile Include="sdgPMConstants.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgPTConstants.Designer.vb">
<DependentUpon>sdgPTConstants.vb</DependentUpon>
</Compile>
<Compile Include="sdgPTConstants.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgSummaryThemes.Designer.vb">
<DependentUpon>sdgSummaryThemes.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -3128,9 +3158,24 @@
<EmbeddedResource Include="dlgThreeVariablePivotTable.resx">
<DependentUpon>dlgThreeVariablePivotTable.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgHSConstants.resx">
<DependentUpon>sdgHSConstants.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgHSMissingOptions.resx">
<DependentUpon>sdgHSMissingOptions.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgLocation.resx">
<DependentUpon>sdgLocation.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgPairPlotOptions.resx">
<DependentUpon>sdgPairPlotOptions.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgPMConstants.resx">
<DependentUpon>sdgPMConstants.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgPTConstants.resx">
<DependentUpon>sdgPTConstants.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgSummaryThemes.resx">
<DependentUpon>sdgSummaryThemes.vb</DependentUpon>
</EmbeddedResource>
Expand Down
133 changes: 133 additions & 0 deletions instat/sdgHSConstants.Designer.vb

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

120 changes: 120 additions & 0 deletions instat/sdgHSConstants.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
48 changes: 48 additions & 0 deletions instat/sdgHSConstants.vb
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
' 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 sdgHSConstants
Private bFirstLoad As Boolean = True
Private bReset As Boolean = True
Private bControlsInitialised As Boolean = False
Private clsListFunction As New RFunction
Private Sub sdgHSConstants_Load(sender As Object, e As EventArgs) Handles ucrSdgButtons.Load
autoTranslate(Me)
End Sub

Private Sub InitialiseControls()
ucrInputLambda.SetParameter(New RParameter("lambda", 1))
ucrInputLambda.AddQuotesIfUnrecognised = False
ucrInputLambda.SetLinkedDisplayControl(lbllambda)

ucrInputSolarConstant.SetParameter(New RParameter("Gsc", 3))
ucrInputSolarConstant.AddQuotesIfUnrecognised = False
ucrInputSolarConstant.SetLinkedDisplayControl(lblSolarConstant)

bControlsInitialised = True
End Sub

Public Sub SetRFunction(clsNewListFunction As RFunction, Optional bReset As Boolean = False)
clsListFunction = clsNewListFunction

If Not bControlsInitialised Then
InitialiseControls()
End If
ucrInputLambda.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True)
ucrInputSolarConstant.SetRCode(clsListFunction, bReset, bCloneIfNeeded:=True)
End Sub
End Class
Loading

0 comments on commit 8383108

Please sign in to comment.