Add dx16 early graphics and adjust placement

References #53 #52 #54

It's hardcoded, but I can live with that for now.

4 files changed, 51 insertions, 11 deletions

diff --git a/extras/dx16-rows b/extras/dx16-rows
new file mode 100644
index 0000000..31ab5d2
--- /dev/null
+++ b/extras/dx16-rows
@@ -0,0 +1,40 @@
+row1-1
+row1-2
+row3-1
+row3-2
+row5-1
+row5-2
+row7-1
+row7-2
+row9-1
+row9-2
+row11-1
+row11-2
+row13-1
+row13-2
+row15-1
+row15-2
+row17-1
+row17-2
+row19-1
+row19-2
+row21-1
+row21-2
+row23-1
+row23-2
+row25-1
+row25-2
+row27-1
+row27-2
+row29-1
+row29-2
+row31-1
+row31-2
+row33-1
+row33-2
+row35-1
+row35-2
+row37-1
+row37-2
+row39-1
+row39-2
diff --git a/include/nms/util.pm b/include/nms/util.pm
index 4e61082..f79df50 100644
--- a/include/nms/util.pm
+++ b/include/nms/util.pm
@@ -67,35 +67,35 @@ sub guess_placement_dx {
 		my ($e, $s) = ($1, $2);
 		$src = "main";
 
-		$x = int(1400 - (($e-1)/2) * 60);
+		$x = int(1523 - (($e-1)/2) * 61);
 		$y = undef;
 
 		if ($s > 1) {
-			$y = 100;
+			$y = 137;
 		} else {
-			$y = 500;
+			$y = 410;
 		}
 
 		$xx = $x + 32;
-		$yy = $y + 300;
+		$yy = $y + 200;
 
 	} elsif ($name =~ /^core$/) {
 		$src = "core";
-		$x = 800;
-		$y = 850;
+		$x = 1100;
+		$y = 650;
 		$xx = $x + 200;
 		$yy = $y + 100;
 	} elsif ($name =~ /^noc$/) {
 		$src = "noc";
-		$x = 400;
-		$y = 900;
+		$x = 300;
+		$y = 800;
 		$xx = $x + 230;
 		$yy = $y + 40;
 	} elsif ($name =~ /^distro(\d)$/) {
 		my $d = ($1);
 		$src = "distro";
-		$x = 1200 - $d * 900;
-		$y = 415;
+		$x = 1200 - $d * 700;
+		$y = 355;
 		$xx = $x + 230;
 		$yy = $y + 40;
 	} else {
diff --git a/web/img/dx16-salkart.png b/web/img/dx16-salkart.png
new file mode 100644
index 0000000..aecedd0
--- /dev/null
+++ b/web/img/dx16-salkart.png
diff --git a/web/index.html b/web/index.html
index 974a816..1bb9f91 100644
--- a/web/index.html
+++ b/web/index.html
@@ -286,7 +286,7 @@
 	</div>
 	</div>
 
-	<div style="display:none;"><img id="source" src="img/tg16-salkart-clean-big.png" ></div>
+	<div style="display:none;"><img id="source" src="img/dx16-salkart.png" ></div>
       </div>
     </div><!--/.fluid-container-->
     <script src="js/jquery.min.js" type="text/javascript"></script>