Skip to content

Commit

Permalink
First use of the version 1.7.1 of BlackBox, instead of 1.7.
Browse files Browse the repository at this point in the history
Display of losses (listing & drawing) in Duniter1.members & Duniter1.MembersPrint.
Better use of Mutex and of Services.Action.
Util: Change in the display of Json; in Mutex, new method Mutex.Stop, and better management.
  • Loading branch information
gerard94 committed Jun 24, 2019
1 parent 8901f0a commit fd569c8
Show file tree
Hide file tree
Showing 32 changed files with 368 additions and 38 deletions.
Binary file modified Blackbox/Duniter1/Docu/MakingOfWWCmds.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Docu/MakingOfWotWizard.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Docu/fr/Manual.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/Basic.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/BasicPrint.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/BasicUpdt.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/Blockchain.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/BlockchainUpdt.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/GQLReceiver.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/Members.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Mod/MembersPrint.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Rsrc/SA-Menus.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Rsrc/Strings.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Rsrc/Version.odc
Binary file not shown.
Binary file modified Blackbox/Duniter1/Rsrc/fr/Strings.odc
Binary file not shown.
Binary file modified Blackbox/Util/Mod/FuncL.odc
Binary file not shown.
Binary file modified Blackbox/Util/Mod/FuncU.odc
Binary file not shown.
Binary file modified Blackbox/Util/Mod/Json.odc
Binary file not shown.
Binary file modified Blackbox/Util/Mod/Mutex.odc
Binary file not shown.
3 changes: 3 additions & 0 deletions Documentation/Duniter1/Manual.fr.txt
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@ Flux de membres par membre : Flux de membres divisé par le nombre de membres :
Nombre de premières entrées : Affiche la liste des dates des blocs où le nombre de membres entrant pour la première fois dans la toile de confiance a changé et les nombres de premières entrées correspondantes depuis le début de la monnaie (avec tracé).
Flux de premières entrées : Variation du nombre de premières entrées par unité de temps (ici: le mois). C'est donc la dérivée du nombre de premières entrées par rapport au temps : (avec tracé).
Flux de premières entrées par membre : Flux de premières entrées divisé par le nombre de membres : , en pourcentage par unité de temps (avec tracé).
Pertes : Affiche la liste des dates des blocs où le nombre de membres a changé et les différences correspondantes entre les premières entrées et les nombres de membres depuis le début de la monnaie (avec tracé).
Flux de pertes : Variation des pertes par unité de temps (ici: le mois). C'est donc la dérivée des pertes par rapport au temps : (avec tracé).
Flux de pertes par membre : Flux de pertes divisé par le nombre de membres : , en pourcentage par unité de temps (avec tracé).
Nombre de membres jour par jour : Affiche la liste des numéros des jours et des nombres de membres correspondants depuis le début de la monnaie (avec tracé).

Use it and enjoy! - ¡Úsalos y disfrútalos! - Bonne utilisation - Приятного использованияn - Powodzenia - Viel Spaß
Expand Down
6 changes: 3 additions & 3 deletions Documentation/MakingOfWotWizard.txt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
Making of WotWizard


Download the Blackbox Component Framework Version 1.7 at:
Download the Blackbox Component Framework Version 1.7.1 at:

http://blackboxframework.org/stable/blackbox-1.7.zip
http://blackboxframework.org/stable/blackbox-1.7.1.zip

and extract it into a new empty directory (let's call it "NewBB").
Download the source code of the last "Stand Alone" version of WotWizard at:

https://github.com/duniter/WotWizard/releases

and extract the content of the "Standalone version/Blackbox" directory into "NewBB" (merge all subdirectories and replace all files when asked).
and extract the content of its "Blackbox" directory into "NewBB" (merge all subdirectories and replace all files when asked).

Then, run "NewBB/BlackBox.exe" (double click), open this file (command "File -> Open") itself in the BlackBox framework (NewBB/Duniter1/Docu/MakingOfWotWizard.odc) and execute the commands below, by clicking on the black-disk icons (when small windows open, click on OK). Then read the last lines at the bottom of this text.

Expand Down
Binary file modified Help/Manual.fr.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion Sources/Duniter1/Basic.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MODULE Duniter1Basic;

CONST

version = "3.1.0";
version = "3.1.1";

initDir* = "Duniter1/Rsrc";
logName = "Log.txt";
Expand Down
2 changes: 1 addition & 1 deletion Sources/Duniter1/BasicPrint.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ MODULE Duniter1BasicPrint;

CONST

version = "3.1.0";
version = "3.1.1";

year0 = 1970; month0 = 1; day0 = 1; (* Start date of computing history *)

Expand Down
2 changes: 1 addition & 1 deletion Sources/Duniter1/BasicUpdt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ MODULE Duniter1BasicUpdt;

CONST

version = "3.1.0";
version = "3.1.1";

(* Directory & name of the file where the path to the Duniter database is written *)
initDir = "Duniter1/Rsrc";
Expand Down
5 changes: 4 additions & 1 deletion Sources/Duniter1/Blockchain.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2031,6 +2031,9 @@ MODULE Duniter1Blockchain;
BEGIN (*Do*)
IF BA.Check("", stopName) THEN
BA.SwitchOff("", stopName);
Services.RemoveAction(dispatch);
mutex.Stop;
CloseB;
lg.Msg("Halting");
HostMenus.Exit;
END;
Expand Down Expand Up @@ -2089,6 +2092,6 @@ MODULE Duniter1Blockchain;
Init;
CLOSE
Services.RemoveAction(dispatch);
mutex.Stop;
CloseB;
mutex.Unlock(NIL, NIL);
END Duniter1Blockchain.
33 changes: 22 additions & 11 deletions Sources/Duniter1/BlockchainUpdt.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2155,14 +2155,31 @@ Si le membre retrouve ses cinq certifications, il doit se renouveler pour reveni
Services.DoLater(update, Services.Ticks() + verifyPeriod)
END UpdateAll;

PROCEDURE DoUpdates (d: ANYPTR; done: BOOLEAN);
PROCEDURE EndUnlock (data: ANYPTR; done: BOOLEAN);

VAR

l: UpdateList;
f: Files.File;
res: INTEGER;

BEGIN (*EndUnlock*)
IF done THEN
lg.Msg("Update done; mutex released");
f := Files.dir.New(dLoc, Files.dontAsk);
lg.Assert(f # NIL, 100, 0, "BlockchainUpdt.EndUnlock");
f.Register(dSyncName, "txt", Files.dontAsk, res);
lg.Assert(res = 0, 101, res, "BlockchainUpdt.EndUnlock");
lg.Msg('"' + dSyncName + '" written'); lg.Msg("");
UpdateAll;
END;
END EndUnlock;

PROCEDURE DoUpdates (d: ANYPTR; done: BOOLEAN);

VAR

l: UpdateList;

BEGIN (*DoUpdates*)
IF done THEN
lg.Msg("Mutex acquired; starting update");
Expand All @@ -2179,14 +2196,7 @@ Si le membre retrouve ses cinq certifications, il doit se renouveler pour reveni
END;
CloseB;
BA.Collect;
mutex.Unlock(NIL, NIL);
lg.Msg("Update done; mutex released");
f := Files.dir.New(dLoc, Files.dontAsk);
lg.Assert(f # NIL, 100, 0, "BlockchainUpdt.DoUpdates");
f.Register(dSyncName, "txt", Files.dontAsk, res);
lg.Assert(res = 0, 101, res, "BlockchainUpdt.DoUpdates");
lg.Msg('"' + dSyncName + '" written'); lg.Msg("");
UpdateAll;
mutex.Unlock(EndUnlock, NIL);
ELSIF Services.Ticks() > d(MutexData).t1 THEN
WITH d: MutexData DO
INC(d.t1, addDelay);
Expand Down Expand Up @@ -2274,7 +2284,8 @@ Si le membre retrouve ses cinq certifications, il doit se renouveler pour reveni
PROCEDURE Stop*;

BEGIN (*Stop*)
mutex.Unlock(NIL, NIL);
Services.RemoveAction(update);
mutex.Stop;
END Stop;

PROCEDURE Init;
Expand Down
2 changes: 1 addition & 1 deletion Sources/Duniter1/GQLReceiver.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ MODULE Duniter1GQLReceiver;

VAR

sel: G. SelectionSet;
sel: G.SelectionSet;
call: Dialog.String;
res: INTEGER;
v: G.Value;
Expand Down
Loading

0 comments on commit fd569c8

Please sign in to comment.