Improve code prettiness

This commit is contained in:
hasufell 2014-11-16 16:45:51 +01:00
parent 562fdbe26f
commit ea88ef84ea
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
3 changed files with 39 additions and 39 deletions

View File

@ -187,10 +187,10 @@ findNeighbor ot zr = case ot of
| is1 z = goUp z >>= go1
| is2 z = goUp z >>= go2
| otherwise = checkParent
. go is1 is2 is3 go1 go2 go3 go4
. fromJust
. goUp
$ z
. go is1 is2 is3 go1 go2 go3 go4
. fromJust
. goUp
$ z
where
checkParent (Just (z'@(TNode {}, _)))
| is3 z = go3 z'

View File

@ -28,37 +28,37 @@ data MyGUI = MkMyGUI {
-- |Tree Window
treeWin :: Window,
-- |delete Button
delButton :: Button,
delButton :: Button,
-- |save Button
saveButton :: Button,
saveButton :: Button,
-- |quit Button
quitButton :: Button,
quitButton :: Button,
-- |file chooser button
fileButton :: FileChooserButton,
fileButton :: FileChooserButton,
-- |drawing area
mainDraw :: DrawingArea,
mainDraw :: DrawingArea,
-- |drawing area for the tree
treeDraw :: DrawingArea,
-- |scaler for point thickness
ptScale :: HScale,
ptScale :: HScale,
-- |entry widget for lower x bound
xminEntry :: Entry,
xminEntry :: Entry,
-- |entry widget for upper x bound
xmaxEntry :: Entry,
xmaxEntry :: Entry,
-- |entry widget for lower y bound
yminEntry :: Entry,
yminEntry :: Entry,
-- |entry widget for upper y bound
ymaxEntry :: Entry,
ymaxEntry :: Entry,
-- |about dialog
aboutDialog :: AboutDialog,
aboutDialog :: AboutDialog,
-- |combo box for choosing the algorithm
algoBox :: ComboBox,
algoBox :: ComboBox,
-- |grid check button
gridCheckBox :: CheckButton,
gridCheckBox :: CheckButton,
-- |coord check button
coordCheckBox :: CheckButton,
coordCheckBox :: CheckButton,
-- |Path entry widget for the quad tree.
quadPathEntry :: Entry,
quadPathEntry :: Entry,
-- |Horizontal box containing the path entry widget.
vbox7 :: Box
}
@ -81,8 +81,7 @@ makeMyGladeGUI = do
<*> xmlGetWidget xml castToButton "drawButton"
<*> xmlGetWidget xml castToButton "saveButton"
<*> xmlGetWidget xml castToButton "quitButton"
<*> xmlGetWidget xml castToFileChooserButton
"filechooserButton"
<*> xmlGetWidget xml castToFileChooserButton "filechooserButton"
<*> xmlGetWidget xml castToDrawingArea "drawingarea"
<*> xmlGetWidget xml castToDrawingArea "treedrawingarea"
<*> xmlGetWidget xml castToHScale "hscale"
@ -120,21 +119,22 @@ makeGUI startFile = do
comboBoxSetActive (algoBox mygui) 0
-- callbacks
_ <- onDestroy (rootWin mygui) mainQuit
_ <- onClicked (delButton mygui) $ drawDiag mygui
_ <- onClicked (saveButton mygui) $ saveDiag mygui
_ <- onClicked (quitButton mygui) mainQuit
_ <- onResponse (aboutDialog mygui) (\x -> case x of
ResponseCancel -> widgetHideAll (aboutDialog mygui)
_ -> return ())
_ <- onDestroy (rootWin mygui) mainQuit
_ <- onClicked (delButton mygui) $ drawDiag mygui
_ <- onClicked (saveButton mygui) $ saveDiag mygui
_ <- onClicked (quitButton mygui) mainQuit
_ <- onResponse (aboutDialog mygui)
(\x -> case x of
ResponseCancel -> widgetHideAll (aboutDialog mygui)
_ -> return ())
-- have to redraw for window overlapping and resizing on expose
_ <- onExpose (mainDraw mygui) (\_ -> drawDiag mygui >>=
(\_ -> return True))
(\_ -> return True))
_ <- onExpose (treeDraw mygui) (\_ -> drawDiag mygui >>=
(\_ -> return True))
_ <- on (algoBox mygui) changed (drawDiag mygui)
_ <- on (algoBox mygui) changed (onAlgoBoxChange mygui)
_ <- on (gridCheckBox mygui) toggled (drawDiag mygui)
(\_ -> return True))
_ <- on (algoBox mygui) changed (drawDiag mygui)
_ <- on (algoBox mygui) changed (onAlgoBoxChange mygui)
_ <- on (gridCheckBox mygui) toggled (drawDiag mygui)
_ <- on (coordCheckBox mygui) toggled (drawDiag mygui)
-- hotkeys

View File

@ -258,9 +258,9 @@ treePretty = Diag f
-- by the dimensions given in xDimension from DiagProp.
xAxis :: Diag
xAxis =
Diag hRule <>
Diag segments <>
Diag labels
Diag hRule
<> Diag segments
<> Diag labels
where
hRule p _ =
arrowAt (p2 (diagXmin p, if diagYmin p <= 0 then 0 else diagYmin p))
@ -286,9 +286,9 @@ xAxis =
-- by the dimensions given in yDimension from DiagProp.
yAxis :: Diag
yAxis =
Diag vRule <>
Diag segments <>
Diag labels
Diag vRule
<> Diag segments
<> Diag labels
where
vRule p _ =
arrowAt (p2 (if diagXmin p <= 0 then 0 else diagXmin p, diagYmin p))