Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

velocizzata decodifica x sequencer e torta... NON BASTA...

Browse Source
This commit is contained in:
Samuele E. Locatelli
2017-05-18 12:51:05 +02:00
parent 971ef09066
commit 4c47434d37
9 changed files with 174 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/MAPO.sqlite
BIN
View File
Binary file not shown.
.vs/config/applicationhost.config
+14 -6
View File
@@ -162,7 +162,7 @@
</site>
<site name="MP-IO" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-IO" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-IO" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:64103:localhost" />
@@ -170,7 +170,7 @@
</site>
<site name="MP-Admin" id="3">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Admin" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-Admin" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56734:localhost" />
@@ -178,7 +178,7 @@
</site>
<site name="MoonProTablet" id="4">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Tablet" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-Tablet" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56739:localhost" />
@@ -186,7 +186,7 @@
</site>
<site name="MP-Site" id="5">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-Site" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-Site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:54806:localhost" />
@@ -194,7 +194,7 @@
</site>
<site name="MP-MON" id="6">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP-MON" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-MON" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56580:localhost" />
@@ -202,7 +202,7 @@
</site>
<site name="MP" id="7">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\Visual Studio 2017\Projects\MoonPro_dotnet\MP" />
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:2809:localhost" />
@@ -216,6 +216,14 @@
<binding protocol="http" bindingInformation="*:17702:localhost" />
</bindings>
</site>
<site name="MP-Site(1)" id="9">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\samuele.steamw\Documents\VisualStudioProject\MoonPro_dotnet\MP-Site" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:54807:localhost" />
</bindings>
</site>
<siteDefaults>
<logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
<traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />
MP-Site/DettaglioMacchina.aspx.cs
-2
View File
@@ -1,4 +1,3 @@
//using WebChart;
using SteamWare;
using System;
using System.Web.UI;
@@ -156,7 +155,6 @@ namespace MoonPro
protected void setTorta()
{
// versione NEW
Mod_grafico2.graficoTorta = new pieChart();
Mod_grafico2.graficoTorta.serie = _resoconti.tortaStati(idxMacchina, intervalloAnalisi, durataMin, chkHideSpenta.Checked);
}
MP-Site/DettaglioMacchina.aspx.designer.cs
Generated
+44 -45
View File
@@ -1,123 +1,122 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace MoonPro
{
namespace MoonPro {
public partial class DettaglioMacchina {
/// <summary>
/// UpdatePanel2 control.
/// Controllo UpdatePanel2.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel2;
/// <summary>
/// toStato control.
/// Controllo toStato.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Button toStato;
/// <summary>
/// Mod_periodoAnalisi1 control.
/// Controllo Mod_periodoAnalisi1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_periodoAnalisi Mod_periodoAnalisi1;
/// <summary>
/// up_grafici control.
/// Controllo up_grafici.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel up_grafici;
/// <summary>
/// Mod_sequencerStati1 control.
/// Controllo Mod_sequencerStati1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_sequencerStati Mod_sequencerStati1;
/// <summary>
/// mod_sequencerTempiCiclo1 control.
/// Controllo mod_sequencerTempiCiclo1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_sequencerTempiCiclo mod_sequencerTempiCiclo1;
/// <summary>
/// Mod_immagineStato1 control.
/// Controllo Mod_immagineStato1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_immagineStato Mod_immagineStato1;
/// <summary>
/// chkHideSpenta control.
/// Controllo chkHideSpenta.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.CheckBox chkHideSpenta;
/// <summary>
/// UpdatePanel3 control.
/// Controllo UpdatePanel3.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel3;
/// <summary>
/// Mod_grafico2 control.
/// Controllo Mod_grafico2.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_grafico Mod_grafico2;
/// <summary>
/// UpdatePanel1 control.
/// Controllo UpdatePanel1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.UpdatePanel UpdatePanel1;
/// <summary>
/// Mod_listaStatiEventi1 control.
/// Controllo Mod_listaStatiEventi1.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::MoonPro.WebUserControls.mod_listaStatiEventi Mod_listaStatiEventi1;
}
MP-Site/MP-Site.csproj
+3 -4
View File
@@ -105,7 +105,7 @@
</FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<TargetFrameworkProfile />
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
@@ -832,12 +832,11 @@
<VisualStudio>
<FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
<WebProjectProperties>
<UseIIS>False</UseIIS>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>54806</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>
</IISUrl>
<IISUrl>http://localhost:54807/</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
MP-Site/MP-Site.csproj.user
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>false</UseIISExpress>
<UseIISExpress>true</UseIISExpress>
<NameOfLastUsedPublishProfile>Donati</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
MP-Site/Web.config
+4 -2
View File
@@ -70,6 +70,7 @@
<add key="TcMaxFactor" value="2" />
<add key="chkIdxOdlEndProd" value="false" />
<!--charting-->
<add key="fastColorDecode" value="true"/>
<add key="AutoCleanUpInterval" value="10" />
<add key="ChartImageHandler" value="storage=file;timeout=20;dir=c:\TempImageFiles\;" />
<!--DB 2012-->
@@ -124,8 +125,9 @@
<controls>
<add tagPrefix="asp" namespace="System.Web.UI.DataVisualization.Charting" assembly="System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" /></controls>
<add tagPrefix="ajaxToolkit" assembly="AjaxControlToolkit" namespace="AjaxControlToolkit" />
</controls>
</pages>
<httpHandlers>
<add path="ChartImg.axd" verb="GET,HEAD,POST" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false" />
MP-Site/WebCharts/PlaceHolder.file
-1
View File
@@ -1 +0,0 @@

MapoDb/resoconti.cs
+108 -24
View File
@@ -1,5 +1,6 @@
using SteamWare;
using System;
using System.Collections.Generic;
/// <summary>
/// Summary description for resoconti
@@ -99,17 +100,14 @@ public class resoconti
{
get
{
//if (HttpContext.Current.Cache["Stati"] == null)
if (!memLayer.ML.isInCacheObject("Stati"))
{
_Stati = taStati.GetData();
SteamWare.memLayer.ML.setCacheVal("Stati", _Stati, true);
//HttpContext.Current.Cache["Stati"] = _Stati;
memLayer.ML.setCacheVal("Stati", _Stati, true);
}
else
{
_Stati = (MapoDb.DS_applicazione.AnagraficaStatiDataTable)SteamWare.memLayer.ML.objCacheObj("Stati");
//_Stati = (MapoDb.DS_applicazione.AnagraficaStatiDataTable)HttpContext.Current.Cache["Stati"];
_Stati = (MapoDb.DS_applicazione.AnagraficaStatiDataTable)memLayer.ML.objCacheObj("Stati");
}
return _Stati;
}
@@ -343,6 +341,73 @@ public class resoconti
return answ;
}
/// <summary>
/// Dizionario codici colore (chiave = idxStato), valore = codice colore
/// </summary>
protected Dictionary<int, string> codColore
{
get
{
Dictionary<int, string> answ = new Dictionary<int, string>();
if (memLayer.ML.isInCacheObject("codColore"))
{
answ = (Dictionary<int, string>)memLayer.ML.objCacheObj("codColore");
}
else
{
string _colore = "";
foreach (MapoDb.DS_applicazione.AnagraficaStatiRow item in Stati)
{
switch (item.Semaforo)
{
case "sGi": // giallo
_colore = "#ffec00";
break;
case "sRo": // rosso
_colore = "#e2001a";
break;
case "sGr": // grigio - spenta
_colore = "#bcbcbc";
break;
case "sVe": // verde
_colore = "#009036";
break;
case "sBl": // blu
_colore = "#3690FF";
break;
default:
break;
}
answ.Add(item.IdxStato, _colore);
}
memLayer.ML.setCacheVal("codColore", answ, true);
}
return answ;
}
}
/// <summary>
/// Dizionario codici semaforo (chiave = idxStato), valore = codice semaforo
/// </summary>
protected Dictionary<int, string> codSemaforo
{
get
{
Dictionary<int, string> answ = new Dictionary<int, string>();
if (memLayer.ML.isInCacheObject("codSemaforo"))
{
answ = (Dictionary<int, string>)memLayer.ML.objCacheObj("codSemaforo");
}
else
{
foreach (MapoDb.DS_applicazione.AnagraficaStatiRow item in Stati)
{
answ.Add(item.IdxStato, item.Semaforo);
}
memLayer.ML.setCacheVal("codSemaforo", answ, true);
}
return answ;
}
}
/// <summary>
/// Restituisce colore da IdxStato
/// </summary>
/// <param name="idx"></param>
@@ -350,25 +415,33 @@ public class resoconti
public string coloreDaIdx(int idx)
{
string _answ = "";
switch (Stati.FindByIdxStato(idx).Semaforo)
if (memLayer.ML.CRB("fastColorDecode"))
{
case "sGi": // giallo
_answ = "#ffec00";
break;
case "sRo": // rosso
_answ = "#e2001a";
break;
case "sGr": // grigio - spenta
_answ = "#bcbcbc";
break;
case "sVe": // verde
_answ = "#009036";
break;
case "sBl": // blu
_answ = "#3690FF";
break;
default:
break;
_answ = codColore[idx];
}
else
{
switch (Stati.FindByIdxStato(idx).Semaforo)
{
case "sGi": // giallo
_answ = "#ffec00";
break;
case "sRo": // rosso
_answ = "#e2001a";
break;
case "sGr": // grigio - spenta
_answ = "#bcbcbc";
break;
case "sVe": // verde
_answ = "#009036";
break;
case "sBl": // blu
_answ = "#3690FF";
break;
default:
break;
}
}
return _answ;
}
@@ -379,7 +452,16 @@ public class resoconti
/// <returns></returns>
public string semaforoDaIdxStato(int idx)
{
return Stati.FindByIdxStato(idx).Semaforo;
string _answ = "";
if (memLayer.ML.CRB("fastColorDecode"))
{
_answ = codSemaforo[idx];
}
else
{
_answ = Stati.FindByIdxStato(idx).Semaforo;
}
return _answ;
}
/// <summary>
/// fornisce una torta stati
@@ -434,6 +516,7 @@ public class resoconti
/// <returns></returns>
public objSequencer sequenzaDati(string idxMacchina, intervalloDate _intervallo)
{
DateTime start = DateTime.Now;
// leggo i dati e costituisco una collezione...
objSequencer _sequenza = new objSequencer();
if (idxMacchina != null && idxMacchina != "")
@@ -457,6 +540,7 @@ public class resoconti
// salvo intervallo
_sequenza.intervallo = _intervallo;
}
return _sequenza;
}
/// <summary>