X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=dev4%2FPages%2FBinomialSolver.xaml;h=c40603f789339b52c61de2b0c482303290f1bc39;hb=2e368438f3f6c0a65f0883ad272b6f2d9b719dbc;hp=c2be161991083c1a827ccca8eec91f23765ae2b4;hpb=1b8c92d90625dad0dcee96ad2db68d47b4efe73f;p=psychlops%2Fsilverlight.git

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