From 518250b3cc7a9070fb5067101c1e0ae2923a32d6 Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Thu, 9 Nov 2023 02:49:02 +0100
Subject: [PATCH] Waves->OP does backannotation, not only loading OP raw file;
 removed Simulation->Graph->load/unload raw file (redundant, now in Waves)

---
 src/xschem.tcl | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/xschem.tcl b/src/xschem.tcl
index 8520c9d4..eaac5ead 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -6989,7 +6989,15 @@ proc build_widgets { {topwin {} } } {
   $topwin.menubar.waves.menu add separator
   $topwin.menubar.waves.menu add command -label Clear -command {xschem raw_clear}
   $topwin.menubar.waves.menu add separator
-  $topwin.menubar.waves.menu add command -label Op -command {waves op}
+  $topwin.menubar.waves.menu add command -label {Op Annotate} -command {
+       set retval [select_raw]
+       set show_hidden_texts 1
+       if {$retval ne {}} {
+         xschem annotate_op $retval
+       } else {
+         xschem annotate_op
+       }
+  }
   $topwin.menubar.waves.menu add command -label Dc -command {waves dc}
   $topwin.menubar.waves.menu add command -label Ac -command {waves ac}
   $topwin.menubar.waves.menu add command -label Tran -command {waves tran}
@@ -7290,13 +7298,15 @@ tclcommand=\"xschem raw_read \$netlist_dir/[file tail [file rootname [xschem get
 "
   }
   $topwin.menubar.simulation.menu.graph add command -label "Annotate Operating Point into schematic" \
-         -command {set show_hidden_texts 1; xschem annotate_op}
-  $topwin.menubar.simulation.menu.graph add command -label {Load Spice .raw file} -command {
-     load_raw
-  }
-  $topwin.menubar.simulation.menu.graph add command -label {Unload Spice .raw file} -command {
-     xschem raw_clear
-  }
+    -command {
+       set retval [select_raw]
+       set show_hidden_texts 1
+       if {$retval ne {}} {
+         xschem annotate_op $retval
+       } else {
+         xschem annotate_op
+       }
+    }
   $topwin.menubar.simulation.menu.graph add checkbutton -label "Live annotate probes with 'b' cursor" \
          -variable live_cursor2_backannotate 
   $topwin.menubar.simulation.menu.graph add checkbutton -label "Hide graphs if no spice data loaded" \