From 707b6e5bfbf57e07bf0af2fb52f894e12e57793f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Dornier?= <remy.dornier@epfl.ch>
Date: Thu, 10 Oct 2024 11:18:07 +0200
Subject: [PATCH 1/2] round zoom value label in pdf export

---
 .idea/workspace.xml                           | 44 +++++++++++++++++++
 .../omero/figure_scripts/Figure_To_Pdf.py     |  6 ++-
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 .idea/workspace.xml

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 000000000..1cc0ab050
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="0ae482ab-2dc7-41fb-bc84-5874c84d662b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py" beforeDir="false" afterPath="$PROJECT_DIR$/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
+  <component name="ProjectId" id="2lY6Lw7dDeTF8DiRrGKBI5koFnZ" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">{
+  &quot;keyToString&quot;: {
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
+    &quot;last_opened_file_path&quot;: &quot;D:/Remy/Github-projects/omero-figure&quot;
+  }
+}</component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="0ae482ab-2dc7-41fb-bc84-5874c84d662b" name="Changes" comment="" />
+      <created>1725344610938</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1725344610938</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
index cec8edb8a..a997b46b8 100644
--- a/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
+++ b/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py
@@ -1309,7 +1309,11 @@ def draw_labels(self, panel, page):
                     label_value = " ".join(label_value)
 
                 elif prop_nf[0] in ["zoom"]:
-                    label_value = str(panel["zoom"]) + " %"
+                    try:
+                        zoom = round(panel["zoom"])
+                    except Exception:
+                        zoom = panel["zoom"]
+                    label_value = str(zoom) + " %"
                 new_text.append(label_value if label_value else item.group())
                 last_idx = item.end()
 

From 9fed41cb18241e8787148a0224e805c0573e83c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Dornier?= <remy.dornier@epfl.ch>
Date: Thu, 10 Oct 2024 11:19:45 +0200
Subject: [PATCH 2/2] update gitignore

---
 .gitignore          |  2 ++
 .idea/workspace.xml | 44 --------------------------------------------
 2 files changed, 2 insertions(+), 44 deletions(-)
 delete mode 100644 .idea/workspace.xml

diff --git a/.gitignore b/.gitignore
index 661c9605a..69f8c16e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ dist
 omero_figure.egg-info
 omero_figure/templates/
 omero_figure/static/
+.vscode
+.idea
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 1cc0ab050..000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AutoImportSettings">
-    <option name="autoReloadType" value="SELECTIVE" />
-  </component>
-  <component name="ChangeListManager">
-    <list default="true" id="0ae482ab-2dc7-41fb-bc84-5874c84d662b" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py" beforeDir="false" afterPath="$PROJECT_DIR$/omero_figure/scripts/omero/figure_scripts/Figure_To_Pdf.py" afterDir="false" />
-    </list>
-    <option name="SHOW_DIALOG" value="false" />
-    <option name="HIGHLIGHT_CONFLICTS" value="true" />
-    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
-    <option name="LAST_RESOLUTION" value="IGNORE" />
-  </component>
-  <component name="Git.Settings">
-    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-  </component>
-  <component name="MarkdownSettingsMigration">
-    <option name="stateVersion" value="1" />
-  </component>
-  <component name="ProjectId" id="2lY6Lw7dDeTF8DiRrGKBI5koFnZ" />
-  <component name="ProjectViewState">
-    <option name="hideEmptyMiddlePackages" value="true" />
-    <option name="showLibraryContents" value="true" />
-  </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;D:/Remy/Github-projects/omero-figure&quot;
-  }
-}</component>
-  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
-  <component name="TaskManager">
-    <task active="true" id="Default" summary="Default task">
-      <changelist id="0ae482ab-2dc7-41fb-bc84-5874c84d662b" name="Changes" comment="" />
-      <created>1725344610938</created>
-      <option name="number" value="Default" />
-      <option name="presentableId" value="Default" />
-      <updated>1725344610938</updated>
-    </task>
-    <servers />
-  </component>
-</project>
\ No newline at end of file