Skip to content

Commit

Permalink
Merge pull request #226 from Patowhiz/SaveColumnsExisting
Browse files Browse the repository at this point in the history
Save columns existing
  • Loading branch information
conlooptechnologies authored Mar 23, 2021
2 parents 5b00f34 + 6e7988d commit f3510e2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 0 additions & 1 deletion instat/dlgFindNonnumericValues.vb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ Public Class dlgFindNonnumericValues
ucrSaveColumn.SetPositionParametersDirectly(False, "result_name")
'makes the ucrSave control to position new column after selected column
ucrSaveColumn.setLinkedReceiver(ucrReceiverColumn)
ucrSaveColumn.SetAssignToBooleans(bTempAssignToColumnWithoutNames:=False)

ucrChkShowSummary.SetText("Display summary")
ucrChkShowSummary.AddRSyntaxContainsFunctionNamesCondition(True, {"summary"})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ DataSheet$set("public", "save_calculation", function(calc) {
instat_calculation <- R6::R6Class("instat_calculation",
public = list(
initialize = function(function_exp = "", type = "", name = "", result_name = "", result_data_frame = "", manipulations = list(),
sub_calculations = list(), calculated_from = list(), save = 0, before, adjacent_column) {
sub_calculations = list(), calculated_from = list(), save = 0, before = FALSE, adjacent_column = "") {
if((type == "calculation" || type == "summary") && missing(result_name)) stop("result_name must be provided for calculation and summary types")
if(type == "combination" && save > 0) {
warning("combination types do not have a main calculation which can be saved. save_output will be stored as FALSE")
Expand Down

0 comments on commit f3510e2

Please sign in to comment.