sll

[psychlops/silverlight.git] / dev4 / Pages / BinomialSolver.xaml

diff --git a/dev4/Pages/BinomialSolver.xaml b/dev4/Pages/BinomialSolver.xaml
index c2be161..c40603f 100644 (file)
--- a/dev4/Pages/BinomialSolver.xaml
+++ b/dev4/Pages/BinomialSolver.xaml
@@ -3,7 +3,7 @@
            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" \r
            xmlns:sdk="http://schemas.microsoft.com/winfx/2006/xaml/presentation/sdk"\r
            xmlns:controls="clr-namespace:System.Windows.Controls;assembly=System.Windows.Controls"\r
-           Width="400" Height="300" \r
+           Width="420" Height="300" \r
            Title="Binomial Likelihood Solver" xmlns:toolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit">\r
 \r
 \r
@@ -36,6 +36,8 @@
                                </Setter.Value>\r
                        </Setter>\r
                </Style>\r
+               <Style TargetType="toolkit:LineSeries">\r
+               </Style>                \r
        </controls:ChildWindow.Resources>\r
 \r
        <Grid x:Name="LayoutRoot" Margin="2">\r
@@ -45,22 +47,28 @@
         </Grid.RowDefinitions>\r
 \r
                <StackPanel Orientation="Horizontal">\r
-                       <Canvas Width="250" Height="Auto">\r
+                       <Canvas Width="250" Height="Auto" x:Name="ChartCanvas">\r
+                               <TextBox x:Name="OText" Width="30" Text="{Binding Path=Value, Mode=TwoWay}" />\r
                                <toolkit:Chart x:Name="chart1" Title="" Width="240" Height="220" Canvas.Left="0" Canvas.Top="0"\r
                                                           FontSize="10">\r
                                        <toolkit:Chart.Series>\r
-                                               <toolkit:ScatterSeries x:Name="Fitted"\r
+                                               <toolkit:LineSeries x:Name="Fitted"\r
                                                                                Title="Fitted"\r
                                                                                ItemsSource="{Binding}"\r
                                                                                IndependentValueBinding="{Binding c_abscissa}"\r
                                                                                DependentValueBinding="{Binding c_ratio}"\r
                                                                                >\r
+                                                       <toolkit:LineSeries.DataPointStyle>\r
+                                                               <Style TargetType="Control">\r
+                                                                       <Setter Property="Template" Value="{x:Null}"/>\r
+                                                               </Style>\r
+                                                       </toolkit:LineSeries.DataPointStyle>\r
 \r
-                                                       <toolkit:ScatterSeries.DependentRangeAxis>\r
+                                                       <toolkit:LineSeries.DependentRangeAxis>\r
                                                                <toolkit:LinearAxis Title="" ShowGridLines="False" Orientation="Y" Minimum="0" Maximum="1">\r
                                                                </toolkit:LinearAxis>\r
-                                                       </toolkit:ScatterSeries.DependentRangeAxis>\r
-                                               </toolkit:ScatterSeries>\r
+                                                       </toolkit:LineSeries.DependentRangeAxis>\r
+                                               </toolkit:LineSeries>\r
                                                <toolkit:ScatterSeries x:Name="Raw"\r
                                                                                Title="Fitted"\r
                                                                                ItemsSource="{Binding}"\r
@@ -81,21 +89,24 @@
                                                </toolkit:ScatterSeries>\r
                                        </toolkit:Chart.Series>\r
                                </toolkit:Chart>\r
-                               <Slider x:Name="OrdinateSlider" Canvas.Left="0" Canvas.Top="10" Orientation="Vertical"  Height="200"></Slider>\r
-                               <Slider x:Name="AbscissaSlider" Canvas.Left="20" Canvas.Top="210" Width="200" MouseLeftButtonUp="AbscissaSlider_MouseLeftButtonUp"></Slider>\r
+                               <Slider x:Name="OrdinateSlider" Canvas.Left="0" Canvas.Top="10" Orientation="Vertical"  Height="200" MouseLeftButtonUp="OrdinateSlider_MouseLeftButtonUp"></Slider>\r
+                               <Slider x:Name="AbscissaSlider" Canvas.Left="20" Canvas.Top="210" Width="200"></Slider>\r
                        </Canvas>\r
 \r
 \r
-                       <StackPanel Orientation="Vertical">\r
-                               <sdk:DataGrid x:Name="dataGrid" Margin="0,5,0,10" RowHeight="40" AutoGenerateColumns="False" >\r
-                                       <sdk:DataGrid.Columns>\r
-                                               <sdk:DataGridTextColumn Header="Abscissa" Width="40" Binding="{Binding abscissa}" />\r
-                                               <sdk:DataGridTextColumn Header="Positive Cases" Width="40"  Binding="{Binding positive}" />\r
-                                               <sdk:DataGridTextColumn Header="Negative Cases" Width="40" Binding="{Binding negative}" />\r
-                                       </sdk:DataGrid.Columns>\r
-                               </sdk:DataGrid>\r
-                               <Button x:Name="AddConditionButton" Content="Add Condition" Click="AddConditionButton_Click" HorizontalAlignment="Right" FontSize="10" Margin="0,12,0,0" Grid.Row="1" />\r
-                       </StackPanel>\r
+                       <ScrollViewer>\r
+                               <StackPanel Orientation="Vertical">\r
+                                       <sdk:DataGrid x:Name="dataGrid" Margin="0,5,0,10" RowHeight="40" AutoGenerateColumns="False" >\r
+                                               <sdk:DataGrid.Columns>\r
+                                                       <sdk:DataGridTextColumn Header="Abscissa" Width="40" Binding="{Binding abscissa}" />\r
+                                                       <sdk:DataGridTextColumn Header="Positive Cases" Width="40"  Binding="{Binding positive}" />\r
+                                                       <sdk:DataGridTextColumn Header="Negative Cases" Width="40" Binding="{Binding negative}" />\r
+                                               </sdk:DataGrid.Columns>\r
+                                       </sdk:DataGrid>\r
+                                       <Button x:Name="AddConditionButton" Content="Add Condition" Click="AddConditionButton_Click" Width="100" HorizontalAlignment="Right" FontSize="10" Margin="0,12,0,0" />\r
+                                       <Button x:Name="RemoveConditionButton" Content="Remove Condition" Click="RemoveConditionButton_Click" Width="100" HorizontalAlignment="Right" FontSize="10" Margin="0,0,0,0" />\r
+                               </StackPanel>\r
+                       </ScrollViewer>\r
                </StackPanel>\r
 \r
                <TextBlock Text="Mean" x:Name="Parameter0Name" Width="40" Height="23" HorizontalAlignment="Left" Margin="0,12,0,0" Grid.Row="1" />\r