rusefi
/
freerouting
mirror of https://github.com/rusefi/freerouting.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replaced the first and last pass parameters with the max passes parameter 

It makes more sense to use a single command line argument to set the maximum number of passes we are willing to make. It's now "-mp <maximum number of passes>"
This commit is contained in:
Andras Fuchs 2020-02-04 22:40:07 +01:00
parent 90839aa2ae
commit cdd1a5db29
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/eu/mihosoft/freerouting/gui/MainApplication.java
View File

@ -29,6 +29,7 @@ import eu.mihosoft.freerouting.logger.FRLogger;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import java.io.File;
/**
*
@ -99,13 +100,8 @@ public class MainApplication extends javax.swing.JFrame
return;
}
if (startupOptions.pass_number_first > 0) {
new_frame.board_panel.board_handling.settings.autoroute_settings.set_start_pass_no(startupOptions.pass_number_first);
new_frame.board_panel.board_frame.autoroute_parameter_window.refresh();
}
new_frame.board_panel.board_handling.settings.autoroute_settings.set_stop_pass_no(startupOptions.pass_number_last);
if (startupOptions.pass_number_last < 99999)
new_frame.board_panel.board_handling.settings.autoroute_settings.set_stop_pass_no(new_frame.board_panel.board_handling.settings.autoroute_settings.get_start_pass_no() + startupOptions.max_passes);
if (startupOptions.max_passes < 99999)
{
var thread = new_frame.board_panel.board_handling.start_batch_autorouter();
@ -116,15 +112,15 @@ public class MainApplication extends javax.swing.JFrame
@Override
public void autorouterAborted() {
SaveDSNFile();
ExportBoardToDSNFile();
}
@Override
public void autorouterFinished() {
SaveDSNFile();
ExportBoardToDSNFile();
}
private void SaveDSNFile()
private void ExportBoardToDSNFile()
{
if ((startupOptions.design_output_filename != null) && (startupOptions.design_output_filename.toLowerCase().endsWith(".dsn")))
{
@ -132,10 +128,10 @@ public class MainApplication extends javax.swing.JFrame
FRLogger.logger.info("Saving '"+startupOptions.design_output_filename+"'...");
try
{
java.io.OutputStream output_stream = new java.io.FileOutputStream(startupOptions.design_output_filename);
String[] file_name_parts = startupOptions.design_output_filename.split("\\.", 2);
String design_name = file_name_parts[0];
String filename_only = new File(startupOptions.design_output_filename).getName();
String design_name = filename_only.substring(0, filename_only.length() - 4);
java.io.OutputStream output_stream = new java.io.FileOutputStream(startupOptions.design_output_filename);
new_frame.board_panel.board_handling.export_to_dsn_file(output_stream, design_name, false);
Runtime.getRuntime().exit(0);
} catch (Exception e)

11
src/main/java/eu/mihosoft/freerouting/gui/StartupOptions.java
View File

@ -16,8 +16,7 @@ public class StartupOptions {
String design_input_filename = null;
String design_output_filename = null;
String design_input_directory_name = null;
int pass_number_first = 0;
int pass_number_last = 99999;
int max_passes = 99999;
java.util.Locale current_locale = java.util.Locale.ENGLISH;
private StartupOptions() {
@ -51,13 +50,9 @@ public class StartupOptions {
if (p_args.length > i + 1 && !p_args[i + 1].startsWith("-")) {
design_output_filename = p_args[i + 1];
}
} else if (p_args[i].startsWith("-pf")) {
} else if (p_args[i].startsWith("-mp")) {
if (p_args.length > i + 1 && !p_args[i + 1].startsWith("-")) {
pass_number_first = Integer.decode(p_args[i + 1]);
}
} else if (p_args[i].startsWith("-pl")) {
if (p_args.length > i + 1 && !p_args[i + 1].startsWith("-")) {
pass_number_last = Integer.decode(p_args[i + 1]);
max_passes = Integer.decode(p_args[i + 1]);
}
} else if (p_args[i].startsWith("-l")) {
// the locale is provided