mirror of
https://github.com/XCharts-Team/XCharts.git
synced 2026-05-25 10:20:10 +00:00
整理代码
This commit is contained in:
@@ -17,7 +17,6 @@ namespace XCharts
|
|||||||
[CustomPropertyDrawer(typeof(ChartTheme), true)]
|
[CustomPropertyDrawer(typeof(ChartTheme), true)]
|
||||||
public class ThemeDrawer : BasePropertyDrawer
|
public class ThemeDrawer : BasePropertyDrawer
|
||||||
{
|
{
|
||||||
private bool m_ThemeModuleToggle = false;
|
|
||||||
public override string ClassName { get { return "Theme"; } }
|
public override string ClassName { get { return "Theme"; } }
|
||||||
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
|
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ namespace XCharts.Examples
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < taskCount; i++)
|
for (int i = 0; i < taskCount; i++)
|
||||||
{
|
{
|
||||||
var taskName = "task-" + (i + 1);
|
|
||||||
var startIndex = Random.Range(0, (int)(dayCount * 2.0f / 3));
|
var startIndex = Random.Range(0, (int)(dayCount * 2.0f / 3));
|
||||||
var endIndex = Random.Range(startIndex, dayCount);
|
var endIndex = Random.Range(startIndex, dayCount);
|
||||||
chart.UpdateData(0, i, 0, startIndex);
|
chart.UpdateData(0, i, 0, startIndex);
|
||||||
@@ -67,7 +66,7 @@ namespace XCharts.Examples
|
|||||||
chart.AddXAxisData("day" + (i + 1));
|
chart.AddXAxisData("day" + (i + 1));
|
||||||
}
|
}
|
||||||
|
|
||||||
var serie = chart.AddSerie(SerieType.Gantt, "任务进度表");
|
chart.AddSerie(SerieType.Gantt, "任务进度表");
|
||||||
for (int i = 0; i < taskCount; i++)
|
for (int i = 0; i < taskCount; i++)
|
||||||
{
|
{
|
||||||
var taskName = "task-" + (i + 1);
|
var taskName = "task-" + (i + 1);
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ namespace XCharts.Examples
|
|||||||
var endTimestamp = startTimestamp + Random.Range(1, 10) * 3600 * 24;
|
var endTimestamp = startTimestamp + Random.Range(1, 10) * 3600 * 24;
|
||||||
chart.AddData(0, startTimestamp, endTimestamp, taskName);
|
chart.AddData(0, startTimestamp, endTimestamp, taskName);
|
||||||
}
|
}
|
||||||
var serie2 = chart.AddSerie(SerieType.Gantt, "李四");
|
chart.AddSerie(SerieType.Gantt, "李四");
|
||||||
for (int i = 0; i < taskCount; i++)
|
for (int i = 0; i < taskCount; i++)
|
||||||
{
|
{
|
||||||
var taskName = "李四-任务-" + (i + 1);
|
var taskName = "李四-任务-" + (i + 1);
|
||||||
@@ -85,7 +85,7 @@ namespace XCharts.Examples
|
|||||||
var endTimestamp = startTimestamp + Random.Range(1, 10) * 3600 * 24;
|
var endTimestamp = startTimestamp + Random.Range(1, 10) * 3600 * 24;
|
||||||
chart.AddData(0, startTimestamp, endTimestamp, taskName);
|
chart.AddData(0, startTimestamp, endTimestamp, taskName);
|
||||||
}
|
}
|
||||||
var serie2 = chart.AddSerie(SerieType.Gantt, "李四");
|
chart.AddSerie(SerieType.Gantt, "李四");
|
||||||
for (int i = 0; i < taskCount; i++)
|
for (int i = 0; i < taskCount; i++)
|
||||||
{
|
{
|
||||||
var taskName = "李四-任务-" + (i + 1);
|
var taskName = "李四-任务-" + (i + 1);
|
||||||
|
|||||||
@@ -61,7 +61,7 @@ namespace XCharts.Examples
|
|||||||
if(openIdx == closeIdx){
|
if(openIdx == closeIdx){
|
||||||
closeIdx ++;
|
closeIdx ++;
|
||||||
}
|
}
|
||||||
var volumn = boxVals[3]*(1000+Random.Range(0f,1f) * 500);
|
//var volumn = boxVals[3]*(1000+Random.Range(0f,1f) * 500);
|
||||||
var open = boxVals[openIdx];
|
var open = boxVals[openIdx];
|
||||||
var close = boxVals[closeIdx];
|
var close = boxVals[closeIdx];
|
||||||
var lowest = boxVals[0];
|
var lowest = boxVals[0];
|
||||||
|
|||||||
@@ -510,37 +510,5 @@ namespace XCharts
|
|||||||
{
|
{
|
||||||
return base.GetHashCode();
|
return base.GetHashCode();
|
||||||
}
|
}
|
||||||
|
|
||||||
internal virtual void SetVerticesDirty()
|
|
||||||
{
|
|
||||||
m_VertsDirty = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal virtual void ClearVerticesDirty()
|
|
||||||
{
|
|
||||||
m_VertsDirty = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal virtual void SetComponentDirty()
|
|
||||||
{
|
|
||||||
m_ComponentDirty = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
internal virtual void ClearComponentDirty()
|
|
||||||
{
|
|
||||||
m_ComponentDirty = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void ClearDirty()
|
|
||||||
{
|
|
||||||
ClearVerticesDirty();
|
|
||||||
ClearComponentDirty();
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void SetAllDirty()
|
|
||||||
{
|
|
||||||
SetVerticesDirty();
|
|
||||||
SetComponentDirty();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -389,7 +389,6 @@ namespace XCharts
|
|||||||
}
|
}
|
||||||
UpdateSerieGridIndex();
|
UpdateSerieGridIndex();
|
||||||
RefreshSeriePainterByGridIndex(grid.index);
|
RefreshSeriePainterByGridIndex(grid.index);
|
||||||
var category = tempAxis.GetData(index, dataZoom);
|
|
||||||
var content = TooltipHelper.GetFormatterContent(tooltip, index, this, dataZoom, isCartesian);
|
var content = TooltipHelper.GetFormatterContent(tooltip, index, this, dataZoom, isCartesian);
|
||||||
TooltipHelper.SetContentAndPosition(tooltip, content, chartRect);
|
TooltipHelper.SetContentAndPosition(tooltip, content, chartRect);
|
||||||
tooltip.SetActive(true);
|
tooltip.SetActive(true);
|
||||||
@@ -645,7 +644,6 @@ namespace XCharts
|
|||||||
{
|
{
|
||||||
if (axis.type != Axis.AxisType.Category) return;
|
if (axis.type != Axis.AxisType.Category) return;
|
||||||
if (axis.data.Count > 0) return;
|
if (axis.data.Count > 0) return;
|
||||||
var isYAxis = axis is YAxis;
|
|
||||||
if (this is GanttChart)
|
if (this is GanttChart)
|
||||||
{
|
{
|
||||||
axis.runtimeData.Clear();
|
axis.runtimeData.Clear();
|
||||||
|
|||||||
@@ -25,7 +25,6 @@ namespace XCharts
|
|||||||
float barGap = GetBarGap();
|
float barGap = GetBarGap();
|
||||||
float barWidth = serie.GetBarWidth(categoryWidth);
|
float barWidth = serie.GetBarWidth(categoryWidth);
|
||||||
float space = (categoryWidth - barWidth) / 2;
|
float space = (categoryWidth - barWidth) / 2;
|
||||||
float barGapWidth = barWidth + barWidth * barGap;
|
|
||||||
int maxCount = serie.maxShow > 0
|
int maxCount = serie.maxShow > 0
|
||||||
? (serie.maxShow > showData.Count ? showData.Count : serie.maxShow)
|
? (serie.maxShow > showData.Count ? showData.Count : serie.maxShow)
|
||||||
: showData.Count;
|
: showData.Count;
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ namespace XCharts
|
|||||||
var grid = GetSerieGridOrDefault(serie);
|
var grid = GetSerieGridOrDefault(serie);
|
||||||
var xCategoryWidth = AxisHelper.GetDataWidth(xAxis, grid.runtimeWidth, showData.Count, dataZoom);
|
var xCategoryWidth = AxisHelper.GetDataWidth(xAxis, grid.runtimeWidth, showData.Count, dataZoom);
|
||||||
var yCategoryWidth = AxisHelper.GetDataWidth(yAxis, grid.runtimeHeight, showData.Count, dataZoom);
|
var yCategoryWidth = AxisHelper.GetDataWidth(yAxis, grid.runtimeHeight, showData.Count, dataZoom);
|
||||||
var barGap = GetBarGap();
|
|
||||||
var barWidth = serie.GetBarWidth(yCategoryWidth);
|
var barWidth = serie.GetBarWidth(yCategoryWidth);
|
||||||
var space = (yCategoryWidth - barWidth) / 2;
|
var space = (yCategoryWidth - barWidth) / 2;
|
||||||
var dataChanging = false;
|
var dataChanging = false;
|
||||||
|
|||||||
@@ -205,7 +205,6 @@ namespace XCharts
|
|||||||
serie.showDataName = true;
|
serie.showDataName = true;
|
||||||
serie.showDataDimension = 2;
|
serie.showDataDimension = 2;
|
||||||
var timestamp = DateTimeUtil.GetTimestamp();
|
var timestamp = DateTimeUtil.GetTimestamp();
|
||||||
var now = DateTimeUtil.GetDateTime(timestamp);
|
|
||||||
for (int i = 0; i < dataCount; i++)
|
for (int i = 0; i < dataCount; i++)
|
||||||
{
|
{
|
||||||
var start = timestamp + Random.Range(1, 6) * 3600 * 24;
|
var start = timestamp + Random.Range(1, 6) * 3600 * 24;
|
||||||
|
|||||||
@@ -386,7 +386,7 @@ namespace XCharts
|
|||||||
{
|
{
|
||||||
|
|
||||||
#if UNITY_2018_1_OR_NEWER
|
#if UNITY_2018_1_OR_NEWER
|
||||||
foreach (var assembly in CompilationPipeline.GetAssemblies(AssembliesType.Player))
|
foreach (var assembly in UnityEditor.Compilation.CompilationPipeline.GetAssemblies(UnityEditor.Compilation.AssembliesType.Player))
|
||||||
{
|
{
|
||||||
if (assembly.name.Equals("Unity.TextMeshPro")) return true;
|
if (assembly.name.Equals("Unity.TextMeshPro")) return true;
|
||||||
}
|
}
|
||||||
@@ -414,7 +414,6 @@ namespace XCharts
|
|||||||
Debug.LogError("AddTMPRefence ERROR: can't find: " + asmdefPath);
|
Debug.LogError("AddTMPRefence ERROR: can't find: " + asmdefPath);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
var oldText = File.ReadAllText(asmdefPath);
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var dest = new List<string>();
|
var dest = new List<string>();
|
||||||
|
|||||||
Reference in New Issue
Block a user