diff --git a/Makefile b/Makefile index 86f84643..3dc88576 100644 --- a/Makefile +++ b/Makefile @@ -51,7 +51,7 @@ test: debug CTEST_OUTPUT_ON_FAILURE=1 make -C debug test test_plantuml: test - plantuml debug/tests/puml/*.puml + plantuml -tsvg debug/tests/puml/*.puml document_test_cases: test_plantuml python3 util/generate_test_cases_docs.py @@ -59,7 +59,7 @@ document_test_cases: test_plantuml clanguml_diagrams: debug mkdir -p docs/diagrams debug/clang-uml - plantuml docs/diagrams/*.puml + plantuml -tsvg docs/diagrams/*.puml .PHONY: submodules submodules: diff --git a/docs/test_cases/t00002.md b/docs/test_cases/t00002.md index 1e3b2ca5..e432037e 100644 --- a/docs/test_cases/t00002.md +++ b/docs/test_cases/t00002.md @@ -87,4 +87,4 @@ private: ``` ## Generated UML diagrams -![t00002_class](./t00002_class.png "Basic class inheritance") +![t00002_class](./t00002_class.svg "Basic class inheritance") diff --git a/docs/test_cases/t00002_class.png b/docs/test_cases/t00002_class.png deleted file mode 100644 index 606887e9..00000000 Binary files a/docs/test_cases/t00002_class.png and /dev/null differ diff --git a/docs/test_cases/t00002_class.svg b/docs/test_cases/t00002_class.svg new file mode 100644 index 00000000..e9b79297 --- /dev/null +++ b/docs/test_cases/t00002_class.svg @@ -0,0 +1,66 @@ +Afoo_a() = 0 : voidfoo_c() = 0 : voidBfoo_a() : voidCfoo_c() : voidDas : std::vector<A*>foo_a() : voidfoo_c() : voidEas : std::vector<A*>foo_a() : voidfoo_c() : voidBase abstract interface.asas \ No newline at end of file diff --git a/docs/test_cases/t00003.md b/docs/test_cases/t00003.md index 299fb8b1..b2f6ae96 100644 --- a/docs/test_cases/t00003.md +++ b/docs/test_cases/t00003.md @@ -78,4 +78,4 @@ int A::static_int = 1; ``` ## Generated UML diagrams -![t00003_class](./t00003_class.png "Class field and methods") +![t00003_class](./t00003_class.svg "Class field and methods") diff --git a/docs/test_cases/t00003_class.png b/docs/test_cases/t00003_class.png deleted file mode 100644 index 38c4884d..00000000 Binary files a/docs/test_cases/t00003_class.png and /dev/null differ diff --git a/docs/test_cases/t00003_class.svg b/docs/test_cases/t00003_class.svg new file mode 100644 index 00000000..b5d5c73f --- /dev/null +++ b/docs/test_cases/t00003_class.svg @@ -0,0 +1,45 @@ +Apublic_member : intstatic_int : intstatic_const_int : int constauto_member : unsigned long constprotected_member : intprivate_member : inta : intb : intc : intA() : voidA(int i) : voidA(A&& ) : voidA(A const& ) : void~A() : voidbasic_method() : voidstatic_method() : intconst_method() const : voidauto_method() : intdouble_int(int const i) : intsum(double const a, double const b) : doubledefault_int(int i = 12) : intdefault_string(int i, std::string s = "abc") : std::stringcreate_from_int(int i) : Aprotected_method() : voidprivate_method() : voidcompare : std::function<bool(int const)> \ No newline at end of file diff --git a/docs/test_cases/t00004.md b/docs/test_cases/t00004.md index a6f84008..1dafde55 100644 --- a/docs/test_cases/t00004.md +++ b/docs/test_cases/t00004.md @@ -42,4 +42,4 @@ public: ``` ## Generated UML diagrams -![t00004_class](./t00004_class.png "Nested classes and enums") +![t00004_class](./t00004_class.svg "Nested classes and enums") diff --git a/docs/test_cases/t00004_class.png b/docs/test_cases/t00004_class.png deleted file mode 100644 index 30e724f2..00000000 Binary files a/docs/test_cases/t00004_class.png and /dev/null differ diff --git a/docs/test_cases/t00004_class.svg b/docs/test_cases/t00004_class.svg new file mode 100644 index 00000000..d57a355a --- /dev/null +++ b/docs/test_cases/t00004_class.svg @@ -0,0 +1,45 @@ +Afoo() const : voidfoo2() const : voidAALightsGreenYellowRedAAA \ No newline at end of file diff --git a/docs/test_cases/t00005.md b/docs/test_cases/t00005.md index 503e8fd1..2284549b 100644 --- a/docs/test_cases/t00005.md +++ b/docs/test_cases/t00005.md @@ -76,4 +76,4 @@ public: ``` ## Generated UML diagrams -![t00005_class](./t00005_class.png "Basic class field relationships") +![t00005_class](./t00005_class.svg "Basic class field relationships") diff --git a/docs/test_cases/t00005_class.png b/docs/test_cases/t00005_class.png deleted file mode 100644 index d094d44a..00000000 Binary files a/docs/test_cases/t00005_class.png and /dev/null differ diff --git a/docs/test_cases/t00005_class.svg b/docs/test_cases/t00005_class.svg new file mode 100644 index 00000000..1b20997b --- /dev/null +++ b/docs/test_cases/t00005_class.svg @@ -0,0 +1,111 @@ +ABCDEFGHIJKRsome_int : intsome_int_pointer : int*some_int_pointer_pointer : int**some_int_reference : int&a : Ab : B*c : C&d : D const*e : E const&f : F&&g : G**h : H***i : I*&j : J volatile*k : K*+a+b+c+d+e+f+g+h+i+j+k \ No newline at end of file diff --git a/docs/test_cases/t00006.md b/docs/test_cases/t00006.md index 44b3d036..5ac6649e 100644 --- a/docs/test_cases/t00006.md +++ b/docs/test_cases/t00006.md @@ -105,4 +105,4 @@ public: ``` ## Generated UML diagrams -![t00006_class](./t00006_class.png "Class field relationships inferred from templates") +![t00006_class](./t00006_class.svg "Class field relationships inferred from templates") diff --git a/docs/test_cases/t00006_class.png b/docs/test_cases/t00006_class.png deleted file mode 100644 index 391163f0..00000000 Binary files a/docs/test_cases/t00006_class.png and /dev/null differ diff --git a/docs/test_cases/t00006_class.svg b/docs/test_cases/t00006_class.svg new file mode 100644 index 00000000..86934139 --- /dev/null +++ b/docs/test_cases/t00006_class.svg @@ -0,0 +1,159 @@ +ABCDEFGHIJKLMNNNNNNcustom_containerTdata : std::vector<T>custom_containerERa : std::vector<A>b : std::vector<B*>c : std::map<int,C>d : std::map<int,D*>e : custom_container<E>f : std::vector<std::vector<F>>g : std::map<int,std::vector<G*>>h : std::array<H,10>i : std::array<I*,5>j : J[10]k : K*[20]lm : std::vector<std::pair<L,M>>ns : std::tuple<N,NN,NNN>+a+b+c+d+e+f+g+h+i+j+klmlmnsnsns \ No newline at end of file diff --git a/docs/test_cases/t00007.md b/docs/test_cases/t00007.md index a7814755..e20572eb 100644 --- a/docs/test_cases/t00007.md +++ b/docs/test_cases/t00007.md @@ -42,4 +42,4 @@ public: ``` ## Generated UML diagrams -![t00007_class](./t00007_class.png "Smart pointers") +![t00007_class](./t00007_class.svg "Smart pointers") diff --git a/docs/test_cases/t00007_class.png b/docs/test_cases/t00007_class.png deleted file mode 100644 index 6db091fc..00000000 Binary files a/docs/test_cases/t00007_class.png and /dev/null differ diff --git a/docs/test_cases/t00007_class.svg b/docs/test_cases/t00007_class.svg new file mode 100644 index 00000000..9c25164c --- /dev/null +++ b/docs/test_cases/t00007_class.svg @@ -0,0 +1,43 @@ +ABCRa : std::unique_ptr<A>b : std::shared_ptr<B>c : std::weak_ptr<C>+a+b+c \ No newline at end of file diff --git a/docs/test_cases/t00008.md b/docs/test_cases/t00008.md index 3c998e8b..4e0ef0c4 100644 --- a/docs/test_cases/t00008.md +++ b/docs/test_cases/t00008.md @@ -55,4 +55,4 @@ struct D { ``` ## Generated UML diagrams -![t00008_class](./t00008_class.png "Template and template template relationships") +![t00008_class](./t00008_class.svg "Template and template template relationships") diff --git a/docs/test_cases/t00008_class.png b/docs/test_cases/t00008_class.png deleted file mode 100644 index 508d6029..00000000 Binary files a/docs/test_cases/t00008_class.png and /dev/null differ diff --git a/docs/test_cases/t00008_class.svg b/docs/test_cases/t00008_class.svg new file mode 100644 index 00000000..c0ac8f70 --- /dev/null +++ b/docs/test_cases/t00008_class.svg @@ -0,0 +1,53 @@ +AT,P,CMP,int Nvalue : Tpointer : T*reference : T&values : std::vector<P>ints : std::array<int,N>comparator : CMPVectorTvalues : std::vector<T>BT,C<>template_template : C<T>Bint,VectorDints : B<int,Vector>add(int i) : voidints \ No newline at end of file diff --git a/docs/test_cases/t00009.md b/docs/test_cases/t00009.md index 478b5928..b413a49b 100644 --- a/docs/test_cases/t00009.md +++ b/docs/test_cases/t00009.md @@ -40,4 +40,4 @@ public: ``` ## Generated UML diagrams -![t00009_class](./t00009_class.png "Template instantiation") +![t00009_class](./t00009_class.svg "Template instantiation") diff --git a/docs/test_cases/t00009_class.png b/docs/test_cases/t00009_class.png deleted file mode 100644 index be6770b5..00000000 Binary files a/docs/test_cases/t00009_class.png and /dev/null differ diff --git a/docs/test_cases/t00009_class.svg b/docs/test_cases/t00009_class.svg new file mode 100644 index 00000000..ef212070 --- /dev/null +++ b/docs/test_cases/t00009_class.svg @@ -0,0 +1,55 @@ +ATvalue : TAintAstd::stringAstd::vector<std::string>Baint : A<int>astring : A<std::string>*avector : A<std::vector<std::string>>&aintastringavector \ No newline at end of file diff --git a/docs/test_cases/t00010.md b/docs/test_cases/t00010.md index dca10221..03f38f1c 100644 --- a/docs/test_cases/t00010.md +++ b/docs/test_cases/t00010.md @@ -44,4 +44,4 @@ public: ``` ## Generated UML diagrams -![t00010_class](./t00010_class.png "Basic template instantiation") +![t00010_class](./t00010_class.svg "Basic template instantiation") diff --git a/docs/test_cases/t00010_class.png b/docs/test_cases/t00010_class.png deleted file mode 100644 index 064e0abf..00000000 Binary files a/docs/test_cases/t00010_class.png and /dev/null differ diff --git a/docs/test_cases/t00010_class.svg b/docs/test_cases/t00010_class.svg new file mode 100644 index 00000000..0747652c --- /dev/null +++ b/docs/test_cases/t00010_class.svg @@ -0,0 +1,51 @@ +AT,Pfirst : Tsecond : PAT,std::stringBTastring : A<T,std::string>BintCaintstring : B<int>astringaintstring \ No newline at end of file diff --git a/docs/test_cases/t00011.md b/docs/test_cases/t00011.md index 35ce8de0..a12358c1 100644 --- a/docs/test_cases/t00011.md +++ b/docs/test_cases/t00011.md @@ -54,4 +54,4 @@ public: ``` ## Generated UML diagrams -![t00011_class](./t00011_class.png "Friend relationships") +![t00011_class](./t00011_class.svg "Friend relationships") diff --git a/docs/test_cases/t00011_class.png b/docs/test_cases/t00011_class.png deleted file mode 100644 index a3350b01..00000000 Binary files a/docs/test_cases/t00011_class.png and /dev/null differ diff --git a/docs/test_cases/t00011_class.svg b/docs/test_cases/t00011_class.svg new file mode 100644 index 00000000..0fa293b2 --- /dev/null +++ b/docs/test_cases/t00011_class.svg @@ -0,0 +1,38 @@ +DTvalue : TAfoo() : voidBm_a : A*foo() : void«friend»m_a \ No newline at end of file diff --git a/docs/test_cases/t00012.md b/docs/test_cases/t00012.md index 597f05fe..7bd60b59 100644 --- a/docs/test_cases/t00012.md +++ b/docs/test_cases/t00012.md @@ -60,4 +60,4 @@ class R { ``` ## Generated UML diagrams -![t00012_class](./t00012_class.png "Advanced template instantiations") +![t00012_class](./t00012_class.svg "Advanced template instantiations") diff --git a/docs/test_cases/t00012_class.png b/docs/test_cases/t00012_class.png deleted file mode 100644 index 4a20b22f..00000000 Binary files a/docs/test_cases/t00012_class.png and /dev/null differ diff --git a/docs/test_cases/t00012_class.svg b/docs/test_cases/t00012_class.svg new file mode 100644 index 00000000..2e3b7f45 --- /dev/null +++ b/docs/test_cases/t00012_class.svg @@ -0,0 +1,89 @@ +AT,Ts...value : Tvalues : intBint Is...ints : std::array<int,sizeof...(Is)>CT,int Is...ints : std::array<T,sizeof...(Is)>Aint,std::string,floatAint,std::string,boolB3,2,1B1,1,1,1Cstd::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3Ra1 : A<int,std::string,float>a2 : A<int,std::string,bool>b1 : B<3,2,1>b2 : B<1,1,1,1>c1 : C<std::map<int,std::vector<std::vector<std::vector<std::string>>>>,3,3,3>Long template annotationa1a2b1b2c1 \ No newline at end of file diff --git a/docs/test_cases/t00013.md b/docs/test_cases/t00013.md index c3bc0857..bac2230a 100644 --- a/docs/test_cases/t00013.md +++ b/docs/test_cases/t00013.md @@ -81,4 +81,4 @@ private: ``` ## Generated UML diagrams -![t00013_class](./t00013_class.png "Template instantiation relationships") +![t00013_class](./t00013_class.svg "Template instantiation relationships") diff --git a/docs/test_cases/t00013_class.png b/docs/test_cases/t00013_class.png deleted file mode 100644 index 234e7008..00000000 Binary files a/docs/test_cases/t00013_class.png and /dev/null differ diff --git a/docs/test_cases/t00013_class.svg b/docs/test_cases/t00013_class.svg new file mode 100644 index 00000000..32067de8 --- /dev/null +++ b/docs/test_cases/t00013_class.svg @@ -0,0 +1,109 @@ +ABCD::FTf : TAa : intBb : intCc : intDd : intprint(R* r) : voidETe : TEintFintEstd::stringRestring : E<std::string>get_a(A* a) : intget_b(B& b) : intget_const_b(B const& b) : intget_c(C c) : intget_d(D&& d) : intget_d2(D&& d) : intget_e(E<T> e) : Tget_int_e(E<int> const& e) : intget_int_e2(E<int>& e) : intget_f(F<T> const& f) : Tget_int_f(F<int> const& f) : intestring \ No newline at end of file diff --git a/docs/test_cases/t00014.md b/docs/test_cases/t00014.md index e747bacd..4fb6d9be 100644 --- a/docs/test_cases/t00014.md +++ b/docs/test_cases/t00014.md @@ -86,4 +86,4 @@ public: ``` ## Generated UML diagrams -![t00014_class](./t00014_class.png "Alias template instantiation") +![t00014_class](./t00014_class.svg "Alias template instantiation") diff --git a/docs/test_cases/t00014_class.png b/docs/test_cases/t00014_class.png deleted file mode 100644 index 1cacbd21..00000000 Binary files a/docs/test_cases/t00014_class.png and /dev/null differ diff --git a/docs/test_cases/t00014_class.svg b/docs/test_cases/t00014_class.svg new file mode 100644 index 00000000..c1663dae --- /dev/null +++ b/docs/test_cases/t00014_class.svg @@ -0,0 +1,101 @@ +AT,Pt : Tp : PAT,std::stringBvalue : std::stringAbool,std::stringAStringfloatAStringintAStringstd::stringGeneralCallbackAIntStringGeneralCallbackRboolstring : A<bool,std::string>floatstring : AString<float>intstring : AIntStringstringstring : AStringStringbs : BVectorbs2 : BVector2cb : GeneralCallback<AIntString>vcb : VoidCallbackboolstringfloatstringintstringstringstringbsbs2cbvcb \ No newline at end of file diff --git a/docs/test_cases/t00015.md b/docs/test_cases/t00015.md index 47c773ba..5c01e5ad 100644 --- a/docs/test_cases/t00015.md +++ b/docs/test_cases/t00015.md @@ -53,4 +53,4 @@ class B : public ns1::ns2::Anon { ``` ## Generated UML diagrams -![t00015_class](./t00015_class.png "Namespace fun") +![t00015_class](./t00015_class.svg "Namespace fun") diff --git a/docs/test_cases/t00015_class.png b/docs/test_cases/t00015_class.png deleted file mode 100644 index b1db060f..00000000 Binary files a/docs/test_cases/t00015_class.png and /dev/null differ diff --git a/docs/test_cases/t00015_class.svg b/docs/test_cases/t00015_class.svg new file mode 100644 index 00000000..20121288 --- /dev/null +++ b/docs/test_cases/t00015_class.svg @@ -0,0 +1,42 @@ +ns1::Ans1::ns2_v0_9_0::Ans1::Anonns3::ns1::ns2::Anonns3::B \ No newline at end of file diff --git a/docs/test_cases/t00016.md b/docs/test_cases/t00016.md index 10ceefc7..ede95857 100644 --- a/docs/test_cases/t00016.md +++ b/docs/test_cases/t00016.md @@ -45,4 +45,4 @@ template <> struct is_numeric { ``` ## Generated UML diagrams -![t00016_class](./t00016_class.png "Unnamed enums and empty templates") +![t00016_class](./t00016_class.svg "Unnamed enums and empty templates") diff --git a/docs/test_cases/t00016_class.png b/docs/test_cases/t00016_class.png deleted file mode 100644 index ad5cc26f..00000000 Binary files a/docs/test_cases/t00016_class.png and /dev/null differ diff --git a/docs/test_cases/t00016_class.svg b/docs/test_cases/t00016_class.svg new file mode 100644 index 00000000..493a6979 --- /dev/null +++ b/docs/test_cases/t00016_class.svg @@ -0,0 +1,52 @@ +is_numeric<>value : enumis_numericcharvalue : enumis_numericunsigned charvalue : enumis_numericintvalue : enumis_numericboolvalue : enum \ No newline at end of file diff --git a/docs/test_cases/t00017.md b/docs/test_cases/t00017.md index b673c436..3b71f8f8 100644 --- a/docs/test_cases/t00017.md +++ b/docs/test_cases/t00017.md @@ -88,4 +88,4 @@ private: ``` ## Generated UML diagrams -![t00017_class](./t00017_class.png "Test include relations also as members flag") +![t00017_class](./t00017_class.svg "Test include relations also as members flag") diff --git a/docs/test_cases/t00017_class.png b/docs/test_cases/t00017_class.png deleted file mode 100644 index 0c3b9319..00000000 Binary files a/docs/test_cases/t00017_class.png and /dev/null differ diff --git a/docs/test_cases/t00017_class.svg b/docs/test_cases/t00017_class.svg new file mode 100644 index 00000000..9729c67d --- /dev/null +++ b/docs/test_cases/t00017_class.svg @@ -0,0 +1,109 @@ +ABCDEFGHIJKRsome_int : intsome_int_pointer : int*some_int_pointer_pointer : int**some_int_reference : int&R(int& some_int, C& cc, E const& ee, F&& ff, I*& ii) : void-c-e-f-i-a-b-d-g-h-j-k \ No newline at end of file diff --git a/docs/test_cases/t00018.md b/docs/test_cases/t00018.md index 760615a8..b6cd8197 100644 --- a/docs/test_cases/t00018.md +++ b/docs/test_cases/t00018.md @@ -133,4 +133,4 @@ void widget::draw(const clanguml::t00018::widget &w) ``` ## Generated UML diagrams -![t00018_class](./t00018_class.png "Pimpl pattern") +![t00018_class](./t00018_class.svg "Pimpl pattern") diff --git a/docs/test_cases/t00018_class.png b/docs/test_cases/t00018_class.png deleted file mode 100644 index 0ff85809..00000000 Binary files a/docs/test_cases/t00018_class.png and /dev/null differ diff --git a/docs/test_cases/t00018_class.svg b/docs/test_cases/t00018_class.svg new file mode 100644 index 00000000..72c77c4f --- /dev/null +++ b/docs/test_cases/t00018_class.svg @@ -0,0 +1,42 @@ +impl::widgetn : intdraw(widget const& w) const : voiddraw(widget const& w) : voidwidget(int n) : voidwidgetpImpl : std::unique_ptr<impl::widget>draw() const : voiddraw() : voidshown() const : boolwidget(int ) : void~widget() : voidwidget(widget&& ) : voidwidget(widget const& ) : voidoperator=(widget&& ) : widget&operator=(widget const& ) : widget&pImpl \ No newline at end of file diff --git a/docs/test_cases/t00019.md b/docs/test_cases/t00019.md index 9bd7c2b1..4f51ff13 100644 --- a/docs/test_cases/t00019.md +++ b/docs/test_cases/t00019.md @@ -152,4 +152,4 @@ private: ``` ## Generated UML diagrams -![t00019_class](./t00019_class.png "Layercake pattern") +![t00019_class](./t00019_class.svg "Layercake pattern") diff --git a/docs/test_cases/t00019_class.png b/docs/test_cases/t00019_class.png deleted file mode 100644 index 2ae951a9..00000000 Binary files a/docs/test_cases/t00019_class.png and /dev/null differ diff --git a/docs/test_cases/t00019_class.svg b/docs/test_cases/t00019_class.svg new file mode 100644 index 00000000..df7cc06e --- /dev/null +++ b/docs/test_cases/t00019_class.svg @@ -0,0 +1,88 @@ +Layer2LowerLayerall_calls_count() const : intBaseBase() : void~Base() : voidm1() : intm2() : std::stringLayer1LowerLayerm1() : intm2() : std::stringLayer3LowerLayerm_m1_calls : intm_m2_calls : intm1() : intm2() : std::stringm1_calls() const : intm2_calls() const : intLayer3BaseLayer2Layer3<Base>Layer1Layer2<Layer3<Base>>Alayers : std::unique_ptr<Layer1<Layer2<Layer3<Base>>>>layers \ No newline at end of file diff --git a/docs/test_cases/t00020.md b/docs/test_cases/t00020.md index 7f0eb992..c5e36555 100644 --- a/docs/test_cases/t00020.md +++ b/docs/test_cases/t00020.md @@ -97,4 +97,4 @@ public: ``` ## Generated UML diagrams -![t00020_class](./t00020_class.png "Abstract factory pattern") +![t00020_class](./t00020_class.svg "Abstract factory pattern") diff --git a/docs/test_cases/t00020_class.png b/docs/test_cases/t00020_class.png deleted file mode 100644 index 6ec07dd2..00000000 Binary files a/docs/test_cases/t00020_class.png and /dev/null differ diff --git a/docs/test_cases/t00020_class.svg b/docs/test_cases/t00020_class.svg new file mode 100644 index 00000000..1da90c09 --- /dev/null +++ b/docs/test_cases/t00020_class.svg @@ -0,0 +1,93 @@ +ProductA~ProductA() : voidsell(int price) const = 0 : boolProductA1sell(int price) const : boolProductA2sell(int price) const : boolProductB~ProductB() : voidbuy(int price) const = 0 : boolProductB1buy(int price) const : boolProductB2buy(int price) const : boolAbstractFactorymake_a() const = 0 : std::unique_ptr<ProductA>make_b() const = 0 : std::unique_ptr<ProductB>Factory1make_a() const : std::unique_ptr<ProductA>make_b() const : std::unique_ptr<ProductB>Factory2make_a() const : std::unique_ptr<ProductA>make_b() const : std::unique_ptr<ProductB> \ No newline at end of file diff --git a/docs/test_cases/t00021.md b/docs/test_cases/t00021.md index 2218a661..b52976af 100644 --- a/docs/test_cases/t00021.md +++ b/docs/test_cases/t00021.md @@ -71,4 +71,4 @@ public: ``` ## Generated UML diagrams -![t00021_class](./t00021_class.png "Visitor pattern") +![t00021_class](./t00021_class.svg "Visitor pattern") diff --git a/docs/test_cases/t00021_class.png b/docs/test_cases/t00021_class.png deleted file mode 100644 index 046b3d28..00000000 Binary files a/docs/test_cases/t00021_class.png and /dev/null differ diff --git a/docs/test_cases/t00021_class.svg b/docs/test_cases/t00021_class.svg new file mode 100644 index 00000000..1f629d47 --- /dev/null +++ b/docs/test_cases/t00021_class.svg @@ -0,0 +1,94 @@ +Visitor~Visitor() : voidvisit_A(A const& item) const = 0 : voidvisit_B(B const& item) const = 0 : voidVisitor1visit_A(A const& item) const : voidvisit_B(B const& item) const : voidVisitor2visit_A(A const& item) const : voidvisit_B(B const& item) const : voidVisitor3visit_A(A const& item) const : voidvisit_B(B const& item) const : voidItem~Item() : voidaccept(Visitor const& visitor) const = 0 : voidAaccept(Visitor const& visitor) const : voidBaccept(Visitor const& visitor) const : void \ No newline at end of file diff --git a/docs/test_cases/t00022.md b/docs/test_cases/t00022.md index 15da0671..0dea7862 100644 --- a/docs/test_cases/t00022.md +++ b/docs/test_cases/t00022.md @@ -52,4 +52,4 @@ protected: ``` ## Generated UML diagrams -![t00022_class](./t00022_class.png "Template method pattern") +![t00022_class](./t00022_class.svg "Template method pattern") diff --git a/docs/test_cases/t00022_class.png b/docs/test_cases/t00022_class.png deleted file mode 100644 index a549aa9c..00000000 Binary files a/docs/test_cases/t00022_class.png and /dev/null differ diff --git a/docs/test_cases/t00022_class.svg b/docs/test_cases/t00022_class.svg new file mode 100644 index 00000000..5873724d --- /dev/null +++ b/docs/test_cases/t00022_class.svg @@ -0,0 +1,40 @@ +Atemplate_method() : voidmethod1() = 0 : voidmethod2() = 0 : voidA1method1() : voidmethod2() : voidA2method1() : voidmethod2() : void \ No newline at end of file diff --git a/docs/test_cases/t00023.md b/docs/test_cases/t00023.md index 606e7aa5..69f5d386 100644 --- a/docs/test_cases/t00023.md +++ b/docs/test_cases/t00023.md @@ -61,4 +61,4 @@ private: ``` ## Generated UML diagrams -![t00023_class](./t00023_class.png "Strategy pattern") +![t00023_class](./t00023_class.svg "Strategy pattern") diff --git a/docs/test_cases/t00023_class.png b/docs/test_cases/t00023_class.png deleted file mode 100644 index f72e5e6f..00000000 Binary files a/docs/test_cases/t00023_class.png and /dev/null differ diff --git a/docs/test_cases/t00023_class.svg b/docs/test_cases/t00023_class.svg new file mode 100644 index 00000000..d02daa66 --- /dev/null +++ b/docs/test_cases/t00023_class.svg @@ -0,0 +1,57 @@ +Strategy~Strategy() : voidalgorithm() = 0 : voidStrategyAalgorithm() : voidStrategyBalgorithm() : voidStrategyCalgorithm() : voidContextm_strategy : std::unique_ptr<Strategy>Context(std::unique_ptr<Strategy> strategy) : voidapply() : voidm_strategy \ No newline at end of file diff --git a/docs/test_cases/t00024.md b/docs/test_cases/t00024.md index 9d2b1248..869c08d9 100644 --- a/docs/test_cases/t00024.md +++ b/docs/test_cases/t00024.md @@ -60,4 +60,4 @@ private: ``` ## Generated UML diagrams -![t00024_class](./t00024_class.png "Proxy pattern") +![t00024_class](./t00024_class.svg "Proxy pattern") diff --git a/docs/test_cases/t00024_class.png b/docs/test_cases/t00024_class.png deleted file mode 100644 index e0f4592a..00000000 Binary files a/docs/test_cases/t00024_class.png and /dev/null differ diff --git a/docs/test_cases/t00024_class.svg b/docs/test_cases/t00024_class.svg new file mode 100644 index 00000000..fd27387a --- /dev/null +++ b/docs/test_cases/t00024_class.svg @@ -0,0 +1,55 @@ +Target~Target() : voidm1() = 0 : voidm2() = 0 : voidTarget1m1() : voidm2() : voidTarget2m1() : voidm2() : voidProxym_target : std::shared_ptr<Target>Proxy(std::shared_ptr<Target> target) : voidm1() : voidm2() : voidm_target \ No newline at end of file diff --git a/docs/test_cases/t00025.md b/docs/test_cases/t00025.md index de475cf1..abf16eed 100644 --- a/docs/test_cases/t00025.md +++ b/docs/test_cases/t00025.md @@ -58,4 +58,4 @@ public: ``` ## Generated UML diagrams -![t00025_class](./t00025_class.png "Template proxy pattern") +![t00025_class](./t00025_class.svg "Template proxy pattern") diff --git a/docs/test_cases/t00025_class.png b/docs/test_cases/t00025_class.png deleted file mode 100644 index 912b9393..00000000 Binary files a/docs/test_cases/t00025_class.png and /dev/null differ diff --git a/docs/test_cases/t00025_class.svg b/docs/test_cases/t00025_class.svg new file mode 100644 index 00000000..46cc96aa --- /dev/null +++ b/docs/test_cases/t00025_class.svg @@ -0,0 +1,66 @@ +Target1m1() : voidm2() : voidTarget2m1() : voidm2() : voidProxyTm_target : std::shared_ptr<T>Proxy(std::shared_ptr<T> target) : voidm1() : voidm2() : voidProxyTarget1ProxyTarget2ProxyHolderproxy1 : Proxy<Target1>proxy2 : Proxy<Target2>proxy1proxy2 \ No newline at end of file diff --git a/docs/test_cases/t00026.md b/docs/test_cases/t00026.md index f0012b02..3b31e67f 100644 --- a/docs/test_cases/t00026.md +++ b/docs/test_cases/t00026.md @@ -79,4 +79,4 @@ struct StringMemento { ``` ## Generated UML diagrams -![t00026_class](./t00026_class.png "Template memento pattern") +![t00026_class](./t00026_class.svg "Template memento pattern") diff --git a/docs/test_cases/t00026_class.png b/docs/test_cases/t00026_class.png deleted file mode 100644 index 8a368706..00000000 Binary files a/docs/test_cases/t00026_class.png and /dev/null differ diff --git a/docs/test_cases/t00026_class.svg b/docs/test_cases/t00026_class.svg new file mode 100644 index 00000000..ea464872 --- /dev/null +++ b/docs/test_cases/t00026_class.svg @@ -0,0 +1,72 @@ +MementoTm_value : TMemento(T&& v) : voidvalue() const : TOriginatorTm_value : TOriginator(T&& v) : voidmemoize_value() const : Memento<T>load(Memento<T> const& m) : voidprint() const : voidset(T&& v) : voidCaretakerTm_mementos : std::unordered_map<std::string,Memento<T>>state(std::string const& n) : Memento<T>&set_state(std::string const& s, Memento<T>&& m) : voidCaretakerstd::stringOriginatorstd::stringStringMementocaretaker : Caretaker<std::string>originator : Originator<std::string>m_mementoscaretakeroriginator \ No newline at end of file diff --git a/docs/test_cases/t00027.md b/docs/test_cases/t00027.md index 7b9c36a9..2c2bb38c 100644 --- a/docs/test_cases/t00027.md +++ b/docs/test_cases/t00027.md @@ -76,4 +76,4 @@ struct Window { ``` ## Generated UML diagrams -![t00027_class](./t00027_class.png "Template decorator pattern") +![t00027_class](./t00027_class.svg "Template decorator pattern") diff --git a/docs/test_cases/t00027_class.png b/docs/test_cases/t00027_class.png deleted file mode 100644 index 63d68bde..00000000 Binary files a/docs/test_cases/t00027_class.png and /dev/null differ diff --git a/docs/test_cases/t00027_class.svg b/docs/test_cases/t00027_class.svg new file mode 100644 index 00000000..2543f808 --- /dev/null +++ b/docs/test_cases/t00027_class.svg @@ -0,0 +1,104 @@ +Shapedisplay() = 0 : void~Shape() : voidLineT<>display() : voidTextT<>display() : voidShapeDecoratordisplay() = 0 : voidColorTdisplay() : voidWeightTdisplay() : voidLineColor,WeightLineColorTextColor,WeightTextColorWindowborder : Line<Color,Weight>divider : Line<Color>title : Text<Color,Weight>description : Text<Color>borderdividertitledescription \ No newline at end of file diff --git a/docs/test_cases/t00028.md b/docs/test_cases/t00028.md index b5300352..552e253d 100644 --- a/docs/test_cases/t00028.md +++ b/docs/test_cases/t00028.md @@ -82,4 +82,4 @@ class R { ``` ## Generated UML diagrams -![t00028_class](./t00028_class.png "PlantUML note decorator test case") +![t00028_class](./t00028_class.svg "PlantUML note decorator test case") diff --git a/docs/test_cases/t00028_class.png b/docs/test_cases/t00028_class.png deleted file mode 100644 index 00159de8..00000000 Binary files a/docs/test_cases/t00028_class.png and /dev/null differ diff --git a/docs/test_cases/t00028_class.svg b/docs/test_cases/t00028_class.svg new file mode 100644 index 00000000..5c0eb476 --- /dev/null +++ b/docs/test_cases/t00028_class.svg @@ -0,0 +1,132 @@ +AA class note.A class note.BB class note.B class note.CC class note.C class note.DDclassnote.Dclassnote.ETparam : TE template class note.GFonetwothreeF enum note.F enum note.EintRaaa : Abbb : B*ccc : C&ddd : std::vector<std::shared_ptr<D>>eee : E<int>ggg : G**R(C& c) : voidR class note.R class note.cccaaabbbdddeeeggg \ No newline at end of file diff --git a/docs/test_cases/t00029.md b/docs/test_cases/t00029.md index e3bc3974..0a30ae14 100644 --- a/docs/test_cases/t00029.md +++ b/docs/test_cases/t00029.md @@ -74,4 +74,4 @@ struct R { ``` ## Generated UML diagrams -![t00029_class](./t00029_class.png "PlantUML skip decorator test case") +![t00029_class](./t00029_class.svg "PlantUML skip decorator test case") diff --git a/docs/test_cases/t00029_class.png b/docs/test_cases/t00029_class.png deleted file mode 100644 index 3f177d7a..00000000 Binary files a/docs/test_cases/t00029_class.png and /dev/null differ diff --git a/docs/test_cases/t00029_class.svg b/docs/test_cases/t00029_class.svg new file mode 100644 index 00000000..25d2a42d --- /dev/null +++ b/docs/test_cases/t00029_class.svg @@ -0,0 +1,69 @@ +ACTparam : TEonetwothreeG1G2G3G4Rg1 : G1g3 : G3&g4 : std::shared_ptr<G4>g1g4 \ No newline at end of file diff --git a/docs/test_cases/t00030.md b/docs/test_cases/t00030.md index d8634e82..46b3717c 100644 --- a/docs/test_cases/t00030.md +++ b/docs/test_cases/t00030.md @@ -55,4 +55,4 @@ struct R { ``` ## Generated UML diagrams -![t00030_class](./t00030_class.png "PlantUML relationship decorators test case") +![t00030_class](./t00030_class.svg "PlantUML relationship decorators test case") diff --git a/docs/test_cases/t00030_class.png b/docs/test_cases/t00030_class.png deleted file mode 100644 index 366010e9..00000000 Binary files a/docs/test_cases/t00030_class.png and /dev/null differ diff --git a/docs/test_cases/t00030_class.svg b/docs/test_cases/t00030_class.svg new file mode 100644 index 00000000..976a41e6 --- /dev/null +++ b/docs/test_cases/t00030_class.svg @@ -0,0 +1,51 @@ +ABCDRaaa : Abbb : std::vector<B>ccc : std::vector<C>ddd : Daaabbb0..11..*ccc0..11..5ddd1 \ No newline at end of file diff --git a/docs/test_cases/t00031.md b/docs/test_cases/t00031.md index 6bbd1027..a2d138d3 100644 --- a/docs/test_cases/t00031.md +++ b/docs/test_cases/t00031.md @@ -59,4 +59,4 @@ struct R { ``` ## Generated UML diagrams -![t00031_class](./t00031_class.png "PlantUML style decorator test case") +![t00031_class](./t00031_class.svg "PlantUML style decorator test case") diff --git a/docs/test_cases/t00031_class.png b/docs/test_cases/t00031_class.png deleted file mode 100644 index 0884451b..00000000 Binary files a/docs/test_cases/t00031_class.png and /dev/null differ diff --git a/docs/test_cases/t00031_class.svg b/docs/test_cases/t00031_class.svg new file mode 100644 index 00000000..3909606d --- /dev/null +++ b/docs/test_cases/t00031_class.svg @@ -0,0 +1,62 @@ +ABonetwothreeCTttt : TDCintRaaa : A*bbb : std::vector<B>ccc : C<int>ddd : D*aaabbbcccddd \ No newline at end of file diff --git a/docs/test_cases/t00032.md b/docs/test_cases/t00032.md index 839b10c7..d0e3c147 100644 --- a/docs/test_cases/t00032.md +++ b/docs/test_cases/t00032.md @@ -59,4 +59,4 @@ struct R { ``` ## Generated UML diagrams -![t00032_class](./t00032_class.png "Class template with template base classes test case") +![t00032_class](./t00032_class.svg "Class template with template base classes test case") diff --git a/docs/test_cases/t00032_class.png b/docs/test_cases/t00032_class.png deleted file mode 100644 index f985cf2b..00000000 Binary files a/docs/test_cases/t00032_class.png and /dev/null differ diff --git a/docs/test_cases/t00032_class.svg b/docs/test_cases/t00032_class.svg new file mode 100644 index 00000000..583ad19e --- /dev/null +++ b/docs/test_cases/t00032_class.svg @@ -0,0 +1,81 @@ +BaseTBaseAoperator()() : voidBoperator()() : voidCoperator()() : voidOverloadT,L,Ts...counter : LOverloadTBase,int,A,B,CRoverload : Overload<TBase,int,A,B,C>overload \ No newline at end of file diff --git a/docs/test_cases/t00033.md b/docs/test_cases/t00033.md index e1c0d073..800398db 100644 --- a/docs/test_cases/t00033.md +++ b/docs/test_cases/t00033.md @@ -49,4 +49,4 @@ struct R { ``` ## Generated UML diagrams -![t00033_class](./t00033_class.png "Nested template instantiation dependency test case") +![t00033_class](./t00033_class.svg "Nested template instantiation dependency test case") diff --git a/docs/test_cases/t00033_class.png b/docs/test_cases/t00033_class.png deleted file mode 100644 index 2ede2d79..00000000 Binary files a/docs/test_cases/t00033_class.png and /dev/null differ diff --git a/docs/test_cases/t00033_class.svg b/docs/test_cases/t00033_class.svg new file mode 100644 index 00000000..302f6c6d --- /dev/null +++ b/docs/test_cases/t00033_class.svg @@ -0,0 +1,73 @@ +ATaaa : TBTbbb : TCTccc : TDddd : intCDBstd::unique_ptr<C<D>>AB<std::unique_ptr<C<D>>>Rabc : A<B<std::unique_ptr<C<D>>>>abc \ No newline at end of file diff --git a/docs/test_cases/t00034.md b/docs/test_cases/t00034.md index f84c3888..1583a524 100644 --- a/docs/test_cases/t00034.md +++ b/docs/test_cases/t00034.md @@ -76,4 +76,4 @@ struct R { ``` ## Generated UML diagrams -![t00034_class](./t00034_class.png "Template metaprogramming type function test case") +![t00034_class](./t00034_class.svg "Template metaprogramming type function test case") diff --git a/docs/test_cases/t00034_class.png b/docs/test_cases/t00034_class.png deleted file mode 100644 index bd8616ae..00000000 Binary files a/docs/test_cases/t00034_class.png and /dev/null differ diff --git a/docs/test_cases/t00034_class.svg b/docs/test_cases/t00034_class.svg new file mode 100644 index 00000000..bd902f1a --- /dev/null +++ b/docs/test_cases/t00034_class.svg @@ -0,0 +1,59 @@ +Voidoperator==(Void const& ) const : booloperator!=(Void const& ) const : boollift_voidTlift_voidvoiddrop_voidTdrop_voidVoidARla : lift_void_t<A>*lv : lift_void_t<void>*la \ No newline at end of file diff --git a/docs/test_cases/t00035.md b/docs/test_cases/t00035.md index e803b114..ccb636bc 100644 --- a/docs/test_cases/t00035.md +++ b/docs/test_cases/t00035.md @@ -47,4 +47,4 @@ struct Right { ``` ## Generated UML diagrams -![t00035_class](./t00035_class.png "PlantUML class diagram layout hints test case") +![t00035_class](./t00035_class.svg "PlantUML class diagram layout hints test case") diff --git a/docs/test_cases/t00035_class.png b/docs/test_cases/t00035_class.png deleted file mode 100644 index b172e543..00000000 Binary files a/docs/test_cases/t00035_class.png and /dev/null differ diff --git a/docs/test_cases/t00035_class.svg b/docs/test_cases/t00035_class.svg new file mode 100644 index 00000000..a61b7500 --- /dev/null +++ b/docs/test_cases/t00035_class.svg @@ -0,0 +1,47 @@ +TopLeftCenterBottomRight \ No newline at end of file diff --git a/docs/test_cases/t00036.md b/docs/test_cases/t00036.md index 6a9947ce..9d8250b1 100644 --- a/docs/test_cases/t00036.md +++ b/docs/test_cases/t00036.md @@ -54,4 +54,4 @@ struct C; ``` ## Generated UML diagrams -![t00036_class](./t00036_class.png "Class diagram with namespaces generated as packages") +![t00036_class](./t00036_class.svg "Class diagram with namespaces generated as packages") diff --git a/docs/test_cases/t00036_class.png b/docs/test_cases/t00036_class.png deleted file mode 100644 index 8f95c3c8..00000000 Binary files a/docs/test_cases/t00036_class.png and /dev/null differ diff --git a/docs/test_cases/t00036_class.svg b/docs/test_cases/t00036_class.svg new file mode 100644 index 00000000..cab52ab5 --- /dev/null +++ b/docs/test_cases/t00036_class.svg @@ -0,0 +1,59 @@ +ns1ns11ns111ns2ns22EblueyellowATa : TAintBa_int : A<int>Ca_int \ No newline at end of file diff --git a/docs/test_cases/t20001.md b/docs/test_cases/t20001.md index 2fc889bd..0a522af6 100644 --- a/docs/test_cases/t20001.md +++ b/docs/test_cases/t20001.md @@ -101,4 +101,4 @@ int tmain() ``` ## Generated UML diagrams -![t20001_sequence](./t20001_sequence.png "Basic sequence diagram test case") +![t20001_sequence](./t20001_sequence.svg "Basic sequence diagram test case") diff --git a/docs/test_cases/t20001_sequence.png b/docs/test_cases/t20001_sequence.png deleted file mode 100644 index e9595008..00000000 Binary files a/docs/test_cases/t20001_sequence.png and /dev/null differ diff --git a/docs/test_cases/t20001_sequence.svg b/docs/test_cases/t20001_sequence.svg new file mode 100644 index 00000000..8253e215 --- /dev/null +++ b/docs/test_cases/t20001_sequence.svg @@ -0,0 +1,32 @@ +tmain()tmain()BBAAwrap_add3()add3()add()log_result()log_result()Main test function \ No newline at end of file diff --git a/docs/test_cases/t20002.md b/docs/test_cases/t20002.md index 6dcda520..65f8c51e 100644 --- a/docs/test_cases/t20002.md +++ b/docs/test_cases/t20002.md @@ -39,4 +39,4 @@ void m1() { m2(); } ``` ## Generated UML diagrams -![t20002_sequence](./t20002_sequence.png "Free function sequence diagram test case") +![t20002_sequence](./t20002_sequence.svg "Free function sequence diagram test case") diff --git a/docs/test_cases/t20002_sequence.png b/docs/test_cases/t20002_sequence.png deleted file mode 100644 index cc5f2e5d..00000000 Binary files a/docs/test_cases/t20002_sequence.png and /dev/null differ diff --git a/docs/test_cases/t20002_sequence.svg b/docs/test_cases/t20002_sequence.svg new file mode 100644 index 00000000..e316b7f8 --- /dev/null +++ b/docs/test_cases/t20002_sequence.svg @@ -0,0 +1,23 @@ +m1()m1()m2()m2()m3()m3()m4()m4()m2()m3()m4() \ No newline at end of file diff --git a/docs/test_cases/t30001.md b/docs/test_cases/t30001.md index 87bf01a4..929c72f6 100644 --- a/docs/test_cases/t30001.md +++ b/docs/test_cases/t30001.md @@ -52,4 +52,4 @@ namespace BB { ``` ## Generated UML diagrams -![t30001_package](./t30001_package.png "Basic package diagram test case") +![t30001_package](./t30001_package.svg "Basic package diagram test case") diff --git a/docs/test_cases/t30001_package.png b/docs/test_cases/t30001_package.png deleted file mode 100644 index 31b48ded..00000000 Binary files a/docs/test_cases/t30001_package.png and /dev/null differ diff --git a/docs/test_cases/t30001_package.svg b/docs/test_cases/t30001_package.svg new file mode 100644 index 00000000..0c8ff2b3 --- /dev/null +++ b/docs/test_cases/t30001_package.svg @@ -0,0 +1,44 @@ +AAABAAAAABBBBBAAABBBBBA AAA note... \ No newline at end of file diff --git a/docs/test_cases/t30002.md b/docs/test_cases/t30002.md index 74bf0e6c..79f6a15f 100644 --- a/docs/test_cases/t30002.md +++ b/docs/test_cases/t30002.md @@ -124,4 +124,4 @@ template std::map> cm() ``` ## Generated UML diagrams -![t30002_package](./t30002_package.png "Package dependency test case") +![t30002_package](./t30002_package.svg "Package dependency test case") diff --git a/docs/test_cases/t30002_package.png b/docs/test_cases/t30002_package.png deleted file mode 100644 index d5fc7e57..00000000 Binary files a/docs/test_cases/t30002_package.png and /dev/null differ diff --git a/docs/test_cases/t30002_package.svg b/docs/test_cases/t30002_package.svg new file mode 100644 index 00000000..0d93ba2b --- /dev/null +++ b/docs/test_cases/t30002_package.svg @@ -0,0 +1,84 @@ +AAABBBA1A2A3A4A5A6A7A8A9A10A11A12A13BBB \ No newline at end of file diff --git a/docs/test_cases/t30003.md b/docs/test_cases/t30003.md index 6503e30e..66d81934 100644 --- a/docs/test_cases/t30003.md +++ b/docs/test_cases/t30003.md @@ -54,4 +54,4 @@ class B : public ns1::ns2::Anon { } ``` ## Generated UML diagrams -![t30003_package](./t30003_package.png "Package deprecated attribute test case") +![t30003_package](./t30003_package.svg "Package deprecated attribute test case") diff --git a/docs/test_cases/t30003_package.png b/docs/test_cases/t30003_package.png deleted file mode 100644 index 35b17732..00000000 Binary files a/docs/test_cases/t30003_package.png and /dev/null differ diff --git a/docs/test_cases/t30003_package.svg b/docs/test_cases/t30003_package.svg new file mode 100644 index 00000000..d76032cf --- /dev/null +++ b/docs/test_cases/t30003_package.svg @@ -0,0 +1,35 @@ +ns1ns3«deprecated»ns1ns2_v1_0_0ns2_v0_9_0«deprecated»ns2 \ No newline at end of file diff --git a/docs/test_cases/t30004.md b/docs/test_cases/t30004.md index a4d84685..df36dab7 100644 --- a/docs/test_cases/t30004.md +++ b/docs/test_cases/t30004.md @@ -57,4 +57,4 @@ namespace CCC { } ``` ## Generated UML diagrams -![t30004_package](./t30004_package.png "PlantUML package decorators test case") +![t30004_package](./t30004_package.svg "PlantUML package decorators test case") diff --git a/docs/test_cases/t30004_package.png b/docs/test_cases/t30004_package.png deleted file mode 100644 index 3c55a308..00000000 Binary files a/docs/test_cases/t30004_package.png and /dev/null differ diff --git a/docs/test_cases/t30004_package.svg b/docs/test_cases/t30004_package.svg new file mode 100644 index 00000000..9ba5ea69 --- /dev/null +++ b/docs/test_cases/t30004_package.svg @@ -0,0 +1,47 @@ +APackage AAA.Package BBB.CCCC package note.Another CCC note.We skipped DDD.AAABBBCCCEEE \ No newline at end of file diff --git a/docs/test_cases/t30005.md b/docs/test_cases/t30005.md index 61b41d4e..1c9e5d32 100644 --- a/docs/test_cases/t30005.md +++ b/docs/test_cases/t30005.md @@ -50,4 +50,4 @@ struct C2 { ``` ## Generated UML diagrams -![t30005_package](./t30005_package.png "Package namespace alias test case") +![t30005_package](./t30005_package.svg "Package namespace alias test case") diff --git a/docs/test_cases/t30005_package.png b/docs/test_cases/t30005_package.png deleted file mode 100644 index 42d4066e..00000000 Binary files a/docs/test_cases/t30005_package.png and /dev/null differ diff --git a/docs/test_cases/t30005_package.svg b/docs/test_cases/t30005_package.svg new file mode 100644 index 00000000..37132e8d --- /dev/null +++ b/docs/test_cases/t30005_package.svg @@ -0,0 +1,48 @@ +AAABBBCCCAAABBBCCC \ No newline at end of file diff --git a/docs/test_cases/t30006.md b/docs/test_cases/t30006.md index 46d9d432..0db35247 100644 --- a/docs/test_cases/t30006.md +++ b/docs/test_cases/t30006.md @@ -51,4 +51,4 @@ struct A2 { } ``` ## Generated UML diagrams -![t30006_package](./t30006_package.png "Package split namespace test case") +![t30006_package](./t30006_package.svg "Package split namespace test case") diff --git a/docs/test_cases/t30006_package.png b/docs/test_cases/t30006_package.png deleted file mode 100644 index f015546a..00000000 Binary files a/docs/test_cases/t30006_package.png and /dev/null differ diff --git a/docs/test_cases/t30006_package.svg b/docs/test_cases/t30006_package.svg new file mode 100644 index 00000000..095ff054 --- /dev/null +++ b/docs/test_cases/t30006_package.svg @@ -0,0 +1,38 @@ +BACTop A note.Bottom A note. \ No newline at end of file diff --git a/docs/test_cases/t30007.md b/docs/test_cases/t30007.md index b2af19b5..3c128fb2 100644 --- a/docs/test_cases/t30007.md +++ b/docs/test_cases/t30007.md @@ -59,4 +59,4 @@ struct A2 { } ``` ## Generated UML diagrams -![t30007_package](./t30007_package.png "Package diagram layout hints test case") +![t30007_package](./t30007_package.svg "Package diagram layout hints test case") diff --git a/docs/test_cases/t30007_package.png b/docs/test_cases/t30007_package.png deleted file mode 100644 index fab55077..00000000 Binary files a/docs/test_cases/t30007_package.png and /dev/null differ diff --git a/docs/test_cases/t30007_package.svg b/docs/test_cases/t30007_package.svg new file mode 100644 index 00000000..9f383f50 --- /dev/null +++ b/docs/test_cases/t30007_package.svg @@ -0,0 +1,45 @@ +ABAACCompare layout with t30006.Bottom A note. \ No newline at end of file diff --git a/docs/test_cases/t90000.md b/docs/test_cases/t90000.md index fa9c39a7..47496b72 100644 --- a/docs/test_cases/t90000.md +++ b/docs/test_cases/t90000.md @@ -29,4 +29,4 @@ File t90000.cc ``` ## Generated UML diagrams -![t90000_class](./t90000_class.png "Basic config test") +![t90000_class](./t90000_class.svg "Basic config test") diff --git a/docs/test_cases/t90000_class.png b/docs/test_cases/t90000_class.png deleted file mode 100644 index a4703d4b..00000000 Binary files a/docs/test_cases/t90000_class.png and /dev/null differ diff --git a/docs/test_cases/t90000_class.svg b/docs/test_cases/t90000_class.svg new file mode 100644 index 00000000..a5beec6d --- /dev/null +++ b/docs/test_cases/t90000_class.svg @@ -0,0 +1,33 @@ +Fooint valueArrayListThis is a very important class.This is afloating noteThis note is connectedto several objects.Boo \ No newline at end of file diff --git a/util/generate_test_cases_docs.py b/util/generate_test_cases_docs.py index c3b61eb2..e64c494e 100755 --- a/util/generate_test_cases_docs.py +++ b/util/generate_test_cases_docs.py @@ -22,50 +22,49 @@ import os import yaml from shutil import copyfile + with open(r'tests/test_cases.yaml') as f: test_groups = yaml.full_load(f)['test_cases'] # Generate test_cases.md index with open(r'docs/test_cases.md', 'w') as tc_index: - tc_index.write("# Test cases index\n") + tc_index.write('# Test cases index\n') for test_group, test_cases in test_groups.items(): - tc_index.write("## {}\n".format(test_group)) + tc_index.write(f'## {test_group}\n') for test_case in test_cases: - tc_index.write(" * [{0}](./test_cases/{0}.md) - {1}\n".format( - test_case['name'], test_case['title'])) + tc_index.write(f' * [{test_case["name"]}](./test_cases/{test_case["name"]}.md) - {test_case["title"]}\n') # Generate invididual documentation docs for test_group, test_cases in test_groups.items(): for test_case in test_cases: name = test_case['name'] - with open(r'docs/test_cases/{}.md'.format(name), 'w') as tc: - tc.write("# {} - {}\n".format(name, test_case['title'])) + with open(f'docs/test_cases/{name}.md', 'w') as tc: + tc.write(f'# {name} - {test_case["title"]}\n') # Write out test description if test_case['description']: - tc.write("{}\n".format(test_case['description'])) + tc.write(f'{test_case["description"]}\n') # Write test config file - config = open('tests/{0}/.clang-uml'.format(name), 'r').read() + config = open(f'tests/{name}/.clang-uml', 'r').read() tc.write("## Config\n") tc.write("```yaml\n") tc.write(config) tc.write("\n```\n") tc.write("## Source code\n") - for source_file in os.listdir("tests/{0}/".format(name)): + for source_file in os.listdir(f'tests/{name}/'): if source_file.endswith(".h") or source_file.endswith(".cc"): if source_file == "test_case.h": continue - tc.write("File {}\n".format(source_file)) + tc.write(f'File {source_file}\n') tc.write("```cpp\n") - tc.write(open('tests/{0}/{1}'.format(name, source_file), 'r').read()) + tc.write(open(f'tests/{name}/{source_file}', 'r').read()) tc.write("\n```\n") # Copy and link the diagram image config_dict = yaml.full_load(config) tc.write("## Generated UML diagrams\n") for diagram_name, _ in config_dict['diagrams'].items(): - copyfile('debug/tests/puml/{}.png'.format(diagram_name), - 'docs/test_cases/{}.png'.format(diagram_name)) - tc.write("![{0}](./{0}.png \"{1}\")\n".format( - diagram_name, test_case["title"])) + copyfile(f'debug/tests/puml/{diagram_name}.svg', + f'docs/test_cases/{diagram_name}.svg') + tc.write(f'![{diagram_name}](./{diagram_name}.svg "{test_case["title"]}")\n')