wip

Author: TeofilC

GUI/DataFiles.hs

@@ -21,10 +21,15 @@ uiFile = "threadscope.ui"
 logoFile :: FilePath
 logoFile = "threadscope.png"
 
+
+
 -- | Textual representation of the UI file
 ui :: Q Exp
 ui = [| TE.decodeUtf8 $(makeRelativeToProject uiFile >>= embedFile) |]
 
+
+
+
 renderLogo :: B.ByteString -> IO (Maybe Pixbuf)
 renderLogo bytes =
   withSystemTempFile logoFile $ \path h -> do

GUI/EventsView.hs

@@ -287,8 +287,7 @@ drawEvents EventsView{drawArea, adj}
   layout   <- layoutEmpty pangoCtx
   layoutSetEllipsize layout EllipsizeEnd
 
-  Rectangle _ _ width clipHeight <- widgetGetAllocation drawArea
-  let clipRect = Rectangle 0 0 width clipHeight
+  clipRect@(Rectangle _ _ width _) <- widgetGetAllocation drawArea
 
   let -- With average char width, timeWidth is enough for 24 hours of logs
       -- (way more than TS can handle, currently). Aligns nicely with

GUI/Timeline/Render.hs

@@ -20,6 +20,7 @@ import Events.HECs
 import GUI.Types
 import GUI.ViewerColours
 import GUI.Timeline.CairoDrawing
+import Debug.Trace
 
 import Graphics.UI.Gtk hiding (rectangle)
 import Graphics.Rendering.Cairo
@@ -321,10 +322,11 @@ scrollView surface old new hecs = do
 -- and not only the newly exposed area. This is comparatively very cheap.
 updateXScaleArea :: TimelineState -> Timestamp -> IO ()
 updateXScaleArea TimelineState{..} lastTx = do
+  traceM "updateXScaleArea"
   -- TODO: get rid of this Just
   Just win <- widgetGetWindow timelineXScaleArea
   Rectangle _ _ width _ <- widgetGetAllocation timelineDrawingArea
-  Rectangle _ _ xScaleAreaHeight _ <- widgetGetAllocation timelineXScaleArea
+  Rectangle _ _ _ xScaleAreaHeight <- widgetGetAllocation timelineXScaleArea
   scaleValue <- readIORef scaleIORef
   -- Snap the view to whole pixels, to avoid blurring.
   hadjValue0 <- adjustmentGetValue timelineAdj
@@ -342,6 +344,7 @@ renderYScaleArea :: ViewParameters -> HECs -> DrawingArea -> Render ()
 renderYScaleArea ViewParameters{maxSpkValue, labelsMode, viewTraces,
                                 histogramHeight, minterval}
                  hecs yScaleArea = do
+  traceM "updateXScaleArea"
   let maxP = maxSparkPool hecs
       maxH = fromIntegral $ maxYHistogram hecs
   Rectangle _ _ xoffset _ <- liftIO $ widgetGetAllocation yScaleArea

threadscope.cabal

@@ -74,6 +74,7 @@ Executable threadscope
 
   include-dirs:      include
   default-extensions: RecordWildCards, NamedFieldPuns, BangPatterns, PatternGuards
+  other-extensions: TemplateHaskell
   Other-Modules:     Events.HECs,
                      Events.EventDuration,
                      Events.EventTree,

threadscope.ui

@@ -593,7 +593,7 @@
                                 <property name="n_columns">2</property>
                                 <child>
                                   <object class="GtkDrawingArea" id="timeline_yscale_area">
-                                    <property name="width_request">110</property>
+                                    <property name="width_request">50</property>
                                     <property name="visible">True</property>
                                   </object>
                                   <packing>