From 53286346e1d2beddc1066dcae39a3992c962652d Mon Sep 17 00:00:00 2001 From: stefan schippers Date: Sat, 14 Oct 2023 23:41:19 +0200 Subject: [PATCH] doc updates, tcl rawfile variable in place for future per-graph raw file --- doc/xschem_man/developer_info.html | 6 +++++- src/scheduler.c | 2 +- src/xschem.tcl | 3 ++- xschem_library/ngspice/autozero_comp.sch | 8 ++++---- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/doc/xschem_man/developer_info.html b/doc/xschem_man/developer_info.html index 6f8eb289..3177e1ca 100644 --- a/doc/xschem_man/developer_info.html +++ b/doc/xschem_man/developer_info.html @@ -511,6 +511,8 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns" + + @@ -685,6 +687,7 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns"
  • no_draw disable drawing
  • ntabs get number of additional tabs (0 = only one tab)
  • pinlayer layer number for pins
  • +
  • raw_level hierarchy level where raw file was loaded
  • rectcolor current layer number
  • rects (xschem get rects n) number of rectangles on layer 'n'
  • sellayer layer number for selection
  • @@ -1033,7 +1036,7 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns" xschem raw_query values node [dset] : print all simulation values of 'node' for dataset 'dset' (default dset=0) xschem raw_query points [dset] : print simulation points for - dataset 'dset' (default dset=0) + dataset 'dset' (default dataset points combined)
  • raw_read [file] [sim]
  •     If a raw file is already loaded delete from memory
        else load specified file and analysis 'sim' (dc, ac, tran, op, ...)
    @@ -1376,6 +1379,7 @@ C {verilog_timescale.sym} 1050 -100 0 0 {name=s1 timestep="1ns" precision="1ns"
     
     
     
    +
     
     
      
    diff --git a/src/scheduler.c b/src/scheduler.c
    index 5031f4df..adf4bb34 100644
    --- a/src/scheduler.c
    +++ b/src/scheduler.c
    @@ -3093,7 +3093,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
          *   xschem raw_query values node [dset] : print all simulation
          *   values of 'node' for dataset 'dset' (default dset=0)
          *   xschem raw_query points [dset] : print simulation points for
    -     *   dataset 'dset' (default dset=0)
    +     *   dataset 'dset' (default dataset points combined)
          */
         else if(!strcmp(argv[1], "raw_query"))
         {
    diff --git a/src/xschem.tcl b/src/xschem.tcl
    index 3c1fd277..fad7b3f0 100644
    --- a/src/xschem.tcl
    +++ b/src/xschem.tcl
    @@ -5613,7 +5613,7 @@ set tctx::global_list {
       lvs_netlist  measure_text netlist_dir netlist_show netlist_type no_ask_save
       no_change_attrs nolist_libs noprint_libs old_selected_tok only_probes path pathlist
       persistent_command preserve_unchanged_attrs prev_symbol ps_colors ps_paper_size rainbow_colors
    -  rawfile_loaded rcode recentfile
    +  rawfile rawfile_loaded rcode recentfile
       retval retval_orig rotated_text search_case search_exact search_found search_schematic
       search_select search_value selected_tok show_hidden_texts show_infowindow
       show_infowindow_after_netlist show_pin_net_names
    @@ -6976,6 +6976,7 @@ if {$OS == "Windows"} {
     }
     
     set rawfile_loaded 0
    +set rawfile {}
     
     # flag bound to a checkbutton in symbol editprop form
     # if set cell is copied when renaming it
    diff --git a/xschem_library/ngspice/autozero_comp.sch b/xschem_library/ngspice/autozero_comp.sch
    index 7289085b..427ac89d 100644
    --- a/xschem_library/ngspice/autozero_comp.sch
    +++ b/xschem_library/ngspice/autozero_comp.sch
    @@ -55,7 +55,7 @@ color="8 14 7 12"
     
     linewidth_mult=1.0
     hilight_wave=-1
    -dataset=70}
    +dataset=-1}
     B 2 350 -1160 810 -1030 {flags=graph
     y1 = 0.647319
     y2 = 0.652563
    @@ -68,7 +68,7 @@ subdivx=2
     node="plus
     minus"
     color="4 5"
    -dataset=70
    +dataset=-1
     linewidth_mult=1.0
     divy=3
     subdivy=1}
    @@ -89,7 +89,7 @@ cal
     --failure--
     \\"SAOUT#70; vss,saout%70\\""
     color="4 4 4 8 8 7 7"
    -dataset=70
    +dataset=-1
     digital=1
     ypos1=0.0825406
     ypos2=0.767045
    @@ -107,7 +107,7 @@ subdivx=4
     unitx=n
     
     
    -dataset=70
    +dataset=-1
     color="4 7"
     node="\\"power dset 97 ; i(vvcc) vcc * % 23\\"
     \\"power dset 70 ; i(vvcc) vcc * % 70\\""