Add identifiers to Reader, pass to openScopeFile

kfish · Mar 26, 2012 · 712ef30 · 712ef30
1 parent e552cd3
commit 712ef30
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/Scope/Layer.hs b/Scope/Layer.hs
@@ -59,11 +59,11 @@ genColors n rgb a = MWC.withSystemRandom (replicateM n . genColor rgb a)
 scopeBufSize :: Int
 scopeBufSize = 1024
 
-openScopeFile :: FilePath -> IO ScopeFile
-openScopeFile path = do
+openScopeFile :: ScopeRead -> FilePath -> IO ScopeFile
+openScopeFile (ScopeRead ReadMethods{..}) path = do
     fd <- openFd path ReadOnly Nothing defaultFileFlags
     let f = ScopeFile path fd undefined
-    cf <- scopeEnum f (iterHeaders standardIdentifiers)
+    cf <- scopeEnum f (iterHeaders readIdentifiers)
     return f{scopeCF = cf}
 
 scopeEnum :: ScopeRender m => ScopeFile -> I.Iteratee (Offset ByteString) m a -> m a
@@ -113,7 +113,7 @@ layersFromFile (ScopeRead ReadMethods{..}) file@ScopeFile{..} = do
 
 addLayersFromFile :: ScopeRead -> FilePath -> Scope ui -> IO (Scope ui)
 addLayersFromFile reader path scope = do
-    (newLayers, newBounds, newUTCBounds) <- layersFromFile reader =<< openScopeFile path
+    (newLayers, newBounds, newUTCBounds) <- layersFromFile reader =<< openScopeFile reader path
     let scope' = scopeUpdate newBounds newUTCBounds scope
     return $ scope' { layers = layers scope ++ newLayers }
 

diff --git a/Scope/Numeric/IEEE754.hs b/Scope/Numeric/IEEE754.hs
@@ -36,9 +36,11 @@ instance ScopePlot Double where
     rawLayerPlot = rawLayerPlotListDouble
     summaryLayerPlot = summaryLayerPlotListDouble
 
+----------------------------------------------------------------------
+
 -- | ScopeRead methods to interpret numeric data as Double
 scopeReadDouble :: ScopeRead
-scopeReadDouble = ScopeRead (ReadMethods extentsDouble enumListDouble (enumSummaryListDouble 1))
+scopeReadDouble = ScopeRead (ReadMethods standardIdentifiers extentsDouble enumListDouble (enumSummaryListDouble 1))
 
 extentsDouble :: (Functor m, MonadIO m)
               => TrackNo -> Iteratee [Offset Block] m LayerExtents

diff --git a/Scope/Types.hs b/Scope/Types.hs
@@ -291,7 +291,8 @@ class ScopePlot a where
 ----------------------------------------------------------------------
 
 data ReadMethods a = ReadMethods
-    { readExtents :: forall m . (Functor m, MonadIO m) => TrackNo -> Iteratee [Offset Block] m LayerExtents
+    { readIdentifiers :: [IdentifyCodec]
+    , readExtents :: forall m . (Functor m, MonadIO m) => TrackNo -> Iteratee [Offset Block] m LayerExtents
     , rawConvEnee :: forall m . (Functor m, Monad m) => Enumeratee [Offset Block] [(TimeStamp, [a])] m ()
     , summaryConvEnee :: forall m . (Functor m, Monad m) => Enumeratee [Offset Block] [[Summary a]] m ()
     }