LayoutEditor: Draw tracks as tracks!

build.xml

@@ -458,7 +458,7 @@
             <fileset dir="${resourcedir}" includes="*.gif"/>
         </copy>
         <copy todir="${target}">
-            <fileset dir="${source}" includes="**/*.properties,**/*.js"/>
+            <fileset dir="${source}" includes="**/*.properties,**/*.js,**/*.png"/>
             <fileset dir="${source}" includes="META-INF/**"/>
         </copy>
     </target>

help/en/Acknowledgements.shtml

@@ -104,6 +104,9 @@
         general has made more contributions than can be
         counted.</li>
 
+        <li>Daniel Bergqvist, who added the "ask before shutdown" code, 
+        improved the Bundle code and added to the Swedish translation
+
         <li>Andrew Berridge, who debugged and fixed problems with
         the SPROG serial interface</li>
 
@@ -472,7 +475,8 @@
         <li>Ian Havercroft, who provided the correct identification
         codes for ESU decoders</li>
 
-        <li>David Heap, who provided a QSI decoder fix</li>
+        <li>David Heap, who provided a QSI decoder fix
+        and improved how signal head aspects are supported.</li>
 
         <li>Rob Heikens, who created ESU decoder definitions and
         programmer pages</li>
@@ -975,7 +979,9 @@
         comboboxes (with drop-down menus); added a 2nd turnout
         circle for slips and added left, right & bottom options
         for the toolbar (and re-laid out same) in the Layout Editor.
-        Also wrote all the slip code for the web server.</li>
+        Added support for DMX512 lighting.
+        Also wrote all the slip code for the web server.
+        </li>
 
         <li>Mark Waters, who provided numerous Zimo decoder
         definitions and new Zimo MX620 definitions.</li>

help/en/JavaHelpSearch/SCHEMA

@@ -1,2 +1,2 @@
 JavaSearch 1.0
-TMAP bs=2048 rt=69 fl=-1 id1=15426 id2=1
+TMAP bs=2048 rt=72 fl=-1 id1=15445 id2=1

help/en/html/apps/DecoderPro/CreateDecoderAdvanced.shtml

@@ -461,7 +461,8 @@ and uses a special syntax:
       CV programming in the command station. "Capability" elements
       are used to tell DecoderPro about these.
 
-      <h4>Access to High CV addresses</h4>Certain command stations
+      <h4>Access to High CV addresses</h4>
+      Certain command stations
       can only access up to CV 256 or CV512. Some decoder
       manufacturers have built in mechanisms to bypass this. For
       example, some ESU decoders can use writes to various CVs to
@@ -624,22 +625,39 @@ selects the different algorithm needed here.
       </ul>
 
       <a id="accessoryops" name="accessoryops"></a>
-      <h4>Accessory Decoder Ops Mode</h4>Special programming
-      packets are used by certain accessory decoders to configure
-      their CVs from the DCC track signal. The capability to do
-      that is written:
+      <h4>Accessory Decoder Ops Mode</h4>
+      Certain accessory decoders require special
+      programming packets to configure their CVs from the DCC track signal.
+      The capability to do that is written:
       <pre style="font-family: monospace;">
         &lt;capability&gt;
             &lt;name&gt;Ops Mode Accessory Programming&lt;/name&gt;
-            &lt;parameter name="Address Type"&gt;decoder&lt;/name&gt;
+            &lt;parameter name="Address Type"&gt;decoder&lt;/parameter&gt;
+            &lt;parameter name="Delay"&gt;200&lt;/parameter&gt;
         &lt;/capability&gt;
 </pre>The "Address Type" parameter is optional:
       <ul>
           <li>If it is "decoder" or omitted, the current address is interpreted as a 9-bit accessory decoder address.</li>
           <li>If it is "accessory" or "output", the current address is interpreted as an 11-bit accessory output address.</li>
           <li>If it is "signal", the current address is interpreted as an 11-bit signal decoder address.</li>
+          <li>
+              If it is "altsignal", the current address is interpreted as an 11-bit signal decoder address,
+              using an alternative interpretation of
+              <a href="https://www.nmra.org/sites/default/files/s-9.2.1_2012_07.pdf"
+                target="_blank">NMRA standard 9.2.1</a>).
+           </li>
+          <li>
+              If it is "legacy", the current address is interpreted as a 9-bit address (as for "decoder")
+              but a "legacy" programming packet (as per Appendix A of
+              <a href="https://www.nmra.org/sites/default/files/s-9.2.1_2012_07.pdf"
+                target="_blank">NMRA standard 9.2.1</a>)
+           is sent.
+          </li>
       </ul>
-      <p>
+      The "Delay" parameter is optional and specifies a minimum delay (in milliseconds)
+      between successive writes. Some decoders will miss commands if the delay is too short.
+      If this is parameter is omitted, the default delay is 500 milliseconds.
+       <p>
         Note that this only works for
         ops-mode writes; these particular NMRA DCC packets do not perform
         read operations, nor do they work in the service mode (programming
@@ -670,6 +688,36 @@ selects the different algorithm needed here.
       NMRA standard 9.2.2</a>.
       </p>
 
+      <a id="opsdelayed" name="opsdelayed"></a>
+      <h4>Ops Mode Delayed Programming</h4>
+       <p>
+      Most locomotive decoders accept special programming packets
+      to configure their CVs from the DCC track signal (Programming on Main).
+      </p>
+      However these packets take time to process and if subsequent packets are sent
+      too soon they can be missed.
+      The capability to do add a delay after programming each CV is written:
+      <pre style="font-family: monospace;">
+        &lt;capability&gt;
+            &lt;name&gt;Ops Mode Delayed Programming&lt;/name&gt;
+            &lt;parameter name="Delay"&gt;500&lt;/parameter&gt;
+        &lt;/capability&gt;
+</pre>The "Delay" parameter specifies
+      a minimum delay (in milliseconds) between successive writes.
+      Some decoders miss commands if the delay is too short.
+      If this is parameter is omitted, the default delay is 500 milliseconds.
+       <p>
+        Note that this only works for
+        ops-mode writes; these particular NMRA DCC packets do not perform
+        read operations, nor do they work in the service mode (programming track).
+      </p>
+       <p>
+        Note also that this particular capability only works for multi-function
+        decoders. Accessory decoders need to use the
+        <a href="#accessoryops">Accessory Decoder Ops Mode</a>
+        capability, which has its own "Delay" parameter.
+      </p>
+
       <a name="indexedcap" id="indexedcap"></a>
       <h4>Indexed CV Access</h4>
       To access indexed CVs, include this

help/en/html/apps/PanelPro/ShowPanel.shtml

@@ -7,15 +7,17 @@
   "HTML Tidy for Mac OS X (vers 31 October 2006 - Apple Inc. build 15.17), see www.w3.org">
   <!-- Copyright Bob Jacobsen 2008 -->
 
-  <title>JMRI: Displaying JMRI Panel Files</title><!-- Style -->
+  <title>JMRI: Displaying JMRI Panel Files</title>
+  <!-- Style -->
   <meta http-equiv="Content-Type" content=
   "text/html; charset=us-ascii">
   <link rel="stylesheet" type="text/css" href="/css/default.css"
   media="screen">
   <link rel="stylesheet" type="text/css" href="/css/print.css"
   media="print">
   <link rel="icon" href="/images/jmri.ico" type="image/png">
-  <link rel="home" title="Home" href="/"><!-- /Style -->
+  <link rel="home" title="Home" href="/">
+  <!-- /Style -->
 </head>
 
 <body>
@@ -37,6 +39,9 @@
       You open your panel file with a web browser, and can then
       read it, print it, copy and paste into a file of another
       form, etc.</p>
+      <img src="images/PanelFileView.png"
+           alt="screen shot of xml preview" align="right" width="462"
+           height="164" hspace="0" vspace="0">
 
       <p>A large example of this is available as a <a href=
       "http://jmri.org/community/examples/SPShastaConfigFile.pdf">PDF
@@ -90,8 +95,8 @@
       <p>Don't change the first line!</p>
 
       <p>For technical information on this, see the <a href=
-      "../../doc/Technical/XmlUsage.shtml">JMRI XML page</a>. 
-      <!--#include virtual="/Footer" --></p>
+      "../../doc/Technical/XmlUsage.shtml">JMRI XML page</a>.</p>
+      <!--#include virtual="/Footer" -->
     </div><!-- closes #mainContent-->
   </div><!-- closes #mBody-->
 </body>

help/en/html/doc/Technical/GitFAQ.shtml

@@ -614,11 +614,15 @@
             repository.
 
 <pre style="font-family: monospace;">
-                git pull https://github.com/arnie/JMRI.git arnie-great-tool
+                git remote add https://github.com/arnie/JMRI.git arnie
+
+                git fetch arnie arnie-great-tool
                 git checkout arnie-great-tool
 </pre>
-              where the 1st part of the "pull" is the
-              URL for Arnie's repository.
+              where the 1st part of the "remote add" is the
+              URL for Arnie's repository, and you just have to 
+              do that command once to define "arnie" as an alias
+              you can use in "git fetch".
             </li>
 
             <li>Now Bill can work with that code, and even change
@@ -629,6 +633,9 @@
                 git commit -m"Fixed a bug in sternerstat handling"
                 git push
 </pre>
+              which commits the changes and pushes them up
+              into Bill's repository on Github.
+              <p>
               Then Arnie can merge those changes into
               his own copy with:
 

help/en/html/doc/Technical/I8N.shtml

@@ -427,6 +427,88 @@ using the new .properties files.
 <p>If all is well, all the message text will have been translated to UPPER CASE.
 Anything you wrote that remains in lower case has not been completely internationalized.
 
+<a name="bundlekeysreport"></a>
+<h3>Bundle Keys Report</h3>
+<p><strong>BundleKeysReport.py</strong>, located in the <strong>scripts</strong> (not jython) directory,
+is used to analyse the bundle keys within a property file.  The primary function is
+to identify unused keys.  The script is run using <strong><em>PanelPro Panels >>
+Run Script...</em></strong>  The output from the script is written to the Script
+Output window.  The run time will vary based on the number of keys to be checked
+along with the position in the source hierarchy.  It will range from several to many
+seconds.</p>
+
+<p>Once a property file, normally the default/English file, is selected, all of the
+classes within the package are scanned for each key in the file.  if there are
+more packages below the initial one, their classes are also scanned.  This
+covers the bundle hierarchy.  <strong>Note:</strong>  It is possible to get false
+positive matches when a class is using a matching key but the class is using a
+private property file.</p>
+
+<p>After the unused key list is built, the entire source tree is scanned for external
+references to the selected property file.  If the class containing the reference uses
+any of the unused keys, those keys are removed from the unused key list.  The jython
+directory is also scanned for external references.</p>
+
+<p>After the scanning is done, a dialog box prompts to save the unused key list.  If
+desired, the list will be written with the selected location and name.
+The default location will be the User Files Location.</p>
+
+<p>The final dialog box asks if the property files should be updated.  If Yes is 
+selected, all of the property files in the bundle set are backed up.  Each file is
+then scanned for the unused keys.  When one is found, the line is updated with
+<strong>#NotUsed</strong> as a comment.  If testing reveals that the key is
+actually required, the comment can be removed.  <strong>Note:</strong>  <em>If
+the source tree is managed by Git, the backups will be included in the current
+branch.  Either move the backups or don't select them when doing a commit</em>.
+
+<a name="classkeysreport"></a>
+<h3>Class Keys Report</h3>
+<p><strong>ClassKeysReport.py</strong>, located in the <strong>scripts</strong> (not jython) directory,
+is used to identify the bundle keys used by a class. The script is run using
+<strong><em>PanelPro Panels >> Run Script...</em></strong>  The output from the
+script is written to the Script Output window.</p>
+
+<p>When the script is started, a file selection dialog is displayed.  Select either
+a Java class file or a Java package directory.  If a directory is selected, all
+of the *.java files within the directory will be processed.  The Bundle.java file
+is excluded.</p>
+
+<p>For each file, the script scans for <strong>Bundle.getMessage(</strong> and 
+<strong>getString(</strong>.  The first <strong><em>word</em></strong> after the
+parenthesis is returned as the bundle key.  A word is defined as the characters
+a-z, A-Z, 0-9 and underscore.  If the first word is a Locale reference, the
+second word is returned.</p>
+
+<p>Here is a typical output line:</p>
+<pre style="font-family: monospace;">
+   783, Search Type = Local, Key Type = Variable, Key = 'titleId', 	Text = addLogixFrame = new JmriJFrame(rbx.getString(titleId));
+</pre>
+Field List
+<ul>
+    <li>The source code line number</li>
+    <li>Search Type
+        <ul>
+            <li>Local: getString, such as rbx.getString()</li>
+            <li>Bundle: getMessage()</li>
+        </ul>
+    </li>
+    <li>Key Type
+        <ul>
+            <li>String: A <strong>word</strong> wrapped in double quotes</li>
+            <li>Variable: A plain <strong>word</strong></li>
+        </ul>
+    </li>
+    <li>The key</li>
+    <li>The source code line</li>
+</ul>
+<p>Only the variable key types are displayed in the script output window.<br>
+<strong>Note</strong>: A key that contains non-word characters will be truncated
+and assigned the Variable key type.
+</p>
+
+<p>When the script is done scanning, it provides an option to export the <strong>entire</strong>
+key list to a CSV file.</p>
+
 <!--#include virtual="/Footer" -->
 
 	  </div><!-- closes #mainContent-->

help/en/html/doc/Technical/gitdeveloper.shtml

@@ -257,7 +257,10 @@ To push the current branch and set the remote as upstream, use
 
     <a name="pull" id="pull"></a>
 
-      <h3>Submit a Pull Request</h3>The last step is to make your
+      <h3>Submit a Pull Request</h3>
+
+      Once your changes are complete and ready to go, 
+      the last step is to make your
       changes, already visible in your GitHub repository, known to
       the JMRI maintainers so that one of them can pull it into the
       main JMRI repository. To do that, you create and submit a
@@ -322,7 +325,7 @@ To push the current branch and set the remote as upstream, use
           </ul>
         If you have any questions about the use of those on your PR, 
         you can add a comment to the PR and somebody will get back to you.
-        <li>If there are any problems, you can make additional edits, 
+        <li>If there are any problems found in the CI process, you can make additional edits, 
         commit those files to the <u>same</u> branch, and push them 
         to your repository.  That'll get them included in an updated 
         version of your PR automatically, rerun the tests, etc.

help/en/html/hardware/loconet/Addressing.shtml

@@ -608,6 +608,31 @@
       use both, you should skip version 1 by providing just the
       LOCONETSV2MODE option.</p>
 
+      <a name="boards" id="boards"></a>
+      <h2>Addressing Op Switches in Digitrax boards</h2>
+      <p>(The following was first fully available in <a href=
+      "http://jmri.org/releasenotes/jmri4.9.7.shtml">JMRI
+      4.9.7</a>. Versions before that may not be complete).</p>
+
+        <p>Digitrax boards like the PM4, BDL168, SE8c and 
+        DS64 use a special protocol to program their Op Switches.
+        If you specify a programming mode of LOCONETBDOPSWMODE,
+        DecoderPro will use that protocol.</p>
+
+        <p>CVs are specified with the format "113.3", 
+        where the part after the period is the specific
+        Op Switch number, and the part before is 
+        board-specific:<p>
+        <UL>
+            <LI>0x70 - 112 - PM4
+            <LI>0x71 - 113 - BDL16
+            <LI>0x72 - 114 - SE8
+            <LI>0x73 - 115 - DS64
+        </UL>
+
+
+    <hr>
+
       <p>LocoNet&reg; is a registered trademark of <a href=
       "http://www.digitrax.com">Digitrax, Inc.</a></p>
     </div><!--#include virtual="/Footer" -->