Branch: refs/heads/master Home: https://github.com/Starlink/starjava Commit: fd3736129a3c17ee7468a23ba55959641a7d28f5 https://github.com/Starlink/starjava/commit/fd3736129a3c17ee7468a23ba55959641a7d28f5 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubeSurfaceFactory.java Log Message: ----------- ttools: fix bug in explicit ranging for sphere plot Commit: 987007004b492ab193b962368e2bb93205a4eb30 https://github.com/Starlink/starjava/commit/987007004b492ab193b962368e2bb93205a4eb30 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/Formatter.java M ttools/src/main/uk/ac/starlink/ttools/build/ModeDoc.java M ttools/src/main/uk/ac/starlink/ttools/task/OutputModeParameter.java Log Message: ----------- ttools: move some line-wrapping code Move some line wrapping code from OutputModeParameter to Formatter so it can be re-used elsewhere. Commit: ac0199bce936fb938efb49efe9bbe28aca06a190 https://github.com/Starlink/starjava/commit/ac0199bce936fb938efb49efe9bbe28aca06a190 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/task/AbstractInputTableParameter.java M ttools/src/main/uk/ac/starlink/ttools/task/FixedTablesInput.java M ttools/src/main/uk/ac/starlink/ttools/task/InputFormatParameter.java M ttools/src/main/uk/ac/starlink/ttools/task/VariableTablesInput.java Log Message: ----------- ttools: improve custom description for table input params Some table input parameters (AbstractTableInputParameter and subclases) need custom wording in their parameter descriptions and prompts to explain the purpose of the tables in question. This was previously handled by some extremely nasty string manipulation that relied on knowledge of hard-coded description text. Replace it by some more reasonable configuration methods. Commit: 0bd79a734588e9f17b376f5b9f703202804aa543 https://github.com/Starlink/starjava/commit/0bd79a734588e9f17b376f5b9f703202804aa543 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M task/src/main/uk/ac/starlink/task/ChoiceParameter.java M ttools/src/main/uk/ac/starlink/ttools/example/EnvPlanePlotter.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/GenericPlot2Task.java R ttools/src/main/uk/ac/starlink/ttools/plot2/task/Plot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotContext.java Log Message: ----------- ttools: refactor Plot2Task Split Plot2Task up into an abstract superclass (AbstractPlot2Task) and a PlotType-agnostic concrete subclass (GenericPlot2Task). GenericPlot2Task should now behave just the same as Plot2Task used to. But now I can instantiate AbstractPlot2Task separately for particular PlotTypes, to give PlotType-specific plotting classes that provide better self-documentation and are easier to use (parameter lists customised to particular plot types). Commit: 0f73b2777b08e044afcff31a959e7d35b9badaf6 https://github.com/Starlink/starjava/commit/0f73b2777b08e044afcff31a959e7d35b9badaf6 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapePlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java Log Message: ----------- ttools: add PlotterParameter The layerN parameter is now provided by a custom parameter type PlotterParameter. The values of this parameter no longer map 1:1 to Plotter instances, since it previously had far too many possible values (mark-auto, mark-flat, mark-aux, ... link-auto, link-flat, link-aux, ....), which made it unwieldy to (auto-)document. Now, for the special case of ShapeModePlotters, this parameter just specifies the ShapeForm, and an auxiliary (shading) parameter is used to specify ShapeMode. For other plotter types, this parameter specifies the Plotter in full. Commit: 4fc72be165355804b39f8f59e182df3dc144e636 https://github.com/Starlink/starjava/commit/4fc72be165355804b39f8f59e182df3dc144e636 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/ParameterFinder.java Log Message: ----------- ttools: make layer suffixes optional in plot2 task parameters Allow data and style parameters to be specified either with or without the layer suffix. This generally means much less typing for multi-layer plots where the layers are related (e.g. from the same table). Commit: 6e516a93703212fe6af4a309e3b223dc0aa8430f https://github.com/Starlink/starjava/commit/6e516a93703212fe6af4a309e3b223dc0aa8430f Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/GenericPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotContext.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java Log Message: ----------- ttools: fix plot2task to handle per-layer DataGeoms Commit: eeff7f6ad25efa701551917078d735b7ef999103 https://github.com/Starlink/starjava/commit/eeff7f6ad25efa701551917078d735b7ef999103 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyDataGeom.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyPlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlanePlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/SkyPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java Log Message: ----------- ttools: add typed plot2 task TypedPlot2Task allows much better self-documentation. Added a couple of example subclasses (Plane and Sky). Other type-specific ones left to do, but most will be trivial. Commit: 9d5ee3d461b1251809922d3e7354652a4f96c324 https://github.com/Starlink/starjava/commit/9d5ee3d461b1251809922d3e7354652a4f96c324 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotPlacement.java M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java Log Message: ----------- ttools: add PlotUtil.subtractInsets utility method Commit: 289e0d63e2ff3db2114274eec20f74571b94c672 https://github.com/Starlink/starjava/commit/289e0d63e2ff3db2114274eec20f74571b94c672 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotDisplay.java Log Message: ----------- ttools: allow data insets to be set on a PlotDisplay You can now fix the extent of the region between the data part of the plot and the component boundary for a PlotDisplay. Previously it only worked for exported icons. Commit: 8bf3245a07c693e412fdedeaa41058e2ef7a7111 https://github.com/Starlink/starjava/commit/8bf3245a07c693e412fdedeaa41058e2ef7a7111 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/example/ApiPlanePlotter.java M ttools/src/main/uk/ac/starlink/ttools/example/PlotGenerator.java Log Message: ----------- ttools: add data insets capability to example plot classes Commit: ed3f82d46663d329e5a63d7962f7f85cd2ebfd14 https://github.com/Starlink/starjava/commit/ed3f82d46663d329e5a63d7962f7f85cd2ebfd14 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M topcat/src/main/uk/ac/starlink/topcat/plot2/StackPlotWindow.java M ttools/src/main/uk/ac/starlink/ttools/plot2/paper/Compositor.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/CompositorParameter.java Log Message: ----------- ttools: replace plot2task boost parameter with compositor Replace the (floating point) alpha boost parameter in AbstractPlot2Task with a more general parameter with type Compositor. This usually works the same way, but allows you to use custom Compositor objects pluggably at runtime if required. Needed to make the BoostCompositor class public rather than just having a static factory method Compositor.createBoostCompositor. This allows other components (the stilts parameter system) to identify BoostCompositors as such and determine their boost values. Commit: 75abe74c1a257356966cb2d7848d9f3cf4adc858 https://github.com/Starlink/starjava/commit/75abe74c1a257356966cb2d7848d9f3cf4adc858 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/DataStoreParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plottask/PaintMode.java M ttools/src/main/uk/ac/starlink/ttools/task/AbstractInputTableParameter.java Log Message: ----------- ttools: first tranche of Plot2Task parameter documentation Add required documentation (prompt and description) for the parameters explicitly defined in the AbstractPlot2Task class. This does not cover those parameters constructed automitically from Coords or ConfigKeys. Commit: da2be5bc8487845e7d43adea5ca3a308f3b2e6e2 https://github.com/Starlink/starjava/commit/da2be5bc8487845e7d43adea5ca3a308f3b2e6e2 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/Formatter.java Log Message: ----------- ttools: add entity declaration options to Formatter Provide the option to declare some internal entities to the Formatter class for it to use while parsing XML it's going to format. I ended up not using this, but it might possibly come in useful at a later date, so leave it in. Commit: 7f9a8fdac19b3d609cd93cc88bec8b9e9dfac8cf https://github.com/Starlink/starjava/commit/7f9a8fdac19b3d609cd93cc88bec8b9e9dfac8cf Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/build/JyStilts.java M ttools/src/main/uk/ac/starlink/ttools/build/ModeDoc.java M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java M ttools/src/main/uk/ac/starlink/ttools/task/LineInvoker.java Log Message: ----------- ttools: parameter documentation now includes value class The auto-generated parameter documentation (in SUN/256 and on the console using the help parameter) now include information about what class the parameter represents. This is useful/necessary for programmatic use of the parameter system, since you may want to submit typed values to a MapEnvironment as an alternative to string values, so you need to know what type is permitted. However, this is a bit problematic, since for the first time the TTOOLS API is being exposed in the STILTS UI. Various issues with that, including the fact that the javadocs are not currently shipped as part of the STILTS package, which they really should be if some of the classes are relevant. In the long term, I'd like to split the plot2 classes out of STILTS altogether and expose only that API, but in the meantime, reference the javadocs published from my web page as a stopgap. I'm also not quite sure about the aesthetic presentation of the parameter types in the Usage sections of the auto-generated task documentation. Maybe revisit the details at some point. Commit: c816706b72e05a5fefc9f575010da91152c21cb0 https://github.com/Starlink/starjava/commit/c816706b72e05a5fefc9f575010da91152c21cb0 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java Log Message: ----------- ttools: add coordinate parameter metadata in Plot2Task The coordinate parameters from AbstractPlot2Task now have user-visible prompt and description strings based on the metadata of the corresponding Coord objects. Commit: 0ca0c1f489513d7d94d61ed60ea50b7b74ba5fa0 https://github.com/Starlink/starjava/commit/0ca0c1f489513d7d94d61ed60ea50b7b74ba5fa0 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java Log Message: ----------- ttools: partially address issues with swing plot2task animation Swing animation is not parallelised. This meant that for slow plots, most frames are never seen with swing animations from Plot2Tasks. Fix this by replacing SwingUtilities.invokeLater with invokeAndWait. However the real fix would be to parallelise the plotting. It wouldn't be too hard, but I'm not doing it now. Add comments to the source code to describe what would have to be done. Commit: 000b8fe0255f52f17dbd53be6e6c9a263650a178 https://github.com/Starlink/starjava/commit/000b8fe0255f52f17dbd53be6e6c9a263650a178 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/config/BooleanConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/ConfigMeta.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/DoubleConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/IntegerConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/OptionConfigKey.java Log Message: ----------- ttools: add more items to ConfigMeta More metadata items (shortDescription, xmlDescription and stringUsage) can now be added to ConfigMeta objects to describe a ConfigKey. Commit: 21ce957b1c49182e99c7c24c6844effdba0b9f29 https://github.com/Starlink/starjava/commit/21ce957b1c49182e99c7c24c6844effdba0b9f29 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ConfigParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java Log Message: ----------- ttools: use all available metadata in ConfigParameter ConfigParameter now acquires enough metadata from the ConfigMeta object of its ConfigKey to be a fully documented Parameter. ConfigParameters can now be used as STILTS task parameters for auto-generation of documentation, as long as the relevant ConfigMeta objects are properly populated. Commit: c07fee2fe4cc85837a72dd2070ec6b8559d96ed0 https://github.com/Starlink/starjava/commit/c07fee2fe4cc85837a72dd2070ec6b8559d96ed0 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/config/CaptionerKeySet.java A ttools/src/main/uk/ac/starlink/ttools/plot2/config/ChoiceConfigKey.java A ttools/src/main/uk/ac/starlink/ttools/plot2/config/ColorConfigKey.java A ttools/src/main/uk/ac/starlink/ttools/plot2/config/DashConfigKey.java A ttools/src/main/uk/ac/starlink/ttools/plot2/config/ShaderConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SubrangeConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlaneSurfaceFactory.java Log Message: ----------- ttools: add metadata for plane-related config keys Added full config key metadata for all the keys used in PlanePlotType. Add new task PlanePlot2Task. Commit: 38bc9f6dad4f476342457cd5a80aa92454bba6cb https://github.com/Starlink/starjava/commit/38bc9f6dad4f476342457cd5a80aa92454bba6cb Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: A ttools/src/main/uk/ac/starlink/ttools/plot2/config/SkySysConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/HemisphereProjection.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/Projection.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SinProjection.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyAxisLabeller.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyAxisLabellers.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkySurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkySys.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyviewProjection.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TickSkyAxisLabeller.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SkyPlot2Task.java Log Message: ----------- ttools: add metadata for sky-related config keys Added full config key metadata for all the keys used in SkyPlot2Type. Add new task SkyPlot2Task Commit: e8497c6e3859f99894603121e7951034c597ec48 https://github.com/Starlink/starjava/commit/e8497c6e3859f99894603121e7951034c597ec48 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubeNavigator.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubeSurfaceFactory.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/CubePlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/SpherePlot2Task.java Log Message: ----------- ttools: add metadata for cube/sphere-related config keys Added full config key metadata for all the keys used in CubePlotType and SpherePlotType. Add new tasks CubePlot2Task and SpherePlot2Task. Commit: 194f92028abaab66b79127d83e38433b91bb848e https://github.com/Starlink/starjava/commit/194f92028abaab66b79127d83e38433b91bb848e Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/config/TimeConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimeFormat.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimeNavigator.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimeSurfaceFactory.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/TimePlot2Task.java Log Message: ----------- ttools: add metadata for time-related config keys Added full config key metadata for all the keys used in TimePlotType. Add new task TimePlot2Task. Commit: d7ba2c6f91399a972851ebd878922b49a2796d79 https://github.com/Starlink/starjava/commit/d7ba2c6f91399a972851ebd878922b49a2796d79 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/Stilts.java M ttools/src/main/uk/ac/starlink/ttools/build/JyStilts.java M ttools/src/main/uk/ac/starlink/ttools/build/PurposeWriter.java M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java M ttools/src/testcases/uk/ac/starlink/ttools/FactoryTest.java M ttools/src/testcases/uk/ac/starlink/ttools/cea/CeaTest.java M ttools/src/testcases/uk/ac/starlink/ttools/task/ParameterTest.java Log Message: ----------- ttools: inform stilts of new plot2 tasks Add entries to the Stilts task factory for the new plot2 tasks. Note these may change name or sequence in the task list at some point in the future. Additionally make some logging tweaks to some of the build machinery, since with the inclusion of these new task the build process invokes some code which makes unwanted INFO-level reports through the logging system at build and test time. Commit: 500d797a5b2e56c2e6675f73455ea5759d0f7618 https://github.com/Starlink/starjava/commit/500d797a5b2e56c2e6675f73455ea5759d0f7618 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/data/SkyCoord.java Log Message: ----------- ttools: fix probably harmless error in SkyCoord It was returning the number of DomainMappers in some cases, but probably this was never noticed since no plots currently use domain mappers for sky coordinates. Commit: 8ed85b94012126ec2d7e996fc5b497556bfc7b9a https://github.com/Starlink/starjava/commit/8ed85b94012126ec2d7e996fc5b497556bfc7b9a Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M topcat/src/main/uk/ac/starlink/topcat/join/MatchPlotter.java M topcat/src/main/uk/ac/starlink/topcat/plot2/CoordPanel.java M topcat/src/main/uk/ac/starlink/topcat/plot2/GangControlManager.java M topcat/src/main/uk/ac/starlink/topcat/plot2/GuiCoordContent.java M topcat/src/main/uk/ac/starlink/topcat/plot2/LayerCommand.java M topcat/src/main/uk/ac/starlink/topcat/plot2/PositionCoordPanel.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/BooleanCoord.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/CachedDataStoreFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/Coord.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/FloatingArrayCoord.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/FloatingCoord.java A ttools/src/main/uk/ac/starlink/ttools/plot2/data/Input.java A ttools/src/main/uk/ac/starlink/ttools/plot2/data/InputMeta.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/SimpleDataStoreFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/SingleCoord.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/SkyCoord.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/StorageType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/StringCoord.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubeDataGeom.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubePlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlaneDataGeom.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlanePlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimeDataGeom.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/CartesianErrorCoordSet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/CartesianVectorCoordSet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/HistogramPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/LabelPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/PlaneEllipseCoordSet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeMode.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SizeForm.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SkyEllipseCoordSet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SkyVectorCoordSet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SpectrogramPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/CoordValue.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/JELDataSpec.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java Log Message: ----------- ttools: rework plot2 data coordinate metadata Replace the use of ValueInfos with a new class Input to describe the user-facing data coordinates used in the plot2 framework. Input has a related class InputMeta which contains all the user-directed metadata (various names and auto-documentation text items). This mirrors the use of the Config and ConfigMeta classes for scalar plot2 configuration items. This allows much richer and more plot2-appropriate metadata to be configured by the plotting components themeselves, so that console on-line help and auto-generated documentation can be more comprehensive. It also cleans up (a bit) the rather horrible and non-obvious distinction between Coord and UserCoord in the API. UserCoord is now gone, replaced by Input, which is less confusing. It also further decouples the plot2 framework from STIL (good), by removing use of ValueInfos from a lot of places, though they still feature in DataSpec. Commit: 3a51b22a04b89300546932d9f6ef57e293f67613 https://github.com/Starlink/starjava/commit/3a51b22a04b89300546932d9f6ef57e293f67613 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/PointCloud.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/CaptionerKeySet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SkySysConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkySurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimeSurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SkyPlot2Task.java Log Message: ----------- ttools: for(a:l) can iterate over arrays not just lists Take advantage of some syntactic sugar I had overlooked. Commit: dad1bcdea97de67fc21aca70c8d9b419ac309cc7 https://github.com/Starlink/starjava/commit/dad1bcdea97de67fc21aca70c8d9b419ac309cc7 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerType.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerTypeParameter.java R ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotterParameter.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/ShapeFamilyLayerType.java A ttools/src/main/uk/ac/starlink/ttools/plot2/task/SimpleLayerType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java Log Message: ----------- ttools: replace PlotterParameter with LayerTypeParameter The Plotter is not the right abstraction for the user interface, introduce a new class LayerType (a slight abstraction from Plotter) which is, and give it a dedicated parameter, rather than fudging the PlotterParameter as before. Probably the LayerType should be used all the way back to PlotType definitions, it would clean up code in topcat too. But not today. Commit: 48b58c985de38337dd480c3d1d547bccf42893ac https://github.com/Starlink/starjava/commit/48b58c985de38337dd480c3d1d547bccf42893ac Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M task/src/main/uk/ac/starlink/task/Parameter.java M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java M ttools/src/main/uk/ac/starlink/ttools/server/TaskServlet.java Log Message: ----------- task: add parameter comparator Commit: cfb3adb213d88a4511bb455f1e46cf45f42627c2 https://github.com/Starlink/starjava/commit/cfb3adb213d88a4511bb455f1e46cf45f42627c2 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerTypeParameter.java Log Message: ----------- ttools: minor changes to task/param classes for reuse Commit: ee5c9060f8f2fafd6fe37be401aeb96b4db056e5 https://github.com/Starlink/starjava/commit/ee5c9060f8f2fafd6fe37be401aeb96b4db056e5 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/config/OptionConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/ShaderConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SkySysConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SubrangeConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubeSurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlaneSurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkySurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimeSurfaceFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/BinSizer.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ContourPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/FunctionPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/HistogramPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/LabelPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SizeForm.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ShapeFamilyLayerType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SkyPlot2Task.java Log Message: ----------- ttools: add full documentation for config options Add documentation metadata for all(?) the config keys. These can now be used to generate per-parameter XML text for insertion into the user document. Commit: 80ec5acfe032d17b70c056a8917c6ea20c47c21a https://github.com/Starlink/starjava/commit/80ec5acfe032d17b70c056a8917c6ea20c47c21a Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: A ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java Log Message: ----------- ttools: auto-documentation for LayerTypes LayerTypeDoc class can write per-LayerType parameter usages as XML to standard output. This can be used to generate text for the relevant parts of SUN/256. Commit: bef21d588c4fb5e539f591fe4fec0aa73780e7c6 https://github.com/Starlink/starjava/commit/bef21d588c4fb5e539f591fe4fec0aa73780e7c6 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java A ttools/src/main/uk/ac/starlink/ttools/build/ShapeModeDoc.java Log Message: ----------- ttools: auto-documentation for ShapeModes ShapeModeDoc class can write per-ShapeMode sections for the XML user document. Commit: b0363eed52cdabcce6fcfe77322387c75599d95e https://github.com/Starlink/starjava/commit/b0363eed52cdabcce6fcfe77322387c75599d95e Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/build.xml M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerTypeParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ShapeFamilyLayerType.java Log Message: ----------- ttools: add plot2 section to sun256 There is a new section on new-style plotting. It doesn't have much text content yet, but it does have subsections for LayerType and ShapeMode options, with content auto-generated from the parameter system, and with document cross-references in place as appropriate. Commit: f51c45d41e304150acc5d91f341c359536b1961c https://github.com/Starlink/starjava/commit/f51c45d41e304150acc5d91f341c359536b1961c Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/ConfigMeta.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/TimeConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/data/InputMeta.java Log Message: ----------- ttools: move concatLines method from ConfigMeta to PlotUtil Commit: bff0a5b3e920c9b44ce561e0f5dc910de9349cdf https://github.com/Starlink/starjava/commit/bff0a5b3e920c9b44ce561e0f5dc910de9349cdf Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/ShapeModeDoc.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeMode.java Log Message: ----------- ttools: add XML documentation strings for ShapeModes Commit: 6dcbac7f62d78241e50ba795214b5507079197cf https://github.com/Starlink/starjava/commit/6dcbac7f62d78241e50ba795214b5507079197cf Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimePlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/MarkForm.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/MultiPointForm.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/PairLinkForm.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeForm.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SizeForm.java Log Message: ----------- ttools: add XML documentation strings for ShapeForms Commit: 8840ecd3844068a547588d1f880bc15275126e23 https://github.com/Starlink/starjava/commit/8840ecd3844068a547588d1f880bc15275126e23 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java M ttools/src/main/uk/ac/starlink/ttools/plot2/Plotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ContourPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/FunctionPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/HistogramPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/LabelPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/LinePlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeMode.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapePlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SpectrogramPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SpotPlotter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ShapeFamilyLayerType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SimpleLayerType.java Log Message: ----------- ttools: add XML description strings for LayerTypes As currently implemented this requires a getPlotterDescription method added to Plotter. Really, that's the wrong level for this to go at, the description should just be attached to the LayerType. For now, LayerType only exists in the task invocation layer, but I should at some point put it directly into the plot layer definitions, and then the documentation can be done a bit more elegantly. Commit: bd17d64f9b2789dc40ee964624b10ca494646f75 https://github.com/Starlink/starjava/commit/bd17d64f9b2789dc40ee964624b10ca494646f75 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SpectrogramPlotter.java Log Message: ----------- ttools: add plot2 task entries to SUN/256 Commit: c8a2a40104c4b1ea8adfeb559d2a63485cac7b02 https://github.com/Starlink/starjava/commit/c8a2a40104c4b1ea8adfeb559d2a63485cac7b02 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/build.xml M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java A ttools/src/main/uk/ac/starlink/ttools/build/LayersWriter.java M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java Log Message: ----------- ttools: add per-plot2task description of available layers Commit: c5639315e088851396c462e39a4f00323ce7afc2 https://github.com/Starlink/starjava/commit/c5639315e088851396c462e39a4f00323ce7afc2 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubePlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlanePlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyPlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/TimePlotType.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/MultiPointForm.java Log Message: ----------- ttools: namespace multi-point layer types Rename similar-sounding but different layer types, e.g. the Plane and Sky variants of ellipse both used to be called "Ellipse", but now they are "XYEllipse" and "SkyEllipse". This means that they can have separately named, and separate sections in the user document without needing complicated schemes to distinguish them. Commit: 60fd316df30a355bc3beab7255ddc885ab55e4a6 https://github.com/Starlink/starjava/commit/60fd316df30a355bc3beab7255ddc885ab55e4a6 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/SkyPlotType.java Log Message: ----------- ttools: remove alternative DataGeoms from SkyPlotType SkyPlotType used to have some alternative DataGeoms, equatorial-galactic and galactic-equatorial for transforming from data to view sky systems. Since that transformation is now handled by the viewsys and datasys parameters in SkyPlot2Task, those are not necessary or useful. SkyPlotType was the only one of the PlotTypes to use this facility for multiple DataGeoms which is otherwise fiddly and in some places nasty. So I could remove it. However, it might be desirable to make use of it at some point, for instance to allow polar coordinates in the Plane Plot, so don't do anything drastic for now. Commit: d1e7b30ba434348243e0c4442f237637c2aecca8 https://github.com/Starlink/starjava/commit/d1e7b30ba434348243e0c4442f237637c2aecca8 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java M ttools/src/main/uk/ac/starlink/ttools/build/ShapeModeDoc.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/ShaderConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SkyVectorCoordSet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ConfigParameter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerTypeParameter.java Log Message: ----------- ttools: improve some details of plot2 param auto-documentation Commit: 1096f142da1dae6e9e4b98b10c00c1756774515e https://github.com/Starlink/starjava/commit/1096f142da1dae6e9e4b98b10c00c1756774515e Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: A ttools/src/main/uk/ac/starlink/ttools/task/DynamicTask.java M ttools/src/main/uk/ac/starlink/ttools/task/LineInvoker.java Log Message: ----------- ttools: allow environment-sensitive parameter reporting New interface DynamicTask introduced for tasks with parameter lists that are sensitive to the environment. This allows the help system to be more helpful at runtime. Commit: 2ce410b907ceb313f2b67c13fe57d9868a8b20c9 https://github.com/Starlink/starjava/commit/2ce410b907ceb313f2b67c13fe57d9868a8b20c9 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ParameterFinder.java Log Message: ----------- ttools: implement DynamicTask for plot2 tasks Now: plot2task layerN=xx help=yyN reports something useful when yy is a parameter associated with layer type xx. It works for help=yy as well. Commit: 624b12876077b7982cc73e599f28a57a1f42a632 https://github.com/Starlink/starjava/commit/624b12876077b7982cc73e599f28a57a1f42a632 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java A ttools/src/main/uk/ac/starlink/ttools/task/DoubleArrayParameter.java Log Message: ----------- ttools: add legend display options to plot2 tasks Configurable legend display is now avaiable. Commit: a6974998738546ccefb5b8c2039489aaf022f996 https://github.com/Starlink/starjava/commit/a6974998738546ccefb5b8c2039489aaf022f996 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ParameterFinder.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SkyPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/task/DynamicTask.java M ttools/src/main/uk/ac/starlink/ttools/task/LineInvoker.java Log Message: ----------- ttools: extend DynamicTask to provide dynamic usage message The -help flag on a DynamicTask (currently AbstractPlot2Tasks) now examines the Environment and writes usage information for any layers that have been set up. Commit: fcfa655d4fcbccd912ba175f6bda0e8d88474812 https://github.com/Starlink/starjava/commit/fcfa655d4fcbccd912ba175f6bda0e8d88474812 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java Log Message: ----------- ttools: return PlotDisplay not just JComponent from plot2task Commit: 721da0e6a1d8d7700b0d3da1b1ad5d6e1971d752 https://github.com/Starlink/starjava/commit/721da0e6a1d8d7700b0d3da1b1ad5d6e1971d752 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotDisplay.java Log Message: ----------- ttools: add PlotDisplay.ASPECT_PROPERTY You can track plot display aspect changes with a PropertyChangeListener. Commit: c86daa06b1b5ec9d9e4813955c2c9dca575c5f65 https://github.com/Starlink/starjava/commit/c86daa06b1b5ec9d9e4813955c2c9dca575c5f65 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/CubeDataGeom.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/CubePlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/GenericPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlanePlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SkyPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/SpherePlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TimePlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java Log Message: ----------- ttools: default plot2 axis labels to data values Fix it so that the labels on plot axes default to the string value of the parameters used to specify the data for one (preferably the first) of the plotted layers. Some plumbing and refactoring required to get the relevant information to the right place. Commit: afb5b05ecdd167dece32bbea670f0337d47982b5 https://github.com/Starlink/starjava/commit/afb5b05ecdd167dece32bbea670f0337d47982b5 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java Log Message: ----------- ttools: avoid NullPointerException for spectrogram Fix some code so that the DataGeom is not dereferenced if it's null. This seems harmless enough, but I'm not 100% sure why it is null, so I may need to revisit this. Commit: 2053e39ba4a5be2c57703bc0a487a420efd8113f https://github.com/Starlink/starjava/commit/2053e39ba4a5be2c57703bc0a487a420efd8113f Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotDisplay.java Log Message: ----------- ttools: fix PlotDisplay graphics positioning Change the component offsets for drawing the graphics in PlotDisplay.paintComponent. I don't really understand exactly where in the Swing API the component location is applied, but by trial and error doing it like this works, and doing it like it was done before painted the graphics in the wrong place if getLocation() was not (0,0). Commit: 3f0deef1f1169909728cc40b88454ad23aebd457 https://github.com/Starlink/starjava/commit/3f0deef1f1169909728cc40b88454ad23aebd457 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlaneSurfaceFactory.java Log Message: ----------- ttools: patch up some configMeta case folding Commit: 579874ab6ca1a17eaa4fc3ef5269b54580096a9d https://github.com/Starlink/starjava/commit/579874ab6ca1a17eaa4fc3ef5269b54580096a9d Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M topcat/src/main/uk/ac/starlink/topcat/plot2/PlotPanel.java M topcat/src/main/uk/ac/starlink/topcat/plot2/ShaderControl.java M ttools/src/main/uk/ac/starlink/ttools/example/ApiPlanePlotter.java M ttools/src/main/uk/ac/starlink/ttools/example/PlotGenerator.java A ttools/src/main/uk/ac/starlink/ttools/plot2/ShadeAxisFactory.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/PlotDisplay.java Log Message: ----------- ttools: use ShadeAxisFactory not ShadeAxis in plot2 tasks Reword the Plot2Task framework to pass around ShadeAxisFactories (like topcat does) rather than ShadeAxis objects. You generally don't have the ShadeAxis until later (when you're doing passes through the data). Commit: 7984211de580c31a7e998d93d51124361a1cf19a https://github.com/Starlink/starjava/commit/7984211de580c31a7e998d93d51124361a1cf19a Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/config/CaptionerKeySet.java Log Message: ----------- ttools: rename config key syntax->texttype Commit: fdc303b13c74fa6b08d8d2b2d780cb363cc49caa https://github.com/Starlink/starjava/commit/fdc303b13c74fa6b08d8d2b2d780cb363cc49caa Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M topcat/src/main/uk/ac/starlink/topcat/plot2/PlotPanel.java M topcat/src/main/uk/ac/starlink/topcat/plot2/ShaderControl.java A ttools/src/main/uk/ac/starlink/ttools/plot2/config/RampKeySet.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeMode.java M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SpectrogramPlotter.java Log Message: ----------- ttools: gather together colour ramp config keys Define a new KeySet RampKeySet to aggregate config keys for colour ramps. This both tidies the code in some places, and makes it clearer what ramps are used for what - the spectrogram is now no longer re-using the same keys as the Aux shaders. Commit: 88878a91dc0d82dc075dbfc72ececceab525ada7 https://github.com/Starlink/starjava/commit/88878a91dc0d82dc075dbfc72ececceab525ada7 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeMode.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/TypedPlot2Task.java Log Message: ----------- ttools: plot2 tasks now include aux axis colour ramp The AbstractPlot2Task interrogates the environment for global aux axis config options and paints an Aux axis appropriately. This is a bit messy - the aux config options are global as far as the plot task goes, but per-layer for the plotters. I've hacked around this for now by getting the AuxShader to report its config options without using the global ones, but it means that client code has to take special steps to put those in. Maybe revisit the API or implementation at some stage. Commit: c7b2345b4b30cc102335514022fe2ef62616d038 https://github.com/Starlink/starjava/commit/c7b2345b4b30cc102335514022fe2ef62616d038 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M topcat/src/main/uk/ac/starlink/topcat/plot2/LegendControl.java M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotPlacement.java Log Message: ----------- ttools: reverse the polarity of legpos[1] Invert the sense of the Y component of legend position so that positive is up the page (like plot coordinates) not down the page (like swing graphics coordinates). It didn't used to matter when the values were just used internally, but now it's exposed as the legpos parameter we don't want to make users have to specify legend Y positions the way they're not expecting. Commit: 5b44be0526618d4b8250cb12dfd136aab7acc6ba https://github.com/Starlink/starjava/commit/5b44be0526618d4b8250cb12dfd136aab7acc6ba Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/LayerTypeParameter.java M ttools/src/main/uk/ac/starlink/ttools/task/ConsumerTask.java M ttools/src/main/uk/ac/starlink/ttools/task/FilterParameter.java M ttools/src/main/uk/ac/starlink/ttools/task/FixedTablesInput.java M ttools/src/main/uk/ac/starlink/ttools/task/HomogeneousTablesInput.java M ttools/src/main/uk/ac/starlink/ttools/task/PixSample.java M ttools/src/main/uk/ac/starlink/ttools/task/SingleMapperTask.java M ttools/src/main/uk/ac/starlink/ttools/task/VariableTablesInput.java Log Message: ----------- ttools: improve FilterParameter metadata setup Add a setTableDescription method to FilterParameter so that you can adjust the parameter metadata in a principled way rather than having to hack the description text about by hand. Commit: 686d991e40621b89e0949650d8a0572d7ccca65c https://github.com/Starlink/starjava/commit/686d991e40621b89e0949650d8a0572d7ccca65c Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/LayerTypeDoc.java M ttools/src/main/uk/ac/starlink/ttools/plot2/config/MultiPointConfigKey.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java M ttools/src/main/uk/ac/starlink/ttools/plot2/task/ShapeFamilyLayerType.java Log Message: ----------- ttools: various improvements to plot2task self-documentation Simplify layer auto-documentation, make it more comprehensible. Rename layer filter commands from cmdN to icmdN, to make it more obvious what those commands are doing there. Add Extra docs to ShapeMode parameter. Various other things. Commit: eb9ad289cec15b93ba21d71bd486811b98b8959d https://github.com/Starlink/starjava/commit/eb9ad289cec15b93ba21d71bd486811b98b8959d Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml Log Message: ----------- ttools: whitespace Commit: c0b041c6a17ea42529812368e36d8dc7621b820f https://github.com/Starlink/starjava/commit/c0b041c6a17ea42529812368e36d8dc7621b820f Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/build.xml M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java M ttools/src/main/uk/ac/starlink/ttools/task/TableHistogram.java M ttools/src/main/uk/ac/starlink/ttools/task/TablePlot2D.java M ttools/src/main/uk/ac/starlink/ttools/task/TablePlot3D.java Log Message: ----------- ttools: prepare for STILTS release 3.0 Change version number & doc date, note new plot commands and deprecate old ones, tidy up change log. Commit: c4d849ba9cbcb71b88b447701fbd6127a60e93db https://github.com/Starlink/starjava/commit/c4d849ba9cbcb71b88b447701fbd6127a60e93db Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/task/LineInvoker.java Log Message: ----------- ttools: add -allowunused flag to stilts command Commit: 76ef30e3361b5ccac1a49d2d5a65f24af86a1503 https://github.com/Starlink/starjava/commit/76ef30e3361b5ccac1a49d2d5a65f24af86a1503 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml M ttools/src/main/uk/ac/starlink/ttools/plottask/PaintMode.java Log Message: ----------- ttools: start to write plot2 section text Add content to plot2 part of user document. This includes moving some parts out of the old plotting section. This is now reasonably complete, though it needs to be supplemented with examples sections for the actual plot commands in the reference section. Commit: 6b0c7baa12bfe1cefb88023b0ec51bd3ec5f6a2f https://github.com/Starlink/starjava/commit/6b0c7baa12bfe1cefb88023b0ec51bd3ec5f6a2f Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/example/EnvPlanePlotter.java Log Message: ----------- ttools: update EnvPlanePlotter example for plot2 task changes Commit: 3957c8fc51aa616f85ae590a5eb57a5a9d383c9a https://github.com/Starlink/starjava/commit/3957c8fc51aa616f85ae590a5eb57a5a9d383c9a Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml Log Message: ----------- ttools: add new Programmatic Invocation section to user doc Commit: a8e9a00bf4a31455af0ffc3d368b207d8898e504 https://github.com/Starlink/starjava/commit/a8e9a00bf4a31455af0ffc3d368b207d8898e504 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java Log Message: ----------- ttools: fix legend to identify related layers When generating entries for the plot legend, layers representing the same positional datasets are now grouped together into a single legend entry. Commit: 38f4bf5f31abb6c4bf497e4543add6fbeba7794b https://github.com/Starlink/starjava/commit/38f4bf5f31abb6c4bf497e4543add6fbeba7794b Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml Log Message: ----------- ttools: add examples sections for plot2 commands Commit: bba732d8fa42b2b789e08ec20d16e91246dbc095 https://github.com/Starlink/starjava/commit/bba732d8fa42b2b789e08ec20d16e91246dbc095 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/docs/sun256.xml Log Message: ----------- ttools: doc adjustments Commit: 126ca4709d2f5f3cfb0346e431949bc427e9f827 https://github.com/Starlink/starjava/commit/126ca4709d2f5f3cfb0346e431949bc427e9f827 Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M ttools/src/main/uk/ac/starlink/ttools/build/UsageWriter.java Log Message: ----------- ttools: don't reference javadocs for private classes Parameter usage messages have hrefs to javadocs for parameter value types. If those classes are private, the links are broken (not to mention useless). Just write them as plain text (also useless, but less misleading, and doesn't give build errors). Commit: 8c80c663c4fbdc849567fdeaa368927a86e329ed https://github.com/Starlink/starjava/commit/8c80c663c4fbdc849567fdeaa368927a86e329ed Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M xdoc/src/etc/toHTML1.xslt Log Message: ----------- xdoc: generate correct links to javadocs for inner classes Commit: fe7266f5ae8ca2d1ac00f7393eba6306b682472e https://github.com/Starlink/starjava/commit/fe7266f5ae8ca2d1ac00f7393eba6306b682472e Author: Mark Taylor <[log in to unmask]> Date: 2014-10-03 (Fri, 03 Oct 2014) Changed paths: M table/src/resources/uk/ac/starlink/table/stil.version M ttools/build.xml Log Message: ----------- ttools: bump STIL and STILTS version numbers for release STIL to 3.0-7, STILTS to 3.0 Compare: https://github.com/Starlink/starjava/compare/b1cf5a58ff07...fe7266f5ae8c