From: Michael Wiebusch <stratomaster@gmx.net>
Date: Thu, 27 Jun 2013 13:36:19 +0000 (+0200)
Subject: backup
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=8f7b5ad91b81c704d9b866e5919136c9ae8366fc;p=mvdsensorcontrol.git

backup
---

diff --git a/config/settings.xml b/config/settings.xml
index 2e4753b..c6ac0bc 100644
--- a/config/settings.xml
+++ b/config/settings.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0"?>
 <MAPS type="MIMOSA26" specDbFile="MIMOSA26_JTAG_SPEC.xml">
-</MAPS>
+<register name="DIS_DISCRI"><field name="DisDiscri" value="42"/></register><register name="CONTROL_PIX_REG"><field name="RowMkd" value="42"/><field name="SelPad2" value="42"/></register></MAPS>
diff --git a/layout/jtageditor.css b/layout/jtageditor.css
index cf51086..dc6a3bf 100644
--- a/layout/jtageditor.css
+++ b/layout/jtageditor.css
@@ -66,7 +66,9 @@ input[type="text"]
     height:25px;
 }
 
-
+.ancestorInfo {
+	height:3em;
+}
 
 table.registers {
   border-collapse:collapse;
diff --git a/xml_spielwiese/cgitest.pl b/xml_spielwiese/cgitest.pl
index 273428f..3752713 100755
--- a/xml_spielwiese/cgitest.pl
+++ b/xml_spielwiese/cgitest.pl
@@ -57,9 +57,14 @@ if ( !keys %cgiHash )
 my $parser   = XML::LibXML->new();
 my $specfile = "";
 my $setfile  = "";
+my $specfileName = "";
+my $setfileName  = "";
 my $spectree;
 my $settree;
 
+my $ancestryTree;
+my @ancestryList;
+
 my $confDir = '../config';
 my $specDir = '../specs';
 
@@ -72,12 +77,16 @@ if ( $cgiHash{'print'} eq 'fileSelection' ) {
 if ( $cgiHash{'print'} eq 'spectree' ) {
 	print "<div class='header'>Available Settings</div>\n";
 	parseSetAndSpec( $cgiHash{'configFile'} );
+	print "<div class='ancestorInfo' align='center'>specifications loaded from $specfileName</div>";
 	print_registers($specfile);
 }
 
 if ( $cgiHash{'print'} eq 'settree' ) {
 	print "<div class='header'>Selected Settings</div>\n";
 	parseSetAndSpec( $cgiHash{'configFile'} );
+	print "<div class='ancestorInfo' align='center'>";
+	print "inherit settings from";
+	print "</div>";
 	print_registers($setfile);
 }
 
@@ -116,18 +125,22 @@ sub prepare_text {
 }
 
 sub parseSetAndSpec {
-	$setfile = $confDir . "/" . $_[0];
-	$settree = $parser->parse_file($setfile);
-	my $specFileName = $settree->findvalue("/MAPS/\@specDbFile");
-	$specfile = $specDir . "/" . $specFileName;
+	parseSet($_[0]);
+	$specfileName = $settree->findvalue("/MAPS/\@specDbFile");
+	$specfile = $specDir . "/" . $specfileName;
 	$spectree = $parser->parse_file($specfile);
 }
 
 sub parseSet {
+	$setfileName = $_[0];
 	$setfile = $confDir . "/" . $_[0];
 	$settree = $parser->parse_file($setfile);
 }
 
+sub buildAncestry { # recursive
+	
+}
+
 sub del {
 
 	my $registerName = $_[0];
@@ -167,6 +180,7 @@ sub del {
 	close SCHREIBEN;
 }
 
+
 sub print_fileSelection {
 	
 	my $configFile= $_[0];
@@ -213,6 +227,20 @@ sub print_fileSelection {
 	print "</table>";
 }
 
+sub changeAncestor {
+	my $ancestorFileName = $_[0];
+	my $xmltree=$settree;
+	my $maps    = $xmltree->findnodes("/MAPS")->shift();
+	
+	$maps->setAttribute("inheritSettingsFrom",$ancestorFileName);
+
+}
+
+sub getAncestor {
+	my $xmltree=$settree;
+	return ($xmltree->findvalue("/MAPS/\@inheritSettingsFrom")||"");
+}
+
 sub save {
 
 	my $registerName = $_[0];
@@ -466,7 +494,7 @@ if(document.getElementById("fileSelector")){
 var e = document.getElementById("fileSelector");
 return e.options[e.selectedIndex].text;}
 else {
-	return "none";
+	return "";
 }
 }