Updated activity diagram and progress indicator

README.md

@@ -39,4 +39,4 @@ Command parameters:
 * -o [output_filename [output_filename2 [...]] Specify output file names, if no name are provided the input file name will be used.
 * -h Displays this information
 
-![Activity Diagram](activityDiagram.png "Current development stage in red.")
+![Activity Diagram](https://www.planttext.com/plantuml/img/TP8nJyGm38Nt_0fBBBq50ICTE7Je118JGeZL8guQAOqZn-NWtzEabElHNfQcydlFoUTiaw9ettbZoiwOsnT22ox4NlVE4mJiADN6DL3b_mJqvPBURK1R2b2fzBGnCApHo54T1_GGKGQdaWpcNCu1ZvZM12jXa-CDlRCpwRgoj7zcj8kkUP5F15M3m-UVvRKLFW29iDGdbQGSZ_vWNMFE9esDBJNOUrqSO3GlZClMfUMeFhGPVA5LvW1D0QyCKVY3KWRcqXp2nUxgPd_zC1xbRtP7y4y9KXyZYv8jQT2mTAZhE4_IPcfeCLXFCrQJyZv6_tsyEtIzOXvpMaft73v9DD_cChQi7EhpR2VJZ1Qydu0DzfTMOEXOQ6IrCGMdsGxr_BX_0000 "Current in development stage marked in red.")

activityDiagram.pltuml

@@ -2,30 +2,32 @@
 
 start
 
-#C02F1D:Read inputFile names;
+:Read inputFile names;
 if (Files exist?) then (true)
-    #C02F1D:Read optional parameters;
-    if (Has optional parameters?) then (true)
-        if (Valid parameters) then (true)
-            #C02F1D:Load parameters;
-        else (false)
-            #C02F1D:Throw error X;
-            stop
-        endif
-    else (false)
-        #C02F1D:Load default parameters;
-    endif
+:Read optional parameters;
+if (Has optional parameters?) then (true)
+if (Valid parameters) then (true)
+:Load parameters;
 else (false)
-    #C02F1D:Throw error X;
-    stop
+:Throw error;
+stop
+endif
+else (false)
+:Load default parameters;
+endif
+else (false)
+:Throw error;
+stop
 endif
 while (Has input files to process?) is (true)
-    :Load inputFile;
-    if (Is supported file format) then (true)
-        :Convert to .photon;
-    else (false)
-        :Throw error X;
-    endif
+#C02F1D:Load inputFile;
+if (Is supported file format) then (true)
+#C02F1D:Load file format handler;
+#C02F1D:Apply parameter mutations;
+#C02F1D:Convert to .photon;
+else (false)
+#C02F1D:Throw error X;
+endif
 endwhile (no more files)
 stop
 

pcb2photon.xcodeproj/project.pbxproj

@@ -10,6 +10,8 @@
 		229D196C20AD797B003E75C6 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229D196B20AD797B003E75C6 /* main.swift */; };
 		229D197720AD9CC3003E75C6 /* ConsoleIO.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229D197620AD9CC3003E75C6 /* ConsoleIO.swift */; };
 		229D197920AD9EB3003E75C6 /* Converter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229D197820AD9EB3003E75C6 /* Converter.swift */; };
+		229D197B20AE0193003E75C6 /* ConverterUtil.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229D197A20AE0193003E75C6 /* ConverterUtil.swift */; };
+		229D197D20AF11BF003E75C6 /* ImageFileDecoders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 229D197C20AF11BF003E75C6 /* ImageFileDecoders.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -29,9 +31,10 @@
 		229D196B20AD797B003E75C6 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
 		229D197220AD7C6A003E75C6 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		229D197420AD9905003E75C6 /* activityDiagram.pltuml */ = {isa = PBXFileReference; lastKnownFileType = text; path = activityDiagram.pltuml; sourceTree = "<group>"; };
-		229D197520AD99C5003E75C6 /* activityDiagram.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = activityDiagram.png; sourceTree = "<group>"; };
 		229D197620AD9CC3003E75C6 /* ConsoleIO.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConsoleIO.swift; sourceTree = "<group>"; };
 		229D197820AD9EB3003E75C6 /* Converter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Converter.swift; sourceTree = "<group>"; };
+		229D197A20AE0193003E75C6 /* ConverterUtil.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConverterUtil.swift; sourceTree = "<group>"; };
+		229D197C20AF11BF003E75C6 /* ImageFileDecoders.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageFileDecoders.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -50,7 +53,6 @@
 			children = (
 				229D197420AD9905003E75C6 /* activityDiagram.pltuml */,
 				229D197220AD7C6A003E75C6 /* README.md */,
-				229D197520AD99C5003E75C6 /* activityDiagram.png */,
 				229D196A20AD797B003E75C6 /* pcb2photon */,
 				229D196920AD797B003E75C6 /* Products */,
 			);
@@ -70,6 +72,8 @@
 				229D196B20AD797B003E75C6 /* main.swift */,
 				229D197620AD9CC3003E75C6 /* ConsoleIO.swift */,
 				229D197820AD9EB3003E75C6 /* Converter.swift */,
+				229D197A20AE0193003E75C6 /* ConverterUtil.swift */,
+				229D197C20AF11BF003E75C6 /* ImageFileDecoders.swift */,
 			);
 			path = pcb2photon;
 			sourceTree = "<group>";
@@ -131,6 +135,8 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				229D197D20AF11BF003E75C6 /* ImageFileDecoders.swift in Sources */,
+				229D197B20AE0193003E75C6 /* ConverterUtil.swift in Sources */,
 				229D196C20AD797B003E75C6 /* main.swift in Sources */,
 				229D197920AD9EB3003E75C6 /* Converter.swift in Sources */,
 				229D197720AD9CC3003E75C6 /* ConsoleIO.swift in Sources */,