Branch: refs/heads/master
Home: https://github.com/Starlink/starjava
Commit: 8bbdcc315cc40dcd72716b402c0f0632914e0700
https://github.com/Starlink/starjava/commit/8bbdcc315cc40dcd72716b402c0f0632914e0700
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java
A ttools/src/main/uk/ac/starlink/ttools/plot2/config/ScalingConfigKey.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/CountScaler.java
A ttools/src/main/uk/ac/starlink/ttools/plot2/layer/Scaler.java
A ttools/src/main/uk/ac/starlink/ttools/plot2/layer/Scaling.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/ShapeMode.java
A ttools/src/testcases/uk/ac/starlink/ttools/plot2/layer/ScalingTest.java
Log Message:
-----------
ttools: provide flexible density scaling functions
Rework the code which scales density values when generating
pixel colours in Density and Auto plotting ShapeModes.
This was initially to fix a problem in the scaling,
which was just not quite done right: at low densities,
two points plotted over each other were nearly the
same colour, but three points mapped to significantly further into
the density colour map. But while I was there I generalised the
colour mapping mechanism to allow different mapping functions;
for now add sqrt and square alongside log and linear. The UI
changes correspondingly. Also made it more efficient by caching
relatively low-density values (in new class CountScaler, which is
quite different from old class CountScaler).
Commit: d2fa732aecadc5cb9850427bb9f944c17bdce844
https://github.com/Starlink/starjava/commit/d2fa732aecadc5cb9850427bb9f944c17bdce844
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/RampKeySet.java
R ttools/src/main/uk/ac/starlink/ttools/plot2/config/ScalingConfigKey.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java
R ttools/src/main/uk/ac/starlink/ttools/plot2/layer/RangeScaler.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/Scaling.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: ramp flip is now a property of Shader not Scaling
Logically it makes more sense for the flip to apply to the shader.
Group config keys appropriately.
Commit: 6a0fa29ea68385bef4b440fb808a1d95608d3fb4
https://github.com/Starlink/starjava/commit/6a0fa29ea68385bef4b440fb808a1d95608d3fb4
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
A ttools/src/main/uk/ac/starlink/ttools/plot2/Scaler.java
A ttools/src/main/uk/ac/starlink/ttools/plot2/Scaling.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/CountScaler.java
R ttools/src/main/uk/ac/starlink/ttools/plot2/layer/Scaler.java
R ttools/src/main/uk/ac/starlink/ttools/plot2/layer/Scaling.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
A ttools/src/testcases/uk/ac/starlink/ttools/plot2/ScalingTest.java
R ttools/src/testcases/uk/ac/starlink/ttools/plot2/layer/ScalingTest.java
Log Message:
-----------
ttools: move classes Scaling, Scaler from plot2.layer -> plot2
Commit: 7d20ace5bd25a6ebf1c53021806a04c5e7b938e6
https://github.com/Starlink/starjava/commit/7d20ace5bd25a6ebf1c53021806a04c5e7b938e6
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M topcat/src/main/uk/ac/starlink/topcat/plot2/ShaderControl.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/Scaling.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/ShadeAxis.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/RampKeySet.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: aux axis now has configurable scaling
You can now select the scaling function for the aux axis
by supplying a Scaling value rather than just toggling between
linear and logarithmic. Same applies to Spectrogram Plotter.
Scalings have to report whether they are "log-like" or not,
so that clients can know how to label the colour ramp
(what ticks to draw and where to draw them).
Commit: 68bf37bd948502ad70fc9b8f9b077f87c28d8725
https://github.com/Starlink/starjava/commit/68bf37bd948502ad70fc9b8f9b077f87c28d8725
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/ColorConfigKey.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/RampKeySet.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/StyleKeys.java
Log Message:
-----------
ttools: adjust colour config key labelling
Commit: 0c0783cd310c7bcdebd2c059bcb4f66f8efbe47d
https://github.com/Starlink/starjava/commit/0c0783cd310c7bcdebd2c059bcb4f66f8efbe47d
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M 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
Log Message:
-----------
ttools: minor changes to shader key metadata
Commit: 97ad679bfb691df7eec25e0ba79700cf3381e812
https://github.com/Starlink/starjava/commit/97ad679bfb691df7eec25e0ba79700cf3381e812
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M topcat/src/main/uk/ac/starlink/topcat/plot2/ShaderControl.java
M 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
M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java
Log Message:
-----------
ttools: rationalise and refactor RampKeySet
Make RampKeySet more flexible, and use it for the density shading
in ShapeMode as well as for Aux and Spectro shading.
This eliminates some special case/duplicated code in density shading,
and makes it easier to add extra shader functionality in a consistent
way for different functions.
RampKeySet.Ramp interface now just aggregates a Shader and a Scaling,
which is all it was really doing before.
Commit: 9f61949ff473b6402961318191743ffb55c6c18c
https://github.com/Starlink/starjava/commit/9f61949ff473b6402961318191743ffb55c6c18c
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M topcat/src/docs/figures/ShaderControl_map.gif
M topcat/src/docs/figures/SpectrogramLayerControl_style.gif
M topcat/src/docs/figures/mode_density.gif
M topcat/src/docs/sun253.xml
M ttools/src/docs/sun256.xml
Log Message:
-----------
topcat: document new aux/density Scaling function option
Add screenshots and change log notes in the topcat and stilts user
documents about the new capabilities for applying scaling functions
to Aux axis and Density shading mode colour maps, and
spectrogram layer.
Commit: b197a610025e72d43bccf1a201b53b7b811241d4
https://github.com/Starlink/starjava/commit/b197a610025e72d43bccf1a201b53b7b811241d4
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M ttools/src/docs/sun256.xml
M ttools/src/main/uk/ac/starlink/ttools/plot2/task/AbstractPlot2Task.java
Log Message:
-----------
ttools: document existing auxmin and auxmax plot2 params
These parameters were present and working but undocumented in
AbstractPlot2Task and subclasses.
Commit: 53ad6d9f44e684ba0c92392b7de63166e9ff1a17
https://github.com/Starlink/starjava/commit/53ad6d9f44e684ba0c92392b7de63166e9ff1a17
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-28 (Wed, 28 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SliderSpecifier.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/BinSizer.java
Log Message:
-----------
ttools: add flip option to SliderSpecifier
Commit: a411e955951a7ee4120fd7852744707321fec285
https://github.com/Starlink/starjava/commit/a411e955951a7ee4120fd7852744707321fec285
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M topcat/src/docs/figures/ShaderControl_map.gif
M topcat/src/docs/figures/SpectrogramLayerControl_style.gif
M topcat/src/docs/figures/mode_density.gif
M topcat/src/docs/sun253.xml
M ttools/src/docs/sun256.xml
M ttools/src/main/uk/ac/starlink/ttools/plot/Shaders.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/RampKeySet.java
Log Message:
-----------
ttools: add colour map quantisation option
Commit: 129af6779768bdd59c61b654f563fae55274c88c
https://github.com/Starlink/starjava/commit/129af6779768bdd59c61b654f563fae55274c88c
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/gui/ResourceIcon.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/RampKeySet.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SliderSpecifier.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/BinSizer.java
A ttools/src/resources/uk/ac/starlink/ttools/gui/ozero.png
Log Message:
-----------
ttools: add reset button to slider controls
All SliderSpecifiers now have an associated button that resets them
to their default values. Not documented. The button is a bit ugly.
Commit: 8888877259fc998f68b4c8de49e0f5e98b6005f9
https://github.com/Starlink/starjava/commit/8888877259fc998f68b4c8de49e0f5e98b6005f9
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M topcat/src/docs/figures/ConfigControl_histobars.gif
M topcat/src/docs/figures/CubeAxisControl_grid.gif
M topcat/src/docs/figures/CubeAxisControl_navigation.gif
M topcat/src/docs/figures/CubeAxisControl_view.gif
M topcat/src/docs/figures/HistogramLayerControl_form.gif
M topcat/src/docs/figures/HistogramPlotWindow.gif
M topcat/src/docs/figures/PlaneAxisControl_grid.gif
M topcat/src/docs/figures/PlaneAxisControl_navigation.gif
M topcat/src/docs/figures/PlanePlotWindow.gif
M topcat/src/docs/figures/ShaderControl_map.gif
M topcat/src/docs/figures/ShaderControl_ramp.gif
M topcat/src/docs/figures/SkyAxisControl_grid.gif
M topcat/src/docs/figures/SkyAxisControl_navigation.gif
M topcat/src/docs/figures/SpectrogramLayerControl_style.gif
M topcat/src/docs/figures/SphereAxisControl_grid.gif
M topcat/src/docs/figures/SphereAxisControl_navigation.gif
M topcat/src/docs/figures/SphereAxisControl_view.gif
M topcat/src/docs/figures/TimeAxisControl_grid.gif
M topcat/src/docs/figures/TimeAxisControl_navigation.gif
M topcat/src/docs/figures/form_contour.gif
M topcat/src/docs/figures/form_ellipse.gif
M topcat/src/docs/figures/form_label.gif
M topcat/src/docs/figures/form_size.gif
M topcat/src/docs/figures/form_sizexy.gif
M topcat/src/docs/figures/form_vector.gif
M topcat/src/docs/figures/mode_aux.gif
M topcat/src/docs/figures/mode_density.gif
M topcat/src/docs/figures/mode_translucent.gif
M topcat/src/docs/figures/mode_transparent.gif
M topcat/src/docs/sun253.xml
Log Message:
-----------
topcat: document new reset button for sliders
Lots of screenshots needed updating.
Commit: 5f722a9c5b701589fb204a00dc798037589d82bd
https://github.com/Starlink/starjava/commit/5f722a9c5b701589fb204a00dc798037589d82bd
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/config/SliderSpecifier.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/geom/PlaneSurface.java
Log Message:
-----------
ttools: report SliderSpecifier value without spurious precision
Commit: 17b3d8280788a0db7ef9cd3471ab8e6c44dbc261
https://github.com/Starlink/starjava/commit/17b3d8280788a0db7ef9cd3471ab8e6c44dbc261
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M topcat/src/docs/sun253.xml
M topcat/src/main/uk/ac/starlink/topcat/plot2/ConfigSpecifier.java
M topcat/src/main/uk/ac/starlink/topcat/plot2/CoordPanel.java
Log Message:
-----------
topcat: add stilts-friendly tooltips to plot2 config labels
The JLabels attached to configuration specifiers and coordinate
selectors used in the plot2 windows now sport tooltips of
the form name=value, which can be used directly in the corresponding
STILTS plotting command.
The tooltips used to be on the the config (but not coord) specifiers
themselves, but this didn't work very well because in some cases
(specifiers composed of more than one component) they weren't
visible, so this has been withdrawn.
Commit: 232f9e35cba76e0e20a1820086bf343b17da40a8
https://github.com/Starlink/starjava/commit/232f9e35cba76e0e20a1820086bf343b17da40a8
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-29 (Thu, 29 Jan 2015)
Changed paths:
M topcat/src/main/uk/ac/starlink/topcat/plot2/ConfigSpecifier.java
M topcat/src/main/uk/ac/starlink/topcat/plot2/CoordPanel.java
A topcat/src/main/uk/ac/starlink/topcat/plot2/InstantTipper.java
Log Message:
-----------
topcat: make plot2 config tooltips instant and persistent
Configure the stilts-friendly plot2 tooltips on config and coord
labels so that they pop up instantly and stay as long as the mouse
is on them, rather than delaying before they are seen and then
disappearing after a while.
I think this is a good idea, especially so that people notice this
information is available from the labels. However, it might prove
to be annoying, in which case it could be harmlessly withdrawn
in future.
Commit: d8b835ab33228455b724bbde64022f1f8fea07df
https://github.com/Starlink/starjava/commit/d8b835ab33228455b724bbde64022f1f8fea07df
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-30 (Fri, 30 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/XYShapes.java
Log Message:
-----------
ttools: fix some bugs in XYShapes
Filled/Open logic was reversed for ellipse shape.
Also rectangles (BlockShape) were being clipped wrongly.
Commit: 5d9b960e9150868672c7fe8551eb5ebfbffc9599
https://github.com/Starlink/starjava/commit/5d9b960e9150868672c7fe8551eb5ebfbffc9599
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-30 (Fri, 30 Jan 2015)
Changed paths:
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SizeXyForm.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/XYShapes.java
Log Message:
-----------
ttools: change caching behaviour for SizeXY form
Remove an extra level of caching, it's probably trying to be
too clever. Leave the code in place, but switched off by default.
Also fix one important efficiency mistake: I was using createGlyph
where I should have used getGlyph (thereby avoiding some upstream
caching that really does help).
Commit: 985a8ba462c1de3c5c14a283694c9222ab834db4
https://github.com/Starlink/starjava/commit/985a8ba462c1de3c5c14a283694c9222ab834db4
Author: Mark Taylor <[log in to unmask]>
Date: 2015-01-30 (Fri, 30 Jan 2015)
Changed paths:
M topcat/src/docs/sun253.xml
M ttools/src/main/uk/ac/starlink/ttools/plot2/PlotUtil.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/MarkForm.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SizeForm.java
M ttools/src/main/uk/ac/starlink/ttools/plot2/layer/SizeXyForm.java
Log Message:
-----------
ttools: limit maximum size of Shape/ShapeXY markers
Impose a fixed limit on the maximum size of sized markers
(currently 100 pixels), since very large ones can cause resource
trouble (memory and CPU), and with the rescale slider in topcat
it's easy to accidentally make them bigger than you want.
Compare: https://github.com/Starlink/starjava/compare/234d2fd22381...985a8ba462c1
|
