From 34c8f68e07f07cd124b395d4d05dd2c888e7b1fc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 22 Nov 2018 08:38:13 +0000
Subject: [PATCH] Dec formatting redefined
---
aoi_gen/Variable.py | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/aoi_gen/Variable.py b/aoi_gen/Variable.py
index 4c7c63b..0777143 100644
--- a/aoi_gen/Variable.py
+++ b/aoi_gen/Variable.py
@@ -127,13 +127,36 @@
except TypeError:
raise ValueError
+ num=float(("{:."+str(self.precision-1)+"e}").format(num))
+ places=self.fexp(num)
+
+ if(places>0):
+ decimal_places=self.precision-places-1
+ if(decimal_places<0):
+ decimal_places=0
+ format_str="{:"+str(places)+"."+str(decimal_places)+"f}"
+ else:
+ format_str="{:."+str(self.precision)+"f}"
return (
- ("{:." + str(self.precision - 1) + "f}").format(num).replace(".", ",\!")
+
+ format_str.format(num).replace(".", ",\!")
)
def getValue(self, num):
- val = ("{:." + str(self.precision - 1) + "f}").format(num)
+
+
+ num=float(("{:."+str(self.precision-1)+"e}").format(num))
+ places=self.fexp(num)
+
+ if(places>0):
+ decimal_places=self.precision-places-1
+ if(decimal_places<0):
+ decimal_places=0
+ format_str="{:"+str(places)+"."+str(decimal_places)+"f}"
+ else:
+ format_str="{:."+str(self.precision)+"f}"
+ val=format_str.format(num)
return float(val)
--
Gitblit v1.8.0