# HG changeset patch
# User totetm <>
# Date 1265973886 -3600
# Node ID de06fa7242aee0c259b1e4429a6b2ee36c165903
# Parent  25ba97723183b20b38a1eb606603656376e11a95
Fixed| agrandir la zonne d'affichage de la time line quand la taille des
    bloques d'annotations sont supèrieur a sa hauteur
  Fixed| faire fonctionner le bouton collapse des zonnes d'affichage des
    timeline

diff -r 25ba97723183 -r de06fa7242ae client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml
--- a/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml	Fri Feb 12 12:04:11 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml	Fri Feb 12 12:24:46 2010 +0100
@@ -8,7 +8,7 @@
     xmlns:Input="clr-namespace:SLExtensions.Input;assembly=SLExtensions"
 	xmlns:Converter="clr-namespace:Iri.Modernisation.Controls.Converter"  
     xmlns:SLExtensions_Data="clr-namespace:SLExtensions.Data;assembly=SLExtensions" 
-	x:Class="Iri.Modernisation.Controls.View.BookTimeLine" Height="272" Width="640" Background="Transparent">
+	x:Class="Iri.Modernisation.Controls.View.BookTimeLine" Width="640" Background="Transparent">
 	<UserControl.Resources>
 		<Converter:BoolToVisibility x:Key="BoolToVisibility"/>
 		<SLExtensions_Data:BoolConverter x:Key="BoolConverter"/>
@@ -30,15 +30,8 @@
 			<StackPanel x:Name="TimeStripsPanel" Width="{Binding WidthTimeStrip}" RenderTransformOrigin="0,0.5" Background="#FF353535">
 				
 				<View:ExtendedSlider x:Name="BookTimeLineSlider" Canvas.ZIndex="10" Height="31"  d:LayoutOverrides="Height" Maximum="{Binding TotalDuration}" Value="{Binding Position,Mode=TwoWay}"  />
-				<Canvas x:Name="BookTimeLineElementPanel" />
-				<Canvas x:Name="BookTimeLineAnnotationPanel" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ElementName=DisplayCommentButton, Mode=OneWay}" Margin="0,20,0,0" />
-				<StackPanel Margin="0,80,0,0">
-				<!--	<TestSpectrogramme:Spectrogramme ColorBar="Red" x:Name="PolemicSpec" Height="20" Canvas.ZIndex="-2"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="#00FF00" x:Name="AdhesionSpec" Height="20" Canvas.ZIndex="-2"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="Blue" x:Name="ReferenceSpec" Height="20" Canvas.ZIndex="-2"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="Yellow" x:Name="QuestionSpec" Height="20" Canvas.ZIndex="-2"/>
-					<TestSpectrogramme:Spectrogramme ColorBar="Black" x:Name="GeneralSpec" Height="20" Canvas.ZIndex="-2"/> -->
-				</StackPanel>
+				<Canvas x:Name="BookTimeLineElementPanel" Height="20" />
+				<Canvas x:Name="BookTimeLineAnnotationPanel" Visibility="{Binding IsChecked, Converter={StaticResource BoolToVisibility}, ElementName=DisplayCommentButton, Mode=OneWay}" Margin="0,2,0,0" />
 			</StackPanel>
 		</ScrollViewer>
 	</StackPanel>
diff -r 25ba97723183 -r de06fa7242ae client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml.cs
--- a/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml.cs	Fri Feb 12 12:04:11 2010 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/BookTimeLine/BookTimeLine.xaml.cs	Fri Feb 12 12:24:46 2010 +0100
@@ -106,7 +106,7 @@
                 }
             }
             int basi = 0;
-           
+            int maxHi = 0;
             foreach (List<Annotation> LAnnotation in VM.Annotations)
             {
                 LAnnotation.Sort((a, b) => TimeSpan.Compare( b.Duration,a.Duration));
@@ -137,6 +137,10 @@
                     }
 
                     Canvas.SetTop(pol, basi);
+                    if(maxHi<=basi)
+                    {
+                        maxHi = basi + 24;
+                    }
                   /***********************/
                     
                     
@@ -147,6 +151,7 @@
                     basi = 0;
                 }
             }
+            BookTimeLineAnnotationPanel.Height = maxHi;
             BookTimeLineElementPanel.UpdateLayout();
         }
 
diff -r 25ba97723183 -r de06fa7242ae client/test/FranceCulture/FranceCulture/FranceCulture.Web/FranceCulture.Web.csproj
--- a/client/test/FranceCulture/FranceCulture/FranceCulture.Web/FranceCulture.Web.csproj	Fri Feb 12 12:04:11 2010 +0100
+++ b/client/test/FranceCulture/FranceCulture/FranceCulture.Web/FranceCulture.Web.csproj	Fri Feb 12 12:24:46 2010 +0100
@@ -87,7 +87,7 @@
         <WebProjectProperties>
           <UseIIS>False</UseIIS>
           <AutoAssignPort>True</AutoAssignPort>
-          <DevelopmentServerPort>7375</DevelopmentServerPort>
+          <DevelopmentServerPort>2692</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>
           </IISUrl>