Merge pull request #229 from IDEMSInternational/master

updating
Vitalis95 · Mar 25, 2024 · 7cc2ff0 · 7cc2ff0
2 parents 9265f12 + 3d0d912
commit 7cc2ff0
Show file tree

Hide file tree

Showing 15 changed files with 1,625 additions and 846 deletions.
diff --git a/instat/dlgHeatMapPlot.Designer.vb b/instat/dlgHeatMapPlot.Designer.vb
diff --git a/instat/dlgHeatMapPlot.resx b/instat/dlgHeatMapPlot.resx
diff --git a/instat/dlgHeatMapPlot.vb b/instat/dlgHeatMapPlot.vb
diff --git a/instat/dlgMergeAdditionalData.vb b/instat/dlgMergeAdditionalData.vb
@@ -45,6 +45,7 @@ Public Class dlgMergeAdditionalData
     End Sub
 
     Private Sub InitialiseDialog()
+        ucrBase.iHelpTopicID = 186
         ucrToDataFrame.SetParameter(New RParameter("x", 0))
         ucrToDataFrame.SetParameterIsRFunction()
         ucrToDataFrame.SetLabelText("To Data Frame:")

diff --git a/instat/dlgTwoWayFrequencies.vb b/instat/dlgTwoWayFrequencies.vb
@@ -48,7 +48,7 @@ Public Class dlgTwoWayFrequencies
     End Sub
 
     Private Sub InitialiseDialog()
-        ucrBase.iHelpTopicID = 415
+        ucrBase.iHelpTopicID = 289
         ucrBase.clsRsyntax.bExcludeAssignedFunctionOutput = False
 
         ucrReceiverColumnFactor.Selector = ucrSelectorTwoWayFrequencies

diff --git a/instat/dlgVisualizeData.vb b/instat/dlgVisualizeData.vb
@@ -17,6 +17,12 @@
 Imports instat.Translations
 
 Public Class dlgVisualizeData
+    Public enumVisualizeMode As String = VisualizeMode.Prepare
+    Public Enum VisualizeMode
+        Prepare
+        Describe
+        Climatic
+    End Enum
     Private bFirstLoad As Boolean = True
     Private bReset As Boolean = True
     Private clsVisDatFunction As New RFunction
@@ -41,6 +47,7 @@ Public Class dlgVisualizeData
             SetDefaults()
         End If
         SetRCodeForControls(bReset)
+        SetHelpOptions()
         bReset = False
         autoTranslate(Me)
         TestOkEnabled()
@@ -328,6 +335,17 @@ Public Class dlgVisualizeData
         End If
     End Sub
 
+    Private Sub SetHelpOptions()
+        Select Case enumVisualizeMode
+            Case VisualizeMode.Prepare
+                ucrBase.iHelpTopicID = 54
+            Case VisualizeMode.Describe
+                ucrBase.iHelpTopicID = 600
+            Case VisualizeMode.Climatic
+                ucrBase.iHelpTopicID = 524
+        End Select
+    End Sub
+
     Private Sub ucrNudMaximumSize_ControlValueChanged(ucrChangedControl As ucrCore) Handles ucrNudMaximumSize.ControlValueChanged
         MaximumDataPoint()
     End Sub
@@ -407,7 +425,7 @@ Public Class dlgVisualizeData
         End If
         Dim lstvariable As List(Of String) = ucrReceiverVisualizeData.GetVariableNamesAsList
         Dim strFacetvariable As String = ucrByFactorsReceiver.GetVariableNames(False)
-        If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not Lstvariable.Contains(StrFacetvariable) Then
+        If Not ucrByFactorsReceiver.IsEmpty AndAlso (rdoVisDat.Checked OrElse rdoVisMiss.Checked) AndAlso Not lstvariable.Contains(strFacetvariable) Then
             lstvariable.Add(strFacetvariable)
         End If
         clsGetVariableFunction.AddParameter("data_name", Chr(34) & ucrSelectorVisualizeData.ucrAvailableDataFrames.strCurrDataFrame & Chr(34), iPosition:=0)

diff --git a/instat/frmConvertToNumeric.vb b/instat/frmConvertToNumeric.vb
@@ -68,9 +68,7 @@ Public Class frmConvertToNumeric
     End Sub
 
     Private Sub cmdHelp_Click(sender As Object, e As EventArgs) Handles cmdHelp.Click
-        Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TableOfContents)
-        'Replace with specific page once written
-        'Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, iHelpTopicID.ToString())
+        Help.ShowHelp(Me.Parent, frmMain.strStaticPath & "\" & frmMain.strHelpFilePath, HelpNavigator.TopicId, "614")
     End Sub
 
     Private Sub cmdInspectValues_Click(sender As Object, e As EventArgs) Handles cmdInspectValues.Click

diff --git a/instat/frmMain.Designer.vb b/instat/frmMain.Designer.vb
diff --git a/instat/frmMain.vb b/instat/frmMain.vb
@@ -2281,6 +2281,7 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuPrepareCheckDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuPrepareCheckDataVisualiseData.Click
+        dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Prepare
         dlgVisualizeData.ShowDialog()
     End Sub
 
@@ -2485,6 +2486,7 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuDescribeOneVariableVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuDescribeOneVariableVisualiseData.Click
+        dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Describe
         dlgVisualizeData.ShowDialog()
     End Sub
 
@@ -2672,6 +2674,7 @@ Public Class frmMain
     End Sub
 
     Private Sub mnuClimaticExamineEditDataVisualiseData_Click(sender As Object, e As EventArgs) Handles mnuClimaticExamineEditDataVisualiseData.Click
+        dlgVisualizeData.enumVisualizeMode = dlgVisualizeData.VisualizeMode.Climatic
         dlgVisualizeData.ShowDialog()
     End Sub
 

diff --git a/instat/static/InstatObject/R/InstallPackages.R b/instat/static/InstatObject/R/InstallPackages.R
@@ -23,75 +23,76 @@ packs <- c("abind", "agricolae", "agridat",
            "blob", "boot", "brew", "brio", "broom", 
            "bslib", "ca", "cachem", "callr", "candisc", 
            "car", "carData", "caret", "cellranger", 
-           "changepoint", "checkmate", "chillR", "chron", 
-           "circlize", "CircStats", "circular", "class", 
-           "classInt", "cli", "clifro", "climdex.pcic", 
-           "clipr", "clock", "clue", "cluster", 
-           "cmsaf", "cmsafops", "cmsafvis", "coda", 
-           "codetools", "coin", "collapse", "colorRamps", 
-           "colorspace", "colourpicker", "combinat", "commonmark", 
-           "conf.design", "confintr", "contfrac", "corrplot", 
-           "corrr", "countrycode", "cowplot", "cpp11", 
-           "crayon", "credentials", "crosstalk", "cubature", 
-           "curl", "DAAG", "dae", "data.table", 
-           "datasauRus", "datawizard", "date", "DBI", 
-           "deldir", "dendextend", "DEoptimR", "desc", 
-           "DescTools", "deSolve", "desplot", "devtools", 
-           "diagram", "diffobj", "digest", "distillery", 
-           "distributional", "dotCall64", "downlit", "dplyr", 
-           "dslabs", "DT", "dtw", "dygraphs", "e1071", 
-           "ecmwfr", "effectsize", "ellipse", "ellipsis", 
-           "elliptic", "emmeans", "EnvStats", "estimability", 
-           "evaluate", "Evapotranspiration", "Exact", 
-           "exactRankTests", "expm", "extraDistr", "extrafont", 
-           "extrafontdb", "extRemes", "factoextra", "FactoMineR", 
-           "fansi", "faraway", "farver", "fastDummies", 
-           "fastmap", "fields", "filelock", "fitdistrplus", 
-           "fivethirtyeight", "flashClust", "FNN", "fontawesome", 
-           "forcats", "foreach", "forecast", "foreign", 
-           "formattable", "formula.tools", "Formula", 
-           "fracdiff", "fs", "future.apply", "future", 
-           "gapminder", "gclus", "gcookbook", "generics", 
-           "GenSA", "geomtextpath", "geosphere", "gert", 
-           "getPass", "GGally", "ggalt", "ggeffects", 
-           "ggfittext", "ggforce", "ggformula", "ggfortify", 
-           "ggmosaic", "ggplot2", "ggplotify", "ggpmisc", 
-           "ggpp", "ggpubr", "ggrepel", "ggridges", 
-           "ggsci", "ggsignif", "ggstance", "ggtext", 
-           "ggthemes", "ggwordcloud", "gh", "gitcreds", 
-           "gld", "GlobalOptions", "globals", "glue", 
-           "gmp", "gnm", "goftest", "gower", "gridExtra", 
-           "gridGraphics", "gridtext", "gstat", "gt", 
-           "gtable", "gtExtras", "gtools", "hardhat", 
-           "haven", "heplots", "here", "hexbin", 
-           "HH", "highr", "HistData", "Hmisc", "hms", 
-           "htmlTable", "htmltools", "htmlwidgets", "httpuv", 
-           "httr", "httr2", "hydroGOF", "hydroTSM", 
-           "hypergeo", "igraph", "imputeTS", "infer", 
-           "ini", "inline", "insight", "interp", 
-           "intervals", "ipred", "ISLR", "isoband", 
-           "iterators", "janeaustenr", "janitor", "jpeg", 
-           "jquerylib", "jsonlite", "juicyjuice", "Kendall", 
-           "KernSmooth", "keyring", "klaR", "knitr", 
-           "labeling", "labelled", "Lahman", "later", 
-           "lattice", "latticeExtra", "lava", "lazyeval", 
-           "leaps", "lemon", "libcoin", "lifecycle", 
-           "listenv", "lme4", "lmerTest", "lmodel2", 
-           "lmom", "lmomco", "Lmoments", "lmtest", 
-           "loo", "lubridate", "lwgeom", "magick", 
-           "magrittr", "mapdata", "mapproj", "maps", 
-           "maptools", "markdown", "MASS", "Matrix", 
-           "MatrixModels", "matrixStats", "mc2d", "memoise", 
-           "metR", "mgcv", "mice", "miceadds", "mime", 
-           "miniUI", "minqa", "mitools", "MKdescr", 
-           "MKinfer", "mlbench", "modeldata", "ModelMetrics", 
-           "modelr", "modeltools", "moderndive", "mosaic", 
-           "mosaicCore", "mosaicData", "multcomp", "multcompView", 
-           "munsell", "mvtnorm", "ncdf4.helpers", "ncdf4", 
-           "nlme", "nloptr", "nnet", "nortest", 
-           "numDeriv", "nycflights13", "openair", "openssl", 
-           "openxlsx", "operator.tools", "paletteer", 
-           "parallelly", "parameters", "patchwork", "pbapply", 
+           "CGPfunctions", "changepoint", "checkmate", 
+           "chillR", "chron", "circlize", "CircStats", 
+           "circular", "class", "classInt", "cli", 
+           "clifro", "climdex.pcic", "clipr", "clock", 
+           "clue", "cluster", "cmsaf", "cmsafops", 
+           "cmsafvis", "coda", "codetools", "coin", 
+           "collapse", "colorRamps", "colorspace", "colourpicker", 
+           "combinat", "commonmark", "conf.design", "confintr", 
+           "contfrac", "corrplot", "corrr", "countrycode", 
+           "cowplot", "cpp11", "crayon", "credentials", 
+           "crosstalk", "cubature", "curl", "DAAG", 
+           "dae", "data.table", "datasauRus", "datawizard", 
+           "date", "DBI", "deldir", "dendextend", 
+           "DEoptimR", "desc", "DescTools", "deSolve", 
+           "desplot", "devtools", "diagram", "diffobj", 
+           "digest", "distillery", "distributional", "dotCall64", 
+           "downlit", "dplyr", "dslabs", "DT", "dtw", 
+           "dygraphs", "e1071", "ecmwfr", "effectsize", 
+           "ellipse", "ellipsis", "elliptic", "emmeans", 
+           "EnvStats", "estimability", "evaluate", "Evapotranspiration", 
+           "Exact", "exactRankTests", "expm", "extraDistr", 
+           "extrafont", "extrafontdb", "extRemes", "factoextra", 
+           "FactoMineR", "fansi", "faraway", "farver", 
+           "fastDummies", "fastmap", "fields", "filelock", 
+           "fitdistrplus", "fivethirtyeight", "flashClust", 
+           "FNN", "fontawesome", "forcats", "foreach", 
+           "forecast", "foreign", "formattable", "formula.tools", 
+           "Formula", "fracdiff", "fs", "future.apply", 
+           "future", "gapminder", "gclus", "gcookbook", 
+           "generics", "GenSA", "geomtextpath", "geosphere", 
+           "gert", "getPass", "GGally", "ggalt", 
+           "ggeffects", "ggfittext", "ggforce", "ggformula", 
+           "ggfortify", "ggmosaic", "ggplot2", "ggplotify", 
+           "ggpmisc", "ggpp", "ggpubr", "ggrepel", 
+           "ggridges", "ggsci", "ggside", "ggsignif", 
+           "ggstance", "ggtext", "ggthemes", "ggwordcloud", 
+           "gh", "gitcreds", "gld", "GlobalOptions", 
+           "globals", "glue", "gmp", "gnm", "goftest", 
+           "gower", "gridExtra", "gridGraphics", "gridtext", 
+           "gstat", "gt", "gtable", "gtExtras", 
+           "gtools", "hardhat", "haven", "heplots", 
+           "here", "hexbin", "HH", "highr", "HistData", 
+           "Hmisc", "hms", "htmlTable", "htmltools", 
+           "htmlwidgets", "httpuv", "httr", "httr2", 
+           "hydroGOF", "hydroTSM", "hypergeo", "igraph", 
+           "imputeTS", "infer", "ini", "inline", 
+           "insight", "interp", "intervals", "inum", 
+           "ipred", "ISLR", "isoband", "iterators", 
+           "janeaustenr", "janitor", "jpeg", "jquerylib", 
+           "jsonlite", "juicyjuice", "Kendall", "KernSmooth", 
+           "keyring", "klaR", "knitr", "labeling", 
+           "labelled", "Lahman", "later", "lattice", 
+           "latticeExtra", "lava", "lazyeval", "leaps", 
+           "lemon", "libcoin", "lifecycle", "listenv", 
+           "lme4", "lmerTest", "lmodel2", "lmom", 
+           "lmomco", "Lmoments", "lmtest", "loo", 
+           "lubridate", "lwgeom", "magick", "magrittr", 
+           "mapdata", "mapproj", "maps", "maptools", 
+           "markdown", "MASS", "Matrix", "MatrixModels", 
+           "matrixStats", "mc2d", "memoise", "metR", 
+           "mgcv", "mice", "miceadds", "mime", "miniUI", 
+           "minqa", "mitools", "MKdescr", "MKinfer", 
+           "mlbench", "modeldata", "ModelMetrics", "modelr", 
+           "modeltools", "moderndive", "mosaic", "mosaicCore", 
+           "mosaicData", "multcomp", "multcompView", "munsell", 
+           "mvtnorm", "ncdf4.helpers", "ncdf4", "nlme", 
+           "nloptr", "nnet", "nortest", "numDeriv", 
+           "nycflights13", "openair", "openssl", "openxlsx", 
+           "operator.tools", "paletteer", "parallelly", 
+           "parameters", "partykit", "patchwork", "pbapply", 
            "pbkrtest", "pbs", "PCICt", "performance", 
            "pillar", "pingr", "pkgbuild", "pkgconfig", 
            "pkgdown", "pkgload", "plogr", "plotly", 
@@ -112,7 +113,7 @@ packs <- c("abind", "agricolae", "agridat",
            "rematch2", "remotes", "repr", "reshape", 
            "reshape2", "rio", "rje", "rlang", "rmarkdown", 
            "RMAWGEN", "Rmpfr", 
-           #"RMySQL",
+           #"RMySQL", 
            "robustbase", 
            "rootSolve", "roxygen2", "rpart", "rpivotTable", 
            "rprojroot", "rrefine", "RSQLite", "rstan", 
@@ -130,12 +131,12 @@ packs <- c("abind", "agricolae", "agridat",
            "splus2R", "SQUAREM", "StanHeaders", "stars", 
            "statip", "statquotes", "statsr", "stinepack", 
            "stringdist", 
-           #"stringi", 
-           #"stringr",
+           #"stringi",
+           #"stringr", 
            "strucchange", 
            "styler", "survival", "svglite", "sys", 
            "systemfonts", "tensorA", 
-           #"terra",
+           #"terra", 
            "testthat", 
            "texmex", "textshaping", "TH.data", "threejs", 
            "tibble", "tidyr", "tidyselect", "tidytext",