V.0.2.0 dev branch

.gitignore

@@ -41,7 +41,9 @@ reference/
 pwk.py
 pwk_roadmap.png
 temp/
-*.png
+src/*.png
+src/test/*.png
+.VSCodeCounter/
 
 # C extensions
 *.so

pyproject.toml

@@ -1,4 +1,3 @@
 [build-system]
 requires = ["setuptools"]
 build-backend = "setuptools.build_meta"
-

setup.cfg

@@ -1,22 +1,22 @@
 [metadata]
 name = roadmapper
-version = 0.1.1
+version = 0.2.0
 authors = CS Goh
 description = Roadmapper. A Roadmap-as-Code (RaC) tool for generating a roadmap by using python code
 long_description = file: README.md
 long_description_content_type = text/markdown
 readme = README.md
 requires-python = ">=3.10"
 classifiers = 
-    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.10
     License :: OSI Approved :: MIT License
     Operating System :: OS Independent
+    Development Status :: 5 - Production/Stable
 
 
 [options]
 install_requires =
-    pycairo >= 1.21.0
-    colour >= 0.1.5
+    Pillow >= 9.3.0
     python-dateutil >= 2.8.2
 package_dir =
     =src

src/demo.py

@@ -110,16 +110,22 @@ def demo03(
 
 def colour_theme_demo(
     mode: TimelineMode = TimelineMode.MONTHLY,
-    start_date: str = "2022-11-01",
+    start_date: str = "2022-12-01",
     number_of_items: int = 12,
+    show_generic_dates: bool = False,
     file_name: str = "demo01.png",
     colour_theme: str = "DEFAULT",
 ) -> None:
-    roadmap = Roadmap(1200, 512, colour_theme=colour_theme, show_marker=True)
-    roadmap.set_title("My Demo Roadmap!!!")
-    roadmap.set_timeline(mode, start_date, number_of_items)
+    roadmap = Roadmap(
+        1200, 1000, auto_height=True, colour_theme=colour_theme, show_marker=True
+    )
+    roadmap.set_title("SAMPLE ROADMAP 2022/2023")
+    roadmap.set_subtitle("ABC Corporation")
+    roadmap.set_timeline(
+        mode, start_date, number_of_items, show_generic_dates=show_generic_dates
+    )
 
-    group = roadmap.add_group("Core Product Work Stream")
+    group = roadmap.add_group("Core Product Work Stream", text_alignment="left")
     task = group.add_task("Base Functionality", "2022-11-01", "2023-10-31")
     task.add_milestone("v.1.0", "2023-02-15")
     task.add_milestone("v.1.1", "2023-08-01")
@@ -129,11 +135,12 @@ def colour_theme_demo(
     task = group.add_task("Showcase #1", "2023-03-01", "2023-05-07")
     task.add_parallel_task("Showcase #2", "2023-06-01", "2023-08-07")
 
-    group = roadmap.add_group("Mobility Work Stream")
+    group = roadmap.add_group("Mobility Work Stream", text_alignment="left")
     group.add_task("Mobile App Development", "2023-02-01", "2024-12-07")
 
-    roadmap.set_footer("Generated by Roadmapper")
+    roadmap.set_footer("Updated on " + datetime.now().strftime("%Y-%m-%d"))
     roadmap.draw()
+
     roadmap.save(file_name)
 
 
@@ -145,7 +152,7 @@ def generic_date_test(
     file_name: str = "demo01.png",
     colour_theme: str = "DEFAULT",
 ) -> None:
-    roadmap = Roadmap(4400, 512, colour_theme=colour_theme, show_marker=True)
+    roadmap = Roadmap(4400, 2000, colour_theme=colour_theme, show_marker=True)
     roadmap.set_title("My Demo Roadmap!!!")
     roadmap.set_timeline(
         mode, start_date, number_of_items, show_generic_dates=show_generic_dates
@@ -169,62 +176,153 @@ def generic_date_test(
     roadmap.save(file_name)
 
 
-# demo01(file_name="demo01.png")
-# demo01(TimelineMode.WEEKLY, "2023-02-01", 16, "demo02.png")
-# demo01(TimelineMode.QUARTERLY, "2023-02-01", 4, "demo03.png")
-# demo01(TimelineMode.HALF_YEARLY, "2023-02-01", 3, "demo04.png")
-# demo01(TimelineMode.YEARLY, "2023-02-01", 2, "demo05.png")
+def parallel_task_demo(
+    mode: TimelineMode = TimelineMode.MONTHLY,
+    start_date: str = "2022-12-01",
+    number_of_items: int = 14,
+    file_name: str = "demo01.png",
+    colour_theme: str = "DEFAULT",
+) -> None:
+    roadmap = Roadmap(
+        1200,
+        612,
+        auto_height=False,
+        colour_theme=colour_theme,
+        show_marker=True,
+    )
+    roadmap.set_title("ROADMAP EXAMPLE 2022/2023")
+    roadmap.set_subtitle("This is a subtitle")
+    roadmap.set_timeline(
+        mode,
+        start_date,
+        number_of_items,
+        show_generic_dates=False,
+    )
+
+    group = roadmap.add_group("TBCore Product Work Stream")
+
+    task = group.add_task("Base Functionality", "2022-11-01", "2023-01-31")
+    parellel_task = task.add_parallel_task("Enhancements", "2023-02-15", "2024-03-31")
+    parellel_task.add_milestone("v.2.0", "2023-04-30")
+
+    task = group.add_task("Showcase #1", "2023-01-01", "2023-01-31")
+    parellel_task = task.add_parallel_task("Showcase #2", "2023-02-02", "2023-03-15")
+    parellel_task.add_milestone("v.2.0", "2023-04-15")
+
+    roadmap.set_footer("Author: CS Goh " + datetime.now().strftime("%Y-%m-%d"))
+    roadmap.draw()
+    roadmap.save(file_name)
+
+
+# # demo01(file_name="demo01.png")
+# # demo01(TimelineMode.WEEKLY, "2023-02-01", 16, "demo02.png")
+# # demo01(TimelineMode.QUARTERLY, "2023-02-01", 4, "demo03.png")
+# # demo01(TimelineMode.HALF_YEARLY, "2023-02-01", 3, "demo04.png")
+# # demo01(TimelineMode.YEARLY, "2023-02-01", 2, "demo05.png")
 
-# demo02_barestyle(file_name="demo01.png")
-# demo02_barestyle(TimelineMode.WEEKLY, "2023-02-01", 16, "demo02.png")
-# demo02_barestyle(TimelineMode.QUARTERLY, "2023-02-01", 4, "demo03.png")
-# demo02_barestyle(TimelineMode.HALF_YEARLY, "2023-02-01", 3, "demo04.png")
-# demo02_barestyle(TimelineMode.YEARLY, "2023-02-01", 2, "demo05.png")
+# # demo02_barestyle(file_name="demo01.png")
+# # demo02_barestyle(TimelineMode.WEEKLY, "2023-02-01", 16, "demo02.png")
+# # demo02_barestyle(TimelineMode.QUARTERLY, "2023-02-01", 4, "demo03.png")
+# # demo02_barestyle(TimelineMode.HALF_YEARLY, "2023-02-01", 3, "demo04.png")
+# # demo02_barestyle(TimelineMode.YEARLY, "2023-02-01", 2, "demo05.png")
 
 # colour_theme_demo(file_name="demo-colour-default.png", colour_theme="DEFAULT")
 # colour_theme_demo(file_name="demo-colour-GREYWOOF.png", colour_theme="GREYWOOF")
 # colour_theme_demo(file_name="demo-colour-BLUEMOUNTAIN.png", colour_theme="BLUEMOUNTAIN")
 # colour_theme_demo(file_name="demo-colour-ORANGEPEEL.png", colour_theme="ORANGEPEEL")
 # colour_theme_demo(file_name="demo-colour-GREENTURTLE.png", colour_theme="GREENTURTLE")
 
-show_generic_dates = False
-
-generic_date_test(
-    file_name="demo-weekly.png",
-    mode=TimelineMode.WEEKLY,
-    start_date="2022-11-01",
-    number_of_items=55,
-    show_generic_dates=show_generic_dates,
-)
-
-generic_date_test(
-    file_name="demo-monthly.png",
-    mode=TimelineMode.MONTHLY,
-    start_date="2022-11-01",
-    number_of_items=55,
-    show_generic_dates=show_generic_dates,
-)
-
-generic_date_test(
-    file_name="demo-quarterly.png",
-    mode=TimelineMode.QUARTERLY,
-    start_date="2022-11-01",
-    number_of_items=55,
-    show_generic_dates=show_generic_dates,
-)
-
-generic_date_test(
-    file_name="demo-half-yearly.png",
-    mode=TimelineMode.HALF_YEARLY,
-    start_date="2022-11-01",
-    number_of_items=12,
-    show_generic_dates=show_generic_dates,
-)
-
-generic_date_test(
-    file_name="demo-yearly.png",
-    mode=TimelineMode.YEARLY,
-    start_date="2022-11-01",
-    number_of_items=12,
-    show_generic_dates=show_generic_dates,
-)
+show_generic_dates = True
+
+### Problematic test case - To check
+# colour_theme_demo(
+#     file_name="demo-colour-GREENTURTLE-weekly.png",
+#     colour_theme="GREENTURTLE",
+#     mode=TimelineMode.WEEKLY,
+#     number_of_items=53,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# colour_theme_demo(
+#     file_name="demo-colour-GREENTURTLE-monthly-gen.png",
+#     colour_theme="GREENTURTLE",
+#     mode=TimelineMode.MONTHLY,
+#     number_of_items=14,
+#     show_generic_dates=show_generic_dates,
+# )
+# show_generic_dates = False
+# colour_theme_demo(
+#     file_name="demo-colour-GREENTURTLE-monthly.png",
+#     colour_theme="GREENTURTLE",
+#     mode=TimelineMode.MONTHLY,
+#     number_of_items=14,
+#     show_generic_dates=show_generic_dates,
+# )
+# show_generic_dates = True
+# colour_theme_demo(
+#     file_name="demo-colour-GREENTURTLE-quarter.png",
+#     colour_theme="GREENTURTLE",
+#     mode=TimelineMode.QUARTERLY,
+#     number_of_items=6,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# colour_theme_demo(
+#     file_name="demo-colour-GREENTURTLE-halfyearly.png",
+#     colour_theme="GREENTURTLE",
+#     mode=TimelineMode.HALF_YEARLY,
+#     number_of_items=6,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# colour_theme_demo(
+#     file_name="demo-colour-GREENTURTLE-yearly.png",
+#     colour_theme="GREENTURTLE",
+#     mode=TimelineMode.YEARLY,
+#     number_of_items=4,
+#     show_generic_dates=show_generic_dates,
+# )
+
+
+# generic_date_test(
+#     file_name="demo-weekly.png",
+#     mode=TimelineMode.WEEKLY,
+#     start_date="2022-11-01",
+#     number_of_items=55,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# generic_date_test(
+#     file_name="demo-monthly.png",
+#     mode=TimelineMode.MONTHLY,
+#     start_date="2022-11-01",
+#     number_of_items=55,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# generic_date_test(
+#     file_name="demo-quarterly.png",
+#     mode=TimelineMode.QUARTERLY,
+#     start_date="2022-11-01",
+#     number_of_items=55,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# generic_date_test(
+#     file_name="demo-half-yearly.png",
+#     mode=TimelineMode.HALF_YEARLY,
+#     start_date="2022-11-01",
+#     number_of_items=12,
+#     show_generic_dates=show_generic_dates,
+# )
+
+# generic_date_test(
+#     file_name="demo-yearly.png",
+#     mode=TimelineMode.YEARLY,
+#     start_date="2022-11-01",
+#     number_of_items=12,
+#     show_generic_dates=show_generic_dates,
+# )
+
+
+parallel_task_demo(file_name="parallel-demo01.png")