sirtimbly/IronCalc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deduplicate single insert delete row column

Browse Source
This commit is contained in:
BrianHung
2025-07-13 00:08:38 -07:00
committed by Nicolás Hatcher Andrés
parent 2d23f5d4e4
commit d7113622e7
1 changed files with 4 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
base/src/user_model/common.rs
View File

@@ -863,11 +863,7 @@ impl UserModel {
/// See also: /// See also:
/// * [Model::insert_rows] /// * [Model::insert_rows]
pub fn insert_row(&mut self, sheet: u32, row: i32) -> Result<(), String> { pub fn insert_row(&mut self, sheet: u32, row: i32) -> Result<(), String> {
let diff_list = vec![Diff::InsertRow { sheet, row }]; self.insert_rows(sheet, row, 1)
self.push_diff_list(diff_list);
self.model.insert_rows(sheet, row, 1)?;
self.evaluate_if_not_paused();
Ok(())
} }
/// Deletes a row /// Deletes a row
@@ -875,31 +871,7 @@ impl UserModel {
/// See also: /// See also:
/// * [Model::delete_rows] /// * [Model::delete_rows]
pub fn delete_row(&mut self, sheet: u32, row: i32) -> Result<(), String> { pub fn delete_row(&mut self, sheet: u32, row: i32) -> Result<(), String> {
let mut row_data = None; self.delete_rows(sheet, row, 1)
let worksheet = self.model.workbook.worksheet(sheet)?;
for rd in &worksheet.rows {
if rd.r == row {
row_data = Some(rd.clone());
break;
}
}
let data = match worksheet.sheet_data.get(&row) {
Some(s) => s.clone(),
None => return Err(format!("Row number '{row}' is not valid.")),
};
let old_data = Box::new(RowData {
row: row_data,
data,
});
let diff_list = vec![Diff::DeleteRow {
sheet,
row,
old_data,
}];
self.push_diff_list(diff_list);
self.model.delete_rows(sheet, row, 1)?;
self.evaluate_if_not_paused();
Ok(())
} }
/// Inserts a column /// Inserts a column
@@ -907,11 +879,7 @@ impl UserModel {
/// See also: /// See also:
/// * [Model::insert_columns] /// * [Model::insert_columns]
pub fn insert_column(&mut self, sheet: u32, column: i32) -> Result<(), String> { pub fn insert_column(&mut self, sheet: u32, column: i32) -> Result<(), String> {
let diff_list = vec![Diff::InsertColumn { sheet, column }]; self.insert_columns(sheet, column, 1)
self.push_diff_list(diff_list);
self.model.insert_columns(sheet, column, 1)?;
self.evaluate_if_not_paused();
Ok(())
} }
/// Deletes a column /// Deletes a column
@@ -919,46 +887,7 @@ impl UserModel {
/// See also: /// See also:
/// * [Model::delete_columns] /// * [Model::delete_columns]
pub fn delete_column(&mut self, sheet: u32, column: i32) -> Result<(), String> { pub fn delete_column(&mut self, sheet: u32, column: i32) -> Result<(), String> {
let worksheet = self.model.workbook.worksheet(sheet)?; self.delete_columns(sheet, column, 1)
if !is_valid_column_number(column) {
return Err(format!("Column number '{column}' is not valid."));
}
let mut column_data = None;
for col in &worksheet.cols {
let min = col.min;
let max = col.max;
if column >= min && column <= max {
column_data = Some(Col {
min: column,
max: column,
width: col.width,
custom_width: col.custom_width,
style: col.style,
});
break;
}
}
let mut data = HashMap::new();
for (row, row_data) in &worksheet.sheet_data {
if let Some(cell) = row_data.get(&column) {
data.insert(*row, cell.clone());
}
}
let diff_list = vec![Diff::DeleteColumn {
sheet,
column,
old_data: Box::new(ColumnData {
column: column_data,
data,
}),
}];
self.push_diff_list(diff_list);
self.model.delete_columns(sheet, column, 1)?;
self.evaluate_if_not_paused();
Ok(())
} }
/// Inserts several rows at once /// Inserts several rows at once