zaphar/sheetsui
1
0
Fork 0
mirror of https://github.com/zaphar/sheetsui.git synced 2025-07-23 13:29:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: zaphar:a299d5e8060820b75171971ad1b5a12da6541960
Branches Tags
zaphar:main
zaphar:clipboard
zaphar:help_styling
zaphar:help_commands
zaphar:exporting
zaphar:save_prompt
zaphar:dialog_scrolling
zaphar:cell_styling
zaphar:address_refactor
zaphar:help
zaphar:user_model
zaphar:cell_operations
zaphar:documentation
zaphar:range_copy
zaphar:user_manual
...
compare: zaphar:e798350cd27abab191d3596438d56009de479228
Branches Tags
zaphar:clipboard
zaphar:main
zaphar:help_styling
zaphar:help_commands
zaphar:exporting
zaphar:save_prompt
zaphar:dialog_scrolling
zaphar:cell_styling
zaphar:address_refactor
zaphar:help
zaphar:user_model
zaphar:cell_operations
zaphar:documentation
zaphar:range_copy
zaphar:user_manual

5 Commits
a299d5e806 ... e798350cd2

Author SHA1 Message Date
Jeremy Wall
e798350cd2 wip: fix area calculation bug 2025-02-07 19:30:07 -05:00
Jeremy Wall
8dd6f6d614 wip: cleanup, todos, unused code, formatting 2025-02-07 19:22:42 -05:00
Jeremy Wall
43f07f58bc wip: sheet renaming and col sizing with UserModel 2025-02-07 17:55:30 -05:00
Jeremy Wall
d8b3191612 wip: new_sheet and cell styling with UserModel 2025-02-07 17:34:19 -05:00
Jeremy Wall
7a5bd63fde wip: Convert over to UserModel 
Step 1: update ironcalc version and plug it in
 2025-02-07 17:32:36 -05:00
6 changed files with 181 additions and 243 deletions
Show Stats Expand all files Collapse all files

117
Cargo.lock generated
View File

@ -28,15 +28,6 @@ dependencies = [
"cpufeatures",
]
[[package]]
name = "aho-corasick"
version = "0.6.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
dependencies = [
"memchr",
]
[[package]]
name = "aho-corasick"
version = "1.1.3"
@ -182,12 +173,6 @@ dependencies = [
"syn",
]
[[package]]
name = "bitflags"
version = "1.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
version = "2.6.0"
@ -293,9 +278,9 @@ dependencies = [
[[package]]
name = "chrono-tz"
version = "0.9.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb"
checksum = "9c6ac4f2c0bf0f44e9161aec9675e1050aa4a530663c4a9e37e108fa948bca9f"
dependencies = [
"chrono",
"chrono-tz-build",
@ -304,12 +289,11 @@ dependencies = [
[[package]]
name = "chrono-tz-build"
version = "0.3.0"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1"
checksum = "e94fea34d77a245229e7746bd2beb786cd2a896f306ff491fb8cecb3074b10a7"
dependencies = [
"parse-zoneinfo",
"phf",
"phf_codegen",
]
@ -431,7 +415,7 @@ version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
dependencies = [
"bitflags 2.6.0",
"bitflags",
"crossterm_winapi",
"futures-core",
"mio",
@ -483,19 +467,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "csv-sniffer"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b8e952164bb270a505d6cb6136624174c34cfb9abd16e0011f5e53058317f39"
dependencies = [
"bitflags 1.3.2",
"csv",
"csv-core",
"memchr",
"regex 0.2.11",
]
[[package]]
name = "csvx"
version = "0.1.17"
@ -869,8 +840,8 @@ dependencies = [
[[package]]
name = "ironcalc"
version = "0.2.0"
source = "git+https://github.com/ironcalc/IronCalc#98dc557a017b2ad640fb46eece17afda14177e59"
version = "0.3.0"
source = "git+https://github.com/ironcalc/IronCalc?rev=264fcac63cc93b08a4b4a6764815e0c0adf6a53c#99125f1fea1c8c72c61f8cba94d847ed3471a4af"
dependencies = [
"bitcode",
"chrono",
@ -885,18 +856,17 @@ dependencies = [
[[package]]
name = "ironcalc_base"
version = "0.2.0"
source = "git+https://github.com/ironcalc/IronCalc#98dc557a017b2ad640fb46eece17afda14177e59"
version = "0.3.0"
source = "git+https://github.com/ironcalc/IronCalc?rev=264fcac63cc93b08a4b4a6764815e0c0adf6a53c#99125f1fea1c8c72c61f8cba94d847ed3471a4af"
dependencies = [
"bitcode",
"chrono",
"chrono-tz",
"csv",
"csv-sniffer",
"js-sys",
"once_cell",
"rand",
"regex 1.11.1",
"regex",
"ryu",
"serde",
]
@ -949,12 +919,6 @@ dependencies = [
"wasm-bindgen",
]
[[package]]
name = "lazy_static"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]]
name = "libc"
version = "0.2.161"
@ -1085,7 +1049,7 @@ version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f2a05b18d44e2957b88f96ba460715e295bc1d7510468a2f3d3b44535d26c24"
dependencies = [
"regex 1.11.1",
"regex",
]
[[package]]
@ -1251,7 +1215,7 @@ version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
dependencies = [
"bitflags 2.6.0",
"bitflags",
"cassowary",
"compact_str",
"crossterm",
@ -1281,20 +1245,7 @@ version = "0.5.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
dependencies = [
"bitflags 2.6.0",
]
[[package]]
name = "regex"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
dependencies = [
"aho-corasick 0.6.10",
"memchr",
"regex-syntax 0.5.6",
"thread_local",
"utf8-ranges",
"bitflags",
]
[[package]]
@ -1303,10 +1254,10 @@ version = "1.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
dependencies = [
"aho-corasick 1.1.3",
"aho-corasick",
"memchr",
"regex-automata",
"regex-syntax 0.8.5",
"regex-syntax",
]
[[package]]
@ -1315,18 +1266,9 @@ version = "0.4.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
dependencies = [
"aho-corasick 1.1.3",
"aho-corasick",
"memchr",
"regex-syntax 0.8.5",
]
[[package]]
name = "regex-syntax"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
dependencies = [
"ucd-util",
"regex-syntax",
]
[[package]]
@ -1370,7 +1312,7 @@ dependencies = [
"proc-macro-crate",
"proc-macro2",
"quote",
"regex 1.11.1",
"regex",
"relative-path",
"rustc_version",
"syn",
@ -1398,7 +1340,7 @@ version = "0.38.37"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
dependencies = [
"bitflags 2.6.0",
"bitflags",
"errno",
"libc",
"linux-raw-sys",
@ -1636,15 +1578,6 @@ dependencies = [
"syn",
]
[[package]]
name = "thread_local"
version = "0.3.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
dependencies = [
"lazy_static",
]
[[package]]
name = "time"
version = "0.3.36"
@ -1722,12 +1655,6 @@ version = "1.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
[[package]]
name = "ucd-util"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abd2fc5d32b590614af8b0a20d837f32eca055edd0bbead59a9cfe80858be003"
[[package]]
name = "unicode-ident"
version = "1.0.13"
@ -1763,12 +1690,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
[[package]]
name = "utf8-ranges"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
[[package]]
name = "utf8parse"
version = "0.2.2"

3
Cargo.toml
View File

@ -10,7 +10,8 @@ anyhow = { version = "1.0.91", features = ["backtrace"] }
clap = { version = "4.5.20", features = ["derive"] }
crossterm = { version = "0.28.1", features = ["event-stream", "serde"] }
csvx = "0.1.17"
ironcalc = { git = "https://github.com/ironcalc/IronCalc" }
# this revision introduces a way to get the Model back out of the UserModel
ironcalc = { git = "https://github.com/ironcalc/IronCalc?rev=264fcac63cc93b08a4b4a6764815e0c0adf6a53c" }
futures = "0.3.31"
ratatui = "0.29.0"
thiserror = "1.0.65"

233
src/book/mod.rs
View File

@ -3,9 +3,7 @@ use std::cmp::max;
use anyhow::{anyhow, Result};
use ironcalc::{
base::{
types::{Border, Col, Fill, Font, Row, SheetData, Style, Worksheet},
worksheet::WorksheetDimension,
Model,
expressions::types::Area, types::{Border, Col, Fill, Font, Row, SheetData, Style, Worksheet}, worksheet::WorksheetDimension, Model, UserModel
},
export::save_xlsx_to_writer,
import::load_from_xlsx,
@ -78,14 +76,14 @@ impl<'book> AddressRange<'book> {
/// A spreadsheet book with some internal state tracking.
pub struct Book {
pub(crate) model: Model,
pub(crate) model: UserModel,
pub current_sheet: u32,
pub location: crate::ui::Address,
}
impl Book {
/// Construct a new book from a Model
pub fn new(model: Model) -> Self {
pub fn new(model: UserModel) -> Self {
Self {
model,
current_sheet: 0,
@ -93,9 +91,17 @@ impl Book {
}
}
pub fn from_model(model: Model) -> Self {
Self::new(UserModel::from_model(model))
}
/// Construct a new book from an xlsx file.
pub fn new_from_xlsx(path: &str) -> Result<Self> {
Ok(Self::new(load_from_xlsx(path, "en", "America/New_York")?))
Ok(Self::from_model(load_from_xlsx(
path,
"en",
"America/New_York",
)?))
}
/// Evaluate the spreadsheet calculating formulas and style changes.
@ -104,10 +110,9 @@ impl Book {
self.model.evaluate();
}
// TODO(zaphar): Should I support ICalc?
/// Construct a new book from a path.
pub fn new_from_xlsx_with_locale(path: &str, locale: &str, tz: &str) -> Result<Self> {
Ok(Self::new(load_from_xlsx(path, locale, tz)?))
Ok(Self::from_model(load_from_xlsx(path, locale, tz)?))
}
/// Save book to an xlsx file.
@ -116,7 +121,7 @@ impl Book {
let file_path = std::path::Path::new(path);
let file = std::fs::File::create(file_path)?;
let writer = std::io::BufWriter::new(file);
save_xlsx_to_writer(&self.model, writer)?;
save_xlsx_to_writer(self.model.get_model(), writer)?;
Ok(())
}
@ -124,10 +129,9 @@ impl Book {
/// is the sheet name and the u32 is the sheet index.
pub fn get_all_sheets_identifiers(&self) -> Vec<(String, u32)> {
self.model
.workbook
.worksheets
.get_worksheets_properties()
.iter()
.map(|sheet| (sheet.get_name(), sheet.get_sheet_id()))
.map(|sheet| (sheet.name.to_owned(), sheet.sheet_id))
.collect()
}
@ -136,16 +140,18 @@ impl Book {
Ok(&self.get_sheet()?.name)
}
pub fn set_sheet_name(&mut self, idx: usize, sheet_name: &str) -> Result<()> {
self.get_sheet_by_idx_mut(idx)?.set_name(sheet_name);
pub fn set_sheet_name(&mut self, idx: u32, sheet_name: &str) -> Result<()> {
self.model.rename_sheet(idx, sheet_name).map_err(|e| anyhow!(e))?;
Ok(())
}
pub fn new_sheet(&mut self, sheet_name: Option<&str>) -> Result<()> {
let (_, idx) = self.model.new_sheet();
self.model.new_sheet().map_err(|e| anyhow!(e))?;
let idx = self.model.get_selected_sheet();
if let Some(name) = sheet_name {
self.set_sheet_name(idx as usize, name)?;
self.set_sheet_name(idx, name)?;
}
self.model.set_selected_sheet(self.current_sheet).map_err(|e| anyhow!(e))?;
Ok(())
}
@ -172,8 +178,12 @@ impl Book {
.iter()
.skip(1)
{
// TODO(jeremy): Is there a better way to do this using UserModel?
// Looks like this is the recommended way:
// https://docs.rs/ironcalc_base/latest/ironcalc_base/struct.UserModel.html#method.auto_fill_columns
let contents = self
.model
.get_model()
.extend_to(
self.current_sheet,
from.row as i32,
@ -187,7 +197,7 @@ impl Book {
self.current_sheet,
cell.row as i32,
cell.col as i32,
contents,
&contents,
)
.map_err(|e| anyhow!(e))?;
}
@ -206,32 +216,41 @@ impl Book {
pub fn clear_cell_contents(&mut self, sheet: u32, Address { row, col }: Address) -> Result<()> {
Ok(self
.model
.cell_clear_contents(sheet, row as i32, col as i32)
.range_clear_contents(&Area {
sheet,
row: row as i32,
column: col as i32,
width: 1,
height: 1,
})
.map_err(|s| anyhow!("Unable to clear cell contents {}", s))?)
}
pub fn clear_cell_range(&mut self, sheet: u32, start: Address, end: Address) -> Result<()> {
for row in start.row..=end.row {
for col in start.col..=end.col {
self.clear_cell_contents(sheet, Address { row, col })?;
}
}
let area = calculate_area(sheet, start, end);
self.model
.range_clear_contents(&area)
.map_err(|s| anyhow!("Unable to clear cell contents {}", s))?;
Ok(())
}
pub fn clear_cell_all(&mut self, sheet: u32, Address { row, col }: Address) -> Result<()> {
Ok(self
.model
.cell_clear_all(sheet, row as i32, col as i32)
.range_clear_all(&Area {
sheet,
row: row as i32,
column: col as i32,
width: 1,
height: 1,
})
.map_err(|s| anyhow!("Unable to clear cell contents {}", s))?)
}
pub fn clear_cell_range_all(&mut self, sheet: u32, start: Address, end: Address) -> Result<()> {
for row in start.row..=end.row {
for col in start.col..=end.col {
self.clear_cell_all(sheet, Address { row, col })?;
}
}
let area = calculate_area(sheet, start, end);
self.model.range_clear_all(&area)
.map_err(|s| anyhow!("Unable to clear cell contents {}", s))?;
Ok(())
}
@ -244,7 +263,7 @@ impl Book {
// TODO(jwall): This is modeled a little weird. We should probably record
// the error *somewhere* but for the user there is nothing to be done except
// not use a style.
match self.model.get_style_for_cell(sheet, cell.row as i32, cell.col as i32)
match self.model.get_model().get_style_for_cell(sheet, cell.row as i32, cell.col as i32)
{
Err(_) => None,
Ok(s) => Some(s),
@ -252,12 +271,12 @@ impl Book {
}
fn get_column(&self, sheet: u32, col: usize) -> Result<Option<&Col>> {
Ok(self.model.workbook.worksheet(sheet)
Ok(self.model.get_model().workbook.worksheet(sheet)
.map_err(|e| anyhow!("{}", e))?.cols.get(col))
}
fn get_row(&self, sheet: u32, col: usize) -> Result<Option<&Row>> {
Ok(self.model.workbook.worksheet(sheet)
Ok(self.model.get_model().workbook.worksheet(sheet)
.map_err(|e| anyhow!("{}", e))?.rows.get(col))
}
@ -267,7 +286,7 @@ impl Book {
// not use a style.
if let Some(col) = self.get_column(sheet, col)? {
if let Some(style_idx) = col.style.map(|idx| idx as usize) {
let styles = &self.model.workbook.styles;
let styles = &self.model.get_model().workbook.styles;
if styles.cell_style_xfs.len() <= style_idx {
return Ok(Some(Style {
alignment: None,
@ -289,7 +308,7 @@ impl Book {
// not use a style.
if let Some(row) = self.get_row(sheet, row)? {
let style_idx = row.s as usize;
let styles = &self.model.workbook.styles;
let styles = &self.model.get_model().workbook.styles;
if styles.cell_style_xfs.len() <= style_idx {
return Ok(Some(Style {
alignment: None,
@ -315,41 +334,36 @@ impl Book {
}
}
pub fn set_cell_style(&mut self, style: &Style, sheet: u32, cell: &Address) -> Result<()> {
self.model.set_cell_style(sheet, cell.row as i32, cell.col as i32, style)
.map_err(|s| anyhow!("Unable to format cell {}", s))?;
pub fn set_cell_style(&mut self, style: &[(&str, &str)], area: &Area) -> Result<()> {
for (path, val) in style {
self.model.update_range_style(area, path, val)
.map_err(|s| anyhow!("Unable to format cell {}", s))?;
}
Ok(())
}
pub fn set_col_style(&mut self, style: &Style, sheet: u32, col: usize) -> Result<()> {
let idx = self.create_or_get_style_idx(style);
let sheet = self.model.workbook.worksheet_mut(sheet)
.map_err(|e| anyhow!("{}", e))?;
let width = sheet.get_column_width(col as i32)
.map_err(|e| anyhow!("{}", e))?;
sheet.set_column_style(col as i32, idx)
.map_err(|e| anyhow!("{}", e))?;
sheet.set_column_width(col as i32, width)
.map_err(|e| anyhow!("{}", e))?;
Ok(())
pub fn set_col_style(&mut self, style: &[(&str, &str)], sheet: u32, col: usize) -> Result<()> {
todo!()
//let idx = self.create_or_get_style_idx(style);
//let sheet = self.model.workbook.worksheet_mut(sheet)
// .map_err(|e| anyhow!("{}", e))?;
//let width = sheet.get_column_width(col as i32)
// .map_err(|e| anyhow!("{}", e))?;
//sheet.set_column_style(col as i32, idx)
// .map_err(|e| anyhow!("{}", e))?;
//sheet.set_column_width(col as i32, width)
// .map_err(|e| anyhow!("{}", e))?;
//Ok(())
}
pub fn set_row_style(&mut self, style: &Style, sheet: u32, row: usize) -> Result<()> {
let idx = self.create_or_get_style_idx(style);
self.model.workbook.worksheet_mut(sheet)
.map_err(|e| anyhow!("{}", e))?
.set_row_style(row as i32, idx)
.map_err(|e| anyhow!("{}", e))?;
Ok(())
}
fn create_or_get_style_idx(&mut self, style: &Style) -> i32 {
let idx = if let Some(style_idx) = self.model.workbook.styles.get_style_index(style) {
style_idx
} else {
self.model.workbook.styles.create_new_style(style)
};
idx
pub fn set_row_style(&mut self, style: &[(&str, &str)], sheet: u32, row: usize) -> Result<()> {
todo!()
//let idx = self.create_or_get_style_idx(style);
//self.model.workbook.worksheet_mut(sheet)
// .map_err(|e| anyhow!("{}", e))?
// .set_row_style(row as i32, idx)
// .map_err(|e| anyhow!("{}", e))?;
//Ok(())
}
/// Get a cells rendered content for display.
@ -382,20 +396,21 @@ impl Book {
/// Update the current cell in a book.
/// This update won't be reflected until you call `Book::evaluate`.
pub fn edit_current_cell<S: Into<String>>(&mut self, value: S) -> Result<()> {
pub fn edit_current_cell<S: AsRef<str>>(&mut self, value: S) -> Result<()> {
self.update_cell(&self.location.clone(), value)?;
Ok(())
}
/// Update an entry in the current sheet for a book.
/// This update won't be reflected until you call `Book::evaluate`.
pub fn update_cell<S: Into<String>>(&mut self, location: &Address, value: S) -> Result<()> {
pub fn update_cell<S: AsRef<str>>(&mut self, location: &Address, value: S) -> Result<()> {
self.model
.set_user_input(
self.current_sheet,
location.row as i32,
location.col as i32,
value.into(),
// TODO(jwall): This could probably be made more efficient
value.as_ref(),
)
.map_err(|e| anyhow!("Invalid cell contents: {}", e))?;
Ok(())
@ -403,9 +418,11 @@ impl Book {
/// Insert `count` rows at a `row_idx`.
pub fn insert_rows(&mut self, row_idx: usize, count: usize) -> Result<()> {
self.model
.insert_rows(self.current_sheet, row_idx as i32, count as i32)
.map_err(|e| anyhow!("Unable to insert row(s): {}", e))?;
for i in 0..count {
self.model
.insert_row(self.current_sheet, (row_idx + i) as i32)
.map_err(|e| anyhow!("Unable to insert row(s): {}", e))?;
}
if self.location.row >= row_idx {
self.move_to(&Address {
row: self.location.row + count,
@ -417,9 +434,11 @@ impl Book {
/// Insert `count` columns at a `col_idx`.
pub fn insert_columns(&mut self, col_idx: usize, count: usize) -> Result<()> {
self.model
.insert_columns(self.current_sheet, col_idx as i32, count as i32)
.map_err(|e| anyhow!("Unable to insert column(s): {}", e))?;
for i in 0..count {
self.model
.insert_column(self.current_sheet, (col_idx + i) as i32)
.map_err(|e| anyhow!("Unable to insert column(s): {}", e))?;
}
if self.location.col >= col_idx {
self.move_to(&Address {
row: self.location.row,
@ -436,16 +455,21 @@ impl Book {
/// Get column size
pub fn get_col_size(&self, idx: usize) -> Result<usize> {
Ok((self
.get_sheet()?
.get_column_width(idx as i32)
self.get_column_size_for_sheet(self.current_sheet, idx)
}
pub fn get_column_size_for_sheet(&self, sheet: u32, idx: usize) -> std::result::Result<usize, anyhow::Error> {
Ok((self.model.get_column_width(sheet, idx as i32)
.map_err(|e| anyhow!("Error getting column width: {:?}", e))?
/ COL_PIXELS) as usize)
}
pub fn set_col_size(&mut self, idx: usize, cols: usize) -> Result<()> {
self.get_sheet_mut()?
.set_column_width(idx as i32, cols as f64 * COL_PIXELS)
pub fn set_col_size(&mut self, col: usize, width: usize) -> Result<()> {
self.set_column_size_for_sheet(self.current_sheet, col, width)
}
pub fn set_column_size_for_sheet(&mut self, sheet: u32, col: usize, width: usize) -> std::result::Result<(), anyhow::Error> {
self.model.set_column_width(sheet, col as i32, width as f64 * COL_PIXELS)
.map_err(|e| anyhow!("Error setting column width: {:?}", e))?;
Ok(())
}
@ -467,7 +491,7 @@ impl Book {
/// Select a sheet by name.
pub fn select_sheet_by_name(&mut self, name: &str) -> bool {
if let Some((idx, _sheet)) = self
.model
.model.get_model()
.workbook
.worksheets
.iter()
@ -482,38 +506,41 @@ impl Book {
/// Get all sheet names
pub fn get_sheet_names(&self) -> Vec<String> {
self.model.workbook.get_worksheet_names()
self.model.get_model().workbook.get_worksheet_names()
}
pub fn select_next_sheet(&mut self) {
let len = self.model.workbook.worksheets.len() as u32;
let len = self.model.get_model().workbook.worksheets.len() as u32;
let mut next = self.current_sheet + 1;
if next == len {
next = 0;
}
self.model.set_selected_sheet(next).expect("Unexpected error selecting sheet");
self.current_sheet = next;
}
pub fn select_prev_sheet(&mut self) {
let len = self.model.workbook.worksheets.len() as u32;
let len = self.model.get_model().workbook.worksheets.len() as u32;
let next = if self.current_sheet == 0 {
len - 1
} else {
self.current_sheet - 1
};
self.model.set_selected_sheet(next).expect("Unexpected error selecting sheet");
self.current_sheet = next;
}
/// Select a sheet by id.
pub fn select_sheet_by_id(&mut self, id: u32) -> bool {
if let Some((idx, _sheet)) = self
.model
.model.get_model()
.workbook
.worksheets
.iter()
.enumerate()
.find(|(_idx, sheet)| sheet.sheet_id == id)
{
self.model.set_selected_sheet(idx as u32).expect("Unexpected error selecting sheet");
self.current_sheet = idx as u32;
return true;
}
@ -522,42 +549,44 @@ impl Book {
/// Get the current `Worksheet`.
pub(crate) fn get_sheet(&self) -> Result<&Worksheet> {
// TODO(jwall): Is there a cleaner way to do this with UserModel?
// Looks like it should be done with:
// https://docs.rs/ironcalc_base/latest/ironcalc_base/struct.UserModel.html#method.get_worksheets_properties
Ok(self
.model
.model.get_model()
.workbook
.worksheet(self.current_sheet)
.map_err(|s| anyhow!("Invalid Worksheet id: {}: error: {}", self.current_sheet, s))?)
}
pub(crate) fn get_sheet_mut(&mut self) -> Result<&mut Worksheet> {
Ok(self
.model
.workbook
.worksheet_mut(self.current_sheet)
.map_err(|s| anyhow!("Invalid Worksheet: {}", s))?)
}
pub(crate) fn get_sheet_name_by_idx(&self, idx: usize) -> Result<&str> {
// TODO(jwall): Is there a cleaner way to do this with UserModel?
// Looks like it should be done with:
// https://docs.rs/ironcalc_base/latest/ironcalc_base/struct.UserModel.html#method.get_worksheets_properties
Ok(&self
.model
.model.get_model()
.workbook
.worksheet(idx as u32)
.map_err(|s| anyhow!("Invalid Worksheet: {}", s))?
.name)
}
pub(crate) fn get_sheet_by_idx_mut(&mut self, idx: usize) -> Result<&mut Worksheet> {
Ok(self
.model
.workbook
.worksheet_mut(idx as u32)
.map_err(|s| anyhow!("Invalid Worksheet: {}", s))?)
}
}
fn calculate_area(sheet: u32, start: Address, end: Address) -> Area {
let area = Area {
sheet,
row: start.row as i32,
column: start.col as i32,
height: (end.row - start.row + 1) as i32,
width: (end.col - start.col + 1) as i32,
};
area
}
impl Default for Book {
fn default() -> Self {
let mut book =
Book::new(Model::new_empty("default_name", "en", "America/New_York").unwrap());
Book::new(UserModel::new_empty("default_name", "en", "America/New_York").unwrap());
book.update_cell(&Address { row: 1, col: 1 }, "").unwrap();
book
}

62
src/ui/mod.rs
View File

@ -5,7 +5,7 @@ use crate::book::{AddressRange, Book};
use anyhow::{anyhow, Result};
use crossterm::event::{self, Event, KeyCode, KeyEventKind, KeyModifiers};
use ironcalc::base::Model;
use ironcalc::base::{expressions::types::Area, Model};
use ratatui::{
buffer::Buffer,
layout::{Constraint, Flex, Layout},
@ -131,7 +131,7 @@ impl<'ws> AppState<'ws> {
}
}
// TODO(jwall): This should probably move to a different module.
// TODO(jwall): Should we just be using `Area` for this?.
/// The Address in a Table.
#[derive(Debug, PartialEq, PartialOrd, Ord, Eq, Clone)]
pub struct Address {
@ -187,7 +187,7 @@ impl<'ws> Workspace<'ws> {
pub fn new_empty(locale: &str, tz: &str) -> Result<Self> {
Ok(Self::new(
Book::new(Model::new_empty("", locale, tz).map_err(|e| anyhow!("{}", e))?),
Book::from_model(Model::new_empty("", locale, tz).map_err(|e| anyhow!("{}", e))?),
PathBuf::default(),
))
}
@ -445,11 +445,11 @@ impl<'ws> Workspace<'ws> {
Ok(Some(Cmd::RenameSheet(idx, name))) => {
match idx {
Some(idx) => {
self.book.set_sheet_name(idx, name)?;
self.book.set_sheet_name(idx as u32, name)?;
}
_ => {
self.book
.set_sheet_name(self.book.current_sheet as usize, name)?;
.set_sheet_name(self.book.current_sheet, name)?;
}
}
Ok(None)
@ -469,13 +469,7 @@ impl<'ws> Workspace<'ws> {
let row_count = _count.unwrap_or(1);
let row = self.book.location.row;
for r in row..(row+row_count) {
let mut style = if let Some(style) = self.book.get_row_style(self.book.current_sheet, r)? {
style
} else {
self.book.create_style()
};
style.fill.bg_color = Some(color.to_string());
self.book.set_row_style(&style, self.book.current_sheet, r)?;
self.book.set_row_style(&[("fill.bg_color", color)], self.book.current_sheet, r)?;
}
Ok(None)
}
@ -483,36 +477,31 @@ impl<'ws> Workspace<'ws> {
let col_count = _count.unwrap_or(1);
let col = self.book.location.col;
for c in col..(col+col_count) {
let mut style = if let Some(style) = self.book.get_column_style(self.book.current_sheet, c)? {
style
} else {
self.book.create_style()
};
style.fill.bg_color = Some(color.to_string());
self.book.set_col_style(&style, self.book.current_sheet, c)?;
self.book.set_col_style(&[("fill.bg_color", color)], self.book.current_sheet, c)?;
}
Ok(None)
}
Ok(Some(Cmd::ColorCell(color))) => {
if let Some((start, end)) = self.state.range_select.get_range() {
for ri in start.row..=end.row {
for ci in start.col..=end.col {
let address = Address { row: ri, col: ci };
let sheet = self.book.current_sheet;
let mut style = self.book.get_cell_style(sheet, &address)
.expect("I think this should be impossible.").clone();
style.fill.bg_color = Some(color.to_string());
self.book.set_cell_style(&style, sheet, &address)?;
}
let sheet = self.book.current_sheet;
let area = if let Some((start, end)) = self.state.range_select.get_range() {
Area {
sheet,
row: start.row as i32,
column: start.col as i32,
width: (end.col - start.col) as i32,
height: (end.row - start.row) as i32
}
} else {
let address = self.book.location.clone();
let sheet = self.book.current_sheet;
let mut style = self.book.get_cell_style(sheet, &address)
.expect("I think this should be impossible.").clone();
style.fill.bg_color = Some(color.to_string());
self.book.set_cell_style(&style, sheet, &address)?;
}
Area {
sheet,
row: address.row as i32,
column: address.col as i32,
width: 1,
height: 1
}
};
self.book.set_cell_style(&[("fill.bg_color", color)], &area)?;
Ok(None)
}
Ok(None) => {
@ -550,7 +539,7 @@ impl<'ws> Workspace<'ws> {
self.handle_numeric_prefix(d);
}
KeyCode::Char('D') => {
if let Some((start, end)) = self.state.range_select.get_range() {
if let Some((start, end)) = dbg!(self.state.range_select.get_range()) {
self.book.clear_cell_range_all(
self.state
.range_select
@ -627,7 +616,6 @@ impl<'ws> Workspace<'ws> {
.modifiers
.contains(KeyModifiers::CONTROL) =>
{
// TODO(zaphar): Share the algorithm below between both copies
self.copy_range(true)?;
self.exit_range_select_mode()?;
}

6
src/ui/render/test.rs
View File

@ -8,7 +8,7 @@ use super::{Address, Book, Viewport, ViewportState};
#[test]
fn test_viewport_get_visible_columns() {
let mut state = ViewportState::default();
let book = Book::new(
let book = Book::from_model(
Model::new_empty("test", "en", "America/New_York").expect("Failed to make model"),
);
let default_size = book.get_col_size(1).expect("Failed to get column size");
@ -26,7 +26,7 @@ fn test_viewport_get_visible_columns() {
#[test]
fn test_viewport_get_visible_rows() {
let mut state = dbg!(ViewportState::default());
let book = Book::new(
let book = Book::from_model(
Model::new_empty("test", "en", "America/New_York").expect("Failed to make model"),
);
let height = 6;
@ -45,7 +45,7 @@ fn test_viewport_get_visible_rows() {
#[test]
fn test_viewport_visible_columns_after_length_change() {
let mut state = ViewportState::default();
let mut book = Book::new(
let mut book = Book::from_model(
Model::new_empty("test", "en", "America/New_York").expect("Failed to make model"),
);
let default_size = book.get_col_size(1).expect("Failed to get column size");

1
src/ui/render/viewport.rs
View File

@ -248,7 +248,6 @@ pub(crate) fn map_color(color: Option<&String>, otherwise: Color) -> Color {
candidate => {
// TODO(jeremy): Should we support more syntaxes than hex string?
// hsl(...) ??
// rgb(...) ??
if candidate.starts_with("#") {
if let Ok(rgb) = colorsys::Rgb::from_hex_str(candidate) {
// Note that the colorsys rgb model clamps the f64 values to no more