diff --git a/design/dide/Gate/Flip-flop cells/$_ALDFFE_.svg b/design/dide/Gate/Flip-flop cells/$_ALDFFE_.svg index d231f0c..d287cdc 100644 --- a/design/dide/Gate/Flip-flop cells/$_ALDFFE_.svg +++ b/design/dide/Gate/Flip-flop cells/$_ALDFFE_.svg @@ -22,26 +22,26 @@ - + - - + + - + \ No newline at end of file diff --git a/design/dide/Gate/Flip-flop cells/$_DFFE_.svg b/design/dide/Gate/Flip-flop cells/$_DFFE_.svg index a9215b0..51de9b7 100644 --- a/design/dide/Gate/Flip-flop cells/$_DFFE_.svg +++ b/design/dide/Gate/Flip-flop cells/$_DFFE_.svg @@ -3,12 +3,12 @@ - + - - + + @@ -16,9 +16,9 @@ - - + + - + \ No newline at end of file diff --git a/design/dide/Gate/Flip-flop cells/$_DFFSRE_.svg b/design/dide/Gate/Flip-flop cells/$_DFFSRE_.svg index ebb1924..6da059f 100644 --- a/design/dide/Gate/Flip-flop cells/$_DFFSRE_.svg +++ b/design/dide/Gate/Flip-flop cells/$_DFFSRE_.svg @@ -22,23 +22,23 @@ - + - - - + + + - + - - + + diff --git a/design/dide/Gate/Flip-flop cells/$_DFFSR_.svg b/design/dide/Gate/Flip-flop cells/$_DFFSR_.svg index c1af850..68e6e09 100644 --- a/design/dide/Gate/Flip-flop cells/$_DFFSR_.svg +++ b/design/dide/Gate/Flip-flop cells/$_DFFSR_.svg @@ -12,12 +12,12 @@ - + - - + + @@ -25,8 +25,8 @@ - - - + + + \ No newline at end of file diff --git a/design/dide/Gate/Flip-flop cells/$_DFF_.svg b/design/dide/Gate/Flip-flop cells/$_DFF_.svg index 7a96dcd..fa2cdd6 100644 --- a/design/dide/Gate/Flip-flop cells/$_DFF_.svg +++ b/design/dide/Gate/Flip-flop cells/$_DFF_.svg @@ -8,12 +8,12 @@ - + - - + + @@ -21,7 +21,7 @@ - - + + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$add.svg b/design/dide/Word/Binary operators/$add.svg index b74a91f..9457e76 100644 --- a/design/dide/Word/Binary operators/$add.svg +++ b/design/dide/Word/Binary operators/$add.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$and.svg b/design/dide/Word/Binary operators/$and.svg index 7185c61..22b6ea7 100644 --- a/design/dide/Word/Binary operators/$and.svg +++ b/design/dide/Word/Binary operators/$and.svg @@ -7,9 +7,9 @@ - - - + + + diff --git a/design/dide/Word/Binary operators/$div.svg b/design/dide/Word/Binary operators/$div.svg index 5dcd876..9b3400d 100644 --- a/design/dide/Word/Binary operators/$div.svg +++ b/design/dide/Word/Binary operators/$div.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$eq.svg b/design/dide/Word/Binary operators/$eq.svg index 05bc973..a585914 100644 --- a/design/dide/Word/Binary operators/$eq.svg +++ b/design/dide/Word/Binary operators/$eq.svg @@ -7,10 +7,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$eqx.svg b/design/dide/Word/Binary operators/$eqx.svg index e085dae..81db380 100644 --- a/design/dide/Word/Binary operators/$eqx.svg +++ b/design/dide/Word/Binary operators/$eqx.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$ge.svg b/design/dide/Word/Binary operators/$ge.svg index 1578981..cccf2cd 100644 --- a/design/dide/Word/Binary operators/$ge.svg +++ b/design/dide/Word/Binary operators/$ge.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$gt.svg b/design/dide/Word/Binary operators/$gt.svg index 7ef4a3c..303806a 100644 --- a/design/dide/Word/Binary operators/$gt.svg +++ b/design/dide/Word/Binary operators/$gt.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$le.svg b/design/dide/Word/Binary operators/$le.svg index 1a48f11..6777c99 100644 --- a/design/dide/Word/Binary operators/$le.svg +++ b/design/dide/Word/Binary operators/$le.svg @@ -7,10 +7,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$logic_and.svg b/design/dide/Word/Binary operators/$logic_and.svg index a62b3a6..b76c758 100644 --- a/design/dide/Word/Binary operators/$logic_and.svg +++ b/design/dide/Word/Binary operators/$logic_and.svg @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -26,7 +26,7 @@ - + @@ -35,10 +35,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$logic_or.svg b/design/dide/Word/Binary operators/$logic_or.svg index c65c233..80823f6 100644 --- a/design/dide/Word/Binary operators/$logic_or.svg +++ b/design/dide/Word/Binary operators/$logic_or.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$lt.svg b/design/dide/Word/Binary operators/$lt.svg index 8ca2600..828d176 100644 --- a/design/dide/Word/Binary operators/$lt.svg +++ b/design/dide/Word/Binary operators/$lt.svg @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$mod.svg b/design/dide/Word/Binary operators/$mod.svg index 76466b7..81b651a 100644 --- a/design/dide/Word/Binary operators/$mod.svg +++ b/design/dide/Word/Binary operators/$mod.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$mul.svg b/design/dide/Word/Binary operators/$mul.svg index d9fa29f..391fd0d 100644 --- a/design/dide/Word/Binary operators/$mul.svg +++ b/design/dide/Word/Binary operators/$mul.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$ne.svg b/design/dide/Word/Binary operators/$ne.svg index 581501e..813e69e 100644 --- a/design/dide/Word/Binary operators/$ne.svg +++ b/design/dide/Word/Binary operators/$ne.svg @@ -7,10 +7,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$nex.svg b/design/dide/Word/Binary operators/$nex.svg index 441b0b7..b03de9d 100644 --- a/design/dide/Word/Binary operators/$nex.svg +++ b/design/dide/Word/Binary operators/$nex.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$or.svg b/design/dide/Word/Binary operators/$or.svg index 5d0b29d..d7eb3ea 100644 --- a/design/dide/Word/Binary operators/$or.svg +++ b/design/dide/Word/Binary operators/$or.svg @@ -2,9 +2,9 @@ - - - + + + diff --git a/design/dide/Word/Binary operators/$pow.svg b/design/dide/Word/Binary operators/$pow.svg index ac9af6f..4e5488e 100644 --- a/design/dide/Word/Binary operators/$pow.svg +++ b/design/dide/Word/Binary operators/$pow.svg @@ -7,10 +7,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$shl.svg b/design/dide/Word/Binary operators/$shl.svg index 5c959ac..9721561 100644 --- a/design/dide/Word/Binary operators/$shl.svg +++ b/design/dide/Word/Binary operators/$shl.svg @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + diff --git a/design/dide/Word/Binary operators/$shr.svg b/design/dide/Word/Binary operators/$shr.svg index 9fc76bb..2614d3a 100644 --- a/design/dide/Word/Binary operators/$shr.svg +++ b/design/dide/Word/Binary operators/$shr.svg @@ -8,7 +8,7 @@ - + @@ -17,11 +17,11 @@ - + - + diff --git a/design/dide/Word/Binary operators/$sshl.svg b/design/dide/Word/Binary operators/$sshl.svg index 61bb965..8d16077 100644 --- a/design/dide/Word/Binary operators/$sshl.svg +++ b/design/dide/Word/Binary operators/$sshl.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$sshr.svg b/design/dide/Word/Binary operators/$sshr.svg index a3d901a..7d83a8c 100644 --- a/design/dide/Word/Binary operators/$sshr.svg +++ b/design/dide/Word/Binary operators/$sshr.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$sub.svg b/design/dide/Word/Binary operators/$sub.svg index f45cd2c..08eb3f1 100644 --- a/design/dide/Word/Binary operators/$sub.svg +++ b/design/dide/Word/Binary operators/$sub.svg @@ -7,7 +7,7 @@ - + @@ -16,10 +16,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Binary operators/$xnor.svg b/design/dide/Word/Binary operators/$xnor.svg index 2a0083f..de7dfac 100644 --- a/design/dide/Word/Binary operators/$xnor.svg +++ b/design/dide/Word/Binary operators/$xnor.svg @@ -2,13 +2,13 @@ - - + + - + - + diff --git a/design/dide/Word/Binary operators/$xor.svg b/design/dide/Word/Binary operators/$xor.svg index 9e0251e..8503a5f 100644 --- a/design/dide/Word/Binary operators/$xor.svg +++ b/design/dide/Word/Binary operators/$xor.svg @@ -2,13 +2,13 @@ - - + + - + - + diff --git a/design/dide/Word/Coarse arithmetics/$alu.svg b/design/dide/Word/Coarse arithmetics/$alu.svg index a151ff6..6de187b 100644 --- a/design/dide/Word/Coarse arithmetics/$alu.svg +++ b/design/dide/Word/Coarse arithmetics/$alu.svg @@ -22,11 +22,11 @@ - + - + diff --git a/design/dide/Word/Coarse arithmetics/$fa.svg b/design/dide/Word/Coarse arithmetics/$fa.svg index 4615727..a7415b3 100644 --- a/design/dide/Word/Coarse arithmetics/$fa.svg +++ b/design/dide/Word/Coarse arithmetics/$fa.svg @@ -19,7 +19,7 @@ - + @@ -31,7 +31,7 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Finite state machines/$fsm.svg b/design/dide/Word/Finite state machines/$fsm.svg index 22553f8..aa3f0f8 100644 --- a/design/dide/Word/Finite state machines/$fsm.svg +++ b/design/dide/Word/Finite state machines/$fsm.svg @@ -2,7 +2,7 @@ - + @@ -14,7 +14,7 @@ - + diff --git a/design/dide/Word/Memories/$mem.svg b/design/dide/Word/Memories/$mem.svg index 150c9c1..09f7cf4 100644 --- a/design/dide/Word/Memories/$mem.svg +++ b/design/dide/Word/Memories/$mem.svg @@ -2,7 +2,7 @@ - + @@ -22,6 +22,6 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Memories/$mem_v2.svg b/design/dide/Word/Memories/$mem_v2.svg index e127855..f841a2b 100644 --- a/design/dide/Word/Memories/$mem_v2.svg +++ b/design/dide/Word/Memories/$mem_v2.svg @@ -16,11 +16,11 @@ - + - + diff --git a/design/dide/Word/Memories/$memrd.svg b/design/dide/Word/Memories/$memrd.svg index d2424c2..82ab2d8 100644 --- a/design/dide/Word/Memories/$memrd.svg +++ b/design/dide/Word/Memories/$memrd.svg @@ -2,7 +2,7 @@ - + @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Memories/$memrd_v2.svg b/design/dide/Word/Memories/$memrd_v2.svg index 5146bea..d8d8b12 100644 --- a/design/dide/Word/Memories/$memrd_v2.svg +++ b/design/dide/Word/Memories/$memrd_v2.svg @@ -2,7 +2,7 @@ - + @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Memories/$memwr.svg b/design/dide/Word/Memories/$memwr.svg index 3e38f68..4255823 100644 --- a/design/dide/Word/Memories/$memwr.svg +++ b/design/dide/Word/Memories/$memwr.svg @@ -2,7 +2,7 @@ - + @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Memories/$memwr_v2.svg b/design/dide/Word/Memories/$memwr_v2.svg index cb6f8e9..7b94aaf 100644 --- a/design/dide/Word/Memories/$memwr_v2.svg +++ b/design/dide/Word/Memories/$memwr_v2.svg @@ -2,7 +2,7 @@ - + @@ -18,6 +18,6 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Multiplexers/$bmux.svg b/design/dide/Word/Multiplexers/$bmux.svg index a2ca726..6710d48 100644 --- a/design/dide/Word/Multiplexers/$bmux.svg +++ b/design/dide/Word/Multiplexers/$bmux.svg @@ -2,21 +2,21 @@ - + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Multiplexers/$bwmux.svg b/design/dide/Word/Multiplexers/$bwmux.svg index 95ab7f2..32a40ce 100644 --- a/design/dide/Word/Multiplexers/$bwmux.svg +++ b/design/dide/Word/Multiplexers/$bwmux.svg @@ -2,22 +2,22 @@ - + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Multiplexers/$demux.svg b/design/dide/Word/Multiplexers/$demux.svg index e99d746..4639a86 100644 --- a/design/dide/Word/Multiplexers/$demux.svg +++ b/design/dide/Word/Multiplexers/$demux.svg @@ -2,21 +2,21 @@ - + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Multiplexers/$mux.svg b/design/dide/Word/Multiplexers/$mux.svg index 2ccb6de..ec78c31 100644 --- a/design/dide/Word/Multiplexers/$mux.svg +++ b/design/dide/Word/Multiplexers/$mux.svg @@ -2,22 +2,22 @@ - + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Multiplexers/$pmux.svg b/design/dide/Word/Multiplexers/$pmux.svg index c4b4892..a87307e 100644 --- a/design/dide/Word/Multiplexers/$pmux.svg +++ b/design/dide/Word/Multiplexers/$pmux.svg @@ -2,22 +2,22 @@ - + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Multiplexers/$tribuf.svg b/design/dide/Word/Multiplexers/$tribuf.svg index c581e24..381a71e 100644 --- a/design/dide/Word/Multiplexers/$tribuf.svg +++ b/design/dide/Word/Multiplexers/$tribuf.svg @@ -2,12 +2,12 @@ - - - + + + - + diff --git a/design/dide/Word/Registers/$adff.svg b/design/dide/Word/Registers/$adff.svg index 7305637..79130a7 100644 --- a/design/dide/Word/Registers/$adff.svg +++ b/design/dide/Word/Registers/$adff.svg @@ -2,32 +2,32 @@ - + - + - + - - - - + + + + - + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$adffe.svg b/design/dide/Word/Registers/$adffe.svg index 1b42f20..877b3dc 100644 --- a/design/dide/Word/Registers/$adffe.svg +++ b/design/dide/Word/Registers/$adffe.svg @@ -2,34 +2,34 @@ - + - + - + - - - - + + + + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$adlatch.svg b/design/dide/Word/Registers/$adlatch.svg index 3b60b4e..02d8aef 100644 --- a/design/dide/Word/Registers/$adlatch.svg +++ b/design/dide/Word/Registers/$adlatch.svg @@ -22,27 +22,27 @@ - + - + - + - - - + + + - - + + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$aldff.svg b/design/dide/Word/Registers/$aldff.svg index 65318b4..aef3329 100644 --- a/design/dide/Word/Registers/$aldff.svg +++ b/design/dide/Word/Registers/$aldff.svg @@ -4,23 +4,23 @@ - + - + - + - - - - + + + + @@ -28,7 +28,7 @@ - - + + \ No newline at end of file diff --git a/design/dide/Word/Registers/$aldffe.svg b/design/dide/Word/Registers/$aldffe.svg index a72470c..bf30ef9 100644 --- a/design/dide/Word/Registers/$aldffe.svg +++ b/design/dide/Word/Registers/$aldffe.svg @@ -25,23 +25,23 @@ - + - + - + - - - - + + + + @@ -49,11 +49,11 @@ - + - - + + \ No newline at end of file diff --git a/design/dide/Word/Registers/$dff.svg b/design/dide/Word/Registers/$dff.svg index 0bd17d2..539387e 100644 --- a/design/dide/Word/Registers/$dff.svg +++ b/design/dide/Word/Registers/$dff.svg @@ -28,49 +28,49 @@ - + - + - + - - - + + + - + - + - + - + - - - + + + - + diff --git a/design/dide/Word/Registers/$dffe.svg b/design/dide/Word/Registers/$dffe.svg index e1b57fb..ae9c645 100644 --- a/design/dide/Word/Registers/$dffe.svg +++ b/design/dide/Word/Registers/$dffe.svg @@ -2,23 +2,23 @@ - + - + - + - - - - + + + + @@ -27,6 +27,6 @@ - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$dffsr.svg b/design/dide/Word/Registers/$dffsr.svg index bc581dc..823be04 100644 --- a/design/dide/Word/Registers/$dffsr.svg +++ b/design/dide/Word/Registers/$dffsr.svg @@ -2,23 +2,23 @@ - + - + - + - - - - + + + + @@ -26,8 +26,8 @@ - - + + diff --git a/design/dide/Word/Registers/$dffsre.svg b/design/dide/Word/Registers/$dffsre.svg index c43268e..bbf5f14 100644 --- a/design/dide/Word/Registers/$dffsre.svg +++ b/design/dide/Word/Registers/$dffsre.svg @@ -25,34 +25,34 @@ - + - + - + - - - - + + + + - + - - + + diff --git a/design/dide/Word/Registers/$dlatch.svg b/design/dide/Word/Registers/$dlatch.svg index 8a63a89..4d78866 100644 --- a/design/dide/Word/Registers/$dlatch.svg +++ b/design/dide/Word/Registers/$dlatch.svg @@ -2,24 +2,24 @@ - + - + - + - - - + + + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$dlatchsr.svg b/design/dide/Word/Registers/$dlatchsr.svg index 83211c4..9150aa4 100644 --- a/design/dide/Word/Registers/$dlatchsr.svg +++ b/design/dide/Word/Registers/$dlatchsr.svg @@ -3,26 +3,26 @@ - + - + - + - - - - + + + + - - + + diff --git a/design/dide/Word/Registers/$sdff.svg b/design/dide/Word/Registers/$sdff.svg index fe876df..70036df 100644 --- a/design/dide/Word/Registers/$sdff.svg +++ b/design/dide/Word/Registers/$sdff.svg @@ -2,32 +2,32 @@ - + - + - + - - - - + + + + - + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$sdffce.svg b/design/dide/Word/Registers/$sdffce.svg index 4fb51de..c5fda74 100644 --- a/design/dide/Word/Registers/$sdffce.svg +++ b/design/dide/Word/Registers/$sdffce.svg @@ -2,34 +2,34 @@ - + - + - + - - - - + + + + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$sdffe.svg b/design/dide/Word/Registers/$sdffe.svg index 7cdbdc7..d5b4b8a 100644 --- a/design/dide/Word/Registers/$sdffe.svg +++ b/design/dide/Word/Registers/$sdffe.svg @@ -2,34 +2,34 @@ - + - + - + - - - - + + + + - + - + - + \ No newline at end of file diff --git a/design/dide/Word/Registers/$sr.svg b/design/dide/Word/Registers/$sr.svg index 05a3206..d37842f 100644 --- a/design/dide/Word/Registers/$sr.svg +++ b/design/dide/Word/Registers/$sr.svg @@ -16,24 +16,24 @@ - + - + - + - - + + - + - + \ No newline at end of file diff --git a/design/dide/Word/Unary operators/$buf.svg b/design/dide/Word/Unary operators/$buf.svg index 8b45d0f..ecba33e 100644 --- a/design/dide/Word/Unary operators/$buf.svg +++ b/design/dide/Word/Unary operators/$buf.svg @@ -2,9 +2,9 @@ - - - + + + diff --git a/design/dide/Word/Unary operators/$logic_not.svg b/design/dide/Word/Unary operators/$logic_not.svg index da417f5..b762e8f 100644 --- a/design/dide/Word/Unary operators/$logic_not.svg +++ b/design/dide/Word/Unary operators/$logic_not.svg @@ -4,10 +4,10 @@ - + - + \ No newline at end of file diff --git a/design/dide/Word/Unary operators/$neg.svg b/design/dide/Word/Unary operators/$neg.svg index e989dde..e9ad5b9 100644 --- a/design/dide/Word/Unary operators/$neg.svg +++ b/design/dide/Word/Unary operators/$neg.svg @@ -4,9 +4,9 @@ - + - + diff --git a/design/dide/Word/Unary operators/$not.svg b/design/dide/Word/Unary operators/$not.svg index 833e779..8e6e465 100644 --- a/design/dide/Word/Unary operators/$not.svg +++ b/design/dide/Word/Unary operators/$not.svg @@ -2,9 +2,9 @@ - - - + + + diff --git a/design/dide/Word/Unary operators/$pos.svg b/design/dide/Word/Unary operators/$pos.svg index 83810c9..a736c94 100644 --- a/design/dide/Word/Unary operators/$pos.svg +++ b/design/dide/Word/Unary operators/$pos.svg @@ -4,9 +4,9 @@ - + - + diff --git a/design/dide/Word/Unary operators/$reduce_and.svg b/design/dide/Word/Unary operators/$reduce_and.svg index ebfc501..81ced8e 100644 --- a/design/dide/Word/Unary operators/$reduce_and.svg +++ b/design/dide/Word/Unary operators/$reduce_and.svg @@ -7,9 +7,9 @@ - - - + + + diff --git a/design/dide/Word/Unary operators/$reduce_or.svg b/design/dide/Word/Unary operators/$reduce_or.svg index 5ea9322..89b206f 100644 --- a/design/dide/Word/Unary operators/$reduce_or.svg +++ b/design/dide/Word/Unary operators/$reduce_or.svg @@ -2,9 +2,9 @@ - - - + + + diff --git a/design/dide/Word/Unary operators/$reduce_xnor.svg b/design/dide/Word/Unary operators/$reduce_xnor.svg index 16c9bb8..fbc3371 100644 --- a/design/dide/Word/Unary operators/$reduce_xnor.svg +++ b/design/dide/Word/Unary operators/$reduce_xnor.svg @@ -2,11 +2,11 @@ - - + + - + diff --git a/design/dide/Word/Unary operators/$reduce_xor.svg b/design/dide/Word/Unary operators/$reduce_xor.svg index 48145ef..ba99418 100644 --- a/design/dide/Word/Unary operators/$reduce_xor.svg +++ b/design/dide/Word/Unary operators/$reduce_xor.svg @@ -2,11 +2,11 @@ - - + + - + diff --git a/public/dide.skin b/public/dide.skin index 44b24c3..4a3212a 100644 Binary files a/public/dide.skin and b/public/dide.skin differ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index df36fcf..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/netlist.css b/public/netlist.css index 2852d68..a03987b 100644 --- a/public/netlist.css +++ b/public/netlist.css @@ -25,26 +25,26 @@ --constant-fill-color: rgba(209, 202, 23, 0.25); /* 器件颜色合集 */ - --combined-color: purple; - --combined-fill-color: purple; - --simple-color: yellow; - --simple-fill-color: yellow; - --flip-color: brown; - --flip-fill-color: brown; - --binary-color: red; - --binary-fill-color: red; - --coarse-color: green; - --coarse-fill-color: green; - --finite-color: blue; - --finite-fill-color: blue; - --memories-color: orange; - --memories-fill-color: orange; - --multiplexers-color: pink; - --multiplexers-fill-color: pink; - --registers-color: gray; - --registers-fill-color: gray; - --unary-color: cyan; - --unary-fill-color: cyan; + --combined-color: #9B59B6; + --combined-fill-color: #E8DAEF; + --simple-color: #F1C40F; + --simple-fill-color: #F9E79F; + --flip-color: #8B4513; + --flip-fill-color: #D2B48C; + --binary-color: #E74C3C; + --binary-fill-color: #F5B7B1; + --coarse-color: #27AE60; + --coarse-fill-color: #A9DFBF; + --finite-color: #2980B9; + --finite-fill-color: #AED6F1; + --memories-color: #E67E22; + --memories-fill-color: #F8C471; + --multiplexers-color: #D35400; + --multiplexers-fill-color: #E59866; + --registers-color: #95A5A6; + --registers-fill-color: #D5DBDB; + --unary-color: #1ABC9C; + --unary-fill-color: #A3E4D7; --line-arrow-opacity: 1; diff --git a/src/components/setting/color.js b/src/components/setting/color.js index 61485f1..1e02009 100644 --- a/src/components/setting/color.js +++ b/src/components/setting/color.js @@ -2,8 +2,10 @@ import { reactive } from 'vue'; import i18n from '@/i18n'; import { parseColor } from '@/hook/color'; +import { globalSetting } from '@/hook/global'; -const { t } = i18n.global; +const { t, locale } = i18n.global; +locale.value = globalSetting.language; export const colorManager = reactive({ currentGerneralIndex: 0, @@ -46,7 +48,7 @@ export const colorManager = reactive({ } ], - currentCell: 'binary', + currentCellIndex: 0, cells: [ { value: 0, @@ -93,7 +95,20 @@ export const colorManager = reactive({ { value: 7, type: 'multiplexers', - + label: t('cell.multiplexers'), + color: 'white' + }, + { + value: 8, + type: 'registers', + label: t('cell.registers'), + color: 'white' + }, + { + value: 9, + type: 'unary', + label: t('cell.unary'), + color: 'white' } ], @@ -104,6 +119,12 @@ export const colorManager = reactive({ const colorString = rootStyles.getPropertyValue(optionName); item.color = colorString; } + + for (const item of this.cells) { + const optionName = `--${item.type}-color`; + const colorString = rootStyles.getPropertyValue(optionName); + item.color = colorString; + } } }); @@ -122,6 +143,17 @@ export function onGeneralColorChange(colorString) { document.documentElement.style.setProperty(`--${item.type}-fill-color`, fillColor); } +export function onCellColorChange(colorString) { + const { r, g, b } = parseColor(colorString); + const index = colorManager.currentGerneralIndex; + const item = colorManager.generals[index]; + const borderColor = `rgb(${r}, ${g}, ${b})`; + const fillColor = `rgb(${r}, ${g}, ${b})`; + const rootStyles = getComputedStyle(document.documentElement); + document.documentElement.style.setProperty(`--${item.type}-color`, borderColor); + document.documentElement.style.setProperty(`--${item.type}-fill-color`, fillColor); +} + export const predefinedColors = [ '#ff4500', '#ff8c00', diff --git a/src/components/setting/index.vue b/src/components/setting/index.vue index cd2a5a9..10f2cf1 100644 --- a/src/components/setting/index.vue +++ b/src/components/setting/index.vue @@ -133,6 +133,32 @@ /> +
+ +
+ + {{ t('setting.cell-color-setting') }} + +
+
+ + + +
+
+ +
+
@@ -145,7 +171,7 @@ import { reactive, defineComponent, watch, ref, onMounted } from 'vue'; import { useI18n } from 'vue-i18n'; import { languageSetting } from './language'; import { crossDotStyle, onConnectStyleChange } from './cross-dot-style'; -import { colorManager, onGeneralColorChange, predefinedColors } from './color'; +import { colorManager, onCellColorChange, onGeneralColorChange, predefinedColors } from './color'; defineComponent({ name: "dide-setting" }); const { t, locale } = useI18n(); diff --git a/src/hook/render/constant.js b/src/hook/render/constant.js index b8f4d11..81087ce 100644 --- a/src/hook/render/constant.js +++ b/src/hook/render/constant.js @@ -29,7 +29,7 @@ export class ConstantRender { * @description 将 elknode 关于 port 的数据添加为 d3 数据项目 * @param {ElkNode} node */ - addAsD3DataItem(node) { + addAsD3DataItem(node) { this.data.push({ id: node.id, x: node.x, diff --git a/src/hook/render/index.js b/src/hook/render/index.js index 08371fd..7776bd8 100644 --- a/src/hook/render/index.js +++ b/src/hook/render/index.js @@ -279,6 +279,7 @@ export class NetlistRender { const instances = this.instantiationRender.render(); const cells = this.cellRender.render(); const connections = this.connectionRender.render(); + const constants = this.constantRender.render(); return { ports, instances, cells, connections }; } @@ -381,9 +382,11 @@ export class NetlistRender { // 系统调用的变换，慢一点变换 if (globalSetting.renderAnimation && !started) { parentSelection + .attr('transform', transform) + .attr('opacity', 0) .transition() - .duration(1000) - .attr('transform', transform); + .duration(750) + .attr('opacity', 1) started = true; } else { parentSelection.attr('transform', transform); diff --git a/src/hook/render/layout.js b/src/hook/render/layout.js index 7b6ef98..f04123a 100644 --- a/src/hook/render/layout.js +++ b/src/hook/render/layout.js @@ -38,7 +38,7 @@ export const LAYOUT_CONSTANT = { // 常数 CONSTANT_WIDTH: 50, - CONSTANT_HEIGHT: 50, + CONSTANT_HEIGHT: 30, // 器件的端口 CELL_PORT_HEIGHT: 1, @@ -221,7 +221,7 @@ export class Module { // 估算常量的宽度 const binary = parseInt(wireId, 2); - const constantWidth = 12 * 0.6 * binary.toString().length + 10; + const constantWidth = 12 * 0.6 * wireId.toString().length + 10; const constantConnection = { id: dotConnect(id, '0'), @@ -238,6 +238,7 @@ export class Module { const node = { id, name: wireId, + renderType: 'constant', width: constantWidth, height: LAYOUT_CONSTANT.CONSTANT_HEIGHT, ports: [constantConnection], diff --git a/src/hook/skin/index.js b/src/hook/skin/index.js index f80b359..7eb2dc9 100644 --- a/src/hook/skin/index.js +++ b/src/hook/skin/index.js @@ -21,7 +21,7 @@ export class SkinManager { const filename = path.split('/').at(-1); const name = filename.slice(0, -4); const text = decoder.decode(buffer); - const meta = new SkinMeta(text); + const meta = new SkinMeta(text, path); this.resources.set(name, { path, @@ -56,21 +56,44 @@ export class SkinManager { */ +export const levelName2CssName = { + 'Combinatorial cells (combined)': 'combined', + 'Combinatorial cells (simple)': 'simple', + 'Flip-flop cells': 'flip', + 'Binary operators': 'binary', + 'Coarse arithmetics': 'coarse', + 'Finite state machines': 'finite', + 'Memories': 'memories', + 'Multiplexers': 'multiplexers', + 'Registers': 'registers', + 'Unary operators': 'unary' +} + class SkinMeta { /** * @param {string} svgString + * @param {string} path */ - constructor(svgString) { + constructor(svgString, path) { + if (path.startsWith('dide')) { + path = path.slice(5); + } + const levelName = path.split('/')[1]; + const cssName = levelName2CssName[levelName]; + + const color = `var(--${cssName}-color)`; + const fillColor = `var(--${cssName}-fill-color)`; + // 解析 svg string 获取关键信息 const parser = new DOMParser(); // 颜色替换 // 填充颜色 - svgString = svgString.replace(/#279BB0/g, 'var(--main-dark-color)'); - svgString = svgString.replace(/#41C9A0/g, 'var(--main-dark-color)'); + svgString = svgString.replace(/#279BB0/g, color); // 边缘颜色 - svgString = svgString.replace(/#000000/g, 'var(--main-color)'); + svgString = svgString.replace(/#000000/g, fillColor); + // 字体颜色 svgString = svgString.replace(/#010101/g, 'var(--foreground)'); diff --git a/src/i18n/ar.json b/src/i18n/ar.json index a01c690..2c01611 100644 --- a/src/i18n/ar.json +++ b/src/i18n/ar.json @@ -33,5 +33,12 @@ "cell.binary": "عامل ثنائي", "cell.finite": "آلة الحالات المحدودة", "cell.memories": "وحدة التخزين", - "cell.coarse": "عمليات حسابية تقريبية" + "cell.coarse": "عمليات حسابية تقريبية", + "cell.multiplexers": "المُعدِّل المتعدد", + "cell.registers": "السجل", + "cell.unary": "عامل أحادي", + "setting.cell-color-setting": "إعداد لون المكون", + "cross-dot-style.slice": "فاصل", + "cross-dot-style.connect": "محول مباشر", + "cross-dot-style.concat": "رمز الدمج" } \ No newline at end of file diff --git a/src/i18n/de.json b/src/i18n/de.json index 541e358..e542b7e 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -33,5 +33,12 @@ "cell.binary": "Binärer Operator", "cell.finite": "Endlicher Automat", "cell.memories": "Speicher", - "cell.coarse": "Grobe arithmetische Operationen" + "cell.coarse": "Grobe arithmetische Operationen", + "cell.multiplexers": "Multiplexer", + "cell.registers": "Register", + "cell.unary": "Unärer Operator", + "setting.cell-color-setting": "Gerätefarbe einstellen", + "cross-dot-style.slice": "Trennzeichen", + "cross-dot-style.connect": "Direktverbinder", + "cross-dot-style.concat": "Zusammenführungszeichen" } \ No newline at end of file diff --git a/src/i18n/en.json b/src/i18n/en.json index e7aa8e2..628d14d 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -33,5 +33,12 @@ "cell.binary": "Binary operator", "cell.finite": "Finite State Machine", "cell.memories": "Storage", - "cell.coarse": "Rough arithmetic operations" + "cell.coarse": "Rough arithmetic operations", + "cell.multiplexers": "Multiplexer", + "cell.registers": "Register", + "cell.unary": "Unary Operator", + "setting.cell-color-setting": "Device color setting", + "cross-dot-style.slice": "Separator", + "cross-dot-style.connect": "Direct connector", + "cross-dot-style.concat": "Combining Character" } \ No newline at end of file diff --git a/src/i18n/fr.json b/src/i18n/fr.json index b36ff02..f4145b1 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -33,5 +33,12 @@ "cell.binary": "Opérateur binaire", "cell.finite": "Machine à états finis", "cell.memories": "Stockage", - "cell.coarse": "Opérations arithmétiques approximatives" + "cell.coarse": "Opérations arithmétiques approximatives", + "cell.multiplexers": "Multiplexeur", + "cell.registers": "Registre", + "cell.unary": "Opérateur unaire", + "setting.cell-color-setting": "Réglage de la couleur de l'appareil", + "cross-dot-style.slice": "Séparateur", + "cross-dot-style.connect": "Connecteur direct", + "cross-dot-style.concat": "Caractère de combinaison" } \ No newline at end of file diff --git a/src/i18n/ja.json b/src/i18n/ja.json index c10f685..eb49fd6 100644 --- a/src/i18n/ja.json +++ b/src/i18n/ja.json @@ -33,5 +33,12 @@ "cell.binary": "二項演算子", "cell.finite": "有限状態機械", "cell.memories": "ストレージ", - "cell.coarse": "大まかな算術演算" + "cell.coarse": "大まかな算術演算", + "cell.multiplexers": "マルチプレクサ", + "cell.registers": "レジスタ", + "cell.unary": "単項演算子", + "setting.cell-color-setting": "デバイスの色設定", + "cross-dot-style.slice": "区切り文字", + "cross-dot-style.connect": "ダイレクトコネクタ", + "cross-dot-style.concat": "結合文字" } \ No newline at end of file diff --git a/src/i18n/ko.json b/src/i18n/ko.json index 134cdf4..5ed125e 100644 --- a/src/i18n/ko.json +++ b/src/i18n/ko.json @@ -33,5 +33,12 @@ "cell.binary": "이항 연산자", "cell.finite": "유한 상태 기계", "cell.memories": "저장소", - "cell.coarse": "대략적인 산술 연산" + "cell.coarse": "대략적인 산술 연산", + "cell.multiplexers": "멀티플렉서", + "cell.registers": "레지스터", + "cell.unary": "단항 연산자", + "setting.cell-color-setting": "장치 색상 설정", + "cross-dot-style.slice": "구분자", + "cross-dot-style.connect": "직접 연결기", + "cross-dot-style.concat": "결합 문자" } \ No newline at end of file diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 8960e90..3acb492 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -33,5 +33,12 @@ "cell.binary": "Бинарный оператор", "cell.finite": "Конечный автомат", "cell.memories": "Хранилище", - "cell.coarse": "Приблизительные арифметические операции" + "cell.coarse": "Приблизительные арифметические операции", + "cell.multiplexers": "Мультиплексор", + "cell.registers": "Регистр", + "cell.unary": "Унарный оператор", + "setting.cell-color-setting": "Настройка цвета устройства", + "cross-dot-style.slice": "Разделитель", + "cross-dot-style.connect": "Прямой соединитель", + "cross-dot-style.concat": "Комбинирующий символ" } \ No newline at end of file diff --git a/src/i18n/zh-cn.json b/src/i18n/zh-cn.json index b064c80..31284fe 100644 --- a/src/i18n/zh-cn.json +++ b/src/i18n/zh-cn.json @@ -33,5 +33,12 @@ "cell.binary": "二元运算符", "cell.finite": "有限状态机", "cell.memories": "存储器", - "cell.coarse": "粗略算术运算" + "cell.coarse": "粗略算术运算", + "cell.multiplexers": "多路复用器", + "cell.registers": "寄存器", + "cell.unary": "一元运算符", + "setting.cell-color-setting": "器件颜色设置", + "cross-dot-style.slice": "拆分符", + "cross-dot-style.connect": "直连符", + "cross-dot-style.concat": "合并符" } \ No newline at end of file diff --git a/src/i18n/zh-tw.json b/src/i18n/zh-tw.json index 8240000..2e663c8 100644 --- a/src/i18n/zh-tw.json +++ b/src/i18n/zh-tw.json @@ -33,5 +33,12 @@ "cell.binary": "二元運算符", "cell.finite": "有限狀態機", "cell.memories": "儲存器", - "cell.coarse": "粗略算術運算" + "cell.coarse": "粗略算術運算", + "cell.multiplexers": "多路復用器", + "cell.registers": "暫存器", + "cell.unary": "一元運算符", + "setting.cell-color-setting": "器件顏色設置", + "cross-dot-style.slice": "分隔符", + "cross-dot-style.connect": "直連符", + "cross-dot-style.concat": "合併符" } \ No newline at end of file