diff options
-rw-r--r-- | ds9/library/plot.tcl | 16 | ||||
-rw-r--r-- | ds9/library/plotdialog.tcl | 2 | ||||
-rw-r--r-- | ds9/parsers/plotparser.tac | 3 | ||||
-rw-r--r-- | ds9/parsers/plotparser.tcl | 236 |
4 files changed, 122 insertions, 135 deletions
diff --git a/ds9/library/plot.tcl b/ds9/library/plot.tcl index 3a8c0ea..a8a1857 100644 --- a/ds9/library/plot.tcl +++ b/ds9/library/plot.tcl @@ -447,21 +447,7 @@ proc PlotChangeLegend {varname} { grid - column - row {PlotUpdateGraph $varname} - strip { - PlotUpdateCanvas $varname - set cc $var(graph,current) - set nn $var(graph,ds,current) - foreach gg $var(graphs) { - set var(graph,current) $gg - set var(graph,ds,current) [lindex $var($gg,dss) 0] - PlotRestoreState $varname - - PlotUpdateGraph $varname - } - set var(graph,current) $cc - set var(graph,ds,current) $nn - PlotRestoreState $varname - } + strip {PlotUpdateCanvas $varname} } } diff --git a/ds9/library/plotdialog.tcl b/ds9/library/plotdialog.tcl index 957a239..1fd3211 100644 --- a/ds9/library/plotdialog.tcl +++ b/ds9/library/plotdialog.tcl @@ -122,6 +122,7 @@ proc PlotDialog {varname wtt} { -menu $var(mb).canvas.font $var(mb).canvas add cascade -label [msgcat::mc {Background}] \ -menu $var(mb).canvas.bg + $var(mb).canvas add separator $var(mb).canvas add cascade -label [msgcat::mc {Bar Mode}] \ -menu $var(mb).canvas.barmode @@ -716,7 +717,6 @@ proc PlotUpdateMenus {varname} { } } - if {[llength $var(graph,dss)] == 0} { $var(mb).graph entryconfig [msgcat::mc {Duplicate Dataset}] \ -state disabled diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac index 252c936..0a1f8db 100644 --- a/ds9/parsers/plotparser.tac +++ b/ds9/parsers/plotparser.tac @@ -278,7 +278,6 @@ plotCmd : LOAD_ load | LIST_ yesno {ProcessCmdCVAR list $2 PlotList} | AXIS_ axis | LEGEND_ legend - | RELIEF_ relief {PlotCmdUpdateElement graph,ds,bar,relief $2} | TITLE_ title # Data @@ -293,6 +292,7 @@ plotCmd : LOAD_ load | ERROR_ errorr # backward compatibility | ERRORBAR_ errorr + | RELIEF_ relief {PlotCmdUpdateElement graph,ds,bar,relief $2} | NAME_ STRING_ {PlotCmdUpdateElement graph,ds,name $2} # backward compatibility @@ -476,6 +476,7 @@ color : STRING_ {PlotCmdUpdateElement graph,ds,color $1} # backward compatiabilty | dummy1 STRING_ {PlotCmdUpdateElement graph,ds,color $2} ; + dummy1 : DISCRETE_ | LINE_ | STEP_ diff --git a/ds9/parsers/plotparser.tcl b/ds9/parsers/plotparser.tcl index 9aec1c5..01e0f45 100644 --- a/ds9/parsers/plotparser.tcl +++ b/ds9/parsers/plotparser.tcl @@ -161,7 +161,7 @@ array set plot::table { 62:x shift 26:277 shift 284:277,target 375 - 222:0,target 95 + 222:0,target 94 161:405 shift 62:y shift 340:277,target 383 @@ -563,7 +563,7 @@ array set plot::table { 309:277 reduce 299:277 reduce 280:258,target 123 - 144:277,target 104 + 144:277,target 103 208:0,target 218 200:277,target 83 198:0,target 64 @@ -633,7 +633,7 @@ array set plot::table { 104:322 shift 100:277,target 54 37:396 shift - 145:277,target 105 + 145:277,target 104 140:277 reduce 139:277 reduce 308:0,target 125 @@ -667,7 +667,7 @@ array set plot::table { 258:414 goto 315:277 reduce 54:277 shift - 205:0,target 97 + 205:0,target 96 195:0,target 195 158:390 shift 104:337 shift @@ -857,7 +857,7 @@ array set plot::table { 45:261,target 126 356:277 reduce 8:335,target 46 - 230:0,target 100 + 230:0,target 99 229:0,target 108 226:257 shift 276:412,target 272 @@ -907,7 +907,7 @@ array set plot::table { 150:277,target 118 149:277,target 117 226:277 reduce - 205:277,target 97 + 205:277,target 96 195:277,target 195 300:0 reduce 290:0 reduce @@ -980,7 +980,7 @@ array set plot::table { 307:277,target 124 302:277 reduce 292:277 reduce - 154:0,target 103 + 154:0,target 102 46:277,target 173 0:316,target 31 41:277 shift @@ -1040,8 +1040,8 @@ array set plot::table { 0:288 reduce 152:277,target 276 0:300 reduce - 207:277,target 96 - 197:277,target 94 + 207:277,target 95 + 197:277,target 105 0:301 reduce 253:277,target 149 0:302 reduce @@ -1100,7 +1100,7 @@ array set plot::table { 104:337,target 261 0:320 reduce 261:262,target 127 - 120:0,target 99 + 120:0,target 98 267:277 reduce 8:301,target 32 206:0 reduce @@ -1115,7 +1115,7 @@ array set plot::table { 25:Y,target 101 237:277 reduce 186:364 shift - 153:277,target 102 + 153:277,target 101 37:258,target 123 208:277,target 218 198:277,target 64 @@ -1186,7 +1186,7 @@ array set plot::table { 108:277,target 174 1:349,target 33 42:362,target 160 - 154:277,target 103 + 154:277,target 102 38:258,target 123 210:277,target 215 209:277,target 216 @@ -1285,7 +1285,7 @@ array set plot::table { 27:271 shift 318:277 reduce 186:445 goto - 144:0,target 104 + 144:0,target 103 44:414,target 170 0:288,target 31 330:0 reduce @@ -1364,7 +1364,7 @@ array set plot::table { 57:305,target 70 57:295,target 203 92:387,target 166 - 213:0,target 98 + 213:0,target 97 16:396 reduce 23:324,target 92 127:0 reduce @@ -1394,7 +1394,7 @@ array set plot::table { 386:0 reduce 324:277 reduce 224:261 shift - 213:277,target 98 + 213:277,target 97 52:304,target 188 0:374,target 31 258:277,target 1 @@ -1917,7 +1917,7 @@ array set plot::table { 227:0,target 1 176:277 reduce 157:Y shift - 120:277,target 99 + 120:277,target 98 119:277,target 223 91:264 reduce 61:258 shift @@ -2007,7 +2007,7 @@ array set plot::table { 166:277,target 151 4:287,target 27 8:367 shift - 222:277,target 95 + 222:277,target 94 157:y,target 103 8:368 shift 8:374,target 58 @@ -2290,7 +2290,7 @@ array set plot::table { 161:405,target 292 62:y,target 103 1:300 reduce - 145:0,target 105 + 145:0,target 104 91:376,target 167 1:301 reduce 5:0 reduce @@ -2538,7 +2538,7 @@ array set plot::table { 0:396,target 31 12:396 reduce 157:432 goto - 128:277,target 101 + 128:277,target 100 114:277 reduce 6:0 accept 174:277,target 63 @@ -2546,7 +2546,7 @@ array set plot::table { 373:0,target 247 350:277 reduce 349:277 reduce - 230:277,target 100 + 230:277,target 99 229:277,target 108 88:277 reduce 53:323 shift @@ -2599,8 +2599,8 @@ array set plot::table { 1:285,target 33 220:277 shift 219:277 reduce - 207:0,target 96 - 197:0,target 94 + 207:0,target 95 + 197:0,target 105 57:292,target 68 383:400,target 131 1:426 goto @@ -2823,7 +2823,7 @@ array set plot::table { 279:277,target 241 28:277,target 88 335:277,target 265 - 128:0,target 101 + 128:0,target 100 93:375,target 170 74:277,target 209 10:292 shift @@ -2996,7 +2996,7 @@ array set plot::table { 100:339,target 54 9:279 shift 226:258,target 123 - 153:0,target 102 + 153:0,target 101 4:332 reduce 10:380 shift 10:379 shift @@ -3559,27 +3559,27 @@ array set plot::rules { 27,line 251 24,line 247 21,line 242 - 268,line 628 + 268,line 629 17,line 235 - 265,line 625 + 265,line 626 14,line 230 - 262,line 619 + 262,line 620 11,line 225 - 258,line 615 - 255,line 610 - 252,line 604 - 248,line 598 - 245,line 593 - 242,line 588 - 238,line 580 + 258,line 616 + 255,line 611 + 252,line 605 + 248,line 599 + 245,line 594 + 242,line 589 + 238,line 581 9,line 221 - 235,line 577 + 235,line 578 6,line 217 - 232,line 574 + 232,line 575 3,line 214 - 228,line 566 - 225,line 561 - 222,line 558 + 228,line 567 + 225,line 562 + 222,line 559 218,line 550 215,line 547 212,line 542 @@ -3649,28 +3649,28 @@ array set plot::rules { 23,line 246 20,line 242 19,line 239 - 267,line 627 + 267,line 628 16,line 234 - 264,line 624 + 264,line 625 13,line 229 - 261,line 618 + 261,line 619 10,line 222 - 257,line 612 - 254,line 609 - 251,line 603 - 247,line 595 - 244,line 590 - 241,line 585 - 237,line 579 + 257,line 613 + 254,line 610 + 251,line 604 + 247,line 596 + 244,line 591 + 241,line 586 + 237,line 580 8,line 220 - 234,line 576 + 234,line 577 5,line 216 - 231,line 569 + 231,line 570 2,line 213 - 227,line 563 + 227,line 564 27,e 1 - 224,line 560 - 221,line 557 + 224,line 561 + 221,line 558 217,line 549 214,line 546 211,line 540 @@ -3733,31 +3733,31 @@ array set plot::rules { 28,line 252 25,line 249 22,line 243 - 269,line 629 + 269,line 630 18,line 238 - 266,line 626 + 266,line 627 15,line 233 - 263,line 620 + 263,line 621 12,line 226 - 260,line 617 - 259,line 616 - 256,line 611 - 253,line 605 - 250,line 602 - 249,line 599 - 246,line 594 - 243,line 589 - 240,line 584 - 239,line 581 - 236,line 578 + 260,line 618 + 259,line 617 + 256,line 612 + 253,line 606 + 250,line 603 + 249,line 600 + 246,line 595 + 243,line 590 + 240,line 585 + 239,line 582 + 236,line 579 7,line 218 - 233,line 575 + 233,line 576 4,line 215 - 230,line 568 - 229,line 567 + 230,line 569 + 229,line 568 1,line 212 - 226,line 562 - 223,line 559 + 226,line 563 + 223,line 560 220,line 555 219,line 554 216,line 548 @@ -3806,10 +3806,10 @@ array set plot::rules { 97,line 364 109,line 383 110,line 384 - 94,line 359 + 94,line 361 106,line 376 91,line 356 - 103,line 370 + 103,line 371 87,line 351 100,line 367 84,line 347 @@ -4003,7 +4003,7 @@ array set plot::lr1_table { 117 {{222 277 1}} 166,trans {} 118 {{224 277 1}} - 120 {{99 {0 277} 2}} + 120 {{98 {0 277} 2}} 119 {{223 277 1}} 121 {{220 {0 277} 1}} 122 {{2 {0 277} 1}} @@ -4015,7 +4015,7 @@ array set plot::lr1_table { 76,trans {} 337,trans {} 127 {{7 {0 277} 1}} - 128 {{101 {0 277} 2}} + 128 {{100 {0 277} 2}} 130 {{60 {0 277} 1}} 129 {{59 {0 277} 1}} 131 {{61 {0 277} 1}} @@ -4035,8 +4035,8 @@ array set plot::lr1_table { 143 {{228 {0 277} 1}} 75,trans {} 336,trans {} - 144 {{104 {0 277} 2}} - 145 {{105 {0 277} 2}} + 144 {{103 {0 277} 2}} + 145 {{104 {0 277} 2}} 146 {{111 {0 277} 1} {112 {0 277} 1} {119 {0 277} 0} {120 {0 277} 0} {121 {0 277} 0} {122 {0 277} 0} {123 {0 277} 0} {18 {0 277} 0} {19 {0 277} 0}} 147 {{115 277 1}} 148 {{116 277 1}} @@ -4045,8 +4045,8 @@ array set plot::lr1_table { 151 {{66 {0 277} 2}} 164,trans {} 152 {{113 {0 277} 1} {114 {0 277} 1}} - 153 {{102 {0 277} 2}} - 154 {{103 {0 277} 2}} + 153 {{101 {0 277} 2}} + 154 {{102 {0 277} 2}} 155 {{234 {0 277} 1} {53 {0 257 258 259 260 261 262} 0} {54 {0 257 258 259 260 261 262} 0} {55 {0 257 258 259 260 261 262} 0} {56 {0 257 258 259 260 261 262} 0}} 249,trans {{273 359} {274 360} {417 361}} 250,trans {{271 362} {272 363} {274 364} {418 365}} @@ -4105,11 +4105,11 @@ array set plot::lr1_table { 194 {{194 {0 277} 1}} 204 {{202 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 195 {{195 {0 277} 1}} - 205 {{97 {0 277} 2}} + 205 {{96 {0 277} 2}} 196 {{193 {0 277} 1}} 206 {{201 {0 277} 1}} - 197 {{94 {0 277} 2}} - 207 {{96 {0 277} 2}} + 197 {{105 {0 277} 2}} + 207 {{95 {0 277} 2}} 198 {{64 {0 277} 2}} 208 {{218 {0 277} 1}} 199 {{68 {0 277} 2}} @@ -4118,7 +4118,7 @@ array set plot::lr1_table { 211 {{217 {0 277} 1}} 161,trans {{402 301} {403 302} {404 303} {405 304} {469 305}} 212 {{214 {0 277} 1}} - 213 {{98 {0 277} 2}} + 213 {{97 {0 277} 2}} 214 {{90 {0 277} 2}} 215 {{89 {0 277} 2}} 246,trans {} @@ -4134,7 +4134,7 @@ array set plot::lr1_table { 223 {{58 277 1}} 224 {{198 {0 277} 1}} 225 {{199 {0 277} 1}} - 226 {{95 {0 277} 2}} + 226 {{94 {0 277} 2}} 227 {{264 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 159,trans {{X 281} {Y 282} {x 283} {y 284} {432 294}} 160,trans {{X 295} {Y 296} {x 297} {y 298} {432 299} {466 300}} @@ -4145,7 +4145,7 @@ array set plot::lr1_table { 232 {{266 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 245,trans {} 233 {{108 {0 277} 2}} - 234 {{100 {0 277} 2}} + 234 {{99 {0 277} 2}} 235 {{256 {0 277} 3}} 69,trans {} 70,trans {} @@ -4225,9 +4225,9 @@ array set plot::lr1_table { 279 {{112 {0 277} 2}} 280 {{113 {0 277} 2} {114 {0 277} 2} {119 {0 277} 0} {120 {0 277} 0} {121 {0 277} 0} {122 {0 277} 0} {123 {0 277} 0} {18 {0 277} 0} {19 {0 277} 0}} 29 {{72 {0 277} 1}} - 30 {{99 {0 277} 1} {219 {0 277} 0} {220 {0 277} 0} {221 277 0} {222 277 0} {223 277 0} {224 277 0} {225 277 0} {226 277 0} {227 277 0}} + 30 {{98 {0 277} 1} {219 {0 277} 0} {220 {0 277} 0} {221 277 0} {222 277 0} {223 277 0} {224 277 0} {225 277 0} {226 277 0} {227 277 0}} 281 {{54 {0 257 258 259 260 261 262} 1}} - 31 {{101 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} + 31 {{100 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 282 {{56 {0 257 258 259 260 261 262} 1}} 242,trans {} 32 {{65 {0 277} 1} {59 {0 277} 0} {60 {0 277} 0} {61 {0 277} 0} {62 {0 277} 0}} @@ -4242,17 +4242,17 @@ array set plot::lr1_table { 327,trans {} 36 {{85 {0 277} 1} {176 {0 277} 0} {177 {0 277} 0}} 287 {{241 {0 277} 1}} - 37 {{104 {0 277} 1} {228 {0 277} 0} {229 {0 277} 0} {230 {0 277} 0} {231 {0 277} 0} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} + 37 {{103 {0 277} 1} {228 {0 277} 0} {229 {0 277} 0} {230 {0 277} 0} {231 {0 277} 0} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 288 {{240 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} - 38 {{105 {0 277} 1} {228 {0 277} 0} {229 {0 277} 0} {230 {0 277} 0} {231 {0 277} 0} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} + 38 {{104 {0 277} 1} {228 {0 277} 0} {229 {0 277} 0} {230 {0 277} 0} {231 {0 277} 0} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 289 {{232 {0 277} 2}} 290 {{247 {0 277} 1}} 300 {{236 {0 277} 2}} - 40 {{102 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} + 40 {{101 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 39 {{66 {0 277} 1} {111 {0 277} 0} {112 {0 277} 0} {113 {0 277} 0} {114 {0 277} 0} {115 277 0} {116 277 0} {117 277 0} {118 277 0}} 291 {{245 {0 277} 1}} 301 {{250 {0 277} 1}} - 41 {{103 {0 277} 1}} + 41 {{102 {0 277} 1}} 292 {{246 {0 277} 1}} 302 {{252 {0 277} 1}} 42 {{107 {0 277} 1} {232 {0 277} 0} {233 {0 277} 0} {234 {0 277} 0} {235 {0 277} 0} {236 {0 277} 0} {237 {0 277} 0} {238 {0 277} 0} {239 {0 277} 0}} @@ -4288,7 +4288,7 @@ array set plot::lr1_table { 65,trans {} 313 {{187 {0 277} 1}} 326,trans {} - 53 {{94 {0 277} 1} {192 {0 277} 0} {193 {0 277} 0} {194 {0 277} 0} {195 {0 277} 0} {196 {0 277} 0}} + 53 {{105 {0 277} 1} {192 {0 277} 0} {193 {0 277} 0} {194 {0 277} 0} {195 {0 277} 0} {196 {0 277} 0}} 314 {{189 {0 277} 1}} 54 {{64 {0 277} 1}} 315 {{186 {0 277} 2}} @@ -4296,22 +4296,22 @@ array set plot::lr1_table { 316 {{110 {0 277} 2}} 56 {{75 {0 277} 1} {82 {0 277} 1} {83 {0 277} 1}} 317 {{129 {0 277} 1}} - 57 {{97 {0 277} 1} {201 {0 277} 0} {202 {0 277} 0} {203 {0 277} 0} {204 {0 277} 0} {205 {0 277} 0} {206 {0 277} 0} {207 {0 277} 0} {208 {0 277} 0} {209 {0 277} 0} {210 {0 277} 0} {211 {0 277} 0} {212 {0 277} 0} {213 {0 277} 0}} + 57 {{96 {0 277} 1} {201 {0 277} 0} {202 {0 277} 0} {203 {0 277} 0} {204 {0 277} 0} {205 {0 277} 0} {206 {0 277} 0} {207 {0 277} 0} {208 {0 277} 0} {209 {0 277} 0} {210 {0 277} 0} {211 {0 277} 0} {212 {0 277} 0} {213 {0 277} 0}} 318 {{128 {0 277} 1}} - 58 {{96 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} + 58 {{95 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 319 {{124 {0 277} 2}} 320 {{125 {0 277} 2}} 60 {{90 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} - 59 {{98 {0 277} 1} {214 {0 277} 0} {215 {0 277} 0} {216 {0 277} 0} {217 {0 277} 0} {218 {0 277} 0}} + 59 {{97 {0 277} 1} {214 {0 277} 0} {215 {0 277} 0} {216 {0 277} 0} {217 {0 277} 0} {218 {0 277} 0}} 154,trans {} 321 {{134 {0 277} 1}} 61 {{89 {0 277} 1} {1 {0 277} 0} {2 {0 277} 0} {3 {0 277} 0} {4 {0 277} 0} {5 {0 277} 0} {6 {0 277} 0} {7 {0 277} 0}} 322 {{131 {0 277} 1}} - 62 {{95 {0 277} 1} {197 {0 277} 0} {198 {0 277} 0} {199 {0 277} 0} {200 {0 277} 0} {53 277 0} {54 277 0} {55 277 0} {56 277 0} {57 277 0} {58 277 0}} + 62 {{94 {0 277} 1} {197 {0 277} 0} {198 {0 277} 0} {199 {0 277} 0} {200 {0 277} 0} {53 277 0} {54 277 0} {55 277 0} {56 277 0} {57 277 0} {58 277 0}} 323 {{130 {0 277} 1}} 63 {{108 {0 277} 1} {264 {0 277} 0} {265 {0 277} 0} {266 {0 277} 0} {267 {0 277} 0} {268 {0 277} 0} {269 {0 277} 0}} 324 {{133 {0 277} 1}} - 64 {{100 {0 277} 1}} + 64 {{99 {0 277} 1}} 325 {{132 {0 277} 1}} 239,trans {{277 351}} 240,trans {{277 352}} @@ -4701,14 +4701,14 @@ array set plot::token_id_table { 363,title RELIEF 434,t 1 448,title {} - 471,line 614 + 471,line 615 259,t 0 260,t 0 - 467,line 592 + 467,line 593 276,title float 312,t 0 362,title RANGE - 464,line 573 + 464,line 574 354,t 0 447,title {} 461,line 552 @@ -4915,15 +4915,15 @@ array set plot::token_id_table { 424,title {} 316,t 0 358,t 0 - 473,line 630 + 473,line 631 337,title LOG 411,t 0 - 470,line 608 - 469,line 601 + 470,line 609 + 469,line 602 423,title {} - 466,line 587 + 466,line 588 453,t 1 - 463,line 565 + 463,line 566 278,t 0 336,title LOADCONFIG 460,line 545 @@ -5359,17 +5359,17 @@ array set plot::token_id_table { 457,t 1 388,title SUNKEN 283,t 0 - 472,line 623 + 472,line 624 335,t 0 312,title FAMILY - 468,line 597 + 468,line 598 387,title STYLE 377,t 0 - 465,line 583 + 465,line 584 473,title {} 429,t 1 430,t 1 - 462,line 556 + 462,line 557 311,title EXPORT 472,t 1 458,line 527 @@ -5697,13 +5697,13 @@ proc plot::yyparse {} { 89 { ProcessCmdCVAR stats $2 PlotStats } 90 { ProcessCmdCVAR stats $2 PlotStats } 91 { ProcessCmdCVAR list $2 PlotList } - 94 { PlotCmdUpdateElement graph,ds,bar,relief $2 } - 96 { PlotCmdUpdateElement graph,ds,show $2 } - 98 { PlotCmdUpdateElement graph,ds,smooth $2 } - 100 { PlotCmdUpdateElement graph,ds,width $2 } - 101 { PlotCmdUpdateElement graph,ds,dash $2 } - 102 { PlotCmdUpdateElement graph,ds,fill $2 } - 103 { PlotCmdUpdateElement graph,ds,fill,color $2 } + 95 { PlotCmdUpdateElement graph,ds,show $2 } + 97 { PlotCmdUpdateElement graph,ds,smooth $2 } + 99 { PlotCmdUpdateElement graph,ds,width $2 } + 100 { PlotCmdUpdateElement graph,ds,dash $2 } + 101 { PlotCmdUpdateElement graph,ds,fill $2 } + 102 { PlotCmdUpdateElement graph,ds,fill,color $2 } + 105 { PlotCmdUpdateElement graph,ds,bar,relief $2 } 106 { PlotCmdUpdateElement graph,ds,name $2 } 109 { PlotCmdLoad $1 xy } 110 { PlotCmdLoad $1 $2 } |