|
|
|
@ -41,12 +41,8 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
|
|
|
|
|
MarkerType.MARKER_DIAMOND_HOLLOW, |
|
|
|
|
MarkerType.MARKER_TRIANGLE_HOLLOW |
|
|
|
|
}; |
|
|
|
|
private static Marker[] normalMarkers = null; |
|
|
|
|
private static Marker[] normalMarkersWithNull = null; |
|
|
|
|
private static Marker[] normalMarkersWithAuto = null; |
|
|
|
|
private static Marker[] normalMarkersWithAutoAndNull = null; |
|
|
|
|
|
|
|
|
|
private static Marker[] getNormalMarkersWithCustom(MarkerType[] types) { |
|
|
|
|
protected Marker[] getNormalMarkersWithCustom(MarkerType[] types) { |
|
|
|
|
MarkerType[] customTypes = types == null ? new MarkerType[0] : types; |
|
|
|
|
Marker[] result = new Marker[customTypes.length + NORMAL_TYPES.length]; |
|
|
|
|
|
|
|
|
@ -63,58 +59,6 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected static Marker[] getNormalMarkers() { |
|
|
|
|
if (normalMarkers == null) { |
|
|
|
|
normalMarkers = getNormalMarkersWithCustom(new MarkerType[0]); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return normalMarkers; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected static Marker[] getNormalMarkersWithNull() { |
|
|
|
|
if (normalMarkersWithNull == null) { |
|
|
|
|
normalMarkersWithNull = getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_NULL}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return normalMarkersWithNull; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected static Marker[] getNormalMarkersWithAuto() { |
|
|
|
|
if (normalMarkersWithAuto == null) { |
|
|
|
|
normalMarkersWithAuto = getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_AUTO}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return normalMarkersWithAuto; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected static Marker[] getNormalMarkersWithAutoAndNull() { |
|
|
|
|
if (normalMarkersWithAutoAndNull == null) { |
|
|
|
|
normalMarkersWithAutoAndNull = getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_AUTO, MarkerType.MARKER_NULL}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return normalMarkersWithAutoAndNull; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
//甘特图的菱形是实心的,之前写的空心。
|
|
|
|
|
//兼容:模板属性不做兼容。只是之前空心做界面兼容。前台展现实心空心一样的效果,所以不用做什么
|
|
|
|
|
private static final MarkerType[] GANTT_TYPES = { |
|
|
|
|
MarkerType.MARKER_TRIANGLE, |
|
|
|
|
MarkerType.MARKER_DIAMOND, |
|
|
|
|
MarkerType.MARKER_STAR |
|
|
|
|
}; |
|
|
|
|
private static Marker[] ganttMarkers = null; |
|
|
|
|
|
|
|
|
|
protected static Marker[] getGanttMarkers() { |
|
|
|
|
if (ganttMarkers == null) { |
|
|
|
|
ganttMarkers = new Marker[GANTT_TYPES.length]; |
|
|
|
|
int i = 0; |
|
|
|
|
for (MarkerType markerType : GANTT_TYPES) { |
|
|
|
|
ganttMarkers[i++] = Marker.createMarker(markerType); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return ganttMarkers; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public MarkerComboBox getMarkerTypeComboBox() { |
|
|
|
|
return markerTypeComboBox; |
|
|
|
|
} |
|
|
|
@ -195,7 +139,7 @@ public class VanChartCommonMarkerPane extends BasicBeanPane<VanChartAttrMarker>
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
protected Marker[] getMarkers() { |
|
|
|
|
return getNormalMarkersWithNull(); |
|
|
|
|
return getNormalMarkersWithCustom(new MarkerType[]{MarkerType.MARKER_NULL}); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|