Limit triangle generator to right triangles
This commit is contained in:
+10
-7
@@ -36,7 +36,7 @@ static TextLayer *s_drop_txt_under_layer;
|
||||
static Layer *s_division_layer;
|
||||
static Layer *s_alarm_highlight_layer;
|
||||
static MenuLayer *s_drop_menu_layer;
|
||||
static TriangleLayer *s_triangle_layer;
|
||||
static RightTriangleLayer *s_triangle_layer;
|
||||
static TextLayer *s_side_a_txt_layer;
|
||||
static TextLayer *s_side_b_txt_layer;
|
||||
static TextLayer *s_side_c_txt_layer;
|
||||
@@ -535,32 +535,33 @@ static void alarm_window_load() {
|
||||
layer_add_child(window_layer, s_alarm_highlight_layer);
|
||||
|
||||
// triangle
|
||||
s_triangle_layer = triangle_layer_create(GRect(0, s_top_bar_grect.size.h + 1, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - (s_top_bar_grect.size.h * 2)), GColorBlack);
|
||||
s_triangle_layer = right_triangle_layer_create(GRect(0, s_top_bar_grect.size.h + 1, PBL_DISPLAY_WIDTH, PBL_DISPLAY_HEIGHT - (s_top_bar_grect.size.h * 2)), GColorBlack);
|
||||
layer_add_child(window_layer, s_triangle_layer->layer);
|
||||
|
||||
// triangle measurements text layers
|
||||
//// side_a
|
||||
s_side_a_txt_layer = text_layer_create(GRect(0, s_bottom_bar_grect.origin.y - 27, PBL_DISPLAY_WIDTH, 23));
|
||||
s_side_a_txt_layer = text_layer_create(GRect(0, s_bottom_bar_grect.origin.y - 25, PBL_DISPLAY_WIDTH, 23));
|
||||
text_layer_set_background_color(s_side_a_txt_layer, GColorClear);
|
||||
text_layer_set_font(s_side_a_txt_layer, s_font_mansalva_small);
|
||||
text_layer_set_text_alignment(s_side_a_txt_layer, GTextAlignmentCenter);
|
||||
layer_add_child(window_layer, text_layer_get_layer(s_side_a_txt_layer));
|
||||
//// side_b
|
||||
s_side_b_txt_layer = text_layer_create(GRect(-4, PBL_DISPLAY_WIDTH / 2, PBL_DISPLAY_WIDTH, 23));
|
||||
s_side_b_txt_layer = text_layer_create(GRect(-3, PBL_DISPLAY_WIDTH / 2, PBL_DISPLAY_WIDTH, 23));
|
||||
text_layer_set_background_color(s_side_b_txt_layer, GColorClear);
|
||||
text_layer_set_font(s_side_b_txt_layer, s_font_mansalva_small);
|
||||
text_layer_set_text_alignment(s_side_b_txt_layer, GTextAlignmentRight);
|
||||
layer_add_child(window_layer, text_layer_get_layer(s_side_b_txt_layer));
|
||||
//// side_c
|
||||
s_side_c_txt_layer = text_layer_create(GRect(4, PBL_DISPLAY_WIDTH / 2, PBL_DISPLAY_WIDTH, 23));
|
||||
s_side_c_txt_layer = text_layer_create(GRect(3, PBL_DISPLAY_WIDTH / 2, PBL_DISPLAY_WIDTH, 23));
|
||||
text_layer_set_background_color(s_side_c_txt_layer, GColorClear);
|
||||
text_layer_set_font(s_side_c_txt_layer, s_font_mansalva_small);
|
||||
layer_add_child(window_layer, text_layer_get_layer(s_side_c_txt_layer));
|
||||
//// display 2 side lengths to the user
|
||||
static char side_a_buffer[3], side_b_buffer[3], side_c_buffer[3];
|
||||
static char side_a_buffer[8], side_b_buffer[8], side_c_buffer[8], angle_A_buffer[8], angle_B_buffer[8], angle_C_buffer[8];
|
||||
uint8_t ignored_side = rand() % 3;
|
||||
switch (ignored_side) {
|
||||
case 0:
|
||||
APP_LOG(APP_LOG_LEVEL_DEBUG, "b,c");
|
||||
snprintf(side_b_buffer, sizeof(side_b_buffer), "%u", s_triangle_layer->side_b);
|
||||
snprintf(side_c_buffer, sizeof(side_c_buffer), "%u", s_triangle_layer->side_c);
|
||||
s_options_over[0] = side_b_buffer;
|
||||
@@ -569,6 +570,7 @@ static void alarm_window_load() {
|
||||
s_options_under[1] = side_c_buffer;
|
||||
break;
|
||||
case 1:
|
||||
APP_LOG(APP_LOG_LEVEL_DEBUG, "a,c");
|
||||
snprintf(side_a_buffer, sizeof(side_a_buffer), "%u", s_triangle_layer->side_a);
|
||||
snprintf(side_c_buffer, sizeof(side_c_buffer), "%u", s_triangle_layer->side_c);
|
||||
s_options_over[0] = side_a_buffer;
|
||||
@@ -577,6 +579,7 @@ static void alarm_window_load() {
|
||||
s_options_under[1] = side_c_buffer;
|
||||
break;
|
||||
case 2:
|
||||
APP_LOG(APP_LOG_LEVEL_DEBUG, "a,b");
|
||||
snprintf(side_a_buffer, sizeof(side_a_buffer), "%u", s_triangle_layer->side_a);
|
||||
snprintf(side_b_buffer, sizeof(side_b_buffer), "%u", s_triangle_layer->side_b);
|
||||
s_options_over[0] = side_a_buffer;
|
||||
@@ -611,7 +614,7 @@ static void alarm_window_unload() {
|
||||
text_layer_destroy(s_side_a_txt_layer);
|
||||
text_layer_destroy(s_side_b_txt_layer);
|
||||
text_layer_destroy(s_side_c_txt_layer);
|
||||
triangle_layer_destroy(s_triangle_layer);
|
||||
right_triangle_layer_destroy(s_triangle_layer);
|
||||
layer_destroy(s_alarm_highlight_layer);
|
||||
layer_destroy(s_division_layer);
|
||||
text_layer_destroy(s_parenthesis_txt_layer);
|
||||
|
||||
Reference in New Issue
Block a user