Browse Source

can read from laeufer, gv12 and adapter

bscheibel 5 years ago
parent
commit
18b60ff77e
1 changed files with 49 additions and 6 deletions
  1. 49 6
      read_data.py

+ 49 - 6
read_data.py

@@ -3,6 +3,15 @@ import re
 
 
 def read_dimensions(file_out, num):
+    toleranzen_included = False
+    with open(file_out) as csv_file:
+        csv_reader = csv.reader(csv_file, delimiter=';')
+        for row in csv_reader:
+            #print("test")
+            if row[num] == "-" or row[num] == "+":
+                toleranzen_included = True
+            #    print("test2")
+
     with open(file_out) as csv_file:
         csv_reader = csv.reader(csv_file, delimiter=';')
         line_count = 0
@@ -13,9 +22,14 @@ def read_dimensions(file_out, num):
         isos = []
         dimensions = []
 
+
+
+
+
         for row in csv_reader:
             #print(row)
             line_count += 1
+            #print(line_count)
 
             if "ISO" in row[num]:
                 isos.append(row[num])
@@ -34,18 +48,36 @@ def read_dimensions(file_out, num):
                 is2vorzeichen = True
                 vorzeichen2 = row[num]
                 continue
+            if (row[num] == "-" or row[num] == "+") and ismaybenumber:
+                dimensions.append(ismaybenumber[0])
 
             if row[num] == "-" or row[num] == "+":
                 vorzeichen1 = row[num]
                 continue
 
-            isnumber = re.findall(r"\d*\,\d+", row[num]) #regex to get number out of line
+            if "%%c<>" in row[num]:
+                continue
 
+            if "2x %%c" in row[num]:
+                continue
+
+            if "16%" in row[num]:
+                continue
+            if "R" in row[num][0] and not "Rz" in row[num]:
+                dimensions.append("Radius: " + row[num][1:])
+                continue
+
+            isnumber = re.findall(r"\d*\,\d+|\d*\.\d+", row[num][0:6]) #regex to get number from line
+            ismaybenumber = re.findall(r"^[0-9]+$",row[num])
             if isnumber:
-                print(isnumber)
+                #print(isnumber)
                 if vorzeichen1 != "nix":
+                    if vorzeichen1 == "-" and (row[num] == "0,00" or row[num] == "0,0"):
+                        dimensions.append(row[num])
+                    else:
                     #print(vorzeichen + isnumber[0])
-                    dimensions.append(vorzeichen1 + isnumber[0])
+                        dimensions.append(vorzeichen1 + isnumber[0])
+                        vorzeichen1 = "nix"
                 else:
                     if row[num][0]!="?":
                         #print(isnumber[0])
@@ -53,18 +85,28 @@ def read_dimensions(file_out, num):
                 if is2vorzeichen is True:
                     vorzeichen1 = vorzeichen2
                     is2vorzeichen = False
+                    vorzeichen2 = "nix"
 
-            if row[num][0] == "?":
+
+            if row[num][0] == "?" and row[num][1].isdigit():
                 #print("+/- " + row[1][1:])
                 dimensions.append("+/- " + row[num][1:])
 
-        #print(isos)
-        print(dimensions)
+        if isos.__len__()>0:
+            print(isos)
+        else:
+            print("No regulations found.")
+        #print(dimensions)
         print(f'Processed {line_count} lines.')
 
         dim = []
         dim_count = 0
+        if not toleranzen_included:
+            print("Maße")
         for x in dimensions:
+            if not toleranzen_included:
+                print(x)
+                continue
             if x == "Durchmesser: ":
                 dim_count = 0
             if dim_count > 2:
@@ -85,3 +127,4 @@ def read_dimensions(file_out, num):
                 continue
 
 
+