diff --git a/drawing/Common.lua b/drawing/Common.lua index 9bbde4f..e99bab3 100644 --- a/drawing/Common.lua +++ b/drawing/Common.lua @@ -2,6 +2,8 @@ local M = {} local Util = require 'Util' local Arc = require 'Arc' +local Dial = require 'Dial' +local CompoundDial = require 'CompoundDial' local Text = require 'Text' local CriticalText = require 'CriticalText' local TextColumn = require 'TextColumn' @@ -277,8 +279,22 @@ M.text_ring_set = function(tr, cr, value) end -------------------------------------------------------------------------------- --- separator (eg a horizontal line) +-- dial +M.dial = function(x, y, radius, thickness, threshold) + return _G_Widget_.Dial( + _G_Widget_.make_semicircle(x, y, radius, 90, 360), + _G_Widget_.arc_style(thickness, _G_Patterns_.INDICATOR_BG), + _G_Widget_.threshold_style( + _G_Patterns_.INDICATOR_FG_PRIMARY, + _G_Patterns_.INDICATOR_FG_CRITICAL, + threshold + ) + ) +end + +-------------------------------------------------------------------------------- +-- separator (eg a horizontal line) M.initSeparator = function(x, y, w) return _G_Widget_.Line( diff --git a/drawing/Memory.lua b/drawing/Memory.lua index 62d991b..7bad6f3 100644 --- a/drawing/Memory.lua +++ b/drawing/Memory.lua @@ -54,18 +54,7 @@ local DIAL_THETA_1 = math.rad(360) 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(DIAL_X, DIAL_Y, DIAL_RADIUS, 90, 360), - _G_Widget_.arc_style( - _DIAL_THICKNESS_, - _G_Patterns_.INDICATOR_BG - ), - _G_Widget_.threshold_style( - _G_Patterns_.INDICATOR_FG_PRIMARY, - _G_Patterns_.INDICATOR_FG_CRITICAL, - 0.8 - ) -) +local dial = Common.dial(DIAL_X, DIAL_Y, DIAL_RADIUS, _DIAL_THICKNESS_, 0.8) local cache_arc = _G_Widget_.Arc( _G_Widget_.make_semicircle(DIAL_X, DIAL_Y, DIAL_RADIUS, 90, 360), _G_Widget_.arc_style(