Skip to content

Commit c8e12b4

Browse files
danielbizercoxdanielbizercox
committed
MOVES3.1 with movesdb20221007
2 parents 20a3396 + 2f30391 commit c8e12b4

13 files changed

+221
-34
lines changed

‎CITATION.cff

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
cff-version: 1.2.0
2-
message: "To cite MOVES3, use the metadata from this file."
2+
message: "To cite MOVES3.1, use the metadata from this file."
33
authors:
44
- name: "USEPA"
5-
title: "Motor Vehicle Emission Simulator: MOVES3"
5+
title: "Motor Vehicle Emission Simulator: MOVES3.1"
66
type: software
77
identifiers:
88
- type: other
99
value: "Office of Transportation and Air Quality. US Environmental Protection Agency. Ann Arbor, MI."
1010
description: "Publisher"
1111
url: "https://www.epa.gov/moves"
12-
version: 3.0.4
13-
date-released: 2022-08-05
12+
version: 3.1
13+
date-released: 2022-12-09

‎MOVESConfiguration.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
defaultServerName = localhost
2-
defaultDatabaseName = movesdb20220802
2+
defaultDatabaseName = movesdb20221007
33
executionServerName = localhost
44
executionDatabaseName = MOVESExecution
55
outputServerName = 127.0.0.1

‎database/Setup/SetupDatabase.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
mysql -uroot -pmoves --force < CreateMOVESUser.sql
2-
mysql -uroot -pmoves < movesdb20220802.sql
2+
mysql -uroot -pmoves < movesdb20221007.sql

‎database/Setup/movesdb20220802.zip ‎database/Setup/movesdb20221007.zip

26.5 MB
Binary file not shown.

‎docs/CommandLineMOVES.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ While the easiest way to interact with MOVES is via its graphical user interface
66

77
## Set up the command environment
88

9-
The first step to running MOVES from the command line is to set up the shell environment to point to all of the resources it needs to run MOVES. Open the Windows command prompt and navigate to the MOVES directory. By default, the path is `C:\Users\Public\EPA\MOVES\MOVES3.0`. The command to change directories is `cd`:
9+
The first step to running MOVES from the command line is to set up the shell environment to point to all of the resources it needs to run MOVES. Open the Windows command prompt and navigate to the MOVES directory. By default, the path is `C:\Users\Public\EPA\MOVES\MOVES3.1`. The command to change directories is `cd`:
1010

1111
```cmd
12-
C:\> cd C:\Users\Public\EPA\MOVES\MOVES3.0
12+
C:\> cd C:\Users\Public\EPA\MOVES\MOVES3.1
1313
1414
```
1515

1616
Then, enter the name `setenv` to run the setenv.bat script, which will set up your environment for you:
1717

1818
```cmd
19-
C:\Users\Public\EPA\MOVES\MOVES3.0> setenv
19+
C:\Users\Public\EPA\MOVES\MOVES3.1> setenv
2020
```
2121

2222
This will execute the setenv.bat script without displaying anything to the command window. The script tells the Windows command shell where to find the Java Runtime Environment (JRE) bundled with MOVES and where to find the Ant utility.
@@ -84,7 +84,7 @@ Below is a simple MOVES batch script for running multiple RunSpecs sequentially.
8484
set RunSpecDir=%CD%
8585
8686
:: Set MOVES install location
87-
set MOVESDir=C:\Users\Public\EPA\MOVES\MOVES3.0
87+
set MOVESDir=C:\Users\Public\EPA\MOVES\MOVES3.1
8888
8989
:: Set up MOVES environment
9090
cd /d %MOVESDir%
@@ -112,7 +112,7 @@ The script below is like the previous script, except that this script also launc
112112
set RunSpecDir=%CD%
113113
114114
:: Set MOVES install location
115-
set MOVESDir=C:\Users\Public\EPA\MOVES\MOVES3.0
115+
set MOVESDir=C:\Users\Public\EPA\MOVES\MOVES3.1
116116
117117
:: Set up MOVES environment
118118
cd /d %MOVESDir%

‎gov/epa/otaq/moves/master/gui/AboutAction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class AboutAction extends JLFAbstractAction {
2828
/** Constant short description text. **/
2929
static final String SHORT_DESCRIPTION_ABOUT = "About MOVES";
3030
/** Constant long description text. **/
31-
static final String LONG_DESCRIPTION_ABOUT = "MOVES3";
31+
static final String LONG_DESCRIPTION_ABOUT = "MOVES3.1";
3232
/** Constant mnemonic key. **/
3333
static final int MNEMONIC_KEY_ABOUT = 'A';
3434

‎gov/epa/otaq/moves/master/gui/MOVESWindow.java

+74-11
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,14 @@ public class MOVESWindow extends JFrame implements ActionListener, LogHandler,
115115
ProfileWeightScriptActionNR profileWeightScriptActionNR;
116116
/** Run MySQL Script Action **/
117117
SummaryReportAction summaryReportAction;
118-
/** User Guide menu action. **/
119-
UserGuideAction userGuideAction;
118+
/** Open Website menu action. **/
119+
OpenWebsiteAction openWebsiteAction;
120+
/** Open GitHub menu action. **/
121+
OpenGitHubAction openGitHubAction;
122+
/** Open Onroad CheatSheet menu action. **/
123+
OpenOnroadCheatSheetAction openOnroadCheatSheetAction;
124+
/** Open Nonroad CheatSheet menu action. **/
125+
OpenNonroadCheatSheetAction openNonroadCheatSheetAction;
120126
/** About menu action. **/
121127
AboutAction aboutAction;
122128
/** Configure menu action. **/
@@ -221,7 +227,7 @@ public class MOVESWindow extends JFrame implements ActionListener, LogHandler,
221227
/** Name of output file that performance profiles are written to **/
222228
static final String PERFORMANCE_PROFILER_FILE_NAME = "guiprofile.txt";
223229
/** Date of the Current Release **/
224-
public static final String MOVES_VERSION = "MOVES3.0.4";
230+
public static final String MOVES_VERSION = "MOVES3.1.0";
225231
/** directory where output db processing scripts are located **/
226232
static final String DB_SCRIPTS_DIR = "database" + File.separator + "OutputProcessingScripts";
227233
static final String DB_NONROAD_SCRIPTS_DIR = "database" + File.separator + "NonroadProcessingScripts";
@@ -528,8 +534,14 @@ void initActions() {
528534
profileWeightScriptActionNR.addActionListener(this);
529535
summaryReportAction = new SummaryReportAction();
530536
summaryReportAction.addActionListener(this);
531-
userGuideAction = new UserGuideAction();
532-
userGuideAction.addActionListener(this);
537+
openWebsiteAction = new OpenWebsiteAction();
538+
openWebsiteAction.addActionListener(this);
539+
openGitHubAction = new OpenGitHubAction();
540+
openGitHubAction.addActionListener(this);
541+
openOnroadCheatSheetAction = new OpenOnroadCheatSheetAction();
542+
openOnroadCheatSheetAction.addActionListener(this);
543+
openNonroadCheatSheetAction = new OpenNonroadCheatSheetAction();
544+
openNonroadCheatSheetAction.addActionListener(this);
533545
aboutAction = new AboutAction();
534546
aboutAction.addActionListener(this);
535547
configureAction = new ConfigureAction();
@@ -688,7 +700,13 @@ public void menuCanceled(MenuEvent e) {}
688700
menuItem.setName("configureMenuItem");
689701
JMenu helpMenu = new JMenu("Help");
690702
helpMenu.setMnemonic('H');
691-
menuItem = helpMenu.add(userGuideAction);
703+
menuItem = helpMenu.add(openWebsiteAction);
704+
menuItem.addMouseListener(mouseHandler);
705+
menuItem = helpMenu.add(openGitHubAction);
706+
menuItem.addMouseListener(mouseHandler);
707+
menuItem = helpMenu.add(openOnroadCheatSheetAction);
708+
menuItem.addMouseListener(mouseHandler);
709+
menuItem = helpMenu.add(openNonroadCheatSheetAction);
692710
menuItem.addMouseListener(mouseHandler);
693711
helpMenu.addSeparator();
694712
menuItem = helpMenu.add(aboutAction);
@@ -792,8 +810,14 @@ public void actionPerformed(ActionEvent evt) {
792810
handleProfileWeightScriptActionNR();
793811
} else if (command.equals(summaryReportAction.getActionCommand())) {
794812
handleSummaryReportAction();
795-
} else if (command.equals(userGuideAction.getActionCommand())) {
796-
handleUserGuideAction();
813+
} else if (command.equals(openWebsiteAction.getActionCommand())) {
814+
handleOpenWebsiteAction();
815+
} else if (command.equals(openGitHubAction.getActionCommand())) {
816+
handleOpenGitHubAction();
817+
} else if (command.equals(openOnroadCheatSheetAction.getActionCommand())) {
818+
handleOpenOnroadCheatSheetAction();
819+
} else if (command.equals(openNonroadCheatSheetAction.getActionCommand())) {
820+
handleOpenNonroadCheatSheetAction();
797821
} else if (command.equals(aboutAction.getActionCommand())) {
798822
handleAboutAction(false);
799823
} else if (command.equals(configureAction.getActionCommand())) {
@@ -1520,9 +1544,48 @@ void handleConfigureAction() {
15201544
c.showModal();
15211545
}
15221546

1523-
/** Handles the User Guide menu action. **/
1524-
void handleUserGuideAction() {
1525-
showURL("http://www.epa.gov/otaq/models/moves/");
1547+
/** Handles the open website menu action. **/
1548+
void handleOpenWebsiteAction() {
1549+
showURL("https://www.epa.gov/moves");
1550+
}
1551+
1552+
/** Handles the Open GitHub menu action. **/
1553+
void handleOpenGitHubAction() {
1554+
showURL("https://github.com/USEPA/EPA_MOVES_Model");
1555+
}
1556+
1557+
/** Handles the Open Onroad CheatSheet menu action. **/
1558+
void handleOpenOnroadCheatSheetAction() {
1559+
try {
1560+
File file = new File("docs/MOVES3CheatsheetOnroad.pdf");
1561+
if(!file.exists()) {
1562+
Logger.log(LogMessageCategory.ERROR, "Could not find the onroad cheatsheet file at: " + file.getAbsolutePath());
1563+
return;
1564+
}
1565+
if(!OpenFile.open(file)) {
1566+
return;
1567+
}
1568+
} catch(Exception e) {
1569+
Logger.log(LogMessageCategory.ERROR, "Could not open the onroad cheatsheet file: " + e);
1570+
return;
1571+
}
1572+
}
1573+
1574+
/** Handles the Open Website menu action. **/
1575+
void handleOpenNonroadCheatSheetAction() {
1576+
try {
1577+
File file = new File("docs/MOVES3CheatsheetNonroad.pdf");
1578+
if(!file.exists()) {
1579+
Logger.log(LogMessageCategory.ERROR, "Could not find the nonroad cheatsheet file at: " + file.getAbsolutePath());
1580+
return;
1581+
}
1582+
if(!OpenFile.open(file)) {
1583+
return;
1584+
}
1585+
} catch(Exception e) {
1586+
Logger.log(LogMessageCategory.ERROR, "Could not open the nonroad cheatsheet file: " + e);
1587+
return;
1588+
}
15261589
}
15271590

15281591
/**

‎gov/epa/otaq/moves/master/gui/OpenGitHubAction.java

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**************************************************************************************************
2+
* @(#)ConverterAction.java
3+
*
4+
*
5+
*
6+
*************************************************************************************************/
7+
package gov.epa.otaq.moves.master.gui;
8+
9+
import javax.swing.Action;
10+
11+
/**
12+
* Class for Open GitHub menu option.
13+
**/
14+
public class OpenGitHubAction extends JLFAbstractAction {
15+
/** Constant command key text. **/
16+
static final String ACTION_COMMAND_KEY =
17+
"openGitHub";
18+
/** Constant action name. **/
19+
static final String NAME =
20+
"Open MOVES GitHub";
21+
/** Constant short description text. **/
22+
static final String SHORT_DESCRIPTION =
23+
"Open MOVES GitHub";
24+
/** Constant long description text. **/
25+
static final String LONG_DESCRIPTION =
26+
"Open MOVES GitHub";
27+
/** Constant mnemonic key. **/
28+
static final int MNEMONIC_KEY = 'G';
29+
30+
/**
31+
* Implements the menu option UI, including command keys,
32+
* name, descriptions, and icons.
33+
**/
34+
public OpenGitHubAction() {
35+
putValue(Action.NAME, NAME);
36+
putValue(Action.SHORT_DESCRIPTION, SHORT_DESCRIPTION);
37+
putValue(Action.LONG_DESCRIPTION, LONG_DESCRIPTION);
38+
putValue(Action.MNEMONIC_KEY, Integer.valueOf(MNEMONIC_KEY));
39+
putValue(Action.ACTION_COMMAND_KEY, ACTION_COMMAND_KEY);
40+
}
41+
}

‎gov/epa/otaq/moves/master/gui/OpenNonroadCheatSheetAction.java

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**************************************************************************************************
2+
* @(#)ConverterAction.java
3+
*
4+
*
5+
*
6+
*************************************************************************************************/
7+
package gov.epa.otaq.moves.master.gui;
8+
9+
import javax.swing.Action;
10+
11+
/**
12+
* Class for Open Nonroad Cheatsheet menu option.
13+
**/
14+
public class OpenNonroadCheatSheetAction extends JLFAbstractAction {
15+
/** Constant command key text. **/
16+
static final String ACTION_COMMAND_KEY =
17+
"openNonroadCheatsheet";
18+
/** Constant action name. **/
19+
static final String NAME =
20+
"Open Nonroad Cheat Sheet";
21+
/** Constant short description text. **/
22+
static final String SHORT_DESCRIPTION =
23+
"Open Nonroad Cheat Sheet";
24+
/** Constant long description text. **/
25+
static final String LONG_DESCRIPTION =
26+
"Open Nonroad Cheat Sheet";
27+
/** Constant mnemonic key. **/
28+
static final int MNEMONIC_KEY = 'N';
29+
30+
/**
31+
* Implements the menu option UI, including command keys,
32+
* name, descriptions, and icons.
33+
**/
34+
public OpenNonroadCheatSheetAction() {
35+
putValue(Action.NAME, NAME);
36+
putValue(Action.SHORT_DESCRIPTION, SHORT_DESCRIPTION);
37+
putValue(Action.LONG_DESCRIPTION, LONG_DESCRIPTION);
38+
putValue(Action.MNEMONIC_KEY, Integer.valueOf(MNEMONIC_KEY));
39+
putValue(Action.ACTION_COMMAND_KEY, ACTION_COMMAND_KEY);
40+
}
41+
}

‎gov/epa/otaq/moves/master/gui/OpenOnroadCheatSheetAction.java

+41
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
/**************************************************************************************************
2+
* @(#)ConverterAction.java
3+
*
4+
*
5+
*
6+
*************************************************************************************************/
7+
package gov.epa.otaq.moves.master.gui;
8+
9+
import javax.swing.Action;
10+
11+
/**
12+
* Class for Open Onroad Cheatsheet menu option.
13+
**/
14+
public class OpenOnroadCheatSheetAction extends JLFAbstractAction {
15+
/** Constant command key text. **/
16+
static final String ACTION_COMMAND_KEY =
17+
"openOnroadCheatsheet";
18+
/** Constant action name. **/
19+
static final String NAME =
20+
"Open Onroad Cheat Sheet";
21+
/** Constant short description text. **/
22+
static final String SHORT_DESCRIPTION =
23+
"Open Onroad Cheat Sheet";
24+
/** Constant long description text. **/
25+
static final String LONG_DESCRIPTION =
26+
"Open Onroad Cheat Sheet";
27+
/** Constant mnemonic key. **/
28+
static final int MNEMONIC_KEY = 'O';
29+
30+
/**
31+
* Implements the menu option UI, including command keys,
32+
* name, descriptions, and icons.
33+
**/
34+
public OpenOnroadCheatSheetAction() {
35+
putValue(Action.NAME, NAME);
36+
putValue(Action.SHORT_DESCRIPTION, SHORT_DESCRIPTION);
37+
putValue(Action.LONG_DESCRIPTION, LONG_DESCRIPTION);
38+
putValue(Action.MNEMONIC_KEY, Integer.valueOf(MNEMONIC_KEY));
39+
putValue(Action.ACTION_COMMAND_KEY, ACTION_COMMAND_KEY);
40+
}
41+
}

‎gov/epa/otaq/moves/master/gui/UserGuideAction.java ‎gov/epa/otaq/moves/master/gui/OpenWebsiteAction.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**************************************************************************************************
2-
* @(#)UserGuideAction.java
2+
* @(#)OpenWebsiteAction.java
33
*
44
*
55
*
@@ -9,14 +9,14 @@
99
import javax.swing.Action;
1010

1111
/**
12-
* Class for MOVES UserGuide menu option.
12+
* Class for MOVES Open Website menu option.
1313
*
1414
* @author Wesley Faler
1515
* @version 2014-07-27
1616
**/
17-
public class UserGuideAction extends JLFAbstractAction {
17+
public class OpenWebsiteAction extends JLFAbstractAction {
1818
/** Constant command key text. **/
19-
static final String ACTION_COMMAND_KEY_USER_GUIDE = "user-guide-command";
19+
static final String ACTION_COMMAND_KEY_USER_GUIDE = "open-website-command";
2020
/** Constant action name. **/
2121
static final String NAME_USER_GUIDE = "MOVES Website and Documents";
2222
/** Constant small icon file and path. **/
@@ -30,19 +30,20 @@ public class UserGuideAction extends JLFAbstractAction {
3030
/** Constant long description text. **/
3131
static final String LONG_DESCRIPTION_USER_GUIDE =
3232
"View MOVES web page for help.";
33-
// static final int MNEMONIC_KEY_USER_GUIDE = '1';
33+
/** Constant mnemonic key. **/
34+
static final int MNEMONIC_KEY = 'W';
3435

3536
/**
3637
* Implements the UserGuide menu option UI, including command keys, name,
3738
* descriptions, and icons.
3839
**/
39-
public UserGuideAction() {
40+
public OpenWebsiteAction() {
4041
putValue(Action.NAME, NAME_USER_GUIDE);
4142
putValue(Action.SMALL_ICON, getIcon(SMALL_ICON_USER_GUIDE));
4243
putValue(LARGE_ICON, getIcon(LARGE_ICON_USER_GUIDE));
4344
putValue(Action.SHORT_DESCRIPTION, SHORT_DESCRIPTION_USER_GUIDE);
4445
putValue(Action.LONG_DESCRIPTION, LONG_DESCRIPTION_USER_GUIDE);
45-
// putValue(Action.MNEMONIC_KEY, Integer.valueOf(MNEMONIC_KEY_USER_GUIDE));
46+
putValue(Action.MNEMONIC_KEY, Integer.valueOf(MNEMONIC_KEY));
4647
putValue(Action.ACTION_COMMAND_KEY, ACTION_COMMAND_KEY_USER_GUIDE);
4748
}
4849
}

‎maketodo.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
defaultServerName = localhost
2-
defaultDatabaseName = movesdb20220802
2+
defaultDatabaseName = movesdb20221007
33
executionServerName = localhost
44
executionDatabaseName = *
55
outputServerName = localhost

0 commit comments

Comments
 (0)