hasufell/cga
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Avoid shadowing of variables

Browse Source
This commit is contained in:
hasufell 2014-10-06 21:12:18 +02:00
parent 8547122be6
commit c35eb704d3
No known key found for this signature in database
GPG Key ID: 220CD1C5BDEED020
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Gtk.hs
View File

@ -186,26 +186,26 @@ drawDiag' fp mygui =
dw <- widgetGetDrawWindow (da mygui)
adjustment <- rangeGetAdjustment (hs mygui)
scaleVal <- adjustmentGetValue adjustment
xlD <- entryGetText (xl mygui)
xuD <- entryGetText (xu mygui)
ylD <- entryGetText (yl mygui)
yuD <- entryGetText (yu mygui)
xlD' <- entryGetText (xl mygui)
xuD' <- entryGetText (xu mygui)
ylD' <- entryGetText (yl mygui)
yuD' <- entryGetText (yu mygui)
-- clear drawing area
clearDiag mygui
let xD = (,) <$> readMaybe xlD <*> readMaybe xuD :: Maybe (Double,
let xD = (,) <$> readMaybe xlD' <*> readMaybe xuD' :: Maybe (Double,
Double)
yD = (,) <$> readMaybe ylD <*> readMaybe yuD :: Maybe (Double,
yD = (,) <$> readMaybe ylD' <*> readMaybe yuD' :: Maybe (Double,
Double)
case (xD, yD) of
(Just xD', Just yD') -> do
let (_, r) = renderDia Cairo
(CairoOptions "" (Width 600) SVG False)
(diagFromString (def{t = scaleVal,
dX = xD',
dY = yD'})
mesh)
(diagS (def{t = scaleVal,
dX = xD',
dY = yD'})
mesh)
renderWithDrawable dw r
return 0
_ -> return 1
@ -223,22 +223,22 @@ saveDiag' fp mygui =
mesh <- readFile fp
adjustment <- rangeGetAdjustment (hs mygui)
scaleVal <- adjustmentGetValue adjustment
xlD <- entryGetText (xl mygui)
xuD <- entryGetText (xu mygui)
ylD <- entryGetText (yl mygui)
yuD <- entryGetText (yu mygui)
xlD' <- entryGetText (xl mygui)
xuD' <- entryGetText (xu mygui)
ylD' <- entryGetText (yl mygui)
yuD' <- entryGetText (yu mygui)
let xD = (,) <$> readMaybe xlD <*> readMaybe xuD :: Maybe (Double,
let xD = (,) <$> readMaybe xlD' <*> readMaybe xuD' :: Maybe (Double,
Double)
yD = (,) <$> readMaybe ylD <*> readMaybe yuD :: Maybe (Double,
yD = (,) <$> readMaybe ylD' <*> readMaybe yuD' :: Maybe (Double,
Double)
case (xD, yD) of
(Just xD', Just yD') -> do
renderCairo "out.svg" (Width 600)
(diagFromString (def{t = scaleVal,
dX = xD',
dY = yD'})
mesh)
(diagS (def{t = scaleVal,
dX = xD',
dY = yD'})
mesh)
return 0
_ -> return 1