File tree Expand file tree Collapse file tree 4 files changed +11
-22
lines changed Expand file tree Collapse file tree 4 files changed +11
-22
lines changed Original file line number Diff line number Diff line change @@ -110,11 +110,8 @@ pub enum SystemCommand {
110
110
/// Set the active timeline and time for the given recording.
111
111
SetActiveTime {
112
112
store_id : StoreId ,
113
- timeline : re_chunk:: Timeline ,
114
- time : Option < re_log_types:: TimeReal > ,
115
-
116
- /// If this is true the timeline will persist even if it is invalid at the moment.
117
- pending : bool ,
113
+ timeline : re_chunk:: TimelineName ,
114
+ time : Option < re_log_types:: TimeInt > ,
118
115
} ,
119
116
120
117
/// Set the loop selection for the given timeline.
Original file line number Diff line number Diff line change @@ -595,9 +595,8 @@ impl TestContext {
595
595
self . command_sender
596
596
. send_system ( SystemCommand :: SetActiveTime {
597
597
store_id,
598
- timeline : re_chunk:: Timeline :: new ( timeline, timecell. typ ( ) ) ,
599
- time : Some ( timecell. as_i64 ( ) . into ( ) ) ,
600
- pending : true ,
598
+ timeline,
599
+ time : Some ( timecell. value . into ( ) ) ,
601
600
} ) ;
602
601
}
603
602
}
@@ -652,17 +651,16 @@ impl TestContext {
652
651
store_id : rec_id,
653
652
timeline,
654
653
time,
655
- pending : _,
656
654
} => {
657
655
assert_eq ! (
658
656
& rec_id,
659
657
self . store_hub. lock( ) . active_recording( ) . unwrap( ) . store_id( )
660
658
) ;
661
659
self . with_blueprint_ctx ( |ctx| {
662
- ctx. set_timeline ( * timeline. name ( ) ) ;
660
+ ctx. set_timeline ( timeline) ;
663
661
664
662
if let Some ( time) = time {
665
- ctx. set_time ( time. floor ( ) ) ;
663
+ ctx. set_time ( time) ;
666
664
}
667
665
} ) ;
668
666
}
Original file line number Diff line number Diff line change @@ -375,9 +375,8 @@ impl egui_table::TableDelegate for DataframeTableDelegate<'_> {
375
375
self . ctx . command_sender ( ) . send_system (
376
376
re_viewer_context:: SystemCommand :: SetActiveTime {
377
377
store_id : self . ctx . store_id ( ) . clone ( ) ,
378
- timeline : descr. timeline ( ) ,
378
+ timeline : * descr. timeline ( ) . name ( ) ,
379
379
time : None ,
380
- pending : false ,
381
380
} ,
382
381
) ;
383
382
}
Original file line number Diff line number Diff line change @@ -912,20 +912,16 @@ impl App {
912
912
913
913
SystemCommand :: SetActiveTime {
914
914
store_id,
915
- // TODO: Make this only be timeline name.
916
915
timeline,
917
- // TODO: Make this be time int?
918
916
time,
919
- // TODO: Remove this
920
- pending : _,
921
917
} => {
922
918
if let Some ( blueprint_ctx) =
923
919
blueprint_ctx ( & mut self . state , & self . command_sender , store_hub)
924
920
{
925
- blueprint_ctx. set_timeline ( * timeline. name ( ) ) ;
921
+ blueprint_ctx. set_timeline ( timeline) ;
926
922
927
923
if let Some ( time) = time {
928
- blueprint_ctx. set_time ( time. floor ( ) ) ;
924
+ blueprint_ctx. set_time ( time) ;
929
925
}
930
926
931
927
if let Some ( rec_cfg) = self . recording_config_mut ( store_hub, & store_id) {
@@ -1157,9 +1153,8 @@ impl App {
1157
1153
self . command_sender
1158
1154
. send_system ( SystemCommand :: SetActiveTime {
1159
1155
store_id,
1160
- timeline : re_chunk:: Timeline :: new ( timeline, timecell. typ ( ) ) ,
1161
- time : Some ( timecell. as_i64 ( ) . into ( ) ) ,
1162
- pending : true ,
1156
+ timeline : timeline,
1157
+ time : Some ( timecell. value . into ( ) ) ,
1163
1158
} ) ;
1164
1159
}
1165
1160
}
You can’t perform that action at this time.
0 commit comments