Plot-ho-matic 0.10.1.0 → 0.11.0.0

raw patch · 3 files changed

+13/−12 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• CHANGELOG.md +4/−0
• Plot-ho-matic.cabal +1/−1
• src/PlotHo/HistoryChannel.hs +8/−11

@@ -1,3 +1,7 @@+0.11.0.0+---+* newHistoryChannel' can now take meta without data+ 0.10.1.0 --- * set default xaxis types

@@ -1,5 +1,5 @@ name:                Plot-ho-matic-version:             0.10.1.0+version:             0.11.0.0 synopsis:            Real-time line plotter for generic data license:             BSD3 license-file:        LICENSE

@@ -151,7 +151,7 @@ -- If the data structure changes, a new tree should be sent, otherwise there could be indexing errors. newHistoryChannel' ::   String -- ^ channel name-  -> IO (Channel, Double -> Vector Double -> Maybe Meta -> IO ())+  -> IO (Channel, Either Meta (Double, Vector Double) -> IO ()) newHistoryChannel' name = do   let toSignalTree :: History'                       -> Tree ( [String]@@ -177,27 +177,24 @@   (channel', newHistoryMessage) <- newChannel' name sameSignalTree toSignalTree     :: IO (Channel' History', History' -> IO ()) -  let newMessage :: Double -> Vector Double -> Maybe Meta -> IO ()-      newMessage nextTime nextVal maybeMeta = do-        let val = (nextTime, nextVal)-+  let newMessage :: Either Meta (Double, Vector Double) -> IO ()+      newMessage msg = do         latestChannelValue <- CC.readMVar (chanLatestValueMVar channel')--        case (latestChannelValue, maybeMeta) of+        case (latestChannelValue, msg) of           -- first message and no meta to go with it-          (Nothing, Nothing) ->+          (Nothing, Right _) ->             putStr $ unlines               [ "WARNING: First message seen by Plot-ho-matic doesn't have signal tree meta-data."               , "This was probably caused by starting the plotter AFTER sending the first telemetry message."               , "Try restarting the application sending messages."               ]           -- any message with meta is a reset-          (_, Just meta) -> newHistoryMessage (History' True (S.singleton val) meta)+          (_, Left meta) -> newHistoryMessage (History' True mempty meta)           -- later message without meta - no reset-          (Just (History' _ oldTimeSeries meta, _), Nothing) -> do+          (Just (History' _ oldTimeSeries meta, _), Right (nextTime, nextVal)) -> do             maxHistory <- IORef.readIORef (chanMaxHistory channel')             let newTimeSeries =-                  S.drop (1 + S.length oldTimeSeries - maxHistory) (oldTimeSeries S.|> val)+                  S.drop (1 + S.length oldTimeSeries - maxHistory) (oldTimeSeries S.|> (nextTime, nextVal))             newHistoryMessage (History' False newTimeSeries meta)        clearHistory :: History' -> History'