From f1292d767121975d20f258bff1f6439ef982e926 Mon Sep 17 00:00:00 2001
From: Maxime Jacquemin <maxime2.jacquemin@gmail.com>
Date: Thu, 17 Mar 2022 00:18:58 +0100
Subject: [PATCH] [ivette] Some fixes
---
ivette/src/frama-c/plugins/eva/style.css | 34 ++++++++++++-------
ivette/src/frama-c/plugins/eva/valuetable.tsx | 28 +++++++--------
2 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/ivette/src/frama-c/plugins/eva/style.css b/ivette/src/frama-c/plugins/eva/style.css
index 80b6c66de0a..6d59c2e1c79 100644
--- a/ivette/src/frama-c/plugins/eva/style.css
+++ b/ivette/src/frama-c/plugins/eva/style.css
@@ -1,11 +1,3 @@
-/* -------------------------------------------------------------------------- */
-/* --- General CSS --- */
-/* -------------------------------------------------------------------------- */
-
-.eva-focused {
- background: var(--code-select);
-}
-
/* -------------------------------------------------------------------------- */
/* --- Probe Panel --- */
/* -------------------------------------------------------------------------- */
@@ -91,13 +83,14 @@
/* -------------------------------------------------------------------------- */
.eva-cell-alarms {
- fill: orange;
- position: absolute;
- z-index: +1;
+ position: relative;
+ float: right;
+ z-index: 1;
margin: 0px;
padding: 0px;
right: 3px;
margin-left: 4px;
+ padding-left: 4px;
}
.eva-alarm-info {
@@ -106,7 +99,7 @@
margin: 1px;
}
-.eva-alarm-none { display: none; }
+.eva-alarm-none { fill: transparent; }
.eva-alarm-True { fill: var(--eva-alarms-true); }
.eva-alarm-False { fill: var(--eva-alarms-false); }
.eva-alarm-Unknown { fill: var(--eva-alarms-unknown); }
@@ -205,13 +198,13 @@
.eva-table-callsite-box {
width: 18px;
min-width: 18px;
- max-width: 18px;
background: var(--background);
border: 0px;
text-align: center;
color: var(--info-text);
border-left: thin solid var(--border);
border-bottom: thin solid var(--border);
+ padding: 2px;
}
tr:first-of-type > .eva-table-callsite-box {
@@ -223,6 +216,7 @@ tr:first-of-type > .eva-table-callsite-box {
/* -------------------------------------------------------------------------- */
.eva-table-values {
+ position: relative;
border: 0px;
padding: 2px 3px 2px 3px;
border-left: thin solid var(--border);
@@ -234,6 +228,20 @@ tr:first-of-type > .eva-table-callsite-box {
height: 22px;
min-height: 22px;
max-height: 22px;
+ white-space: break-spaces;
+}
+
+.eva-values-position {
+ padding-left: 19px;
+ padding-right: 2px;
+}
+
+/* -------------------------------------------------------------------------- */
+/* --- Selected Element Background --- */
+/* -------------------------------------------------------------------------- */
+
+.eva-focused {
+ background: var(--code-select);
}
/* -------------------------------------------------------------------------- */
diff --git a/ivette/src/frama-c/plugins/eva/valuetable.tsx b/ivette/src/frama-c/plugins/eva/valuetable.tsx
index 418581fa1dd..f11f72d42db 100644
--- a/ivette/src/frama-c/plugins/eva/valuetable.tsx
+++ b/ivette/src/frama-c/plugins/eva/valuetable.tsx
@@ -92,6 +92,7 @@ function useCallsitesCache(): Request<callstack, Callsite[]> {
interface CallsiteCellProps {
callstack: callstack | 'Header';
+ index?: number;
getCallsites: Request<callstack, Callsite[]>;
selectedClass?: string;
}
@@ -104,7 +105,7 @@ function makeStackTitle(calls: Callsite[]): string {
}
async function CallsiteCell(props: CallsiteCellProps): Promise<JSX.Element> {
- const { callstack: c, getCallsites, selectedClass = '' } = props;
+ const { callstack: c, index, getCallsites, selectedClass = '' } = props;
const callClass = classes('eva-table-callsite-box', selectedClass);
const callsites = c !== 'Header' ? await getCallsites(c) : [];
const infos =
@@ -112,7 +113,7 @@ async function CallsiteCell(props: CallsiteCellProps): Promise<JSX.Element> {
c === 'Summary' ? 'Summary' : makeStackTitle(callsites);
return (
<td className={callClass} title={infos}>
- {c === 'Header' ? '#' : c === 'Summary' ? '∑' : c}
+ {c === 'Header' ? '#' : c === 'Summary' ? '∑' : index}
</td>
);
}
@@ -395,7 +396,7 @@ function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
return async (callstack: callstack): Promise<JSX.Element> => {
const evaluation = await probe.evaluate(callstack);
const { vBefore, vAfter, vThen, vElse } = evaluation;
- function td(e: Values.evaluation, state: string): JSX.Element {
+ function td(e: Values.evaluation): JSX.Element {
const status = getAlarmStatus(e.alarms);
const alarmClass = classes('eva-cell-alarms', `eva-alarm-${status}`);
const kind = callstack === 'Summary' ? 'one' : 'this';
@@ -405,21 +406,19 @@ function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
className={className}
onContextMenu={onContextMenu(e)}
>
- <div style={{ position: 'relative' }}>
- <span className={`eva-state-${state}`}>{e.value}</span>
- <Icon className={alarmClass} size={10} title={title} id="WARNING" />
- </div>
+ <span className={'eva-values-position'}>{e.value}</span>
+ <Icon className={alarmClass} size={10} title={title} id="WARNING" />
</td>
);
}
- if (state === 'Before' && vBefore) return td(vBefore, 'Before');
- if (state === 'After' && vAfter) return td(vAfter, 'After');
+ if (state === 'Before' && vBefore) return td(vBefore);
+ if (state === 'After' && vAfter) return td(vAfter);
if (state === 'After' && vThen && vElse)
- return <>{td(vThen, 'Then')}{td(vElse, 'Else')}</>;
+ return <>{td(vThen)}{td(vElse)}</>;
if (state === 'Both' && vBefore && vAfter)
- return <>{td(vBefore, 'Before')}{td(vAfter, 'After')}</>;
+ return <>{td(vBefore)}{td(vAfter)}</>;
if (state === 'Both' && vBefore && vThen && vElse)
- return <>{td(vBefore, 'Before')}{td(vThen, 'Then')}{td(vElse, 'Else')}</>;
+ return <>{td(vBefore)}{td(vThen)}{td(vElse)}</>;
return <></>;
};
}
@@ -476,11 +475,12 @@ async function FunctionSection(props: FunctionProps): Promise<JSX.Element> {
return ProbeHeader({ probe, status, state, ...fcts });
}));
- const values = await Promise.all(callstacks.map(async (callstack) => {
+ const values = await Promise.all(callstacks.map(async (callstack, index) => {
const isSelected = isSelectedCallstack(callstack);
const selector = isSelected && callstack !== 'Summary';
const selectedClass = selector ? 'eva-focused' : '';
- const call = await CallsiteCell({ selectedClass, getCallsites, callstack });
+ const callProps = { selectedClass, getCallsites };
+ const call = await CallsiteCell({ index, callstack, ...callProps });
const onClick = (): void => props.selectCallstack(callstack);
const vs = await Promise.all(probes.map(async ([ promise, status ]) => {
const probe = await promise;
--
GitLab