cicsim 0.2.2__tar.gz → 0.2.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cicsim
-Version: 0.2.2
+Version: 0.2.7
 Summary: Custom IC Creator Simulation Tools
 Author-email: Carsten Wulff <carsten@wulff.no>
 License: MIT
@@ -25,6 +25,8 @@ Requires-Dist: matplotlib
 Requires-Dist: click
 Requires-Dist: pyyaml
 Requires-Dist: tabulate
+Requires-Dist: rich
+Requires-Dist: tqdm
 Provides-Extra: pg
 Requires-Dist: PySide6; extra == "pg"
 Requires-Dist: pyqtgraph; extra == "pg"

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

@@ -67,12 +67,15 @@ def cli(ctx,color):
 @click.option("--ignore/--no-ignore", default=False,is_flag=True, help="Ignore error checks")
 @click.option("--sha/--no-sha", default=None, help="Check SHA of input files")
 @click.option("--replace",default=None, help="YAML file with replacements for netlist")
+@click.option("--threads", default=1, help="Number of parallel simulation threads")
+@click.option("--progress/--no-progress", default=False, help="Show progress bar instead of interleaved logs")
+@click.option("--timeout", default=None, type=int, help="Timeout in seconds per simulation (default: no limit)")
 @click.pass_context
-def run(ctx,testbench,run,corner,count,name,ignore,sha,replace):
+def run(ctx,testbench,run,corner,count,name,ignore,sha,replace,threads,progress,timeout):
     """Run a ngspice simulation of TESTBENCH
     """
 
-    r = cs.CmdRunNg(testbench,run,corner,name,count,sha)
+    r = cs.CmdRunNg(testbench,run,corner,name,count,sha,threads=threads,progress=progress,timeout=timeout)
     r.loadReplacements(replace)
 
     r.run(ignore)
@@ -91,7 +94,8 @@ def archive(ctx,name,runfiles):
 
 @cli.command()
 @click.argument("files",nargs=-1)
-@click.option("--x",default=None,help="Specify x-axis")
+@click.option("--x", default=None,
+              help="X-axis column; else CICWAVE_X / CICSIM_X_AXIS; else saved default (pg); else auto")
 @click.option("--backend",default="tk",type=click.Choice(["tk","pg"]),
               help="GUI backend: tk (tkinter+matplotlib) or pg (PySide6+pyqtgraph)")
 @click.option("--sheet",default=None,help="Sheet name for Excel files (default: first sheet)")
@@ -163,8 +167,19 @@ def wave(files,x,backend,sheet,pivot,pivot_info,session,export):
               session_path=session, export_path=export)
 
 
+def _resolve_wave_x_from_cli_env(cli_x):
+    """Apply --x, else CICWAVE_X / CICSIM_X_AXIS environment variables."""
+    if cli_x:
+        return cli_x
+    v = os.environ.get("CICWAVE_X") or os.environ.get("CICSIM_X_AXIS")
+    if v and str(v).strip():
+        return str(v).strip()
+    return None
+
+
 def _run_wave(files, x, backend, sheet, pivot_spec=None,
               pivot_info_flag=False, session_path=None, export_path=None):
+    x = _resolve_wave_x_from_cli_env(x)
     if pivot_spec:
         from cicsim.pivot import load_spec, pivot_info, apply_pivot
         from cicsim.wavefiles import WaveFile
@@ -224,7 +239,8 @@ def _run_wave(files, x, backend, sheet, pivot_spec=None,
 
 @click.command()
 @click.argument("files", nargs=-1)
-@click.option("--x", default=None, help="Specify x-axis")
+@click.option("--x", default=None,
+              help="X-axis column; else CICWAVE_X / CICSIM_X_AXIS; else saved default; else auto")
 @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)")

{cicsim-0.2.2 → cicsim-0.2.7}/cicsim/cmdresults.py

@@ -35,6 +35,10 @@ import glob
 import pandas as pd
 import numpy as np
 import time
+from rich.console import Console
+from rich.table import Table
+from rich import box
+from rich.markup import escape
 
 logger = logging.getLogger("cicsim")
 
@@ -43,7 +47,7 @@ logger = logging.getLogger("cicsim")
 class CmdResults(cs.Command):
     """ Summarize results of TESTBENCH """
 
-    def __init__(self,runfile,runname=None):
+    def __init__(self,runfile,runname=None,progress=False):
         if(runname is None):
             self.runname = runfile.replace(".run","")
         else:
@@ -51,6 +55,7 @@ class CmdResults(cs.Command):
         self.runfile = runfile
         self.ofile = runfile.replace(".run","")
         self.testbench = re.sub("_.*","",runfile)
+        self.progress = progress
         super().__init__()
 
     def summaryToMarkdown(self,specs,df_all):
@@ -106,30 +111,6 @@ class CmdResults(cs.Command):
             text_file.write(self.footer)
 
 
-    def readCsv(self):
-        print("Not updated")
-        pass
-        files = glob.glob(f"output_{self.testbench}/{self.testbench}_*.csv")
-        df_all = pd.DataFrame()
-        for f in files:
-            df = pd.read_csv(f)
-            name = os.path.basename(f).replace(".*_","").replace(".csv","")
-            df["name"] = name
-            (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(f)
-            df["time"] = time.ctime(mtime)
-            m = re.search("([A-Z]+[a-z]+)[A-Z]",name)
-            if(m):
-                df["type"] = m.group(1)
-            df_all = pd.concat([df,df_all])
-
-        if(df_all.empty):
-            return None
-
-
-        #- Print each corner
-        df_all.drop(columns=["Unnamed: 0"],inplace=True)
-        return df_all
-
     def readYaml(self):
         files = list()
         with open(self.runfile) as fi:
@@ -137,31 +118,112 @@ class CmdResults(cs.Command):
                 l = re.sub("\n","",l)
                 files.append(l + ".yaml")
 
-        df_all = pd.DataFrame()
+        frames = []
         for f in files:
             with open(f) as yaml_file:
                 yaml_contents = yaml.safe_load(yaml_file)
             df = pd.json_normalize(yaml_contents)
-            name = os.path.basename(f).replace(".*_","").replace(".yaml","")
+            name = re.sub(r".*_", "", os.path.basename(f)).replace(".yaml","")
             df["name"] = name
             (mode, ino, dev, nlink, uid, gid, size, atime, mtime, ctime) = os.stat(f)
             df["time"] = time.ctime(mtime)
             m = re.search("([A-Z]+[a-z]+)[A-Z]",name)
             if(m):
                 df["type"] = m.group(1)
-            df_all = pd.concat([df,df_all])
+            frames.append(df)
 
+        if not frames:
+            return None
 
-        if(df_all.empty):
+        df_all = pd.concat(frames, ignore_index=True)
 
+        if df_all.empty:
             return None
 
-
         return df_all
 
 
 
 
+    def printRich(self, df, specs=None):
+        console = Console()
+        str_cols = {"name", "time", "type"}
+        key_cols = [c for c in ["name", "type"] if c in df.columns]
+        data_cols = [c for c in df.columns if c not in key_cols]
+
+        def spec_for(col):
+            return specs[col] if specs and col in specs else None
+
+        def display_val(col, raw):
+            """Return (scaled_float, formatted_string) for a data cell."""
+            sp = spec_for(col)
+            v = raw * sp.scale if sp and sp.scale != 1 else raw
+            return v, f"{v:.4g}"
+
+        def col_header(col):
+            sp = spec_for(col)
+            if sp and sp.unit:
+                return f"{col} {escape(f'[{sp.unit}]')}"
+            return col
+
+        def col_width(col):
+            """Estimate rendered column width including cell padding."""
+            sp = spec_for(col)
+            scale = sp.scale if sp else 1
+            header_w = len(col_header(col))
+            if col in str_cols:
+                val_w = df[col].astype(str).str.len().max() if len(df) else 0
+            else:
+                scaled = df[col].dropna() * scale
+                val_w = int(scaled.apply(lambda v: len(f"{v:.4g}")).max()) if len(scaled) else 0
+            return max(header_w, val_w) + 2  # +2 for cell padding
+
+        key_width = sum(col_width(c) + 1 for c in key_cols)
+        available = console.width - key_width
+
+        # Group data columns into chunks that fit the terminal width
+        chunks, chunk, chunk_w = [], [], 0
+        for col in data_cols:
+            w = col_width(col) + 1
+            if chunk and chunk_w + w > available:
+                chunks.append(chunk)
+                chunk, chunk_w = [col], w
+            else:
+                chunk.append(col)
+                chunk_w += w
+        if chunk:
+            chunks.append(chunk)
+
+        def make_table(cols):
+            t = Table(box=box.SIMPLE_HEAD, show_footer=False, highlight=True)
+            for col in cols:
+                if col in str_cols:
+                    t.add_column(col, style="cyan", no_wrap=True)
+                else:
+                    t.add_column(col_header(col), justify="right")
+            for _, row in df.iterrows():
+                cells = []
+                for col in cols:
+                    val = row[col]
+                    if col in str_cols:
+                        cells.append(str(val))
+                    elif pd.isna(val):
+                        cells.append("")
+                    else:
+                        scaled, formatted = display_val(col, val)
+                        sp = spec_for(col)
+                        if sp:
+                            if sp.OK(scaled):
+                                formatted = f"[green]{formatted}[/green]"
+                            else:
+                                formatted = f"[bold red]{formatted}[/bold red]"
+                        cells.append(formatted)
+                t.add_row(*cells)
+            return t
+
+        for chunk in chunks:
+            console.print(make_table(key_cols + chunk))
+
     def run(self):
 
         df_all = self.readYaml()
@@ -169,11 +231,11 @@ class CmdResults(cs.Command):
             logger.warning("No results found in yaml file")
             return
 
-        #-Print all results
-        print(df_all.to_markdown(index=False,tablefmt="github",floatfmt=".5g"))
-
         specs = cs.Specification(self.testbench)
 
+        #-Print all results
+        self.printRich(df_all, specs if len(specs) > 0 else None)
+
         if(len(specs) > 0):
             df = df_all[specs.sources + ["name","type","time"]]
             df.reset_index(inplace=True)

{cicsim-0.2.2 → cicsim-0.2.7}/cicsim/cmdrunng.py

@@ -36,13 +36,15 @@ import datetime
 import hashlib
 import inspect
 import subprocess
+import signal
 import numpy as np
+from concurrent.futures import ThreadPoolExecutor, as_completed
 
 logger = logging.getLogger("cicsim")
 
 class Simulation(cs.CdsConfig):
 
-    def __init__(self,testbench,corner,runsim,config,index,sha=None):
+    def __init__(self,testbench,corner,runsim,config,index,sha=None,progress=False,timeout=None):
          #- Permutation variables
         self.runsim = runsim
         self.runmeas = True
@@ -52,6 +54,8 @@ class Simulation(cs.CdsConfig):
         self.pyscript = testbench + ".py"
         self.rundir = f"output_{self.testbench}"
         self.sha = sha
+        self.progress = progress
+        self.timeout = timeout
 
         #- Store sha128 checksums for files
         self.shas = dict()
@@ -94,7 +98,8 @@ class Simulation(cs.CdsConfig):
             with open(fpath,"rb") as f:
                 self.shas[filename] = hashlib.sha256(f.read()).hexdigest()
         else:
-            logger.warning(f"Could not find referenced file {fpath}")
+            if not self.progress:
+                logger.warning(f"Could not find referenced file {fpath}")
 
     def loadSha(self):
         shafile = self.oname + ".sha"
@@ -143,7 +148,8 @@ class Simulation(cs.CdsConfig):
 
         #- Maybe run sim if no input files have changed
         if(self.sha and self.matchAllSha()):
-            logger.warning("No spice files have changed")
+            if not self.progress:
+                logger.warning("No spice files have changed")
             self.runsim = False
 
         #- Run simulation, or not, depends on runsim
@@ -157,7 +163,8 @@ class Simulation(cs.CdsConfig):
 
         #- Run measurement if it exists, check sha though
         if(self.sha and not self.runsim and self.matchSha(self.name + ".meas")):
-            logger.warning("No meas files have changed")
+            if not self.progress:
+                logger.warning("No meas files have changed")
             self.runmeas = False
         measOk = self.ngspiceMeas(ignore)
 
@@ -167,7 +174,8 @@ class Simulation(cs.CdsConfig):
             if(self.runsim):
                 self.saveSha()
             else:
-                logger.warning("Not storing sha file, no simulation run")
+                if not self.progress:
+                    logger.warning("Not storing sha file, no simulation run")
 
         if(simOk and measOk):
             self.parseLog()
@@ -181,6 +189,7 @@ class Simulation(cs.CdsConfig):
 
     def ngspice(self,ignore=True):
         simOk = True
+        self.err = 0
 
         if(self.runsim):
             tickTime = datetime.datetime.now()
@@ -202,15 +211,22 @@ class Simulation(cs.CdsConfig):
             self.removeFile(self.oname + ".yaml")
 
             # Run NGSPICE
-            cmd = f"cd {self.rundir}; ngspice {options} {includes} {self.name}.spi -r {self.name}.raw 2>&1 |tee {self.name}.log"
+            if self.progress:
+                cmd = f"cd {self.rundir}; ngspice {options} {includes} {self.name}.spi -r {self.name}.raw > {self.name}.log 2>&1"
+            else:
+                cmd = f"cd {self.rundir}; ngspice {options} {includes} {self.name}.spi -r {self.name}.raw 2>&1 |tee {self.name}.log"
             logger.debug("Cmd: " + cmd)
             try:
-                result = subprocess.run(cmd, shell=True)
+                result = subprocess.run(cmd, shell=True, timeout=self.timeout)
                 self.err = result.returncode
+            except subprocess.TimeoutExpired:
+                logger.error(f"Simulation {self.name} timed out after {self.timeout}s")
+                self.err = 1
             except KeyboardInterrupt:
                 sys.exit(2)
             except Exception as e:
                 logger.error(str(e))
+                self.err = 1
 
             if(self.err > 0):
                 simOk = False
@@ -219,7 +235,8 @@ class Simulation(cs.CdsConfig):
             logger.info("Corner simulation time: " + str(nextTime - tickTime))
             tickTime = nextTime
         else:
-            logger.warning(f"Skipping simulation of {self.name}.spi")
+            if not self.progress:
+                logger.warning(f"Skipping simulation of {self.name}.spi")
 
          #- Check logfile. ngspice does not always exit cleanly
         errors = list()
@@ -260,6 +277,8 @@ class Simulation(cs.CdsConfig):
         for l in fi:
             if(l.startswith("#ifdef")):
                 d = re.split(r"\s+",l)
+                if len(d) < 2:
+                    continue
                 dkey = d[1]
                 state = 1
                 continue
@@ -369,11 +388,17 @@ class Simulation(cs.CdsConfig):
 
         #- Run measurement
         if(self.runmeas):
-            cmd = f"cd {self.rundir}; ngspice -b {self.name}.meas  2>&1 | tee {self.name}.logm"
+            if self.progress:
+                cmd = f"cd {self.rundir}; ngspice -b {self.name}.meas > {self.name}.logm 2>&1"
+            else:
+                cmd = f"cd {self.rundir}; ngspice -b {self.name}.meas  2>&1 | tee {self.name}.logm"
             logger.debug("Cmd: " + cmd)
-            subprocess.run(cmd, shell=True)
+            result = subprocess.run(cmd, shell=True)
+            if result.returncode != 0:
+                logger.warning(f"ngspice measurement run returned {result.returncode} for {self.name}")
         else:
-            logger.warning(f"Skipping measurement run of {self.name}.meas")
+            if not self.progress:
+                logger.warning(f"Skipping measurement run of {self.name}.meas")
 
         #- Check meas logfile. ngspice does not always exit cleanly
         errors = list()
@@ -399,21 +424,34 @@ class Simulation(cs.CdsConfig):
     def parseLog(self):
         analysis = False
 
+        re_eq     = re.compile(r"=")
+        re_kv     = re.compile(r"^([^\s]+)\s*=\s*([^\s]+)\s")
+        re_binary = re.compile(r"binary raw file")
+        re_meas   = re.compile(r"Measurements for (.*)$")
+        re_sep    = re.compile(r"^---------------------------------")
+        re_index  = re.compile(r"^Index")
+        re_digit  = re.compile(r"^\d")
+        re_start  = re.compile(r"^\s*MEAS_START")
+        re_end    = re.compile(r"^\s*MEAS_END")
+
         #- Parse main log file for measurements
         data = dict()
         with open(self.oname + ".log") as fi:
             for l in fi:
-                if(analysis and re.search("=",l)):
-                    m = re.search(r"^([^\s]+)\s*=\s*([^\s]+)\s",l)
+                if(analysis and re_eq.search(l)):
+                    m = re_kv.search(l)
                     if(m):
                         key = m.groups()[0].strip()
                         val = m.groups()[1].strip()
-                        data[key] = float(val)
+                        try:
+                            data[key] = float(val)
+                        except ValueError:
+                            logger.warning(f"Could not parse measurement value: {key}={val}")
 
-                if(re.search("binary raw file",l)):
+                if(re_binary.search(l)):
                     analysis = False
 
-                m = re.search("Measurements for (.*)$",l)
+                m = re_meas.search(l)
                 if(m):
                     analysis = True
 
@@ -428,19 +466,16 @@ class Simulation(cs.CdsConfig):
             with open(measlog) as fi:
                 for l in fi:
 
-
                     if(analysis):
-                        #print(table,prepareTable,l)
-                            # Parse tables
-                        if(not prepareTable and re.search("^---------------------------------",l)):
+                        # Parse tables
+                        if(not prepareTable and re_sep.search(l)):
                             prepareTable = True
                             continue
-                        #print(l,end="")
-                        #print(re.search(r"^\d",l))
-                        if(table and not prepareTable and (not re.search(r"^\d",l) )):
+
+                        if(table and not prepareTable and (not re_digit.search(l))):
                             table = False
 
-                        if(prepareTable and re.search("^Index",l)):
+                        if(prepareTable and re_index.search(l)):
                             arr = re.split(r"\s+",l)
                             table_header = arr[1:]
                             table = True
@@ -448,28 +483,32 @@ class Simulation(cs.CdsConfig):
 
                         if(table and not prepareTable):
                             arr = re.split(r"\s+",l)
-
                             for k,v in zip(table_header,arr[1:]):
                                 if(v== ""):
                                     continue
                                 if(k not in data):
                                     data[k] = list()
-                                data[k].append(float(v))
-
+                                try:
+                                    data[k].append(float(v))
+                                except ValueError:
+                                    logger.warning(f"Could not parse table value: {k}={v}")
 
                         if(prepareTable):
                             prepareTable = False
 
                     #- Find key=val pairs
-                    if(analysis and re.search("=",l)):
-                        m = re.search(r"^([^\s]+)\s*=\s*([^\s]+)\s",l)
+                    if(analysis and re_eq.search(l)):
+                        m = re_kv.search(l)
                         if(m):
                             key = m.groups()[0].strip()
                             val = m.groups()[1].strip()
-                            data[key] = float(val)
-                    if(re.search(r"^\s*MEAS_START",l)):
+                            try:
+                                data[key] = float(val)
+                            except ValueError:
+                                logger.warning(f"Could not parse measurement value: {key}={val}")
+                    if(re_start.search(l)):
                         analysis = True
-                    if(re.search(r"^\s*MEAS_END",l)):
+                    if(re_end.search(l)):
                         analysis = False
 
         yamlfile = self.oname + ".yaml"
@@ -515,13 +554,16 @@ class CmdRunNg(cs.CdsConfig):
     """ Run ngspice
     """
 
-    def __init__(self,testbench,runsim,corners,cornername,count,sha):
+    def __init__(self,testbench,runsim,corners,cornername,count,sha,threads=1,progress=False,timeout=None):
         self.testbench = testbench
         self.count = count
         self.runsim = runsim
         self.corners = corners
         self.cornername = cornername
         self.sha = sha
+        self.threads = max(1, threads)
+        self.progress = progress
+        self.timeout = timeout
         self.replace = None
 
         super().__init__()
@@ -545,7 +587,7 @@ class CmdRunNg(cs.CdsConfig):
 
     def run(self,ignore=False):
         startTime = datetime.datetime.now()
-        
+
         self.filename = self.testbench + ".spi"
 
         if(not os.path.exists(self.filename)):
@@ -553,36 +595,72 @@ class CmdRunNg(cs.CdsConfig):
             return
 
         permutations = self.getPermutations(self.corners)
+
+        # Build ordered list of (corner, index) jobs
+        jobs = [(corner, index) for corner in permutations for index in range(self.count)]
+
+        def run_one(job):
+            corner, index = job
+            c = Simulation(self.testbench, corner, self.runsim, self.config, index, self.sha,
+                           progress=self.progress, timeout=self.timeout)
+            c.loadReplace(self.replace)
+            ok = c.run(ignore)
+            return c, bool(ok)
+
+        executor = None
+        try:
+            if self.progress:
+                from tqdm import tqdm
+                from cicsim.command import suppress_console_logging
+                with suppress_console_logging():
+                    if self.threads > 1:
+                        executor = ThreadPoolExecutor(max_workers=self.threads)
+                        results = list(tqdm(executor.map(run_one, jobs),
+                                           total=len(jobs), desc=self.testbench, unit="sim"))
+                    else:
+                        results = list(tqdm((run_one(job) for job in jobs),
+                                           total=len(jobs), desc=self.testbench, unit="sim"))
+            elif self.threads > 1:
+                logger.info(f"Running {len(jobs)} simulation(s) with {self.threads} threads")
+                executor = ThreadPoolExecutor(max_workers=self.threads)
+                results = list(executor.map(run_one, jobs))
+            else:
+                results = [run_one(job) for job in jobs]
+        except KeyboardInterrupt:
+            logger.warning("Interrupted — cancelling pending simulations")
+            if executor is not None:
+                executor.shutdown(wait=False, cancel_futures=True)
+            sys.exit(2)
+        finally:
+            if executor is not None:
+                executor.shutdown(wait=False)
+
         pyRunLater = list()
         files = list()
         simOk = True
+        failed_names = []
 
-        for corner in permutations:
-            for index in range(0,self.count):
-                if(not simOk):
-                    logger.error(f"Previous simulation failed, skipping {index}")
-                    continue
-
-                #- Run a simulation for a corner
-                c = Simulation(self.testbench,corner,self.runsim,self.config,index,self.sha)
-
-                #- Setup additional replacements
-                c.loadReplace(self.replace)
-
-                #- Run simulation
-                if(not c.run(ignore)):
-                    simOk = False
-                    continue
-
+        for c, ok in results:
+            if not ok:
+                simOk = False
+                failed_names.append(c.name)
+                if not self.progress:
+                    logger.error(f"Simulation {c.name} failed")
+            else:
                 files.append(c.oname)
-
-                #- Run python post parsing if py file exist and simulation is OK
-                if(simOk and os.path.exists(c.pyscript)):
+                if os.path.exists(c.pyscript):
                     pyRunLater.append(c)
 
-
         endTime = datetime.datetime.now()
-        logger.info("Total simulation time: " + str(endTime - startTime))
+        elapsed = str(endTime - startTime)
+
+        if self.progress:
+            passed = len(results) - len(failed_names)
+            print(f"Done: {passed}/{len(results)} passed  [{elapsed}]")
+            for name in failed_names:
+                print(f"  FAILED: {name}")
+        else:
+            logger.info("Total simulation time: " + elapsed)
 
         #- Make runfile
         if(self.cornername):
@@ -607,7 +685,7 @@ class CmdRunNg(cs.CdsConfig):
                     else:
                         tb.main(c.oname)
             #- Extract results
-            r = cs.CmdResults(runfile)
+            r = cs.CmdResults(runfile, progress=self.progress)
             r.run()
         else:
             logger.warning("Skipping post processing, one simulation failed")

{cicsim-0.2.2 → cicsim-0.2.7}/cicsim/cmdsummary.py

@@ -146,8 +146,7 @@ class Summary(cs.Command):
         super().__init__()
 
         if(not os.path.exists(self.filename)):
-            logger.error(f"Could not find {self.filename}")
-            exit()
+            raise FileNotFoundError(f"Could not find {self.filename}")
 
         with open(self.filename) as fi:
             obj =yaml.safe_load(fi)

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

@@ -8,6 +8,7 @@ import os
 
 from .wavebrowser import *
 from .wavegraph import *
+from .theme import _get_theme
 
 
 #- I try to follow a Model, View, Controller type of design pattern
@@ -261,9 +262,10 @@ class CmdWave(cs.Command):
         win = Toplevel(self.root)
         win.title("Keyboard Shortcuts")
         win.resizable(False, False)
+        theme = _get_theme()
         label = Label(win, text=text, justify=LEFT,
                       font=("Courier", 11),
-                      bg="#2b2b2b", fg="#e0e0e0",
+                      bg=theme['panel_bg'], fg=theme['panel_fg'],
                       padx=16, pady=12)
         label.pack(fill=BOTH, expand=True)
         btn = ttk.Button(win, text="Close", command=win.destroy)