octoleo/plantuml
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml.git synced 2024-11-26 14:56:28 +00:00
Code Issues Releases Wiki Activity
744 Commits 10 Branches 89 Tags 51 MiB
ddaacdf3f7
Commit Graph

423 Commits

Author SHA1 Message Date
matthew16550
abc3ca620f Remove some redundant calls to StringBounder.calculateDimension() 2021-10-04 23:56:35 +11:00
matthew16550
a02ff86cbd Delete UScale and related code as it is now unused. 2021-10-04 22:00:11 +11:00
arnaudroques
4ac9b7cd90
Merge pull request #689 from matthew16550/StringBounder-simplifications 
StringBounder injection & some minor related tidyings
 2021-10-04 09:25:43 +02:00
Arnaud Roques
11de152d92 Import version 1.2021.11 2021-10-03 23:01:18 +02:00
matthew16550
ead2698f01 Remove redundant getDefaultStringBounder() methods 2021-10-03 06:12:31 +11:00
matthew16550
c38b269089 Simplify StringBounder code in ImageBuilder 2021-10-03 06:11:03 +11:00
matthew16550
102d67271c Pass a StringBounder into DriverTextG2d & DriverTextAsPathG2d 2021-10-03 05:39:53 +11:00
matthew16550
102a7ccf64 Pass a StringBounder into UGraphicG2d & EmptyImageBuilder 2021-10-03 05:12:56 +11:00
matthew16550
d3a4fc6fe0 Pass a StringBounder into UGraphicSvg 2021-10-03 04:54:37 +11:00
matthew16550
2b2a47b9f0 Add FileFormat.getDefaultStringBounder(SvgCharSizeHack) 2021-10-03 04:50:13 +11:00
matthew16550
f1bff6dde6 Simplify UGraphicTikz constructors 2021-10-03 04:36:02 +11:00
matthew16550
eecb097640 Remove redundant UGraphicTikz constructor param 2021-10-03 04:34:41 +11:00
matthew16550
ff53f679ef Pass a StringBounder into UGraphicTikz 2021-10-03 04:31:42 +11:00
matthew16550
4c3b0bd989 Remove unused tikzFontDistortion field 2021-10-03 04:04:23 +11:00
matthew16550
3c5769cc5f Remove unused stringBounder field 2021-10-03 04:02:00 +11:00
a-krawciw
467241bf92 Change the output of a file to match the natural file structure. In reference to plantuml/plantuml#672 2021-09-23 22:15:07 -07:00
arnaudroques
2a3ecbb72e
Merge pull request #680 from matthew16550/PSystemUtils 
Enable cmapx file creation for Board, Mindmap, Network, Timing & WBS diagrams
 2021-09-22 09:33:31 +02:00
matthew16550
4937c8f1be Enable cmapx file creation for Board, Mindmap, Network, Timing & WBS diagrams. 2021-09-22 15:19:39 +10:00
Arnaud Roques
8f8d2863b1 Fix nwdiagram issue 2021-09-21 19:44:04 +02:00
arnaudroques
08cba946b3
Merge pull request #679 from matthew16550/png-split 
Update PNG splitting to support more diagram types
 2021-09-21 14:43:38 +02:00
matthew16550
25413d5b2b Update PNG splitting to support these diagram types: 
Activity, Archimate, Board, Class, Component, Deployment, Gantt, Mindmap, Network, Salt, State, Timing, WBS, Wire
 2021-09-21 21:45:07 +10:00
Arnaud Roques
3d7aa78624 Merge branch 'master' of https://github.com/plantuml/plantuml 2021-09-20 18:38:45 +02:00
Arnaud Roques
d0fe54026d Fix broken switch/case arrows when using kill/detach 2021-09-20 18:38:08 +02:00
matthew16550
16f9d973fa Add AbstractCommonUGraphic.stringBounder field 2021-09-20 22:56:11 +10:00
matthew16550
9791fc3f66 Rename UGraphic2.writeImageTOBEMOVED() -> UGraphic.writeToStream() & remove UGraphic2 interface. 2021-09-20 16:56:14 +10:00
arnaudroques
a6f3d162a6
Merge pull request #675 from matthew16550/UGraphicNo 
Extract common functionality to UGraphicNo class
 2021-09-19 19:26:30 +02:00
arnaudroques
3c2fbb9c53
Merge pull request #674 from matthew16550/createTextLayout 
Extract TextBlockUtils.createTextLayout() methods
 2021-09-19 19:05:48 +02:00
Arnaud Roques
6fdb340b37 Improve style support 2021-09-19 19:05:24 +02:00
matthew16550
8ec5a84040 * Extract common functionality to UGraphicNo class 
* Simplify subclass constructors
* Remove dpiFactor() methods which became redundant a while ago
 2021-09-19 22:33:09 +10:00
matthew16550
c6f40e32b1 Extract TextBlockUtils.createTextLayout() methods 2021-09-19 20:22:54 +10:00
Arnaud Roques
b3bf75e0b7 Improve style support for nwdiag 2021-09-15 23:03:09 +02:00
Arnaud Roques
e1fe53457a Add shadowing for nwdiag and support for D+xx notation in gantt 2021-09-14 19:26:18 +02:00
Arnaud Roques
da75a18cde Add new command 'printscale weekly with calendar date' 2021-09-13 18:22:02 +02:00
Arnaud Roques
673da114f2 Temporary rollback to fix issue when import zip file 2021-09-13 17:58:32 +02:00
arnaudroques
1bd97a0992
Merge pull request #669 from matthew16550/charset 
Simplify Charset code
 2021-09-13 17:38:08 +02:00
Arnaud Roques
b4819a8365 Fix typo 2021-09-13 17:37:30 +02:00
matthew16550
e3e2c2836e Use UTF_8 object instead of "UTF-8" string literal. 2021-09-13 15:18:15 +10:00
matthew16550
91749a2da3 Simplify Charset usage by using non-null Charset objects instead of charset name in nullable Strings 2021-09-13 14:37:17 +10:00
arnaudroques
5cb202295d
Merge pull request #664 from matthew16550/imageio-read-bytes 
Extract ImageIO.read(byte[]) method
 2021-09-12 12:35:01 +02:00
arnaudroques
061ce99bc5
Merge pull request #665 from matthew16550/SourceFileReaderAbstract 
Extract common code to SourceFileReaderAbstract constructor
 2021-09-12 12:33:12 +02:00
arnaudroques
07d9cc9917
Merge pull request #666 from The-Lum/detach-mod 
mod: change class of `detach`
 2021-09-12 12:29:53 +02:00
The-Lum
d7eba91125
mod: change class of detach 
- `detach` is more a `keyword` than a `type`, like `kill`.

Then change class of `detach` from `type` to `keyword`.
 2021-09-11 11:33:43 +02:00
matthew16550
c72202eb96 Extract common code to SourceFileReaderAbstract constructor 2021-09-11 19:02:36 +10:00
matthew16550
985916664f Extract ImageIO.read(byte[]) method 2021-09-11 14:21:48 +10:00
matthew16550
08dfd191ba Refactor some code to use AutoCloseable / try-with-resources 2021-09-11 00:52:29 +10:00
matthew16550
9e7db1ce64 Fix copy to clipboard on Mac. 
The previous code `Toolkit.getDefaultToolkit().createImage()` does not read the image file into memory but Clipboard.setContents() on Mac seems to need an image that is already in memory.
 2021-09-08 14:51:40 +10:00
matthew16550
8903d5e689 Prevent intermittent test failure due to PSystemError creating different output at different times of the hour. 2021-09-03 17:51:22 +10:00
Arnaud Roques
9238bacd65 Import version 1.2021.10 2021-08-30 19:13:54 +02:00
damienwojtowicz
b5e9171558 Implemented zoom control keyboard shortcuts 
- Added a `CTRL + +` to zoom in
- Added a `CTRL + -` to zoom out
- Added a `CTRL + 0` to reset zoom
- Minor refactor in classes names (removed "2" appended to GUI's classes name)
 2021-08-02 12:11:47 +02:00
Josep Mones Teixidor
0bef01372f Fix issue with garbage after the diagram and created better tests 2021-07-29 06:02:06 +02:00
Josep Mones Teixidor
6849c96144 Add tests for Pipe 2021-07-29 03:50:30 +02:00
Arnaud Roques
1edafc748d Import version 1.2021.9 2021-07-25 12:41:36 +02:00
arnaudroques
671cbc4101
Merge pull request #586 from The-Lum/LanguageDescriptorImprovement 
Language Descriptor Improvement (adding some word)
 2021-07-07 22:56:43 +02:00
The-Lum
275b9b33f5
Suppress of then word to avoid warning of Cypher 
Suppress of `then` word to avoid warning of Cypher:

[Observed on V1.2021.7]
```
>java -jar  plantuml.jar -stdrpt -cypher
Warning:then
```
or:
```
java -jar  plantuml.jar -v -cypher
(0.000 - 254 Mo) 248 Mo - SecurityProfile LEGACY
(0.014 - 254 Mo) 247 Mo - PlantUML Version 1.2021.7
(0.014 - 254 Mo) 247 Mo - GraphicsEnvironment.isHeadless() false
(0.014 - 254 Mo) 247 Mo - Forcing resource load on OpenJdk
Warning:then
(0.372 - 254 Mo) 240 Mo - Found 0 files
```
 2021-07-06 13:27:46 +02:00
The-Lum
f8e02ef0aa
Rename Warning to CypherWarning 
Rename `Warning` to `CypherWarning`, for more readability on the stdout/stderror
 2021-07-06 13:01:39 +02:00
The-Lum
5aee7363b7
Language Descriptor Improvement 
Adding:
- collections
- hexagon
- label
- person
- annotation
- left to right direction

+ all `@start/@end` with same order than https://github.com/plantuml/plantuml/blob/master/src/net/sourceforge/plantuml/core/DiagramType.java
 2021-07-05 22:36:10 +02:00
Arnaud Roques
d55c9c6ca7 Import version 1.2021.8 2021-06-27 18:50:40 +02:00
Arnaud Roques
39c585ee09 Import version 1.2021.7 2021-05-23 17:35:13 +02:00
Arnaud Roques
f83a207360 Import version 1.2021.6 2021-05-14 10:42:57 +02:00
matthew16550
28983460d7 Add "help themes" command. And ThemeUtils class. 2021-05-10 12:36:09 +10:00
Arnaud Roques
7afaa0c743 Add use of Objects.requireNonNull 2021-05-09 23:14:40 +02:00
matthew16550
de5ed44c97 Add -filedir option. 2021-05-08 11:07:20 +10:00
Arnaud Roques
c216d071b5 Improve theme support 2021-05-06 23:23:05 +02:00
Arnaud Roques
1048a07d7d Improve theme support 2021-05-03 22:11:48 +02:00
Arnaud Roques
f1d83b484c Integration of themes from Brett Schwarz 2021-05-01 19:40:56 +02:00
Arnaud Roques
fcf10ee0a9 Import version 1.2021.5 2021-04-25 22:59:17 +02:00
Thilo Schaper
9a46840192 remove unused option '-recurse' from usage listing 2021-04-21 22:54:56 +02:00
Arnaud Roques
a53860d53d Fix compile error 2021-04-20 22:27:12 +02:00
Arnaud Roques
e1e6bcc5c8 Improve ELK support 2021-04-20 22:19:49 +02:00
Arnaud Roques
bc1074a775 Improve ELK support 2021-04-17 13:19:39 +02:00
Arnaud Roques
cb8cd3492c Improve ELK support (Label and orientation) 2021-04-15 18:49:28 +02:00
Arnaud Roques
320ab186b4 Improve ELK support 2021-04-14 20:08:29 +02:00
Arnaud Roques
dfdec8820f Improve Gantt and add alpha support for ELK 2021-04-13 19:05:18 +02:00
Arnaud Roques
f69cfcd011 Add some Gantt improvement 2021-04-07 20:02:23 +02:00
matthew16550
7863aae1af Infer svgLinkTarget instead of storing it in ImageBuilder. 2021-04-07 19:47:24 +10:00
matthew16550
f1b5a4c827 Infer svgDimensionStyle instead of storing it in ImageBuilder. 2021-04-07 19:41:13 +10:00
matthew16550
8fc84d437a Infer preserveAspectRatio instead of storing it in ImageBuilder. 2021-04-07 19:38:03 +10:00
matthew16550
5b970db545 Infer hoverPathColorRGB instead of storing it in ImageBuilder. 2021-04-07 19:32:14 +10:00
matthew16550
5c2634cf4e Simplify ImageBuilder.getFinalDimension() and cache calculated result. 2021-04-07 19:25:27 +10:00
matthew16550
f47a2a14fc Infer scale instead of storing it in ImageBuilder. 2021-04-07 19:16:17 +10:00
matthew16550
2b712e44c0 Infer lengthAdjust instead of storing it in ImageBuilder. 2021-04-07 19:11:44 +10:00
matthew16550
5c8b1dc46a Infer handwritten instead of storing it in ImageBuilder. 2021-04-07 18:50:19 +10:00
matthew16550
c4fe9f4349 Infer dpi instead of storing it in ImageBuilder. 2021-04-07 18:46:12 +10:00
matthew16550
81abee58fa Refactor duplicate scaleFactor calculations. 2021-04-07 18:38:29 +10:00
matthew16550
9c865ab58b Infer svgCharSizeHack instead of storing it in ImageBuilder. 2021-04-07 18:27:57 +10:00
matthew16550
f0e978de36 Move all ImageBuilder border related code into maybeDrawBorder() method. 2021-04-07 13:01:15 +10:00
arnaudroques
ee0503cbe5
Merge pull request #521 from matthew16550/createImageBuilder 
Add AbstractPSystem.createImageBuilder().  Remove styledImageBuilder()
 2021-04-05 23:05:24 +02:00
Arnaud Roques
af012b24fb Fix minor regression when exporting Cmap data in PNG image. 
DPI is no more relevant, scaleFactor must be used instead.
 2021-04-05 22:57:59 +02:00
matthew16550
935c52109b Add AbstractPSystem.createImageBuilder(). Remove styledImageBuilder() 2021-04-04 23:45:56 +10:00
arnaudroques
b659ee4d3b
Merge pull request #520 from matthew16550/skinparam 
Simplify default & boolean values in SkinParam
 2021-04-04 13:33:26 +02:00
matthew16550
75f80fa2df Simplify default & boolean values in SkinParam. Change "sameClassWidth" param to case insensitive. Rename a few SkinParam tests for consistency. 2021-04-04 21:25:02 +10:00
arnaudroques
49c9fba2ec
Merge pull request #519 from matthew16550/drawable 
Add ImageBuilder.imageBuilder() & ImageBuilder.drawable().  Move ImageBuilder creation to CucaDiagram & SequenceDiagram classes.
 2021-04-04 12:33:48 +02:00
Arnaud Roques
feba01473c Import version 1.2021.4 2021-04-04 12:31:53 +02:00
matthew16550
af3dbd1cdb Add ImageBuilder.imageBuilder() & ImageBuilder.drawable(). Move ImageBuilder creation to CucaDiagram & SequenceDiagram classes. 2021-04-03 11:49:34 +11:00
arnaudroques
33ba37318c
Merge pull request #518 from nicerloop/gantt-scale-compress 
Add compress parameter to print scale command in gantt diagram
 2021-04-02 19:28:28 +02:00
arnaudroques
3a9ef9671c
Merge pull request #517 from nicerloop/gantt-scale-yearly-quarterly 
Add quarterly and yearly print scale to gantt diagram
 2021-04-02 19:28:13 +02:00
Arnaud Roques
9f224e46f3 Minor correction 2021-04-02 19:26:59 +02:00
Loïc PÉRON
638bd2e9ea Add compress parameter to print scale command in gantt diagram 2021-04-02 16:34:14 +02:00
Loïc PÉRON
be69806a96 Add quarterly and yearly print scale to gantt diagram 2021-04-02 16:12:41 +02:00
matthew16550
15c85b7190 Extract FileFormat.getDefaultStringBounder() method 2021-04-02 22:02:44 +11:00
matthew16550
5c58b61278 Fix preserveAspectRatio regression caused in #511 - ensure that "plain" diagrams use a default value of "none". 2021-04-02 17:09:04 +11:00
Arnaud Roques
0e98cae2d0 Minor fixes 2021-03-30 23:19:28 +02:00
arnaudroques
16c3c672df
Merge pull request #513 from matthew16550/getAsInt 
Extract SkinParam.getAsInt() method
 2021-03-29 09:22:22 +02:00
matthew16550
d5780e48f6 Extract SkinParam.getAsInt() method 2021-03-29 15:50:53 +11:00
matthew16550
75f26baab7 Remove redundant FileFormatOption.affineTransform field (it was always null and could not be set to another value) 2021-03-29 12:00:19 +11:00
matthew16550
13a62c3884 Move preserveAspectRatio & svgLinkTarget calculation to ImageBuilder class. 2021-03-29 01:33:48 +11:00
arnaudroques
8496f821ca
Merge pull request #510 from matthew16550/imagedatacomplex 
Undelete ImageDataComplex constructor that was accidentally removed from net.sourceforge.plantuml.api
 2021-03-28 12:31:05 +02:00
arnaudroques
4ac177c458
Merge pull request #509 from matthew16550/hoverpathcolor 
Move hoverpathcolor calculation to ImageBuilder class.
 2021-03-28 12:30:39 +02:00
Arnaud Roques
cb0bcb6952 Minor fixes 2021-03-28 12:30:15 +02:00
matthew16550
d43fe93e2b Undelete ImageDataComplex constructor that was accidentally removed from net.sourceforge.plantuml.api in commit a746d98 2021-03-28 12:36:41 +11:00
matthew16550
1c70b9ea34 Move hoverpathcolor calculation to ImageBuilder class. 2021-03-28 12:05:48 +11:00
Arnaud Roques
986393d90d Improve URL management 2021-03-25 18:46:44 +01:00
matthew16550
880441b1cf Replace UGraphicUtils with ImageBuilder. 2021-03-25 21:49:53 +11:00
matthew16550
d7127326ad Minor simplifications in ImageBuilder 2021-03-25 13:26:11 +11:00
matthew16550
a746d98e3d ImageBuilder simplifications 2021-03-24 14:53:58 +11:00
Arnaud Roques
b982cc4caf Update file header 2021-03-23 23:10:34 +01:00
Arnaud Roques
d579f6899f Add few non regression tests 2021-03-23 18:14:35 +01:00
matthew16550
bc2cc49550 Merge ImageParameter into ImageBuilder 2021-03-24 01:11:20 +11:00
matthew16550
68be6ae4a0 Simplify passing around of seed value. 2021-03-24 00:06:33 +11:00
arnaudroques
3cbe042f8e
Merge pull request #504 from matthew16550/builders-2 
Add plainImageBuilder() plainPngBuilder() styledImageBuilder() and PlainDiagram / PlainStringsDiagram classes
 2021-03-23 11:13:07 +01:00
Arnaud Roques
c2eadfd3e4 Add minor correction and some test test 2021-03-23 11:11:32 +01:00
matthew16550
ac1fa530cf Extract common functionality to new ImageBuilder methods plainImageBuilder() plainPngBuilder() styledImageBuilder() and to PlainDiagram / PlainStringsDiagram classes. 2021-03-23 20:40:50 +11:00
Arnaud Roques
efab37d3ce Import version 1.2021.3 2021-03-22 19:00:32 +01:00
Arnaud Roques
2efa343e38 Decouple StringBounderDebug from any OS 2021-03-22 14:20:24 +01:00
Arnaud Roques
aad084e5a1 Try to turn around some rounding issues 2021-03-22 10:54:54 +01:00
Arnaud Roques
0d6a17a27e Fix SimpleSequenceDiagramTest by using the appropriate StringBounderDebug 2021-03-22 09:45:48 +01:00
Arnaud Roques
bdc0eb9709 Add a first test using Debug format output 2021-03-21 13:52:20 +01:00
matthew16550
720d9f5203 Tweak Smetana Y offset to avoid clipping at top 2021-03-21 19:07:28 +11:00
matthew16550
9f576036df Fix top & left margin problems with CucaDiagrams (#497) 2021-03-21 00:37:59 +11:00
Arnaud Roques
ad2e9d5fb3 Remove unused files 2021-03-19 18:27:32 +01:00
Arnaud Roques
e6437ce908 Refactor Gantt and clean TitledDiagram 2021-03-19 17:58:09 +01:00
matthew16550
848a75216f Fix previous regression a different way that fixes a use case the previous fix missed. 2021-03-20 02:51:26 +11:00
matthew16550
3c87ae4671 Fix regression for Activity, Class, Description & State Diagram default margins. 2021-03-19 23:06:57 +11:00
matthew16550
c20fe8d58f Fix regression for Sequence Diagram default margins when using Puma. 2021-03-19 22:20:29 +11:00
arnaudroques
4a1a8787d0
Merge pull request #493 from matthew16550/scale 
Handle Scale & DPI more consistently for all diagram types.
 2021-03-18 22:38:24 +01:00
Arnaud Roques
756225dee0 Add Gantt bugfix 2021-03-18 22:38:00 +01:00
matthew16550
270fec579a Simplify GitDiagram code for consistency with other diagrams. Margin / scale / background color etc will not take effect until those commands are enabled for this diagram type. 2021-03-19 06:00:55 +11:00
matthew16550
2da2146f21 Handle Scale & DPI more consistently for all diagram types. 2021-03-19 05:14:42 +11:00
arnaudroques
69645c8e1e
Merge pull request #492 from matthew16550/test-2 
Tweaks to enable "Test Playground" in plantuml-test repo
 2021-03-18 14:38:48 +01:00
Arnaud Roques
266e8b6497 Add new affectation 2021-03-18 14:38:17 +01:00
matthew16550
7d7fdaddf2 Tweak visibility in PSystemError to help with tests. 2021-03-19 00:12:00 +11:00
Arnaud Roques
82c57e1b54 fix typo in comment 2021-03-15 17:14:41 +01:00
Kir Ax
8b99027a83 Add empty line between code blocks 2021-03-14 23:40:04 +07:00
Kir Ax
869143866f Make interactive SVG for Object diagrams 2021-03-14 23:37:50 +07:00
Kir Ax
e27667b683 Make interactive SVG for Class diagrams 2021-03-14 18:56:57 +07:00
Arnaud Roques
28f253d992 Bug fixes 2021-03-12 19:16:16 +01:00
Arnaud Roques
1fb75b1b0e Delete unused files 2021-03-10 18:34:49 +01:00
matthew16550
4b4562ec35 Move UmlDiagram.animation to parent class (TitledDiagram). 2021-03-10 05:41:49 +11:00
matthew16550
568c2e3106 Move diagram.getAnimation() & diagram.getWarningOrError() into ImageParameter class. 2021-03-10 05:31:38 +11:00
Arnaud Roques
bedbe1036b Fix background color for MinMapDiagram 2021-03-09 19:02:38 +01:00