mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-25 00:22:27 +00:00
Scroller improvements
Better jump options in scroller and fix icon problem (Resource path needs /, not \ even on windows)
This commit is contained in:
parent
a38e2262d3
commit
fc80620e74
@ -4,7 +4,7 @@
|
|||||||
<groupId>org.pamguard</groupId>
|
<groupId>org.pamguard</groupId>
|
||||||
<artifactId>Pamguard</artifactId>
|
<artifactId>Pamguard</artifactId>
|
||||||
<name>Pamguard</name>
|
<name>Pamguard</name>
|
||||||
<version>2.02.13c</version>
|
<version>2.02.13d</version>
|
||||||
<description>Pamguard using Maven to control dependencies</description>
|
<description>Pamguard using Maven to control dependencies</description>
|
||||||
<url>www.pamguard.org</url>
|
<url>www.pamguard.org</url>
|
||||||
<organization>
|
<organization>
|
||||||
@ -172,7 +172,7 @@
|
|||||||
</additionalResources>
|
</additionalResources>
|
||||||
</dmg>
|
</dmg>
|
||||||
<jdk>
|
<jdk>
|
||||||
<include>true</include>
|
<include>false</include>
|
||||||
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
|
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
|
||||||
</jdk>
|
</jdk>
|
||||||
<codesign>
|
<codesign>
|
||||||
|
2
pom.xml
2
pom.xml
@ -216,7 +216,7 @@
|
|||||||
</additionalResources>
|
</additionalResources>
|
||||||
</dmg>
|
</dmg>
|
||||||
<jdk>
|
<jdk>
|
||||||
<include>true</include>
|
<include>false</include>
|
||||||
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
|
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
|
||||||
</jdk>
|
</jdk>
|
||||||
<codesign>
|
<codesign>
|
||||||
|
@ -16,7 +16,7 @@ public class PamguardVersionInfo {
|
|||||||
* @return release type
|
* @return release type
|
||||||
*/
|
*/
|
||||||
static public ReleaseType getReleaseType() {
|
static public ReleaseType getReleaseType() {
|
||||||
return ReleaseType.BETA;
|
return ReleaseType.CORE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -26,7 +26,8 @@ public class PamIcon {
|
|||||||
|
|
||||||
|
|
||||||
//the default is windows. Icon automatically resize on Windows.
|
//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")) {
|
if (System.getProperty("os.name").equals("Linux") || System.getProperty("os.name").startsWith("Mac")) {
|
||||||
switch (sizeFlag) {
|
switch (sizeFlag) {
|
||||||
|
@ -42,7 +42,7 @@ public abstract class AbstractPamScroller implements DataTimeLimits {
|
|||||||
/*
|
/*
|
||||||
* List of play speeds for a quick menu
|
* 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;
|
// private long realTimerStart;
|
||||||
//
|
//
|
||||||
|
@ -644,7 +644,7 @@ public class ViewerScrollerManager extends AbstractScrollManager implements PamS
|
|||||||
newMin = checkMinimumTime(menuMouseTime - scrollRange / 2);
|
newMin = checkMinimumTime(menuMouseTime - scrollRange / 2);
|
||||||
newMax = checkMaximumTime(newMin + scrollRange);
|
newMax = checkMaximumTime(newMin + scrollRange);
|
||||||
newMin = menuMouseTime - scrollRange/2;
|
newMin = menuMouseTime - scrollRange/2;
|
||||||
newMin = checkGapPos(dataBlock, newMin, newMax);
|
// newMin = checkGapPos(dataBlock, newMin, newMax); // doesn't work.
|
||||||
newMax = newMin + scrollRange;
|
newMax = newMin + scrollRange;
|
||||||
System.out.printf("Centering scoller at %s, range %s to %s\n", PamCalendar.formatDBDateTime(menuMouseTime),
|
System.out.printf("Centering scoller at %s, range %s to %s\n", PamCalendar.formatDBDateTime(menuMouseTime),
|
||||||
PamCalendar.formatDBDateTime(newMin), PamCalendar.formatDBDateTime(newMax));
|
PamCalendar.formatDBDateTime(newMin), PamCalendar.formatDBDateTime(newMax));
|
||||||
|
@ -31,7 +31,12 @@ public class UserDisplayFrame extends JInternalFrame {
|
|||||||
add(userDisplayComponent.getComponent());
|
add(userDisplayComponent.getComponent());
|
||||||
setTitle(userDisplayComponent.getFrameTitle());
|
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);
|
setSize(900, 400);
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
Loading…
Reference in New Issue
Block a user