Some visual improvements and fixes for the call stack view

joerick · Oct 11, 2024 · 187ed13 · 187ed13
1 parent cbbab96
commit 187ed13
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 35 deletions.
diff --git a/docs/_static/preview/assets/index-CSk4DLjl.js b/docs/_static/preview/assets/index-CSk4DLjl.js
diff --git a/docs/_static/preview/assets/index-DhaBtkCM.js b/docs/_static/preview/assets/index-DhaBtkCM.js
diff --git a/docs/_static/preview/index.html b/docs/_static/preview/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Pyinstrument Demo</title>
-    <script type="module" crossorigin src="./assets/index-CSk4DLjl.js"></script>
+    <script type="module" crossorigin src="./assets/index-DhaBtkCM.js"></script>
     <link rel="stylesheet" crossorigin href="./assets/index-paBu1EOJ.css">
   </head>
   <body>

diff --git a/html_renderer/src/components/Frame.svelte b/html_renderer/src/components/Frame.svelte
@@ -77,7 +77,16 @@
     name = frame.function;
   }
 
-  const codePosition = `${frame.filePathShort}:${frame.lineNo?.toString().padEnd(4, " ")}`;
+  let codePosition: string
+  if (frame.isSynthetic) {
+    codePosition = "";
+  } else if (frame.filePathShort == null) {
+    codePosition = "";
+  } else if (frame.lineNo == null || frame.lineNo === 0) {
+    codePosition = frame.filePathShort;
+  } else {
+    codePosition = `${frame.filePathShort}:${frame.lineNo}`;
+  }
 
   let formattedTime: string;
   $: if ($viewOptionsCallStack.timeFormat === "absolute") {
@@ -224,7 +233,7 @@
       <div
         class="time"
         style:color={timeColor}
-        style:font-weight={frameProportionOfTotal < 0.2 ? 500 : 600}
+        style:font-weight={frameProportionOfTotal < 0.15 ? 500 : 600}
       >
         {formattedTime}
       </div>
@@ -262,7 +271,7 @@
             /></svg
           >
         </div>
-        {frame.group.frames.length} frames hidden ({groupLibrarySummary})
+        {frame.group.frames.length-1} frames hidden ({groupLibrarySummary})
       </div>
     </div>
   {/if}

diff --git a/html_renderer/src/lib/color.ts b/html_renderer/src/lib/color.ts
@@ -3,9 +3,11 @@ export function colorForFrameProportionOfTotal(proportion: number): string {
         return '#FF4159'
     } else if (proportion > 0.3) {
         return '#F5A623'
-    } else if (proportion > 0.2) {
+    } else if (proportion > 0.15) {
         return '#D8CB2A'
-    } else {
+    } else if (proportion > 0.05) {
         return '#7ED321'
+    } else {
+        return '#58984f'
     }
 }
diff --git a/pyinstrument/renderers/html_resources/app.js b/pyinstrument/renderers/html_resources/app.js