[Git][debian-gis-team/gpsprune][bullseye-backports] 6 commits: New upstream version 21.3
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Fri May 20 05:43:01 BST 2022
Bas Couwenberg pushed to branch bullseye-backports at Debian GIS Project / gpsprune
Commits:
019d7cac by Bas Couwenberg at 2022-05-15T07:16:08+02:00
New upstream version 21.3
- - - - -
ce656140 by Bas Couwenberg at 2022-05-15T07:16:10+02:00
Update upstream source from tag 'upstream/21.3'
Update to upstream version '21.3'
with Debian dir 164820a3ddd0c89fc704de5d3b7ae3a8ea864770
- - - - -
877f50a6 by Bas Couwenberg at 2022-05-15T07:16:22+02:00
New upstream release.
- - - - -
9f019da4 by Bas Couwenberg at 2022-05-15T07:16:59+02:00
Set distribution to unstable.
- - - - -
8e13c908 by Bas Couwenberg at 2022-05-20T06:29:34+02:00
Merge tag 'debian/21.3-1' into bullseye-backports
releasing package gpsprune version 21.3-1
- - - - -
0f0bd108 by Bas Couwenberg at 2022-05-20T06:29:41+02:00
Rebuild for bullseye-backports.
- - - - -
10 changed files:
- build.sh
- debian/changelog
- tim/prune/GpsPrune.java
- tim/prune/function/PasteCoordinateList.java
- tim/prune/function/edit/PointEditor.java
- tim/prune/gui/map/MapCanvas.java
- tim/prune/gui/map/MapPosition.java
- tim/prune/gui/map/ScaleBar.java
- tim/prune/lang/prune-texts_fr.properties
- tim/prune/readme.txt
Changes:
=====================================
build.sh
=====================================
@@ -1,6 +1,6 @@
# Build script
# Version number
-PRUNENAME=gpsprune_21.2
+PRUNENAME=gpsprune_21.3
# remove compile directory
rm -rf compile
# remove dist directory
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+gpsprune (21.3-1~bpo11+1) bullseye-backports; urgency=medium
+
+ * Rebuild for bullseye-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Fri, 20 May 2022 06:29:39 +0200
+
+gpsprune (21.3-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sun, 15 May 2022 07:16:50 +0200
+
gpsprune (21.2-1~bpo11+1) bullseye-backports; urgency=medium
* Rebuild for bullseye-backports.
=====================================
tim/prune/GpsPrune.java
=====================================
@@ -38,9 +38,9 @@ import tim.prune.gui.profile.ProfileChart;
public class GpsPrune
{
/** Version number of application, used in about screen and for version check */
- public static final String VERSION_NUMBER = "21.2";
+ public static final String VERSION_NUMBER = "21.3";
/** Build number, just used for about screen */
- public static final String BUILD_NUMBER = "395";
+ public static final String BUILD_NUMBER = "396";
/** Static reference to App object */
private static App APP = null;
@@ -58,7 +58,7 @@ public class GpsPrune
String localeCode = null;
String langFilename = null;
String configFilename = null;
- ArrayList<File> dataFiles = new ArrayList<File>();
+ ArrayList<File> dataFiles = new ArrayList<>();
boolean showUsage = false;
// Mac OSX - specific properties (Mac insists that this is done as soon as possible)
=====================================
tim/prune/function/PasteCoordinateList.java
=====================================
@@ -133,7 +133,7 @@ public class PasteCoordinateList extends GenericFunction
{
String text = _coordArea.getText();
_okButton.setEnabled(text != null && text.length() > 6
- && (text.indexOf(' ') >= 0 || text.indexOf(',') >= 0));
+ && (text.indexOf(' ') >= 0 || text.indexOf(',') >= 0 || text.indexOf(';') >= 0));
}
/**
=====================================
tim/prune/function/edit/PointEditor.java
=====================================
@@ -135,7 +135,9 @@ public class PointEditor
{
Component comp = super.prepareRenderer(renderer, row, column);
boolean changed = ((EditFieldsTableModel) getModel()).getChanged(row);
- comp.setBackground(changed ? Color.orange : getBackground());
+ if (row != getSelectedRow()) {
+ comp.setBackground(changed ? Color.orange : getBackground());
+ }
return comp;
}
};
=====================================
tim/prune/gui/map/MapCanvas.java
=====================================
@@ -4,6 +4,7 @@ import java.awt.*;
import java.awt.event.*;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;
+import java.awt.image.ImageObserver;
import javax.swing.*;
@@ -389,13 +390,15 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
_scaleBar.updateScale(_mapPosition.getZoom(), _mapPosition.getYFromPixels(0, 0));
}
// Draw the prepared image onto the panel
- if (_mapImage != null) {
+ if (_mapImage != null)
+ {
Graphics2D g2 = (Graphics2D) (inG.create());
final double preScale = g2.getTransform().getScaleX();
- if (preScale != _lastScale) {
- // System.out.println("Scale: " + preScale);
+ if (preScale != _lastScale)
+ {
_lastScale = preScale;
_mapPosition.setDisplayScaling(_lastScale);
+ _scaleBar.setDisplayScaling(_lastScale);
}
AffineTransform at = g2.getTransform();
final double xTranslate = at.getTranslateX();
@@ -567,7 +570,7 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
{
Image image = _tileManager.getTile(l, tileX, tileY, true);
if (image != null) {
- g.drawImage(image, x, y, 256, 256, null);
+ g.drawImage(image, x, y, 256, 256, (img, flags, px, py, width, height) -> checkPaintedTile(flags));
}
}
}
@@ -644,6 +647,16 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
}
+ private boolean checkPaintedTile(int flags)
+ {
+ if ((flags & ImageObserver.ALLBITS) == 0) {
+ tilesUpdated(true);
+ return true;
+ }
+ return false;
+ }
+
+
/**
* Paint the points using the given graphics object
* @param inG Graphics object to use for painting
=====================================
tim/prune/gui/map/MapPosition.java
=====================================
@@ -84,7 +84,6 @@ public class MapPosition
*/
public void zoomToPixels(int inMinX, int inMaxX, int inMinY, int inMaxY, int inWidth, int inHeight)
{
- // System.out.println("Current position is " + _xPosition + ", " + _yPosition);
int diffX = Math.abs(inMaxX - inMinX);
int diffY = Math.abs(inMaxY - inMinY);
// Find out what zoom level to go to
@@ -101,8 +100,8 @@ public class MapPosition
}
setZoom(requiredZoom);
// Set position
- _xPosition = (_xPosition - inWidth/2 + (inMinX + inMaxX) / 2) * multFactor;
- _yPosition = (_yPosition - inHeight/2 + (inMinY + inMaxY) / 2) * multFactor;
+ _xPosition = (_xPosition + (inMinX + inMaxX - inWidth) / 2 * _displayScaling) * multFactor;
+ _yPosition = (_yPosition + (inMinY + inMaxY - inHeight) / 2 * _displayScaling) * multFactor;
}
/**
@@ -220,7 +219,7 @@ public class MapPosition
* @return tile index for that point
*/
private int getTileIndex(int inPosition) {
- return inPosition / MAP_TILE_SIZE;
+ return Math.floorDiv(inPosition, MAP_TILE_SIZE);
}
/**
@@ -228,7 +227,7 @@ public class MapPosition
* @return pixel offset for that point
*/
private int getDisplayOffset(int inPosition) {
- return inPosition % MAP_TILE_SIZE;
+ return inPosition - getTileIndex(inPosition) * MAP_TILE_SIZE;
}
/**
=====================================
tim/prune/gui/map/ScaleBar.java
=====================================
@@ -20,6 +20,8 @@ public class ScaleBar extends JPanel
private int _zoomLevel = -1;
/** y position */
private double _yPos = 0.0;
+ /** Scaling factor on screen (usually 1.0) */
+ private double _displayScaling = 1.0;
/** Invalid scale, do not draw */
private static final int INVALID_SCALE = 0;
@@ -63,7 +65,7 @@ public class ScaleBar extends JPanel
final double lat = Math.atan(Math.sinh(angle));
final double distAroundEarth = Distance.convertRadiansToDistance(2 * Math.PI) * Math.cos(lat);
// pixels at this zoom level
- return (256 << _zoomLevel) / distAroundEarth;
+ return (256 << _zoomLevel) / distAroundEarth / _displayScaling;
}
/**
@@ -176,4 +178,11 @@ public class ScaleBar extends JPanel
_zoomLevel = inZoom;
_yPos = inYPos;
}
+
+ /**
+ * @param inScaling current display scaling factor from OS
+ */
+ public void setDisplayScaling(double inScaling) {
+ _displayScaling = inScaling;
+ }
}
=====================================
tim/prune/lang/prune-texts_fr.properties
=====================================
@@ -336,7 +336,7 @@ dialog.distances.column.from=Du point
dialog.distances.column.to=Vers le point
dialog.distances.currentpoint=Point courant
dialog.distances.toofewpoints=Cette fonction a besoin de waypoints pour calculer les distances entre eux
-dialog.fullrangedetails.intro=Voici les d\u00e9tails pour l\u2019\u00e9tendue s\u00e9lectionn\u00e9e
+dialog.fullrangedetails.intro=Voici les d\u00e9tails pour l'\u00e9tendue s\u00e9lectionn\u00e9e
dialog.fullrangedetails.coltotal=Inclure les cellules vides
dialog.fullrangedetails.colsegments=Exclure les cellules vides
dialog.estimatetime.details=D\u00e9tails
@@ -349,8 +349,11 @@ dialog.estimatetime.parameters.timefor=Dur\u00e9e pour
dialog.estimatetime.results=R\u00e9sultats
dialog.estimatetime.results.estimatedtime=Dur\u00e9e estim\u00e9e
dialog.estimatetime.results.actualtime=Dur\u00e9e en fait
+dialog.estimatetime.error.nodistance=Les estimations du temps n\u00e9cessitent des points de trace connect\u00e9s
dialog.estimatetime.error.noaltitudes=L'\u00e9tendue s\u00e9lectionn\u00e9e de contient pas d'altitudes
+dialog.learnestimationparams.intro=Voici les param\u00e8tres calcul\u00e9s \u00e0 partir de cette piste
dialog.learnestimationparams.averageerror=Erreur en moyenne
+dialog.learnestimationparams.combine=Ces param\u00e8tres peuvent \u00eatre combin\u00e9s avec les valeurs actuelles
dialog.learnestimationparams.combinedresults=R\u00e9sultats combin\u00e9es
dialog.learnestimationparams.weight.100pccurrent=Conserver les valeurs actuelles
dialog.learnestimationparams.weight.current=actuelles
@@ -596,9 +599,11 @@ dialog.markers.half.climb=Demi-mont\u00e9e
dialog.markers.half.descent=Demi-descente
dialog.projectpoint.desc=Saisissez la direction et la distance de la projection
dialog.projectpoint.bearing=Azimut (degr\u00e8s du nord)
+dialog.projectcircle.desc=Saisissez le rayon du cercle
dialog.configuresrtm.threesecond=Donn\u00e9es \u00e0 basse r\u00e9solution (3 secondes d'arc)
dialog.configuresrtm.threesecond.desc=Les donn\u00e9es \u00e0 basse r\u00e9solution sont toujours activ\u00e9es
dialog.configuresrtm.onesecond=Donn\u00e9es \u00e0 haute r\u00e9solution (1 seconde d'arc)
+dialog.configuresrtm.onesecond.desc2=Cr\u00e9er un compte sur https://urs.earthdata.nasa.gov/users/new
dialog.configuresrtm.showregistrationwebsite=Aller maintenant sur le site de la NASA pour l'inscription ?
dialog.configuresrtm.userid=Nom d'utilisateur \u00e0 NASA Earthdata
dialog.configuresrtm.password=Mot de passe \u00e0 NASA Earthdata
=====================================
tim/prune/readme.txt
=====================================
@@ -1,4 +1,4 @@
-GpsPrune version 21.2
+GpsPrune version 21.3
=====================
GpsPrune is an application for viewing, editing and managing coordinate data from GPS systems,
@@ -17,7 +17,7 @@ Running
=======
To run GpsPrune from the jar file, simply call it from a command prompt or shell:
- java -jar gpsprune_21.2.jar
+ java -jar gpsprune_21.3.jar
If the jar file is saved in a different directory, you will need to include the path.
Depending on your system settings, you may be able to click or double-click on the jar file
@@ -25,9 +25,16 @@ in a file manager window to execute it. A shortcut, menu item, alias, desktop i
or other link can of course be made should you wish.
To specify a language other than the default, use an additional parameter, eg:
- java -jar gpsprune_21.2.jar --lang=DE
+ java -jar gpsprune_21.3.jar --lang=DE
+New with version 21.3
+=====================
+ - Bugfix for map scalebar due to display scaling of OS (introduced by 21.2)
+ - Bugfix for intermittent tile loading issues (introduced by 21.2)
+ - Bugfix for cosmetics of edit point dialog
+ - Make coordinate pasting tolerant of semicolons as separators
+
New with version 21.2
=====================
- Don't apply display scaling of OS to map tiles, so that they remain sharp (Issue #16)
View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/compare/8363d5e254c7eef2d78a58cf567c9f6425f479a5...0f0bd10882b2b6be306d1424de4a1f992fbdcf1f
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/gpsprune/-/compare/8363d5e254c7eef2d78a58cf567c9f6425f479a5...0f0bd10882b2b6be306d1424de4a1f992fbdcf1f
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20220520/4be5d160/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list