From 1b7a035220fc4ab6cf4506bbd0977b7562644dd7 Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Wed, 18 Oct 2023 16:10:08 +0200
Subject: [PATCH] fix graph_fullxzoom in case of non monotonical sweep x axis
 variable

---
 doc/xschem_man/symbol_property_syntax.html |  3 +++
 src/callback.c                             |  1 +
 src/draw.c                                 | 11 ++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/doc/xschem_man/symbol_property_syntax.html b/doc/xschem_man/symbol_property_syntax.html
index 1d5fb497..97430f45 100644
--- a/doc/xschem_man/symbol_property_syntax.html
+++ b/doc/xschem_man/symbol_property_syntax.html
@@ -535,6 +535,9 @@ verilog_format="xnor #(@risedel , @falldel ) @name ( @@Z , @@A , @@B );"
  <ul>
   <li><kbd>@symname</kbd></li>
   <p> This expands to the name of the symbol</p>
+  <li><kbd>@symref</kbd></li>
+  <p> This expands to the symbol reference exactly as specified in the instance (the <kbd>Symbol</kbd> textbox 
+   if you edit the symbol attributes with <kbd>q</kbd> key).</p>
   <li><kbd>@symname_ext</kbd></li>
   <p> This expands to the name of the symbol, keeping the extension (usually .sym)</p>
   <li><kbd>@path</kbd></li>
diff --git a/src/callback.c b/src/callback.c
index 69e9738b..58799ca6 100644
--- a/src/callback.c
+++ b/src/callback.c
@@ -48,6 +48,7 @@ static int waves_selected(int event, KeySym key, int state, int button)
     xRect *r;
     r = &xctx->rect[GRIDLAYER][i];
     if(!(r->flags & 1) ) continue;
+    if(!strboolcmp(get_tok_value(xctx->rect[GRIDLAYER][i].prop_ptr, "lock", 0), "true")) continue;
     if( (xctx->ui_state & GRAPHPAN) ||
        POINTINSIDE(xctx->mousex, xctx->mousey, r->x1,  r->y1,  r->x2 - 40,  r->y1 + 20) ||
        POINTINSIDE(xctx->mousex, xctx->mousey, r->x1 + 20,  r->y1,  r->x2 - 30,  r->y2 - 10) ) {
diff --git a/src/draw.c b/src/draw.c
index fd2008df..c701f6d0 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -2018,9 +2018,10 @@ int graph_fullxzoom(int i, Graph_ctx *gr, int dataset)
     int dset = dataset == -1 ? 0 : dataset;
     char *custom_rawfile = NULL; /* "rawfile" attr. set in graph: load and switch to specified raw */
     char *sim_type = NULL;
-    int save_datasets = -1, save_npoints = -1;
+    int k, save_datasets = -1, save_npoints = -1;
     Raw *raw = NULL;
 
+    dbg(1, "graph_fullxzoom(): sweep idx=%d\n", idx);
     if(idx < 0 ) idx = 0;
 
     my_strdup2(_ALLOC_ID_, &custom_rawfile, get_tok_value(r->prop_ptr,"rawfile",0));
@@ -2046,8 +2047,12 @@ int graph_fullxzoom(int i, Graph_ctx *gr, int dataset)
       raw->npoints[0] = raw->allpoints;
     }   
  
-    xx1 = get_raw_value(dset, idx, 0);
-    xx2 = get_raw_value(dset, idx, xctx->raw->npoints[dset] -1);
+    xx1 = xx2 = get_raw_value(dset, idx, 0);
+    for(k = 0; k < xctx->raw->npoints[dset]; k++) {
+      double v = get_raw_value(dset, idx, k);
+      if(v < xx1) xx1 = v;
+      if(v > xx2) xx2 = v;
+    }
     if(gr->logx) {
       xx1 = mylog10(xx1);
       xx2 = mylog10(xx2);