Automatic merge of X1.3.1-189-gab83b4ca9 and 5 pull requests

- Pull request #40 at e81861b: Monogame upgrade - Pull request #79 at 7d9f14b: Update version calculation for new unstable versions - Pull request #216 at 7a72277: Upgrade and replace web server with EmbedIO - Pull request #225 at 0817e32: Fix advanced adhesion wheelslip upon resuming from save: https://bugs.launchpad.net/or/+bug/1294410 - Pull request #226 at 803bc44: EmbedIO web server graphical track monitor
openrails · Jul 4, 2020 · 2ef8e74 · 2ef8e74
7 parents ad586bd + ab83b4c + e81861b + 7d9f14b + 7a72277 + 0817e32 + 803bc44
commit 2ef8e74
Show file tree

Hide file tree

Showing 8 changed files with 1,453 additions and 42 deletions.
diff --git a/Source/RunActivity/RunActivity.csproj b/Source/RunActivity/RunActivity.csproj
@@ -189,6 +189,7 @@
     <Compile Include="Viewer3D\Viewer.cs" />
     <Compile Include="Viewer3D\Water.cs" />
     <Compile Include="Viewer3D\Weather.cs" />
+    <Compile Include="Viewer3D\WebServices\TrackMonitorDisplay.cs" />
     <Compile Include="Viewer3D\WebServices\WebServer.cs" />
     <Compile Include="Viewer3D\Wire.cs" />
     <Compile Include="Viewer3D\World.cs" />
@@ -350,6 +351,9 @@
     <Content Include="Viewer3D\WebServices\Web\index.css" />
     <Content Include="Viewer3D\WebServices\Web\index.html" />
     <Content Include="Viewer3D\WebServices\Web\or_logo.png" />
+    <Content Include="Viewer3D\WebServices\Web\TrackMonitor\SignalAspects.png" />
+    <Content Include="Viewer3D\WebServices\Web\TrackMonitor\TrackMonitorImages.png" />
+    <Content Include="Viewer3D\WebServices\Web\TrackMonitor\index.css" />
     <Content Include="Viewer3D\WebServices\Web\TrackMonitor\index.html" />
     <Content Include="Viewer3D\WebServices\Web\TrackMonitor\index.js" />
   </ItemGroup>

diff --git a/Source/RunActivity/Viewer3D/WebServices/TrackMonitorDisplay.cs b/Source/RunActivity/Viewer3D/WebServices/TrackMonitorDisplay.cs
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/SignalAspects.png b/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/SignalAspects.png
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/TrackMonitorImages.png b/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/TrackMonitorImages.png
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/index.css b/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/index.css
@@ -0,0 +1,91 @@
+#table {
+	/*border-collapse: collapse;*/
+	padding: 20px;
+	border: 2px;
+	border-spacing: 2px;
+	/*border-spacing: 0;*/
+}
+
+/* Apply rounded border */
+.border{
+	border-spacing: 0;
+	border: gray 2px solid;
+	border-radius: 20px;
+}
+
+.button{
+	border: gray 1px solid;
+	border-radius: 20px;
+	text-align: center;
+	width: 50px;
+	margin: 4px 2px;
+}
+
+/* Allows to apply text color */
+td[ColorCode= "???"]{
+	background-color:black;
+	color:yellow;
+}
+td[ColorCode= "??!"]{
+	background-color:black;
+	color:Green;
+}
+td[ColorCode= "?!?"]{
+	background-color:black;
+	color:Black;
+}
+td[ColorCode= "?!!"]{
+	background-color:black;
+	color:PaleGreen;
+}
+td[ColorCode= "!??"]{
+	background-color:black;
+	color:White;
+}
+td[ColorCode= "!!?"]{
+	background-color:black;
+	color:Orange;
+}
+td[ColorCode= "!!!"]{
+	background-color:black;
+	color:OrangeRed;
+}
+td[ColorCode= "%%%"]{
+	background-color:black;
+	color:Cyan;
+}
+td[ColorCode= "%$$"]{
+	background-color: black;
+	color:brown;
+}
+td[ColorCode= "%%$"]{
+	background-color: black;
+	color:lightgreen;
+}
+td[ColorCode= "$%$"]{
+	background-color: black;
+	color:blue;
+}
+td[ColorCode= "$$$"]{
+	background-color:black;
+	color:LightSkyBlue;
+}
+
+/* Separator between diferent info area*/
+.separator{
+	border-bottom: 1px solid gray;
+}
+.separatorred{
+	border-bottom: 1px solid red;
+}
+.separatordarkgray{
+	border-bottom: 1px solid darkgray;
+}
+
+/* Developper: Used as help for cells alignement*/
+td{
+	/*border: black 1px solid;*/
+	border-spacing: 0;
+	border-radius: 7px;
+	padding: 0;
+}
diff --git a/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/index.html b/Source/RunActivity/Viewer3D/WebServices/Web/TrackMonitor/index.html
@@ -19,30 +19,24 @@
 -->
 <html lang="en">
 <head>
-	<meta charset="utf-8"/>
-	<meta name="viewport" content="width=device-width, initial-scale=1"><!-- adds zooming for mobiles -->
-	<title>OR: Track Monitor API</title>
-	<link rel="shortcut icon" type="image/png" href="/or_logo.png"><!-- This icon appears in the page's tab and its bookmark. -->
-	<link rel="stylesheet" type="text/css" href="/index.css"><!-- share styles with home page -->
-	<script src="index.js"></script>
+  <meta charset="utf-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1"><!-- adds zooming for mobiles -->
+  <title>OR: Track Monitor API</title>
+  <link rel="shortcut icon" type="image/png" href="/or_logo.png"><!-- This icon appears in the page's tab and its bookmark. -->
+  <link rel="stylesheet" type="text/css" href="/index.css"><!-- share styles with home page -->
+  <link rel="stylesheet" type="text/css" href="index.css">
+
 </head>
 
-<body onload="setInterval (ApiTrackMonitor, 500)">
+<body id="body" onload="setInterval (ApiTrackMonitor, 500)">
+  <p id="demo"></p>
   <div id=menu><a href="/">Back to Menu</a></div>
-  <h2>Open Rails - Track Monitor (F4)</h2>
-
   <div>
-    <table style="padding-left: 50px;">
-      <tr><td>Speed:          </td><td id=speedMpS>               </td><td>mph</td></tr>
-      <tr><td>Projected:      </td><td id=projectedSpeedMpS>      </td><td>mph</td></tr>
-      <tr><td>Limit:          </td><td id=allowedSpeedMpS>        </td><td>mph</td></tr>
-      <tr><td>Mode:           </td><td id=controlMode>            </td><td>   </td></tr>
-      <tr><td>Inclination:    </td><td id=currentElevationPercent></td><td>%  </td></tr>
-      <tr><td>Direction:      </td><td id=direction>              </td><td>   </td></tr>
-      <tr><td>Cab Orientation:</td><td id=cabOrientation>         </td><td>   </td></tr>
-      <tr><td>On Path:        </td><td id=isOnPath>               </td><td>   </td></tr>
+    <br/>
+    <button class="button" onclick="changePageColor()" id="buttonDN">Night</button>
+    <table class="border"  id="TrackMonitor">
     </table>
   </div>
-
+  <script src="index.js"></script>
 </body>
 </html>