From 529cc3824c4dd751b07090600ae61e9eb1b27b0d Mon Sep 17 00:00:00 2001 From: ndwarshuis Date: Sun, 11 Jul 2021 18:19:09 -0400 Subject: [PATCH] ENH don't make point for semicircles --- core | 2 +- drawing/Common.lua | 7 +------ drawing/Memory.lua | 14 ++------------ drawing/Processor.lua | 7 +------ 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/core b/core index db3924e..9e6e960 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit db3924e25d98b942b4bc9fe81cb8bb8ada8a1fb1 +Subproject commit 9e6e960796bd66bc050f2d111ecdab6c309a0874 diff --git a/drawing/Common.lua b/drawing/Common.lua index 10457cc..f5aba34 100644 --- a/drawing/Common.lua +++ b/drawing/Common.lua @@ -218,12 +218,7 @@ end M.initRing = function(x, y, r) return _G_Widget_.Arc( - _G_Widget_.make_semicircle( - _G_Widget_.make_point(x, y), - r, - 0, - 360 - ), + _G_Widget_.make_semicircle(x, y, r, 0, 360), _G_Widget_.arc_style( 2, _G_Patterns_.BORDER_FG diff --git a/drawing/Memory.lua b/drawing/Memory.lua index 55e4b6a..62d991b 100644 --- a/drawing/Memory.lua +++ b/drawing/Memory.lua @@ -55,12 +55,7 @@ local DIAL_X = _G_INIT_DATA_.RIGHT_X + DIAL_RADIUS + _DIAL_THICKNESS_ / 2 local DIAL_Y = header.bottom_y + DIAL_RADIUS + _DIAL_THICKNESS_ / 2 local dial = _G_Widget_.Dial( - _G_Widget_.make_semicircle( - _G_Widget_.make_point(DIAL_X, DIAL_Y), - DIAL_RADIUS, - 90, - 360 - ), + _G_Widget_.make_semicircle(DIAL_X, DIAL_Y, DIAL_RADIUS, 90, 360), _G_Widget_.arc_style( _DIAL_THICKNESS_, _G_Patterns_.INDICATOR_BG @@ -72,12 +67,7 @@ local dial = _G_Widget_.Dial( ) ) local cache_arc = _G_Widget_.Arc( - _G_Widget_.make_semicircle( - _G_Widget_.make_point(DIAL_X, DIAL_Y), - DIAL_RADIUS, - 90, - 360 - ), + _G_Widget_.make_semicircle(DIAL_X, DIAL_Y, DIAL_RADIUS, 90, 360), _G_Widget_.arc_style( _DIAL_THICKNESS_, _G_Patterns_.INDICATOR_FG_SECONDARY diff --git a/drawing/Processor.lua b/drawing/Processor.lua index f18a713..cd12737 100644 --- a/drawing/Processor.lua +++ b/drawing/Processor.lua @@ -57,12 +57,7 @@ local _create_core_ = function(cores, id, x, y) cores[id +1] = { dials = _G_Widget_.CompoundDial( - _G_Widget_.make_semicircle( - _G_Widget_.make_point(x, y), - _DIAL_OUTER_RADIUS_, - 90, - 360 - ), + _G_Widget_.make_semicircle(x, y, _DIAL_OUTER_RADIUS_, 90, 360), _G_Widget_.arc_style( _DIAL_THICKNESS_, _G_Patterns_.INDICATOR_BG