Skip to content

Commit

Permalink
Update version to v2.1.0
Browse files Browse the repository at this point in the history 
	修改：     Cargo.toml
	修改：     README.md
	修改：     UpdateLog.md
	修改：     src/app.rs
	修改：     src/lib.rs
  • Loading branch information
@A4-Tacks
A4-Tacks committed May 2, 2023
1 parent d6ff37e commit a6683fa
Show file tree
Hide file tree
Showing 5 changed files with 256 additions and 117 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[package]
name = "timg"
version = "2.0.1"
version = "2.1.0"
edition = "2021"

authors = ["A4-Tacks <[email protected]>"]
keywords = ["terminal", "image", "term", "tui", "viewer"]
description = "Picture viewer for terminal (VT100)."
keywords = ["terminal", "image", "ansi_term", "tui", "viewer"]
description = "Interactive Image Viewer on Terminal (xterm)"
categories = ["command-line-utilities"]

license = "MIT"
Expand Down
5 changes: 3 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
The image viewer on the terminal is based on the VT100 standard.
The image viewer on the terminal is based on the xterm standard.
This is an interactive image viewer with very fast IO speed on the terminal, utilizing incremental output and other methods to significantly reduce IO data. It can perform well on low-speed terminals.

# Functions
- Zoom Picture
Expand All @@ -20,4 +21,4 @@ The image viewer on the terminal is based on the VT100 standard.
# Info
crate: <https://crates.io/crates/timg>

Due to the current implementation of reading one character at a time being unavailable on Windows, it may result in the software being unavailable or not meeting expectations on Windows.
Due to the current implementation of the software reading one character at a time appearing to be unavailable on Windows systems, it may result in the software being unavailable or not meeting your expectations when running on Windows systems.
10 changes: 10 additions & 0 deletions UpdateLog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v2.0.1
The library used `term_lattice` has fixed some minor issues and will use its updated version
Optimized the background color display in the help interface, and the transparent background color in the test was re added as the bug was fixed

# v2.1.0
## Add Functions
- InitRatio
- UnitRatio
- RC ErrorCode

Some optimizations have been made
Modified the position reference for zooming, no longer the top left corner but the center of the screen
Now the `Control+C` key can also be used to exit
158 changes: 114 additions & 44 deletions src/app.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,7 @@ use timg::{
Position,
Float,
};
use image::{
imageops::FilterType,
ColorType
};
use image::imageops::FilterType;


const FILTERS: &[FilterType] = &[
Expand All @@ -39,7 +36,6 @@ const FILTERS: &[FilterType] = &[

pub type Rgba = [u8; 4];


/// RGBA color to RGB color
/// # Examples
/// ```
Expand Down Expand Up @@ -68,7 +64,7 @@ pub fn rgba_to_rgb(foreground: Rgba, background: Rgb) -> Rgb {
}


#[macro_export]
/// 输出信息
macro_rules! log {
(e:($code:expr) $( $x:expr ),* ) => {{
log!(e $($x),* );
Expand All @@ -79,6 +75,27 @@ macro_rules! log {
ESC, format!($($x),*) ))
}

/// 声明一个可变的变量, 并且在声明时声明一个宏用于之后的重复初始化
/// 可同时声明多次
macro_rules! new_and_init_macro {
(
$(
let mut $name:ident $(: $ty:ty )?
=> $init_macro:ident = $value:expr;
)*
) => {
$(
let mut $name $(: $ty)?;
macro_rules! $init_macro {
() => {
$name = $value;
}
}
$init_macro!();
)*
};
}


pub fn run(matches: ArgMatches) {
macro_rules! get_value {
Expand Down Expand Up @@ -179,21 +196,11 @@ pub fn run(matches: ArgMatches) {
let mut stdin = stdin().into_raw_mode().unwrap_or_else(|e| {
log!(e:(2) "GetStdInError: {}", e);
});
let is_alpha: bool = match repr_img.color() {
ColorType::L8 | ColorType::L16
| ColorType::Rgb8 | ColorType::Rgb16
| ColorType::Rgb32F
=> false,
ColorType::La8
| ColorType::La16| ColorType::Rgba8
| ColorType::Rgba16 | ColorType::Rgba32F
=> true,
t => log!(e:(2) "ColorTypeError: {:?}", t),
};
let is_alpha: bool = repr_img.color().has_alpha();
let mut is_start: bool = true;
let mut readbuf: [u8; 1] = [0];
'main: loop {
let mut term_size: Position
'main: loop { // 部分参数初始化将在这个头部进行
let mut term_size: Position /* 终端的大小, 按像素算 */
= Position::from(if let Some(size) = set_term_size {
[size.x, size.y * 2]
} else {
Expand All @@ -209,16 +216,21 @@ pub fn run(matches: ArgMatches) {
if is_start {
eprint!("\x1b[{}S", term_size.y >> 1); // 滚动一个屏幕, 以空出空间
}
clear_screen!();
term_size.y -= 2; // 缩小终端大小一文本行以留给状态行
let mut scale: Float = get_scale(term_size, img_size);
let mut win_pos: Position = Position::default(); // 在图片中的绝对像素
let full_scale: Float = get_scale(term_size, img_size);
clear_screen!();
new_and_init_macro!{
// scale alias ratio.
let mut scale: Float => init_scale = full_scale;
let mut back_ground_color_idx => init_back_ground_color_idx = 0;
let mut win_pos: Position => init_win_pos = Position::default(); // 在图片中的绝对像素
}
let mut screen_buf: ScreenBuffer
= ScreenBuffer::new(term_size.into_array());
screen_buf.cfg.chromatic_aberration = default_opt_level;
let mut back_ground_color_idx = 0;
let mut filter_idx = 4;
let [mut grayscale, mut invert] = [false; 2];
let mut error_buf: String = String::new();
loop {
screen_buf.cfg.default_color
= back_grounds[back_ground_color_idx];
Expand Down Expand Up @@ -278,17 +290,19 @@ pub fn run(matches: ArgMatches) {
"\x1b[7m",
"ImgSize[{}x{}] ",
"Pos[{},{}] ",
"Scale[{:.2}] ",
"Ratio[{:.2}] ",
"Opt[{}] ",
"Fl[{}] ",
"Help(H) ",
"Quit(Q)",
"\x1b[0m"),
"\x1b[0m\x1b[s{}\x1b[K\x1b[u"),
img_size.x, img_size.y,
win_pos.x, win_pos.y,
scale,
screen_buf.cfg.chromatic_aberration,
filter_idx);
filter_idx,
error_buf);
error_buf.clear();
eprint!("\x1b[H{}{}", screen_buf.flush(false), status_line);
is_start = false;
macro_rules! read_char {
Expand All @@ -309,10 +323,30 @@ pub fn run(matches: ArgMatches) {
};
macro_rules! ctrl_err {
( $( $x:expr ),* ) => {
eprint!("\x07 \x1b[101m{}\x1b[0m",
format!( $( $x ),* ))
error_buf.extend(
format!("\x07 \x1b[101m{}\x1b[0m",
format!( $( $x ),* )).chars())
};
}
/// <: new < old
/// >: new > old
/// note 一轮中仅可运行一次,
/// 并且仅在 scale_term_size 未改变, scale 已改变时使用
macro_rules! fix_pos {
(<) => {{
win_pos += (scale_term_size
- term_size.mul_scale(scale))
>> 1.into();
}};
(>) => {{
let old: Position = win_pos;
win_pos -= (term_size.mul_scale(scale)
- scale_term_size)
>> 1.into();
if win_pos.x > old.x { win_pos.x = 0 }
if win_pos.y > old.y { win_pos.y = 0 }
}};
}
let [moveb_wlen, moveb_hlen] = [
(scale_term_size.x as Float * short_move_ratio).ceil() as SizeType,
(scale_term_size.y as Float * short_move_ratio).ceil() as SizeType
Expand All @@ -321,13 +355,14 @@ pub fn run(matches: ArgMatches) {
(scale_term_size.x as Float * long_move_ratio).ceil() as SizeType,
(scale_term_size.y as Float * long_move_ratio).ceil() as SizeType
];
match readbuf[0] as char {
// 将在此处阻塞等待输入
match readbuf[0] as char { // 处理读入的单个字符
'r' => {
screen_buf.init_bg_colors();
clear_screen!();
},
'R' => continue 'main,
'Q' => break, /* exit */
'Q' | '\x03' => break, /* exit */
'h' => {
let old = win_pos.x;
win_pos.x -= move_len;
Expand Down Expand Up @@ -383,22 +418,38 @@ pub fn run(matches: ArgMatches) {
}
},
'D' => win_pos.x += movec_wlen,
'+' | 'c' => scale *= zoom_sub_ratio,
'-' | 'x' => scale *= zoom_add_ratio,
'o' => { /* opt */

// 缩放
// 放大(比例与视区缩小 new < old) p += (old - new) >> 1
'+' | 'c' => {
scale *= zoom_sub_ratio;
fix_pos!(<);
},
// 缩小(比例与视区放大 old < new) p -= (new - old) >> 1
'-' | 'x' => {
scale *= zoom_add_ratio;
if scale > full_scale {
// 防止将图片缩的过小
init_scale!();
ctrl_err!("RC");
}
fix_pos!(>);
},

'o' => { /* opt add */
screen_buf.cfg.chromatic_aberration += 1;
}
'O' => { /* opt */
'O' => { /* opt add */
screen_buf.cfg.chromatic_aberration += 10;
}
'i' => { /* opt */
'i' => { /* opt sub */
if screen_buf.cfg.chromatic_aberration != 0 {
screen_buf.cfg.chromatic_aberration -= 1
} else {
ctrl_err!("FV")
};
}
'I' => { /* opt */
'I' => { /* opt sub */
if screen_buf.cfg.chromatic_aberration >= 10 {
screen_buf.cfg.chromatic_aberration -= 10
} else {
Expand All @@ -411,7 +462,7 @@ pub fn run(matches: ArgMatches) {
back_ground_color_idx %= back_grounds.len();
},
'Z' => {
back_ground_color_idx = 0;
init_back_ground_color_idx!();
},
'f' => {
filter_idx += 1;
Expand All @@ -423,13 +474,26 @@ pub fn run(matches: ArgMatches) {
'Y' => repr_img = repr_img.rotate270(),
'm' => invert = ! invert,
'M' => grayscale = ! grayscale,
'X' => {
init_scale!();
init_win_pos!();
},
'C' => {
let old_scale = scale;
scale = 1.0;
if scale < old_scale {
fix_pos!(<)
} else {
fix_pos!(>)
}
},
'H' | '?' => {
// help
clear_screen!();

eprintln!("\x1b[H");
macro_rules! outlines {
( $( $fmt:tt $( , $( $x:expr ),+ )? ; )* ) => {
( $( $fmt:expr $( , $( $x:expr ),+ )? ; )* ) => {
$(
eprint!(
concat!("\x1b[G", $fmt, "\n\x1b[G")
Expand All @@ -441,22 +505,29 @@ pub fn run(matches: ArgMatches) {
.map(|x| x.fmt_color())
.collect::<Vec<_>>().join(", ");
outlines!{
"{0}Help{0}", "-".repeat(((term_size.x - 4) >> 1) as usize);
"Move: move px:`hjkl`, move 1/4 term: `aswd`, move 3/4 term: `ASWD`, s/l ratio: ({:.2},{:.2})",
"{0}Help{0}", "-".repeat(
((term_size.x - 4) >> 1) as usize);
concat!(
"Move: move px:`hjkl`, move 1/4 term: `aswd`, ",
"move 3/4 term: `ASWD`, s/l ratio: ({:.2},{:.2})"),
short_move_ratio, long_move_ratio;
"Opt: add opt: `oO`, sub opt: `iI`";
"Zoom: `cx` or `+-`, ratio: {:.4},{:.4}", zoom_add_ratio, zoom_sub_ratio;
"Zoom: `cx` or `+-`, ratio: {:.4},{:.4}",
zoom_add_ratio, zoom_sub_ratio;
"ReDraw: `r`";
"ReInit: `R`";
"SwitchBackground: `z` [{}]", bgs_fmt;
"InitBackground: `Z`";
"SetFilter: `f`, ({:?}) {:?}", FILTERS[filter_idx], FILTERS;
"SetFilter: `f`, ({:?}) {:?}",
FILTERS[filter_idx], FILTERS;
"FlipImage: `gG`";
"Rotate: `yY`";
"Invert: `m`";
"Grayscale: `M`";
"ThisHelpInfo: `H?`";
"Quit: `Q`";
"InitRatio: `X`";
"UnitRatio: `C`";
"Quit: `Q` or `Ctrl-C`";
};
eprint!("\x1b[{}H", (term_size.y >> 1) + 1);

Expand All @@ -468,7 +539,6 @@ pub fn run(matches: ArgMatches) {
ctrl_err!("EI:{:?}", c)
},
}
eprint!("\x1b[K"); // 清除残留状态行
}
break;
}
Expand Down
Loading

0 comments on commit a6683fa

Please sign in to comment.