Merge pull request #184 from FriendsOfCADability/Issue183

Fixed step import in millimeter
FriendsOfCADability · Dec 21, 2024 · 54847bb · 54847bb
2 parents ed5d8b8 + 159efc1
commit 54847bb
Showing 1 changed file with 34 additions and 15 deletions.
diff --git a/CADability/ImportStep.cs b/CADability/ImportStep.cs
@@ -4815,29 +4815,48 @@ private void GetContext(Item item)
             {
                 foreach (Item it in units.val as List<Item>)
                 {
-                    if (it.parameter.TryGetValue("conversion_factor", out Item cf))
+                    if (it.parameter.TryGetValue("conversion_factor", out Item cf) &&
+                        cf.parameter.TryGetValue("value_component", out Item vc) &&
+                        vc.val is List<Item> vcList && vcList.Count > 0 &&
+                        vcList[0].type == Item.ItemType.floatval)
                     {
-                        if (cf.parameter.TryGetValue("value_component", out Item vc))
+                        double value = (double)vcList[0].val;
+
+                        if (cf.type == Item.ItemType.planeAngleMeasure || cf.type == Item.ItemType.planeAngleMeasureWithUnit)
                         {
-                            if ((cf.type == Item.ItemType.planeAngleMeasure || cf.type == Item.ItemType.planeAngleMeasureWithUnit) && vc.val is List<Item> && (vc.val as List<Item>)[0].type == Item.ItemType.floatval)
-                                context.toRadian = (double)(vc.val as List<Item>)[0].val;
-                            if ((cf.type == Item.ItemType.positiveLengthMeasure || cf.type == Item.ItemType.lengthMeasureWithUnit) && vc.val is List<Item> && (vc.val as List<Item>)[0].type == Item.ItemType.floatval)
+                            context.toRadian = value;
+                        }
+                        else if (cf.type == Item.ItemType.positiveLengthMeasure || cf.type == Item.ItemType.lengthMeasureWithUnit)
+                        {
+                            context.factor = value;
+
+                            if (it.parameter.TryGetValue("name", out Item name) &&
+                                name.type == Item.ItemType.stringval && name.sval == "METRE")
                             {
-                                context.factor = (double)(vc.val as List<Item>)[0].val; // why * 1000 ? definitely wrong for 83855_elp11b.stp
-                                if (it.parameter.TryGetValue("name", out Item name))
-                                {
-                                    //REVIEW: Is *= 1000 really right? Shouldn't it be = 1000?
-                                    if (name.type == Item.ItemType.stringval && name.sval == "METRE") 
-                                        context.factor *= 1000; // added because of "PROBLEM ELE NULLPUNKT.stp"
-                                }
+                                context.factor *= 1000; // Handle "METRE" case
                             }
                         }
                     }
                     else if (it.parameter.TryGetValue("name", out Item name))
                     {
-                        //TODO: Add other units
-                        if (name.type == Item.ItemType.keyword && name.sval == "METRE") 
-                            context.factor = 1000; // added because of "issue153.stp"
+                        // added because of issue 183.
+                        if (it.parameter.TryGetValue("prefix", out Item prefix) &&
+                            name.type == Item.ItemType.keyword && name.sval == "METRE")
+                        {
+                            if (prefix.sval == "MILLI")
+                                context.factor = 1;
+                            else if (prefix.sval == "CENTI")
+                                context.factor = 10;
+                            else if (prefix.sval == "DECI")
+                                context.factor = 100;
+                            else if (prefix.sval == null)
+                                context.factor = 1000; // Default case for "METRE" without prefix
+                        }
+                        else if (name.type == Item.ItemType.keyword && name.sval == "METRE")
+                        {
+                            // added because of "issue153.stp"
+                            context.factor = 1000; // Default case for "METRE"
+                        }
                     }
                 }
             }