git-svn-id: http://10.4.3.168:50001/svn/Furnace@42 dbcde07d-dcf5-c148-8a84-ac3097b7778e

Branch/NTP02/FrameworkLocal/UIClient/Themes/OceanBlue/Button.xaml

@@ -527,7 +527,7 @@
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="BG" Property="Background" Value="{StaticResource Button_BG_Unable}"/>
                             <Setter TargetName="BG" Property="BorderBrush" Value="{StaticResource Button_BD_Unable}"/>
-                            <Setter TargetName="Inner_BG" Property="Background" Value="{StaticResource Button_InnerBG_Unable}"/>
+                            <!--<Setter TargetName="Inner_BG" Property="Background" Value="{StaticResource Button_InnerBG_Unable}"/>-->
                             <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
                             <Setter Property="Effect" TargetName="contentpresenter">
                                 <Setter.Value>

Branch/NTP02/Furnace/FurnaceSimulator/Config/NTP02/_ioDefineHeater.xml

@@ -0,0 +1,149 @@
+<?xml version="1.0"?>
+<IO_DEFINE xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+	<Dig_In>
+		<DI_ITEM Index="0"	Name="DI_HeaterUCascadePVSBrk"			BufferOffset="0"	Addr="15660"	Description="HeaterU Cascade PV SBrk" />
+		<DI_ITEM Index="1"	Name="DI_HeaterUHeaterPVSBrk"				BufferOffset="1"	Addr="15661"	Description="HeaterU Heater PV SBrk" />
+		<DI_ITEM Index="2"	Name="DI_HeaterUEnableOutput"			BufferOffset="2"	Addr="15662"	Description="HeaterU Enable Output" />
+
+		<DI_ITEM Index="3"	Name="DI_HeaterCUCascadePVSBrk"			BufferOffset="3"	Addr="15663"	Description="HeaterCU Cascade PV SBrk" />
+		<DI_ITEM Index="4"	Name="DI_HeaterCUHeaterPVSBrk"				BufferOffset="4"	Addr="15664"	Description="HeaterCU Heater PV SBrk" />
+		<DI_ITEM Index="5"	Name="DI_HeaterCUEnableOutput"			BufferOffset="5"	Addr="15665"	Description="HeaterCU Enable Output" />
+
+		<DI_ITEM Index="6"	Name="DI_HeaterCCascadePVSBrk"			BufferOffset="6"	Addr="15666"	Description="HeaterC Cascade PV SBrk" />
+		<DI_ITEM Index="7"	Name="DI_HeaterCHeaterPVSBrk"				BufferOffset="7"	Addr="15667"	Description="HeaterC Heater PV SBrk" />
+		<DI_ITEM Index="8"	Name="DI_HeaterCEnableOutput"			BufferOffset="8"	Addr="15668"	Description="HeaterC Enable Output" />
+
+		<DI_ITEM Index="9"	Name="DI_HeaterCLCascadePVSBrk"			BufferOffset="9"	Addr="15669"	Description="HeaterCL Cascade PV SBrk" />
+		<DI_ITEM Index="10"	Name="DI_HeaterCLHeaterPVSBrk"				BufferOffset="10"	Addr="15670"	Description="HeaterCL Heater PV SBrk" />
+		<DI_ITEM Index="11"	Name="DI_HeaterCLEnableOutput"			BufferOffset="11"	Addr="15671"	Description="HeaterCL Enable Output" />
+
+		<DI_ITEM Index="12"	Name="DI_HeaterLCascadePVSBrk"			BufferOffset="12"	Addr="15672"	Description="HeaterL Cascade PV SBrk" />
+		<DI_ITEM Index="13"	Name="DI_HeaterLHeaterPVSBrk"				BufferOffset="13"	Addr="15673"	Description="HeaterL Heater PV SBrk" />
+		<DI_ITEM Index="14"	Name="DI_HeaterLEnableOutput"			BufferOffset="14"	Addr="15674"	Description="HeaterL Enable Output" />
+
+	</Dig_In>
+	<Dig_Out>
+		<DO_ITEM Index="0"	Name="DO_HeaterUEnableIn"				BufferOffset="0"	Addr="15500"	Description="HeaterU Enable In" />
+		<DO_ITEM Index="1"	Name="DO_HeaterUAutoManual"				BufferOffset="1"	Addr="15501"	Description="HeaterU Auto/Manual" />
+		<DO_ITEM Index="2"	Name="DO_HeaterUHeaterPVSelect"			BufferOffset="2"	Addr="15502"	Description="HeaterU Heater PV Select" />
+		<DO_ITEM Index="3"	Name="DO_HeaterUCascadeMode"			BufferOffset="3"	Addr="15503"	Description="HeaterU Cascade Mode" />
+
+		<DO_ITEM Index="4"	Name="DO_HeaterCUEnableIn"				BufferOffset="4"	Addr="15504"	Description="HeaterCU Enable In" />
+		<DO_ITEM Index="5"	Name="DO_HeaterCUAutoManual"				BufferOffset="5"	Addr="15505"	Description="HeaterCU Auto/Manual" />
+		<DO_ITEM Index="6"	Name="DO_HeaterCUHeaterPVSelect"			BufferOffset="6"	Addr="15506"	Description="HeaterCU Heater PV Select" />
+		<DO_ITEM Index="7"	Name="DO_HeaterCUCascadeMode"			BufferOffset="7"	Addr="15507"	Description="HeaterCU Cascade Mode" />
+
+		<DO_ITEM Index="8"	Name="DO_HeaterCEnableIn"				BufferOffset="8"	Addr="15508"	Description="HeaterC Enable In" />
+		<DO_ITEM Index="9"	Name="DO_HeaterCAutoManual"				BufferOffset="9"	Addr="15509"	Description="HeaterC Auto/Manual" />
+		<DO_ITEM Index="10"	Name="DO_HeaterCHeaterPVSelect"			BufferOffset="10"	Addr="15510"	Description="HeaterC Heater PV Select" />
+		<DO_ITEM Index="11"	Name="DO_HeaterCCascadeMode"			BufferOffset="11"	Addr="15511"	Description="HeaterC Cascade Mode" />
+
+		<DO_ITEM Index="12"	Name="DO_HeaterCLEnableIn"				BufferOffset="12"	Addr="15512"	Description="HeaterCL Enable In" />
+		<DO_ITEM Index="13"	Name="DO_HeaterCLAutoManual"				BufferOffset="13"	Addr="15513"	Description="HeaterCL Auto/Manual" />
+		<DO_ITEM Index="14"	Name="DO_HeaterCLHeaterPVSelect"			BufferOffset="14"	Addr="15514"	Description="HeaterCL Heater PV Select" />
+		<DO_ITEM Index="15"	Name="DO_HeaterCLCascadeMode"			BufferOffset="15"	Addr="15515"	Description="HeaterCL Cascade Mode" />
+
+		<DO_ITEM Index="16"	Name="DO_HeaterLEnableIn"				BufferOffset="16"	Addr="15516"	Description="HeaterL Enable In" />
+		<DO_ITEM Index="17"	Name="DO_HeaterLAutoManual"				BufferOffset="17"	Addr="15517"	Description="HeaterL Auto/Manual" />
+		<DO_ITEM Index="18"	Name="DO_HeaterLHeaterPVSelect"			BufferOffset="18"	Addr="15518"	Description="HeaterL Heater PV Select" />
+		<DO_ITEM Index="19"	Name="DO_HeaterLCascadeMode"			BufferOffset="19"	Addr="15519"	Description="HeaterL Cascade Mode" />
+
+	</Dig_Out>
+	<Ana_In>
+		<AI_ITEM Index="0"	Name="AI_HeaterUCascadePV"				BufferOffset="0"	Addr="15682"	Description="HeaterU Cascade PV" />
+		<AI_ITEM Index="1"	Name="AI_HeaterUHeaterPV"					BufferOffset="2"	Addr="15684"	Description="HeaterU Heater PV" />
+		<AI_ITEM Index="2"	Name="AI_HeaterUWorkingOutput"			BufferOffset="4"	Addr="15686"	Description="HeaterU Working Output" />
+		<AI_ITEM Index="3"	Name="AI_HeaterUOverTemp"				BufferOffset="6"	Addr="15688"	Description="HeaterU Over Temp" />
+
+		<AI_ITEM Index="4"	Name="AI_HeaterCUCascadePV"				BufferOffset="8"	Addr="15690"	Description="HeaterCU Cascade PV" />
+		<AI_ITEM Index="5"	Name="AI_HeaterCUHeaterPV"					BufferOffset="10"	Addr="15692"	Description="HeaterCU Heater PV" />
+		<AI_ITEM Index="6"	Name="AI_HeaterCUWorkingOutput"			BufferOffset="12"	Addr="15694"	Description="HeaterCU Working Output" />
+		<AI_ITEM Index="7"	Name="AI_HeaterCUOverTemp"				BufferOffset="14"	Addr="15696"	Description="HeaterCU Over Temp" />
+
+		<AI_ITEM Index="8"	Name="AI_HeaterCCascadePV"				BufferOffset="16"	Addr="15698"	Description="HeaterC Cascade PV" />
+		<AI_ITEM Index="9"	Name="AI_HeaterCHeaterPV"					BufferOffset="18"	Addr="15700"	Description="HeaterC Heater PV" />
+		<AI_ITEM Index="10"	Name="AI_HeaterCWorkingOutput"			BufferOffset="20"	Addr="15702"	Description="HeaterC Working Output" />
+		<AI_ITEM Index="11"	Name="AI_HeaterCOverTemp"				BufferOffset="22"	Addr="15704"	Description="HeaterC Over Temp" />
+
+		<AI_ITEM Index="12"	Name="AI_HeaterCLCascadePV"				BufferOffset="24"	Addr="15706"	Description="HeaterCL Cascade PV" />
+		<AI_ITEM Index="13"	Name="AI_HeaterCLHeaterPV"					BufferOffset="26"	Addr="15708"	Description="HeaterCL Heater PV" />
+		<AI_ITEM Index="14"	Name="AI_HeaterCLWorkingOutput"			BufferOffset="28"	Addr="15710"	Description="HeaterCL Working Output" />
+		<AI_ITEM Index="15"	Name="AI_HeaterCLOverTemp"				BufferOffset="30"	Addr="15712"	Description="HeaterCL Over Temp" />
+
+		<AI_ITEM Index="16"	Name="AI_HeaterLCascadePV"				BufferOffset="32"	Addr="15714"	Description="HeaterL Cascade PV" />
+		<AI_ITEM Index="17"	Name="AI_HeaterLHeaterPV"					BufferOffset="34"	Addr="15716"	Description="HeaterL Heater PV" />
+		<AI_ITEM Index="18"	Name="AI_HeaterLWorkingOutput"			BufferOffset="36"	Addr="15718"	Description="HeaterL Working Output" />
+		<AI_ITEM Index="19"	Name="AI_HeaterLOverTemp"				BufferOffset="38"	Addr="15720"	Description="HeaterL Over Temp" />
+
+		<AI_ITEM Index="20"	Name="AI_HeaterUWorkingTarget"				BufferOffset="40"	Addr="15722"	Description="HeaterU.working target" />
+		<AI_ITEM Index="21"	Name="AI_HeaterCUWorkingTarget"				BufferOffset="42"	Addr="15724"	Description="HeaterCU.working target" />
+		<AI_ITEM Index="22"	Name="AI_HeaterCWorkingTarget"				BufferOffset="44"	Addr="15726"	Description="HeaterC.working target" />
+		<AI_ITEM Index="23"	Name="AI_HeaterCLWorkingTarget"				BufferOffset="46"	Addr="15728"	Description="HeaterCL.working target" />
+		<AI_ITEM Index="24"	Name="AI_HeaterLWorkingTarget"				BufferOffset="48"	Addr="15730"	Description="HeaterL.working target" />
+
+	</Ana_In>
+	<Ana_Out>
+		<AO_ITEM Index="0"	Name="AO_HeaterUHeaterControlModeSV"						BufferOffset="0"	Addr="15520"	Description="HeaterU Heater Control Mode SV" />
+		<AO_ITEM Index="1"	Name="AO_HeaterCUHeaterControlModeSV"						BufferOffset="2"	Addr="15522"	Description="HeaterCU Heater Control Mode SV" />
+		<AO_ITEM Index="2"	Name="AO_HeaterCHeaterControlModeSV"						BufferOffset="4"	Addr="15524"	Description="HeaterC Heater Control Mode SV" />
+		<AO_ITEM Index="3"	Name="AO_HeaterCLHeaterControlModeSV"						BufferOffset="6"	Addr="15526"	Description="HeaterCL Heater Control Mode SV" />
+		<AO_ITEM Index="4"	Name="AO_HeaterLHeaterControlModeSV"						BufferOffset="8"	Addr="15528"	Description="HeaterL Heater Control Mode SV" />
+
+		<AO_ITEM Index="0"	Name="AO_HeaterUCascadeControlModeSV"						BufferOffset="10"	Addr="15530"	Description="HeaterU Cascade Control Mode SV" />
+		<AO_ITEM Index="1"	Name="AO_HeaterUUpRate"					BufferOffset="12"	Addr="15532"	Description="HeaterU Up Rate" />
+		<AO_ITEM Index="2"	Name="AO_HeaterUDownRate"				BufferOffset="14"	Addr="15534"	Description="HeaterU Down Rate" />
+		<AO_ITEM Index="3"	Name="AO_HeaterUCascade_P"				BufferOffset="16"	Addr="15536"	Description="HeaterU Cascade P" />
+		<AO_ITEM Index="4"	Name="AO_HeaterUCascade_I"				BufferOffset="18"	Addr="15538"	Description="HeaterU Cascade I" />
+		<AO_ITEM Index="5"	Name="AO_HeaterUCascade_D"				BufferOffset="20"	Addr="15540"	Description="HeaterU Cascade D" />
+		<AO_ITEM Index="6"	Name="AO_HeaterUHeater_P"					BufferOffset="22"	Addr="15542"	Description="HeaterU Heater P" />
+		<AO_ITEM Index="7"	Name="AO_HeaterUHeater_I"					BufferOffset="24"	Addr="15544"	Description="HeaterU Heater I" />
+		<AO_ITEM Index="8"	Name="AO_HeaterUHeater_D"					BufferOffset="26"	Addr="15546"	Description="HeaterU Heater D" />
+    <AO_ITEM Index="10"	Name="AO_HeaterUTCOpenOffset"	BufferOffset="30"	Addr="15550"	Description="HeaterU TC OPEN OFFSET" />
+
+		<AO_ITEM Index="11"	Name="AO_HeaterCUCascadeControlModeSV"						BufferOffset="32"	Addr="15552"	Description="HeaterCU Cascade Control Mode SV" />
+		<AO_ITEM Index="12"	Name="AO_HeaterCUUpRate"					BufferOffset="34"	Addr="15554"	Description="HeaterCU Up Rate" />
+		<AO_ITEM Index="13"	Name="AO_HeaterCUDownRate"				BufferOffset="36"	Addr="15556"	Description="HeaterCU Down Rate" />
+		<AO_ITEM Index="14"	Name="AO_HeaterCUCascade_P"				BufferOffset="38"	Addr="15558"	Description="HeaterCU Cascade P" />
+		<AO_ITEM Index="15"	Name="AO_HeaterCUCascade_I"				BufferOffset="40"	Addr="15560"	Description="HeaterCU Cascade I" />
+		<AO_ITEM Index="16"	Name="AO_HeaterCUCascade_D"				BufferOffset="42"	Addr="15562"	Description="HeaterCU Cascade D" />
+		<AO_ITEM Index="17"	Name="AO_HeaterCUHeater_P"					BufferOffset="44"	Addr="15564"	Description="HeaterCU Heater P" />
+		<AO_ITEM Index="18"	Name="AO_HeaterCUHeater_I"					BufferOffset="46"	Addr="15566"	Description="HeaterCU Heater I" />
+		<AO_ITEM Index="19"	Name="AO_HeaterCUHeater_D"					BufferOffset="48"	Addr="15568"	Description="HeaterCU Heater D" />
+    <AO_ITEM Index="21"	Name="AO_HeaterCUTCOpenOffset"					BufferOffset="52"	Addr="15572"	Description="HeaterCU TC OPEN OFFSET" />
+
+		<AO_ITEM Index="22"	Name="AO_HeaterCCascadeControlModeSV"						BufferOffset="54"	Addr="15574"	Description="HeaterC Cascade Control Mode SV" />
+		<AO_ITEM Index="23"	Name="AO_HeaterCUpRate"					BufferOffset="56"	Addr="15576"	Description="HeaterC Up Rate" />
+		<AO_ITEM Index="24"	Name="AO_HeaterCDownRate"				BufferOffset="58"	Addr="15578"	Description="HeaterC Down Rate" />
+		<AO_ITEM Index="25"	Name="AO_HeaterCCascade_P"				BufferOffset="60"	Addr="15580"	Description="HeaterC Cascade P" />
+		<AO_ITEM Index="26"	Name="AO_HeaterCCascade_I"				BufferOffset="62"	Addr="15582"	Description="HeaterC Cascade I" />
+		<AO_ITEM Index="27"	Name="AO_HeaterCCascade_D"				BufferOffset="64"	Addr="15584"	Description="HeaterC Cascade D" />
+		<AO_ITEM Index="28"	Name="AO_HeaterCHeater_P"					BufferOffset="66"	Addr="15586"	Description="HeaterC Heater P" />
+		<AO_ITEM Index="29"	Name="AO_HeaterCHeater_I"					BufferOffset="68"	Addr="15588"	Description="HeaterC Heater I" />
+		<AO_ITEM Index="30"	Name="AO_HeaterCHeater_D"					BufferOffset="70"	Addr="15590"	Description="HeaterC Heater D" />
+    <AO_ITEM Index="32"	Name="AO_HeaterCTCOpenOffset"					BufferOffset="74"	Addr="15594"	Description="HeaterC TC OPEN OFFSET" />
+
+    <AO_ITEM Index="33"	Name="AO_HeaterCLCascadeControlModeSV"						BufferOffset="76"	Addr="15596"	Description="HeaterCL Cascade Control Mode SV" />
+		<AO_ITEM Index="34"	Name="AO_HeaterCLUpRate"					BufferOffset="78"	Addr="15598"	Description="HeaterCL Up Rate" />
+		<AO_ITEM Index="35"	Name="AO_HeaterCLDownRate"				BufferOffset="80"	Addr="15600"	Description="HeaterCL Down Rate" />
+		<AO_ITEM Index="36"	Name="AO_HeaterCLCascade_P"				BufferOffset="82"	Addr="15602"	Description="HeaterCL Cascade P" />
+		<AO_ITEM Index="37"	Name="AO_HeaterCLCascade_I"				BufferOffset="84"	Addr="15604"	Description="HeaterCL Cascade I" />
+		<AO_ITEM Index="38"	Name="AO_HeaterCLCascade_D"				BufferOffset="86"	Addr="15606"	Description="HeaterCL Cascade D" />
+		<AO_ITEM Index="39"	Name="AO_HeaterCLHeater_P"					BufferOffset="88"	Addr="15608"	Description="HeaterCL Heater P" />
+		<AO_ITEM Index="40"	Name="AO_HeaterCLHeater_I"					BufferOffset="90"	Addr="15610"	Description="HeaterCL Heater I" />
+		<AO_ITEM Index="41"	Name="AO_HeaterCLHeater_D"					BufferOffset="92"	Addr="15612"	Description="HeaterCL Heater D" />
+    <AO_ITEM Index="43"	Name="AO_HeaterCLTCOpenOffset"					BufferOffset="96"	Addr="15616"	Description="HeaterCL TC OPEN OFFSET" />
+
+		<AO_ITEM Index="44"	Name="AO_HeaterLCascadeControlModeSV"						BufferOffset="98"	Addr="15618"	Description="HeaterL Cascade Control Mode SV" />
+		<AO_ITEM Index="45"	Name="AO_HeaterLUpRate"					BufferOffset="100"	Addr="15620"	Description="HeaterL Up Rate" />
+		<AO_ITEM Index="46"	Name="AO_HeaterLDownRate"				BufferOffset="102"	Addr="15622"	Description="HeaterL Down Rate" />
+		<AO_ITEM Index="47"	Name="AO_HeaterLCascade_P"				BufferOffset="104"	Addr="15624"	Description="HeaterL Cascade P" />
+		<AO_ITEM Index="48"	Name="AO_HeaterLCascade_I"				BufferOffset="106"	Addr="15626"	Description="HeaterL Cascade I" />
+		<AO_ITEM Index="49"	Name="AO_HeaterLCascade_D"				BufferOffset="108"	Addr="15628"	Description="HeaterL Cascade D" />
+		<AO_ITEM Index="50"	Name="AO_HeaterLHeater_P"					BufferOffset="110"	Addr="15630"	Description="HeaterL Heater P" />
+		<AO_ITEM Index="51"	Name="AO_HeaterLHeater_I"					BufferOffset="112"	Addr="15632"	Description="HeaterL Heater I" />
+		<AO_ITEM Index="52"	Name="AO_HeaterLHeater_D"					BufferOffset="114"	Addr="15634"	Description="HeaterL Heater D" />
+    <AO_ITEM Index="54"	Name="AO_HeaterLTCOpenOffset"					BufferOffset="118"	Addr="15638"	Description="HeaterL TC OPEN OFFSET" />
+
+
+  </Ana_Out>
+</IO_DEFINE>

Branch/NTP02/Furnace/FurnaceSimulator/FurnaceSimulator.csproj

@@ -206,7 +206,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="Config\NTP02\_ioDefineHeater.xml" />
+    <Resource Include="Config\NTP02\_ioDefinePM.xml" />
+  </ItemGroup>
   <ItemGroup />
   <ItemGroup>
     <None Include="Config\SiBCN\_ioDefinePM.xml">

Branch/NTP02/Furnace/FurnaceSimulator/Views/PLCView.xaml

@@ -12,7 +12,7 @@
                 Port="6740"
                 Source="System.PM1"/>
         </TabItem>
-        <TabItem Header="GasLine1">
+        <!--<TabItem Header="GasLine1">
             <local:SimulatorPlcFloatIOView
                 IoMapFile="ELK\\_ioDefineGasLine.xml"
                 Module="GasLine1"
@@ -53,7 +53,7 @@
                 Module="GasLine7"
                 Port="6747"
                 Source="System.GasLine7"/>
-        </TabItem>
+        </TabItem>-->
         <!--<TabItem Header="GasLine8">
             <local:SimulatorPlcFloatIOView
                 IoMapFile="ELK\\_ioDefineGasLine.xml"

Branch/NTP02/Furnace/FurnaceUI/Views/Editors/NTP02/RecipeGasPanelSettingView.xaml.cs

@@ -11,7 +11,12 @@ namespace FurnaceUI.Views.Editors.NTP02
         public RecipeGasPanelSettingView()
         {
             InitializeComponent();
-        } 
+        }
         #endregion
+
+        private void GasSingularLine_Loaded(object sender, System.Windows.RoutedEventArgs e)
+        {
+
+        }
     }
 }