From 5b4f9e505be8d843e21b1ec44e8adacd25ca52a2 Mon Sep 17 00:00:00 2001 From: Rostislav Svoboda Date: Mon, 11 Apr 2022 13:32:51 +0200 Subject: [PATCH] v0.0.3 --- project.clj | 31 ++++++++++++++++--------------- src/cljplot/common.clj | 37 ++++++++++++++++++------------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/project.clj b/project.clj index efc64ab..3ec6e6a 100644 --- a/project.clj +++ b/project.clj @@ -1,15 +1,16 @@ -(defproject cljplot "0.0.2a-SNAPSHOT" - :description "JVM chart library" - :url "https://github.com/generateme/cljplot" - :license {:name "Eclipse Public License" - :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.10.1"] - [generateme/fastmath "2.0.3"] - [clojure2d "1.4.0"] - [clojure.java-time "0.3.2"] - [org.clojure/data.csv "1.0.0"] - [org.clojure/data.json "1.0.0"]] - :repl-options {:timeout 120000} - :java-source-paths ["src"] - :javac-options ["-target" "1.8" "-source" "1.8"] - :target-path "target/%s") +(defproject org.clojars.bost/cljplot "0.0.3" + :description "JVM chart library" + :url "https://github.com/generateme/cljplot" + :license {:name "Eclipse Public License" + :url "http://www.eclipse.org/legal/epl-v10.html"} + :dependencies [[org.clojure/clojure "1.11.1"] + [generateme/fastmath "2.1.8"] + [clojure2d "1.4.4"] + [clojure.java-time "0.3.3"] + [org.clojure/data.csv "1.0.1"] + [org.clojure/data.json "2.4.0"]] + :repl-options {:timeout 120000} + :java-source-paths ["src"] + ;; :javac-options ["-target" "1.8" "-source" "1.8"] + :target-path "target/%s" + :deploy-repositories [["clojars" {:sign-releases false}]]) diff --git a/src/cljplot/common.clj b/src/cljplot/common.clj index 08bec31..1dbc0c2 100644 --- a/src/cljplot/common.clj +++ b/src/cljplot/common.clj @@ -63,7 +63,7 @@ (defn wrap-interpolator-for-dt "Wrap interpolator to work with date/time values." [interpolator domain x y] - (if (date-time? (first x)) + (if (date-time? (first x)) (let [scale (s/time-interval domain) interp (interpolator (mapv scale x) y)] (fn [v] @@ -216,23 +216,23 @@ ;; -(defn- triangle-shape - "" - [canv x y hsize size angle stroke?] - (let [size (double size) - hsize (double hsize) - size3 (/ size 3.0) - size6 (+ size3 size3)] - (-> canv - (push-matrix) - (translate x y) - (rotate (m/radians angle)) - (triangle (- hsize) (- size3) - (+ hsize) (- size3) - 0 (+ size6) stroke?) - (pop-matrix)))) - -(defn draw-shape +;; (defn- triangle-shape +;; "" +;; [canv x y hsize size angle stroke?] +;; (let [size (double size) +;; hsize (double hsize) +;; size3 (/ size 3.0) +;; size6 (+ size3 size3)] +;; (-> canv +;; (push-matrix) +;; (translate x y) +;; (rotate (m/radians angle)) +;; (triangle (- hsize) (- size3) +;; (+ hsize) (- size3) +;; 0 (+ size6) stroke?) +;; (pop-matrix)))) + +(defn draw-shape "" [canv x y type color stroke size] (-> canv @@ -395,4 +395,3 @@ (defn read-csv [f] (rest (with-open [reader (io/reader f)] (doall (csv/read-csv reader))))) -