- Material Pair에 layout 적용

- Trend Graph에 Force, Velocity 추가

DataHandler.cs

@@ -40,6 +40,8 @@ namespace friction
 		{
 			public float HUMIDITY;
 			public float TEMPERATURE;
+			public float FORCE;
+			public float VELOCITY;
 			public float RPN;
 
 			override public string ToString()
@@ -207,7 +209,7 @@ namespace friction
 			return result;
 		}
 
-		public List<TREND_CHART> GetHumidityChart(string strSpring, string strTable)
+		public List<TREND_CHART> GetTrendChart(string strSpring, string strTable)
 		{
 			string strQuery = string.Format("[{0}]='{1}' and [{2}]='{3}'", Config.COLUMN_NAME.SPRING, strSpring, Config.COLUMN_NAME.TABLE, strTable);
 			DataRow[] rows = m_Data.Select(strQuery);
@@ -219,6 +221,8 @@ namespace friction
 				{
 					HUMIDITY = (float)r[Config.COLUMN_NAME.HUMIDITY],
 					TEMPERATURE = (float)r[Config.COLUMN_NAME.TEMP],
+					FORCE = (float)r[Config.COLUMN_NAME.FORCE],
+					VELOCITY = (float)r[Config.COLUMN_NAME.VELOCITY],
 					RPN = (float)r[Config.COLUMN_NAME.RPN],
 				});
 			}
@@ -226,7 +230,6 @@ namespace friction
 			return result;
 		}
 
-
 		#region calculation
 		float CalcDependency(DataRow[] rows, string strColumn)
 		{