diff --git a/application.tsx b/application.tsx index b4997ee..bd5333e 100644 --- a/application.tsx +++ b/application.tsx @@ -8,6 +8,7 @@ import {importFromStackprof} from './import/stackprof' import {Profile} from './profile' import {Flamechart} from './flamechart' import { FlamechartView } from './flamechart-view' +import { FontFamily, FontSize } from './style' const enum SortOrder { CHRONO, @@ -21,6 +22,14 @@ interface ApplicationState { sortOrder: SortOrder } +export class Toolbar extends ReloadableComponent<{}, ApplicationState> { + render() { + return
+ speedscope +
+ } +} + export class Application extends ReloadableComponent<{}, ApplicationState> { constructor() { super() @@ -86,6 +95,7 @@ export class Application extends ReloadableComponent<{}, ApplicationState> { const flamechartToView = sortOrder == SortOrder.CHRONO ? flamechart : sortedFlamechart return
+ {flamechartToView && }
@@ -96,7 +106,19 @@ const style = StyleSheet.create({ root: { width: '100vw', height: '100vh', - overflow: 'hidden' + overflow: 'hidden', + display: 'flex', + flexDirection: 'column', + position: 'relative', + }, + toolbar: { + height: 18, + background: 'black', + color: 'white', + textAlign: 'center', + fontFamily: FontFamily.MONOSPACE, + fontSize: FontSize.TITLE, + lineHeight: '18px' } }) diff --git a/dev.html b/dev.html index 2a91528..cfad930 100644 --- a/dev.html +++ b/dev.html @@ -4,7 +4,7 @@ - SpeedScope + speedscope diff --git a/flamechart-style.ts b/flamechart-style.ts index f162bb2..f225ff2 100644 --- a/flamechart-style.ts +++ b/flamechart-style.ts @@ -1,22 +1,8 @@ import {StyleSheet} from 'aphrodite' +import { FontFamily, FontSize, Colors } from './style' const HOVERTIP_PADDING = 2 - -export enum FontFamily { - MONOSPACE = "Courier, monospace" -} - -export enum FontSize { - LABEL = 10 -} - -export enum Colors { - MEDIUM_GRAY = "#BDBDBD", - LIGHT_GRAY = "#C4C4C4" -} - - export namespace Sizes { export const MINIMAP_HEIGHT = 100 export const TOOLTIP_WIDTH_MAX = 300 @@ -46,6 +32,9 @@ export const style = StyleSheet.create({ paddingRight: HOVERTIP_PADDING, maxWidth: Sizes.TOOLTIP_WIDTH_MAX, }, + hoverCount: { + color: '#6FCF97' + }, clip: { overflow: 'hidden' }, diff --git a/flamechart-view.tsx b/flamechart-view.tsx index 78dd2fa..698b58a 100644 --- a/flamechart-view.tsx +++ b/flamechart-view.tsx @@ -13,7 +13,8 @@ import { atMostOnceAFrame } from "./utils"; import { rectangleBatchRenderer, RectangleBatchRendererProps } from "./rectangle-batch-renderer" import { FlamechartMinimapView } from "./flamechart-minimap-view" -import { style, Sizes, FontSize, FontFamily } from './flamechart-style' +import { style, Sizes } from './flamechart-style' +import { FontSize, FontFamily } from './style' interface FlamechartFrameLabel { configSpaceBounds: Rect @@ -81,6 +82,7 @@ const DEVICE_PIXEL_RATIO = window.devicePixelRatio interface FlamechartPanZoomViewProps { flamechart: Flamechart setNodeHover: (node: CallTreeNode | null, logicalViewSpaceMouse: Vec2) => void + configSpaceViewportRect: Rect setConfigSpaceViewportRect: (rect: Rect) => void } @@ -94,12 +96,10 @@ export class FlamechartPanZoomView extends ReloadableComponent -
{hoveredNode.frame.name}
-
Total Time: {this.formatTime(hoveredNode.getTotalTime())}
-
Self Time: {this.formatTime(hoveredNode.getSelfTime())}
-
Cum. Total Time: {this.formatTime(hoveredNode.frame.getTotalTime())}
-
Cum. Self Time: {this.formatTime(hoveredNode.frame.getSelfTime())}
+
+ {this.formatTime(hoveredNode.getTotalTime())}{' '} + {hoveredNode.frame.name} +
) } @@ -625,6 +626,7 @@ export class FlamechartView extends ReloadableComponent {this.renderTooltip()} diff --git a/index.html b/index.html index f8fbb57..c905d0d 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - SpeedScope + speedscope diff --git a/style.ts b/style.ts new file mode 100644 index 0000000..40c575f --- /dev/null +++ b/style.ts @@ -0,0 +1,13 @@ +export enum FontFamily { + MONOSPACE = "Courier, monospace" +} + +export enum FontSize { + LABEL = 10, + TITLE = 12 +} + +export enum Colors { + MEDIUM_GRAY = "#BDBDBD", + LIGHT_GRAY = "#C4C4C4" +}