1.1 --- a/WMIProvider/Sensor.cs	Sat Oct 16 13:29:06 2010 +0000
     1.2 +++ b/WMIProvider/Sensor.cs	Sat Oct 16 14:15:41 2010 +0000
     1.3 @@ -1,11 +1,49 @@
     1.4 +/*
     1.5 +  
     1.6 +  Version: MPL 1.1/GPL 2.0/LGPL 2.1
     1.7 +
     1.8 +  The contents of this file are subject to the Mozilla Public License Version
     1.9 +  1.1 (the "License"); you may not use this file except in compliance with
    1.10 +  the License. You may obtain a copy of the License at
    1.11 + 
    1.12 +  http://www.mozilla.org/MPL/
    1.13 +
    1.14 +  Software distributed under the License is distributed on an "AS IS" basis,
    1.15 +  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
    1.16 +  for the specific language governing rights and limitations under the License.
    1.17 +
    1.18 +  The Original Code is the Open Hardware Monitor code.
    1.19 +
    1.20 +  The Initial Developer of the Original Code is 
    1.21 +  Paul Werelds <paul@werelds.net>.
    1.22 +  Portions created by the Initial Developer are Copyright (C) 2009-2010
    1.23 +  the Initial Developer. All Rights Reserved.
    1.24 +
    1.25 +  Contributor(s):
    1.26 +
    1.27 +  Alternatively, the contents of this file may be used under the terms of
    1.28 +  either the GNU General Public License Version 2 or later (the "GPL"), or
    1.29 +  the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
    1.30 +  in which case the provisions of the GPL or the LGPL are applicable instead
    1.31 +  of those above. If you wish to allow use of your version of this file only
    1.32 +  under the terms of either the GPL or the LGPL, and not to allow others to
    1.33 +  use your version of this file under the terms of the MPL, indicate your
    1.34 +  decision by deleting the provisions above and replace them with the notice
    1.35 +  and other provisions required by the GPL or the LGPL. If you do not delete
    1.36 +  the provisions above, a recipient may use your version of this file under
    1.37 +  the terms of any one of the MPL, the GPL or the LGPL.
    1.38 + 
    1.39 +*/
    1.40 +
    1.41  using System.Management.Instrumentation;
    1.42  using OpenHardwareMonitor.Hardware;
    1.43  
    1.44  namespace OpenHardwareMonitor.WMIProvider {
    1.45    [InstrumentationClass(InstrumentationType.Instance)]
    1.46 -  public class Sensor : IWmiClass {
    1.47 +  public class Sensor : IWmiObject {
    1.48 +    private ISensor sensor;
    1.49  
    1.50 -    private ISensor _sensor;
    1.51 +    #region WMI Exposed
    1.52  
    1.53      public string SensorType { get; private set; }
    1.54      public string Identifier { get; private set; }
    1.55 @@ -16,25 +54,27 @@
    1.56      public float Max { get; private set; }
    1.57      public int Index { get; private set; }
    1.58  
    1.59 -    public Sensor(ISensor sensor) {
    1.60 -      Name = sensor.Name;
    1.61 -      Index = sensor.Index;
    1.62 +    #endregion
    1.63  
    1.64 -      SensorType = sensor.SensorType.ToString();
    1.65 -      Identifier = sensor.Identifier.ToString();
    1.66 -      Parent = sensor.Hardware.Identifier.ToString();
    1.67 +    public Sensor(ISensor data) {
    1.68 +      Name = data.Name;
    1.69 +      Index = data.Index;
    1.70  
    1.71 -      _sensor = sensor;
    1.72 +      SensorType = data.SensorType.ToString();
    1.73 +      Identifier = data.Identifier.ToString();
    1.74 +      Parent = data.Hardware.Identifier.ToString();
    1.75 +
    1.76 +      sensor = data;
    1.77      }
    1.78      
    1.79      public void Update() {
    1.80 -      Value = (_sensor.Value != null) ? (float)_sensor.Value : 0;
    1.81 +      Value = (sensor.Value != null) ? (float)sensor.Value : 0;
    1.82  
    1.83 -      if (_sensor.Min != null)
    1.84 -        Min = (float)_sensor.Min;
    1.85 +      if (sensor.Min != null)
    1.86 +        Min = (float)sensor.Min;
    1.87  
    1.88 -      if (_sensor.Max != null)
    1.89 -        Max = (float)_sensor.Max;
    1.90 +      if (sensor.Max != null)
    1.91 +        Max = (float)sensor.Max;
    1.92      }
    1.93    }
    1.94  }