From e80c12367c949b70eac9ae7f1a650319d48581a3 Mon Sep 17 00:00:00 2001 From: Tim Molter <tim.molter@gmail.com> Date: Sun, 26 May 2013 11:26:35 +0200 Subject: [PATCH] added CSV data back for CSV chart demos --- .gitignore | 1 - xchart-demo/CSV/CSVChartColumns/series1.csv | 3 ++ xchart-demo/CSV/CSVChartColumns/series2.csv | 3 ++ .../CSV/CSVChartColumnsExport/series1.csv | 3 ++ xchart-demo/CSV/CSVChartRows/series1.csv | 2 ++ xchart-demo/CSV/CSVChartRows/series2.csv | 2 ++ .../CSV/CSVChartRowsExport/series1.csv | 2 ++ .../xchart/standalone/CSVChartColumns.java | 19 +++++++---- .../xeiam/xchart/standalone/CSVChartRows.java | 32 ++++++++----------- .../xchart/standalone/ErrorBarLogTest.java | 32 ++++++++----------- .../xeiam/xchart/standalone/ErrorBarTest.java | 32 ++++++++----------- 11 files changed, 67 insertions(+), 64 deletions(-) create mode 100644 xchart-demo/CSV/CSVChartColumns/series1.csv create mode 100644 xchart-demo/CSV/CSVChartColumns/series2.csv create mode 100644 xchart-demo/CSV/CSVChartColumnsExport/series1.csv create mode 100644 xchart-demo/CSV/CSVChartRows/series1.csv create mode 100644 xchart-demo/CSV/CSVChartRows/series2.csv create mode 100644 xchart-demo/CSV/CSVChartRowsExport/series1.csv diff --git a/.gitignore b/.gitignore index ba17b3f1..2573b937 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,3 @@ target/ .settings/ *.png *.jpg -CSV/ \ No newline at end of file diff --git a/xchart-demo/CSV/CSVChartColumns/series1.csv b/xchart-demo/CSV/CSVChartColumns/series1.csv new file mode 100644 index 00000000..e7ff3f30 --- /dev/null +++ b/xchart-demo/CSV/CSVChartColumns/series1.csv @@ -0,0 +1,3 @@ +1,12 +2,34 +3,56 \ No newline at end of file diff --git a/xchart-demo/CSV/CSVChartColumns/series2.csv b/xchart-demo/CSV/CSVChartColumns/series2.csv new file mode 100644 index 00000000..b3f0ff6a --- /dev/null +++ b/xchart-demo/CSV/CSVChartColumns/series2.csv @@ -0,0 +1,3 @@ +1,56 +2,34 +3,12 \ No newline at end of file diff --git a/xchart-demo/CSV/CSVChartColumnsExport/series1.csv b/xchart-demo/CSV/CSVChartColumnsExport/series1.csv new file mode 100644 index 00000000..d530da1c --- /dev/null +++ b/xchart-demo/CSV/CSVChartColumnsExport/series1.csv @@ -0,0 +1,3 @@ +1,12 +2,34 +3,56 diff --git a/xchart-demo/CSV/CSVChartRows/series1.csv b/xchart-demo/CSV/CSVChartRows/series1.csv new file mode 100644 index 00000000..f53406c0 --- /dev/null +++ b/xchart-demo/CSV/CSVChartRows/series1.csv @@ -0,0 +1,2 @@ +1,2,3 +12,34,56 diff --git a/xchart-demo/CSV/CSVChartRows/series2.csv b/xchart-demo/CSV/CSVChartRows/series2.csv new file mode 100644 index 00000000..3df77443 --- /dev/null +++ b/xchart-demo/CSV/CSVChartRows/series2.csv @@ -0,0 +1,2 @@ +1,2,3 +56,34,12 diff --git a/xchart-demo/CSV/CSVChartRowsExport/series1.csv b/xchart-demo/CSV/CSVChartRowsExport/series1.csv new file mode 100644 index 00000000..f53406c0 --- /dev/null +++ b/xchart-demo/CSV/CSVChartRowsExport/series1.csv @@ -0,0 +1,2 @@ +1,2,3 +12,34,56 diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java index 3ad92707..70d552bd 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java @@ -1,10 +1,17 @@ /** - * Copyright (c) 2013 Knowmtech <http://knowmtech.com> - * - * All rights reserved. No warranty, explicit or implicit, provided. In no event shall the author be liable for any claim or damages. - * - * IMPORTANT: THIS CODE IS PROPRIETARY!!! ABSOLUTELY NO DUPLICATION OR DISTRIBUTION IS PERMITTED WITHOUT EXPRESS WRITTEN PERMISSION FROM: - * M. ALEXANDER NUGENT CONSULTING 22B STACY RD, SANTA FE NM 87585 (505)-988-7016 i@alexnugent.name + * Copyright 2013 Xeiam LLC. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.xeiam.xchart.standalone; diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java index 85848aff..bd8b034a 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java @@ -1,23 +1,17 @@ /** - * Copyright (C) 2013 Xeiam LLC http://xeiam.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright 2013 Xeiam LLC. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.xeiam.xchart.standalone; diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java index 995d88ef..a1d0378f 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java @@ -1,23 +1,17 @@ /** - * Copyright (C) 2013 Xeiam LLC http://xeiam.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright 2013 Xeiam LLC. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.xeiam.xchart.standalone; diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java index bbb4c9da..08025ece 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java @@ -1,23 +1,17 @@ /** - * Copyright (C) 2013 Xeiam LLC http://xeiam.com - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do - * so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. + * Copyright 2013 Xeiam LLC. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ package com.xeiam.xchart.standalone; -- GitLab