Merge branch 'feature/ivette/eva/probe-label' into 'master'

[ivette/eva] fixed probe label & zoom tooltip

See merge request frama-c/frama-c!3607

ivette/src/frama-c/plugins/eva/probeinfos.tsx

@@ -27,7 +27,7 @@
 // React & Dome
 import React from 'react';
 import { Hpack, Filler } from 'dome/layout/boxes';
-import { Label, Code } from 'dome/controls/labels';
+import { Code } from 'dome/controls/labels';
 import { IconButton } from 'dome/controls/buttons';
 import { ButtonGroup, Button } from 'dome/frame/toolbars';
 
@@ -48,7 +48,6 @@ function ProbeEditor(props: ModelProp): JSX.Element | null {
   const { model } = props;
   const probe = model.getFocused();
   if (!probe || !probe.code) return null;
-  const { label } = probe;
   const { code } = probe;
   const { stmt, marker } = probe;
   const { cols, rows } = sizeof(code);
@@ -57,7 +56,6 @@ function ProbeEditor(props: ModelProp): JSX.Element | null {
   const { zoomable } = probe;
   return (
     <>
-      <Label className="eva-probeinfo-label">{label}</Label>
       <div className="eva-probeinfo-code">
         <SizedArea cols={cols} rows={rows}>{code}</SizedArea>
       </div>
@@ -67,6 +65,7 @@ function ProbeEditor(props: ModelProp): JSX.Element | null {
         className="eva-probeinfo-button"
         display={zoomable}
         selected={zoomed}
+        title="Resize cells to fit values"
         onClick={() => { if (probe) probe.setZoomed(!zoomed); }}
       />
       <IconButton

ivette/src/frama-c/plugins/eva/probes.ts

@@ -33,31 +33,10 @@ import * as Ast from 'frama-c/kernel/api/ast';
 import { ModelCallbacks } from './cells';
 
 /* --------------------------------------------------------------------------*/
-/* --- Probe Labelling                                                    ---*/
+/* --- Probe State                                                        ---*/
 /* --------------------------------------------------------------------------*/
 
-const Ka = 'A'.charCodeAt(0);
-const Kz = 'Z'.charCodeAt(0);
 const LabelSize = 12;
-let La = Ka;
-let Lk = 0;
-
-function newLabel(): string {
-  const a = La;
-  const k = Lk;
-  const lbl = String.fromCharCode(a);
-  if (a < Kz) {
-    La++;
-  } else {
-    La = Ka;
-    Lk++;
-  }
-  return k > 0 ? `${lbl}${k}` : lbl;
-}
-
-/* --------------------------------------------------------------------------*/
-/* --- Probe State                                                        ---*/
-/* --------------------------------------------------------------------------*/
 
 export class Probe {
 
@@ -69,7 +48,6 @@ export class Probe {
   prev?: Probe;
   transient = true;
   loading = true;
-  label?: string;
   code?: string;
   stmt?: Ast.marker;
   rank?: number;
@@ -89,27 +67,20 @@ export class Probe {
 
   requestProbeInfo(): void {
     this.loading = true;
-    this.label = '…';
     Server
       .send(Values.getProbeInfo, this.marker)
       .then(({ code, stmt, rank, effects, condition }) => {
         this.code = code;
         this.stmt = stmt;
         this.rank = rank;
-        this.label = undefined;
         this.effects = effects;
         this.condition = condition;
         this.loading = false;
-        if (code && code.length > LabelSize)
-          this.label = newLabel();
-        else
-          this.label = code;
       })
       .catch(() => {
         this.code = '(error)';
         this.stmt = undefined;
         this.rank = undefined;
-        this.label = undefined;
         this.effects = false;
         this.condition = false;
         this.loading = false;

ivette/src/frama-c/plugins/eva/valuetable.tsx

@@ -101,11 +101,10 @@ function TableCell(props: TableCellProps) {
     // ---- Probe Contents
     case 'probes':
       {
-        const { stmt, code, label } = probe;
-        const textClass = label ? 'dome-text-label' : 'dome-text-cell';
+        const { stmt, code } = probe;
         contents = (
           <>
-            <span className={textClass}>{label ?? code}</span>
+            <span className='dome-text-cell'>{code}</span>
             <Stmt stmt={stmt} marker={marker} short />
           </>
         );