修改rf ui

Venus/Venus_MainPages/ViewModels/OverViewModel.cs

@@ -608,11 +608,11 @@ namespace Venus_MainPages.ViewModels
         private void OnSetSRf()
         {
 
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetSRf", BRFFwdPowerSetpoint, 100, 100);
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetSRf", SRFFwdPowerSetpoint, !SRFIsOn);
         }
         private void OnSetBRf()
         {
-            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetBRf", BRFFwdPowerSetpoint, 100, 100);
+            InvokeClient.Instance.Service.DoOperation($"{ModuleName}.SetBRf", BRFFwdPowerSetpoint, !BRFIsOn);
         }
 
         private void OnPMAbort()
@@ -640,6 +640,7 @@ namespace Venus_MainPages.ViewModels
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas6.SetPoint", MfcGas6Setpoint);
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas7.SetPoint", MfcGas7Setpoint);
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.MfcGas8.SetPoint", MfcGas8Setpoint);
+            //InvokeClient
         }
 
         private void OnHV()
@@ -796,8 +797,10 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.IsLidClosed");
 
             m_RtDataKeys.Add($"{ModuleName}.SRfIsOn");
+            m_RtDataKeys.Add($"{ModuleName}.SRfForwardPowerFeedBack");
             m_RtDataKeys.Add($"{ModuleName}.SRfReflectPower");
             m_RtDataKeys.Add($"{ModuleName}.BRfIsOn");
+            m_RtDataKeys.Add($"{ModuleName}.BRfForwardPowerFeedBack");
             m_RtDataKeys.Add($"{ModuleName}.BRfReflectPower");
 
 

Venus/Venus_MainPages/Views/OverView.xaml

@@ -56,7 +56,6 @@
                     <Binding Path="N2ValveIsOpen"/>
                     <Binding Path="GasFinalValveIsOpen"/>
                 </MultiBinding>
-
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
 
@@ -208,11 +207,20 @@
 
         <ctrls:Pipe2    Canvas.Left="1144" Canvas.Top="120" HorizontalAlignment="Left" VerticalAlignment="Top"  />
 
+
+        <Ellipse Width="20" Height="20" Fill="{Binding SRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="300"/>
+        <Button Height="20"  Content="SRFM Man/Aut" Canvas.Left="530" Canvas.Top="300" Command="{Binding SetSRfCommand}"  Background="Gray"/>
+        
         <Ellipse Width="20" Height="20" Fill="{Binding SRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="325"/>
         <Button Height="20" Width="100" Content="SRF ON/OFF" Canvas.Left="530" Canvas.Top="325" Command="{Binding SetSRfCommand}"  Background="Gray"/>
+
+        <Ellipse Width="20" Height="20" Fill="{Binding BRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="650" Canvas.Top="300"/>
+        <Button Height="20" Width="100" Content="SRFM Man/Aut" Canvas.Left="680" Canvas.Top="300" Command="{Binding SetBRfCommand}"  Background="Gray"/>
+        
         <Ellipse Width="20" Height="20" Fill="{Binding BRFIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="650" Canvas.Top="325"/>
         <Button Height="20" Width="100" Content="BRF ON/OFF" Canvas.Left="680" Canvas.Top="325" Command="{Binding SetBRfCommand}"  Background="Gray"/>
-        <Button Content="Gas SetPoint" Canvas.Left="510" Canvas.Top="590" Background="Gray" Command="{Binding GasSetPointCommand}"/>
+        <!--<Ellipse Width="20" Height="20" Fill="{Binding GasIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="500" Canvas.Top="590"/>-->
+        <Button Width="100" Content="Gas SetPoint" Canvas.Left="400" Canvas.Top="650" Background="Gray" Command="{Binding GasSetPointCommand}"/>
         <Button Height="20"  Content="HV SetPoint" Canvas.Left="1290" Canvas.Top="316" Command="{Binding HVSetCommand}"  Background="Gray"/>
         <Ellipse Width="20" Height="20" Fill="{Binding HVIsOn,Converter={StaticResource boolToColor}}"  Canvas.Left="1380" Canvas.Top="316"/>
         <Button Height="20" Width="100" Content="HV ON/OFF" Canvas.Left="1410" Canvas.Top="316" Command="{Binding HVCommand}" CommandParameter="True" Background="Gray"/>
@@ -391,7 +399,7 @@
 
         <ctrls:FlowPipe  Height="8"  Width="80" Canvas.Left="1252" Canvas.Top="182"   />
         <ctrls:FlowPipe  Height="8"  Width="70" Canvas.Left="1264" Canvas.Top="272"   />
-        <TextBlock Text="Guage" Canvas.Left="1272" Canvas.Top="250"/>
+        <TextBlock Text="Guage" Canvas.Left="1272" Canvas.Top="248"/>
 
         <customControls:CommonValveControl   ValveOrientation="Horizontal" Status="{Binding RtDataValues[PMA.ValveGuage.IsOpen],Mode=TwoWay}" Height="20" Width="20" Canvas.Left="1280" Canvas.Top="265"/>
 
@@ -609,7 +617,7 @@
 
         </Grid>
 
-        <Grid Width="300" Height="230" Canvas.Left="500" Canvas.Top="352" Background="#E8E8E8"  unity:GridOptions.ShowBorder="True">
+        <Grid Width="300" Height="290"  Canvas.Left="500" Canvas.Top="352" Background="#E8E8E8"  unity:GridOptions.ShowBorder="True">
             <Grid.RowDefinitions>
                 <RowDefinition/>
                 <RowDefinition/>
@@ -620,6 +628,8 @@
                 <RowDefinition/>
                 <RowDefinition/>
                 <RowDefinition/>
+                <RowDefinition/>
+                <RowDefinition/>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="2*"/>
@@ -627,35 +637,44 @@
                 <ColumnDefinition Width="*"/>
 
             </Grid.ColumnDefinitions>
-            <TextBlock Grid.Row="0" Text="SRF Fwd Power(W)"     FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="1" Text="SRF Ref Power(W)"      FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="2" Text="SRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="3" Text="SRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="4" Text="BRF Fwd Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="5" Text="BRF Ref Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="6" Text="BRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="7" Text="BRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-            <TextBlock Grid.Row="8" Text="DC Bias(V)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
-
-            <TextBox Grid.Row="0" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFFwdPowerSetpoint}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBlock Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.SRfReflectPower],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
-            <TextBox Grid.Row="2" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="3" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFFwdPowerSetpoint}"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <!--<TextBox Grid.Row="5" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />-->
-            <TextBox Grid.Row="6" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="7" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-            <TextBox Grid.Row="8" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
-
-            <TextBlock Grid.Row="0" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.SRfForwardPowerFeedBack],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-
-            <TextBlock Grid.Row="2" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock  Text="SRF" Grid.ColumnSpan="3" FontSize="15" VerticalAlignment="Center"  HorizontalAlignment="Center"/>
+
+            <TextBlock Grid.Row="1" Text="SRF Fwd Power(W)"     FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="2" Text="SRF Ref Power(W)"      FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="3" Text="SRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="4" Text="SRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+
+            <TextBox   Grid.Row="1" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding SRFFwdPowerSetpoint}" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBlock Grid.Row="2" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.SRfReflectPower],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
+            <TextBox   Grid.Row="3" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox   Grid.Row="4" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+
+            <TextBlock Grid.Row="1" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.SRfForwardPowerFeedBack],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <!--<TextBlock Grid.Row="2" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>-->
             <TextBlock Grid.Row="3" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
             <TextBlock Grid.Row="4" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.BRfForwardPowerFeedBack],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="5" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.BRfReflectPower],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
-            <TextBlock Grid.Row="6" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="7" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
-            <TextBlock Grid.Row="8" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            
+            <TextBlock  Text="BRF" Grid.Row="5" Grid.ColumnSpan="3" FontSize="15" VerticalAlignment="Center"  HorizontalAlignment="Center"/>
+           
+            
+            <TextBlock Grid.Row="6" Text="BRF Fwd Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="7" Text="BRF Ref Power(W)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="8" Text="BRF Match C1(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="9" Text="BRF Match C2(%)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+            <TextBlock Grid.Row="10" Text="DC Bias(V)" FontSize="15" VerticalAlignment="Center" HorizontalAlignment="Left" Padding="10,0,0,0"/>
+
+           
+            <TextBox   Grid.Row="6" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding BRFFwdPowerSetpoint}"  HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            
+            <!--<TextBox   Grid.Row="7" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />-->
+            <TextBox   Grid.Row="8" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+            <TextBox   Grid.Row="9" Grid.Column="1" Width="Auto" Height="Auto" Text="0.0" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"    BorderThickness="0" />
+
+            <TextBlock Grid.Row="6" Grid.Column="2" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.BRfForwardPowerFeedBack],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="7" Grid.Column="1" Width="Auto" Height="Auto" Text="{Binding RtDataValues[PMA.BRfReflectPower],StringFormat='F1'}"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center" Grid.ColumnSpan="2"/>
+
+            <TextBlock Grid.Row="9" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
+            <TextBlock Grid.Row="10" Grid.Column="2" Width="Auto" Height="Auto" Text="0.0"  Background="#E8E8E8" TextBlock.TextAlignment="Center" VerticalAlignment="Center" Block.TextAlignment="Center"/>
 
         </Grid>
 

Venus/Venus_RT/Devices/JetPM.cs

@@ -429,11 +429,20 @@ namespace Venus_RT.Devices
             DATA.Subscribe($"{Name}.IsSlitDoorClosed", () => IsSlitDoorClosed);
             DATA.Subscribe($"{Name}.IsLidClosed", () => IsLidClosed);
             DATA.Subscribe($"{Name}.SRfIsOn", () => _Generator.IsPowerOn);
+            DATA.Subscribe($"{Name}.SRfForwardPowerFeedBack", () => _Generator.ForwardPower);
+            DATA.Subscribe($"{Name}.SRfReflectPower", () => ReflectPower);
+            DATA.Subscribe($"{Name}.SRfMatchIsAuto", () =>
+            {
+                return _Match.TuneMode1== EnumRfMatchTuneMode.Auto ? true : false;
+            }
+            );
             DATA.Subscribe($"{Name}.BRfIsOn", () =>
             {
                 return _GeneratorBias == null ? false : _GeneratorBias.IsPowerOn;
             }
             );
+            DATA.Subscribe($"{Name}.BRfForwardPowerFeedBack", () => _GeneratorBias.ForwardPower);
+            DATA.Subscribe($"{Name}.BRfReflectPower", () => BiasReflectPower);
             DATA.Subscribe($"{Name}.TurboPumpRotationalSpeed", () => _TurboPump.RotationalSpeed);
             DATA.Subscribe($"{Name}.PendulumValve.Position", () => _pendulumValve.Position);
             DATA.Subscribe($"{Name}.PendulumValve.Pressure", () => _pendulumValve.Pressure);
@@ -461,15 +470,33 @@ namespace Venus_RT.Devices
 
             OP.Subscribe($"{Module}.SetSRf", (cmd, args) => {
 
-                //GeneratorSetpower((float)args[0]);
-                GeneratorPowerOn((bool)args[1]);
+                var ison = (bool)args[1];
+                if (ison == true)
+                {
+                    GeneratorSetpower((float)args[0]);
+                    GeneratorPowerOn(true);
+                }
+                else
+                {
+                    GeneratorPowerOn(false);
+                }
+                
 
                 return true;
             });
 
             OP.Subscribe($"{Module}.SetBRf", (cmd, args) => {
-                //SetBiasMatchPosition((float)args[0], (float)args[1]);
-                GeneratorBiasPowerOn((bool)args[0]);
+
+                var ison = (bool)args[1];
+                if (ison == true)
+                {
+                    GeneratorBiasSetpower((float)args[0]);
+                    GeneratorBiasPowerOn(true);
+                }
+                else
+                {
+                    GeneratorBiasPowerOn(false);
+                }
                 return true;
             });
 

Venus/Venus_RT/Devices/PendulumValve.cs

@@ -230,7 +230,7 @@ namespace Venus_RT.Devices
                         {
                             int pressure;
                             if (int.TryParse(data[1], out pressure))
-                                Pressure = pressure  * _pressure_ful_range  / 1000;
+                                Pressure = pressure  * _pressure_ful_range  / 1000000;
                         }
                         break;
                     case "A":
@@ -377,7 +377,7 @@ namespace Venus_RT.Devices
             if(_CheckStatus())
             {
                 IsOpen = true;
-                return SendCommand(Operation.SetPressure, pressure * 1000 / _pressure_ful_range);
+                return SendCommand(Operation.SetPressure, pressure * 1000000 / _pressure_ful_range);
             }
 
             return false;

Venus/Venus_Themes/CustomControls/AduRadioButton.xaml

@@ -51,6 +51,7 @@
                                 HorizontalAlignment="Left"
                                 VerticalAlignment="Center"
                                 Text="{TemplateBinding Content}"
+                                Padding="0,0,0,1"
                                 Focusable="False"
                                 SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </StackPanel>
@@ -73,7 +74,7 @@
                                     <DropShadowEffect Color="Black"></DropShadowEffect>
                                 </Setter.Value>
                             </Setter>
-                            <Setter Property="customControl:AduRadioButtonIcon.FontSize" Value="24"/>
+                            <Setter Property="customControl:AduRadioButtonIcon.FontSize" Value="26"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

Venus/Venus_Themes/UserControls/ButterflyValve.xaml

@@ -11,7 +11,7 @@
             <RotateTransform CenterX="17" CenterY="17" Angle="{Binding ElementName=valve,Path=RotateTransformValue}"/>
         </TransformGroup>
     </UserControl.RenderTransform>
-    <Border Width="35" Height="35" CornerRadius="17" Background="#D9D9D9">
+    <Border Width="35" Height="35" CornerRadius="17" Background="#D9D9D9" Opacity="0.95">
         
         <Path Width="31" Height="10" Fill="Black" Stroke="Black"  Stretch="Fill" Data="M213.333333 507.733333h725.333334v42.666667H204.8l145.066667 145.066667-29.866667 29.866666L128 533.333333 320 341.333333l29.866667 29.866667L213.333333 507.733333z"/>
     </Border>

Venus/Venus_UI/Views/ShellView.xaml

@@ -147,7 +147,7 @@
         <Grid.RowDefinitions>
             <RowDefinition Height="90"/>
             <RowDefinition/>
-            <RowDefinition Height="50"/>
+            <RowDefinition Height="48"/>
         </Grid.RowDefinitions>
 
         <ContentControl x:Name="Top_Frame" Grid.Row="0"  prism:RegionManager.RegionName="TopRegion"/>

Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -33,10 +33,6 @@ namespace Venus_UI.Views
             m_regionManager = regionManager;
             m_regionNavigationService = regionNavigationService;
 
-            //m_regionManager.RegisterViewWithRegion("MainRegion", typeof(Venus_MainPages.Views.OverView));
-            //m_regionManager.RegisterViewWithRegion("MainRegion", typeof(Venus_MainPages.Views.RecipeView));
-            //m_regionManager.RegisterViewWithRegion("MainRegion", typeof(Venus_MainPages.Views.DataAnalysisView));
-
             m_regionManager.RegisterViewWithRegion("TopRegion", typeof(Venus_MainPages.Views.TopView));