Skip to content
This repository has been archived by the owner on Sep 28, 2022. It is now read-only.

Commit

Permalink
Merge pull request #300 from USEPA/dev-ui-py3qt5
Browse files Browse the repository at this point in the history 
MTP5r3 Release Updates
  • Loading branch information
@TongZhai
TongZhai authored Aug 15, 2019
2 parents 9e5630b + a7a204b commit 4a7e77d
Show file tree
Hide file tree
Showing 58 changed files with 4,749 additions and 706 deletions.
3 changes: 3 additions & 0 deletions doc/EPANET/EPANET.qhp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
<section title="Data Browser" ref="src/Data_Bro.htm"></section>
<section title="Map Browser" ref="src/Map_Brow.htm"></section>
<section title="Property Editor" ref="src/Property.htm"></section>
<section title="Setting Program Preferences" ref="src/Setting_.htm"></section>
</section>
<section title="Working with Projects" ref="src/Working_.htm">
<section title="Overview" ref="src/Working_.htm"></section>
Expand Down Expand Up @@ -241,6 +242,8 @@
<keyword name="Pipes" ref="src/Pipes.htm"/>
<keyword name="Adding a link" ref="src/Addi0049.htm"/>
<keyword name="Editing an Object" ref="src/Editing_.htm"/>
<keyword name="Program Preferences - General" ref="src/Program_.htm"/>
<keyword name="Program Preferences - Formats" ref="src/Prog0046.htm"/>
<keyword name="Setting Project Defaults" ref="src/Sett0005.htm"/>
<keyword name="Viewing a Project Summary" ref="src/View0006.htm"/>
<keyword name="Property Editor" ref="src/Property.htm"/>
Expand Down
Binary file modified doc/EPANET/epanet.qch
View file
Binary file not shown.
Binary file modified doc/EPANET/epanet.qhc
View file
Binary file not shown.
49 changes: 49 additions & 0 deletions doc/EPANET/src/Prog0046.htm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<HTML><HEAD><TITLE>Program Preferences - Formats</TITLE><META NAME="GENERATOR" CONTENT="ForeHTML Pro 2.0">
<STYLE TYPE="text/css"><!--

.BannerBase { font-size: 12pt ; font-weight: bold; margin: 5pt 0pt 5pt 0pt ; font-family: Arial,sans-serif; }
.Base { font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; }
.Base1 { font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; }
.BodyText2 { font-size: 12pt ; margin: 0pt 36pt 0pt 36pt ; font-family: Times New Roman,serif; }
.BodyText21 { font-size: 12pt ; margin: 0pt 36pt 0pt 36pt ; font-family: Times New Roman,serif; }
.Bullet1 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Bullet2 { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Arial,sans-serif; }
.Bullet3 { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Arial,sans-serif; }
.Bullet4 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Bullet5 { font-size: 10pt ; font-family: Arial,sans-serif; }
.ButtonBar { font-size: 6pt ; font-weight: bold; margin: 5pt -0.1in 5pt -0.1in ; font-family: Arial,sans-serif; }
.HeadingBase { font-size: 11pt ; margin: 7pt 0pt 0pt 0pt ; line-height: 11pt ; font-family: Arial,sans-serif; }
.HeadingBase1 { font-size: 11pt ; margin: 7pt 0pt 0pt 0pt ; line-height: 11pt ; font-family: Arial,sans-serif; }
.HTMLBASE { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
BODY { margin: 0pt 1px 0pt 0pt ; }
.Indented { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; font-family: Arial,sans-serif; }
.List { font-size: 11pt ; margin: 0pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListBullet { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListBullet1 { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListNumber { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListNumber1 { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.List1 { font-size: 11pt ; margin: 0pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.Normal { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
.Normal1 { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
.Number1 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number2 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number3 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number4 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number5 { font-size: 10pt ; font-family: Arial,sans-serif; }

--></STYLE>
</HEAD>

<BODY BGPROPERTIES=FIXED>
<!--ForeHelp.Banner-->

<P STYLE="font-size: 12pt ; font-weight: bold; margin: 5pt 0pt 5pt 0pt ; font-family: Arial,sans-serif; ">
<SPAN STYLE="color: #0000ff; ">Program Preferences - Formats</SPAN></P><!--ForeHelp.Ignore--><HR><!--ForeHelp.EndIgnore--><!--ForeHelp.EndBanner-->

<P CLASS="Base">
The <B>Formats</B> page of the <A HREF="Setting_.htm">Program Preferences</A> dialog box controls how many decimal places are displayed when results for computed quantities are reported.</P>
<P CLASS="Bullet2"><IMG SRC="GENERATE/DO-IT.gif" ALT="GENERATE/DO-IT.gif" WIDTH="6" HEIGHT="8" ALIGN="BASELINE" BORDER="0">&nbsp;&nbsp;&nbsp;&nbsp;
Use the dropdown list boxes to select a specific Node or Link parameter.</P>
<P CLASS="Bullet2"><IMG SRC="GENERATE/DO-IT.gif" ALT="GENERATE/DO-IT.gif" WIDTH="6" HEIGHT="8" ALIGN="BASELINE" BORDER="0">&nbsp;&nbsp;&nbsp;&nbsp;
Use the spin edit boxes to select the number of decimal places to use when displaying computed results for the parameter.</P>
</BODY></HTML>
65 changes: 65 additions & 0 deletions doc/EPANET/src/Program_.htm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<HTML><HEAD><TITLE>Program Preferences - General</TITLE><META NAME="GENERATOR" CONTENT="ForeHTML Pro 2.0">
<STYLE TYPE="text/css"><!--

.BannerBase { font-size: 12pt ; font-weight: bold; margin: 5pt 0pt 5pt 0pt ; font-family: Arial,sans-serif; }
.Base { font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; }
.Base1 { font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; }
.BodyText2 { font-size: 12pt ; margin: 0pt 36pt 0pt 36pt ; font-family: Times New Roman,serif; }
.BodyText21 { font-size: 12pt ; margin: 0pt 36pt 0pt 36pt ; font-family: Times New Roman,serif; }
.Bullet1 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Bullet2 { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Arial,sans-serif; }
.Bullet3 { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Arial,sans-serif; }
.Bullet4 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Bullet5 { font-size: 10pt ; font-family: Arial,sans-serif; }
.ButtonBar { font-size: 6pt ; font-weight: bold; margin: 5pt -0.1in 5pt -0.1in ; font-family: Arial,sans-serif; }
.HeadingBase { font-size: 11pt ; margin: 7pt 0pt 0pt 0pt ; line-height: 11pt ; font-family: Arial,sans-serif; }
.HeadingBase1 { font-size: 11pt ; margin: 7pt 0pt 0pt 0pt ; line-height: 11pt ; font-family: Arial,sans-serif; }
.HTMLBASE { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
BODY { margin: 0pt 1px 0pt 0pt ; }
.Indented { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; font-family: Arial,sans-serif; }
.List { font-size: 11pt ; margin: 0pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListBullet { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListBullet1 { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListNumber { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListNumber1 { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.List1 { font-size: 11pt ; margin: 0pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.Normal { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
.Normal1 { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
.Number1 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number2 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number3 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number4 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number5 { font-size: 10pt ; font-family: Arial,sans-serif; }

--></STYLE>
</HEAD>

<BODY BGPROPERTIES=FIXED>
<!--ForeHelp.Banner-->

<P STYLE="font-size: 12pt ; font-weight: bold; margin: 5pt 0pt 5pt 0pt ; font-family: Arial,sans-serif; ">
<SPAN STYLE="color: #0000ff; ">Program Preferences - General</SPAN></P><!--ForeHelp.Ignore--><HR><!--ForeHelp.EndIgnore--><!--ForeHelp.EndBanner-->

<P CLASS="Base">
The <B>General </B>page of the <A HREF="Setting_.htm">Program Preferences</A> dialog box allows you to modify the following program preferences:</P>
<P CLASS="Base">
<B><U>Bold Fonts</U></B></P>
<P CLASS="Base">
Uses bold fonts in all newly created windows.</P>
<P CLASS="Base">
<B><U>Blinking Map Hiliter</U></B></P>
<P CLASS="Base">
Makes the selected node, link, or label on the map blink on and off. </P>
<P CLASS="Base">
<B><U>Flyover Map Labeling</U></B></P>
<P CLASS="Base">
Displays the ID label and the current parameter value a hint-style box whenever the mouse is placed over a node or link on the network map. </P>
<P CLASS="Base">
<B><U>Confirm Deletions</U></B></P>
<P CLASS="Base">
Displays a confirmation dialog box before deleting any object.</P>
<P CLASS="Base">
<B><U>Automatic Backup File</U></B></P>
<P CLASS="Base">
Saves a backup copy of a newly opened project to disk named with a .bak extension.</P>
</BODY></HTML>
67 changes: 67 additions & 0 deletions doc/EPANET/src/Setting_.htm
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<HTML><HEAD><TITLE>Setting Program Preferences</TITLE><META NAME="GENERATOR" CONTENT="ForeHTML Pro 2.0">
<STYLE TYPE="text/css"><!--

.BannerBase { font-size: 12pt ; font-weight: bold; margin: 5pt 0pt 5pt 0pt ; font-family: Arial,sans-serif; }
.Base { font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; }
.Base1 { font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; }
.BodyText2 { font-size: 12pt ; margin: 0pt 36pt 0pt 36pt ; font-family: Times New Roman,serif; }
.BodyText21 { font-size: 12pt ; margin: 0pt 36pt 0pt 36pt ; font-family: Times New Roman,serif; }
.Bullet1 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Bullet2 { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Arial,sans-serif; }
.Bullet3 { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Arial,sans-serif; }
.Bullet4 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Bullet5 { font-size: 10pt ; font-family: Arial,sans-serif; }
.ButtonBar { font-size: 6pt ; font-weight: bold; margin: 5pt -0.1in 5pt -0.1in ; font-family: Arial,sans-serif; }
.HeadingBase { font-size: 11pt ; margin: 7pt 0pt 0pt 0pt ; line-height: 11pt ; font-family: Arial,sans-serif; }
.HeadingBase1 { font-size: 11pt ; margin: 7pt 0pt 0pt 0pt ; line-height: 11pt ; font-family: Arial,sans-serif; }
.HTMLBASE { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
BODY { margin: 0pt 1px 0pt 0pt ; }
.Indented { font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; font-family: Arial,sans-serif; }
.List { font-size: 11pt ; margin: 0pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListBullet { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListBullet1 { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListNumber { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.ListNumber1 { font-size: 11pt ; margin: 6pt 90pt 0pt 90pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.List1 { font-size: 11pt ; margin: 0pt 18pt 0pt 18pt ; text-indent: -18pt ; font-family: Times New Roman,serif; }
.Normal { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
.Normal1 { font-size: 12pt ; margin: 0pt 1px 0pt 0pt ; font-family: Times New Roman,serif; }
.Number1 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number2 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number3 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number4 { font-size: 10pt ; font-family: Arial,sans-serif; }
.Number5 { font-size: 10pt ; font-family: Arial,sans-serif; }

--></STYLE>
</HEAD>

<BODY BGPROPERTIES=FIXED>
<!--ForeHelp.Banner-->

<P STYLE="font-size: 12pt ; font-weight: bold; margin: 5pt 0pt 5pt 0pt ; font-family: Arial,sans-serif; ">
<SPAN STYLE="color: #0000ff; ">Setting Program Preferences</SPAN></P><!--ForeHelp.Ignore--><HR><!--ForeHelp.EndIgnore--><!--ForeHelp.EndBanner-->

<P CLASS="Base">
Program preferences allow you to customize certain program features. </P>
<P CLASS="Base"><SPAN STYLE="font-size: 11pt ; ">
</SPAN><B>To set Program Preferences:</B></P>
<OL STYLE="font-size: 10pt ; font-family: Arial,sans-serif; "><LI>
Select <B>File &gt;&gt; Preferences</B>.</LI>
<LI>
A <B>Preferences</B> dialog form will appear allowing you to select preferences for the following categories:</LI>
<P STYLE="font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; font-family: Arial,sans-serif; "><IMG SRC="GENERATE/DIAMOND.gif" ALT="GENERATE/DIAMOND.gif" WIDTH="8" HEIGHT="12" ALIGN="BASELINE" BORDER="0">&nbsp;&nbsp;&nbsp;&nbsp;
<A HREF="Program_.htm">General Preferences</A></P>
<P STYLE="font-size: 10pt ; margin: 6pt 18pt 0pt 18pt ; font-family: Arial,sans-serif; "><IMG SRC="GENERATE/DIAMOND.gif" ALT="GENERATE/DIAMOND.gif" WIDTH="8" HEIGHT="12" ALIGN="BASELINE" BORDER="0">&nbsp;&nbsp;&nbsp;&nbsp;
<A HREF="Prog0046.htm">Formatting Preferences</A></P>
<P STYLE="font-size: 10pt ; margin: 6pt 36pt 0pt 36pt ; text-indent: -18pt ; font-family: Arial,sans-serif; ">
&nbsp;</P>
<P STYLE="font-size: 10pt ; margin: 6pt 0pt 0pt 0pt ; font-family: Arial,sans-serif; ">
&nbsp;</P><!--ForeHelp.Ignore-->
<!--ForeHelp.Browse NAME="workspace" PREV="Property.htm" NEXT=""-->
<BR CLEAR><HR><TABLE WIDTH="100%"><TR>
<TD ALIGN="LEFT" WIDTH="33%"><A HREF="Property.htm"><IMG SRC="prev.gif" ALIGN="BOTTOM" ALT="prev.gif" BORDER=0></A>
<IMG SRC="disnext.gif" ALIGN="BOTTOM" ALT="disnext.gif" BORDER=0></TD>
<TD ALIGN="CENTER" WIDTH="33%"></TD>
<TD ALIGN="RIGHT" WIDTH="33%"></TD>
</TR></TABLE><!--ForeHelp.EndIgnore-->

</BODY></HTML>
1 change: 1 addition & 0 deletions doc/SWMM/SWMM.qhp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,7 @@
</section>
<section title="Cross-Section Editor" ref="src/cross_sectioneditordialog.htm"></section>
<section title="Curve Editor" ref="src/curveeditordialog.htm"></section>
<section title="Events Editor" ref="src/events_editor.htm"></section>
<section title="Graph Options Dialog" ref="src/graphoptionsdialog.htm"></section>
<section title="Groundwater Flow Editor" ref="src/groundwaterfloweditordialog.htm"></section>
<section title="Groundwater Equation Editor" ref="src/groundwater_equation_editor.htm"></section>
Expand Down
2 changes: 1 addition & 1 deletion doc/SWMM/src/curveeditordialog.htm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
onmouseout="document.images.prev.src='button_prev.png'"><img name=prev src="button_prev.png" border=0 alt="Previous page"></a>&nbsp;


<a href="graphoptionsdialog.htm"
<a href="events_editor.htm"
onmouseover="document.images.next.src='button_next_h.png'"
onmouseout="document.images.next.src='button_next.png'"><img name=next src="button_next.png" border=0 alt="Next page"></a>

Expand Down
Loading

0 comments on commit 4a7e77d

Please sign in to comment.