From 2585bf11636f64b490b7c3152ca7912aa2f76be9 Mon Sep 17 00:00:00 2001 From: iobyte Date: Tue, 16 Jan 2024 23:46:55 +0000 Subject: [PATCH] trackeditor: add default slider value git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9246 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 93391b5a51b4a5f27acf8c870f09b7894e8f9698 Former-commit-id: e23e63a00d64a7eb80e69fe525072ad7380cdd54 --- .../gui/segment/SegmentEditorDlg.java | 30 +++++++++---------- .../gui/segment/SegmentSideProperties.java | 12 ++++---- .../gui/segment/SegmentSlider.java | 15 ++++++---- src/tools/trackeditor/utils/Properties.java | 2 +- 4 files changed, 31 insertions(+), 28 deletions(-) diff --git a/src/tools/trackeditor/gui/segment/SegmentEditorDlg.java b/src/tools/trackeditor/gui/segment/SegmentEditorDlg.java index 0b0c69899..ee29abcf3 100644 --- a/src/tools/trackeditor/gui/segment/SegmentEditorDlg.java +++ b/src/tools/trackeditor/gui/segment/SegmentEditorDlg.java @@ -332,7 +332,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (radiusStartSlider == null) { - radiusStartSlider = new SegmentSlider(1, 1000, 0.001); + radiusStartSlider = new SegmentSlider(1, 1000, 1, 0.001); radiusStartSlider.setBounds(115, 64, 50, 390); radiusStartSlider.setSection("Radius"); radiusStartSlider.setAttr("Start"); @@ -353,7 +353,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (radiusEndSlider == null) { - radiusEndSlider = new SegmentSlider(1, 1000, 0.001); + radiusEndSlider = new SegmentSlider(1, 1000, 1, 0.001); radiusEndSlider.setBounds(170, 64, 50, 390); radiusEndSlider.setSection("Radius"); radiusEndSlider.setAttr("End"); @@ -374,7 +374,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (arcSlider == null) { - arcSlider = new SegmentSlider(1, 360, 0.001); + arcSlider = new SegmentSlider(1, 360, 1, 0.001); arcSlider.setBounds(60, 64, 50, 390); arcSlider.setSection("Arc"); arcSlider.setAttr(""); @@ -395,7 +395,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (lengthSlider == null) { - lengthSlider = new SegmentSlider(0.001, 1000, 0.001, shape.getLength(), "Length", "", "Length", false); + lengthSlider = new SegmentSlider(0.001, 1000, 0.001, 0.001, shape.getLength(), "Length", "", "Length", false); lengthSlider.setBounds(5, 64, 50, 390); lengthSlider.addSliderListener(this); } @@ -410,7 +410,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (gradeSlider == null) { - gradeSlider = new SegmentSlider(-45, 45, 0.001, shape.getGrade(), "Grade", "", "Grade", true); + gradeSlider = new SegmentSlider(-45, 45, 0, 0.001, shape.getGrade(), "Grade", "", "Grade", true); gradeSlider.setBounds(225, 64, 50, 390); gradeSlider.addSliderListener(this); } @@ -425,7 +425,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (startTangentSlider == null) { - startTangentSlider = new SegmentSlider(-45, 45, 0.001, shape.getProfilStartTangent(), "Tangent", "Start", "ProfilStartTangent", true); + startTangentSlider = new SegmentSlider(-45, 45, 0, 0.001, shape.getProfilStartTangent(), "Tangent", "Start", "ProfilStartTangent", true); startTangentSlider.setBounds(280, 64, 50, 390); startTangentSlider.addSliderListener(this); } @@ -440,7 +440,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (endTangentSlider == null) { - endTangentSlider = new SegmentSlider(-45, 45, 0.001, shape.getProfilEndTangent(), "Tangent", "End", "ProfilEndTangent", true); + endTangentSlider = new SegmentSlider(-45, 45, 0, 0.001, shape.getProfilEndTangent(), "Tangent", "End", "ProfilEndTangent", true); endTangentSlider.setBounds(335, 64, 50, 390); endTangentSlider.addSliderListener(this); } @@ -455,7 +455,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (profilStepsSlider == null) { - profilStepsSlider = new SegmentSlider(0, 100, 0.001, shape.getProfilSteps(), "Steps", "", "ProfilSteps", true); + profilStepsSlider = new SegmentSlider(0, 100, 0, 0.001, shape.getProfilSteps(), "Steps", "", "ProfilSteps", true); profilStepsSlider.setBounds(390, 64, 50, 390); profilStepsSlider.addSliderListener(this); } @@ -470,7 +470,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (profilStepsLengthSlider == null) { - profilStepsLengthSlider = new SegmentSlider(0, 100, 0.001, shape.getProfilStepsLength(), "Steps", "Len", "ProfilStepsLength", true); + profilStepsLengthSlider = new SegmentSlider(0, 100, 0, 0.001, shape.getProfilStepsLength(), "Steps", "Len", "ProfilStepsLength", true); profilStepsLengthSlider.setBounds(445, 64, 50, 390); profilStepsLengthSlider.addSliderListener(this); } @@ -485,7 +485,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (bankingStartSlider == null) { - bankingStartSlider = new SegmentSlider(-45, 45, 0.001, shape.getBankingStart(), "Banking", "Start", "BankingStart", true); + bankingStartSlider = new SegmentSlider(-45, 45, 0, 0.001, shape.getBankingStart(), "Banking", "Start", "BankingStart", true); bankingStartSlider.setBounds(500, 64, 50, 390); bankingStartSlider.addSliderListener(this); } @@ -500,7 +500,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (bankingEndSlider == null) { - bankingEndSlider = new SegmentSlider(-45, 45, 0.001, shape.getBankingEnd(), "Banking", "End", "BankingEnd", true); + bankingEndSlider = new SegmentSlider(-45, 45, 0, 0.001, shape.getBankingEnd(), "Banking", "End", "BankingEnd", true); bankingEndSlider.setBounds(555, 64, 50, 390); bankingEndSlider.addSliderListener(this); } @@ -515,7 +515,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (heightStartLeftSlider == null) { - heightStartLeftSlider = new SegmentSlider(0, 200, 0.001, shape.getHeightStartLeft(), "L Height", "Start", "HeightStartLeft", true); + heightStartLeftSlider = new SegmentSlider(0, 200, 0, 0.001, shape.getHeightStartLeft(), "L Height", "Start", "HeightStartLeft", true); heightStartLeftSlider.setBounds(610, 64, 50, 390); heightStartLeftSlider.addSliderListener(this); } @@ -530,7 +530,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (heightStartRightSlider == null) { - heightStartRightSlider = new SegmentSlider(0, 200, 0.001, shape.getHeightStartRight(), "R Height", "Start", "HeightStartRight", true); + heightStartRightSlider = new SegmentSlider(0, 200, 0, 0.001, shape.getHeightStartRight(), "R Height", "Start", "HeightStartRight", true); heightStartRightSlider.setBounds(665, 64, 50, 390); heightStartRightSlider.addSliderListener(this); } @@ -545,7 +545,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (heightEndLeftSlider == null) { - heightEndLeftSlider = new SegmentSlider(0, 200, 0.001, shape.getHeightEndLeft(), "L Height", "End", "HeightEndLeft", true); + heightEndLeftSlider = new SegmentSlider(0, 200, 0, 0.001, shape.getHeightEndLeft(), "L Height", "End", "HeightEndLeft", true); heightEndLeftSlider.setBounds(720, 64, 50, 390); heightEndLeftSlider.addSliderListener(this); } @@ -560,7 +560,7 @@ public class SegmentEditorDlg extends JDialog implements SliderListener { if (heightEndRightSlider == null) { - heightEndRightSlider = new SegmentSlider(0, 200, 0.001, shape.getHeightEndRight(), "R Height", "End", "HeightEndRight", true); + heightEndRightSlider = new SegmentSlider(0, 200, 0, 0.001, shape.getHeightEndRight(), "R Height", "End", "HeightEndRight", true); heightEndRightSlider.setBounds(775, 64, 50, 390); heightEndRightSlider.addSliderListener(this); } diff --git a/src/tools/trackeditor/gui/segment/SegmentSideProperties.java b/src/tools/trackeditor/gui/segment/SegmentSideProperties.java index fb72c0373..42f10cb45 100644 --- a/src/tools/trackeditor/gui/segment/SegmentSideProperties.java +++ b/src/tools/trackeditor/gui/segment/SegmentSideProperties.java @@ -561,7 +561,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener { if (barrierHeightSlider == null) { - barrierHeightSlider = new SegmentSlider(0, 50, 0.001, side.getBarrierHeight(), "Height", "", "BarrierHeight", true); + barrierHeightSlider = new SegmentSlider(0, 50, 0, 0.001, side.getBarrierHeight(), "Height", "", "BarrierHeight", true); barrierHeightSlider.setBounds(52, 25, 50, 290); barrierHeightSlider.addSliderListener(this); } @@ -577,7 +577,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener { if (sideStartWidthSlider == null) { - sideStartWidthSlider = new SegmentSlider(0, 100, 0.001, side.getSideStartWidth(), "Width", "Start", "SideStartWidth", true); + sideStartWidthSlider = new SegmentSlider(0, 100, 0, 0.001, side.getSideStartWidth(), "Width", "Start", "SideStartWidth", true); sideStartWidthSlider.setBounds(358, 25, 50, 290); sideStartWidthSlider.addSliderListener(this); } @@ -592,7 +592,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener { if (borderWidthSlider == null) { - borderWidthSlider = new SegmentSlider(0, 5, 0.001, side.getBorderWidth(), "Width", "", "BorderWidth", true); + borderWidthSlider = new SegmentSlider(0, 5, 0, 0.001, side.getBorderWidth(), "Width", "", "BorderWidth", true); borderWidthSlider.setBounds(720, 25, 50, 290); borderWidthSlider.addSliderListener(this); } @@ -607,7 +607,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener { if (sideEndWidthSlider == null) { - sideEndWidthSlider = new SegmentSlider(0, 100, 0.001, side.getSideEndWidth(), "Width", "End", "SideEndWidth", true); + sideEndWidthSlider = new SegmentSlider(0, 100, 0, 0.001, side.getSideEndWidth(), "Width", "End", "SideEndWidth", true); sideEndWidthSlider.setBounds(413, 25, 50, 290); sideEndWidthSlider.addSliderListener(this); } @@ -622,7 +622,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener { if (barrierWidthSlider == null) { - barrierWidthSlider = new SegmentSlider(0, 50, 0.001, side.getBarrierWidth(), "Width", "", "BarrierWidth", true); + barrierWidthSlider = new SegmentSlider(0, 50, 0, 0.001, side.getBarrierWidth(), "Width", "", "BarrierWidth", true); barrierWidthSlider.setBounds(107, 25, 50, 290); barrierWidthSlider.addSliderListener(this); } @@ -637,7 +637,7 @@ public class SegmentSideProperties extends JPanel implements SliderListener { if (borderHeightSlider == null) { - borderHeightSlider = new SegmentSlider(0, 5, 0.001, side.getBorderHeight(), "Height", "", "BorderHeight", true); + borderHeightSlider = new SegmentSlider(0, 5, 0, 0.001, side.getBorderHeight(), "Height", "", "BorderHeight", true); borderHeightSlider.setBounds(665, 25, 50, 290); borderHeightSlider.addSliderListener(this); } diff --git a/src/tools/trackeditor/gui/segment/SegmentSlider.java b/src/tools/trackeditor/gui/segment/SegmentSlider.java index fcc7b6e1f..396066345 100644 --- a/src/tools/trackeditor/gui/segment/SegmentSlider.java +++ b/src/tools/trackeditor/gui/segment/SegmentSlider.java @@ -61,6 +61,7 @@ public class SegmentSlider extends JPanel private String attr; private double min; private double max; + private double defaultValue; private double resolution = Double.NaN; private String method; private Object parent; @@ -70,22 +71,24 @@ public class SegmentSlider extends JPanel /** * */ - public SegmentSlider(double min, double max, double resolution) + public SegmentSlider(double min, double max, double defaultValue, double resolution) { super(); this.min = min; this.max = max; + this.defaultValue = defaultValue; this.resolution = resolution; initialize(); this.parent = this.getParent(); new SliderLink(); } - public SegmentSlider(double min, double max, double resolution, double value, String section, String attr, String method, boolean optional) + public SegmentSlider(double min, double max, double defaultValue, double resolution, double value, String section, String attr, String method, boolean optional) { super(); this.min = min; this.max = max; + this.defaultValue = defaultValue; this.resolution = resolution; this.value = value; this.section = section; @@ -398,7 +401,7 @@ public class SegmentSlider extends JPanel { getTextField().setText(""); getTextField().setEnabled(false); - setSliderValue(min); + setSliderValue(defaultValue); getSlider().setEnabled(false); if (optional) checkBox.setSelected(false); @@ -446,7 +449,7 @@ public class SegmentSlider extends JPanel if (Double.isNaN(val)) { getTextField().setText(""); - setSliderValue(min); + setSliderValue(defaultValue); if (optional) checkBox.setSelected(false); } @@ -565,7 +568,7 @@ public class SegmentSlider extends JPanel { if (Double.isNaN(value)) { - value = min; + value = defaultValue; } if (oldValue != value) { @@ -584,7 +587,7 @@ public class SegmentSlider extends JPanel { getTextField().setText(""); getTextField().setEnabled(false); - setSliderValue(min); + setSliderValue(defaultValue); getSlider().setEnabled(false); valueChanged(); } diff --git a/src/tools/trackeditor/utils/Properties.java b/src/tools/trackeditor/utils/Properties.java index 910b83fa7..831b12569 100644 --- a/src/tools/trackeditor/utils/Properties.java +++ b/src/tools/trackeditor/utils/Properties.java @@ -34,7 +34,7 @@ public class Properties private static Properties instance = new Properties(); private Vector propertiesListeners = new Vector(); public final String title = "sd2-trackeditor"; - public final String version = "1.3.36"; + public final String version = "1.3.37"; private String path; private double imageScale = 1;