Skip to content

Commit a14ba21

Browse files
Added Timer Mousewheel support
1 parent b704740 commit a14ba21

11 files changed

Lines changed: 31 additions & 7 deletions

View5D.jar

242 Bytes
Binary file not shown.

javacImageJ

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ javac -target 1.8 -source 1.8 -deprecation -classpath ".:/usr/local/ImageJ/ij.ja
99
# javac -deprecation -classpath "." View5D_.java
1010
jar -cf View5D_.jar view5d/*.class plugins.config
1111
# cp /*.class /usr/local/ImageJ/plugins/View5D/
12-
cp View5D_.jar /mnt/c/Users/pi96doc/Desktop/Fiji.app/plugins/View5D_-2.3.6.jar
12+
cp View5D_.jar /mnt/c/Users/pi96doc/Desktop/Fiji.app/plugins/View5D_-2.3.7.jar
1313

1414
# cp View5D_.jar /usr/local/ImageJ/plugins/View5D/
1515
# cp View5D_.jar /windows/C/DriveF/JavaProgs/ImageJ/plugins/View5D/

javacPython

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,13 @@ cp View5D_.jar "/mnt/c/NoBackup/DeconvCompileTest/DIPlib_3_2017/share/DIPimage/p
1414
cp View5D_.jar "/mnt/c/NoBackup/DeconvCompileTest/DIPlib_3_2019/share/DIPimage/private/View5D.jar"
1515
cp View5D_.jar "../View5D.jar"
1616
cp View5D_.jar "/mnt/c/Users/pi96doc/.julia/artifacts/View5D.jar"
17+
cp View5D_.jar "C:\Program Files\DIPimage 2.9\common\dipimage\private\View5D.jar"
18+
cp View5D_.jar "C:\Program Files\DIPlib_3_2019\share\DIPimage\private\View5D.jar"
19+
cp View5D_.jar " C:\NoBackup\DeconvCompileTest\DIPlib_3_2019\share\DIPimage\private\View5D.jar"
20+
cp View5D_.jar " C:\NoBackup\DeconvCompileTest\DIPlib_3_2017\share\DIPimage\private\View5D.jar"
1721
cd ..
18-
cp View5D.jar "View5D_v2.3.6.jar"
19-
tar -czf "View5D_v2.3.6-jar.tar.gz" "View5D_v2.3.6.jar"
22+
cp View5D.jar "View5D_v2.3.7.jar"
23+
tar -czf "View5D_v2.3.7-jar.tar.gz" "View5D_v2.3.7.jar"
2024
# cp /*.class /usr/local/ImageJ/plugins/View5D/
2125
#cp View5D_.jar /usr/local/ImageJ/plugins/View5D/
2226
# cp View5D_.jar /windows/C/DriveF/JavaProgs/ImageJ/plugins/View5D/

src/View5D_.jar

242 Bytes
Binary file not shown.

src/view5d/ImageCanvas.class

96 Bytes
Binary file not shown.

src/view5d/ImageCanvas.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,15 @@ public void mouseEntered(MouseEvent e) {
935935
@Override
936936
public void mouseWheelMoved(MouseWheelEvent e)
937937
{
938-
if ((e.isShiftDown()) && e.isControlDown())// orthogonal Zoom
938+
if ((e.isAltDown())) { // advance in time
939+
if (e.getWheelRotation() < 0)
940+
my3ddata.nextTime(1);
941+
else
942+
my3ddata.nextTime(-1);
943+
myPanel.AdjustOffset();
944+
UpdateAll();
945+
}
946+
else if ((e.isShiftDown()) && e.isControlDown())// orthogonal Zoom
939947
if (e.getWheelRotation() < 0)
940948
{
941949
ChangeOrthoZoom(1.0625);

src/view5d/ImgPanel.class

405 Bytes
Binary file not shown.

src/view5d/ImgPanel.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@
2424

2525
// import java.io.*;
2626
import java.awt.*;
27+
import java.awt.event.*;
2728
import java.lang.System.*;
2829
// import ij.*;
2930

3031
// This class manages constructing the application
31-
public class ImgPanel extends Panel {
32+
public class ImgPanel extends Panel implements MouseWheelListener { // the listener is for the scrollbar (slider)
3233
static final long serialVersionUID = 1;
3334

3435
Container applet;
@@ -53,7 +54,17 @@ public void InitScaling() {
5354
public void OwnerPanel(ImgPanel owner) {
5455
DataPanel=owner;
5556
}
56-
57+
58+
@Override
59+
public void mouseWheelMoved(MouseWheelEvent e) {
60+
if (e.getWheelRotation() < 0)
61+
data3d.nextTime(1);
62+
else
63+
data3d.nextTime(-1);
64+
AdjustOffset();
65+
c1.UpdateAll();
66+
}
67+
5768
public void CheckScrollBar() {
5869
//System.out.println("CheckScrollBar: "+data3d.Times+" timesteps.\n");
5970
//System.out.println("Objects: Applet: "+System.identityHashCode(applet)+" , Data: "+data3d+", this Panel: "+System.identityHashCode(this)+", DataPanel: "+System.identityHashCode(DataPanel)+"\n");
@@ -78,6 +89,7 @@ public void CheckScrollBar() {
7889
}
7990
Slider.setBlockIncrement(data3d.Times / 10 + 1);
8091
Slider.addAdjustmentListener(c1);
92+
Slider.addMouseWheelListener(this); // register this class for handling the events in it
8193
Slider.setVisible(true);
8294
}
8395
else {

src/view5d/PositionLabel.class

0 Bytes
Binary file not shown.

src/view5d/View5D_.class

0 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)