nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-21 22:52:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Scroller improvements

Browse Source 
Better jump options in scroller and fix icon problem (Resource path needs /, not \ even on windows)
This commit is contained in:
Douglas Gillespie 2024-10-11 19:50:45 +01:00
parent a38e2262d3
commit fc80620e74
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dependency-reduced-pom.xml
View File

@ -4,7 +4,7 @@
<groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId>
<name>Pamguard</name>
<version>2.02.13c</version>
<version>2.02.13d</version>
<description>Pamguard using Maven to control dependencies</description>
<url>www.pamguard.org</url>
<organization>
@ -172,7 +172,7 @@
</additionalResources>
</dmg>
<jdk>
<include>true</include>
<include>false</include>
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
</jdk>
<codesign>

2
pom.xml
View File

@ -216,7 +216,7 @@
</additionalResources>
</dmg>
<jdk>
<include>true</include>
<include>false</include>
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
</jdk>
<codesign>

2
src/PamController/PamguardVersionInfo.java
View File

@ -16,7 +16,7 @@ public class PamguardVersionInfo {
* @return release type
*/
static public ReleaseType getReleaseType() {
return ReleaseType.BETA;
return ReleaseType.CORE;
}
/**

3
src/PamView/PamIcon.java
View File

@ -26,7 +26,8 @@ public class PamIcon {
//the default is windows. Icon automatically resize on Windows.
String path = "Resources\\pamguardIcon.png";
// Even on Windows, use a / slash. A \\ doesn't work (OK in debugger, not in built version)
String path = "Resources/pamguardIcon.png";
if (System.getProperty("os.name").equals("Linux") || System.getProperty("os.name").startsWith("Mac")) {
switch (sizeFlag) {

2
src/pamScrollSystem/AbstractPamScroller.java
View File

@ -42,7 +42,7 @@ public abstract class AbstractPamScroller implements DataTimeLimits {
/*
* List of play speeds for a quick menu
*/
protected double[] playSpeeds = {.1, 0.25, .5, 1.0, 2, 5, 10};
protected double[] playSpeeds = {.1, 0.25, .5, 1.0, 2, 5, 10, 20, 30, 60};
// private long realTimerStart;
//

2
src/pamScrollSystem/ViewerScrollerManager.java
View File

@ -644,7 +644,7 @@ public class ViewerScrollerManager extends AbstractScrollManager implements PamS
newMin = checkMinimumTime(menuMouseTime - scrollRange / 2);
newMax = checkMaximumTime(newMin + scrollRange);
newMin = menuMouseTime - scrollRange/2;
newMin = checkGapPos(dataBlock, newMin, newMax);
// newMin = checkGapPos(dataBlock, newMin, newMax); // doesn't work.
newMax = newMin + scrollRange;
System.out.printf("Centering scoller at %s, range %s to %s\n", PamCalendar.formatDBDateTime(menuMouseTime),
PamCalendar.formatDBDateTime(newMin), PamCalendar.formatDBDateTime(newMax));

7
src/userDisplay/UserDisplayFrame.java
View File

@ -31,7 +31,12 @@ public class UserDisplayFrame extends JInternalFrame {
add(userDisplayComponent.getComponent());
setTitle(userDisplayComponent.getFrameTitle());
setFrameIcon(PamIcon.getPAMGuardImageIcon(PamIcon.SMALL));
try {
setFrameIcon(PamIcon.getPAMGuardImageIcon(PamIcon.SMALL));
}
catch (Exception e) {
System.out.println(e.getMessage());
}
setSize(900, 400);
setVisible(true);