Plot-ho-matic 0.9.0.5 → 0.9.0.6
raw patch · 5 files changed
+39/−30 lines, 5 filesPVP ok
version bump matches the API change (PVP)
API changes (from Hackage documentation)
Files
- CHANGELOG.md +5/−0
- Plot-ho-matic.cabal +1/−1
- src/PlotHo/GraphWidget.hs +21/−16
- src/SetHo.hs +10/−2
- src/SetHo/LookupTree.hs +2/−11
CHANGELOG.md view
@@ -1,3 +1,8 @@+0.9.0.6+---+* Fix regression where signal selectors weren't growing+* rename {options -> opt, signals -> sig} to save space+ 0.9.0.5 --- * smaller minimum plot size
Plot-ho-matic.cabal view
@@ -1,5 +1,5 @@ name: Plot-ho-matic-version: 0.9.0.5+version: 0.9.0.6 synopsis: Real-time line plotter for generic data license: BSD3 license-file: LICENSE
src/PlotHo/GraphWidget.hs view
@@ -184,26 +184,36 @@ -- the options widget optionsWidget <- makeOptionsWidget graphInfoMVar redraw- optionsExpander <- Gtk.expanderNew "options"+ optionsExpander <- Gtk.expanderNew "opt" Gtk.set optionsExpander [ Gtk.containerChild := optionsWidget , Gtk.expanderExpanded := False ] -- the signal selector- treeview' <- newSignalSelectorArea onButton sameSignalTree forestFromMeta graphInfoMVar msgStore redraw- treeview <- Gtk.expanderNew "signals"- Gtk.set treeview [ Gtk.containerChild := treeview'- , Gtk.expanderExpanded := True- ]+ -- we put the expander inside the scroll because otherwise it doesn't grow, for some reason >_<+ treeview <- newSignalSelectorArea onButton sameSignalTree forestFromMeta graphInfoMVar msgStore redraw+ treeviewExpander <- Gtk.expanderNew "sig"+ Gtk.set treeviewExpander+ [ Gtk.containerChild := treeview+ , Gtk.expanderExpanded := True+ ] + treeviewExpanderScroll <- Gtk.scrolledWindowNew Nothing Nothing+ Gtk.containerAdd treeviewExpanderScroll treeviewExpander+ Gtk.set treeviewExpanderScroll+ [ Gtk.scrolledWindowHscrollbarPolicy := Gtk.PolicyNever+ , Gtk.scrolledWindowVscrollbarPolicy := Gtk.PolicyAutomatic+ ]++ -- options and signal selector packed in vbox vboxOptionsAndSignals <- Gtk.vBoxNew False 4 Gtk.set vboxOptionsAndSignals [ Gtk.containerChild := optionsExpander , Gtk.boxChildPacking optionsExpander := Gtk.PackNatural- , Gtk.containerChild := treeview- , Gtk.boxChildPacking treeview := Gtk.PackGrow+ , Gtk.containerChild := treeviewExpanderScroll+ , Gtk.boxChildPacking treeviewExpanderScroll := Gtk.PackGrow ] -- hbox to hold eveything@@ -212,6 +222,7 @@ [ Gtk.containerChild := vboxOptionsAndSignals , Gtk.boxChildPacking vboxOptionsAndSignals := Gtk.PackNatural , Gtk.containerChild := chartCanvas+ , Gtk.boxChildPacking chartCanvas := Gtk.PackGrow ] void $ Gtk.set win [ Gtk.containerChild := hboxEverything ]@@ -258,7 +269,7 @@ -> (a -> [Tree.Tree ([String], Either String (a -> [[(Double, Double)]]))]) -> CC.MVar (GraphInfo a) -> Gtk.ListStore a- -> IO () -> IO Gtk.ScrolledWindow+ -> IO () -> IO Gtk.TreeView newSignalSelectorArea onButton sameSignalTree forestFromMeta graphInfoMVar msgStore redraw = do treeStore <- Gtk.treeStoreNew [] treeview <- Gtk.treeViewNewWithModel treeStore@@ -478,13 +489,7 @@ rebuildSignalTree (forestFromMeta newMsg) redraw -- scroll <- Gtk.scrolledWindowNew Nothing Nothing- Gtk.containerAdd scroll treeview- Gtk.set scroll [ Gtk.scrolledWindowHscrollbarPolicy := Gtk.PolicyNever- , Gtk.scrolledWindowVscrollbarPolicy := Gtk.PolicyAutomatic- ]- return scroll+ return treeview
src/SetHo.hs view
@@ -85,12 +85,20 @@ -- the signal selector (treeview, getLatestStaged, receiveNewUpstream, takeLatestUpstream, loadFromFile) <- newLookupTreeview rootName initialValue (Gtk.toggleButtonGetActive buttonAutoCommit) commit+ treeviewExpander <- Gtk.expanderNew "signals" Gtk.set treeviewExpander [ Gtk.containerChild := treeview , Gtk.expanderExpanded := True ] + treeviewExpanderScroll <- Gtk.scrolledWindowNew Nothing Nothing+ Gtk.containerAdd treeviewExpanderScroll treeviewExpander+ Gtk.set treeviewExpanderScroll+ [ Gtk.scrolledWindowHscrollbarPolicy := Gtk.PolicyNever+ , Gtk.scrolledWindowVscrollbarPolicy := Gtk.PolicyAutomatic+ ]+ let menuBarDescription = [ ("_File", [ ("Load", Just (loadFile win loadFromFile)) , ("Save", Just (saveFile win getLatestStaged))@@ -119,8 +127,8 @@ , Gtk.boxChildPacking buttonTakeUpstream := Gtk.PackNatural , Gtk.containerChild := options , Gtk.boxChildPacking options := Gtk.PackNatural- , Gtk.containerChild := treeviewExpander- , Gtk.boxChildPacking treeviewExpander := Gtk.PackGrow+ , Gtk.containerChild := treeviewExpanderScroll+ , Gtk.boxChildPacking treeviewExpanderScroll := Gtk.PackGrow ] _ <- on buttonCommit Gtk.buttonActivated $ do
src/SetHo/LookupTree.hs view
@@ -146,7 +146,7 @@ -> DTree -> IO Bool -> (DTree -> IO ())- -> IO (Gtk.ScrolledWindow, IO DTree, DTree -> IO (), IO (), DTree -> IO ())+ -> IO (Gtk.TreeView, IO DTree, DTree -> IO (), IO (), DTree -> IO ()) newLookupTreeview rootName initialValue getAutocommit commit = do treeStore <- Gtk.treeStoreNew [] :: IO (Gtk.TreeStore ListViewElement) treeview <- Gtk.treeViewNewWithModel treeStore :: IO Gtk.TreeView@@ -464,16 +464,7 @@ tree <- ddataToTree (Just rootName) initialValue Gtk.treeStoreInsertTree treeStore [] 0 tree - scroll <- Gtk.scrolledWindowNew Nothing Nothing- Gtk.containerAdd scroll treeview- Gtk.set scroll [ Gtk.scrolledWindowHscrollbarPolicy := Gtk.PolicyNever- , Gtk.scrolledWindowVscrollbarPolicy := Gtk.PolicyAutomatic- ]- -- 20 pixels width: other stuff is certainly larger than that so it'll never get that small- -- 110 pixels height: enough for the user to see the selector window and a child or two.- _ <- Gtk.widgetSetSizeRequest scroll 20 110-- return (scroll, getLatestStaged, receiveNewUpstream, takeLatestUpstream, loadDTree)+ return (treeview, getLatestStaged, receiveNewUpstream, takeLatestUpstream, loadDTree) mergeSums :: SumElem -> SumElem -> (Bool, SumElem) mergeSums oldSum newSum