xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trackeditor: add check for height and height L + R 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@9253 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
iobyte 2024-01-17 22:17:05 +00:00
parent 497f8ee1cf
commit 9bf7484972
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/tools/trackeditor/gui/CheckDialog.java
View File

@ -315,6 +315,9 @@ public class CheckDialog extends JDialog
double width = trackData.getMainTrack().getWidth();
double firstHeightStart = Double.NaN;
double previousHeightEnd = Double.NaN;
double firstHeightStartLeft = Double.NaN;
double firstHeightStartRight = Double.NaN;
double previousHeightEndLeft = Double.NaN;
@ -326,17 +329,25 @@ public class CheckDialog extends JDialog
String segmentInfo = "Segment " + segment.getName() + " : ";
double heightStart = segment.getHeightStart();
boolean hasHeightStart = !Double.isNaN(heightStart);
double heightStartLeft = segment.getHeightStartLeft();
boolean hasHeightStartLeft = !Double.isNaN(heightStartLeft);
double heightStartRight = segment.getHeightStartRight();
boolean hasHeightStartRight = !Double.isNaN(heightStartRight);
boolean hasHeightStart = hasHeightStartLeft && hasHeightStartRight;
boolean hasBankingStartFromHeights = hasHeightStart && heightStartLeft != heightStartRight;
boolean hasHeightStartLeftRight = hasHeightStartLeft && hasHeightStartRight;
boolean hasBankingStartFromHeights = hasHeightStartLeftRight && heightStartLeft != heightStartRight;
double bankingStart = segment.getBankingStart();
boolean hasBankingStart = !Double.isNaN(bankingStart);
if (hasHeightStart && (hasHeightStartLeft || hasHeightStartRight))
{
textArea.append(segmentInfo + "has height start and height start left or height start right\n");
}
// Track should start at an elevation of 0.0.
if (i == 0)
@ -369,18 +380,26 @@ public class CheckDialog extends JDialog
}
}
double heightEnd = segment.getHeightEnd();
boolean hasHeightEnd = !Double.isNaN(heightEnd);
double heightEndLeft = segment.getHeightEndLeft();
boolean hasHeightEndLeft = !Double.isNaN(heightEndLeft);
double heightEndRight = segment.getHeightEndRight();
boolean hasHeightEndRight = !Double.isNaN(heightEndRight);
boolean hasHeightEnd = hasHeightEndLeft && hasHeightEndRight;
boolean hasBankingEndFromHeights = hasHeightEnd && heightEndLeft != heightEndRight;
boolean hasHeightEndLeftRight = hasHeightEndLeft && hasHeightEndRight;
boolean hasBankingEndFromHeights = hasHeightEndLeftRight && heightEndLeft != heightEndRight;
double bankingEnd = segment.getBankingEnd();
boolean hasBankingEnd = !Double.isNaN(bankingEnd);
if (hasHeightEnd && (hasHeightEndLeft || hasHeightEndRight))
{
textArea.append(segmentInfo + "has height end and height end left or height end right\n");
}
if (hasBankingEnd && hasBankingEndFromHeights)
{
textArea.append(segmentInfo + "Banking end angle and banking from heights\n");
@ -396,7 +415,7 @@ public class CheckDialog extends JDialog
double grade = segment.getGrade();
boolean hasGrade = !Double.isNaN(grade);
if (hasGrade && hasHeightEnd)
if (hasGrade && hasHeightEndLeftRight)
{
if (hasBankingEndFromHeights)
{
@ -411,7 +430,7 @@ public class CheckDialog extends JDialog
Segment previous = segment.previousShape;
Segment next = segment.nextShape;
if (previous != null && hasHeightStart)
if (previous != null && hasHeightStartLeftRight)
{
if (!Double.isNaN(previousHeightEndLeft) && previousHeightEndLeft != heightStartLeft)
{
@ -423,7 +442,7 @@ public class CheckDialog extends JDialog
textArea.append(segmentInfo + "Previous height end right : " + previousHeightEndRight + " doesn't match " + heightStartRight + "\n");
}
}
else if (next == null && hasHeightEnd)
else if (next == null && hasHeightEndLeftRight)
{
if (!Double.isNaN(firstHeightStartLeft) && firstHeightStartLeft != heightEndLeft)
{

2
src/tools/trackeditor/utils/Properties.java
View File

@ -34,7 +34,7 @@ public class Properties
private static Properties instance = new Properties();
private Vector<ActionListener> propertiesListeners = new Vector<ActionListener>();
public final String title = "sd2-trackeditor";
public final String version = "1.4.0";
public final String version = "1.4.1";
private String path;
private double imageScale = 1;