refactor: apply GDScript style guide to line_chart.gd

This commit is contained in:
eddex 2020-10-05 18:12:23 +02:00
parent 836efde1b6
commit b871022ccb

View File

@ -8,14 +8,12 @@ extends Chart
# It is a basic type of chart common in many fields. It is similar to a scatter plot # It is a basic type of chart common in many fields. It is similar to a scatter plot
# except that the measurement points are ordered (typically by their x-axis value) # except that the measurement points are ordered (typically by their x-axis value)
# and joined with straight line segments. # and joined with straight line segments.
# A line chart is often used to visualize a trend in data over intervals of time # A line chart is often used to visualize a trend in data over intervals of time -
# a time series thus the line is often drawn chronologically. # a time series - thus the line is often drawn chronologically.
# In these cases they are known as run charts. # In these cases they are known as run charts.
# Source: Wikipedia # Source: Wikipedia
# ---------------------
func _get_property_list(): func _get_property_list():
return [ return [
# Chart Properties # Chart Properties
@ -58,8 +56,11 @@ func _get_property_list():
# Chart Style # Chart Style
{ {
"hint": 24, "hint": 24,
"hint_string": "%d/%d:%s"%[TYPE_INT, PROPERTY_HINT_ENUM, "hint_string":
PoolStringArray(PointShapes.keys()).join(",")], (
"%d/%d:%s"
% [TYPE_INT, PROPERTY_HINT_ENUM, PoolStringArray(PointShapes.keys()).join(",")]
),
"name": "Chart_Style/points_shape", "name": "Chart_Style/points_shape",
"type": TYPE_ARRAY, "type": TYPE_ARRAY,
"usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE "usage": PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE
@ -127,55 +128,54 @@ func _get_property_list():
}, },
] ]
func structure_datas(database : Array, are_values_columns : bool, x_values_index : int):
func structure_datas(database: Array, are_values_columns: bool, x_values_index: int):
# @x_values_index can be either a column or a row relative to x values # @x_values_index can be either a column or a row relative to x values
# @y_values can be either a column or a row relative to y values
self.are_values_columns = are_values_columns self.are_values_columns = are_values_columns
match are_values_columns: if are_values_columns:
true: for row in database.size():
for row in database.size(): var t_vals: Array
var t_vals : Array for column in database[row].size():
for column in database[row].size(): if column == x_values_index:
if column == x_values_index: var x_data = database[row][column]
var x_data = database[row][column] if x_data.is_valid_float() or x_data.is_valid_integer():
if x_data.is_valid_float() or x_data.is_valid_integer(): x_datas.append(x_data as float)
x_datas.append(x_data as float)
else:
x_datas.append(x_data.replace(",",".") as float)
else: else:
if row != 0: x_datas.append(x_data.replace(",", ".") as float)
var y_data = database[row][column]
if y_data.is_valid_float() or y_data.is_valid_integer():
t_vals.append(y_data as float)
else:
t_vals.append(y_data.replace(",",".") as float)
else:
y_labels.append(str(database[row][column]))
if not t_vals.empty():
y_datas.append(t_vals)
x_label = str(x_datas.pop_front())
false:
for row in database.size():
if row == x_values_index:
x_datas = (database[row])
x_label = x_datas.pop_front() as String
else: else:
var values = database[row] as Array if row != 0:
y_labels.append(values.pop_front() as String) var y_data = database[row][column]
y_datas.append(values) if y_data.is_valid_float() or y_data.is_valid_integer():
for data in y_datas: t_vals.append(y_data as float)
for value in data.size(): else:
data[value] = data[value] as float t_vals.append(y_data.replace(",", ".") as float)
else:
y_labels.append(str(database[row][column]))
if not t_vals.empty():
y_datas.append(t_vals)
x_label = str(x_datas.pop_front())
else:
for row in database.size():
if row == x_values_index:
x_datas = (database[row])
x_label = x_datas.pop_front() as String
else:
var values = database[row] as Array
y_labels.append(values.pop_front() as String)
y_datas.append(values)
for data in y_datas:
for value in data.size():
data[value] = data[value] as float
# draw y labels # draw y labels
var to_order : Array var to_order: Array
var to_order_min : Array var to_order_min: Array
for cluster in y_datas.size(): for cluster in y_datas.size():
# define x_chors and y_chors # define x_chors and y_chors
var ordered_cluster = y_datas[cluster] as Array var ordered_cluster = y_datas[cluster] as Array
ordered_cluster.sort() ordered_cluster.sort()
ordered_cluster = PoolIntArray(ordered_cluster) ordered_cluster = PoolIntArray(ordered_cluster)
var margin_max = ordered_cluster[ordered_cluster.size()-1] var margin_max = ordered_cluster[ordered_cluster.size() - 1]
var margin_min = ordered_cluster[0] var margin_min = ordered_cluster[0]
to_order.append(margin_max) to_order.append(margin_max)
to_order_min.append(margin_min) to_order_min.append(margin_min)
@ -185,13 +185,13 @@ func structure_datas(database : Array, are_values_columns : bool, x_values_index
var margin = to_order.pop_back() var margin = to_order.pop_back()
if not origin_at_zero: if not origin_at_zero:
y_margin_min = to_order_min.pop_front() y_margin_min = to_order_min.pop_front()
v_dist = y_decim * pow(10.0,str(margin).length()-2) v_dist = y_decim * pow(10.0, str(margin).length() - 2)
var multi = 0 var multi = 0
var p = (v_dist*multi) + ((y_margin_min) if not origin_at_zero else 0) var p = (v_dist * multi) + ((y_margin_min) if not origin_at_zero else 0)
y_chors.append(p as String) y_chors.append(p as String)
while p < margin: while p < margin:
multi+=1 multi += 1
p = (v_dist*multi) + ((y_margin_min) if not origin_at_zero else 0) p = (v_dist * multi) + ((y_margin_min) if not origin_at_zero else 0)
y_chors.append(p as String) y_chors.append(p as String)
# draw x_labels # draw x_labels
@ -203,18 +203,20 @@ func structure_datas(database : Array, are_values_columns : bool, x_values_index
margin = to_order.pop_back() margin = to_order.pop_back()
if not origin_at_zero: if not origin_at_zero:
x_margin_min = to_order.pop_front() x_margin_min = to_order.pop_front()
h_dist = x_decim * pow(10.0,str(margin).length()-2) h_dist = x_decim * pow(10.0, str(margin).length() - 2)
multi = 0 multi = 0
p = (h_dist*multi) + ((x_margin_min) if not origin_at_zero else 0) p = (h_dist * multi) + ((x_margin_min) if not origin_at_zero else 0)
x_labels.append(p as String) x_labels.append(p as String)
while p < margin: while p < margin:
multi+=1 multi += 1
p = (h_dist*multi) + ((x_margin_min) if not origin_at_zero else 0) p = (h_dist * multi) + ((x_margin_min) if not origin_at_zero else 0)
x_labels.append(p as String) x_labels.append(p as String)
func build_chart(): func build_chart():
SIZE = get_size() SIZE = get_size()
origin = Vector2(OFFSET.x,SIZE.y-OFFSET.y) origin = Vector2(OFFSET.x, SIZE.y - OFFSET.y)
func calculate_pass(): func calculate_pass():
if invert_chart: if invert_chart:
@ -226,8 +228,9 @@ func calculate_pass():
x_chors = x_labels x_chors = x_labels
# calculate distance in pixel between 2 consecutive values/datas # calculate distance in pixel between 2 consecutive values/datas
x_pass = (SIZE.x - OFFSET.x) / (x_chors.size()-1) x_pass = (SIZE.x - OFFSET.x) / (x_chors.size() - 1)
y_pass = origin.y / (y_chors.size()-1) y_pass = origin.y / (y_chors.size() - 1)
func calculate_coordinates(): func calculate_coordinates():
x_coordinates.clear() x_coordinates.clear()
@ -237,35 +240,35 @@ func calculate_coordinates():
if invert_chart: if invert_chart:
for column in y_datas[0].size(): for column in y_datas[0].size():
var single_coordinates : Array var single_coordinates: Array
for row in y_datas: for row in y_datas:
if origin_at_zero: if origin_at_zero:
single_coordinates.append((row[column]*y_pass)/v_dist) single_coordinates.append((row[column] * y_pass) / v_dist)
else: else:
single_coordinates.append((row[column] - y_margin_min)*y_pass/v_dist) single_coordinates.append((row[column] - y_margin_min) * y_pass / v_dist)
y_coordinates.append(single_coordinates) y_coordinates.append(single_coordinates)
else: else:
for cluster in y_datas: for cluster in y_datas:
var single_coordinates : Array var single_coordinates: Array
for value in cluster.size(): for value in cluster.size():
if origin_at_zero: if origin_at_zero:
single_coordinates.append((cluster[value]*y_pass)/v_dist) single_coordinates.append((cluster[value] * y_pass) / v_dist)
else: else:
single_coordinates.append((cluster[value] - y_margin_min)*y_pass/v_dist) single_coordinates.append((cluster[value] - y_margin_min) * y_pass / v_dist)
y_coordinates.append(single_coordinates) y_coordinates.append(single_coordinates)
if show_x_values_as_labels: if show_x_values_as_labels:
for x in x_datas.size(): for x in x_datas.size():
x_coordinates.append(x_pass*x) x_coordinates.append(x_pass * x)
else: else:
for x in x_datas.size(): for x in x_datas.size():
if origin_at_zero: if origin_at_zero:
if invert_chart: if invert_chart:
x_coordinates.append(x_pass*x) x_coordinates.append(x_pass * x)
else: else:
x_coordinates.append(x_datas[x]*x_pass/h_dist) x_coordinates.append(x_datas[x] * x_pass / h_dist)
else: else:
x_coordinates.append((x_datas[x] - x_margin_min)*x_pass/h_dist) x_coordinates.append((x_datas[x] - x_margin_min) * x_pass / h_dist)
for f in functions: for f in functions:
point_values.append([]) point_values.append([])
@ -275,20 +278,30 @@ func calculate_coordinates():
for function in y_coordinates.size(): for function in y_coordinates.size():
for function_value in y_coordinates[function].size(): for function_value in y_coordinates[function].size():
if are_values_columns: if are_values_columns:
point_positions[function_value].append(Vector2(x_coordinates[function]+origin.x, origin.y-y_coordinates[function][function_value])) point_positions[function_value].append(Vector2(
point_values[function_value].append([x_datas[function_value],y_datas[function_value][function]]) x_coordinates[function] + origin.x,
origin.y - y_coordinates[function][function_value]))
point_values[function_value].append(
[x_datas[function_value], y_datas[function_value][function]])
else: else:
point_positions[function].append(Vector2(x_coordinates[function_value]+origin.x,origin.y-y_coordinates[function][function_value])) point_positions[function].append(Vector2(
point_values[function].append([x_datas[function_value],y_datas[function_value][function]]) x_coordinates[function_value] + origin.x,
origin.y - y_coordinates[function][function_value]))
point_values[function].append(
[x_datas[function_value], y_datas[function_value][function]])
else: else:
for cluster in y_coordinates.size(): for cluster in y_coordinates.size():
for y in y_coordinates[cluster].size(): for y in y_coordinates[cluster].size():
if are_values_columns: if are_values_columns:
point_values[y].append([x_datas[cluster],y_datas[cluster][y]]) point_values[y].append([x_datas[cluster], y_datas[cluster][y]])
point_positions[y].append(Vector2(x_coordinates[cluster]+origin.x,origin.y-y_coordinates[cluster][y])) point_positions[y].append(Vector2(
x_coordinates[cluster] + origin.x, origin.y - y_coordinates[cluster][y]))
else: else:
point_values[cluster].append([x_datas[y],y_datas[cluster][y]]) point_values[cluster].append([x_datas[y], y_datas[cluster][y]])
point_positions[cluster].append(Vector2(x_coordinates[y]+origin.x,origin.y-y_coordinates[cluster][y])) point_positions[cluster].append(Vector2(
x_coordinates[y] + origin.x,
origin.y - y_coordinates[cluster][y]))
func _draw(): func _draw():
clear_points() clear_points()
@ -296,51 +309,68 @@ func _draw():
draw_grid() draw_grid()
draw_chart_outlines() draw_chart_outlines()
var defined_colors : bool = false var defined_colors: bool = false
if function_colors.size(): if function_colors.size():
defined_colors = true defined_colors = true
for _function in point_values.size(): for _function in point_values.size():
var PointContainer : Control = Control.new() var point_container: Control = Control.new()
Points.add_child(PointContainer) Points.add_child(point_container)
for function_point in point_values[_function].size(): for function_point in point_values[_function].size():
var point : Point = point_node.instance() var point: Point = point_node.instance()
point.connect("_point_pressed",self,"point_pressed") point.connect("_point_pressed", self, "point_pressed")
point.connect("_mouse_entered",self,"show_data") point.connect("_mouse_entered", self, "show_data")
point.connect("_mouse_exited",self,"hide_data") point.connect("_mouse_exited", self, "hide_data")
point.create_point(points_shape[_function], function_colors[function_point if invert_chart else _function], point.create_point(
Color.white, point_positions[_function][function_point], points_shape[_function],
point.format_value(point_values[_function][function_point], false, false), function_colors[function_point if invert_chart else _function],
y_labels[function_point if invert_chart else _function] as String) Color.white,
point_positions[_function][function_point],
point.format_value(point_values[_function][function_point], false, false),
y_labels[function_point if invert_chart else _function] as String)
PointContainer.add_child(point) point_container.add_child(point)
if function_point > 0: if function_point > 0:
draw_line(point_positions[_function][function_point-1], point_positions[_function][function_point], draw_line(
function_colors[function_point if invert_chart else _function], 2, false) point_positions[_function][function_point - 1],
point_positions[_function][function_point],
function_colors[function_point if invert_chart else _function],
2,
false)
func draw_grid(): func draw_grid():
# ascisse # ascisse
for p in x_chors.size(): for p in x_chors.size():
var point : Vector2 = origin+Vector2((p)*x_pass,0) var point: Vector2 = origin + Vector2((p) * x_pass, 0)
# v grid # v grid
draw_line(point,point-Vector2(0,SIZE.y-OFFSET.y),v_lines_color,0.2,true) draw_line(point, point - Vector2(0, SIZE.y - OFFSET.y), v_lines_color, 0.2, true)
# ascisse # ascisse
draw_line(point-Vector2(0,5),point,v_lines_color,1,true) draw_line(point - Vector2(0, 5), point, v_lines_color, 1, true)
draw_string(font,point+Vector2(-const_width/2*x_chors[p].length(),font_size+const_height),x_chors[p],font_color) draw_string(
font,
point + Vector2(-const_width / 2 * x_chors[p].length(), font_size + const_height),
x_chors[p],
font_color)
# ordinate # ordinate
for p in y_chors.size(): for p in y_chors.size():
var point : Vector2 = origin-Vector2(0,(p)*y_pass) var point: Vector2 = origin - Vector2(0, (p) * y_pass)
# h grid # h grid
draw_line(point,point+Vector2(SIZE.x-OFFSET.x,0),h_lines_color,0.2,true) draw_line(point, point + Vector2(SIZE.x - OFFSET.x, 0), h_lines_color, 0.2, true)
# ordinate # ordinate
draw_line(point,point+Vector2(5,0),h_lines_color,1,true) draw_line(point, point + Vector2(5, 0), h_lines_color, 1, true)
draw_string(font,point-Vector2(y_chors[p].length()*const_width+font_size,-const_height),y_chors[p],font_color) draw_string(
font,
point - Vector2(y_chors[p].length() * const_width + font_size, -const_height),
y_chors[p],
font_color)
func draw_chart_outlines(): func draw_chart_outlines():
draw_line(origin,SIZE-Vector2(0,OFFSET.y),box_color,1,true) draw_line(origin, SIZE - Vector2(0, OFFSET.y), box_color, 1, true)
draw_line(origin,Vector2(OFFSET.x,0),box_color,1,true) draw_line(origin, Vector2(OFFSET.x, 0), box_color, 1, true)
draw_line(Vector2(OFFSET.x,0),Vector2(SIZE.x,0),box_color,1,true) draw_line(Vector2(OFFSET.x, 0), Vector2(SIZE.x, 0), box_color, 1, true)
draw_line(Vector2(SIZE.x,0),SIZE-Vector2(0,OFFSET.y),box_color,1,true) draw_line(Vector2(SIZE.x, 0), SIZE - Vector2(0, OFFSET.y), box_color, 1, true)