summaryrefslogtreecommitdiff
path: root/altosuilib
diff options
context:
space:
mode:
Diffstat (limited to 'altosuilib')
-rw-r--r--altosuilib/AltosUIAxis.java2
-rw-r--r--altosuilib/AltosUIEnable.java39
-rw-r--r--altosuilib/AltosUIGraph.java2
-rw-r--r--altosuilib/AltosUIGrapher.java2
-rw-r--r--altosuilib/AltosUILib.java16
-rw-r--r--altosuilib/AltosUIMarker.java2
-rw-r--r--altosuilib/AltosUIPreferences.java2
-rw-r--r--altosuilib/AltosUIPreferencesBackend.java2
-rw-r--r--altosuilib/AltosUISeries.java2
9 files changed, 31 insertions, 38 deletions
diff --git a/altosuilib/AltosUIAxis.java b/altosuilib/AltosUIAxis.java
index a38cba63..1638ea29 100644
--- a/altosuilib/AltosUIAxis.java
+++ b/altosuilib/AltosUIAxis.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIEnable.java b/altosuilib/AltosUIEnable.java
index 84803c0e..ea4bd00a 100644
--- a/altosuilib/AltosUIEnable.java
+++ b/altosuilib/AltosUIEnable.java
@@ -23,7 +23,7 @@ import javax.swing.*;
import java.io.*;
import java.util.concurrent.*;
import java.util.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
@@ -39,10 +39,12 @@ public class AltosUIEnable extends Container {
Insets il, ir;
int y;
+ int x;
+
+ static final int max_rows = 14;
class GraphElement implements ActionListener {
AltosUIGrapher grapher;
- JLabel label;
JRadioButton enable;
String name;
@@ -53,8 +55,7 @@ public class AltosUIEnable extends Container {
GraphElement (String name, AltosUIGrapher grapher, boolean enabled) {
this.name = name;
this.grapher = grapher;
- label = new JLabel(name);
- enable = new JRadioButton("Enable", enabled);
+ enable = new JRadioButton(name, enabled);
grapher.set_enable(enabled);
enable.addActionListener(this);
}
@@ -63,18 +64,11 @@ public class AltosUIEnable extends Container {
public void add(String name, AltosUIGrapher grapher, boolean enabled) {
GraphElement e = new GraphElement(name, grapher, enabled);
-
- /* Add label */
GridBagConstraints c = new GridBagConstraints();
- c.gridx = 0; c.gridy = y;
- c.fill = GridBagConstraints.NONE;
- c.anchor = GridBagConstraints.LINE_START;
- c.insets = il;
- add(e.label, c);
- /* Add radio button */
+ /* Add element */
c = new GridBagConstraints();
- c.gridx = 1; c.gridy = y;
+ c.gridx = x; c.gridy = y;
c.fill = GridBagConstraints.HORIZONTAL;
c.anchor = GridBagConstraints.CENTER;
c.insets = ir;
@@ -82,19 +76,17 @@ public class AltosUIEnable extends Container {
/* Next row */
y++;
+ if (y == max_rows) {
+ x++;
+ y = 0;
+ }
}
public void add_units() {
/* Imperial units setting */
- /* Add label */
- GridBagConstraints c = new GridBagConstraints();
- c.gridx = 0; c.gridy = 1000;
- c.fill = GridBagConstraints.NONE;
- c.anchor = GridBagConstraints.LINE_START;
- c.insets = il;
- add(new JLabel("Imperial Units"), c);
- JRadioButton imperial_units = new JRadioButton("Enable", AltosUIPreferences.imperial_units());
+ /* Add label */
+ JRadioButton imperial_units = new JRadioButton("Imperial Units", AltosUIPreferences.imperial_units());
imperial_units.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
JRadioButton item = (JRadioButton) e.getSource();
@@ -103,8 +95,8 @@ public class AltosUIEnable extends Container {
}
});
imperial_units.setToolTipText("Use Imperial units instead of metric");
- c = new GridBagConstraints();
- c.gridx = 1; c.gridy = 1000;
+ GridBagConstraints c = new GridBagConstraints();
+ c.gridx = 0; c.gridy = 1000;
c.fill = GridBagConstraints.NONE;
c.anchor = GridBagConstraints.LINE_START;
c.insets = il;
@@ -114,6 +106,7 @@ public class AltosUIEnable extends Container {
public AltosUIEnable() {
il = new Insets(4,4,4,4);
ir = new Insets(4,4,4,4);
+ x = 0;
y = 0;
setLayout(new GridBagLayout());
add_units();
diff --git a/altosuilib/AltosUIGraph.java b/altosuilib/AltosUIGraph.java
index ef0cc677..061a7629 100644
--- a/altosuilib/AltosUIGraph.java
+++ b/altosuilib/AltosUIGraph.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIGrapher.java b/altosuilib/AltosUIGrapher.java
index d826072f..23e7d9f0 100644
--- a/altosuilib/AltosUIGrapher.java
+++ b/altosuilib/AltosUIGrapher.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
diff --git a/altosuilib/AltosUILib.java b/altosuilib/AltosUILib.java
index 9fcaf6d4..76782e2e 100644
--- a/altosuilib/AltosUILib.java
+++ b/altosuilib/AltosUILib.java
@@ -20,7 +20,7 @@ package org.altusmetrum.altosuilib_1;
import java.awt.*;
import libaltosJNI.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
public class AltosUILib extends AltosLib {
@@ -81,18 +81,18 @@ public class AltosUILib extends AltosLib {
static public boolean initialized = false;
static public boolean loaded_library = false;
+ static final String[] library_names = { "altos", "altos32", "altos64" };
+
public static boolean load_library() {
if (!initialized) {
- try {
- System.loadLibrary("altos");
- libaltos.altos_init();
- loaded_library = true;
- } catch (UnsatisfiedLinkError e) {
+ for (String name : library_names) {
try {
- System.loadLibrary("altos64");
+ System.loadLibrary(name);
libaltos.altos_init();
loaded_library = true;
- } catch (UnsatisfiedLinkError e2) {
+ break;
+ } catch (UnsatisfiedLinkError e) {
+ System.out.printf("Link error %s\n", e.getMessage());
loaded_library = false;
}
}
diff --git a/altosuilib/AltosUIMarker.java b/altosuilib/AltosUIMarker.java
index e4262abd..ae8eb034 100644
--- a/altosuilib/AltosUIMarker.java
+++ b/altosuilib/AltosUIMarker.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
diff --git a/altosuilib/AltosUIPreferences.java b/altosuilib/AltosUIPreferences.java
index fc14f24b..4c995f80 100644
--- a/altosuilib/AltosUIPreferences.java
+++ b/altosuilib/AltosUIPreferences.java
@@ -21,7 +21,7 @@ import java.io.*;
import java.util.*;
import java.awt.Component;
import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
public class AltosUIPreferences extends AltosPreferences {
diff --git a/altosuilib/AltosUIPreferencesBackend.java b/altosuilib/AltosUIPreferencesBackend.java
index 55da8d48..64d3e3df 100644
--- a/altosuilib/AltosUIPreferencesBackend.java
+++ b/altosuilib/AltosUIPreferencesBackend.java
@@ -19,7 +19,7 @@ package org.altusmetrum.altosuilib_1;
import java.io.File;
import java.util.prefs.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import javax.swing.filechooser.FileSystemView;
public class AltosUIPreferencesBackend implements AltosPreferencesBackend {
diff --git a/altosuilib/AltosUISeries.java b/altosuilib/AltosUISeries.java
index 441eba2b..1f2a1c3f 100644
--- a/altosuilib/AltosUISeries.java
+++ b/altosuilib/AltosUISeries.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.awt.*;
import javax.swing.*;
-import org.altusmetrum.altoslib_2.*;
+import org.altusmetrum.altoslib_3.*;
import org.jfree.ui.*;
import org.jfree.chart.*;
generated by cgit v1.2.3 (git 2.39.1) at 2026-01-04 15:26:30 +0000