Compare commits
11 Commits
b8fd938120
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 0c2588a299 | |||
| 0c527bb3cb | |||
| 6ca21b407d | |||
| 1323d15333 | |||
| d69966bc01 | |||
| dae3b57f73 | |||
| ee1cac0522 | |||
| 712d75b256 | |||
| d5ccb9b8c6 | |||
| a03794e69f | |||
| 98215e42af |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,4 +1,5 @@
|
||||
/target
|
||||
/.vscode
|
||||
/*.csv
|
||||
/*.nscim
|
||||
/*.nscim
|
||||
/plot.png
|
||||
29
README.md
29
README.md
@@ -3,22 +3,6 @@
|
||||
*New* Spreadsheet Calculator Improved
|
||||
|
||||
Based loosely off sc-im (spreadsheet calculator improvised), which has dumb keybinds and not many features.
|
||||
## Improvements from sc-im
|
||||
|
||||
* Cell type (string, function, value) are all "the same" and use polymorphism to detect what you are trying to do.
|
||||
The logic is more or less:
|
||||
```cpp
|
||||
if value.can_be_a_number() {
|
||||
return value.as_number()
|
||||
} else if value.starts_with('=') {
|
||||
return value.as_equation()
|
||||
} else {
|
||||
return value.as_string()
|
||||
}
|
||||
```
|
||||
|
||||
* Keybinds are closer to vim keying (i/a start inserting into a cell)
|
||||
|
||||
|
||||
## Keybinds
|
||||
|
||||
@@ -141,6 +125,19 @@ if value.can_be_a_number() {
|
||||
|
||||
> Any time a function takes a variable amount of inputs, a range can be specified: `avg(B:B)`.
|
||||
|
||||
## Improvements from sc-im
|
||||
|
||||
* Cell type (string, function, value) are all "the same" and use polymorphism to detect what you are trying to do.
|
||||
If the cell can be a number (parsed into a float) it will be, if not, then if the string starts with "=", then treats it as an equation, otherwise, it's a string.
|
||||
|
||||
* Cell references move with copy / paste
|
||||
* =A0: Will translate
|
||||
* =$A0: Will translate Y only
|
||||
* =$A0: Will translate X only
|
||||
* =$A$0: No translation
|
||||
|
||||
* Keybinds are closer to vim keying (i/a start inserting into a cell)
|
||||
|
||||
## FAQ:
|
||||
|
||||
* Every number is a float (or will end up as a float)
|
||||
|
||||
10
bash_complitions
Normal file
10
bash_complitions
Normal file
@@ -0,0 +1,10 @@
|
||||
# This is only WIP, idk how to make it only take
|
||||
# 1 argument yet
|
||||
_complete() {
|
||||
local cur="${COMP_WORDS[COMP_CWORD]}"
|
||||
|
||||
# Only suggest *.csv and *.neoscim
|
||||
COMPREPLY=($(compgen -f -X '!*.@(csv|nscim)' -- "$cur"))
|
||||
}
|
||||
|
||||
complete -F _complete sc
|
||||
@@ -1,8 +1,9 @@
|
||||
use std::{
|
||||
cmp::{max, min},
|
||||
collections::HashMap,
|
||||
io,
|
||||
fs, io,
|
||||
path::PathBuf,
|
||||
time::SystemTime,
|
||||
};
|
||||
|
||||
use ratatui::{
|
||||
@@ -27,6 +28,7 @@ pub struct App {
|
||||
pub grid: Grid,
|
||||
pub mode: Mode,
|
||||
pub file: Option<PathBuf>,
|
||||
file_modified_date: SystemTime,
|
||||
pub msg: StatusMessage,
|
||||
pub vars: HashMap<String, String>,
|
||||
pub screen: ScreenSpace,
|
||||
@@ -40,7 +42,7 @@ impl Widget for &App {
|
||||
let (x_max, y_max) = self.screen.how_many_cells_fit_in(&area, &self.vars);
|
||||
|
||||
let is_selected = |x: usize, y: usize| -> bool {
|
||||
if let Mode::Visual((mut x1, mut y1)) = self.mode {
|
||||
if let Mode::Visual((mut x1, mut y1)) | Mode::VisualCmd((mut x1, mut y1), _)= self.mode {
|
||||
let (mut x2, mut y2) = self.grid.cursor();
|
||||
x1 += 1;
|
||||
y1 += 1;
|
||||
@@ -78,10 +80,6 @@ impl Widget for &App {
|
||||
y_idx = y as usize - 1 + self.screen.scroll_y();
|
||||
}
|
||||
|
||||
if is_selected(x.into(), y.into()) {
|
||||
style = style.fg(Color::LightMagenta).bg(Color::Blue);
|
||||
}
|
||||
|
||||
const ORANGE1: Color = Color::Rgb(200, 160, 0);
|
||||
const ORANGE2: Color = Color::Rgb(180, 130, 0);
|
||||
|
||||
@@ -127,7 +125,10 @@ impl Widget for &App {
|
||||
Some(cell) => {
|
||||
match cell {
|
||||
CellType::Number(c) => display = c.to_string(),
|
||||
CellType::String(s) => display = s.to_owned(),
|
||||
CellType::String(s) => {
|
||||
display = s.to_owned();
|
||||
style = Style::new().fg(Color::LightMagenta)
|
||||
}
|
||||
CellType::Equation(e) => {
|
||||
match self.grid.evaluate(e) {
|
||||
Ok(val) => {
|
||||
@@ -166,6 +167,10 @@ impl Widget for &App {
|
||||
}
|
||||
None => should_render = false,
|
||||
}
|
||||
|
||||
if is_selected(x.into(), y.into()) {
|
||||
style = style.bg(Color::Blue);
|
||||
}
|
||||
if (x_idx, y_idx) == self.grid.cursor() {
|
||||
should_render = true;
|
||||
style = Style::new().fg(Color::Black).bg(Color::White);
|
||||
@@ -211,13 +216,24 @@ impl App {
|
||||
screen: ScreenSpace::new(),
|
||||
marks: HashMap::new(),
|
||||
clipboard: Clipboard::new(),
|
||||
file_modified_date: SystemTime::now(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_with_file(file: impl Into<PathBuf> + Clone) -> std::io::Result<Self> {
|
||||
let mut app = Self::new();
|
||||
app.file = Some(file.clone().into());
|
||||
app.grid = Grid::new_from_file(file.into())?;
|
||||
|
||||
let mut file = fs::OpenOptions::new().read(true).open(file.into())?;
|
||||
let metadata = file.metadata()?;
|
||||
// Not all systems support this, apparently.
|
||||
if let Ok(time) = metadata.modified() {
|
||||
app.file_modified_date = time;
|
||||
} else {
|
||||
// Default is to just assume it was modified when we opened it.
|
||||
}
|
||||
|
||||
app.grid = Grid::new_from_file(&mut file)?;
|
||||
Ok(app)
|
||||
}
|
||||
|
||||
@@ -303,6 +319,21 @@ impl App {
|
||||
|
||||
fn handle_events(&mut self) -> io::Result<()> {
|
||||
match &mut self.mode {
|
||||
Mode::VisualCmd(pos, chord) => match event::read()? {
|
||||
event::Event::Key(key) => match key.code {
|
||||
event::KeyCode::Esc => self.mode = Mode::Visual(*pos),
|
||||
event::KeyCode::Backspace => chord.backspace(),
|
||||
event::KeyCode::Char(c) => chord.add_char(c),
|
||||
event::KeyCode::Enter => {
|
||||
// tmp is to get around reference issues.
|
||||
let tmp = pos.clone();
|
||||
Mode::process_cmd(self);
|
||||
self.mode = Mode::Visual(tmp)
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
_ => {}
|
||||
},
|
||||
Mode::Chord(chord) => match event::read()? {
|
||||
event::Event::Key(key) => match key.code {
|
||||
event::KeyCode::Esc => self.mode = Mode::Normal,
|
||||
@@ -372,20 +403,13 @@ impl App {
|
||||
}
|
||||
Mode::Command(editor) => match event::read()? {
|
||||
event::Event::Key(key) => match key.code {
|
||||
event::KeyCode::Esc => {
|
||||
// just cancel the operation
|
||||
self.mode = Mode::Normal;
|
||||
}
|
||||
event::KeyCode::Esc => self.mode = Mode::Normal,
|
||||
event::KeyCode::Backspace => editor.backspace(),
|
||||
event::KeyCode::Char(c) => editor.add_char(c),
|
||||
event::KeyCode::Enter => {
|
||||
Mode::process_cmd(self);
|
||||
self.mode = Mode::Normal;
|
||||
}
|
||||
event::KeyCode::Backspace => {
|
||||
editor.backspace();
|
||||
}
|
||||
event::KeyCode::Char(c) => {
|
||||
editor.add_char(c);
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
_ => {}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
use std::{
|
||||
cmp::{max, min},
|
||||
fs,
|
||||
fs::{self, File},
|
||||
io::{Read, Write},
|
||||
path::PathBuf,
|
||||
path::PathBuf
|
||||
};
|
||||
|
||||
use evalexpr::*;
|
||||
@@ -11,7 +11,7 @@ use crate::app::{
|
||||
logic::{
|
||||
cell::{CSV_DELIMITER, CellType},
|
||||
ctx,
|
||||
},
|
||||
}, mode::Mode,
|
||||
};
|
||||
|
||||
#[cfg(test)]
|
||||
@@ -58,10 +58,9 @@ impl Grid {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_from_file(path: impl Into<PathBuf>) -> std::io::Result<Self> {
|
||||
pub fn new_from_file(file: &mut File) -> std::io::Result<Self> {
|
||||
let mut grid = Self::new();
|
||||
|
||||
let mut file = fs::OpenOptions::new().read(true).open(path.into())?;
|
||||
let mut buf = String::new();
|
||||
file.read_to_string(&mut buf)?;
|
||||
for (yi, line) in buf.lines().enumerate() {
|
||||
@@ -92,7 +91,7 @@ impl Grid {
|
||||
resolve_values = true;
|
||||
}
|
||||
Some(CUSTOM_EXT) => {
|
||||
resolve_values = true;
|
||||
resolve_values = false;
|
||||
}
|
||||
_ => {
|
||||
resolve_values = false;
|
||||
@@ -111,21 +110,28 @@ impl Grid {
|
||||
for x in 0..=mx {
|
||||
let cell = &self.cells[x][y];
|
||||
|
||||
// newline after the cell, because it's end of line.
|
||||
// else, just put a comma after the cell.
|
||||
let is_last = x==mx;
|
||||
let delim = if is_last {
|
||||
'\n'
|
||||
} else {
|
||||
CSV_DELIMITER
|
||||
};
|
||||
|
||||
let data = if let Some(cell) = cell {
|
||||
if let Ok(val) = self.evaluate(&cell.to_string())
|
||||
&& resolve_values
|
||||
{
|
||||
val.to_string()
|
||||
format!("{}{}", val.to_string(), delim)
|
||||
} else {
|
||||
cell.escaped_csv_string()
|
||||
format!("{}{}", cell.escaped_csv_string(), delim)
|
||||
}
|
||||
} else {
|
||||
CSV_DELIMITER.to_string()
|
||||
delim.to_string()
|
||||
};
|
||||
|
||||
write!(f, "{data}")?;
|
||||
}
|
||||
write!(f, "\n")?;
|
||||
}
|
||||
f.flush()?;
|
||||
|
||||
@@ -460,6 +466,92 @@ impl Default for Grid {
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn saving_csv() {
|
||||
// setup grid
|
||||
// This should be 1..10 in the A column, then
|
||||
// 1^2..10^2 in the B column.
|
||||
let mut app = App::new();
|
||||
app.grid.set_cell("A0", 1.);
|
||||
app.grid.set_cell("B0", "=A0^2".to_string());
|
||||
|
||||
app.grid.set_cell("A1", "=A0+A$0".to_string());
|
||||
app.grid.set_cell("B1", "=A1^2".to_string());
|
||||
|
||||
app.grid.mv_cursor_to(0, 1);
|
||||
app.mode = Mode::Visual(app.grid.cursor());
|
||||
Mode::process_key(&mut app, 'l');
|
||||
Mode::process_key(&mut app, 'y');
|
||||
app.mode = Mode::Normal;
|
||||
app.grid.mv_cursor_to(0, 2);
|
||||
for _ in 0..10 {
|
||||
Mode::process_key(&mut app, 'p');
|
||||
}
|
||||
// setup done
|
||||
|
||||
// insure that the cells are there
|
||||
let cell = app.grid.get_cell_raw(0, 10).as_ref().expect("Should've been set");
|
||||
let res = app.grid.evaluate(&cell.to_string()).expect("Should evaluate");
|
||||
assert_eq!(res, 11.0);
|
||||
assert_eq!(cell.escaped_csv_string(), "=A9+A$0");
|
||||
let cell = app.grid.get_cell_raw(1, 10).as_ref().expect("Should've been set");
|
||||
let res = app.grid.evaluate(&cell.to_string()).expect("Should evaluate");
|
||||
assert_eq!(res, 121.0);
|
||||
assert_eq!(cell.escaped_csv_string(), "=A10^2");
|
||||
|
||||
// set saving the file
|
||||
let filename = "/tmp/file.csv";
|
||||
app.grid.save_to(filename).expect("This will only work on linux systems");
|
||||
let mut file = fs::OpenOptions::new().read(true).open(filename).expect("Just wrote the file");
|
||||
let mut buf = String::new();
|
||||
file.read_to_string(&mut buf).expect("Just opened the file");
|
||||
let line = buf.lines().skip(10).next();
|
||||
assert_eq!(line, Some("11,121"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn saving_neoscim() {
|
||||
// setup grid
|
||||
// This should be 1..10 in the A column, then
|
||||
// 1^2..10^2 in the B column.
|
||||
let mut app = App::new();
|
||||
app.grid.set_cell("A0", 1.);
|
||||
app.grid.set_cell("B0", "=A0^2".to_string());
|
||||
|
||||
app.grid.set_cell("A1", "=A0+A$0".to_string());
|
||||
app.grid.set_cell("B1", "=A1^2".to_string());
|
||||
|
||||
app.grid.mv_cursor_to(0, 1);
|
||||
app.mode = Mode::Visual(app.grid.cursor());
|
||||
Mode::process_key(&mut app, 'l');
|
||||
Mode::process_key(&mut app, 'y');
|
||||
app.mode = Mode::Normal;
|
||||
app.grid.mv_cursor_to(0, 2);
|
||||
for _ in 0..10 {
|
||||
Mode::process_key(&mut app, 'p');
|
||||
}
|
||||
// setup done
|
||||
|
||||
// insure that the cells are there
|
||||
let cell = app.grid.get_cell_raw(0, 10).as_ref().expect("Should've been set");
|
||||
let res = app.grid.evaluate(&cell.to_string()).expect("Should evaluate");
|
||||
assert_eq!(res, 11.0);
|
||||
assert_eq!(cell.escaped_csv_string(), "=A9+A$0");
|
||||
let cell = app.grid.get_cell_raw(1, 10).as_ref().expect("Should've been set");
|
||||
let res = app.grid.evaluate(&cell.to_string()).expect("Should evaluate");
|
||||
assert_eq!(res, 121.0);
|
||||
assert_eq!(cell.escaped_csv_string(), "=A10^2");
|
||||
|
||||
// set saving the file
|
||||
let filename= "/tmp/file.neoscim";
|
||||
app.grid.save_to(filename).expect("This will only work on linux systems");
|
||||
let mut file = fs::OpenOptions::new().read(true).open(filename).expect("Just wrote the file");
|
||||
let mut buf = String::new();
|
||||
file.read_to_string(&mut buf).expect("Just opened the file");
|
||||
let line = buf.lines().skip(10).next();
|
||||
assert_eq!(line, Some("=A9+A$0,=A10^2"));
|
||||
}
|
||||
|
||||
// Do cells hold strings?
|
||||
#[test]
|
||||
fn cell_strings() {
|
||||
@@ -803,8 +895,16 @@ fn ranges() {
|
||||
|
||||
#[test]
|
||||
fn recursive_ranges() {
|
||||
// recursive ranges causes weird behavior
|
||||
// todo!();
|
||||
let mut grid = Grid::new();
|
||||
|
||||
grid.set_cell("A1", 1.);
|
||||
grid.set_cell("B1", 2.);
|
||||
grid.set_cell("B0", "=sum(A:A)".to_string());
|
||||
grid.set_cell("A0", "=sum(B:B)".to_string());
|
||||
|
||||
let cell = grid.get_cell("B0").as_ref().expect("Just set it");
|
||||
let res = grid.evaluate(&cell.to_string());
|
||||
assert!(res.is_err());
|
||||
}
|
||||
|
||||
#[test]
|
||||
@@ -937,3 +1037,29 @@ fn insert_row_above_3() {
|
||||
let cell = grid.get_cell("B1").as_ref().expect("Just set it");
|
||||
assert_eq!(cell.to_string(), "=A1");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn cell_eval_depth() {
|
||||
use crate::app::mode::*;
|
||||
let mut app= App::new();
|
||||
|
||||
app.grid.set_cell("A0", 1.);
|
||||
app.grid.set_cell("A1", "=A0+$A$0".to_string());
|
||||
|
||||
app.grid.mv_cursor_to(0, 1);
|
||||
app.mode = Mode::Chord(Chord::new('y'));
|
||||
Mode::process_key(&mut app, 'y');
|
||||
Mode::process_key(&mut app, 'j');
|
||||
app.mode = Mode::Chord(Chord::new('5'));
|
||||
Mode::process_key(&mut app, 'p');
|
||||
|
||||
assert_eq!(app.grid.cursor(), (0, 7));
|
||||
|
||||
let c = app.grid.get_cell("A6").as_ref().expect("Just set it");
|
||||
|
||||
assert_eq!(c.to_string(), "=A5+$A$0");
|
||||
|
||||
let res = app.grid.evaluate(&c.to_string()).expect("Should evaluate");
|
||||
assert_eq!(res, 7.);
|
||||
}
|
||||
|
||||
|
||||
@@ -38,9 +38,9 @@ impl CellType {
|
||||
|
||||
// escape string of it has a comma
|
||||
if display.contains(CSV_DELIMITER) {
|
||||
format!("\"{display}\"{CSV_DELIMITER}")
|
||||
format!("\"{display}\"")
|
||||
} else {
|
||||
format!("{display}{CSV_DELIMITER}")
|
||||
display
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -6,7 +6,8 @@ use crate::app::logic::{calc::Grid, cell::CellType};
|
||||
|
||||
pub struct CallbackContext<'a> {
|
||||
variables: &'a Grid,
|
||||
eval_depth: RwLock<usize>,
|
||||
eval_breadcrumbs: RwLock<Vec<String>>,
|
||||
compute_cache: RwLock<HashMap<String, Value>>,
|
||||
functions: HashMap<String, Function<DefaultNumericTypes>>,
|
||||
|
||||
/// True if builtin functions are disabled.
|
||||
@@ -139,10 +140,11 @@ impl<'a> CallbackContext<'a> {
|
||||
|
||||
pub fn new(grid: &'a Grid) -> Self {
|
||||
Self {
|
||||
eval_depth: RwLock::new(0),
|
||||
variables: grid,
|
||||
functions: Self::get_functions(),
|
||||
without_builtin_functions: false,
|
||||
eval_breadcrumbs: RwLock::new(Vec::new()),
|
||||
compute_cache: RwLock::new(HashMap::new()),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -151,27 +153,46 @@ impl<'a> Context for CallbackContext<'a> {
|
||||
type NumericTypes = DefaultNumericTypes;
|
||||
|
||||
fn get_value(&self, identifier: &str) -> Option<Value<Self::NumericTypes>> {
|
||||
const RECURSION_DEPTH_LIMIT: usize = 20;
|
||||
|
||||
// check cache
|
||||
if let Ok(cc) = self.compute_cache.read() {
|
||||
if let Some(hit) = cc.get(identifier) {
|
||||
return Some(hit.clone());
|
||||
}
|
||||
}
|
||||
|
||||
if let Ok(mut trail) = self.eval_breadcrumbs.write() {
|
||||
let find = trail.iter().filter(|id| *id == identifier).collect::<Vec<&String>>();
|
||||
if find.len() > 0 {
|
||||
// recursion detected
|
||||
return None;
|
||||
} else {
|
||||
trail.push(identifier.to_owned(), );
|
||||
}
|
||||
}
|
||||
|
||||
let pre_return = |v: Value| {
|
||||
if let Ok(mut cc) = self.compute_cache.write() {
|
||||
cc.insert(identifier.to_owned(), v.clone());
|
||||
}
|
||||
Some(v)
|
||||
};
|
||||
|
||||
if let Some(v) = self.variables.get_cell(identifier) {
|
||||
match v {
|
||||
CellType::Number(n) => return Some(Value::Float(n.to_owned())),
|
||||
CellType::String(s) => return Some(Value::String(s.to_owned())),
|
||||
CellType::Equation(eq) => {
|
||||
if let Ok(mut depth) = self.eval_depth.write() {
|
||||
*depth += 1;
|
||||
if *depth > RECURSION_DEPTH_LIMIT {
|
||||
return None;
|
||||
}
|
||||
} else {
|
||||
// It would be unsafe to continue to process without knowing how
|
||||
// deep we've gone.
|
||||
return None;
|
||||
}
|
||||
CellType::Number(n) => {
|
||||
return pre_return(Value::Float(n.to_owned()));
|
||||
},
|
||||
CellType::String(s) => {
|
||||
return pre_return(Value::String(s.to_owned()));
|
||||
},
|
||||
CellType::Equation(eq) => {
|
||||
// remove the equals sign from the beginning, as that
|
||||
// tries to set variables with our evaluation lib
|
||||
match eval_with_context(&eq[1..], self) {
|
||||
Ok(e) => return Some(e),
|
||||
Ok(e) => {
|
||||
return pre_return(e)
|
||||
},
|
||||
Err(e) => {
|
||||
match e {
|
||||
EvalexprError::VariableIdentifierNotFound(_) => {
|
||||
@@ -196,14 +217,6 @@ impl<'a> Context for CallbackContext<'a> {
|
||||
CellType::Number(e) => vals.push(Value::Float(*e)),
|
||||
CellType::String(s) => vals.push(Value::String(s.to_owned())),
|
||||
CellType::Equation(eq) => {
|
||||
if let Ok(mut depth) = self.eval_depth.write() {
|
||||
*depth += 1;
|
||||
if *depth > RECURSION_DEPTH_LIMIT {
|
||||
return None;
|
||||
}
|
||||
} else {
|
||||
return None;
|
||||
}
|
||||
if let Ok(val) = eval_with_context(&eq[1..], self) {
|
||||
vals.push(val);
|
||||
}
|
||||
@@ -239,10 +252,8 @@ impl<'a> Context for CallbackContext<'a> {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// DOES NOT EVALUATE EQUATIONS!!
|
||||
///
|
||||
///
|
||||
/// This is used as a pseudo-context, just used for
|
||||
/// learning all the variables in an expression.
|
||||
#[derive(Debug)]
|
||||
@@ -259,18 +270,10 @@ impl ExtractionContext {
|
||||
}
|
||||
}
|
||||
pub fn dump_vars(&self) -> Vec<String> {
|
||||
if let Ok(r) = self.var_registry.read() {
|
||||
r.clone()
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
if let Ok(r) = self.var_registry.read() { r.clone() } else { Vec::new() }
|
||||
}
|
||||
pub fn dump_fns(&self) -> Vec<String> {
|
||||
if let Ok(r) = self.fn_registry.read() {
|
||||
r.clone()
|
||||
} else {
|
||||
Vec::new()
|
||||
}
|
||||
if let Ok(r) = self.fn_registry.read() { r.clone() } else { Vec::new() }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -280,7 +283,9 @@ impl Context for ExtractionContext {
|
||||
fn get_value(&self, identifier: &str) -> Option<Value<Self::NumericTypes>> {
|
||||
if let Ok(mut registry) = self.var_registry.write() {
|
||||
registry.push(identifier.to_owned());
|
||||
} else { panic!("The RwLock should always be write-able") }
|
||||
} else {
|
||||
panic!("The RwLock should always be write-able")
|
||||
}
|
||||
|
||||
Some(Value::Int(1))
|
||||
}
|
||||
@@ -293,7 +298,9 @@ impl Context for ExtractionContext {
|
||||
let _ = argument;
|
||||
if let Ok(mut registry) = self.fn_registry.write() {
|
||||
registry.push(identifier.to_owned())
|
||||
} else { panic!("The RwLock should always be write-able") }
|
||||
} else {
|
||||
panic!("The RwLock should always be write-able")
|
||||
}
|
||||
// Ok(Value::Int(1))
|
||||
unimplemented!("Extracting function identifier not implemented yet")
|
||||
}
|
||||
|
||||
101
src/app/mode.rs
101
src/app/mode.rs
@@ -1,7 +1,8 @@
|
||||
use std::{
|
||||
cmp::{max, min},
|
||||
fmt::Display,
|
||||
path::PathBuf,
|
||||
fs,
|
||||
path::PathBuf, process::Command,
|
||||
};
|
||||
|
||||
use ratatui::{
|
||||
@@ -14,7 +15,7 @@ use crate::app::{
|
||||
app::App,
|
||||
error_msg::StatusMessage,
|
||||
logic::{
|
||||
calc::{CSV_EXT, CUSTOM_EXT, LEN},
|
||||
calc::{CSV_EXT, CUSTOM_EXT, Grid, LEN},
|
||||
cell::CellType,
|
||||
},
|
||||
};
|
||||
@@ -25,6 +26,7 @@ pub enum Mode {
|
||||
Normal,
|
||||
Command(Chord),
|
||||
Visual((usize, usize)),
|
||||
VisualCmd((usize, usize), Chord),
|
||||
}
|
||||
|
||||
impl Display for Mode {
|
||||
@@ -35,6 +37,7 @@ impl Display for Mode {
|
||||
Mode::Chord(_) => write!(f, "CHORD"),
|
||||
Mode::Command(_) => write!(f, "COMMAND"),
|
||||
Mode::Visual(_) => write!(f, "VISUAL"),
|
||||
Mode::VisualCmd(_, _) => write!(f, "V-CMD"),
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -45,6 +48,7 @@ impl Mode {
|
||||
// Where you are typing
|
||||
Mode::Insert(_) => Style::new().fg(Color::White).bg(Color::Blue),
|
||||
Mode::Command(_) => Style::new().fg(Color::Black).bg(Color::Magenta),
|
||||
Mode::VisualCmd(_, _) => Style::new().fg(Color::Black).bg(Color::Yellow),
|
||||
Mode::Chord(_) => Style::new().fg(Color::Black).bg(Color::LightBlue),
|
||||
// Movement-based modes
|
||||
Mode::Visual(_) => Style::new().fg(Color::Yellow),
|
||||
@@ -83,6 +87,9 @@ impl Mode {
|
||||
}
|
||||
};
|
||||
|
||||
// TODO Check if the file exists, but the program wasn't opened with it. We might be accidentally overwriting something else.
|
||||
// let mut file = fs::OpenOptions::new().write(true).append(false).truncate(true).create(true).open(path)?;
|
||||
|
||||
if let Err(e) = app.grid.save_to(&path) {
|
||||
app.msg = StatusMessage::error(format!("{e}"));
|
||||
} else {
|
||||
@@ -142,6 +149,82 @@ impl Mode {
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
if let Mode::VisualCmd(pos, editor) = &mut app.mode {
|
||||
let cmd = &editor.as_string()[1..];
|
||||
let args = cmd.split_ascii_whitespace().collect::<Vec<&str>>();
|
||||
if args.is_empty() {
|
||||
return;
|
||||
}
|
||||
|
||||
// These values are going to be used in probably all
|
||||
// the commands related to ranges, we will just write
|
||||
// logic here first, once.
|
||||
let (x1, y1) = pos;
|
||||
let (x1, y1) = (*x1, *y1);
|
||||
let (x2, y2) = app.grid.cursor();
|
||||
let (low_x, hi_x) = if x1 < x2 { (x1, x2) } else { (x2, x1) };
|
||||
let (low_y, hi_y) = if y1 < y2 { (y1, y2) } else { (y2, y1) };
|
||||
|
||||
let mut save_range = |to: &str| {
|
||||
let mut g = Grid::new();
|
||||
for (i, x) in (low_x..=hi_x).enumerate() {
|
||||
for (j, y) in (low_y..=hi_y).enumerate() {
|
||||
g.set_cell_raw((i, j), app.grid.get_cell_raw(x, y).clone());
|
||||
}
|
||||
}
|
||||
if let Err(_e) = g.save_to(to) {
|
||||
app.msg = StatusMessage::error("Failed to save file");
|
||||
}
|
||||
};
|
||||
|
||||
let get_project_name = || {
|
||||
if let Some(file) = &app.file {
|
||||
if let Some(name) = file.file_name() {
|
||||
if let Some(name) = name.to_str() {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
}
|
||||
return "unknown"
|
||||
};
|
||||
|
||||
match args[0] {
|
||||
"export" => {
|
||||
if let Some(arg1) = args.get(1) {
|
||||
save_range(&arg1);
|
||||
} else {
|
||||
app.msg = StatusMessage::error("export <path.csv>")
|
||||
}
|
||||
app.mode = Mode::Normal
|
||||
}
|
||||
"plot" => {
|
||||
// Use gnuplot to plot the selected data.
|
||||
// * Temp data will be stored in /tmp/
|
||||
// * Output will either be plot.png or a name that you pass in
|
||||
let output_filename = if let Some(arg1) = args.get(1) {
|
||||
arg1
|
||||
} else {
|
||||
"plot.png"
|
||||
};
|
||||
|
||||
save_range("/tmp/plot.csv");
|
||||
let plot = include_str!("../../template.gnuplot");
|
||||
let s = plot.replace("$FILE", "/tmp/plot.csv");
|
||||
let s = s.replace("$TITLE", get_project_name());
|
||||
let s = s.replace("$XLABEL", "hard-coded x");
|
||||
let s = s.replace("$YLABEL", "hard-coded y");
|
||||
let s = s.replace("$OUTPUT", "/tmp/output.png");
|
||||
let _ = fs::write("/tmp/plot.p", s);
|
||||
|
||||
let _ = Command::new("gnuplot").arg("/tmp/plot.p").output();
|
||||
let _ = fs::copy("/tmp/output.png", output_filename);
|
||||
|
||||
app.msg = StatusMessage::info("Wrote gnuplot data to /tmp");
|
||||
app.mode = Mode::Normal
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn process_key(app: &mut App, key: char) {
|
||||
@@ -210,7 +293,13 @@ impl Mode {
|
||||
app.grid.insert_row_above(app.grid.cursor());
|
||||
}
|
||||
'v' => app.mode = Mode::Visual(app.grid.cursor()),
|
||||
':' => app.mode = Mode::Command(Chord::new(':')),
|
||||
':' => {
|
||||
if let Self::Visual(pos) = app.mode {
|
||||
app.mode = Mode::VisualCmd(pos, Chord::new(':'));
|
||||
} else {
|
||||
app.mode = Mode::Command(Chord::new(':'))
|
||||
}
|
||||
}
|
||||
'p' => {
|
||||
app.clipboard.paste(&mut app.grid, true);
|
||||
app.grid.apply_momentum(app.clipboard.momentum());
|
||||
@@ -322,15 +411,16 @@ impl Mode {
|
||||
}
|
||||
}
|
||||
}
|
||||
// IDK why it works but it does. Keystrokes are process somewhere else?
|
||||
// Keys are process in the handle_event method in App for these
|
||||
Mode::Insert(_chord) => {}
|
||||
Mode::Command(_chord) => {}
|
||||
Mode::VisualCmd(_pos, _chord) => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn chars_to_display(&self, cell: &Option<CellType>) -> u16 {
|
||||
let len = match &self {
|
||||
Mode::Insert(edit) | Mode::Command(edit) | Mode::Chord(edit) => edit.len(),
|
||||
Mode::Insert(edit) | Mode::VisualCmd(_, edit) | Mode::Command(edit) | Mode::Chord(edit) => edit.len(),
|
||||
Mode::Normal => {
|
||||
let len = cell.as_ref().map(|f| f.to_string().len()).unwrap_or_default();
|
||||
len
|
||||
@@ -359,6 +449,7 @@ impl Mode {
|
||||
area,
|
||||
),
|
||||
Mode::Visual(_) => {}
|
||||
Mode::VisualCmd(_, editor) => f.render_widget(editor, area),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
18
template.gnuplot
Normal file
18
template.gnuplot
Normal file
@@ -0,0 +1,18 @@
|
||||
datafile = '$FILE'
|
||||
set datafile separator ','
|
||||
|
||||
set title '$TITLE'
|
||||
set key autotitle columnhead
|
||||
set xlabel "$XLABEL"
|
||||
set ylabel "$YLABEL"
|
||||
|
||||
set style line 1 linewidth 2 linecolor 1 pointtype 7 pointsize 1.5
|
||||
|
||||
set autoscale
|
||||
set grid
|
||||
|
||||
set term png size 1280, 720
|
||||
set output '$OUTPUT'
|
||||
plot datafile using 1:2 with linespoints linestyle 1
|
||||
# plot datafile using 1:2 with linespoints linestyle 1, datafile using 1:3, etc...
|
||||
replot
|
||||
Reference in New Issue
Block a user