Skip to content

Commit

Permalink
Merge pull request #74 from FJBDev/master
Browse files Browse the repository at this point in the history
 Bugfix for the vertical line of the last tag #48
  • Loading branch information
patrovite authored Jun 18, 2018
2 parents 133f6fe + e9077c7 commit 9a8ad84
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependency>
<groupId>net.iakovlev</groupId>
<artifactId>timeshape</artifactId>
<version>2018d.1</version>
<version>2018d.3</version>
</dependency>
</dependencies>
</project>
15 changes: 7 additions & 8 deletions src/course_generator/mrb/PanelProfilMRB.java
Original file line number Diff line number Diff line change
Expand Up @@ -656,8 +656,8 @@ else if (ProfileType == 2)
}

// -- Copyright --
//Image img = Toolkit.getDefaultToolkit()
// .getImage(getClass().getResource("/course_generator/images/copyright.png"));
// Image img = Toolkit.getDefaultToolkit()
// .getImage(getClass().getResource("/course_generator/images/copyright.png"));
Image img = getIcon("copyright.png");
g2d.drawImage(img, width - 15, (height - offy - img.getHeight(null)) / 2, this);

Expand Down Expand Up @@ -932,7 +932,7 @@ private void DrawSlopeProfile(Graphics2D g2d, Double xmin, Double ymin, double r
avrSlope += Math.abs(r.getSlope());
nbSlope++;

if ((xCurvePts[2] - xCurvePts[0]) > track.CurveFilter) // Filtre
if ((xCurvePts[2] - xCurvePts[0]) >= track.CurveFilter) // Filtre
{
double avr = avrSlope / nbSlope;
if (avr < 5.0)
Expand Down Expand Up @@ -1023,7 +1023,7 @@ public void save(String filename) {
try {
ImageIO.write(image, "png", new File(filename));
} catch (IOException ex) {
CgLog.error("PanelProfilMRB.save : Impossible to save the profil image");
CgLog.error("PanelProfilMRB.save : Impossible to save the profile image");
System.out.println(ex.getMessage());
}
// -- Enable Highlight of the current box
Expand Down Expand Up @@ -1062,11 +1062,10 @@ public void setSelLine(int selLine) {
SelLine = selLine;
repaint();
}



private Image getIcon(String name) {
return Toolkit.getDefaultToolkit().getImage(getClass().getResource("/course_generator/images/old/"+name));
return Toolkit.getDefaultToolkit().getImage(getClass().getResource("/course_generator/images/old/" + name));
}



}

0 comments on commit 9a8ad84

Please sign in to comment.