Skip to content

Commit

Permalink
Removed legacy Leaflet checkbox
Browse files Browse the repository at this point in the history
(Please delete your previous configuration.json and restart the GUI to generate a new one)
  • Loading branch information
clvrk committed Jun 7, 2020
1 parent 2c5a3e8 commit 5777b0f
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 31 deletions.
3 changes: 1 addition & 2 deletions AppSettings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ public AppSettings()
config_cs["image_format"] = "PNG";
config_cs["image_quality"] = 100;
config_cs["force_overwrite"] = false;
config_cs["leaflet"] = false;
}

public string GetArguments(PapyrusVariant variant, bool includeExePath, string worldPath, string outputPath)
Expand Down Expand Up @@ -65,7 +64,7 @@ public string GetArguments(PapyrusVariant variant, bool includeExePath, string w
additionalArgs[1] = String.Format("--limitx {0},{1} --limitz {2},{3}", config_cs["limitXZ_X1"] / divider, config_cs["limitXZ_X2"] / divider, config_cs["limitXZ_Z1"] / divider, config_cs["limitXZ_Z2"] / divider);
}

arguments = String.Format(exePath + "-w \"{0}\" -o \"{1}\" --dim {2} -f {3} {4} --brillouin_j {5} --brillouin_divider {6} --brillouin_offset {7} --forceoverwrite {8} --use_leaflet_legacy {9} --htmlfile {10} {11} {12}", worldPath, outputPath, config_cs["dimension"], config_cs["image_format"].ToString().ToLower(), config_cs["image_quality"], config_cs["heightmap_j"], config_cs["heightmap_divider"], config_cs["heightmap_offset"], Convert.ToString(config_cs["force_overwrite"]).ToLower(), Convert.ToString(config_cs["leaflet"]).ToLower(), config_cs["html_filename"], additionalArgs[0], additionalArgs[1]);
arguments = String.Format(exePath + "-w \"{0}\" -o \"{1}\" --dim {2} -f {3} {4} --brillouin_j {5} --brillouin_divider {6} --brillouin_offset {7} --forceoverwrite {8} --htmlfile {9} {10} {11}", worldPath, outputPath, config_cs["dimension"], config_cs["image_format"].ToString().ToLower(), config_cs["image_quality"], config_cs["heightmap_j"], config_cs["heightmap_divider"], config_cs["heightmap_offset"], Convert.ToString(config_cs["force_overwrite"]).ToLower(), config_cs["html_filename"], additionalArgs[0], additionalArgs[1]).Trim();

break;

Expand Down
41 changes: 14 additions & 27 deletions Forms/FormConfigure.Designer.cs

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

2 changes: 0 additions & 2 deletions Forms/FormConfigure.cs
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ public FormConfigure(FormMain formMain)
comboBoxImgFormat.SelectedItem = FormMain.Settings.config_cs["image_format"];
numericUpDownImgQuality.Value = (int)FormMain.Settings.config_cs["image_quality"];
checkBoxForceOverwrite.Checked = (bool)FormMain.Settings.config_cs["force_overwrite"];
checkBoxLeaflet.Checked = (bool)FormMain.Settings.config_cs["leaflet"];
#endregion
}

Expand Down Expand Up @@ -155,7 +154,6 @@ public void ApplySettings()
FormMain.Settings.config_cs["image_format"] = comboBoxImgFormat.SelectedItem.ToString();
FormMain.Settings.config_cs["image_quality"] = (int)numericUpDownImgQuality.Value;
FormMain.Settings.config_cs["force_overwrite"] = (bool)checkBoxForceOverwrite.Checked;
FormMain.Settings.config_cs["leaflet"] = (bool)checkBoxLeaflet.Checked;
#endregion
//
#region .js
Expand Down

0 comments on commit 5777b0f

Please sign in to comment.