fixing some formats + adding some docs to the Reame

README.md

@@ -1,12 +1,23 @@
 #BarCode
+
+This script that generates barcodes in four barcode formats including
+Code 128, Code 39, Code 2of5, and Codabar. With a little over 100 lines
+of code you have the options of “vertical” or “horizontal” display,
+varying barcode heights, and one of four barcode formats. It does require
+the GD Library to be installed as a module in PHP.
+
 ####Basic use:
 ```php
+namespace Elminson\BarCode;
+
 require_once(__DIR__ . '/vendor/autoload.php');
+
 $barcode = new BarCode('code128');
 $barcode->setPrint(true);
 $barcode->setTextColor("#ff9900");
 $barcode->setBgColor("#cccccc");
-$barcode->setFileName = "test";
+$barcode->setFileName("test");
+$barcode->setFilepath(__DIR__."/temp/");
 echo $barcode->generate("testing");
 ```
 
@@ -19,16 +30,3 @@ php-barcode
 
 Source code for the article "How To Create Barcodes in PHP" found at: 
 http://davidscotttufts.com/2009/03/31/how-to-create-barcodes-in-php/
-
-This script that generates barcodes in four barcode formats including
-Code 128, Code 39, Code 2of5, and Codabar. With a little over 100 lines
-of code you have the options of “vertical” or “horizontal” display,
-varying barcode heights, and one of four barcode formats. It does require
-the GD Library to be installed as a module in PHP.
-
-Usage:
-<img alt="testing" src="barcode.php?text=testing" />
-
-Result:
-<img alt="testing" src="http://davidscotttufts.com/code/barcode.php?text=testing" />
-```

index.php

@@ -14,9 +14,8 @@
 $barcode->setTextColor("#ff9900");
 $barcode->setBgColor("#cccccc");
 $barcode->setFileName("test");
-$barcode->setFilepath("temp/");
+$barcode->setFilepath(__DIR__."/temp/");
 echo $barcode->generate("testing");
-echo "\n";
 //$barcode = new BarCode('code128b');
 //echo $barcode->generate("testing");
 //echo "\n";

src/BarCode.php

@@ -56,6 +56,7 @@ public function getFile()
     {
         return $this->file;
     }
+
     public function setFileName($filename)
     {
         $this->file_name = $filename;
@@ -142,13 +143,15 @@ public function generate($text)
         $this->setText($text);
         if ($this->getCode_type() == "code25") {
             $this->code_string = $this->barcode25();
-        } else   if ($this->getCode_type() == "code39") {
-            $this->code_string = $this->barcode39();
         } else {
-            if ($this->getCode_type() == "codabar") {
-                $this->code_string = $this->barcodabar();
+            if ($this->getCode_type() == "code39") {
+                $this->code_string = $this->barcode39();
             } else {
-                $this->code_string = $this->barcodebase();
+                if ($this->getCode_type() == "codabar") {
+                    $this->code_string = $this->barcodabar();
+                } else {
+                    $this->code_string = $this->barcodebase();
+                }
             }
         }
         $this->generateBarCodeImage();
@@ -353,7 +356,7 @@ public function generateBarCodeImage()
                 $name = $this->file_name;
             }
 
-         echo   $this->file = $this->filepath . $name . ".png";
+            $this->file = $this->filepath . $name . ".png";
             imagepng($image, $this->file);
             imagedestroy($image);
         }