timeplot 1.0.20 → 1.0.21

raw patch · 3 files changed

+11/−8 lines, 3 filesdep ~Chart

Dependency ranges changed: Chart

Files

• Tools/TimePlot.hs +3/−1
• Tools/TimePlot/Render.hs +6/−5
• timeplot.cabal +2/−2

@@ -73,7 +73,9 @@       let plots = I.runStreamSummary (I.byKey initPlot) eventsToTracks              -- Render-      return $ renderLayout1sStacked $ map (dataToPlot commonTimeAxis (minOutTime,maxOutTime)) (M.elems plots)+      return $ renderStackedLayouts $+        slayouts_layouts ^= map (dataToPlot commonTimeAxis (minOutTime,maxOutTime)) (M.elems plots) $+        defaultStackedLayouts  showHelp = mapM_ putStrLn [ "",   "tplot - a tool for drawing timing diagrams.",

@@ -14,7 +14,7 @@ import Tools.TimePlot.Types
 import Tools.TimePlot.Plots
 
-dataToPlot :: AxisData LocalTime -> (LocalTime,LocalTime) -> PlotData -> AnyLayout1 LocalTime
+dataToPlot :: AxisData LocalTime -> (LocalTime,LocalTime) -> PlotData -> StackedLayout LocalTime
 dataToPlot commonTimeAxis tr = dataToPlot' commonTimeAxis . constrainTime tr
 
 constrainTime :: (LocalTime,LocalTime) -> PlotData -> PlotData
@@ -26,20 +26,21 @@ inRange (t0,t1) t = t>=t0 && t<=t1
 eventTimes e = [eventStart e, eventEnd e]
 
-dataToPlot' commonTimeAxis p@PlotBarsData{} = withAnyOrdinate $ layoutWithTitle commonTimeAxis [plotBars plot] (plotName p) (length (barsTitles p) > 1)
+dataToPlot' :: AxisData LocalTime -> PlotData -> StackedLayout LocalTime
+dataToPlot' commonTimeAxis p@PlotBarsData{} = StackedLayout $ layoutWithTitle commonTimeAxis [plotBars plot] (plotName p) (length (barsTitles p) > 1)
   where plot = plot_bars_values      ^= barsValues p $
                plot_bars_item_styles ^= barsStyles p $
                plot_bars_style       ^= barsStyle p $
                plot_bars_titles      ^= barsTitles p $
                ourPlotBars
-dataToPlot' commonTimeAxis p@PlotEventData{} = withAnyOrdinate $ layoutWithTitle commonTimeAxis [toPlot plot] (plotName p) False
+dataToPlot' commonTimeAxis p@PlotEventData{} = StackedLayout $ layoutWithTitle commonTimeAxis [toPlot plot] (plotName p) False
   where plot = plot_event_data           ^= eventData p $
                plot_event_long_fillstyle ^= toFillStyle $
                plot_event_label          ^= toLabel     $
                defaultPlotEvent
         toFillStyle s = solidFillStyle . opaque $ fromMaybe lightgray (readColourName (statusColor s))
         toLabel     s = statusLabel s 
-dataToPlot' commonTimeAxis p@PlotLinesData{} = withAnyOrdinate $ layoutWithTitle commonTimeAxis (map toPlot plots) (plotName p) (length (linesData p) > 1)
+dataToPlot' commonTimeAxis p@PlotLinesData{} = StackedLayout $ layoutWithTitle commonTimeAxis (map toPlot plots) (plotName p) (length (linesData p) > 1)
   where plots = [plot_lines_values ^= [vs] $ 
                  plot_lines_title  ^= title $ 
                  plot_lines_style  ^= lineStyle $ 
@@ -47,7 +48,7 @@                  | vs <- linesData p
                  | title <- linesTitles p
                  | lineStyle <- linesStyles p]
-dataToPlot' commonTimeAxis p@PlotDotsData{} = withAnyOrdinate $ layoutWithTitle commonTimeAxis (map toPlot plots) (plotName p) (length (dotsData p) > 1)
+dataToPlot' commonTimeAxis p@PlotDotsData{} = StackedLayout $ layoutWithTitle commonTimeAxis (map toPlot plots) (plotName p) (length (dotsData p) > 1)
   where plots = [plot_points_values ^= vs $
                  plot_points_style  ^= hollowCircles 4 1 color $
                  plot_points_title  ^= subtrack $

@@ -1,5 +1,5 @@ name: timeplot-version: 1.0.20+version: 1.0.21 cabal-version: >=1.6 build-type: Simple license: BSD3@@ -29,7 +29,7 @@     buildable: True     ghc-options: -rtsopts     other-modules: Graphics.Rendering.Chart.Event-    build-depends: Chart >=0.15 && < 0.17, base >=3 && <5, bytestring -any,+    build-depends: Chart >=0.17 && < 0.18, base >=3 && <5, bytestring -any,                    bytestring-lexing -any, cairo -any, colour -any, containers -any,                    data-accessor ==0.2.*, data-accessor-template >=0.2.1.1 && <0.3,                    regex-tdfa -any, strptime >=0.1.7, time -any,