Hardware/ATI/ATIGPU.cs
changeset 165 813d8bc3192f
parent 164 cc1e116d0f2c
child 166 fa9dfbfc4145
     1.1 --- a/Hardware/ATI/ATIGPU.cs	Thu Aug 05 19:28:50 2010 +0000
     1.2 +++ b/Hardware/ATI/ATIGPU.cs	Sun Aug 08 13:57:26 2010 +0000
     1.3 @@ -37,13 +37,11 @@
     1.4  
     1.5  using System;
     1.6  using System.Collections.Generic;
     1.7 -using System.Drawing;
     1.8  
     1.9  namespace OpenHardwareMonitor.Hardware.ATI {
    1.10 -  public class ATIGPU : Hardware {
    1.11 +  internal class ATIGPU : Hardware {
    1.12  
    1.13      private string name;
    1.14 -    private Image icon;
    1.15      private int adapterIndex;
    1.16      private int busNumber;
    1.17      private int deviceNumber;
    1.18 @@ -56,22 +54,20 @@
    1.19      private Sensor fanControl;
    1.20  
    1.21      public ATIGPU(string name, int adapterIndex, int busNumber, 
    1.22 -      int deviceNumber) 
    1.23 +      int deviceNumber, ISettings settings) 
    1.24      {
    1.25        this.name = name;
    1.26 -      this.icon = Utilities.EmbeddedResources.GetImage("ati.png");
    1.27        this.adapterIndex = adapterIndex;
    1.28        this.busNumber = busNumber;
    1.29        this.deviceNumber = deviceNumber;
    1.30  
    1.31 -      this.temperature = 
    1.32 -        new Sensor("GPU Core", 0, SensorType.Temperature, this);
    1.33 -      this.fan = new Sensor("GPU Fan", 0, SensorType.Fan, this, null);
    1.34 -      this.coreClock = new Sensor("GPU Core", 0, SensorType.Clock, this);
    1.35 -      this.memoryClock = new Sensor("GPU Memory", 1, SensorType.Clock, this);
    1.36 -      this.coreVoltage = new Sensor("GPU Core", 0, SensorType.Voltage, this);
    1.37 -      this.coreLoad = new Sensor("GPU Core", 0, SensorType.Load, this);
    1.38 -      this.fanControl = new Sensor("GPU Fan", 0, SensorType.Control, this);
    1.39 +      this.temperature = new Sensor("GPU Core", 0, SensorType.Temperature, this, settings);
    1.40 +      this.fan = new Sensor("GPU Fan", 0, SensorType.Fan, this, settings);
    1.41 +      this.coreClock = new Sensor("GPU Core", 0, SensorType.Clock, this, settings);
    1.42 +      this.memoryClock = new Sensor("GPU Memory", 1, SensorType.Clock, this, settings);
    1.43 +      this.coreVoltage = new Sensor("GPU Core", 0, SensorType.Voltage, this, settings);
    1.44 +      this.coreLoad = new Sensor("GPU Core", 0, SensorType.Load, this, settings);
    1.45 +      this.fanControl = new Sensor("GPU Fan", 0, SensorType.Control, this, settings);
    1.46        Update();                   
    1.47      }
    1.48  
    1.49 @@ -87,8 +83,8 @@
    1.50        get { return new Identifier("atigpu", adapterIndex.ToString()); }
    1.51      }
    1.52  
    1.53 -    public override Image Icon {
    1.54 -      get { return icon; }
    1.55 +    public override HardwareType HardwareType {
    1.56 +      get { return HardwareType.GPU; }
    1.57      }
    1.58  
    1.59      public override void Update() {