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 my master #492

Merged
merged 28 commits into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
8513b6a
Merge pull request #230 from Fidel365/Dataview
MeSophie Jul 3, 2024
53b237b
New climsoft dialog
conlooptechnologies Jul 12, 2024
119cc68
Merge pull request #261 from IDEMSInternational/master
Vitalis95 Jul 12, 2024
508f5cc
Merge pull request #262 from IDEMSInternational/master
Vitalis95 Jul 19, 2024
4f3e7db
changes to the code
Vitalis95 Jul 19, 2024
9830469
Added epicawrap package into R-instat
derekagorhom Jul 20, 2024
7dae1f4
Merge pull request #239 from IDEMSInternational/master
MeSophie Jul 22, 2024
d1af34c
Made suggested changes
conlooptechnologies Jul 23, 2024
41315e2
changes
Vitalis95 Jul 23, 2024
4a10487
data view changes
Fidel365 Jul 27, 2024
54d5c58
Merge branch 'IDEMSInternational:master' into Frontmnu
Fidel365 Jul 27, 2024
cfc307a
Merge pull request #9083 from Fidel365/Frontmnu
N-thony Jul 29, 2024
b375c4e
Merge pull request #9078 from derekagorhom/R_Packages
N-thony Jul 29, 2024
793f2a7
Merge pull request #264 from IDEMSInternational/master
Vitalis95 Jul 31, 2024
25577fc
Merge pull request #242 from IDEMSInternational/master
MeSophie Jul 31, 2024
ca752bd
Merge pull request #9077 from Vitalis95/Export_buckets_9051
N-thony Jul 31, 2024
43744fb
Change made
MeSophie Jul 31, 2024
8307206
Merge pull request #9090 from MeSophie/InfillGapsIssue7901
N-thony Aug 1, 2024
63baf2c
more climsoft import changes
conlooptechnologies Aug 5, 2024
08c9905
made changes to import from climsoft R function
conlooptechnologies Aug 6, 2024
0b1d5c0
added region fields and removed error in importing metadata
conlooptechnologies Aug 6, 2024
a331ce3
made station id compulsory
conlooptechnologies Aug 6, 2024
df6561f
Added the Option of Loading and Saving Json Files in the R script window
derekagorhom Aug 6, 2024
84b1ad9
Merge pull request #9096 from derekagorhom/Allow_for_Import_Json_File
N-thony Aug 8, 2024
e72800b
Merge pull request #9070 from Patowhiz/climsoft_updated_dialog
N-thony Aug 8, 2024
fdff261
Merge pull request #267 from IDEMSInternational/master
Vitalis95 Aug 8, 2024
ffc8089
changes to the code
Vitalis95 Aug 8, 2024
5aef168
Merge pull request #9097 from Vitalis95/updatemetada
N-thony Aug 8, 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
10 changes: 4 additions & 6 deletions instat/dlgCalculator.vb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Public Class dlgCalculator
SetDefaults()
bFirstLoad = False
End If
SetHelpOptions()
SetStructuredMenu()
ReopenDialog()
TestOKEnabled()
autoTranslate(Me)
Expand Down Expand Up @@ -75,7 +75,7 @@ Public Class dlgCalculator
bInsertColumnBefore:=ucrBase.clsRsyntax.clsBaseCommandString.bInsertColumnBefore,
bRequireCorrectLength:=ucrBase.clsRsyntax.clsBaseCommandString.bRequireCorrectLength)
ucrBase.Visible = True
SetHelpOptions()
SetStructuredMenu()
End Sub

Private Sub ReopenDialog()
Expand Down Expand Up @@ -261,10 +261,8 @@ Public Class dlgCalculator
End If
End Sub

Private Sub SetHelpOptions()
Private Sub SetStructuredMenu()
Select Case enumCalculatorMode
Case CalculatorMode.Prepare
ucrBase.iHelpTopicID = 14
Case CalculatorMode.Structured
ucrCalc.ucrInputCalOptions.SetName("Circular")
ucrBase.iHelpTopicID = 677
Expand Down Expand Up @@ -324,7 +322,7 @@ Public Class dlgCalculator
Case "Symbols"
Me.Width = iBasicWidth * 2.56
Case "Goodness of Fit"
Me.Width = iBasicWidth * 1.27
Me.Width = iBasicWidth * 1.25
ucrBase.iHelpTopicID = 717
Case "Integer"
Me.Width = iBasicWidth * 1.5
Expand Down
550 changes: 344 additions & 206 deletions instat/dlgClimSoft.Designer.vb

Large diffs are not rendered by default.

451 changes: 255 additions & 196 deletions instat/dlgClimSoft.vb

Large diffs are not rendered by default.

739 changes: 459 additions & 280 deletions instat/dlgExportClimaticDefinitions.Designer.vb

Large diffs are not rendered by default.

222 changes: 170 additions & 52 deletions instat/dlgExportClimaticDefinitions.vb

Large diffs are not rendered by default.

112 changes: 60 additions & 52 deletions instat/frmMain.Designer.vb

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions instat/frmMain.vb
Original file line number Diff line number Diff line change
Expand Up @@ -2843,4 +2843,8 @@ Public Class frmMain
UpdateSwapDataAndScript()
UpdateLayout()
End Sub

Private Sub RInstatResourcesSiteToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles RInstatResourcesSiteToolStripMenuItem.Click
Process.Start("https://ecampus.r-instat.org/course/view.php?id=14")
End Sub
End Class
9 changes: 9 additions & 0 deletions instat/instat.vbproj
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,12 @@
</Compile>
<Compile Include="Enum\RObjectFormat.vb" />
<Compile Include="Enum\RObjectTypeLabel.vb" />
<Compile Include="sdgClimsoft.Designer.vb">
<DependentUpon>sdgClimsoft.vb</DependentUpon>
</Compile>
<Compile Include="sdgClimsoft.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="sdgDefineAnnualRainfall.Designer.vb">
<DependentUpon>sdgDefineAnnualRainfall.vb</DependentUpon>
</Compile>
Expand Down Expand Up @@ -3200,6 +3206,9 @@
<EmbeddedResource Include="dlgThreeVariablePivotTable.resx">
<DependentUpon>dlgThreeVariablePivotTable.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgClimsoft.resx">
<DependentUpon>sdgClimsoft.vb</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="sdgDefineAnnualRainfall.resx">
<DependentUpon>sdgDefineAnnualRainfall.vb</DependentUpon>
</EmbeddedResource>
Expand Down
307 changes: 307 additions & 0 deletions instat/sdgClimsoft.Designer.vb

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

Loading
Loading