diff --git a/public/main.js b/public/main.js index a545f89c5e638a918e281085a85952f37fe03fc2..98034d444458983a5730ec0a4e2e3e5386a72a46 100644 --- a/public/main.js +++ b/public/main.js @@ -12664,7 +12664,7 @@ var $author$project$Scatterplot$scatterplot = function (model) { _List_fromArray( [ $elm_community$typed_svg$TypedSvg$Attributes$InPx$x( - A2($gampleman$elm_visualization$Scale$convert, xScaleLocal, labelPositions.x) - 10), + A2($gampleman$elm_visualization$Scale$convert, xScaleLocal, labelPositions.x) - 20), $elm_community$typed_svg$TypedSvg$Attributes$InPx$y(30), $elm_community$typed_svg$TypedSvg$Attributes$textAnchor($elm_community$typed_svg$TypedSvg$Types$AnchorMiddle), $elm_community$typed_svg$TypedSvg$Attributes$fontSize( @@ -12697,7 +12697,7 @@ var $author$project$Scatterplot$scatterplot = function (model) { $elm_community$typed_svg$TypedSvg$text_, _List_fromArray( [ - $elm_community$typed_svg$TypedSvg$Attributes$InPx$x(10), + $elm_community$typed_svg$TypedSvg$Attributes$InPx$x(20), $elm_community$typed_svg$TypedSvg$Attributes$InPx$y( A2($gampleman$elm_visualization$Scale$convert, yScaleLocal, labelPositions.y) - 10), $elm_community$typed_svg$TypedSvg$Attributes$textAnchor($elm_community$typed_svg$TypedSvg$Types$AnchorMiddle), diff --git a/src/ExtendedFunctions.elm b/src/ExtendedFunctions.elm index 70294a0e36431f8851c20480ea07421cbca4d614..ca6dfe2fbe89c26dbc17ca96dd4b1129aa25427d 100644 --- a/src/ExtendedFunctions.elm +++ b/src/ExtendedFunctions.elm @@ -58,138 +58,6 @@ map10 func maybe1 maybe2 maybe3 maybe4 maybe5 maybe6 maybe7 maybe8 maybe9 maybe1 ) -map21 : - (a -> b -> c -> d -> e -> f -> g -> h -> i -> j -> k -> l -> m -> n -> o -> p -> q -> r -> s -> t -> u -> result) - -> Maybe a - -> Maybe b - -> Maybe c - -> Maybe d - -> Maybe e - -> Maybe f - -> Maybe g - -> Maybe h - -> Maybe i - -> Maybe j - -> Maybe k - -> Maybe l - -> Maybe m - -> Maybe n - -> Maybe o - -> Maybe p - -> Maybe q - -> Maybe r - -> Maybe s - -> Maybe t - -> Maybe u - -> Maybe result -map21 func maybe1 maybe2 maybe3 maybe4 maybe5 maybe6 maybe7 maybe8 maybe9 maybe10 maybe11 maybe12 maybe13 maybe14 maybe15 maybe16 maybe17 maybe18 maybe19 maybe20 maybe21 = - maybe1 - |> Maybe.andThen - (\value1 -> - maybe2 - |> Maybe.andThen - (\value2 -> - maybe3 - |> Maybe.andThen - (\value3 -> - maybe4 - |> Maybe.andThen - (\value4 -> - maybe5 - |> Maybe.andThen - (\value5 -> - maybe6 - |> Maybe.andThen - (\value6 -> - maybe7 - |> Maybe.andThen - (\value7 -> - maybe8 - |> Maybe.andThen - (\value8 -> - maybe9 - |> Maybe.andThen - (\value9 -> - maybe10 - |> Maybe.andThen - (\value10 -> - maybe11 - |> Maybe.andThen - (\value11 -> - maybe12 - |> Maybe.andThen - (\value12 -> - maybe13 - |> Maybe.andThen - (\value13 -> - maybe14 - |> Maybe.andThen - (\value14 -> - maybe15 - |> Maybe.andThen - (\value15 -> - maybe16 - |> Maybe.andThen - (\value16 -> - maybe17 - |> Maybe.andThen - (\value17 -> - maybe18 - |> Maybe.andThen - (\value18 -> - maybe19 - |> Maybe.andThen - (\value19 -> - maybe20 - |> Maybe.andThen - (\value20 -> - maybe21 - |> Maybe.map - (\value21 -> - func value1 - value2 - value3 - value4 - value5 - value6 - value7 - value8 - value9 - value10 - value11 - value12 - value13 - value14 - value15 - value16 - value17 - value18 - value19 - value20 - value21 - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - ) - - listmap10 : (a -> b -> c -> d -> e -> f -> g -> h -> i -> j -> k) -> List a diff --git a/src/Scatterplot.elm b/src/Scatterplot.elm index d9545a8dcdaf49b4b424bb0c75d845240c81290c..72f9c920c96bd800f6f7523fd6df50543300a664 100644 --- a/src/Scatterplot.elm +++ b/src/Scatterplot.elm @@ -87,7 +87,7 @@ scatterplot model = , g [ transform [ Translate (padding - 1) (h - padding - 1) ] ] [ xAxis xValues , text_ - [ x (Scale.convert xScaleLocal labelPositions.x - 10), y 30, textAnchor AnchorMiddle, fontSize <| Px 14 ] + [ x (Scale.convert xScaleLocal labelPositions.x - 20), y 30, textAnchor AnchorMiddle, fontSize <| Px 14 ] [ Html.text <| model.xDescription ++ (if String.length model.unitX > 0 then @@ -102,7 +102,7 @@ scatterplot model = , g [ transform [ Translate (padding - 1) (padding - 1) ] ] [ yAxis yValues , text_ - [ x 10, y (Scale.convert yScaleLocal labelPositions.y - 10), textAnchor AnchorMiddle, fontSize <| Px 14 ] + [ x 20, y (Scale.convert yScaleLocal labelPositions.y - 10), textAnchor AnchorMiddle, fontSize <| Px 14 ] [ Html.text <| model.yDescription ++ (if String.length model.unitY > 0 then diff --git a/src/TreeView.elm b/src/TreeView.elm index 41d7b22c7a0e58a768d0cf1821dcc07362d0db49..bd906bf187a1e65048fcab861d8c969e4167fb71 100644 --- a/src/TreeView.elm +++ b/src/TreeView.elm @@ -291,27 +291,14 @@ label : Datum -> Svg Msg label item = case item.node.kind of Leaf -> - -- let - -- corner = - -- min item.width item.height * 0.2 - -- in g [ transform [ Translate item.x item.y ], onClick (SetStarPlotFromTree item.node.id) ] [ Path.element [ Curve.linearClosed [ ( 0, item.height ) , ( 0, 0 ) , ( item.width, 0 ) - - --, ( item.width - corner, 0 ) - --, ( item.width, corner ) , ( item.width, item.height ) ] - - -- , Curve.linear - -- [ ( item.width - corner, 0 ) - -- , ( item.width - corner, corner ) - -- , ( item.width, corner ) - -- ] ] [ fill (Paint (Color.rgb 1 1 0.8)) , stroke (Paint Color.black) @@ -366,9 +353,6 @@ label item = [ Curve.linearClosed [ ( item.x, item.y + item.height ) , ( item.x, item.y + item.height * 0.1 ) - - --, ( item.x + item.width * 0.05, item.y ) - --, ( item.x + item.width * 0.4, item.y ) , ( item.x + item.width * 0.45, item.y + item.height * 0.1 ) , ( item.x + item.width, item.y + item.height * 0.1 ) , ( item.x + item.width, item.y + item.height ) @@ -535,95 +519,3 @@ hasIRBlaster model smartphone = else False - - - -{- mapToSPData : Smartphone -> Maybe Smartphone - mapToSPData smartphone = - map10 - (\brand model price rating battery processor_name memory ram screen_size refresh_rate -> - { id = smartphone.id - , brand = Just brand - , model = Just model - , price = Just price - , rating = Just rating - , g5 = smartphone.g5 - , nfc = smartphone.nfc - , ir_blaster = smartphone.ir_blaster - , processor_name = Just processor_name - , processor_brand = smartphone.processor_brand - , num_cores = smartphone.num_cores - , processor_speed = smartphone.processor_speed - , battery = Just battery - , fast_charging = smartphone.fast_charging - , memory = Just memory - , ram = Just ram - , screen_size = Just screen_size - , resolution = smartphone.resolution - , refresh_rate = Just refresh_rate - , camera = smartphone.camera - , card = smartphone.card - , os = smartphone.os - } - ) - smartphone.brand - smartphone.model - smartphone.price - smartphone.rating - smartphone.battery - smartphone.processor_name - smartphone.memory - smartphone.ram - smartphone.screen_size - smartphone.refresh_rate --} -{- mapToSPData : Smartphone -> Maybe Smartphone - mapToSPData smartphone = - map21 - (\brand model price rating g5 nfc ir_blaster processor_name processor_brand num_cores processor_speed battery fast_charging memory ram screen_size resolution refresh_rate camera card os -> - { id = smartphone.id - , brand = Just brand - , model = Just model - , price = Just price - , rating = Just rating - , g5 = Just g5 - , nfc = Just nfc - , ir_blaster = Just ir_blaster - , processor_name = Just processor_name - , processor_brand = Just processor_brand - , num_cores = Just num_cores - , processor_speed = Just processor_speed - , battery = Just battery - , fast_charging = Just fast_charging - , memory = Just memory - , ram = Just ram - , screen_size = Just screen_size - , resolution = Just resolution - , refresh_rate = Just refresh_rate - , camera = Just camera - , card = Just card - , os = Just os - } - ) - smartphone.brand - smartphone.model - smartphone.price - smartphone.rating - smartphone.g5 - smartphone.nfc - smartphone.ir_blaster - smartphone.processor_name - smartphone.processor_brand - smartphone.num_cores - smartphone.processor_speed - smartphone.battery - smartphone.fast_charging - smartphone.memory - smartphone.ram - smartphone.screen_size - smartphone.resolution - smartphone.refresh_rate - smartphone.camera - smartphone.card - smartphone.os --}