changed custom scale input

src/blenderbim/blenderbim/bim/module/drawing/operator.py

@@ -189,7 +189,7 @@ class CreateDrawing(bpy.types.Operator):
                     self.cprops = self.camera.data.BIMCameraProperties
                     self.drawing_name = self.file.by_id(drawing_id).Name
                     self.metadata = tool.Drawing.get_drawing_metadata(self.camera_element)
-                    self.get_scale()
+                    self.get_scale(context)
                     if self.cprops.update_representation(self.camera):
                         bpy.ops.bim.update_representation(obj=self.camera.name, ifc_representation_class="")
 
@@ -939,13 +939,43 @@ class CreateDrawing(bpy.types.Operator):
 
         return svg_path
 
-    def get_scale(self):
+    def get_scale(self, context):
-        if self.camera.data.BIMCameraProperties.diagram_scale == "CUSTOM":
+        camera_props = self.camera.data.BIMCameraProperties
-            self.human_scale, fraction = self.camera.data.BIMCameraProperties.custom_diagram_scale.split("|")
+        if camera_props.diagram_scale == "CUSTOM":
-        else:
+            if context.scene.unit_settings.system == "IMPERIAL":
-            self.human_scale, fraction = self.camera.data.BIMCameraProperties.diagram_scale.split("|")
+                if camera_props.custom_diagram_scale_input1[-1] == "'" or camera_props.custom_diagram_scale_input1[-1] == "\"":
+                    camera_props.custom_diagram_scale_input1 = camera_props.custom_diagram_scale_input1[:-1]
+                if camera_props.custom_diagram_scale_input2[-1] == "'":
+                    camera_props.custom_diagram_scale_input2 = camera_props.custom_diagram_scale_input2[:-1]
+                if camera_props.custom_diagram_scale_input2[1:] == "'-0\"" or camera_props.custom_diagram_scale_input2[1:] == "' 0\"":
+                    camera_props.custom_diagram_scale_input2 = camera_props.custom_diagram_scale_input2[0]
+                if "/" in camera_props.custom_diagram_scale_input1:
+                    if " " in camera_props.custom_diagram_scale_input1:
+                        n1, n2 = camera_props.custom_diagram_scale_input1.split(" ")
+                        n2_1, n2_2 = n2.split("/")
+                        numerator = int(n1) + (int(n2_1) / int(n2_2))
+                    elif "-" in camera_props.custom_diagram_scale_input1:
+                        n1, n2 = camera_props.custom_diagram_scale_input1.split("-")
+                        n2_1, n2_2 = n2.split("/")
+                        numerator = int(n1) + (int(n2_1) / int(n2_2))
+                    else:
+                        n1, n2 = camera_props.custom_diagram_scale_input1.split("/")
+                        numerator = int(n1) / int(n2)
+                else:
+                    numerator = 1
+                denominator = (int(camera_props.custom_diagram_scale_input2) / numerator) * 12
+                scale = "1" + "/" + str(denominator)
+                human_scale = camera_props.custom_diagram_scale_input1 + "=" + camera_props.custom_diagram_scale_input2
+            else:
+                scale = camera_props.custom_diagram_scale_input1 + "/" + camera_props.custom_diagram_scale_input2
+                human_scale = camera_props.custom_diagram_scale_input1 + ":" + camera_props.custom_diagram_scale_input2
 
-        if self.camera.data.BIMCameraProperties.is_nts:
+            camera_props.custom_diagram_scale = human_scale + "|" + scale
+            self.human_scale, fraction = camera_props.custom_diagram_scale.split("|")
+        else:
+            self.human_scale, fraction = camera_props.diagram_scale.split("|")
+
+        if camera_props.is_nts:
             self.human_scale = "NTS"
 
         numerator, denominator = fraction.split("/")

src/blenderbim/blenderbim/bim/module/drawing/prop.py

@@ -336,6 +336,8 @@ class BIMCameraProperties(PropertyGroup):
     view_name: StringProperty(name="View Name")
     diagram_scale: EnumProperty(items=get_diagram_scales, name="Drawing Scale", update=update_diagram_scale)
     custom_diagram_scale: StringProperty(name="Custom Scale", update=update_diagram_scale)
+    custom_diagram_scale_input1: StringProperty(name="Custom Scale Input 1", update=update_diagram_scale)
+    custom_diagram_scale_input2: StringProperty(name="Custom Scale Input 2", update=update_diagram_scale)
     raster_x: IntProperty(name="Raster X", default=1000)
     raster_y: IntProperty(name="Raster Y", default=1000)
     is_nts: BoolProperty(name="Is NTS")

src/blenderbim/blenderbim/bim/module/drawing/ui.py

@@ -84,8 +84,14 @@ class BIM_PT_camera(Panel):
         row = layout.row()
         row.prop(props, "diagram_scale")
         if props.diagram_scale == "CUSTOM":
-            row = layout.row()
+            row = layout.row(align=True)
-            row.prop(props, "custom_diagram_scale")
+            row.prop(props, "custom_diagram_scale_input1", text="Custom Scale")
+            if context.scene.unit_settings.system == "IMPERIAL":
+                separator = "         ="
+            else:
+                separator = "         :"
+            row.label(text=separator)
+            row.prop(props, "custom_diagram_scale_input2", text="")
 
         row = layout.row(align=True)
         row.operator("bim.create_drawing", text="Create Drawing", icon="OUTPUT")