Skip to content

Commit

Permalink
Provide an optional warning message to the user.
Browse files Browse the repository at this point in the history
  • Loading branch information
elliottslaughter committed Mar 19, 2024
1 parent 75e33c5 commit 1863900
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ struct Config {
// This is just for the local profile
interval: Interval,
tile_set: TileSet,
warning_message: Option<String>,

data_source: CountingDeferredDataSource<Box<dyn DeferredDataSource>>,

Expand Down Expand Up @@ -1353,6 +1354,7 @@ impl Config {
let kinds = info.entry_info.kinds();
let interval = info.interval;
let tile_set = info.tile_set;
let warning_message = info.warning_message;

let mut field_schema = info.field_schema;
assert!(!field_schema.contains_name("Title"));
Expand All @@ -1367,6 +1369,7 @@ impl Config {
kind_filter: BTreeSet::new(),
interval,
tile_set,
warning_message,
data_source: CountingDeferredDataSource::new(data_source),
search_state,
items_selected: BTreeMap::new(),
Expand Down Expand Up @@ -1497,7 +1500,10 @@ impl Window {
fn content(&mut self, ui: &mut egui::Ui, cx: &mut Context) {
ui.horizontal(|ui| {
ui.heading(format!("Profile {}", self.index));
ui.label(cx.view_interval.to_string())
ui.label(cx.view_interval.to_string());
if let Some(message) = &self.config.warning_message {
ui.label(RichText::new(message).color(Color32::RED).heading());
}
});

ScrollArea::vertical()
Expand Down
1 change: 1 addition & 0 deletions src/data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pub struct DataSourceInfo {
pub interval: Interval,
pub tile_set: TileSet,
pub field_schema: FieldSchema,
pub warning_message: Option<String>,
}

#[derive(Debug, Clone, Deserialize, Serialize)]
Expand Down
1 change: 1 addition & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ impl RandomDataSource {
interval: Self::interval(&mut rng),
tile_set: TileSet::default(),
field_schema,
warning_message: Some("Demo only. The data in this profile is synthetic.".to_string()),
};

Self {
Expand Down
3 changes: 3 additions & 0 deletions src/merge_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,12 @@ impl MergeDeferredDataSource {
let first_info = source_infos.first().unwrap();
let tile_set = first_info.tile_set.clone();
let field_schema = first_info.field_schema.clone();
let warning_message = first_info.warning_message.clone();

for info in &source_infos {
assert_eq!(tile_set, info.tile_set);
assert_eq!(field_schema, info.field_schema);
assert_eq!(warning_message, info.warning_message);
}

// Merge remaining fields
Expand All @@ -112,6 +114,7 @@ impl MergeDeferredDataSource {
interval,
tile_set,
field_schema,
warning_message,
}
}

Expand Down

0 comments on commit 1863900

Please sign in to comment.