diff --git a/QR-GEN.sln b/QR-GEN.sln
index 8ed2c1e..d65cfc0 100644
--- a/QR-GEN.sln
+++ b/QR-GEN.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29709.97
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "QR-GEN", "QR-GEN\QR-GEN.csproj", "{4B0464BD-88BC-44A4-9750-AFC4259E7400}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZCode", "QR-GEN\ZCode.csproj", "{4B0464BD-88BC-44A4-9750-AFC4259E7400}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersGen", "VersGen\VersGen.csproj", "{175AF851-9AED-4D5F-8571-9CEC8B2D2320}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
{4B0464BD-88BC-44A4-9750-AFC4259E7400}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B0464BD-88BC-44A4-9750-AFC4259E7400}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B0464BD-88BC-44A4-9750-AFC4259E7400}.Release|Any CPU.Build.0 = Release|Any CPU
+ {175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {175AF851-9AED-4D5F-8571-9CEC8B2D2320}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/QR-GEN/Controllers/CodGenController.cs b/QR-GEN/Controllers/CodGenController.cs
deleted file mode 100644
index fccc72f..0000000
--- a/QR-GEN/Controllers/CodGenController.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Drawing.Imaging;
-using System.IO;
-using System.Linq;
-using System.Web;
-using System.Web.Mvc;
-using ZXing;
-using ZXing.QrCode;
-
-namespace QR_GEN.Controllers
-{
- public class CodGenController : Controller
- {
- // GET: CodGen
- public ActionResult Index()
- {
- return View();
- }
- ///
- /// Restituisce un QR code dato valore
- ///
- ///
- /// Altezza immagine
- /// Larghezza immagine
- ///
- public ActionResult QR(string id, int hSize = 600, int wSize = 600)
- {
- BarcodeFormat formato = BarcodeFormat.QR_CODE;
- return utils.getImage2D(ref id, hSize, wSize, formato);
- }
- ///
- /// Restituisce un DataMatrix code dato valore
- ///
- ///
- /// Altezza immagine
- /// Larghezza immagine
- ///
- public ActionResult DataMatrix(string id, int hSize = 300, int wSize = 600)
- {
- BarcodeFormat formato = BarcodeFormat.DATA_MATRIX;
- return utils.getImage2D(ref id, hSize, wSize, formato);
- }
- ///
- /// Restituisce un Aztec code dato valore
- ///
- ///
- /// Altezza immagine
- /// Larghezza immagine
- ///
- public ActionResult Aztec(string id, int hSize = 600, int wSize = 600)
- {
- BarcodeFormat formato = BarcodeFormat.AZTEC;
- return utils.getImage2D(ref id, hSize, wSize, formato);
- }
- ///
- /// Restituisce un Aztec code dato valore
- ///
- ///
- /// Altezza immagine
- /// Larghezza immagine
- ///
- public ActionResult Pdf417(string id, int hSize = 300, int wSize = 600)
- {
- BarcodeFormat formato = BarcodeFormat.PDF_417;
- return utils.getImage2D(ref id, hSize, wSize, formato);
- }
- ///
- /// Restituisce un Code39 1D dato valore
- ///
- ///
- /// mostrare valore SOLO come codice (false --> testo sotto)
- /// Altezza immagine
- ///
- public ActionResult code39(string id, bool pureBarcode = false, int hSize = 70)
- {
- BarcodeFormat formato = BarcodeFormat.CODE_39;
- return utils.getImage(id, hSize, formato, pureBarcode);
- }
- ///
- /// Restituisce un Code128 1D dato valore
- ///
- ///
- /// mostrare valore SOLO come codice (false --> testo sotto)
- /// Altezza immagine
- ///
- public ActionResult Code128(string id, bool pureBarcode = false, int hSize = 70)
- {
- BarcodeFormat formato = BarcodeFormat.CODE_128;
- return utils.getImage(id, hSize, formato, pureBarcode);
- }
- }
-}
\ No newline at end of file
diff --git a/QR-GEN/Controllers/GenController.cs b/QR-GEN/Controllers/GenController.cs
new file mode 100644
index 0000000..cbc64a9
--- /dev/null
+++ b/QR-GEN/Controllers/GenController.cs
@@ -0,0 +1,94 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using ZXing;
+using ZXing.QrCode;
+
+namespace QR_GEN.Controllers
+{
+ public class GenController : Controller
+ {
+ // GET: Gen
+ public ActionResult Index()
+ {
+ return View();
+ }
+ ///
+ /// Restituisce un QR code dato valore
+ ///
+ ///
+ /// Altezza immagine
+ /// Larghezza immagine
+ ///
+ public ActionResult QR(string id, int h = 600, int w = 600)
+ {
+ BarcodeFormat formato = BarcodeFormat.QR_CODE;
+ return utils.getImage2D(ref id, h, w, formato);
+ }
+ ///
+ /// Restituisce un DataMatrix code dato valore
+ ///
+ ///
+ /// Altezza immagine
+ /// Larghezza immagine
+ ///
+ public ActionResult DataMatrix(string id, int h = 300, int w = 600)
+ {
+ BarcodeFormat formato = BarcodeFormat.DATA_MATRIX;
+ return utils.getImage2D(ref id, h, w, formato);
+ }
+ ///
+ /// Restituisce un Aztec code dato valore
+ ///
+ ///
+ /// Altezza immagine
+ /// Larghezza immagine
+ ///
+ public ActionResult Aztec(string id, int h = 600, int w = 600)
+ {
+ BarcodeFormat formato = BarcodeFormat.AZTEC;
+ return utils.getImage2D(ref id, h, w, formato);
+ }
+ ///
+ /// Restituisce un Aztec code dato valore
+ ///
+ ///
+ /// Altezza immagine
+ /// Larghezza immagine
+ ///
+ public ActionResult Pdf417(string id, int h = 300, int w = 600)
+ {
+ BarcodeFormat formato = BarcodeFormat.PDF_417;
+ return utils.getImage2D(ref id, h, w, formato);
+ }
+ ///
+ /// Restituisce un Code39 1D dato valore
+ ///
+ ///
+ /// Altezza immagine
+ /// Indica se mostrare ANCHE testo
+ ///
+ public ActionResult code39(string id, int h = 75, bool showVal = true)
+ {
+ BarcodeFormat formato = BarcodeFormat.CODE_39;
+ return utils.getImage(id, h, formato, !showVal);
+ }
+ ///
+ /// Restituisce un Code128 1D dato valore
+ ///
+ ///
+ /// Altezza immagine
+ /// Indica se mostrare ANCHE testo
+ ///
+ public ActionResult Code128(string id, int h = 75, bool showVal = true)
+ {
+ BarcodeFormat formato = BarcodeFormat.CODE_128;
+ return utils.getImage(id, h, formato, !showVal);
+ }
+ }
+}
\ No newline at end of file
diff --git a/QR-GEN/Controllers/HomeController.cs b/QR-GEN/Controllers/HomeController.cs
index 9f0c279..fd83150 100644
--- a/QR-GEN/Controllers/HomeController.cs
+++ b/QR-GEN/Controllers/HomeController.cs
@@ -7,6 +7,7 @@ using ZXing.QrCode;
using Newtonsoft.Json;
using System.Collections.Generic;
using ZXing.Common;
+using System.Reflection;
namespace QR_GEN.Controllers
{
@@ -28,8 +29,19 @@ namespace QR_GEN.Controllers
public string[] parameters { get; set; }
}
+
+
public ActionResult Index()
{
+ var assembly = Assembly.GetCallingAssembly();
+ ViewBag.Version = assembly.GetName().Version;
+ string company = "Steamware";
+ object[] attribs = assembly.GetCustomAttributes(typeof(AssemblyCompanyAttribute), true);
+ if (attribs.Length > 0)
+ {
+ company = ((AssemblyCompanyAttribute)attribs[0]).Company;
+ }
+ ViewBag.CopyRight = company;
return View();
}
diff --git a/QR-GEN/Properties/AssemblyInfo.cs b/QR-GEN/Properties/AssemblyInfo.cs
index cc375f3..61c8554 100644
--- a/QR-GEN/Properties/AssemblyInfo.cs
+++ b/QR-GEN/Properties/AssemblyInfo.cs
@@ -7,9 +7,9 @@ using System.Runtime.InteropServices;
[assembly: AssemblyTitle("QR_GEN")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Steamware")]
+//[assembly: AssemblyCompany("Steamware")]
[assembly: AssemblyProduct("QR_GEN")]
-[assembly: AssemblyCopyright("Copyright © 2018")]
+//[assembly: AssemblyCopyright("Copyright © 2018")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
@@ -30,5 +30,5 @@ using System.Runtime.InteropServices;
//
// È possibile specificare tutti i valori o lasciare i valori predefiniti per Revisione e Numeri build
// utilizzando l'asterisco (*) come illustrato di seguito:
-[assembly: AssemblyVersion("1.1.2002.27")]
-[assembly: AssemblyFileVersion("1.1.2002.27")]
+//[assembly: AssemblyVersion("1.1.2002.27")]
+//[assembly: AssemblyFileVersion("1.1.2002.27")]
diff --git a/QR-GEN/Views/CodGen/Index.cshtml b/QR-GEN/Views/CodGen/Index.cshtml
deleted file mode 100644
index 4dbc422..0000000
--- a/QR-GEN/Views/CodGen/Index.cshtml
+++ /dev/null
@@ -1,55 +0,0 @@
-@{
- ViewBag.Title = "Home Page";
-}
-
-@{
- string QrTextBox = "www.steamware.net";
- if (IsPost)
- {
- QrTextBox = Request.Form["QrTextBox"];
- }
-}
-
-
Multi-format CODE GENERATOR
-
Generatore Barcode 1D / 2D by Steamware
-
-
-
-
-
-
-
-
QR Code
-
-
-
-
DataMatrix
-
-
-
-
Aztec
-
-
-
-
-
-
Code 39
-
-
-
-
Code 128
-
-
-
-
-
\ No newline at end of file
diff --git a/QR-GEN/Views/Gen/Index.cshtml b/QR-GEN/Views/Gen/Index.cshtml
new file mode 100644
index 0000000..166fbff
--- /dev/null
+++ b/QR-GEN/Views/Gen/Index.cshtml
@@ -0,0 +1,21 @@
+@{
+ ViewBag.Title = "Home Page";
+}
+
+@{
+ string QrTextBox = "www.steamware.net";
+ if (IsPost)
+ {
+ QrTextBox = Request.Form["QrTextBox"];
+ }
+}
+
+
Multi-format CODE GENERATOR
+
Generatore Barcode 1D / 2D by Steamware
+
+
+
\ No newline at end of file
diff --git a/QR-GEN/Views/Home/Index.cshtml b/QR-GEN/Views/Home/Index.cshtml
index 87fc907..fd48a78 100644
--- a/QR-GEN/Views/Home/Index.cshtml
+++ b/QR-GEN/Views/Home/Index.cshtml
@@ -11,7 +11,7 @@
}
Multi-format CODE GENERATOR
-
Generatore Barcode 1D / 2D by Steamware
+
Barcode generator 1D / 2D
@@ -34,37 +34,37 @@
QR Code
-
+
Aztec
-
+
DataMatrix
-
+
Pdf417
-
+
-
Code 39
-
+
Code 39 (show val)
+
-
Code 128
-
+
Code 128 (show val)
+
-
Code 39 (pure code)
-
+
Code 39 (no val)
+
-
Code 128 (pure code)
-
+
Code 128 (no val)
+
diff --git a/QR-GEN/Views/Shared/_Layout.cshtml b/QR-GEN/Views/Shared/_Layout.cshtml
index 63cdb4c..5c39a9f 100644
--- a/QR-GEN/Views/Shared/_Layout.cshtml
+++ b/QR-GEN/Views/Shared/_Layout.cshtml
@@ -4,7 +4,7 @@
- @ViewBag.Title - Applicazione ASP.NET
+ Steamware ZCode Generator
@Styles.Render("~/Content/css")
@Scripts.Render("~/bundles/modernizr")
@@ -15,13 +15,15 @@
- @Html.ActionLink("QR Code generator", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
+ @Html.ActionLink("ZCode Gen", "Index", "Home", new { area = "" }, new { @class = "navbar-brand" })
+
+
-
+ @*
@Html.ActionLink("www.steamware.net", "steamware", "Home")
-
+
*@
diff --git a/QR-GEN/QR-GEN.csproj b/QR-GEN/ZCode.csproj
similarity index 76%
rename from QR-GEN/QR-GEN.csproj
rename to QR-GEN/ZCode.csproj
index 6e2055f..b0a2e4c 100644
--- a/QR-GEN/QR-GEN.csproj
+++ b/QR-GEN/ZCode.csproj
@@ -120,10 +120,13 @@
+
+ VersGen.cs
+
-
+
Global.asax
@@ -138,32 +141,42 @@
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -179,6 +192,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -195,8 +271,10 @@
+
+
@@ -204,7 +282,6 @@
-
diff --git a/QR-GEN/packages.config b/QR-GEN/packages.config
index 006118f..03fce06 100644
--- a/QR-GEN/packages.config
+++ b/QR-GEN/packages.config
@@ -1,7 +1,8 @@
-
+
+
@@ -17,7 +18,7 @@
-
+