Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move TrackChartPoints from TrackDetailsMenu

Browse source
This commit is contained in:
Vitaliy 2020-06-24 18:15:35 +03:00
parent 1cce2705ee
commit a974a48240
5 changed files with 51 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackChartPoints.java Normal file
View file

@ -0,0 +1,46 @@
package net.osmand.plus.mapcontextmenu.other;
import net.osmand.GPXUtilities.GPXFile;
import net.osmand.data.LatLon;
import java.util.List;
public class TrackChartPoints {
private List<LatLon> xAxisPoints;
private LatLon highlightedPoint;
private int segmentColor;
private GPXFile gpx;
public List<LatLon> getXAxisPoints() {
return xAxisPoints;
}
public LatLon getHighlightedPoint() {
return highlightedPoint;
}
public int getSegmentColor() {
return segmentColor;
}
public GPXFile getGpx() {
return gpx;
}
public void setXAxisPoints(List<LatLon> xAxisPoints) {
this.xAxisPoints = xAxisPoints;
}
public void setHighlightedPoint(LatLon highlightedPoint) {
this.highlightedPoint = highlightedPoint;
}
public void setSegmentColor(int segmentColor) {
this.segmentColor = segmentColor;
}
public void setGpx(GPXFile gpx) {
this.gpx = gpx;
}
}

41
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/TrackDetailsMenu.java
View file

@ -806,43 +806,4 @@ public class TrackDetailsMenu {
return NO_COLOR; return NO_COLOR;
} }
} }
}
public static class TrackChartPoints {
private List<LatLon> xAxisPoints;
private LatLon highlightedPoint;
private int segmentColor;
private GPXFile gpx;
public List<LatLon> getXAxisPoints() {
return xAxisPoints;
}
public LatLon getHighlightedPoint() {
return highlightedPoint;
}
public int getSegmentColor() {
return segmentColor;
}
public GPXFile getGpx() {
return gpx;
}
public void setXAxisPoints(List<LatLon> xAxisPoints) {
this.xAxisPoints = xAxisPoints;
}
public void setHighlightedPoint(LatLon highlightedPoint) {
this.highlightedPoint = highlightedPoint;
}
public void setSegmentColor(int segmentColor) {
this.segmentColor = segmentColor;
}
public void setGpx(GPXFile gpx) {
this.gpx = gpx;
}
}
}

2
OsmAnd/src/net/osmand/plus/views/GPXLayer.java
View file

@ -42,7 +42,7 @@ import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.base.PointImageDrawable; import net.osmand.plus.base.PointImageDrawable;
import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController.SelectedGpxPoint; import net.osmand.plus.mapcontextmenu.controllers.SelectedGpxMenuController.SelectedGpxPoint;
import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints; import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
import net.osmand.plus.render.OsmandRenderer; import net.osmand.plus.render.OsmandRenderer;
import net.osmand.plus.render.OsmandRenderer.RenderingContext; import net.osmand.plus.render.OsmandRenderer.RenderingContext;
import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference; import net.osmand.plus.settings.backend.OsmandSettings.CommonPreference;

2
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -17,7 +17,7 @@ import net.osmand.plus.settings.backend.OsmandSettings;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.MapActivity;
import net.osmand.plus.helpers.AndroidUiHelper; import net.osmand.plus.helpers.AndroidUiHelper;
import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints; import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory; import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.CompassRulerControlWidgetState; import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.CompassRulerControlWidgetState;
import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopCoordinatesView; import net.osmand.plus.views.mapwidgets.MapInfoWidgetsFactory.TopCoordinatesView;

5
OsmAnd/src/net/osmand/plus/views/RouteLayer.java
View file

@ -36,8 +36,7 @@ import net.osmand.osm.edit.Way;
import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R; import net.osmand.plus.R;
import net.osmand.plus.UiUtilities; import net.osmand.plus.UiUtilities;
import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu; import net.osmand.plus.mapcontextmenu.other.TrackChartPoints;
import net.osmand.plus.mapcontextmenu.other.TrackDetailsMenu.TrackChartPoints;
import net.osmand.plus.profiles.LocationIcon; import net.osmand.plus.profiles.LocationIcon;
import net.osmand.plus.render.RenderingIcons; import net.osmand.plus.render.RenderingIcons;
import net.osmand.plus.routing.RouteCalculationResult; import net.osmand.plus.routing.RouteCalculationResult;
@ -104,7 +103,7 @@ public class RouteLayer extends OsmandMapLayer implements ContextMenuLayer.ICont
this.transportHelper = helper.getTransportRoutingHelper(); this.transportHelper = helper.getTransportRoutingHelper();
} }
public void setTrackChartPoints(TrackDetailsMenu.TrackChartPoints trackChartPoints) { public void setTrackChartPoints(TrackChartPoints trackChartPoints) {
this.trackChartPoints = trackChartPoints; this.trackChartPoints = trackChartPoints;
} }