Merge branch 'master' of /Users/beatescheibel/PycharmProjects/dxf_reader with conflicts.

.idea/dxf_reader.iml

@@ -4,7 +4,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/venv" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.7 (dxf_reader)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.7" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">

.idea/encodings.xml

@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="Encoding">
-    <file url="file://$PROJECT_DIR$/drawings/GV_12.DXF" charset="US-ASCII" />
+    <file url="file://$PROJECT_DIR$/drawings/GV_12.DXF" charset="windows-1252" />
     <file url="file://$PROJECT_DIR$/drawings/Laeufer.DXF" charset="windows-1252" />
-    <file url="file://$PROJECT_DIR$/drawings/Stahl_Adapterplatte.DXF" charset="windows-1252" />
-    <file url="file://$PROJECT_DIR$/temporary/extracted_Stahladapter.csv" charset="UTF-8" />
   </component>
 </project>

.idea/misc.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (dxf_reader)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7" project-jdk-type="Python SDK" />
 </project>

main.py

@@ -1,11 +1,10 @@
+import read_data
 import read_text_lines
 import merge_pandas
-import read_data
 
-drawing = "drawings/Stahl_Adapterplatte.DXF"
-file_out = "temporary/extracted_Stahladapter.csv"
-#file_out = "temporary/extracted_GV_12.csv"
-#file_out = "temporary/extracted_Laeufer.csv"
-#read_text_lines.read(drawing, file_out)
-#merge_pandas.merge_lines(file_out)
-read_data.read_dimensions(file_out, 0)
+
+
+file = "drawings/GV_12.DXF"
+file_out = "GV12_extracted.csv"
+read_text_lines.read(file, file_out)
+read_data.read_dimensions(file_out)