From 9a6bc691cb0fa96d50a93e6bce60161a4fc6940d Mon Sep 17 00:00:00 2001
From: jaseg <git@jaseg.de>
Date: Tue, 21 Feb 2023 00:44:09 +0100
Subject: cli: Add merge command

---
 gerbonara/rs274x.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gerbonara/rs274x.py')

diff --git a/gerbonara/rs274x.py b/gerbonara/rs274x.py
index f770c51..3d28cc6 100644
--- a/gerbonara/rs274x.py
+++ b/gerbonara/rs274x.py
@@ -263,9 +263,11 @@ class GerberFile(CamFile):
         :rtype: str
         """
         if settings is None:
-            settings = self.import_settings.copy() or FileSettings()
-            settings.zeros = None
-            settings.number_format = (4,5) # up to 10m by 10m with 10nm resolution
+            if self.import_settings:
+                settings = self.import_settings.copy()
+                settings.zeros = None
+            else:
+                settings = FileSettings.defaults()
         return '\n'.join(self._generate_statements(settings, drop_comments=drop_comments)).encode('utf-8')
 
     def __len__(self):
-- 
cgit