diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 3fb5622..5ef5692 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -13,24 +13,12 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: Cache m2 folder - uses: actions/cache@v2 - env: - cache-name: cache-m2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-build-${{ env.cache-name }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up Java + uses: actions/setup-java@v3 with: java-version: '8' distribution: 'zulu' + cache: 'maven' - name: Set up CI environment run: .github/setup.sh - name: Execute the build diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 92a0192..925b576 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -11,24 +11,12 @@ jobs: steps: - uses: actions/checkout@v2 - - - name: Cache m2 folder - uses: actions/cache@v2 - env: - cache-name: cache-m2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-build-${{ env.cache-name }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache-name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: Set up JDK 8 - uses: actions/setup-java@v2 + - name: Set up Java + uses: actions/setup-java@v3 with: java-version: '8' distribution: 'zulu' + cache: 'maven' - name: Set up CI environment run: .github/setup.sh - name: Execute the build diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..d87fa6f --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,24 @@ +Copyright (c) 2017 - 2022, SciJava developers. +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 5eb1ae5..45e74d2 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,24 @@ [![](https://github.com/scijava/scijava-plot/actions/workflows/build-main.yml/badge.svg)](https://github.com/scijava/scijava-plot/actions/workflows/build-main.yml) -# imagej-plot-service +# SciJava PlotService -A service for displaying plots in ImageJ +UI-independent framework for creating scientific plots. + + +# Usage and Demos + +Run the following Groovy snippet from the [Script Editor](https://github.com/scijava/script-editor): + +```groovy +#@ UIService uiService +#@ PlotService plotService + +plot = plotService.newXYPlot() +plot.setTitle("XY Plot") +series = plot.addXYSeries() +series.setLabel("Series 1") +series.setValues([1,2,3], [7,3,9]) +uiService.show(plot) +``` + +Several Java demos (XY, BoxPlot, Category plots, etc.) are available in [scijava-ui-swing](https://github.com/scijava/scijava-ui-swing/tree/909e16b5cbf1b92e1d8ccce96a3521050c93174a/src/test/java/org/scijava/ui/swing/viewer/plot). diff --git a/pom.xml b/pom.xml index 5759525..99570ec 100644 --- a/pom.xml +++ b/pom.xml @@ -1,17 +1,17 @@ - + 4.0.0 org.scijava pom-scijava - 26.0.0 + 31.1.0 org.scijava scijava-plot - 0.1.2-SNAPSHOT + 0.2.1-SNAPSHOT SciJava Plot Plots for SciJava. @@ -19,7 +19,7 @@ 2017 SciJava - http://www.scijava.org/ + https://scijava.org/ @@ -33,7 +33,7 @@ maarzt Matthias Arzt - https://imagej.net/User:Maarzt + https://imagej.net/people/maarzt founder lead @@ -47,7 +47,7 @@ ctrueden Curtis Rueden - https://imagej.net/User:Rueden + https://imagej.net/people/ctrueden maintainer @@ -66,7 +66,7 @@ Image.sc Forum - https://forum.image.sc/tags/scijava + https://forum.image.sc/tag/scijava @@ -90,19 +90,12 @@ org.scijava.plot bsd_2 - Max Planck Institute of Molecular Cell Biology and Genetics. + SciJava developers. sign,deploy-to-scijava - - - scijava.public - https://maven.scijava.org/content/groups/public - - - org.scijava diff --git a/src/main/java/org/scijava/plot/BarSeries.java b/src/main/java/org/scijava/plot/BarSeries.java index 6620a59..96f6e2a 100644 --- a/src/main/java/org/scijava/plot/BarSeries.java +++ b/src/main/java/org/scijava/plot/BarSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/BoxSeries.java b/src/main/java/org/scijava/plot/BoxSeries.java index 9949140..bd84ec3 100644 --- a/src/main/java/org/scijava/plot/BoxSeries.java +++ b/src/main/java/org/scijava/plot/BoxSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/CategoryAxis.java b/src/main/java/org/scijava/plot/CategoryAxis.java index 03a1ed3..6679487 100644 --- a/src/main/java/org/scijava/plot/CategoryAxis.java +++ b/src/main/java/org/scijava/plot/CategoryAxis.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/CategoryChart.java b/src/main/java/org/scijava/plot/CategoryChart.java index 60765a1..e49245c 100644 --- a/src/main/java/org/scijava/plot/CategoryChart.java +++ b/src/main/java/org/scijava/plot/CategoryChart.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/CategoryChartItem.java b/src/main/java/org/scijava/plot/CategoryChartItem.java index d2e309b..93d2f6c 100644 --- a/src/main/java/org/scijava/plot/CategoryChartItem.java +++ b/src/main/java/org/scijava/plot/CategoryChartItem.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/Labeled.java b/src/main/java/org/scijava/plot/Labeled.java index 0fc0d38..28f4830 100644 --- a/src/main/java/org/scijava/plot/Labeled.java +++ b/src/main/java/org/scijava/plot/Labeled.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/LineSeries.java b/src/main/java/org/scijava/plot/LineSeries.java index 7f475da..ac46cad 100644 --- a/src/main/java/org/scijava/plot/LineSeries.java +++ b/src/main/java/org/scijava/plot/LineSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/LineStyle.java b/src/main/java/org/scijava/plot/LineStyle.java index 617007c..621433d 100644 --- a/src/main/java/org/scijava/plot/LineStyle.java +++ b/src/main/java/org/scijava/plot/LineStyle.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/MarkerStyle.java b/src/main/java/org/scijava/plot/MarkerStyle.java index b335d57..16c269e 100644 --- a/src/main/java/org/scijava/plot/MarkerStyle.java +++ b/src/main/java/org/scijava/plot/MarkerStyle.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/NumberAxis.java b/src/main/java/org/scijava/plot/NumberAxis.java index af68532..79476dc 100644 --- a/src/main/java/org/scijava/plot/NumberAxis.java +++ b/src/main/java/org/scijava/plot/NumberAxis.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/Plot.java b/src/main/java/org/scijava/plot/Plot.java index 9a06e68..aa91975 100644 --- a/src/main/java/org/scijava/plot/Plot.java +++ b/src/main/java/org/scijava/plot/Plot.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/PlotService.java b/src/main/java/org/scijava/plot/PlotService.java index 24edf82..80c9141 100644 --- a/src/main/java/org/scijava/plot/PlotService.java +++ b/src/main/java/org/scijava/plot/PlotService.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/SeriesStyle.java b/src/main/java/org/scijava/plot/SeriesStyle.java index 6195316..25b421b 100644 --- a/src/main/java/org/scijava/plot/SeriesStyle.java +++ b/src/main/java/org/scijava/plot/SeriesStyle.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/XYPlot.java b/src/main/java/org/scijava/plot/XYPlot.java index b8e98d6..2f438a5 100644 --- a/src/main/java/org/scijava/plot/XYPlot.java +++ b/src/main/java/org/scijava/plot/XYPlot.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/XYPlotItem.java b/src/main/java/org/scijava/plot/XYPlotItem.java index e660eec..bc2e875 100644 --- a/src/main/java/org/scijava/plot/XYPlotItem.java +++ b/src/main/java/org/scijava/plot/XYPlotItem.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/XYSeries.java b/src/main/java/org/scijava/plot/XYSeries.java index d286211..d0ee496 100644 --- a/src/main/java/org/scijava/plot/XYSeries.java +++ b/src/main/java/org/scijava/plot/XYSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/AbstractChartItem.java b/src/main/java/org/scijava/plot/defaultplot/AbstractChartItem.java index 7c5b4da..31e0f51 100644 --- a/src/main/java/org/scijava/plot/defaultplot/AbstractChartItem.java +++ b/src/main/java/org/scijava/plot/defaultplot/AbstractChartItem.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/AbstractLabeled.java b/src/main/java/org/scijava/plot/defaultplot/AbstractLabeled.java index 9144610..b35961c 100644 --- a/src/main/java/org/scijava/plot/defaultplot/AbstractLabeled.java +++ b/src/main/java/org/scijava/plot/defaultplot/AbstractLabeled.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/AbstractPlot.java b/src/main/java/org/scijava/plot/defaultplot/AbstractPlot.java index dc06349..2ba8bde 100644 --- a/src/main/java/org/scijava/plot/defaultplot/AbstractPlot.java +++ b/src/main/java/org/scijava/plot/defaultplot/AbstractPlot.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultBarSeries.java b/src/main/java/org/scijava/plot/defaultplot/DefaultBarSeries.java index b8a52b9..a113b8c 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultBarSeries.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultBarSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultBoxSeries.java b/src/main/java/org/scijava/plot/defaultplot/DefaultBoxSeries.java index e895732..e76e02b 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultBoxSeries.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultBoxSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryAxis.java b/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryAxis.java index 416bb61..6c23b75 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryAxis.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryAxis.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryChart.java b/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryChart.java index 12df357..61cebee 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryChart.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultCategoryChart.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultCategorySeries.java b/src/main/java/org/scijava/plot/defaultplot/DefaultCategorySeries.java index 8f14bca..fd67494 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultCategorySeries.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultCategorySeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultLineSeries.java b/src/main/java/org/scijava/plot/defaultplot/DefaultLineSeries.java index 2e4ebcf..d852888 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultLineSeries.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultLineSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultNumberAxis.java b/src/main/java/org/scijava/plot/defaultplot/DefaultNumberAxis.java index 3f229a5..76bac91 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultNumberAxis.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultNumberAxis.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultPlotService.java b/src/main/java/org/scijava/plot/defaultplot/DefaultPlotService.java index 96ceefc..2d1f6ed 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultPlotService.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultPlotService.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultSeriesStyle.java b/src/main/java/org/scijava/plot/defaultplot/DefaultSeriesStyle.java index ed319c3..51addc3 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultSeriesStyle.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultSeriesStyle.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultXYPlot.java b/src/main/java/org/scijava/plot/defaultplot/DefaultXYPlot.java index cdfea80..a7c8326 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultXYPlot.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultXYPlot.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/plot/defaultplot/DefaultXYSeries.java b/src/main/java/org/scijava/plot/defaultplot/DefaultXYSeries.java index cfc9268..3aae430 100644 --- a/src/main/java/org/scijava/plot/defaultplot/DefaultXYSeries.java +++ b/src/main/java/org/scijava/plot/defaultplot/DefaultXYSeries.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/ui/viewer/plot/AbstractPlotDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/plot/AbstractPlotDisplayViewer.java index c2b25b7..111b5ff 100644 --- a/src/main/java/org/scijava/ui/viewer/plot/AbstractPlotDisplayViewer.java +++ b/src/main/java/org/scijava/ui/viewer/plot/AbstractPlotDisplayViewer.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/ui/viewer/plot/DefaultPlotDisplay.java b/src/main/java/org/scijava/ui/viewer/plot/DefaultPlotDisplay.java index 5cf0d97..cc41cb2 100644 --- a/src/main/java/org/scijava/ui/viewer/plot/DefaultPlotDisplay.java +++ b/src/main/java/org/scijava/ui/viewer/plot/DefaultPlotDisplay.java @@ -1,20 +1,18 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/src/main/java/org/scijava/ui/viewer/plot/PlotDisplay.java b/src/main/java/org/scijava/ui/viewer/plot/PlotDisplay.java index 26385bc..28f1f6b 100644 --- a/src/main/java/org/scijava/ui/viewer/plot/PlotDisplay.java +++ b/src/main/java/org/scijava/ui/viewer/plot/PlotDisplay.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayPanel.java b/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayPanel.java index eafc6c6..51157b7 100644 --- a/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayPanel.java +++ b/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayPanel.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayViewer.java b/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayViewer.java index 9bc946b..3a9d7de 100644 --- a/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayViewer.java +++ b/src/main/java/org/scijava/ui/viewer/plot/PlotDisplayViewer.java @@ -1,10 +1,8 @@ /* * #%L - * ImageJ software for multidimensional image processing and analysis. + * Plots for SciJava. * %% - * Copyright (C) 2009 - 2016 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. + * Copyright (C) 2017 - 2022 SciJava developers. * %% * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/src/test/java/org/scijava/plot/defaultplot/DefaultCategoryChartTest.java b/src/test/java/org/scijava/plot/defaultplot/DefaultCategoryChartTest.java index daea110..853081d 100644 --- a/src/test/java/org/scijava/plot/defaultplot/DefaultCategoryChartTest.java +++ b/src/test/java/org/scijava/plot/defaultplot/DefaultCategoryChartTest.java @@ -1,3 +1,31 @@ +/*- + * #%L + * Plots for SciJava. + * %% + * Copyright (C) 2017 - 2022 SciJava developers. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ package org.scijava.plot.defaultplot; import org.junit.Test;