Commit e81a5a47 authored by Dorchies David's avatar Dorchies David
Browse files

feat: Change the format of Chrono.txt and PaChrono.txt

Closes #1
parent 41ca1385
......@@ -249,7 +249,7 @@ Procedure C1_EcritureEnteteResultDetail(ZChrono:boolean);
write(YFicResult2,' Vges[',YRanglac,']/Vtot[',YRangLac,']')
else
if YAbsRel=1 then
write(YFicResult2,' Vobj[',YRangLac,']')
write(YFicResult2,' Vobj[',YRangLac,']')
else
write(YFicResult2,' Vobj[',YRangLac,']/Vtot[',YRangLac,']');
write(YFicResult2,' QEmin[',YRanglac,']',
......@@ -271,19 +271,19 @@ Procedure C1_EcritureEnteteResultDetail(ZChrono:boolean);
' QSTmin3[',YRanglac,']',
' QSTmax3[',YRanglac,']');
case YOptionRepart of
1..2: write(YFicResult2,' TPot[',YRanglac,']',
1..2: write(YFicResult2,' TPot[',YRanglac,']',
' Part[',YrangLac,']');
3 : write(YFicResult2,' VRobj',
' QSTpot[',YrangLac,']');
3 : write(YFicResult2,' VRobj',
' QSTpot[',YrangLac,']');
4..5: begin
write(YFicResult2,' TPot');
write(YFicResult2,' TPot');
if YCodeTpot then
write(YFicResult2,'1')
else
write(YFicResult2,'2');
write(YFicResult2,'[',YRanglac,']');
if YAbsRel=1 then
write(YFicResult2,' Vpot[',YrangLac,']')
write(YFicResult2,' Vpot[',YrangLac,']')
else
write(YFicResult2,' Vpot[',YrangLac,']/Vtot[',YRangLac,']');
write(YficResult2,' QSTpot[',YrangLac,']')
......@@ -303,9 +303,9 @@ Procedure C1_EcritureEnteteResultDetail(ZChrono:boolean);
write(YFicResult2,' VTges',
' VTges0')
else
write(YFicResult2,' VTobj',
' VTobj0');
write(YFicResult2, ' Vdef');
write(YFicResult2,' VTobj',
' VTobj0');
write(YFicResult2, ' Vdef');
end
else
begin
......@@ -320,9 +320,9 @@ Procedure C1_EcritureEnteteResultDetail(ZChrono:boolean);
write(YFicResult2,' ',XQST0);
write(YFicResult2,' QXdef0');
write(YFicResult2,' QXdef1 QXdef2',
' Succes Iter Test');
' Succes Iter Test');
if YOptionRepart=5 then
write(YFicResult2,' IterTps');
write(YFicResult2,' IterTps');
writeln(YFicResult2);
end; {fin de C1_EcritureEnteteResultDetail}
......
......@@ -171,44 +171,44 @@ procedure Ici_Ecriture_resultats_Detailles(ZChron:boolean);
begin
write(YFicResult2,B_Date(YDeb2.YdateEnJour[0]),' ',YDeb2.YQXsous:21:12,' ');
write(YFicResult2,B_Date(YDeb2.YdateEnJour[0]),' ',YDeb2.YQXsous:21,' ');
for YRangLac:=1 to YNbLacs do
begin
write(YFicResult2,' ',YChaiDate[YRangLac],' ');
if YAbsRel=1 then
write(YFicResult2,YVolume[YRangLac]:27:12,' ')
write(YFicResult2,YVolume[YRangLac]:21,' ')
else
write(YFicResult2,(YVolume[YRangLac]/YVtot[YRangLac]):27:20,' ');
write(YFicResult2,YQEmin[YRangLac]:21,' ',YQEmax[YRangLac]:21,' ',YQSmin[YRangLac]:21,' ',YQSmax[YRangLac]:21,' ');
write(YFicResult2,YDeb2.YQMnat[YrangLac]:21:12,' ',Ydeb2.YQVnat[YrangLac]:21:12,' ',
YQMRef[YRanglac]:21:12,' ',YQMRes[YRangLac]:21:12,' ',
YQVRef[YRanglac]:21:12,' ',YQVRes[YRangLac]:21:12,' ',
YQEinf[YRangLac]:21:12,' ',YQEsup[YRangLac]:21:12,' ',
YQSTmin1[YRanglac]:21:12,' ',YQSTmax1[YRangLac]:21:12,' ',
YQSTmin2[YRanglac]:21:12,' ',YQSTmax2[YRangLac]:21:12,' ',
YQSTmin[YRanglac]:21:12,' ',YQSTmax[YRangLac]:21:12,' ');
write(YFicResult2,YDeb2.YQMnat[YrangLac]:21,' ',Ydeb2.YQVnat[YrangLac]:21,' ',
YQMRef[YRanglac]:21,' ',YQMRes[YRangLac]:21,' ',
YQVRef[YRanglac]:21,' ',YQVRes[YRangLac]:21,' ',
YQEinf[YRangLac]:21,' ',YQEsup[YRangLac]:21,' ',
YQSTmin1[YRanglac]:21,' ',YQSTmax1[YRangLac]:21,' ',
YQSTmin2[YRanglac]:21,' ',YQSTmax2[YRangLac]:21,' ',
YQSTmin[YRanglac]:21,' ',YQSTmax[YRangLac]:21,' ');
case YOptionRepart of
1..2: write(YFicResult2,YTpot[YRangLac]:24:5,' ',YPart[YRangLac]:21:12,' ');
3 : write(YFicResult2,YVRobj:24:12,' ',YQSTpot[YRangLac]:21:12,' ');
1..2: write(YFicResult2,YTpot[YRangLac]:21,' ',YPart[YRangLac]:21,' ');
3 : write(YFicResult2,YVRobj:21,' ',YQSTpot[YRangLac]:21,' ');
4..5: if YAbsRel=1 then
write(YFicResult2,YTpot[YRangLac]:24:5,' ',YVpot[YRangLac]:24:12,' ',YQSTpot[YRangLac]:21:12,' ')
write(YFicResult2,YTpot[YRangLac]:21,' ',YVpot[YRangLac]:21,' ',YQSTpot[YRangLac]:21,' ')
else
write(YFicResult2,YTpot[YRangLac]:24:5,' ',(YVpot[YRangLac]/YVtot[Yranglac]):24:17,' ',YQSTpot[YRangLac]:21:12,' ')
end;
write(YFicResult2,YQST[YRangLac]:21:12,' ',YQV[YRangLac]:21:12,' ',
YQE[YRanglac]:21:12,' ',YQS[YRangLac]:21:12,' ',
write(YFicResult2,YQST[YRangLac]:21,' ',YQV[YRangLac]:21,' ',
YQE[YRanglac]:21,' ',YQS[YRangLac]:21,' ',
YCodeRepart[YRangLac]:5,' ',YCodePrise[YrangLac]:5,' ',
YCodeRestit[YrangLac]:5,' ',YCodeAval[YrangLac]:5,' ',
YcodeSigne[YRangLac]:5,' ');
end;
if YAbsRel=1 then
write(YFicResult2,YVolTot1:27:12,' ',YVolTot0:27:12,' ',YVManque:27:12)
write(YFicResult2,YVolTot1:21,' ',YVolTot0:21,' ',YVManque:21)
else
write(YFicResult2,(YVolTot1/YVtotCumul):27:20,' ',(YVolTot0/YVtotCumul):27:20,' ',(YVManque/YVtotCumul):27:20);
write(YficResult2,' ',YQST0:21:12,' ',YQXdef[0]:21:12,' ',YQXdef[1]:21:12,' ',
YQXdef[2]:21:12,YSuccesRepart:8,' ',YNIter:7,' ',YTest:2);
write(YficResult2,' ',YQST0:21,' ',YQXdef[0]:21,' ',YQXdef[1]:21,' ',
YQXdef[2]:21,YSuccesRepart:8,YNIter:8,YTest:8);
if YOptionRepart=5 then
write(YFicResult2,' ',YNItertps:4);
write(YFicResult2,YNItertps:8);
writeln(YFicResult2);
flush(YFicResult2);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment