diff options
| author | Jovansonlee Cesar <ivanceras@gmail.com> | 2022-09-26 10:47:34 +0800 |
|---|---|---|
| committer | Jovansonlee Cesar <ivanceras@gmail.com> | 2022-09-26 10:47:34 +0800 |
| commit | d41725ca369f9c75207fb4ffef3ab6f6217a93dc (patch) | |
| tree | dc4dd034904e279537c5ea64854d016acc030008 /packages | |
| parent | b9c97b14822ff58206555a330c57af1935166c57 (diff) | |
remove unused code, fix test_data, disable merge_marker_line since it is buggy
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/svgbob/src/buffer/fragment_buffer/fragment.rs | 6 | ||||
| -rw-r--r-- | packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs | 1 | ||||
| -rw-r--r-- | packages/svgbob/src/settings.rs | 12 | ||||
| -rw-r--r-- | packages/svgbob/test_data/demo.bob | 4 |
4 files changed, 7 insertions, 16 deletions
diff --git a/packages/svgbob/src/buffer/fragment_buffer/fragment.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment.rs index 3cae197..09659cf 100644 --- a/packages/svgbob/src/buffer/fragment_buffer/fragment.rs +++ b/packages/svgbob/src/buffer/fragment_buffer/fragment.rs @@ -423,11 +423,13 @@ impl Merge for Fragment { // line and marker_line (Fragment::Line(line), Fragment::MarkerLine(mline)) => { - line.merge_marker_line(mline) + //line.merge_marker_line(mline) + None } // marker_line and line (Fragment::MarkerLine(mline), Fragment::Line(line)) => { - line.merge_marker_line(mline) + //line.merge_marker_line(mline) + None } (Fragment::MarkerLine(mline), Fragment::Polygon(polygon)) => { mline.merge_polygon(polygon) diff --git a/packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs b/packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs index 0a83616..1405c07 100644 --- a/packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs +++ b/packages/svgbob/src/buffer/fragment_buffer/fragment/line.rs @@ -188,6 +188,7 @@ impl Line { } } + // TODO This is still very buggy pub(crate) fn merge_marker_line( &self, mline: &MarkerLine, diff --git a/packages/svgbob/src/settings.rs b/packages/svgbob/src/settings.rs index 22c2085..f1f9212 100644 --- a/packages/svgbob/src/settings.rs +++ b/packages/svgbob/src/settings.rs @@ -14,8 +14,6 @@ pub struct Settings { pub stroke_width: f32, /// the scale multiplier pub scale: f32, - /// flag whether to enhace circuitries or not, default true - pub enhance_circuitries: bool, /// flag whether to include the big rectangle as backdrop /// for all of the svg shapes pub include_backdrop: bool, @@ -23,14 +21,6 @@ pub struct Settings { pub include_styles: bool, /// flag whether to include the def of markers, etc in the svg pub include_defs: bool, - /// merge lines and shapes like triangle,circle,rect to form arrow lines or marker line - pub merge_line_with_shapes: bool, -} -impl Settings { - /// the inverse of the default scale 10 - pub fn scale_inverse(&self) -> f32 { - 1.0 / self.scale - } } impl Default for Settings { @@ -43,11 +33,9 @@ impl Default for Settings { stroke_color: "black".into(), stroke_width: 2.0, scale: 8.0, - enhance_circuitries: true, include_backdrop: true, include_styles: true, include_defs: true, - merge_line_with_shapes: false, } } } diff --git a/packages/svgbob/test_data/demo.bob b/packages/svgbob/test_data/demo.bob index c73fa22..455ada9 100644 --- a/packages/svgbob/test_data/demo.bob +++ b/packages/svgbob/test_data/demo.bob @@ -152,13 +152,13 @@ What can it do? ! `. O : ! .-----------. . <. .> . `. ^ \ : ! ( ) ( ) ( ) ! \ \ : - ! '-----+ ,---' `> ' ` <' :.~~~~> \ v : + ! `-----+ ,---' `> ' ` <' :.~~~~> \ v : ! |/ * : ! ' : ! _ __ : ! _ __ .-. .--. .--.--. .--. .' '. ,' '. : ! (_) (__) ( 3 ) ( 4 ) ( 4( )4 ) ( 5 ) ( 6 ) ( 7 ) : - ! '-' `--' `--'--' `--' `._.' `.__.' : + ! `-' `--' `--'--' `--' `._.' `.__.' : ! : ! ___ ____ ____ _____ ! ! ,' `. ,' `. .' `. ,' `. ! |