cicsim 0.2.0__tar.gz → 0.2.2__tar.gz

{cicsim-0.2.0 → cicsim-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cicsim
-Version: 0.2.0
+Version: 0.2.2
 Summary: Custom IC Creator Simulation Tools
 Author-email: Carsten Wulff <carsten@wulff.no>
 License: MIT
@@ -67,8 +67,8 @@ This is a script package I use to control ngspice, it can
 | 0.1.17  | Updated docs and spec |
 | 0.1.18  | Code quality overhaul: replaced os.system with subprocess, replaced eval with ast.literal_eval, migrated to Python logging module, added documentation for all CLI commands, removed setup.py in favor of pyproject.toml |
 | 0.1.19  | Wave viewer overhaul: measurement cursors (A/B) with delta readout, scroll-wheel zoom, keyboard shortcuts, engineering notation on axes (EngFormatter), Export PDF, legend toggle, regex search tooltip, Help menu. Fixed pyproject.toml license for Python 3.8. Added unit tests |
-
-
+| 0.2.0   | New pyqtgraph backend (`--backend pg`): hierarchical wave browser, automatic dual Y-axes, GPU-accelerated rendering, closeable tabs, analysis functions (FFT/PSD, Histogram, Differentiate, X vs Y). Fixed AC analysis complex data plotting |
+| 0.2.1   | Multi-format file support: CSV, TSV, Excel, JSON, Parquet, Feather, HDF5, Pickle, and more. `--sheet` option for Excel files. String/categorical axis support with rotated labels. Gradient (dy/dx) and slope in cursor readout. Double-click to plot. Regex signal picker for X vs Y |
 
 
 # Install this module
@@ -90,16 +90,26 @@ Head over to [Sky130nm tutorial](https://analogicus.com/aic2026/sky130nm_tutoria
 
 # Get started with waveform viewer
 
-Make sure you install a python version with tk. On my mac it was
+A standalone `cicwave` command is available that defaults to the pyqtgraph
+backend. It is equivalent to `cicsim wave --backend pg`.
 
 ``` bash
-brew install python-tk
+# Standalone command (defaults to pg backend)
+cicwave output_tran/tran_SchGtTtKffVh_*
+
+# Or via cicsim subcommand
+cicsim wave output_tran/tran_SchGtTtKffVh_*              # tkinter backend
+cicsim wave --backend pg output_tran/tran_SchGtTtKffVh_*  # pyqtgraph backend
 ```
 
-Once installed, I do
+Supported file formats: `.raw` (ngspice), `.csv`, `.tsv`, `.txt`, `.xlsx`,
+`.xls`, `.ods`, `.json`, `.parquet`, `.feather`, `.h5`, `.hdf5`, `.pkl`,
+`.pickle`, `.html`, `.xml`, `.fwf`, `.dta`, `.sas7bdat`, `.sav`.
 
 ``` bash
-cicsim wave output_tran/tran_SchGtTtKffVh_*
+# Open CSV / Excel files
+cicwave data.csv
+cicwave data.xlsx --sheet "Sheet2"
 ```
 
 ![](wave.png)
@@ -108,25 +118,33 @@ cicsim wave output_tran/tran_SchGtTtKffVh_*
 
 | Key | Action |
 |:-------------|:-------------------------------|
-| `a` | Set cursor A at mouse position |
-| `b` | Set cursor B at mouse position |
+| `A` | Set cursor A at mouse position |
+| `B` | Set cursor B at mouse position |
 | `Escape` | Clear cursors |
-| `f` | Auto scale (fit) |
-| `r` | Reload all waves |
-| `l` | Toggle legend |
-| `Delete` | Remove selected wave |
-| `Ctrl+O` | Open raw file |
+| `F` | Auto scale (fit) |
+| `R` | Reload all waves |
+| `L` | Toggle legend |
+| `Ctrl+O` | Open file |
 | `Ctrl+P` | Export PDF |
-| `Ctrl+N` | New plot tab |
-| `Ctrl+A` | Add axis |
+| `Ctrl+N` | New plot tab (pg) |
+| `Ctrl+W` | Close current tab (pg) |
 | `Ctrl+Q` | Quit |
 | Scroll | Zoom x-axis |
 | Shift+Scroll | Zoom y-axis |
 
+## Analysis functions (pg backend, right-click menu)
+
+| Function | Description |
+|:---------|:-----------|
+| FFT / PSD | Power spectral density in dB with Hanning window |
+| Histogram | Distribution with Gaussian fit, mean and sigma |
+| Differentiate | Numerical dy/dx |
+| X vs Y | Parametric plot with regex signal picker |
+
 
 # Commands
 
-``` 
+```
 Usage: cicsim [OPTIONS] COMMAND [ARGS]...
 
   Custom Integrated Circuit Simulation
@@ -151,3 +169,17 @@ Commands:
   template     Run an IP template with <options> YAML file
   wave         Open waveform viewer
 ```
+
+A standalone command is also available:
+
+```
+Usage: cicwave [OPTIONS] [FILES]...
+
+  Waveform viewer (standalone). Defaults to the pyqtgraph backend.
+
+Options:
+  --x TEXT                Specify x-axis
+  --backend [tk|pg]       GUI backend (default: pg)
+  --sheet TEXT            Sheet name for Excel files
+  --help                  Show this message and exit.
+```

{cicsim-0.2.0 → cicsim-0.2.2}/README.md

@@ -35,8 +35,8 @@ This is a script package I use to control ngspice, it can
 | 0.1.17  | Updated docs and spec |
 | 0.1.18  | Code quality overhaul: replaced os.system with subprocess, replaced eval with ast.literal_eval, migrated to Python logging module, added documentation for all CLI commands, removed setup.py in favor of pyproject.toml |
 | 0.1.19  | Wave viewer overhaul: measurement cursors (A/B) with delta readout, scroll-wheel zoom, keyboard shortcuts, engineering notation on axes (EngFormatter), Export PDF, legend toggle, regex search tooltip, Help menu. Fixed pyproject.toml license for Python 3.8. Added unit tests |
-
-
+| 0.2.0   | New pyqtgraph backend (`--backend pg`): hierarchical wave browser, automatic dual Y-axes, GPU-accelerated rendering, closeable tabs, analysis functions (FFT/PSD, Histogram, Differentiate, X vs Y). Fixed AC analysis complex data plotting |
+| 0.2.1   | Multi-format file support: CSV, TSV, Excel, JSON, Parquet, Feather, HDF5, Pickle, and more. `--sheet` option for Excel files. String/categorical axis support with rotated labels. Gradient (dy/dx) and slope in cursor readout. Double-click to plot. Regex signal picker for X vs Y |
 
 
 # Install this module
@@ -58,16 +58,26 @@ Head over to [Sky130nm tutorial](https://analogicus.com/aic2026/sky130nm_tutoria
 
 # Get started with waveform viewer
 
-Make sure you install a python version with tk. On my mac it was
+A standalone `cicwave` command is available that defaults to the pyqtgraph
+backend. It is equivalent to `cicsim wave --backend pg`.
 
 ``` bash
-brew install python-tk
+# Standalone command (defaults to pg backend)
+cicwave output_tran/tran_SchGtTtKffVh_*
+
+# Or via cicsim subcommand
+cicsim wave output_tran/tran_SchGtTtKffVh_*              # tkinter backend
+cicsim wave --backend pg output_tran/tran_SchGtTtKffVh_*  # pyqtgraph backend
 ```
 
-Once installed, I do
+Supported file formats: `.raw` (ngspice), `.csv`, `.tsv`, `.txt`, `.xlsx`,
+`.xls`, `.ods`, `.json`, `.parquet`, `.feather`, `.h5`, `.hdf5`, `.pkl`,
+`.pickle`, `.html`, `.xml`, `.fwf`, `.dta`, `.sas7bdat`, `.sav`.
 
 ``` bash
-cicsim wave output_tran/tran_SchGtTtKffVh_*
+# Open CSV / Excel files
+cicwave data.csv
+cicwave data.xlsx --sheet "Sheet2"
 ```
 
 ![](wave.png)
@@ -76,25 +86,33 @@ cicsim wave output_tran/tran_SchGtTtKffVh_*
 
 | Key | Action |
 |:-------------|:-------------------------------|
-| `a` | Set cursor A at mouse position |
-| `b` | Set cursor B at mouse position |
+| `A` | Set cursor A at mouse position |
+| `B` | Set cursor B at mouse position |
 | `Escape` | Clear cursors |
-| `f` | Auto scale (fit) |
-| `r` | Reload all waves |
-| `l` | Toggle legend |
-| `Delete` | Remove selected wave |
-| `Ctrl+O` | Open raw file |
+| `F` | Auto scale (fit) |
+| `R` | Reload all waves |
+| `L` | Toggle legend |
+| `Ctrl+O` | Open file |
 | `Ctrl+P` | Export PDF |
-| `Ctrl+N` | New plot tab |
-| `Ctrl+A` | Add axis |
+| `Ctrl+N` | New plot tab (pg) |
+| `Ctrl+W` | Close current tab (pg) |
 | `Ctrl+Q` | Quit |
 | Scroll | Zoom x-axis |
 | Shift+Scroll | Zoom y-axis |
 
+## Analysis functions (pg backend, right-click menu)
+
+| Function | Description |
+|:---------|:-----------|
+| FFT / PSD | Power spectral density in dB with Hanning window |
+| Histogram | Distribution with Gaussian fit, mean and sigma |
+| Differentiate | Numerical dy/dx |
+| X vs Y | Parametric plot with regex signal picker |
+
 
 # Commands
 
-``` 
+```
 Usage: cicsim [OPTIONS] COMMAND [ARGS]...
 
   Custom Integrated Circuit Simulation
@@ -119,3 +137,17 @@ Commands:
   template     Run an IP template with <options> YAML file
   wave         Open waveform viewer
 ```
+
+A standalone command is also available:
+
+```
+Usage: cicwave [OPTIONS] [FILES]...
+
+  Waveform viewer (standalone). Defaults to the pyqtgraph backend.
+
+Options:
+  --x TEXT                Specify x-axis
+  --backend [tk|pg]       GUI backend (default: pg)
+  --sheet TEXT            Sheet name for Excel files
+  --help                  Show this message and exit.
+```

{cicsim-0.2.0 → cicsim-0.2.2}/cicsim/cicsim.py

@@ -94,7 +94,12 @@ def archive(ctx,name,runfiles):
 @click.option("--x",default=None,help="Specify x-axis")
 @click.option("--backend",default="tk",type=click.Choice(["tk","pg"]),
               help="GUI backend: tk (tkinter+matplotlib) or pg (PySide6+pyqtgraph)")
-def wave(files,x,backend):
+@click.option("--sheet",default=None,help="Sheet name for Excel files (default: first sheet)")
+@click.option("--pivot",default=None,help="Pivot spec file (YAML/JSON)")
+@click.option("--pivot-info",is_flag=True,default=False,help="Print pivot dimensions and exit")
+@click.option("--session",default=None,help="Load session file (.cicwave.yaml)")
+@click.option("--export",default=None,help="Export plot to file (PDF/PNG/SVG) and exit")
+def wave(files,x,backend,sheet,pivot,pivot_info,session,export):
     """Open waveform viewer.
 
     Interactive waveform viewer for SPICE simulation results (.raw files).
@@ -107,10 +112,19 @@ def wave(files,x,backend):
       F              Auto scale (fit all)
       R              Reload all waveforms
       L              Toggle legend
+      Shift+Z        Zoom in
+      Ctrl+Z         Zoom out
       Ctrl+O         Open raw file
+      Ctrl+S         Save session
       Ctrl+P         Export to PDF
       Ctrl+N         New plot tab (pg backend)
+      Ctrl+L         Set axis labels
+      Ctrl+T         Add annotation
       Ctrl+Q         Quit
+      Ctrl+Up        Increase line width
+      Ctrl+Down      Decrease line width
+      Ctrl+=         Increase font size
+      Ctrl+-         Decrease font size
 
     \b
     Mouse (pg backend):
@@ -122,8 +136,8 @@ def wave(files,x,backend):
 
     \b
     Browser (pg backend):
-      Click wave     Add to plot
-      Right-click    Remove from plot
+      Double-click   Add to plot
+      Right-click    Context menu (plot, remove, style, analysis)
       Flat checkbox  Toggle hierarchy / flat list
 
     \b
@@ -132,8 +146,44 @@ def wave(files,x,backend):
       pg   Uses PySide6 + pyqtgraph. Install: pip install cicsim[pg]
            Features: hierarchical wave browser, automatic dual Y-axes
            (left/right by unit), GPU-accelerated rendering.
+
+    \b
+    Pivot:
+      --pivot spec.yaml     Reshape data using pivot spec before viewing
+      --pivot-info          Print unique values per pivot dimension and exit
+
+    \b
+    Session:
+      --session plot.cicwave.yaml         Load saved session
+      --export plot.pdf                   Export to file and exit (no GUI)
+      --session s.yaml --export out.pdf   Restore session and export
     """
 
+    _run_wave(files, x, backend, sheet, pivot, pivot_info,
+              session_path=session, export_path=export)
+
+
+def _run_wave(files, x, backend, sheet, pivot_spec=None,
+              pivot_info_flag=False, session_path=None, export_path=None):
+    if pivot_spec:
+        from cicsim.pivot import load_spec, pivot_info, apply_pivot
+        from cicsim.wavefiles import WaveFile
+        spec = load_spec(pivot_spec)
+
+        if pivot_info_flag:
+            for f in files:
+                wf = WaveFile(f, x or "")
+                print("--- %s ---" % f)
+                print(pivot_info(wf.df, spec))
+                print()
+            return
+
+        if not x and spec.get('columns'):
+            x = spec['columns']
+
+    if session_path or export_path:
+        backend = "pg"
+
     if backend == "pg":
         try:
             from cicsim.cmdwave_pg import CmdWavePg
@@ -151,9 +201,59 @@ def wave(files,x,backend):
             sys.exit(1)
         c = cs.CmdWave(x)
 
-    for f in files:
-        c.openFile(f)
-    c.run()
+    if session_path:
+        c.win.applySession(session_path)
+
+    if pivot_spec:
+        for f in files:
+            wf = WaveFile(f, x or "")
+            pivoted = apply_pivot(wf.df, spec)
+            name = "pivot(%s)" % os.path.basename(f)
+            c.openDataFrame(pivoted, name,
+                            pivot_spec_path=os.path.abspath(pivot_spec),
+                            original_path=os.path.abspath(f))
+    else:
+        for f in files:
+            c.openFile(f, sheet_name=sheet)
+
+    if export_path:
+        c.exportAndExit(export_path)
+    else:
+        c.run()
+
+
+@click.command()
+@click.argument("files", nargs=-1)
+@click.option("--x", default=None, help="Specify x-axis")
+@click.option("--backend", default="pg", type=click.Choice(["tk", "pg"]),
+              help="GUI backend (default: pg)")
+@click.option("--sheet", default=None, help="Sheet name for Excel files (default: first sheet)")
+@click.option("--pivot", default=None, help="Pivot spec file (YAML/JSON)")
+@click.option("--pivot-info", is_flag=True, default=False, help="Print pivot dimensions and exit")
+@click.option("--session", default=None, help="Load session file (.cicwave.yaml)")
+@click.option("--export", default=None, help="Export plot to file (PDF/PNG/SVG) and exit")
+def cicwave(files, x, backend, sheet, pivot, pivot_info, session, export):
+    """Waveform viewer (standalone).
+
+    Shortcut for 'cicsim wave --backend pg'. Opens the pyqtgraph-based
+    waveform viewer by default.
+
+    Supports: .raw, .csv, .tsv, .xlsx, .json, .parquet, .feather, .h5,
+    .pkl, and more.
+
+    \b
+    Pivot:
+      --pivot spec.yaml     Reshape data using pivot spec before viewing
+      --pivot-info          Print unique values per pivot dimension and exit
+
+    \b
+    Session:
+      --session plot.cicwave.yaml         Load saved session
+      --export plot.pdf                   Export to file and exit (no GUI)
+      --session s.yaml --export out.pdf   Restore session and export
+    """
+    _run_wave(files, x, backend, sheet, pivot, pivot_info,
+              session_path=session, export_path=export)
 
 
 

{cicsim-0.2.0 → cicsim-0.2.2}/cicsim/cmdwave.py

@@ -41,6 +41,9 @@ class CmdWave(cs.Command):
         menubar.add_cascade(menu=menu_edit, label="Edit")
         menubar.add_cascade(menu=menu_view, label="View")
 
+        self._line_width = 2
+        self._font_size = 9
+
         menu_file.add_command(label="Open Raw          Ctrl+O",
                               command=self.openFileDialog)
         menu_file.add_command(label="Export PDF        Ctrl+P",
@@ -58,6 +61,10 @@ class CmdWave(cs.Command):
                               command=self.reloadPlots)
         menu_edit.add_command(label="Auto Scale        F",
                               command=self._autoSize)
+        menu_edit.add_command(label="Zoom In           Shift+Z",
+                              command=self._zoomIn)
+        menu_edit.add_command(label="Zoom Out          Ctrl+Z",
+                              command=self._zoomOut)
         menu_edit.add_separator()
         menu_edit.add_command(label="Remove Selected   Delete",
                               command=self._removeLine)
@@ -73,6 +80,16 @@ class CmdWave(cs.Command):
         menu_view.add_separator()
         menu_view.add_command(label="Toggle Legend      L",
                               command=self._toggleLegend)
+        menu_view.add_separator()
+        menu_view.add_command(label="Increase Line Width   Ctrl+Up",
+                              command=self._incLineWidth)
+        menu_view.add_command(label="Decrease Line Width   Ctrl+Down",
+                              command=self._decLineWidth)
+        menu_view.add_separator()
+        menu_view.add_command(label="Increase Font Size    Ctrl+=",
+                              command=self._incFontSize)
+        menu_view.add_command(label="Decrease Font Size    Ctrl+-",
+                              command=self._decFontSize)
 
         menu_help = Menu(menubar)
         menubar.add_cascade(menu=menu_help, label="Help")
@@ -99,12 +116,19 @@ class CmdWave(cs.Command):
         self.root.bind('<Delete>', lambda e: self._removeLine())
         self.root.bind('<Escape>', lambda e: self._clearCursors())
 
+        self.root.bind('<Control-z>', lambda e: self._zoomOut())
+        self.root.bind('<Control-Up>', lambda e: self._incLineWidth())
+        self.root.bind('<Control-Down>', lambda e: self._decLineWidth())
+        self.root.bind('<Control-equal>', lambda e: self._incFontSize())
+        self.root.bind('<Control-minus>', lambda e: self._decFontSize())
+
         # Single-key shortcuts — skip when focus is in an Entry widget
         for key, func in [('r', self.reloadPlots),
                           ('f', self._autoSize),
                           ('a', self._setCursorA),
                           ('b', self._setCursorB),
-                          ('l', self._toggleLegend)]:
+                          ('l', self._toggleLegend),
+                          ('Z', self._zoomIn)]:
             self.root.bind(key, self._make_key_handler(func))
 
     def _make_key_handler(self, func):
@@ -126,6 +150,40 @@ class CmdWave(cs.Command):
         if p:
             p.autoSize()
 
+    def _zoomIn(self):
+        p = self.graph.getCurrentPlot()
+        if p:
+            p.zoomIn()
+
+    def _zoomOut(self):
+        p = self.graph.getCurrentPlot()
+        if p:
+            p.zoomOut()
+
+    def _incLineWidth(self):
+        self._line_width = min(self._line_width + 1, 10)
+        self._applyLineWidth()
+
+    def _decLineWidth(self):
+        self._line_width = max(self._line_width - 1, 1)
+        self._applyLineWidth()
+
+    def _applyLineWidth(self):
+        for t in self.graph.nb.tabs():
+            self.graph.nb.nametowidget(t).setLineWidth(self._line_width)
+
+    def _incFontSize(self):
+        self._font_size = min(self._font_size + 1, 24)
+        self._applyFontSize()
+
+    def _decFontSize(self):
+        self._font_size = max(self._font_size - 1, 6)
+        self._applyFontSize()
+
+    def _applyFontSize(self):
+        for t in self.graph.nb.tabs():
+            self.graph.nb.nametowidget(t).setFontSize(self._font_size)
+
     def _removeLine(self):
         p = self.graph.getCurrentPlot()
         if p:
@@ -176,6 +234,8 @@ class CmdWave(cs.Command):
             "  Ctrl+A        Add axis\n"
             "  R             Reload all waves\n"
             "  F             Auto scale (fit)\n"
+            "  Shift+Z       Zoom in\n"
+            "  Ctrl+Z        Zoom out\n"
             "  Delete        Remove selected wave\n"
             "\n"
             "Cursors\n"
@@ -189,6 +249,10 @@ class CmdWave(cs.Command):
             "\n"
             "View\n"
             "  L             Toggle legend\n"
+            "  Ctrl+Up       Increase line width\n"
+            "  Ctrl+Down     Decrease line width\n"
+            "  Ctrl+=        Increase font size\n"
+            "  Ctrl+-        Decrease font size\n"
             "\n"
             "Zoom\n"
             "  Scroll        Zoom x-axis\n"
@@ -215,9 +279,12 @@ class CmdWave(cs.Command):
     def reloadPlots(self):
         self.graph.reloadPlots()
 
-    def openFile(self, fname):
+    def openFile(self, fname, sheet_name=None):
         self.browser.openFile(fname)
 
+    def openDataFrame(self, df, name, **kwargs):
+        self.browser.openDataFrame(df, name)
+
     def run(self):
         tkinter.mainloop()