Merge branch 'master' into work

Update at Mon Mar 6 14:01:25 EST 2017 by tim
A few corrections to the JSON format output.
2026-08-22 14:07:07 +02:00 · 2017-03-06 14:01:26 -05:00 · 2017-03-06 14:01:25 -05:00 · 2017-03-06 14:01:14 -05:00 · 2017-03-03 09:11:54 -05:00 · 2017-03-03 09:11:52 -05:00
2 changed files with 12 additions and 16 deletions
@@ -1 +1 @@
-1.5.73
+1.5.75
@@ -84,9 +84,9 @@ proc netgen::convert_to_json {filename lvs_final} {
               nets {
 	          puts $fjson "   \"${key}\": \["
 		  set cktval [lindex $value 0]
-		  puts $fjson "    \"$cktval\","
+		  puts $fjson "    $cktval,"
 		  set cktval [lindex $value 1]
-		  puts $fjson "    \"$cktval\""
+		  puts $fjson "    $cktval"
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -194,15 +194,13 @@ proc netgen::convert_to_json {filename lvs_final} {
 	                   puts $fjson "          \],"
 			}
 		     }
+	             puts $fjson "        \]"
 		     if {$gidx == $glen} {
-	                puts $fjson "        \]"
+	                puts $fjson "      \]"
 		     } else {
-	                puts $fjson "        \],"
+	                puts $fjson "      \],"
 		     }
 		  }
-		  if {$glen > 0} {
-		     puts $fjson "      \]"
-		  }
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -275,15 +273,13 @@ proc netgen::convert_to_json {filename lvs_final} {
 	                   puts $fjson "          \],"
 			}
 		     }
+	             puts $fjson "        \]"
 		     if {$gidx == $glen} {
-	                puts $fjson "        \]"
+	                puts $fjson "      \]"
 		     } else {
-	                puts $fjson "        \],"
+	                puts $fjson "      \],"
 		     }
 		  }
-		  if {$glen > 0} {
-		     puts $fjson "      \]"
-		  }
 		  if {$kidx == $nkeys} {
 		     puts $fjson "   \]"
 		  } else {
@@ -326,9 +322,9 @@ proc netgen::convert_to_json {filename lvs_final} {
 		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
 		     }
 		     set property [lindex $instance end]
-		     set prop0 [lindex $property 0]
-		     set propname [lindex $prop0 0]
-		     set propval [lindex $prop0 1]
+		     set prop1 [lindex $property 1]
+		     set propname [lindex $prop1 0]
+		     set propval [lindex $prop1 1]
 		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
 	             puts $fjson "           \]"
 	             puts $fjson "         \]"
Author	SHA1	Message	Date
Tim Edwards	66f94b47e6	Merge branch 'master' into work	2017-03-06 14:01:26 -05:00
Tim Edwards	09532ee628	Update at Mon Mar 6 14:01:25 EST 2017 by tim	2017-03-06 14:01:25 -05:00
Tim Edwards	2b7d416a41	A few corrections to the JSON format output.	2017-03-06 14:01:14 -05:00
Tim Edwards	090e9e122a	Merge branch 'master' into work	2017-03-03 09:11:54 -05:00
Tim Edwards	67f1c1a2e9	Update at Fri Mar 3 09:11:52 EST 2017 by tim	2017-03-03 09:11:52 -05:00
Tim Edwards	a7dcb4ef45	Corrected new JSON file output format from netgen.	2017-03-03 09:11:30 -05:00
@@ -1 +1 @@
 .5.73
 .5.75