Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28cc88b4b8 | ||
|
|
c9925cd03c | ||
|
|
40f9465929 | ||
|
|
359805b713 | ||
|
|
31565b9170 | ||
|
|
9c2a0541df | ||
|
|
38d7d587fa | ||
|
|
f19ab9455a | ||
|
|
cadffe40d6 | ||
|
|
5a195e2822 | ||
|
|
63592b91a9 | ||
|
|
88345c58a7 | ||
|
|
7124b2b61c | ||
|
|
f93e6a7d7c | ||
|
|
5d46401b85 | ||
|
|
97867080d9 | ||
|
|
93a4b44143 | ||
|
|
5e3e5628d2 | ||
|
|
4a6349cd9c | ||
|
|
e9c998fec8 | ||
|
|
290b8918fc | ||
|
|
0e6de5d0f0 | ||
|
|
98d30a326e | ||
|
|
5f64499984 | ||
|
|
6e32c740ae | ||
|
|
e0721715d0 | ||
|
|
10edc00973 | ||
|
|
f8829ce82c | ||
|
|
ac91b712a3 | ||
|
|
4bccbbac33 | ||
|
|
5c8b7290ba | ||
|
|
288713ce5b | ||
|
|
ff3b5a320c | ||
|
|
a2e0f6a517 | ||
|
|
7356e5dd30 | ||
|
|
933c6c1952 | ||
|
|
d8fd4488e2 | ||
|
|
fef2a2e979 | ||
|
|
f001dffb68 | ||
|
|
2818644b7f | ||
|
|
86d93fd702 | ||
|
|
593cc0c91b | ||
|
|
32a316589b | ||
|
|
d4bc9bdf75 | ||
|
|
3325ba935b | ||
|
|
345f24996f | ||
|
|
4040b2456c | ||
|
|
8e77d31a5a | ||
|
|
6e029beafc | ||
|
|
f5a7cd5984 | ||
|
|
d4d5e26a2b | ||
|
|
92990948ad | ||
|
|
bf6d40f398 | ||
|
|
03299db99a | ||
|
|
a0886d900e | ||
|
|
97fe038d9b | ||
|
|
58e3da8942 | ||
|
|
b7c3793a66 | ||
|
|
2498466a51 | ||
|
|
ef36eba039 | ||
|
|
c40e28ed0f | ||
|
|
b21846a513 | ||
|
|
3532f75c2b | ||
|
|
6c59919972 | ||
|
|
77d56b8bec | ||
|
|
7ef7bc13dc | ||
|
|
a1d85274b9 | ||
|
|
e7b9bc92a2 | ||
|
|
7d8e414fe2 | ||
|
|
476bcc9c55 | ||
|
|
ae006f52f4 | ||
|
|
3583a93ae0 | ||
|
|
212a00a43c | ||
|
|
e5dbba362a | ||
|
|
bdc09addfa | ||
|
|
51b3987a4a | ||
|
|
e7290fa81b | ||
|
|
b5432498c6 | ||
|
|
807592eab2 | ||
|
|
394c0779fc | ||
|
|
5b3f777100 | ||
|
|
8b36905842 | ||
|
|
b203e8e062 | ||
|
|
4d4df1bde2 | ||
|
|
876780a349 | ||
|
|
3b83377f3c | ||
|
|
e64c45b621 | ||
|
|
70dae9ab1b | ||
|
|
0bb3c5bc65 | ||
|
|
54f5c7c548 | ||
|
|
56217186ff | ||
|
|
82fb2bcc48 | ||
|
|
6dc42b637a | ||
|
|
e6d12713e3 | ||
|
|
9456cf32fc | ||
|
|
9b1fb4e7d2 | ||
|
|
c09c62f077 | ||
|
|
7a2e93a995 | ||
|
|
5327c29641 | ||
|
|
be865102a8 | ||
|
|
37f1b43b93 | ||
|
|
16f0775783 | ||
|
|
f2c4285b4c | ||
|
|
ee95f0e89e | ||
|
|
1306977954 | ||
|
|
476fa81bc2 | ||
|
|
e8f1f0ac43 | ||
|
|
cfbc2d96a1 | ||
|
|
1adf24ce77 | ||
|
|
a61d130baa | ||
|
|
0a1760cee6 | ||
|
|
3e094af325 | ||
|
|
762e4d70a0 | ||
|
|
6c4f863b96 | ||
|
|
b87f82f74d | ||
|
|
ffad53a331 | ||
|
|
662a218e41 | ||
|
|
0501ae9bec | ||
|
|
7fd38eec00 | ||
|
|
4bab4580ad | ||
|
|
21d2e6ad20 | ||
|
|
d0a8f369ef | ||
|
|
fef2e1a40c | ||
|
|
20c2cb7ea4 | ||
|
|
64a26e987e | ||
|
|
eb233847de | ||
|
|
7bb810d427 | ||
|
|
e49724072b | ||
|
|
3664ba93e9 | ||
|
|
a9903e987b | ||
|
|
f9a88a211c | ||
|
|
32535af3e6 | ||
|
|
fa8948c1b6 | ||
|
|
2d5455c09d | ||
|
|
83680bbe57 | ||
|
|
1d1a00a0ff | ||
|
|
ffd95b9fdf | ||
|
|
ecb2544cab | ||
|
|
9c66021b53 | ||
|
|
8255fc3c1b | ||
|
|
32e7413aad | ||
|
|
d87db5fd48 | ||
|
|
388368adad | ||
|
|
4d014d5a1d | ||
|
|
181a6c226f | ||
|
|
1975ed7eaa | ||
|
|
565a7530fb | ||
|
|
32cbc6bc3e | ||
|
|
7d7a05c04c | ||
|
|
6ac268b668 | ||
|
|
19c72892a8 | ||
|
|
9717968e08 | ||
|
|
e19c3229bd | ||
|
|
b3c6f1031b | ||
|
|
c2d93b4a4a | ||
|
|
76430322dd | ||
|
|
31ae0ab8e0 | ||
|
|
8182d434ec | ||
|
|
da78d0cdb1 | ||
|
|
850db144ac | ||
|
|
0f6709075f | ||
|
|
e86b84b0b9 | ||
|
|
e08d212986 | ||
|
|
7b88d955e5 | ||
|
|
d1c34fb437 | ||
|
|
611f9cdfa3 | ||
|
|
bd2fc22e96 | ||
|
|
efa16837d8 | ||
|
|
db7aad26fd | ||
|
|
229b3da2d1 | ||
|
|
48d6728e1e | ||
|
|
c51c06e6ec | ||
|
|
a425c9a6ac | ||
|
|
e79ae8ebf5 | ||
|
|
e3020d15ba | ||
|
|
83e0ecbdc7 | ||
|
|
3087023caa | ||
|
|
7e080767da | ||
|
|
44c3a91d72 | ||
|
|
26dc7d8761 | ||
|
|
e573fa4197 | ||
|
|
7aa0cf4361 | ||
|
|
c3faf45f75 | ||
|
|
fb8b5aa77f | ||
|
|
8183a284af | ||
|
|
09997a0074 | ||
|
|
c44597dfbd | ||
|
|
b1632eaea5 | ||
|
|
a2461af084 | ||
|
|
5c366839f3 | ||
|
|
311df46a2c | ||
|
|
a235f61044 | ||
|
|
0b80b86d31 | ||
|
|
0c7ede5f43 | ||
|
|
445c1ac7ba | ||
|
|
c687e05d8f | ||
|
|
5fb6fecc24 | ||
|
|
3dfbdc328e | ||
|
|
97d87f2455 | ||
|
|
a78be47e2b | ||
|
|
eed2ce4243 | ||
|
|
78ba7b70b4 | ||
|
|
f86cd4602c | ||
|
|
ee28afac86 | ||
|
|
81ff6372e9 | ||
|
|
61156f1c3e | ||
|
|
e26b170b05 | ||
|
|
ddbaa0fb94 | ||
|
|
64d2b2678a | ||
|
|
3a3b5ea2dd | ||
|
|
7cb3ac8a80 | ||
|
|
190ca5d171 | ||
|
|
5d8ec51417 | ||
|
|
d922436ada | ||
|
|
4537a829af | ||
|
|
363b9c7132 | ||
|
|
f9d83ac68c | ||
|
|
63b5cbaba7 | ||
|
|
1989914aef | ||
|
|
2c0b155baf | ||
|
|
4d20c2457a | ||
|
|
2dd9003721 | ||
|
|
94ceb44fd4 | ||
|
|
ab50d2adf4 | ||
|
|
0eb979256f | ||
|
|
5ce94a63d3 | ||
|
|
42ea50d62e | ||
|
|
0df4cf0fd5 | ||
|
|
ccf3da114b | ||
|
|
348417977d | ||
|
|
914a1f8866 | ||
|
|
cbbbeeac0b | ||
|
|
c9ea726bfb | ||
|
|
fa88e05d91 | ||
|
|
a6915020cb | ||
|
|
ea2287215e | ||
|
|
e940dead70 | ||
|
|
b6a6d54a22 | ||
|
|
11a95cb391 | ||
|
|
084c22836b | ||
|
|
726b81bf12 | ||
|
|
7c3de520d9 | ||
|
|
b450796df5 | ||
|
|
b1daadf9f2 | ||
|
|
c38e3ee446 | ||
|
|
606b9919e3 | ||
|
|
e3de7e7100 | ||
|
|
92fae0e13f | ||
|
|
a8b260ad38 | ||
|
|
faff877c80 | ||
|
|
0a0eeb3c3f | ||
|
|
cdcbbc2cf4 | ||
|
|
7565d8ee95 | ||
|
|
11e1302e05 | ||
|
|
99cb2883a1 | ||
|
|
e61dede7f8 | ||
|
|
cb4dfab482 | ||
|
|
377c508038 | ||
|
|
30e34b6847 | ||
|
|
102702e1df | ||
|
|
c014f0ef34 | ||
|
|
e615a6b9d4 | ||
|
|
f1dca727c6 | ||
|
|
2db1f4c7f7 | ||
|
|
b3d631943c | ||
|
|
b6895ae99c | ||
|
|
9f26a7323c | ||
|
|
2a7e322ee5 | ||
|
|
13a44264ac | ||
|
|
6165719829 | ||
|
|
51dd6d27c5 | ||
|
|
cea4dcd9cb | ||
|
|
e1c1f411c3 | ||
|
|
4550fc95d7 | ||
|
|
1f97af9c03 | ||
|
|
df9e1ec42d | ||
|
|
ac79fae1fb | ||
|
|
fe39f07981 | ||
|
|
b578e0c50c | ||
|
|
4408a8f368 | ||
|
|
d3e922af6e | ||
|
|
8adf878584 | ||
|
|
aa6973813f | ||
|
|
e21a64fcad | ||
|
|
8b6308d3c9 | ||
|
|
bc3ea9c4b9 | ||
|
|
04ea55e21a | ||
|
|
a68270ff67 | ||
|
|
c498ed2d96 | ||
|
|
e6d059bc19 | ||
|
|
cc500ceccf | ||
|
|
7a91969f41 | ||
|
|
6bd3605d10 | ||
|
|
6c6da90952 | ||
|
|
539b63f765 | ||
|
|
e755459004 | ||
|
|
a8f95e2386 | ||
|
|
55b200a48e | ||
|
|
6b8d7c2df2 | ||
|
|
eb7c4895ca | ||
|
|
a060dbd461 | ||
|
|
9379f7a27d | ||
|
|
19fedc2278 | ||
|
|
260efc17a9 | ||
|
|
a4026d6386 | ||
|
|
d6f7755d12 | ||
|
|
00b89635f3 | ||
|
|
f54dc07432 | ||
|
|
3bbc55b4be | ||
|
|
b58d3e005d | ||
|
|
870bb41ff7 | ||
|
|
0701531d37 | ||
|
|
43eb486700 | ||
|
|
82eeb9a478 | ||
|
|
432c263cdf | ||
|
|
c2d28b0110 | ||
|
|
23361d142e | ||
|
|
63836527c7 | ||
|
|
4f6e8249e0 | ||
|
|
ab2f775b95 | ||
|
|
bb0e176956 | ||
|
|
c0d4aced5e | ||
|
|
4ed865759a | ||
|
|
70e09d3b3a | ||
|
|
2bcfa4d121 | ||
|
|
5b497d61f0 | ||
|
|
242df7f648 | ||
|
|
421e6797f6 | ||
|
|
0886956ec8 | ||
|
|
9670bde56f | ||
|
|
3277cf551b | ||
|
|
ad5cc831a3 | ||
|
|
b00cca953e | ||
|
|
1f35020e3f | ||
|
|
f0994dd801 | ||
|
|
d002eebd49 | ||
|
|
e3ffac9ce0 | ||
|
|
e8a4d5eeed | ||
|
|
fc090dadce | ||
|
|
25e4786484 | ||
|
|
81e85ab488 | ||
|
|
201b1099bd | ||
|
|
b6054dd633 | ||
|
|
912843be25 | ||
|
|
bf49a7fc87 | ||
|
|
d77be00bcc | ||
|
|
ff0fa8ae8e | ||
|
|
92f4793181 | ||
|
|
5eaac204d5 | ||
|
|
7ef41ad886 | ||
|
|
ada396f26d | ||
|
|
674247db09 | ||
|
|
5fecd29666 | ||
|
|
71e1324a0f | ||
|
|
07cae542b0 | ||
|
|
b693f67b99 | ||
|
|
18a3d51d75 | ||
|
|
118a39bd5c | ||
|
|
5357eb9735 | ||
|
|
0946212c4b | ||
|
|
d6ab44d18e | ||
|
|
1db1a543c7 | ||
|
|
2009e8223b | ||
|
|
bdaa38ea5c | ||
|
|
713732b1dd | ||
|
|
f053539cdd | ||
|
|
fc6916bb3e | ||
|
|
97c26cb4fb | ||
|
|
10c98bb96e | ||
|
|
3e92a0c40d | ||
|
|
7c2d9891d0 | ||
|
|
3c3ac1f1df | ||
|
|
80af278a0f | ||
|
|
f3c461cbd9 | ||
|
|
f254eaee25 | ||
|
|
012408d19e | ||
|
|
f7e563e71a | ||
|
|
81c6d39c1a | ||
|
|
5adb0bdee5 | ||
|
|
d682443e1d | ||
|
|
64c99d46d4 | ||
|
|
0f0defb36f | ||
|
|
1e1ee67d4b | ||
|
|
5bc514c565 | ||
|
|
c065b19ef8 | ||
|
|
1da3461dfe | ||
|
|
b20a4c3c3d | ||
|
|
d66e75c183 | ||
|
|
31b4c47379 | ||
|
|
71bba499e0 | ||
|
|
7a08fa42d9 | ||
|
|
18a008462a | ||
|
|
d81da59398 | ||
|
|
3ab1eabe75 | ||
|
|
cf4f860db8 | ||
|
|
c68e3337ef | ||
|
|
dd5eecb1e2 | ||
|
|
db1ae613d6 | ||
|
|
a800816cda | ||
|
|
d4ef06c7c1 | ||
|
|
95d1d231c9 | ||
|
|
10b278e26f | ||
|
|
0550eef2eb | ||
|
|
73eb9919eb | ||
|
|
9116009b0b | ||
|
|
4e4ceb5074 | ||
|
|
d79e2ff187 | ||
|
|
d4a2594239 | ||
|
|
b666162bdf | ||
|
|
d705accaed | ||
|
|
d93917b081 | ||
|
|
ceff5f3083 | ||
|
|
97762756f8 | ||
|
|
2c49e991b4 | ||
|
|
c2a8f38ef5 | ||
|
|
f8a41fce08 | ||
|
|
624ae826eb | ||
|
|
d47dc0687e | ||
|
|
117e5222e4 | ||
|
|
b1c7a77f37 | ||
|
|
7b833390f1 | ||
|
|
ae08642116 | ||
|
|
c1905aa7e1 | ||
|
|
97ece018aa | ||
|
|
7f0102a881 | ||
|
|
786923bdbf | ||
|
|
deb9b2069f | ||
|
|
9308a73e8e | ||
|
|
869e116ad0 | ||
|
|
a2f3d22001 | ||
|
|
2e360943b2 | ||
|
|
8976f054c7 | ||
|
|
7bce725c63 | ||
|
|
5c83d67865 | ||
|
|
6e52b1681e | ||
|
|
f27b2cc586 | ||
|
|
1ed5d69bf4 | ||
|
|
5bb6cc40fe | ||
|
|
4c0a12dcf9 | ||
|
|
a308af41e0 | ||
|
|
02db91f3d7 | ||
|
|
4cf4015579 | ||
|
|
291b97ac9b | ||
|
|
b04e367e72 | ||
|
|
81d58122d6 | ||
|
|
874f592cf4 | ||
|
|
9b0bdd1e63 | ||
|
|
d934b5e381 | ||
|
|
14549330b9 | ||
|
|
2487bec6d6 | ||
|
|
4e1acfecdc | ||
|
|
c63c776989 | ||
|
|
44a8be6be3 | ||
|
|
a5a64f2080 | ||
|
|
16ee5a90e4 | ||
|
|
7ca6e69526 | ||
|
|
279fa0bf5e | ||
|
|
abe24611b3 | ||
|
|
17a18dde18 | ||
|
|
044818072e | ||
|
|
8bd791b2c4 | ||
|
|
c8d0d0c212 | ||
|
|
d31be61af8 | ||
|
|
a8a408b5d5 | ||
|
|
ff9d25412c | ||
|
|
de7f3e63b1 | ||
|
|
879c151524 | ||
|
|
7990a60d8b | ||
|
|
8aa0e25da2 | ||
|
|
1e6a578890 | ||
|
|
1dca9b98df | ||
|
|
de180b3635 | ||
|
|
5ca763ac8c | ||
|
|
188486f33a | ||
|
|
bc08d06bb1 | ||
|
|
05e039011a | ||
|
|
7640123299 | ||
|
|
e6dd983f97 | ||
|
|
002ebc5928 | ||
|
|
84486c03ed | ||
|
|
dc7dfb2414 | ||
|
|
ee01beb844 | ||
|
|
a31e2127e7 | ||
|
|
68b62a5630 | ||
|
|
990d44dd07 | ||
|
|
819ae41c00 | ||
|
|
bf95b7f7e6 | ||
|
|
861b78b928 | ||
|
|
a29df8f904 | ||
|
|
08c414a66e | ||
|
|
97ebf9324a | ||
|
|
0112ad63d9 | ||
|
|
bcbb440ad4 | ||
|
|
57a80d00aa | ||
|
|
70eae5f7d2 | ||
|
|
e2a65e2cdd | ||
|
|
f03b74614e | ||
|
|
532b3fd7fd | ||
|
|
64df4129d4 | ||
|
|
f6e35e2045 | ||
|
|
a97717a624 | ||
|
|
3f650de52f | ||
|
|
1f4bda7976 | ||
|
|
a4423e45f8 | ||
|
|
1386c592bf | ||
|
|
016f3fc73c | ||
|
|
7ef3184699 | ||
|
|
5f6c823301 | ||
|
|
a42c46f4d2 | ||
|
|
fb09cf254e | ||
|
|
315b913fd0 | ||
|
|
0383dc18ae | ||
|
|
f16856d23b | ||
|
|
e640fa1bc0 | ||
|
|
df3b3b604d | ||
|
|
21e6c410e2 | ||
|
|
19045329dc | ||
|
|
4586ef79f7 | ||
|
|
bc4557e21f | ||
|
|
f97d4ce3c5 | ||
|
|
f6e08f203c | ||
|
|
5dcbc6b4e1 | ||
|
|
ebe906fce0 | ||
|
|
cd4f626218 | ||
|
|
c1eb2cf447 | ||
|
|
5fec95cc4d | ||
|
|
46b943c800 | ||
|
|
fa8fe508a7 | ||
|
|
911a2bbbff | ||
|
|
2a926a8d73 | ||
|
|
d222842313 | ||
|
|
2942b6e442 | ||
|
|
926cade437 | ||
|
|
13b4413b36 | ||
|
|
706a900c8e | ||
|
|
da03f39425 | ||
|
|
f516db0e48 | ||
|
|
8744e1d73e | ||
|
|
6113d9f4cd | ||
|
|
1dd92cb089 | ||
|
|
8f6255c2cd | ||
|
|
6c4f6e269c | ||
|
|
82b0837d8c | ||
|
|
137489cc1f | ||
|
|
4dc4dfdda0 | ||
|
|
7d42c164fc | ||
|
|
ae15311471 | ||
|
|
dbcdace348 | ||
|
|
9375827949 | ||
|
|
739f401fac | ||
|
|
5f5a47679d | ||
|
|
26d1d63edb | ||
|
|
1b2f98494b | ||
|
|
381bc37d13 | ||
|
|
e7b63fe270 | ||
|
|
80ae4c36ad | ||
|
|
936bfc753a | ||
|
|
f0ccf1f4f7 | ||
|
|
3a3c4d9d73 | ||
|
|
41cffd13e0 | ||
|
|
9270dd0ff1 | ||
|
|
ba8a50e0b9 | ||
|
|
9c69f2ce6d | ||
|
|
e7a27c798a | ||
|
|
ddc612328e | ||
|
|
d05d1e6914 | ||
|
|
8bcf776813 | ||
|
|
589e591d3b | ||
|
|
e2e8c5ec9e | ||
|
|
fce034419d | ||
|
|
d9aea9eb3c | ||
|
|
4cddd43f5a | ||
|
|
becc1696cb | ||
|
|
cf4957551f | ||
|
|
794b06d55a | ||
|
|
f51f742e00 | ||
|
|
31fe765e51 | ||
|
|
40cc188815 | ||
|
|
303f6bb35b | ||
|
|
9043b6e2a3 | ||
|
|
0608b9175e | ||
|
|
ea7fda6b28 | ||
|
|
090326b75c | ||
|
|
b582e133a1 | ||
|
|
78e6f7e5a7 | ||
|
|
8173eb8de9 | ||
|
|
591cd8950c | ||
|
|
7c4c772f43 | ||
|
|
3a78d6d6f7 | ||
|
|
bbf85a6048 | ||
|
|
6dfa876809 | ||
|
|
aff86a2ffa | ||
|
|
1eb925f3dd | ||
|
|
701d76240e | ||
|
|
37ea9e9083 | ||
|
|
6457b3ad25 | ||
|
|
cba5b948de | ||
|
|
4ba232a7e4 | ||
|
|
05f3f0fc7e | ||
|
|
89a5d78ced | ||
|
|
5fc4e3903a | ||
|
|
1b70e22a58 | ||
|
|
22aeda105e | ||
|
|
7181122a3a | ||
|
|
76ce34c4ea | ||
|
|
c58620fdc2 | ||
|
|
a6341dedd2 | ||
|
|
ba7171326c | ||
|
|
78b4269a69 | ||
|
|
a30bf8e364 | ||
|
|
bd1edbaf30 | ||
|
|
bdf9264963 | ||
|
|
befe1a550d | ||
|
|
f4d3f2b28f | ||
|
|
2a1c8c1e57 | ||
|
|
a3da09cf5b | ||
|
|
017f26c03d | ||
|
|
1e2a123693 | ||
|
|
2916afb974 | ||
|
|
37963b7b21 | ||
|
|
e5b4c998cb | ||
|
|
4bf0ad40b1 | ||
|
|
420d766ae5 | ||
|
|
645a76b0e8 | ||
|
|
6288f039d2 | ||
|
|
3585b29b03 | ||
|
|
96bac8ee1f | ||
|
|
e7d14e7aa3 | ||
|
|
6b14ed7efe | ||
|
|
3d40f599d6 | ||
|
|
6ec677a047 | ||
|
|
7bb0c9d57e | ||
|
|
ec2a1da6b6 | ||
|
|
a072a28929 | ||
|
|
fc7d732e0a | ||
|
|
cc5d86328b | ||
|
|
e3cbe3cf1f | ||
|
|
9482aaf523 | ||
|
|
e0cee0fbef | ||
|
|
f9a8512477 | ||
|
|
1457db721b | ||
|
|
7774d2d7af | ||
|
|
e6d3564d9b | ||
|
|
d62e703439 | ||
|
|
0346080e16 | ||
|
|
76559f6af8 | ||
|
|
04ce79462c | ||
|
|
ffa065a3e6 | ||
|
|
0e1e3665a6 | ||
|
|
c64bcd1ff7 | ||
|
|
dd84b83302 | ||
|
|
084223037c | ||
|
|
072840a18c | ||
|
|
3ef13666dc | ||
|
|
e344678ac5 | ||
|
|
1f79e6510d | ||
|
|
b94c37dd3b | ||
|
|
b61c4da8f1 | ||
|
|
ba60585550 | ||
|
|
0ed7660e72 | ||
|
|
8b4ff41b96 | ||
|
|
8769fa260d | ||
|
|
2667737490 | ||
|
|
7cb3982a1f | ||
|
|
2336dd22f3 | ||
|
|
f13ab03192 | ||
|
|
0df813b0d2 | ||
|
|
2faebfd402 | ||
|
|
7094ff3e62 | ||
|
|
c6ab2647c1 | ||
|
|
b62d1429c0 | ||
|
|
23a0bc33fa | ||
|
|
93340a48b1 | ||
|
|
0379a8ee02 | ||
|
|
6cce02650b | ||
|
|
6e79fe4cd5 | ||
|
|
f66d8c7a34 | ||
|
|
826e532605 | ||
|
|
fc35f2fbcc | ||
|
|
216239bfce | ||
|
|
739eb56006 | ||
|
|
468405d4ea | ||
|
|
31af83ba02 | ||
|
|
45fddb9459 | ||
|
|
05dcd3bcca | ||
|
|
89a898410f | ||
|
|
4a0456cbce | ||
|
|
a525d8a2b0 | ||
|
|
d7fcf62e12 | ||
|
|
4ac86b9acb | ||
|
|
00c9ecde52 | ||
|
|
ae49908a42 | ||
|
|
37cf42c524 | ||
|
|
c43a26870e | ||
|
|
5a6574921a | ||
|
|
7fa86c29e7 | ||
|
|
a3f20796d7 | ||
|
|
835d73789e | ||
|
|
f0ac170d2f | ||
|
|
b154e3d03b | ||
|
|
633e5a53dc | ||
|
|
3f98cf8625 | ||
|
|
36fe9a51c4 | ||
|
|
74ab3aa522 | ||
|
|
cfdf175f9d | ||
|
|
c07a863018 | ||
|
|
243941db51 | ||
|
|
d6c1316178 | ||
|
|
f35048b89f | ||
|
|
24d92b2ac0 | ||
|
|
c702862bc4 | ||
|
|
400f6be9e3 | ||
|
|
5fc6951060 | ||
|
|
5ba38d5cd6 | ||
|
|
3e8132646d | ||
|
|
5aef0bbf3c | ||
|
|
bb3dadc0c7 | ||
|
|
7bb176e7c7 | ||
|
|
8c16e4ed58 | ||
|
|
e9315d9be7 | ||
|
|
46738cec6b | ||
|
|
e576bb15f1 | ||
|
|
26d18d26e9 | ||
|
|
8bac416ab5 | ||
|
|
e6aa840633 | ||
|
|
4b976d3b5f | ||
|
|
e3315c8f81 | ||
|
|
6bcbd006f1 | ||
|
|
c60a0938eb | ||
|
|
4d026afb2c | ||
|
|
4e888d9db0 | ||
|
|
440996b636 | ||
|
|
ed1a1a71ac | ||
|
|
cbe3ad0084 | ||
|
|
46935fde45 | ||
|
|
ca8dc19c83 | ||
|
|
e4a31b3497 | ||
|
|
406dc2bdd4 | ||
|
|
c325f61fce | ||
|
|
d3729cfe77 | ||
|
|
fa8f07b97e | ||
|
|
52c153fa84 | ||
|
|
21bd87f74b | ||
|
|
4d08f3c271 | ||
|
|
e44bbd5a3c | ||
|
|
f827f6bf13 | ||
|
|
4be68ba98d | ||
|
|
e47edea63b | ||
|
|
8daf89d1c4 | ||
|
|
0fa3ca5fad | ||
|
|
e3229c8183 | ||
|
|
c8606cf445 | ||
|
|
09029dc993 | ||
|
|
0a97070b90 | ||
|
|
4f57179a2e | ||
|
|
d0d7d91ab7 | ||
|
|
8497d151ab | ||
|
|
8a98f2bbca | ||
|
|
181aea2805 | ||
|
|
6a762275b6 | ||
|
|
a64430691c | ||
|
|
3cd6d31731 | ||
|
|
af30fde81a | ||
|
|
589b8dcd23 | ||
|
|
4e87135bf4 | ||
|
|
f636236935 | ||
|
|
c3d732b426 | ||
|
|
9b6abadb5a | ||
|
|
686b01c43a | ||
|
|
04afbf2f84 | ||
|
|
75f2796748 | ||
|
|
45179bc542 | ||
|
|
67729e94bf | ||
|
|
c53e82a423 | ||
|
|
02ccfa9ed7 | ||
|
|
fc5de2a097 | ||
|
|
0753c4e1b7 | ||
|
|
d8c2634a66 | ||
|
|
6f7a891a6d | ||
|
|
e4224e6358 | ||
|
|
aa8a9dccbf | ||
|
|
1732e30e58 | ||
|
|
9eedd1fff9 | ||
|
|
ac6e8a3704 | ||
|
|
c5f918c885 | ||
|
|
230712c3ea | ||
|
|
2e2f054a4f | ||
|
|
8913a774ea | ||
|
|
36c3785cde | ||
|
|
f75a25d010 | ||
|
|
5ed905df71 | ||
|
|
ea4fa81cc4 | ||
|
|
8862be991e | ||
|
|
8aea55909e | ||
|
|
1289967abb | ||
|
|
41d1fb9d59 | ||
|
|
8d9a196059 | ||
|
|
9db90debeb | ||
|
|
2333ab540e | ||
|
|
c81d65f527 | ||
|
|
bf44f5c027 | ||
|
|
d1400f12a6 | ||
|
|
c610717220 | ||
|
|
5edcf15072 | ||
|
|
e4bffce6f4 | ||
|
|
54fe032791 | ||
|
|
c668dddcfd | ||
|
|
bdc975f280 | ||
|
|
4315fb94f3 | ||
|
|
eb1163f712 | ||
|
|
42f3c02c3e | ||
|
|
31ebcf07e0 | ||
|
|
95612e8ce9 | ||
|
|
e56d88937a | ||
|
|
8c697a9621 | ||
|
|
2d3747b3d3 | ||
|
|
b38e252746 | ||
|
|
f1d6eb8990 | ||
|
|
c2c77304d7 | ||
|
|
0b051ad3c6 | ||
|
|
b72ffe03c3 | ||
|
|
01de0cfe93 | ||
|
|
d6f152958f | ||
|
|
b85962bfcd | ||
|
|
a1ae3f42f4 | ||
|
|
21876586df | ||
|
|
a317cd849f | ||
|
|
3b8a49d429 | ||
|
|
872235e94f | ||
|
|
da7ef60bef | ||
|
|
824669f70f | ||
|
|
558085705f | ||
|
|
19a3f3d310 | ||
|
|
49aab685fb | ||
|
|
4383599d30 | ||
|
|
ae6bca3033 | ||
|
|
1266884f93 | ||
|
|
f91527464d | ||
|
|
58f72cfa6b | ||
|
|
97f8a3ccde | ||
|
|
69134303d2 | ||
|
|
cef67540c2 | ||
|
|
ff38571933 | ||
|
|
5d0109769d | ||
|
|
6852b08cfc | ||
|
|
2896c604a5 | ||
|
|
b21b6be9ca | ||
|
|
5f043468ee | ||
|
|
e25a3ae98c | ||
|
|
4f69553bd3 | ||
|
|
38560cdcf5 | ||
|
|
7cd4d070ac | ||
|
|
e6b36f3fe5 | ||
|
|
36597d9b3d | ||
|
|
c4e965a631 | ||
|
|
15da23183b | ||
|
|
77baba0893 | ||
|
|
55da743977 | ||
|
|
a19ab7aa79 | ||
|
|
29d4c7c146 | ||
|
|
e711f0fb6f | ||
|
|
36fd8cdc8a | ||
|
|
4a24e39224 | ||
|
|
97c161fc3f | ||
|
|
00c43d91cd | ||
|
|
100cfd095e | ||
|
|
5047dbc85e | ||
|
|
1b8f9b2abc | ||
|
|
f3ad4414b6 | ||
|
|
8930c39fbe | ||
|
|
7c2908569e | ||
|
|
5598464081 | ||
|
|
69f40748e5 | ||
|
|
c7eb10884a | ||
|
|
0ec1a39328 | ||
|
|
92c9b106e3 | ||
|
|
37a9122aa8 | ||
|
|
91e780432d | ||
|
|
a1cdb1ad56 | ||
|
|
fef93209cd | ||
|
|
81f15208cf | ||
|
|
c9c5bfe093 | ||
|
|
932e4a0f98 | ||
|
|
0483a2463b | ||
|
|
149b150eda | ||
|
|
9364b99158 | ||
|
|
3adce567df | ||
|
|
fa2cc303cd | ||
|
|
e842fef434 | ||
|
|
1c89b7fb1b | ||
|
|
2b85f221bb | ||
|
|
fdebac3b6a | ||
|
|
85d6feec01 | ||
|
|
0fffc85f6c | ||
|
|
e123967577 | ||
|
|
2b31426df3 | ||
|
|
dc490cef44 | ||
|
|
49d54323f6 | ||
|
|
a81d65f595 | ||
|
|
82c386806a | ||
|
|
239ee905e7 | ||
|
|
ed3b7ba6fd | ||
|
|
d52946f31f | ||
|
|
55d96a3767 | ||
|
|
6000a91e74 | ||
|
|
bd6e200a70 | ||
|
|
1360e3ad7b | ||
|
|
ac877ad08e | ||
|
|
4aad26b0cc | ||
|
|
10cb2fbda5 | ||
|
|
2c0a6a6c87 | ||
|
|
329f52fd21 | ||
|
|
7019699e74 | ||
|
|
c2178c7b6f | ||
|
|
0ed75de06f | ||
|
|
2607d3a33b | ||
|
|
2b886fb452 | ||
|
|
bed66fbde7 | ||
|
|
2b9ee576e9 | ||
|
|
efafcb2977 | ||
|
|
0569425df1 | ||
|
|
6c8a2013d9 | ||
|
|
5c7edbef8a | ||
|
|
d417fe96c4 | ||
|
|
c4da75fe6a | ||
|
|
0bf7f6da61 | ||
|
|
8992772748 | ||
|
|
463cb520d9 | ||
|
|
399f68c03b | ||
|
|
15df4beb80 | ||
|
|
4b79940122 | ||
|
|
51ce85d453 | ||
|
|
3dfe95558f | ||
|
|
45e56e53a4 | ||
|
|
0e114fa7bb | ||
|
|
78721bdf08 | ||
|
|
143f468c26 | ||
|
|
c3f01cc9b6 | ||
|
|
0c7091e2d9 | ||
|
|
334633f0fb | ||
|
|
a52e6b86f4 | ||
|
|
40d90424a3 | ||
|
|
bb33e8077a | ||
|
|
2859d0f4ff | ||
|
|
c4c2449216 | ||
|
|
9bf125aa15 | ||
|
|
a9df5384a3 | ||
|
|
6ed71d004e | ||
|
|
92b81f4996 | ||
|
|
3b83cd3418 | ||
|
|
0cd60920ca | ||
|
|
2673ad9ce4 | ||
|
|
0c7924aa7c | ||
|
|
e7c93602a1 | ||
|
|
6a3bb38dbc | ||
|
|
1a79dc87ba | ||
|
|
dd38b3d725 | ||
|
|
35221c8973 | ||
|
|
bf0cd7685e | ||
|
|
5f37767207 | ||
|
|
cab1bceae8 | ||
|
|
48c389a27c | ||
|
|
a95364db1d | ||
|
|
4199eb6ac5 | ||
|
|
47ac8e8bef | ||
|
|
1bc9b9fc86 | ||
|
|
91510a1755 | ||
|
|
c2d1e228a8 | ||
|
|
bfa0f0fd9b | ||
|
|
9d01ab0e16 | ||
|
|
02c6430ed2 | ||
|
|
f755b7ce74 | ||
|
|
0b78522ca5 | ||
|
|
3814f9a1c9 | ||
|
|
fe4ae46784 | ||
|
|
8250efcd62 | ||
|
|
c698f2af2b | ||
|
|
7ebb683fac | ||
|
|
05ee0e86b1 | ||
|
|
1ed6274f8b | ||
|
|
7857a2ea61 | ||
|
|
8ce85e5d23 | ||
|
|
c01effbf4c | ||
|
|
a2ff3ecd9a | ||
|
|
9ae16ca6ec | ||
|
|
c7406d3bce | ||
|
|
cb8ecc752b | ||
|
|
a5ecc2383c | ||
|
|
8e6323ae48 | ||
|
|
e73f76024e | ||
|
|
83c03c998a | ||
|
|
4c522ae050 | ||
|
|
689d5a7592 | ||
|
|
c118d4fae8 | ||
|
|
1baf2e8dd5 | ||
|
|
1fcdaa8b81 | ||
|
|
71729578dd | ||
|
|
abe7bf969a | ||
|
|
673ae3908c | ||
|
|
cd7a81d828 | ||
|
|
81264fa63e | ||
|
|
5e3dbc18c3 | ||
|
|
e43c20c1e6 | ||
|
|
f65039d748 | ||
|
|
d0e70ddddc | ||
|
|
3de96a8d9d | ||
|
|
1a31c9122e | ||
|
|
9a7c264ee6 | ||
|
|
5eb030046c | ||
|
|
b3fd673f33 | ||
|
|
fb12f498a7 | ||
|
|
fd54116d55 | ||
|
|
83ecdc9a88 | ||
|
|
be1e868fc4 | ||
|
|
a1e6e646f9 | ||
|
|
29df56c8b4 | ||
|
|
064b3efa13 | ||
|
|
5cc5628956 | ||
|
|
8afa3d1e30 | ||
|
|
c53d7d9c25 | ||
|
|
8f0535dc5c | ||
|
|
02f14ffdf1 | ||
|
|
a412f2f18f | ||
|
|
8f4d233965 | ||
|
|
cc84b96024 | ||
|
|
4ff81a0b63 | ||
|
|
9b40b7eb39 | ||
|
|
5c3464a303 | ||
|
|
71bea2eea4 | ||
|
|
84fd841f86 | ||
|
|
ed0a549027 | ||
|
|
06e621399b | ||
|
|
267f30849f | ||
|
|
b8ed3d8954 | ||
|
|
b634acec67 | ||
|
|
629b856788 | ||
|
|
3035ea8d8b | ||
|
|
abe7046d4f | ||
|
|
f3007e2fe2 | ||
|
|
b60b922fef | ||
|
|
85d3345043 | ||
|
|
a7a1a4ddd1 | ||
|
|
60ee889794 | ||
|
|
9ec21d815d | ||
|
|
ac32995e01 | ||
|
|
5204b2cef2 | ||
|
|
8c99268bb8 | ||
|
|
237b2670f6 | ||
|
|
0719db17ed | ||
|
|
d50f617a85 | ||
|
|
1cfc7e6638 | ||
|
|
8b9bb68ac5 | ||
|
|
018192714c | ||
|
|
71b631fbe4 | ||
|
|
2951f5e093 | ||
|
|
e1f69e41b0 | ||
|
|
898aad3da5 | ||
|
|
7274ff5e2d | ||
|
|
ec5b9571d3 | ||
|
|
770ecdfa99 | ||
|
|
4023ae73ba | ||
|
|
7f87d22249 | ||
|
|
6225f8940e | ||
|
|
6a5183cc0c | ||
|
|
037f5ecfa5 | ||
|
|
63657151ea | ||
|
|
c4e1a4c485 | ||
|
|
4222503961 | ||
|
|
af779a1880 | ||
|
|
84a5bed66d | ||
|
|
5d3111df37 | ||
|
|
fa9ffccb19 | ||
|
|
79660bfd6e | ||
|
|
3c9bc6ce73 | ||
|
|
4a333ff988 | ||
|
|
ce8c4ebd91 | ||
|
|
0ee47e95da | ||
|
|
16916f44b9 | ||
|
|
4d2ba40287 | ||
|
|
845bf3c325 | ||
|
|
3693c32d4b | ||
|
|
bc157fcde7 | ||
|
|
9a0476aa46 | ||
|
|
fb62298bd2 | ||
|
|
d19506f1ad | ||
|
|
c7b5b40eda | ||
|
|
74c61262b7 | ||
|
|
271f977cdd | ||
|
|
2290e2eb6d | ||
|
|
0d33072a7e | ||
|
|
e823b3ae95 | ||
|
|
19d9a29459 | ||
|
|
f96f9cc62f | ||
|
|
d2e5eecf22 | ||
|
|
b9ca6bf4a9 | ||
|
|
aa68acea3d | ||
|
|
12cca24d8b | ||
|
|
bf7b18f158 | ||
|
|
3675dc5b9d | ||
|
|
1dfdcb0413 | ||
|
|
a698d46144 | ||
|
|
d32baa61a1 | ||
|
|
32cda58064 | ||
|
|
4081f96d68 | ||
|
|
16350b4dec | ||
|
|
d8fe1d8b81 | ||
|
|
5e018fc8f0 | ||
|
|
80a463a91e | ||
|
|
61fce32c60 | ||
|
|
5525fff1fe | ||
|
|
328f5656bf | ||
|
|
9ec080a107 | ||
|
|
1bae755f1c | ||
|
|
9deccb465e | ||
|
|
2ff635d0cd | ||
|
|
501000fa6b | ||
|
|
9f4b297d23 | ||
|
|
aea308a5a2 | ||
|
|
5c4948bd6d | ||
|
|
d78d9167a0 | ||
|
|
75149000db | ||
|
|
9c9fcc3dd8 | ||
|
|
4271fbb85f | ||
|
|
ba4603e850 | ||
|
|
f2bc31c97b | ||
|
|
62a1726ef1 | ||
|
|
f19941f6da | ||
|
|
3917b84b56 | ||
|
|
04e5b61732 | ||
|
|
3ecf97ac82 | ||
|
|
f6a2240b1f | ||
|
|
3c82148f44 | ||
|
|
2c43e9587d | ||
|
|
52c311887a | ||
|
|
4c25355be9 | ||
|
|
d95b299217 | ||
|
|
efa8912742 | ||
|
|
c33913bd58 | ||
|
|
295ceaa702 | ||
|
|
8c64652b33 | ||
|
|
66a9563345 | ||
|
|
fdf241c6dd | ||
|
|
113989dc46 | ||
|
|
430cff8747 | ||
|
|
aee69fa3c7 | ||
|
|
afb3483fe3 | ||
|
|
7f2ff9d341 | ||
|
|
57be80bcd4 | ||
|
|
90272fa444 | ||
|
|
73fd407aff | ||
|
|
46dc527222 | ||
|
|
b83494888b | ||
|
|
a0f964e89e | ||
|
|
30b3b8800e | ||
|
|
366baa737a | ||
|
|
453a2084e7 | ||
|
|
fe30a20882 | ||
|
|
70dcb1a6ee | ||
|
|
c4554d38c1 | ||
|
|
4deed897ff | ||
|
|
460450f524 | ||
|
|
29b5c97345 | ||
|
|
b171eb7d32 | ||
|
|
0e18d43496 | ||
|
|
bd4222adfa | ||
|
|
1e4761609d | ||
|
|
de72e2e96b | ||
|
|
95a0dabe68 | ||
|
|
9f53ad685e | ||
|
|
02c597d109 | ||
|
|
510bee115b | ||
|
|
ed250f836d | ||
|
|
a47410a0f1 | ||
|
|
704130966e | ||
|
|
b927aa81b3 | ||
|
|
d154ac96c2 | ||
|
|
6067ba601e | ||
|
|
60336c25f1 | ||
|
|
82093bcf95 | ||
|
|
7b8191e2f0 | ||
|
|
716d0af96f | ||
|
|
88dd9cf15a | ||
|
|
f917dd9284 | ||
|
|
cd68bebf03 | ||
|
|
7d4091eb24 | ||
|
|
35cc348f03 | ||
|
|
59fc80a10b | ||
|
|
ea146cbe87 | ||
|
|
c6b28ba3a0 | ||
|
|
6f3e1e31f0 | ||
|
|
fe57890da4 | ||
|
|
7df0750c58 | ||
|
|
8cd9ec939b | ||
|
|
872ff0ef62 | ||
|
|
052faed48d | ||
|
|
bcf825a4f7 | ||
|
|
31b37a7792 | ||
|
|
dfe12c8bcb | ||
|
|
89d5b2d576 | ||
|
|
3afd9f5025 | ||
|
|
601ef73b5d | ||
|
|
e4f8bc347d | ||
|
|
3cb47ee5c8 | ||
|
|
1535247e1b | ||
|
|
37dd4ebaef | ||
|
|
1e8949067b | ||
|
|
1945e94190 | ||
|
|
1ba971af24 | ||
|
|
0b5357d12a | ||
|
|
3be361b03c | ||
|
|
7681b5d326 | ||
|
|
0a35d387f7 | ||
|
|
b40efc2426 | ||
|
|
59aae7fd40 | ||
|
|
a633e4bccf | ||
|
|
6c4b67d93a | ||
|
|
b56b8099ab | ||
|
|
f9fe5c9b6c | ||
|
|
2ee8420b94 | ||
|
|
bbe127865b | ||
|
|
13b954d580 | ||
|
|
50686e1b65 | ||
|
|
7b3c3d891d | ||
|
|
98feca7fca | ||
|
|
e45eb3fd69 | ||
|
|
dd86b8b461 | ||
|
|
57d43cd5d3 | ||
|
|
14b5b5e3df | ||
|
|
f53289ef1b | ||
|
|
a7e43ca6a7 | ||
|
|
8ca21c413f | ||
|
|
1b3ce91582 | ||
|
|
61fd54c496 | ||
|
|
b017127b3a | ||
|
|
52f2d15280 | ||
|
|
5c86e46c72 | ||
|
|
a5648851f2 | ||
|
|
cb41520a20 | ||
|
|
537612e5e3 | ||
|
|
4e0c671f68 | ||
|
|
507cfb9d53 | ||
|
|
2013009e8a | ||
|
|
f1a1d08458 | ||
|
|
7de6cc4468 | ||
|
|
783d83e4cc | ||
|
|
c366a1a4e7 | ||
|
|
b784cab94b | ||
|
|
78e361d486 | ||
|
|
3b1f135fdb | ||
|
|
2f93d1a83f | ||
|
|
653a26fee1 | ||
|
|
e33c9cb2f0 | ||
|
|
4be43528e3 | ||
|
|
9d343a42ce | ||
|
|
459722610a | ||
|
|
f745dce04e | ||
|
|
c1f4aaf957 | ||
|
|
f4bf8d3766 | ||
|
|
6e94d7a707 | ||
|
|
87e8e17e91 | ||
|
|
9e79178d0f | ||
|
|
9d0168a9ee | ||
|
|
9760d41561 | ||
|
|
0c039793df | ||
|
|
4cec45131e | ||
|
|
e6c08cb4e4 | ||
|
|
2d17d8cfe4 | ||
|
|
ef583fc9bb | ||
|
|
db87b1e214 | ||
|
|
5790bdfe82 | ||
|
|
731567369e | ||
|
|
317cbf904d | ||
|
|
f4561494f6 | ||
|
|
5164891928 | ||
|
|
5e79e29823 | ||
|
|
cc3649fcb8 | ||
|
|
ab11d15729 | ||
|
|
0e75d67671 | ||
|
|
ba81f923d9 | ||
|
|
a0cdb182fd | ||
|
|
ca7296ca8c | ||
|
|
fb2d0d3e71 | ||
|
|
2afd641f0f | ||
|
|
d871bbfc3b | ||
|
|
5e9ab81363 | ||
|
|
d0acface41 | ||
|
|
aea7cdb823 | ||
|
|
e066c6ab94 | ||
|
|
8e82772cfc | ||
|
|
441a064d84 | ||
|
|
ee6b2a94eb | ||
|
|
07761716e4 | ||
|
|
6dc96b86b4 | ||
|
|
8c2874e04d | ||
|
|
c7001bf0fa | ||
|
|
f62b209ffb | ||
|
|
0fe71b2b92 | ||
|
|
e528ba5278 | ||
|
|
fd1b2b1041 | ||
|
|
e5422c71f5 | ||
|
|
efd8960e1e | ||
|
|
8dcb0a298e | ||
|
|
acbd3537c0 | ||
|
|
145c301eed | ||
|
|
ec91a8b63f | ||
|
|
ffdeb28bfd | ||
|
|
df1ac5586e | ||
|
|
ab1b7a2605 | ||
|
|
53456cf7fa | ||
|
|
1cbdda1ec5 | ||
|
|
ba2fa25636 | ||
|
|
5189cbaa6f | ||
|
|
f1ce2e4b10 | ||
|
|
50ae49c0ec | ||
|
|
502c2240f7 | ||
|
|
b784f00b92 | ||
|
|
0c0d7f3481 | ||
|
|
457dac477a | ||
|
|
dc114f759d | ||
|
|
672f81f216 | ||
|
|
3516986ff2 | ||
|
|
7ecd98a5fb | ||
|
|
1fdeab9685 | ||
|
|
ebd4e64cc3 | ||
|
|
1452f4129f | ||
|
|
04d43f3f28 | ||
|
|
b7ebf961ac | ||
|
|
28c7a0177a | ||
|
|
9c5ea0bdd9 | ||
|
|
cd540b0146 | ||
|
|
62860750f2 | ||
|
|
4d8277c5c2 | ||
|
|
b9fddcf78c | ||
|
|
a834e1905d | ||
|
|
de1f5c1944 | ||
|
|
6d9b193d25 | ||
|
|
982d346264 | ||
|
|
4c927eb7c7 | ||
|
|
fead93f0b9 | ||
|
|
ca3ba3adb6 | ||
|
|
9f87a38107 | ||
|
|
329572d191 | ||
|
|
ae21315593 | ||
|
|
b209547a5b | ||
|
|
8a0f214144 | ||
|
|
5ff3b9457a | ||
|
|
8ec25cac46 | ||
|
|
39180f8ea3 | ||
|
|
2203b2ca8b | ||
|
|
faab0d78cf | ||
|
|
c3a5ea1b91 | ||
|
|
6349c4f752 | ||
|
|
8c5fa68f11 | ||
|
|
a487cd8e64 | ||
|
|
92eac86c68 | ||
|
|
cd2e29a77d | ||
|
|
ce090c6437 | ||
|
|
f80be0f3da | ||
|
|
fd9a338365 | ||
|
|
776164310b | ||
|
|
52ab9f4ade | ||
|
|
88c75c0d35 | ||
|
|
cd571b6ec4 | ||
|
|
701f9ab69b | ||
|
|
6d47664767 | ||
|
|
8cb8c50998 | ||
|
|
f14a149748 | ||
|
|
beb2c2fec0 | ||
|
|
48e010f195 | ||
|
|
e350b7d8f5 | ||
|
|
e7e1582836 | ||
|
|
9d9a8a7ced | ||
|
|
aef81d088c | ||
|
|
35b421b4df | ||
|
|
dbbae7a53f | ||
|
|
b9ace9f58f | ||
|
|
48aa5cb1aa | ||
|
|
b517c38cb9 | ||
|
|
d158c8ad7a | ||
|
|
8c9eeb6160 | ||
|
|
aedb8c46fc | ||
|
|
1ff895368e | ||
|
|
48e30125bb | ||
|
|
db416d25de | ||
|
|
da18a8b712 | ||
|
|
48c98cddba | ||
|
|
16a0e03d1d | ||
|
|
e0f580daf6 | ||
|
|
c1c16964eb | ||
|
|
d0134d6415 | ||
|
|
9f4c759ea3 | ||
|
|
661e2071d1 | ||
|
|
0f25334032 | ||
|
|
334ada3dcc | ||
|
|
df0b5bb014 | ||
|
|
20686086d8 | ||
|
|
1be8f6c434 | ||
|
|
f8c16d8c7c | ||
|
|
7f3cf46ee1 | ||
|
|
632cd2cd4c | ||
|
|
0f5243f36a | ||
|
|
137368cc27 | ||
|
|
e343d284d9 | ||
|
|
a23692a29c | ||
|
|
30170df1b1 | ||
|
|
3be4e6c112 | ||
|
|
e5650b5378 | ||
|
|
67f534a6f6 | ||
|
|
51031e7359 | ||
|
|
e215e0f14a | ||
|
|
1099d5f282 | ||
|
|
330761a372 | ||
|
|
81f38b942c | ||
|
|
07cefceed8 | ||
|
|
ed5e520b35 | ||
|
|
36b62260b1 | ||
|
|
3e085dd7c6 | ||
|
|
a18fd29795 | ||
|
|
76e4f4b80e | ||
|
|
8466531916 | ||
|
|
a4c5d34720 | ||
|
|
2e158f4c1b | ||
|
|
b3a7e7f465 | ||
|
|
1a66188411 | ||
|
|
485b2cad1e | ||
|
|
3bcd90f7ae | ||
|
|
586f17dc2a | ||
|
|
9863b05c30 | ||
|
|
a9f92637ca | ||
|
|
6b8b1b8e1e | ||
|
|
c3c5802be2 | ||
|
|
ab776f15f4 | ||
|
|
ebc3e938bf | ||
|
|
9cc3bb23c0 | ||
|
|
d2f275c49f | ||
|
|
aec31df520 | ||
|
|
76745dc9d0 | ||
|
|
25dce4d386 | ||
|
|
1c736df647 | ||
|
|
aeae8fb710 | ||
|
|
6055065e27 | ||
|
|
a08b2c77d6 | ||
|
|
f9a099a284 | ||
|
|
62fcafa982 | ||
|
|
065d94eb4a | ||
|
|
7760181baa | ||
|
|
9302d1fabc | ||
|
|
d1d63c8c29 | ||
|
|
bfd166b717 | ||
|
|
4f747f8fa7 | ||
|
|
2111307965 | ||
|
|
065e1f063f | ||
|
|
5226836211 | ||
|
|
c58dc5785a | ||
|
|
30d76da32f | ||
|
|
876521fdea | ||
|
|
e1e5279366 | ||
|
|
32886c5034 | ||
|
|
41e14208e4 | ||
|
|
b79fc28a5f | ||
|
|
ef72ff6903 | ||
|
|
82e8b510ca | ||
|
|
8109ddf78f | ||
|
|
f0f6ad17e2 | ||
|
|
83d53a46fb | ||
|
|
a8c8e14d6a | ||
|
|
e96e291ec4 | ||
|
|
e03ebedfdf | ||
|
|
deaf114fa3 | ||
|
|
0071ef22d7 | ||
|
|
58924aaf3a | ||
|
|
d6af6ce486 | ||
|
|
b1d0e6dc55 | ||
|
|
a200adb51a | ||
|
|
6ea00200b0 | ||
|
|
5cf03d7ae0 | ||
|
|
3b5fbdabd4 | ||
|
|
18c5d9b480 | ||
|
|
fe5c050c61 | ||
|
|
a7c56e3920 | ||
|
|
a519228856 | ||
|
|
e1f5628a4f | ||
|
|
e4eee1c29e | ||
|
|
0fc5bd3c10 | ||
|
|
77de17d7e3 | ||
|
|
87fcf1c610 | ||
|
|
8895d0d565 | ||
|
|
6340d9ea0b | ||
|
|
62aaa276a7 | ||
|
|
0391775fed | ||
|
|
400b743feb | ||
|
|
754910f514 | ||
|
|
614285804d | ||
|
|
1b22ba436b | ||
|
|
387d462c2c | ||
|
|
e6178525d7 | ||
|
|
a663dc482c | ||
|
|
b913d76972 | ||
|
|
ab276db78c | ||
|
|
34038d2844 | ||
|
|
c27ea5c447 | ||
|
|
a8c71e475e | ||
|
|
41673145ee | ||
|
|
4757c7d051 | ||
|
|
5619b98468 | ||
|
|
630eb98343 | ||
|
|
5412cb4d2d | ||
|
|
8f46f128ff | ||
|
|
8807d4d98b | ||
|
|
7719f5270d | ||
|
|
afb4c1b61e | ||
|
|
28bea42b15 | ||
|
|
955af412ea | ||
|
|
49dd3c65e1 | ||
|
|
b2f41f88c9 | ||
|
|
f3500c7f24 | ||
|
|
1cbdc9deff | ||
|
|
89652cc080 | ||
|
|
fe3f151e0b | ||
|
|
16caae9d40 | ||
|
|
d541becb1a | ||
|
|
21e97d4e30 | ||
|
|
9fd9bd95f4 | ||
|
|
fe9c348ee0 | ||
|
|
0d36ba188e | ||
|
|
5a6d55c2ca | ||
|
|
36ad9562eb | ||
|
|
bf06a9fe43 | ||
|
|
34c9fbd77a | ||
|
|
f4ca2650e5 | ||
|
|
1d0aded01d | ||
|
|
3322bafdca | ||
|
|
6a0f66c244 | ||
|
|
40757b949d | ||
|
|
b6c91f63f7 | ||
|
|
e36206b436 | ||
|
|
797a853b36 | ||
|
|
bdc5e35453 | ||
|
|
1bd05ee1c2 | ||
|
|
dc406147df | ||
|
|
87fa63d8f9 | ||
|
|
2355a14a0c | ||
|
|
69e94e978c | ||
|
|
97fafe9b9b | ||
|
|
312abc9501 | ||
|
|
ca8c7a23fd | ||
|
|
9d69d60ea8 | ||
|
|
7ab6db184d | ||
|
|
e72d06bf6f | ||
|
|
fbf342f1ad | ||
|
|
699e174b3d | ||
|
|
48f6c09436 | ||
|
|
bab2c33e38 | ||
|
|
c725e15015 | ||
|
|
3bad91ec37 | ||
|
|
ceaab3c2fc | ||
|
|
e183c5d1de | ||
|
|
dc73213bee | ||
|
|
2ed57fbbe0 | ||
|
|
4de04d1af8 | ||
|
|
7ae64d390f | ||
|
|
f56d87f648 | ||
|
|
6c65d84d5e | ||
|
|
490b5466da | ||
|
|
3805cc9932 | ||
|
|
b56172328e | ||
|
|
e4a012b5a3 | ||
|
|
3dfdc308e3 | ||
|
|
14a2abaebd | ||
|
|
d0afd0ed74 | ||
|
|
473aac4500 | ||
|
|
ad59afc4f5 | ||
|
|
3be2973032 | ||
|
|
b5a3ee7568 | ||
|
|
aad7d75fa6 | ||
|
|
70f1581a3b | ||
|
|
641003ded4 | ||
|
|
28526d8f91 | ||
|
|
416a807e5d | ||
|
|
e723b56e18 | ||
|
|
67b76a3113 | ||
|
|
1169f3cc94 | ||
|
|
82ab7b5429 | ||
|
|
9b3a281e35 | ||
|
|
00f0e39eda | ||
|
|
1e7e5b0328 | ||
|
|
8afd5023e9 | ||
|
|
100003ad90 | ||
|
|
7fd6e4469b | ||
|
|
793289dd80 | ||
|
|
ab10970025 | ||
|
|
3c9eccdfab | ||
|
|
6c4636917a | ||
|
|
56b170d767 | ||
|
|
318f6e9965 | ||
|
|
63f7095508 | ||
|
|
1965782348 | ||
|
|
a54bf30c3d | ||
|
|
1e245004c9 | ||
|
|
03c3c37435 | ||
|
|
19ad9c4d1a | ||
|
|
c183e5016c | ||
|
|
4790b9c071 | ||
|
|
770bb5f96f | ||
|
|
6319ac9310 | ||
|
|
b6f0c6f49a | ||
|
|
486ff5c239 | ||
|
|
73475220e9 | ||
|
|
852a3f58ff | ||
|
|
8b8aff7df1 | ||
|
|
e86111bd7a | ||
|
|
870cba5005 | ||
|
|
c5df959210 | ||
|
|
631e52b486 | ||
|
|
5e32082fcf | ||
|
|
8834afa4f3 | ||
|
|
0d88b954d8 | ||
|
|
46602227af | ||
|
|
99fe5e8f74 | ||
|
|
9e9f56ee65 | ||
|
|
cf53985fed | ||
|
|
0ace259d2d | ||
|
|
f73b9b06c0 | ||
|
|
906ed801c7 | ||
|
|
975f2027ed | ||
|
|
22f3823699 | ||
|
|
c81dfb3ccc | ||
|
|
2c8c2699ef | ||
|
|
7fd570c5a7 | ||
|
|
76ab3114f0 | ||
|
|
76975a85e0 | ||
|
|
7b9c725f04 | ||
|
|
6fea7baea2 | ||
|
|
9c2b2033ec | ||
|
|
f67b7c6f60 | ||
|
|
fb0f1ad866 | ||
|
|
2b1fa93ebe | ||
|
|
e3140763ba | ||
|
|
e60b388930 | ||
|
|
f4914934f2 | ||
|
|
7115632d30 | ||
|
|
52112a5413 | ||
|
|
07798bbf46 | ||
|
|
134c66d51c | ||
|
|
84cf693528 | ||
|
|
7ef2df8535 | ||
|
|
4d95e42d20 | ||
|
|
30702cb118 | ||
|
|
e930bcaa91 | ||
|
|
1e2432e298 | ||
|
|
1243b2dc88 | ||
|
|
f2b97b68bd | ||
|
|
2149fa0dcb | ||
|
|
6293c6206c | ||
|
|
f451731877 | ||
|
|
d74c78eff5 | ||
|
|
af347349e1 | ||
|
|
2f47b190ac | ||
|
|
655982e908 | ||
|
|
82eba020ac | ||
|
|
eb65ce4c1b | ||
|
|
691ec4f3bd | ||
|
|
c1069adc2f | ||
|
|
097b5eb7fc | ||
|
|
e965e2b4c1 | ||
|
|
d81f341303 | ||
|
|
1ea6fd7c54 | ||
|
|
3025c995b6 | ||
|
|
ecc75c45eb | ||
|
|
09dcf486d8 | ||
|
|
592c1e5dbc | ||
|
|
cd3baf2870 | ||
|
|
93734ff1b9 | ||
|
|
dfb7d37cfb | ||
|
|
83aa6a5791 | ||
|
|
45f020edaa | ||
|
|
ad1c5c487e | ||
|
|
5c323b28e2 | ||
|
|
da2250df3a | ||
|
|
cb1d6b4db7 | ||
|
|
f96cee145c | ||
|
|
e4670e4a4d | ||
|
|
5c0f90b43e | ||
|
|
e6de528b7f | ||
|
|
dfff8d2fcb | ||
|
|
33a1fd2b52 | ||
|
|
f083b7f6ef | ||
|
|
25de73812b | ||
|
|
6b232d2971 | ||
|
|
9c0ffa8356 | ||
|
|
ffbd2e2413 | ||
|
|
58300b8c1a | ||
|
|
cd2fda8224 | ||
|
|
73ae571de1 | ||
|
|
7aee4c64a3 | ||
|
|
c3cae35de4 | ||
|
|
2736d2f399 | ||
|
|
00afc6c06b | ||
|
|
4eefa88490 | ||
|
|
92e54bf11e | ||
|
|
c11350d49a | ||
|
|
8f5fb4cc3b | ||
|
|
fc7a7bb7fd | ||
|
|
5a1c363e8a | ||
|
|
77a6da3024 | ||
|
|
c4a66281f6 | ||
|
|
7ffc2482fc | ||
|
|
f37da68a67 | ||
|
|
f64ed131f9 | ||
|
|
79b31e8d08 | ||
|
|
d1c8e3e4f5 | ||
|
|
c253ad832d | ||
|
|
6081b09267 | ||
|
|
592c2c9a72 | ||
|
|
ce45776a63 | ||
|
|
02bbdf9fda | ||
|
|
6c9e90ceaf | ||
|
|
b99be5a280 | ||
|
|
1acd582de9 | ||
|
|
8ce5a4d215 | ||
|
|
ccb55ff4e1 | ||
|
|
3ef4b40558 | ||
|
|
c667d94e84 | ||
|
|
1b601460e6 | ||
|
|
7db65f127e | ||
|
|
f302e18d71 | ||
|
|
352c0beb27 | ||
|
|
d6561ab44d | ||
|
|
5d9b6f99c6 | ||
|
|
163a842384 | ||
|
|
eea355a784 | ||
|
|
1ab1cb37b0 | ||
|
|
be19a11387 | ||
|
|
062743d748 | ||
|
|
ac2a2002b7 | ||
|
|
6951b82339 | ||
|
|
e41c23120a | ||
|
|
4c5281ea30 | ||
|
|
7b7ba2eb37 | ||
|
|
4a43653d7f | ||
|
|
0307927fa9 | ||
|
|
db11c9d968 | ||
|
|
d85e5c4666 | ||
|
|
45ee8a9662 | ||
|
|
5ab06dbe51 | ||
|
|
d73e901a96 | ||
|
|
c17e39e3cf | ||
|
|
af4cce96ef | ||
|
|
0a780e5f78 | ||
|
|
fb2b1f680f | ||
|
|
6957986632 | ||
|
|
13d23502a9 | ||
|
|
5fa888768e | ||
|
|
07451899c4 | ||
|
|
2aa693e4ae | ||
|
|
ff480fb593 | ||
|
|
d6753dc986 | ||
|
|
2d2484d8fa | ||
|
|
bb97f1977b | ||
|
|
eb26eba131 | ||
|
|
2d3e214514 | ||
|
|
894a7c8477 | ||
|
|
21197ead23 | ||
|
|
d79a0cc973 | ||
|
|
a55669d181 | ||
|
|
2fd44fbfb4 | ||
|
|
962bfa945d | ||
|
|
65c1163a55 | ||
|
|
8d67442ca3 | ||
|
|
f7d2ac8b86 | ||
|
|
4f91de4c97 | ||
|
|
37b04961f1 | ||
|
|
0a63f16f62 | ||
|
|
92eb729a39 | ||
|
|
d891c9783d | ||
|
|
51858597cd | ||
|
|
8b3baf433f | ||
|
|
12e3d779c6 | ||
|
|
c6274890a7 | ||
|
|
907fc0c53a | ||
|
|
b4ee76416e | ||
|
|
a88b42a8ef | ||
|
|
08f01aee69 | ||
|
|
c69cbdb34e | ||
|
|
01fd7dbec8 | ||
|
|
2af9b0018c | ||
|
|
7f8e8d5a9f | ||
|
|
c9887a97e7 | ||
|
|
1a708921e3 | ||
|
|
9fe1b35a59 | ||
|
|
edf744eee1 | ||
|
|
e400980103 | ||
|
|
b12e935a5d | ||
|
|
1d4422e9c5 | ||
|
|
1a10da9c89 | ||
|
|
470eae8b92 | ||
|
|
9b53b4302b | ||
|
|
461202219d | ||
|
|
ddfaa3a73f | ||
|
|
3e531130fe | ||
|
|
595eb29c42 | ||
|
|
ccbbc83502 | ||
|
|
fd0a8ddf51 | ||
|
|
ce5808e3ce | ||
|
|
4dafa345b4 | ||
|
|
90776f0af9 | ||
|
|
32777456b9 | ||
|
|
dcaa7fafbd | ||
|
|
17eb3e8184 | ||
|
|
7bbca7cf54 | ||
|
|
3c738ebcb9 | ||
|
|
6522cea03f | ||
|
|
ea2dbfba3e | ||
|
|
8d92fbbdac | ||
|
|
77f06aaa07 | ||
|
|
b79c5b30c0 | ||
|
|
fdac834d48 | ||
|
|
4355be1a9c | ||
|
|
66f6d3505b | ||
|
|
65c261887c | ||
|
|
6c794d2eb4 | ||
|
|
51c912f3a8 | ||
|
|
76e90f417e | ||
|
|
e556bcff54 | ||
|
|
4833685e2e | ||
|
|
2d7681086d | ||
|
|
f44ac69d68 | ||
|
|
32684af292 | ||
|
|
862ec88191 | ||
|
|
d36a9cd340 | ||
|
|
afafbb0c5e | ||
|
|
e3f01b575a | ||
|
|
d6924998d9 | ||
|
|
0ae5c02ea0 | ||
|
|
e395f9f575 | ||
|
|
f074e1fdf2 | ||
|
|
4d1eb0fecc | ||
|
|
f5fdde9a5d | ||
|
|
32aa5bece5 | ||
|
|
cdfb867037 | ||
|
|
021971816a | ||
|
|
e4386e20a3 | ||
|
|
8760cd364d | ||
|
|
4c40f675b5 | ||
|
|
325bb9ed02 | ||
|
|
505d1aeb48 | ||
|
|
1dd189cbd4 | ||
|
|
fa7490dee8 | ||
|
|
7fda5b6b4a | ||
|
|
3ff0883eca | ||
|
|
04c8f1ae5f | ||
|
|
f73000056c | ||
|
|
4605950b94 | ||
|
|
ae40097b51 | ||
|
|
daaa9b193e | ||
|
|
98ee3ee6ec | ||
|
|
b77aed2395 | ||
|
|
45afdc25f9 | ||
|
|
2ae681cebc | ||
|
|
cc465a050c | ||
|
|
1fd840d33f | ||
|
|
cc237fffa8 | ||
|
|
bb27d4ec20 | ||
|
|
255f7302ea | ||
|
|
9e0b4fd243 | ||
|
|
2e926c9ece | ||
|
|
bcc2d2f4d4 | ||
|
|
e3555b2c51 | ||
|
|
e99037223b | ||
|
|
9f2b81d385 | ||
|
|
2c592b25b9 | ||
|
|
bf05b5ddc1 | ||
|
|
fa2454d079 | ||
|
|
8544dd1144 | ||
|
|
1f8b0bddb4 | ||
|
|
5b2ee80329 | ||
|
|
acfb876da0 | ||
|
|
ab9ebc6400 | ||
|
|
a603c3a63f | ||
|
|
d0ea629c10 | ||
|
|
b35be16268 | ||
|
|
7644927de9 | ||
|
|
242b1a4e50 | ||
|
|
397b5b0cab | ||
|
|
8da1cb622f | ||
|
|
7365bf70b6 | ||
|
|
2825d02cb2 | ||
|
|
24cb32c96c | ||
|
|
820adf2bb7 | ||
|
|
4211855732 | ||
|
|
44b057c522 | ||
|
|
f4d580a000 | ||
|
|
a77c342e69 | ||
|
|
559d7dc006 | ||
|
|
1a47bbe19d | ||
|
|
b1c658d711 | ||
|
|
2ff4f63d23 | ||
|
|
ba087f12a5 | ||
|
|
a64a9867ef | ||
|
|
63d6c114c0 | ||
|
|
1d45ccb8b8 | ||
|
|
4ce597a2a0 | ||
|
|
b430cbb62b | ||
|
|
500885ec4d | ||
|
|
ea3654f1f8 | ||
|
|
7a5b4779e9 | ||
|
|
c744797c6f | ||
|
|
11a7486a9c | ||
|
|
44ccf99d48 | ||
|
|
ef672798ef | ||
|
|
245a5057c3 | ||
|
|
e06610756a | ||
|
|
dbc256be1a | ||
|
|
e589fcdd3d | ||
|
|
d20cdfc47f | ||
|
|
ab2e307e3d | ||
|
|
a81564e582 | ||
|
|
f93f3fe122 | ||
|
|
2e94348bb8 | ||
|
|
e7fd2077bd | ||
|
|
624e9b6f71 | ||
|
|
ca10f19fe5 | ||
|
|
1a36d78ee2 | ||
|
|
809a0dd9cb | ||
|
|
b2b5c971c3 | ||
|
|
7c4ba10871 | ||
|
|
cc9f853a34 | ||
|
|
fa32e42933 | ||
|
|
9c7f1f7ba9 | ||
|
|
3842e689ac | ||
|
|
d461cb8001 | ||
|
|
2bb783b5d4 | ||
|
|
edc5b65234 | ||
|
|
0237c5a80a | ||
|
|
1201184669 | ||
|
|
36adba84e7 | ||
|
|
afa21c9057 | ||
|
|
42dfdcc3b1 | ||
|
|
6c9481296b | ||
|
|
89353b656f | ||
|
|
48851c7d71 | ||
|
|
d30028c57d | ||
|
|
23e36ca3f7 | ||
|
|
e92e00f5c8 | ||
|
|
0d547cc469 | ||
|
|
973e6c8080 | ||
|
|
5f6154c510 | ||
|
|
2cad6f21ab | ||
|
|
41a56c6e77 | ||
|
|
487045dbad | ||
|
|
c12c06a604 | ||
|
|
6380e3110f | ||
|
|
3fdc0349da | ||
|
|
0691c64ca9 | ||
|
|
f4545b0075 | ||
|
|
ecefb39265 | ||
|
|
95288e6eef | ||
|
|
ffebfbdddc | ||
|
|
4f471d4d6f | ||
|
|
f5046858c8 | ||
|
|
47bcf8a748 | ||
|
|
694c84a526 | ||
|
|
c567a0b370 | ||
|
|
a14dfba6b4 | ||
|
|
ed006fe1c3 | ||
|
|
a733e148e2 | ||
|
|
77c0dddee3 | ||
|
|
8429d04b3a | ||
|
|
4c953d29fe | ||
|
|
129e3f3f88 | ||
|
|
436f4adaf6 | ||
|
|
9f9dd508b1 | ||
|
|
d772a44c67 | ||
|
|
100f98c56b | ||
|
|
445de3b777 | ||
|
|
7bafaf33d0 | ||
|
|
d18ee586cc | ||
|
|
fbb8450a01 | ||
|
|
d40ca95f68 | ||
|
|
d62e681be1 | ||
|
|
58daf689bd | ||
|
|
6f5a361338 | ||
|
|
2c080dc6af | ||
|
|
0a656645e8 | ||
|
|
1c7ddea417 | ||
|
|
ac756ec41e | ||
|
|
8c5adb2544 | ||
|
|
d33d6b166f | ||
|
|
1384634aa1 | ||
|
|
906b7f2d39 | ||
|
|
bb662346fa | ||
|
|
efff8fe4dc | ||
|
|
fe6cafba47 | ||
|
|
ab3a006e65 | ||
|
|
5197bce872 | ||
|
|
00b4292306 | ||
|
|
ace5053c1b | ||
|
|
24aebfbcf8 | ||
|
|
5d6ae31ee9 | ||
|
|
c59edf4661 | ||
|
|
029e8bb210 | ||
|
|
1fc8540bf8 | ||
|
|
0c0ac93061 | ||
|
|
4debe830b6 | ||
|
|
4de6784bec | ||
|
|
29cedaa7b2 | ||
|
|
2e404ed005 | ||
|
|
89f4fea717 | ||
|
|
d4568ddbb5 | ||
|
|
75066fa61a | ||
|
|
e887df9aac | ||
|
|
1662ff1e24 | ||
|
|
cbc7296132 | ||
|
|
8004fbcdcc | ||
|
|
b03ec68044 | ||
|
|
bb6292ce90 | ||
|
|
af72e59830 | ||
|
|
45690690d1 | ||
|
|
602593a6cb | ||
|
|
650df2b56c | ||
|
|
c986674306 | ||
|
|
3eeaea14fa | ||
|
|
4b9f75b8d1 | ||
|
|
2139b42b77 | ||
|
|
8c9478f403 | ||
|
|
973ea74622 | ||
|
|
e63b931dfb | ||
|
|
0b0c402baf | ||
|
|
3aea790829 | ||
|
|
460683703e | ||
|
|
89b9fd21ff | ||
|
|
4b82234e98 | ||
|
|
187135e62b | ||
|
|
f3ec60500d | ||
|
|
ae857a098a | ||
|
|
9799e225a4 | ||
|
|
3d54ac044f | ||
|
|
0fab381b85 | ||
|
|
ffbaa8b2a1 | ||
|
|
5abbae6b12 | ||
|
|
078ea9cd30 | ||
|
|
909b13e6a2 | ||
|
|
d6c4228826 | ||
|
|
8cee06c875 | ||
|
|
74dba4290b | ||
|
|
de92d9d851 | ||
|
|
603963045b | ||
|
|
571d8f5d69 | ||
|
|
e8d0b2c18f | ||
|
|
0a968e2184 | ||
|
|
0ec87a7f24 | ||
|
|
0dd727f9d4 | ||
|
|
10d6a17a59 | ||
|
|
0c06b4cb2a | ||
|
|
fb9c2a4308 | ||
|
|
e189ab69dc | ||
|
|
79d8bb7dee | ||
|
|
cbaeeaed83 | ||
|
|
d064fc042a | ||
|
|
f9c28034a5 | ||
|
|
3b5b7c09dd | ||
|
|
ebbe4c4be7 | ||
|
|
5e5cc8d050 | ||
|
|
09bdb7dd92 | ||
|
|
2de2c8e077 | ||
|
|
2842bb5339 | ||
|
|
98c5a6b610 | ||
|
|
0d105f7488 | ||
|
|
6b64e5cc99 | ||
|
|
e8515db8eb | ||
|
|
7429952168 | ||
|
|
798e442fc0 | ||
|
|
c1ff99797c | ||
|
|
bab1ce9e17 | ||
|
|
d7a8e5de20 | ||
|
|
596cd24cc3 | ||
|
|
d58a509c1d | ||
|
|
cd07f3aa8d | ||
|
|
768a0b9f14 | ||
|
|
23fb3e6fb3 | ||
|
|
bb56c92938 | ||
|
|
35ee6617ac | ||
|
|
add8261ceb | ||
|
|
32fb90521f | ||
|
|
6356bab320 | ||
|
|
24bc373827 | ||
|
|
bf80d870d3 | ||
|
|
2ba3c16a98 | ||
|
|
05411c468d | ||
|
|
b04e325ab5 | ||
|
|
2faab43aed | ||
|
|
d499636cb6 | ||
|
|
b31be5ac36 | ||
|
|
6f95e514b9 | ||
|
|
1f0d49bd4d | ||
|
|
0c750ec244 | ||
|
|
d78310476e | ||
|
|
e199ac7d5e | ||
|
|
47ec0ac9b5 | ||
|
|
17d4b15761 | ||
|
|
d636f5b637 | ||
|
|
02ef127942 | ||
|
|
003be29eca | ||
|
|
a9b905a039 | ||
|
|
bccbc41fe8 | ||
|
|
b0810f6eed | ||
|
|
ef398c78b1 | ||
|
|
9e0fb53b60 | ||
|
|
b87977a2d8 | ||
|
|
c5402ebb55 | ||
|
|
181776f33f | ||
|
|
043d8d839a | ||
|
|
edc99230d7 | ||
|
|
ebd05768a4 | ||
|
|
5fab694c27 | ||
|
|
550d86683d | ||
|
|
d3edf9e5c3 | ||
|
|
3397754abc | ||
|
|
1b1bbb6d02 | ||
|
|
5a29dca452 | ||
|
|
e9b00aa148 | ||
|
|
7898ab86c6 | ||
|
|
17c0035a0a | ||
|
|
92712dd172 |
No files matched your search
@@ -0,0 +1,12 @@
|
||||
# Pamhyr .editorconfig
|
||||
|
||||
root = true
|
||||
|
||||
[*.py]
|
||||
charset = utf-8
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
tab_width = 8
|
||||
end_of_line = lf
|
||||
trim_trailing_whitespace = true
|
||||
insert_final_newline = true
|
||||
@@ -1,6 +1,7 @@
|
||||
### CUSTOM ###
|
||||
|
||||
*.exe
|
||||
*.msi
|
||||
*.tar.xz
|
||||
*.zip
|
||||
*.spec
|
||||
@@ -8,16 +9,47 @@
|
||||
*.class
|
||||
|
||||
tmp
|
||||
mage8
|
||||
adists
|
||||
|
||||
*.tar
|
||||
*.tar.*
|
||||
*.tgz
|
||||
*.zip
|
||||
|
||||
*.html
|
||||
*.pdf
|
||||
*.odt
|
||||
|
||||
!doc/**/*.pdf
|
||||
|
||||
doc/dev/images/auto_*
|
||||
doc/dev/documentation.*
|
||||
!doc/dev/*.org
|
||||
|
||||
doc/dev/images/auto_*
|
||||
doc/users/documentation.*
|
||||
!doc/users/*.org
|
||||
|
||||
TAGS
|
||||
|
||||
pamhyrBuild
|
||||
wine-pamhyr-build*
|
||||
|
||||
_PAMHYR_
|
||||
__old__
|
||||
|
||||
*-venv
|
||||
|
||||
mage8/
|
||||
adists/
|
||||
rubarbe/
|
||||
|
||||
linux/
|
||||
windows/
|
||||
|
||||
install/
|
||||
|
||||
### END CUSTOM ###
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/python
|
||||
@@ -249,6 +281,7 @@ flycheck_*.el
|
||||
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/emacs
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/qt
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=qt
|
||||
|
||||
@@ -309,3 +342,548 @@ compile_commands.json
|
||||
*_qmlcache.qrc
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/qt
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/latex
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=latex
|
||||
|
||||
### LaTeX ###
|
||||
## Core latex/pdflatex auxiliary files:
|
||||
*.aux
|
||||
*.lof
|
||||
*.log
|
||||
*.lot
|
||||
*.fls
|
||||
*.out
|
||||
*.toc
|
||||
*.fmt
|
||||
*.fot
|
||||
*.cb
|
||||
*.cb2
|
||||
.*.lb
|
||||
|
||||
## Intermediate documents:
|
||||
*.dvi
|
||||
*.xdv
|
||||
*-converted-to.*
|
||||
# these rules might exclude image files for figures etc.
|
||||
# *.ps
|
||||
# *.eps
|
||||
# *.pdf
|
||||
|
||||
## Generated if empty string is given at "Please type another file name for output:"
|
||||
.pdf
|
||||
|
||||
## Bibliography auxiliary files (bibtex/biblatex/biber):
|
||||
*.bbl
|
||||
*.bcf
|
||||
*.blg
|
||||
*-blx.aux
|
||||
*-blx.bib
|
||||
*.run.xml
|
||||
|
||||
## Build tool auxiliary files:
|
||||
*.fdb_latexmk
|
||||
*.synctex
|
||||
*.synctex(busy)
|
||||
*.synctex.gz
|
||||
*.synctex.gz(busy)
|
||||
*.pdfsync
|
||||
|
||||
## Build tool directories for auxiliary files
|
||||
# latexrun
|
||||
latex.out/
|
||||
|
||||
## Auxiliary and intermediate files from other packages:
|
||||
# algorithms
|
||||
*.alg
|
||||
*.loa
|
||||
|
||||
# achemso
|
||||
acs-*.bib
|
||||
|
||||
# amsthm
|
||||
*.thm
|
||||
|
||||
# beamer
|
||||
*.nav
|
||||
*.pre
|
||||
*.snm
|
||||
*.vrb
|
||||
|
||||
# changes
|
||||
*.soc
|
||||
|
||||
# comment
|
||||
*.cut
|
||||
|
||||
# cprotect
|
||||
*.cpt
|
||||
|
||||
# elsarticle (documentclass of Elsevier journals)
|
||||
*.spl
|
||||
|
||||
# endnotes
|
||||
*.ent
|
||||
|
||||
# fixme
|
||||
*.lox
|
||||
|
||||
# feynmf/feynmp
|
||||
*.mf
|
||||
*.mp
|
||||
*.t[1-9]
|
||||
*.t[1-9][0-9]
|
||||
*.tfm
|
||||
|
||||
#(r)(e)ledmac/(r)(e)ledpar
|
||||
*.end
|
||||
*.?end
|
||||
*.[1-9]
|
||||
*.[1-9][0-9]
|
||||
*.[1-9][0-9][0-9]
|
||||
*.[1-9]R
|
||||
*.[1-9][0-9]R
|
||||
*.[1-9][0-9][0-9]R
|
||||
*.eledsec[1-9]
|
||||
*.eledsec[1-9]R
|
||||
*.eledsec[1-9][0-9]
|
||||
*.eledsec[1-9][0-9]R
|
||||
*.eledsec[1-9][0-9][0-9]
|
||||
*.eledsec[1-9][0-9][0-9]R
|
||||
|
||||
# glossaries
|
||||
*.acn
|
||||
*.acr
|
||||
*.glg
|
||||
*.glo
|
||||
*.gls
|
||||
*.glsdefs
|
||||
*.lzo
|
||||
*.lzs
|
||||
*.slg
|
||||
*.slo
|
||||
*.sls
|
||||
|
||||
# uncomment this for glossaries-extra (will ignore makeindex's style files!)
|
||||
# *.ist
|
||||
|
||||
# gnuplot
|
||||
*.gnuplot
|
||||
*.table
|
||||
|
||||
# gnuplottex
|
||||
*-gnuplottex-*
|
||||
|
||||
# gregoriotex
|
||||
*.gaux
|
||||
*.glog
|
||||
*.gtex
|
||||
|
||||
# htlatex
|
||||
*.4ct
|
||||
*.4tc
|
||||
*.idv
|
||||
*.lg
|
||||
*.trc
|
||||
*.xref
|
||||
|
||||
# hyperref
|
||||
*.brf
|
||||
|
||||
# knitr
|
||||
*-concordance.tex
|
||||
# TODO Uncomment the next line if you use knitr and want to ignore its generated tikz files
|
||||
# *.tikz
|
||||
*-tikzDictionary
|
||||
|
||||
# listings
|
||||
*.lol
|
||||
|
||||
# luatexja-ruby
|
||||
*.ltjruby
|
||||
|
||||
# makeidx
|
||||
*.idx
|
||||
*.ilg
|
||||
*.ind
|
||||
|
||||
# minitoc
|
||||
*.maf
|
||||
*.mlf
|
||||
*.mlt
|
||||
*.mtc[0-9]*
|
||||
*.slf[0-9]*
|
||||
*.slt[0-9]*
|
||||
*.stc[0-9]*
|
||||
|
||||
# minted
|
||||
_minted*
|
||||
*.pyg
|
||||
|
||||
# morewrites
|
||||
*.mw
|
||||
|
||||
# newpax
|
||||
*.newpax
|
||||
|
||||
# nomencl
|
||||
*.nlg
|
||||
*.nlo
|
||||
*.nls
|
||||
|
||||
# pax
|
||||
*.pax
|
||||
|
||||
# pdfpcnotes
|
||||
*.pdfpc
|
||||
|
||||
# sagetex
|
||||
*.sagetex.sage
|
||||
*.sagetex.py
|
||||
*.sagetex.scmd
|
||||
|
||||
# scrwfile
|
||||
*.wrt
|
||||
|
||||
# svg
|
||||
svg-inkscape/
|
||||
|
||||
# sympy
|
||||
*.sout
|
||||
*.sympy
|
||||
sympy-plots-for-*.tex/
|
||||
|
||||
# pdfcomment
|
||||
*.upa
|
||||
*.upb
|
||||
|
||||
# pythontex
|
||||
*.pytxcode
|
||||
pythontex-files-*/
|
||||
|
||||
# tcolorbox
|
||||
*.listing
|
||||
|
||||
# thmtools
|
||||
*.loe
|
||||
|
||||
# TikZ & PGF
|
||||
*.dpth
|
||||
*.md5
|
||||
*.auxlock
|
||||
|
||||
# titletoc
|
||||
*.ptc
|
||||
|
||||
# todonotes
|
||||
*.tdo
|
||||
|
||||
# vhistory
|
||||
*.hst
|
||||
*.ver
|
||||
|
||||
# easy-todo
|
||||
*.lod
|
||||
|
||||
# xcolor
|
||||
*.xcp
|
||||
|
||||
# xmpincl
|
||||
*.xmpi
|
||||
|
||||
# xindy
|
||||
*.xdy
|
||||
|
||||
# xypic precompiled matrices and outlines
|
||||
*.xyc
|
||||
*.xyd
|
||||
|
||||
# endfloat
|
||||
*.ttt
|
||||
*.fff
|
||||
|
||||
# Latexian
|
||||
TSWLatexianTemp*
|
||||
|
||||
## Editors:
|
||||
# WinEdt
|
||||
*.bak
|
||||
*.sav
|
||||
|
||||
# Texpad
|
||||
.texpadtmp
|
||||
|
||||
# LyX
|
||||
*.lyx~
|
||||
|
||||
# Kile
|
||||
*.backup
|
||||
|
||||
# gummi
|
||||
.*.swp
|
||||
|
||||
# KBibTeX
|
||||
*~[0-9]*
|
||||
|
||||
# TeXnicCenter
|
||||
*.tps
|
||||
|
||||
# auto folder when using emacs and auctex
|
||||
./auto/*
|
||||
# *.el
|
||||
|
||||
# expex forward references with \gathertags
|
||||
*-tags.tex
|
||||
|
||||
# standalone packages
|
||||
*.sta
|
||||
|
||||
# Makeindex log files
|
||||
*.lpz
|
||||
|
||||
# xwatermark package
|
||||
*.xwm
|
||||
|
||||
# REVTeX puts footnotes in the bibliography by default, unless the nofootinbib
|
||||
# option is specified. Footnotes are the stored in a file with suffix Notes.bib.
|
||||
# Uncomment the next line to have this generated file ignored.
|
||||
#*Notes.bib
|
||||
|
||||
### LaTeX Patch ###
|
||||
# LIPIcs / OASIcs
|
||||
*.vtc
|
||||
|
||||
# glossaries
|
||||
*.glstex
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/latex
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/intellij
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=intellij
|
||||
|
||||
### Intellij ###
|
||||
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
|
||||
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
|
||||
|
||||
# User-specific stuff
|
||||
.idea/**/workspace.xml
|
||||
.idea/**/tasks.xml
|
||||
.idea/**/usage.statistics.xml
|
||||
.idea/**/dictionaries
|
||||
.idea/**/shelf
|
||||
|
||||
# AWS User-specific
|
||||
.idea/**/aws.xml
|
||||
|
||||
# Generated files
|
||||
.idea/**/contentModel.xml
|
||||
|
||||
# Sensitive or high-churn files
|
||||
.idea/**/dataSources/
|
||||
.idea/**/dataSources.ids
|
||||
.idea/**/dataSources.local.xml
|
||||
.idea/**/sqlDataSources.xml
|
||||
.idea/**/dynamic.xml
|
||||
.idea/**/uiDesigner.xml
|
||||
.idea/**/dbnavigator.xml
|
||||
|
||||
# Gradle
|
||||
.idea/**/gradle.xml
|
||||
.idea/**/libraries
|
||||
|
||||
# Gradle and Maven with auto-import
|
||||
# When using Gradle or Maven with auto-import, you should exclude module files,
|
||||
# since they will be recreated, and may cause churn. Uncomment if using
|
||||
# auto-import.
|
||||
# .idea/artifacts
|
||||
# .idea/compiler.xml
|
||||
# .idea/jarRepositories.xml
|
||||
# .idea/modules.xml
|
||||
# .idea/*.iml
|
||||
# .idea/modules
|
||||
# *.iml
|
||||
# *.ipr
|
||||
|
||||
# CMake
|
||||
cmake-build-*/
|
||||
|
||||
# Mongo Explorer plugin
|
||||
.idea/**/mongoSettings.xml
|
||||
|
||||
# File-based project format
|
||||
*.iws
|
||||
|
||||
# IntelliJ
|
||||
out/
|
||||
|
||||
# mpeltonen/sbt-idea plugin
|
||||
.idea_modules/
|
||||
|
||||
# JIRA plugin
|
||||
atlassian-ide-plugin.xml
|
||||
|
||||
# Cursive Clojure plugin
|
||||
.idea/replstate.xml
|
||||
|
||||
# SonarLint plugin
|
||||
.idea/sonarlint/
|
||||
|
||||
# Crashlytics plugin (for Android Studio and IntelliJ)
|
||||
com_crashlytics_export_strings.xml
|
||||
crashlytics.properties
|
||||
crashlytics-build.properties
|
||||
fabric.properties
|
||||
|
||||
# Editor-based Rest Client
|
||||
.idea/httpRequests
|
||||
|
||||
# Android studio 3.1+ serialized cache file
|
||||
.idea/caches/build_file_checksums.ser
|
||||
|
||||
### Intellij Patch ###
|
||||
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
|
||||
|
||||
# *.iml
|
||||
# modules.xml
|
||||
# .idea/misc.xml
|
||||
# *.ipr
|
||||
|
||||
# Sonarlint plugin
|
||||
# https://plugins.jetbrains.com/plugin/7973-sonarlint
|
||||
.idea/**/sonarlint/
|
||||
|
||||
# SonarQube Plugin
|
||||
# https://plugins.jetbrains.com/plugin/7238-sonarqube-community-plugin
|
||||
.idea/**/sonarIssues.xml
|
||||
|
||||
# Markdown Navigator plugin
|
||||
# https://plugins.jetbrains.com/plugin/7896-markdown-navigator-enhanced
|
||||
.idea/**/markdown-navigator.xml
|
||||
.idea/**/markdown-navigator-enh.xml
|
||||
.idea/**/markdown-navigator/
|
||||
|
||||
# Cache file creation bug
|
||||
# See https://youtrack.jetbrains.com/issue/JBR-2257
|
||||
.idea/$CACHE_FILE$
|
||||
|
||||
# CodeStream plugin
|
||||
# https://plugins.jetbrains.com/plugin/12206-codestream
|
||||
.idea/codestream.xml
|
||||
|
||||
# Azure Toolkit for IntelliJ plugin
|
||||
# https://plugins.jetbrains.com/plugin/8053-azure-toolkit-for-intellij
|
||||
.idea/**/azureSettings.xml
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/intellij
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/visualstudiocode
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudiocode
|
||||
|
||||
### VisualStudioCode ###
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
!.vscode/*.code-snippets
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Built Visual Studio Code Extensions
|
||||
*.vsix
|
||||
|
||||
### VisualStudioCode Patch ###
|
||||
# Ignore all local history of files
|
||||
.history
|
||||
.ionide
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/visualstudiocode
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/linux
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=linux
|
||||
|
||||
### Linux ###
|
||||
*~
|
||||
|
||||
# temporary files which can be created if a process still has a handle open of a deleted file
|
||||
.fuse_hidden*
|
||||
|
||||
# KDE directory preferences
|
||||
.directory
|
||||
|
||||
# Linux trash folder which might appear on any partition or disk
|
||||
.Trash-*
|
||||
|
||||
# .nfs files are created when an open file is removed but is still being accessed
|
||||
.nfs*
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/linux
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/macos
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=macos
|
||||
|
||||
### macOS ###
|
||||
# General
|
||||
.DS_Store
|
||||
.AppleDouble
|
||||
.LSOverride
|
||||
|
||||
# Icon must end with two \r
|
||||
Icon
|
||||
|
||||
# Thumbnails
|
||||
._*
|
||||
|
||||
# Files that might appear in the root of a volume
|
||||
.DocumentRevisions-V100
|
||||
.fseventsd
|
||||
.Spotlight-V100
|
||||
.TemporaryItems
|
||||
.Trashes
|
||||
.VolumeIcon.icns
|
||||
.com.apple.timemachine.donotpresent
|
||||
|
||||
# Directories potentially created on remote AFP share
|
||||
.AppleDB
|
||||
.AppleDesktop
|
||||
Network Trash Folder
|
||||
Temporary Items
|
||||
.apdisk
|
||||
|
||||
### macOS Patch ###
|
||||
# iCloud generated files
|
||||
*.icloud
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/macos
|
||||
|
||||
# Created by https://www.toptal.com/developers/gitignore/api/windows
|
||||
# Edit at https://www.toptal.com/developers/gitignore?templates=windows
|
||||
|
||||
### Windows ###
|
||||
# Windows thumbnail cache files
|
||||
Thumbs.db
|
||||
Thumbs.db:encryptable
|
||||
ehthumbs.db
|
||||
ehthumbs_vista.db
|
||||
|
||||
# Dump file
|
||||
*.stackdump
|
||||
|
||||
# Folder config file
|
||||
[Dd]esktop.ini
|
||||
|
||||
# Recycle Bin used on file shares
|
||||
$RECYCLE.BIN/
|
||||
|
||||
# Windows Installer files
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# Windows shortcuts
|
||||
*.lnk
|
||||
|
||||
# End of https://www.toptal.com/developers/gitignore/api/windows
|
||||
@@ -1,5 +1,5 @@
|
||||
# .gitlab-ci.yml -- Pamhyr gitlab-ci
|
||||
# Copyright (C) 2023 INRAE
|
||||
# Copyright (C) 2023-2025 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -15,97 +15,139 @@
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
stages:
|
||||
- build
|
||||
- downloads
|
||||
- configure
|
||||
- test
|
||||
- build
|
||||
- package
|
||||
- hash
|
||||
- antivirus
|
||||
- release
|
||||
|
||||
#########
|
||||
# BUILD #
|
||||
#########
|
||||
#########################
|
||||
# PYINSTALLER VARIABLES #
|
||||
#########################
|
||||
|
||||
build-mage-linux:
|
||||
stage: build
|
||||
variables:
|
||||
HIDDEN_IMPORTS: "--hiddenimport rasterio --collect-submodules rasterio"
|
||||
|
||||
#############
|
||||
# DOWNLOADS #
|
||||
#############
|
||||
|
||||
variables:
|
||||
MAGE_8_VERSION: "permalink/latest"
|
||||
ADISTS_VERSION: "permalink/latest"
|
||||
RUBAR_VERSION: "permalink/latest"
|
||||
|
||||
dl-mage8-doc:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test5/downloads/packages/mage_linux.tgz
|
||||
- mkdir -p mage
|
||||
- cd mage
|
||||
- tar xvf ../mage.tgz
|
||||
- mkdir -p doc
|
||||
- cd doc
|
||||
- curl -L -o mage8.pdf https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/documents/Mage-8_Documentation.pdf
|
||||
artifacts:
|
||||
paths:
|
||||
- mage/mage
|
||||
- mage/mage_extraire
|
||||
- mage/mailleurPF
|
||||
- doc/mage8.pdf
|
||||
|
||||
# build-mage-linux:
|
||||
# stage: build
|
||||
# tags:
|
||||
# - linux
|
||||
# rules:
|
||||
# - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
# variables:
|
||||
# GIT_SUBMODULE_STRATEGY: recursive
|
||||
# GIT_SUBMODULE_DEPTH: 20
|
||||
# script:
|
||||
# - cd mage/src/
|
||||
# - mkdir -p build
|
||||
# - cd build
|
||||
# - cmake ..
|
||||
# - make
|
||||
# artifacts:
|
||||
# paths:
|
||||
# - mage/src/build/mage
|
||||
# - mage/src/build/mage_extraire
|
||||
# - mage/src/build/mailleurPF
|
||||
|
||||
build-mage-windows:
|
||||
stage: build
|
||||
dl-mage8-linux:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- curl -L -o mage.tgz https://gitlab.irstea.fr/jean-baptiste.faure/mage/-/releases/Test5/downloads/packages/mage_windows.tgz
|
||||
- mkdir -p mage
|
||||
- cd mage
|
||||
- tar xvf ../mage.tgz
|
||||
- curl -L -o mage8.tgz https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_linux.tgz
|
||||
- mkdir -p mage8-linux
|
||||
- cd mage8-linux
|
||||
- tar xvf ../mage8.tgz
|
||||
artifacts:
|
||||
paths:
|
||||
- mage/mage.exe
|
||||
- mage/mage_extraire.exe
|
||||
- mage/mailleurPF.exe
|
||||
- mage8-linux/mage
|
||||
|
||||
# build-mage-windows:
|
||||
# stage: build
|
||||
# tags:
|
||||
# - wine
|
||||
# rules:
|
||||
# - if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
# variables:
|
||||
# GIT_SUBMODULE_STRATEGY: recursive
|
||||
# GIT_SUBMODULE_DEPTH: 20
|
||||
# script:
|
||||
# - cd mage/src/
|
||||
# - sed s/add_compile_definitions(win)/add_compile_definitions(windows)/ CMakeLists.txt > __tmp__
|
||||
# - echo set(CMAKE_Fortran_COMPILER "C:/Program\ Files/gcc/bin/gfortran.exe") > CMakeLists.txt
|
||||
# - echo set(CMAKE_MAKE_PROGRAM "C:/Program Files\ \(x86\)/GnuWin32/bin/make.exe") >> CMakeLists.txt
|
||||
# - type __tmp__ >> CMakeLists.txt
|
||||
# - mkdir build
|
||||
# - cd build
|
||||
# - cmake -G "MinGW Makefiles" ..
|
||||
# - make
|
||||
# artifacts:
|
||||
# paths:
|
||||
# - mage/src/build/mage.exe
|
||||
# - mage/src/build/mage_extraire.exe
|
||||
# - mage/src/build/mailleurPF.exe
|
||||
dl-mage8-windows:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- curl -L -o mage8.tgz https://forge.inrae.fr/river-hydraulics/mage/-/releases/$MAGE_8_VERSION/downloads/packages/mage_windows.tgz
|
||||
- mkdir -p mage8-windows
|
||||
- cd mage8-windows
|
||||
- tar xvf ../mage8.tgz
|
||||
artifacts:
|
||||
paths:
|
||||
- mage8-windows/mage.exe
|
||||
|
||||
build:
|
||||
stage: build
|
||||
dl-adists-linux:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- mkdir -p adists-linux
|
||||
- cd adists-linux
|
||||
- curl -L -o adists https://forge.inrae.fr/river-hydraulics/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists
|
||||
artifacts:
|
||||
paths:
|
||||
- adists-linux/adists
|
||||
|
||||
dl-adists-windows:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- mkdir -p adists-windows
|
||||
- cd adists-windows
|
||||
- curl -L -o adists.exe https://forge.inrae.fr/river-hydraulics/adists/-/releases/$ADISTS_VERSION/downloads/executables/adists_win64.exe
|
||||
artifacts:
|
||||
paths:
|
||||
- adists-windows/adists.exe
|
||||
|
||||
dl-rubar-linux:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- mkdir -p rubar-linux
|
||||
- cd rubar-linux
|
||||
- curl -L -o rubar.tgz https://forge.inrae.fr/river-hydraulics/rubarbe/-/releases/$RUBAR_VERSION/downloads/packages/rubar_linux.tgz
|
||||
- tar xf rubar.tgz
|
||||
artifacts:
|
||||
paths:
|
||||
- rubar-linux/rubarbe
|
||||
|
||||
dl-rubar-windows:
|
||||
stage: downloads
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- mkdir -p rubar-windows
|
||||
- cd rubar-windows
|
||||
- curl -L -o rubar.tgz https://forge.inrae.fr/river-hydraulics/rubarbe/-/releases/$RUBAR_VERSION/downloads/packages/rubar_windows.tgz
|
||||
- tar xf rubar.tgz
|
||||
artifacts:
|
||||
paths:
|
||||
- rubar-windows/rubarbe.exe
|
||||
|
||||
#############
|
||||
# CONFIGURE #
|
||||
#############
|
||||
|
||||
set-version:
|
||||
stage: configure
|
||||
tags:
|
||||
- linux
|
||||
script:
|
||||
@@ -116,7 +158,7 @@ build:
|
||||
- VERSION
|
||||
|
||||
build-lang:
|
||||
stage: build
|
||||
stage: configure
|
||||
tags:
|
||||
- linux
|
||||
script:
|
||||
@@ -130,91 +172,551 @@ build-lang:
|
||||
# TESTS #
|
||||
#########
|
||||
|
||||
test:
|
||||
unittest:
|
||||
stage: test
|
||||
tags:
|
||||
- linux
|
||||
needs:
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
script:
|
||||
- echo "TODO PAMHYR tests"
|
||||
- python3.12 -m venv venv
|
||||
- . venv/bin/activate
|
||||
- pip3 install -U pip
|
||||
- pip3 install -r ./full-requirements.txt
|
||||
- pip3 install -U -r ./full-requirements.txt
|
||||
- cd src
|
||||
- python3.12 -m unittest discover -t .
|
||||
|
||||
test-pep8:
|
||||
stage: test
|
||||
tags:
|
||||
- linux
|
||||
needs:
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
- job: unittest
|
||||
script:
|
||||
# Setup virtual env
|
||||
- python3.12 -m venv venv
|
||||
- . venv/bin/activate
|
||||
- pip3 install -U pip
|
||||
- pip3 install -r ./requirements.txt
|
||||
- pip3 install -U -r ./requirements.txt
|
||||
- pip3 install pycodestyle
|
||||
- pycodestyle --exclude="*_to_*.py" ./src
|
||||
allow_failure: true
|
||||
|
||||
#########
|
||||
# BUILD #
|
||||
#########
|
||||
|
||||
# build-users-doc:
|
||||
# stage: build
|
||||
# tags:
|
||||
# - linux
|
||||
# needs:
|
||||
# - job: set-version
|
||||
# artifacts: true
|
||||
# script:
|
||||
# - cd ./doc/users/
|
||||
# - ./build.sh
|
||||
# artifacts:
|
||||
# paths:
|
||||
# - doc/users/documentation.pdf
|
||||
# - doc/users/documentation.html
|
||||
# - doc/users/images/
|
||||
# allow_failure: true
|
||||
|
||||
build-td:
|
||||
stage: build
|
||||
tags:
|
||||
- linux
|
||||
needs:
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
script:
|
||||
- cd ./doc/users/TP_Hydraulique_Hogneau/
|
||||
- ./build.sh
|
||||
artifacts:
|
||||
paths:
|
||||
- doc/users/TP_Hydraulique_Hogneau/step-by-step.pdf
|
||||
- doc/users/TP_Hydraulique_Hogneau/pas-a-pas.pdf
|
||||
- doc/users/TP_Hydraulique_Hogneau/Tuto-2-fr.pdf
|
||||
- doc/users/TP_Hydraulique_Hogneau/data/
|
||||
allow_failure: true
|
||||
|
||||
build-td-2:
|
||||
stage: build
|
||||
tags:
|
||||
- linux
|
||||
needs:
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
script:
|
||||
- cd ./doc/users/TP_AdisTS_Vieux_Rhone/
|
||||
- ./build.sh
|
||||
artifacts:
|
||||
paths:
|
||||
- doc/users/TP_AdisTS_Vieux_Rhone/pas-a-pas.pdf
|
||||
- doc/users/TP_AdisTS_Vieux_Rhone/data/
|
||||
- doc/users/TP_AdisTS_Vieux_Rhone/Sujet.pdf
|
||||
- doc/users/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr
|
||||
allow_failure: true
|
||||
|
||||
build-developers-doc:
|
||||
stage: build
|
||||
tags:
|
||||
- linux
|
||||
needs:
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
script:
|
||||
- cd ./doc/dev/
|
||||
- ./build.sh
|
||||
# Create html documentation
|
||||
- cd ../../src
|
||||
- python3.12 -m venv doc-venv
|
||||
- . doc-venv/bin/activate
|
||||
- pip3 install -U pip
|
||||
- pip3 install -r ../full-requirements.txt
|
||||
- pip3 install -U -r ../full-requirements.txt
|
||||
- pip3 install pdoc3
|
||||
- pdoc --html .
|
||||
# Create archive
|
||||
- tar cf html.tar ./html
|
||||
- cd ../doc/dev
|
||||
- mv ../../src/html.tar ./
|
||||
artifacts:
|
||||
paths:
|
||||
- doc/dev/documentation.pdf
|
||||
- doc/dev/documentation.html
|
||||
- doc/dev/html.tar
|
||||
- doc/dev/images/
|
||||
allow_failure: true
|
||||
|
||||
build-linux:
|
||||
stage: build
|
||||
tags:
|
||||
- linux
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
needs:
|
||||
- job: dl-adists-linux
|
||||
artifacts: true
|
||||
- job: dl-rubar-linux
|
||||
artifacts: true
|
||||
- job: dl-mage8-linux
|
||||
artifacts: true
|
||||
- job: dl-mage8-doc
|
||||
artifacts: true
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
- job: build-lang
|
||||
artifacts: true
|
||||
- job: build-developers-doc
|
||||
artifacts: true
|
||||
# - job: build-users-doc
|
||||
# artifacts: true
|
||||
- job: build-td
|
||||
artifacts: true
|
||||
- job: build-td-2
|
||||
artifacts: true
|
||||
script:
|
||||
- mkdir -p linux
|
||||
- cd linux
|
||||
# Setup virtual env
|
||||
- python3.12 -m venv linux-venv
|
||||
- . linux-venv/bin/activate
|
||||
- pip3 install -U pip
|
||||
- pip3 install -r ../requirements.txt
|
||||
- pip3 install -U -r ../requirements.txt
|
||||
# Run Pyinstaller
|
||||
- pyinstaller -y $HIDDEN_IMPORTS --paths linux-venv/lib/python3.12/site-packages ../src/pamhyr.py
|
||||
# Create directory
|
||||
- mkdir -p pamhyr
|
||||
- mkdir -p pamhyr/_internal
|
||||
# Copy Pamhyr info
|
||||
- cp -v ../VERSION pamhyr/_internal/
|
||||
- cp -v ../AUTHORS pamhyr/_internal/
|
||||
- cp -v ../LICENSE pamhyr/_internal/
|
||||
- cp -v ../src/motd.txt pamhyr/_internal/
|
||||
# Copy mage
|
||||
- mkdir -p pamhyr/mage8
|
||||
- cp -v ../mage8-linux/* pamhyr/mage8/
|
||||
# Copy adists
|
||||
- mkdir -p pamhyr/adists
|
||||
- cp -v ../adists-linux/* pamhyr/adists/
|
||||
# Copy rubar
|
||||
- mkdir -p pamhyr/rubar
|
||||
- cp -v ../rubar-linux/* pamhyr/rubar/
|
||||
# Copy Pamhyr
|
||||
- cp -r dist/pamhyr/* pamhyr/
|
||||
# Pamhyr script to force x11
|
||||
- echo '#!/usr/bin/env bash' > pamhyr/pamhyr-x11
|
||||
- echo "" >> pamhyr/pamhyr-x11
|
||||
- echo "GDK_BACKEND=x11 ./pamhyr $@" >> pamhyr/pamhyr-x11
|
||||
- chmod +x pamhyr/pamhyr-x11
|
||||
# Copy Pamhyr resources
|
||||
- mkdir -p pamhyr/_internal/View
|
||||
- mkdir -p pamhyr/_internal/View/ui
|
||||
- mkdir -p pamhyr/_internal/View/ui/Widgets
|
||||
- cp -r ../src/View/ui/*.ui pamhyr/_internal/View/ui/
|
||||
- cp -r ../src/View/ui/ressources/ pamhyr/_internal/View/ui
|
||||
- cp -r ../src/View/ui/Widgets/*.ui pamhyr/_internal/View/ui/Widgets
|
||||
# Copy lang
|
||||
- mkdir -p pamhyr/_internal/lang
|
||||
- cp -r ../src/lang/*.qm pamhyr/_internal/lang
|
||||
# Copy tests cases
|
||||
- mkdir -p pamhyr/tests_cases/
|
||||
- mkdir -p pamhyr/tests_cases/Saar
|
||||
- cp ../tests_cases/Saar/Saar.pamhyr pamhyr/tests_cases/Saar/
|
||||
# Copy documentations
|
||||
- mkdir -p pamhyr/doc/
|
||||
- mkdir -p pamhyr/doc/images/
|
||||
- mkdir -p pamhyr/doc/html/
|
||||
# - cp ../doc/users/documentation.pdf pamhyr/doc/Pamhyr2-users.pdf
|
||||
# - cp ../doc/users/documentation.html pamhyr/doc/Pamhyr2-users.html
|
||||
- cp ../doc/mage8.pdf pamhyr/doc/mage8.pdf
|
||||
- cp ../doc/dev/documentation.pdf pamhyr/doc/Pamhyr2-dev.pdf
|
||||
- cp ../doc/dev/documentation.html pamhyr/doc/Pamhyr2-dev.html
|
||||
#- cp ../doc/users/images/* pamhyr/doc/images
|
||||
- cp -r ../doc/dev/images/* pamhyr/doc/images
|
||||
- cp -r ../doc/images/* pamhyr/doc/images
|
||||
# Copy Tuto
|
||||
- mkdir -p pamhyr/doc/TP_Hydraulique_Hogneau/
|
||||
- mkdir -p pamhyr/doc/TP_Hydraulique_Hogneau/data
|
||||
- cp ../doc/users/TP_Hydraulique_Hogneau/Hogneau_Engees2022.pdf pamhyr/doc/TP_Hydraulique_Hogneau/Hogneau_Engees2022.pdf
|
||||
- cp ../doc/users/TP_Hydraulique_Hogneau/step-by-step.pdf pamhyr/doc/TP_Hydraulique_Hogneau/Tuto1-en.pdf
|
||||
- cp ../doc/users/TP_Hydraulique_Hogneau/pas-a-pas.pdf pamhyr/doc/TP_Hydraulique_Hogneau/Tuto1-fr.pdf
|
||||
- cp ../doc/users/TP_Hydraulique_Hogneau/Tuto-2-fr.pdf pamhyr/doc/TP_Hydraulique_Hogneau/Tuto2-fr.pdf
|
||||
- cp ../doc/users/TP_Hydraulique_Hogneau/*.pamhyr pamhyr/doc/TP_Hydraulique_Hogneau/
|
||||
- cp ../doc/users/TP_Hydraulique_Hogneau/data/* pamhyr/doc/TP_Hydraulique_Hogneau/data/
|
||||
- mkdir -p pamhyr/doc/TP_AdisTS_Vieux_Rhone/
|
||||
- mkdir -p pamhyr/doc/TP_AdisTS_Vieux_Rhone/data
|
||||
- cp ../doc/users/TP_AdisTS_Vieux_Rhone/*.pdf pamhyr/doc/TP_AdisTS_Vieux_Rhone/
|
||||
- cp ../doc/users/TP_AdisTS_Vieux_Rhone/data/* pamhyr/doc/TP_AdisTS_Vieux_Rhone/data/
|
||||
- cp ../doc/users/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr pamhyr/doc/TP_AdisTS_Vieux_Rhone/Vieux_Rhone_TP_AdisTS.pamhyr
|
||||
# Copy TP charriage
|
||||
- mkdir -p pamhyr/doc/TP_charriage/
|
||||
- cp -r ../doc/users/TP_charriage/* pamhyr/doc/TP_charriage
|
||||
artifacts:
|
||||
paths:
|
||||
- linux/pamhyr
|
||||
|
||||
build-windows:
|
||||
stage: build
|
||||
tags:
|
||||
- wine
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
needs:
|
||||
- job: dl-mage8-windows
|
||||
artifacts: true
|
||||
- job: dl-adists-windows
|
||||
artifacts: true
|
||||
- job: dl-rubar-windows
|
||||
artifacts: true
|
||||
- job: dl-mage8-doc
|
||||
artifacts: true
|
||||
- job: set-version
|
||||
artifacts: true
|
||||
- job: build-lang
|
||||
artifacts: true
|
||||
- job: build-developers-doc
|
||||
artifacts: true
|
||||
# - job: build-users-doc
|
||||
# artifacts: true
|
||||
- job: build-td
|
||||
artifacts: true
|
||||
- job: build-td-2
|
||||
artifacts: true
|
||||
script:
|
||||
- mkdir windows
|
||||
- cd windows
|
||||
# Setup env
|
||||
- python -m pip install -U pip
|
||||
- python -m pip install -r ..\requirements.txt
|
||||
- python -m pip install -U -r ..\requirements.txt
|
||||
# Run Pyinstaller
|
||||
# - pyinstaller --noconsole -y ..\src\pamhyr.py
|
||||
- pyinstaller -i ../src/View/ui/ressources/icon.ico $HIDDEN_IMPORTS --hide-console hide-early -y ..\src\pamhyr.py
|
||||
# Create directory
|
||||
- mkdir pamhyr
|
||||
- dir
|
||||
- copy ..\packages\make-windows-dir.bat .\make-windows-dir.bat
|
||||
- .\make-windows-dir.bat
|
||||
artifacts:
|
||||
paths:
|
||||
- windows/pamhyr
|
||||
|
||||
############
|
||||
# PACKAGES #
|
||||
############
|
||||
|
||||
linux-package:
|
||||
linux-package-tar:
|
||||
stage: package
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: build-lang
|
||||
artifacts: true
|
||||
- job: build
|
||||
artifacts: true
|
||||
- job: build-mage-linux
|
||||
# - job: test-linux
|
||||
- job: build-linux
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
|
||||
artifacts:
|
||||
paths:
|
||||
- packages/pamhyr-gnulinux-amd64.tar.xz
|
||||
- linux/pamhyr-gnulinux.tar.xz
|
||||
script:
|
||||
- cd packages
|
||||
- ./linux.sh
|
||||
- cd linux
|
||||
- tar --xz -cf pamhyr-gnulinux.tar.xz ./pamhyr --checkpoint=.100
|
||||
|
||||
windows-package:
|
||||
windows-package-zip:
|
||||
stage: package
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
# - job: test-windows
|
||||
- job: build-windows
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
|
||||
artifacts:
|
||||
paths:
|
||||
- windows/pamhyr-windows.zip
|
||||
script:
|
||||
- cd windows
|
||||
- zip -r pamhyr-windows.zip pamhyr
|
||||
|
||||
windows-package-exe:
|
||||
stage: package
|
||||
tags:
|
||||
- release
|
||||
- wine
|
||||
needs:
|
||||
- job: build-lang
|
||||
artifacts: true
|
||||
- job: build
|
||||
artifacts: true
|
||||
- job: build-mage-windows
|
||||
# - job: test-windows
|
||||
- job: build-windows
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
|
||||
artifacts:
|
||||
paths:
|
||||
- packages/pamhyr-win-amd64.exe
|
||||
- windows/pamhyr-windows.exe
|
||||
script:
|
||||
- cd windows
|
||||
- copy ..\packages\make-windows-exe.bat make-windows-exe.bat
|
||||
- copy ..\packages\pamhyr.nsi pamhyr.nsi
|
||||
- .\make-windows-exe.bat
|
||||
|
||||
########
|
||||
# HASH #
|
||||
########
|
||||
|
||||
linux-build-hash:
|
||||
stage: hash
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: build-linux
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- cd linux
|
||||
- sha256sum -b pamhyr/pamhyr > pamhyr/pamhyr.sha256
|
||||
artifacts:
|
||||
paths:
|
||||
- linux/pamhyr/pamhyr.sha256
|
||||
|
||||
windows-build-hash:
|
||||
stage: hash
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: build-windows
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- cd windows
|
||||
- sha256sum -b pamhyr/pamhyr.exe > pamhyr/pamhyr.exe.sha256
|
||||
artifacts:
|
||||
paths:
|
||||
- windows/pamhyr/pamhyr.exe.sha256
|
||||
|
||||
pkg-hash:
|
||||
stage: hash
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: linux-package-tar
|
||||
artifacts: true
|
||||
- job: windows-package-zip
|
||||
artifacts: true
|
||||
- job: windows-package-exe
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- cd windows
|
||||
- sha256sum -b pamhyr-windows.exe > pamhyr-windows.exe.sha256
|
||||
- sha256sum -b pamhyr-windows.zip > pamhyr-windows.zip.sha256
|
||||
- cd ..
|
||||
- cd linux
|
||||
- sha256sum -b pamhyr-gnulinux.tar.xz > pamhyr-gnulinux.tar.xz.sha256
|
||||
artifacts:
|
||||
paths:
|
||||
- windows/pamhyr-windows.exe.sha256
|
||||
- windows/pamhyr-windows.zip.sha256
|
||||
- linux/pamhyr-gnulinux.tar.xz.sha256
|
||||
|
||||
#############
|
||||
# ANTIVIRUS #
|
||||
#############
|
||||
|
||||
build-check-clamav:
|
||||
stage: antivirus
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: build-linux
|
||||
artifacts: true
|
||||
- job: build-windows
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_BRANCH == 'master' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- cd packages
|
||||
- ./windows.bat
|
||||
- ./clamav-scan.sh builds
|
||||
allow_failure: true
|
||||
|
||||
pkg-check-clamav:
|
||||
stage: antivirus
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: linux-package-tar
|
||||
artifacts: true
|
||||
- job: windows-package-zip
|
||||
artifacts: true
|
||||
- job: windows-package-exe
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH == 'ci-test' || $CI_COMMIT_TAG
|
||||
script:
|
||||
- cd packages
|
||||
- ./clamav-scan.sh packages
|
||||
allow_failure: true
|
||||
|
||||
###########
|
||||
# RELEASE #
|
||||
###########
|
||||
|
||||
shadow-release:
|
||||
stage: release
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: linux-package-tar
|
||||
artifacts: true
|
||||
- job: windows-package-zip
|
||||
artifacts: true
|
||||
- job: windows-package-exe
|
||||
artifacts: true
|
||||
# - job: build-users-doc
|
||||
# artifacts: true
|
||||
- job: build-developers-doc
|
||||
artifacts: true
|
||||
- job: pkg-hash
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG && $CI_COMMIT_TAG !~ /^v/
|
||||
artifacts:
|
||||
paths:
|
||||
- linux/pamhyr-gnulinux.tar.xz
|
||||
- windows/pamhyr-windows.zip
|
||||
- windows/pamhyr-windows.exe
|
||||
- linux/pamhyr-gnulinux.tar.xz.sha256
|
||||
- windows/pamhyr-windows.zip.sha256
|
||||
- windows/pamhyr-windows.exe.sha256
|
||||
- doc/dev/documentation.pdf
|
||||
# - doc/users/documentation.pdf
|
||||
script:
|
||||
- cd packages
|
||||
|
||||
|
||||
tag-release:
|
||||
stage: release
|
||||
tags:
|
||||
- release
|
||||
- linux
|
||||
needs:
|
||||
- job: linux-package
|
||||
- job: linux-package-tar
|
||||
artifacts: true
|
||||
- job: windows-package
|
||||
- job: windows-package-zip
|
||||
artifacts: true
|
||||
- job: windows-package-exe
|
||||
artifacts: true
|
||||
# - job: build-users-doc
|
||||
# artifacts: true
|
||||
- job: build-developers-doc
|
||||
artifacts: true
|
||||
- job: pkg-hash
|
||||
artifacts: true
|
||||
rules:
|
||||
- if: $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_TAG =~ /^v/
|
||||
artifacts:
|
||||
paths:
|
||||
- packages/pamhyr-gnulinux-amd64.tar.xz
|
||||
- packages/pamhyr-win-amd64.exe
|
||||
- linux/pamhyr-gnulinux.tar.xz
|
||||
- windows/pamhyr-windows.zip
|
||||
- windows/pamhyr-windows.exe
|
||||
- linux/pamhyr-gnulinux.tar.xz.sha256
|
||||
- windows/pamhyr-windows.zip.sha256
|
||||
- windows/pamhyr-windows.exe.sha256
|
||||
- doc/dev/documentation.pdf
|
||||
# - doc/users/documentation.pdf
|
||||
script:
|
||||
- cd packages
|
||||
release:
|
||||
name: '$CI_COMMIT_TAG'
|
||||
description: 'Automatic release from tag $CI_COMMIT_TAG'
|
||||
description: '$CI_COMMIT_TAG_MESSAGE'
|
||||
tag_name: '$CI_COMMIT_TAG'
|
||||
ref: '$CI_COMMIT_SHA'
|
||||
assets:
|
||||
links:
|
||||
- name: 'GNU/Linux amd64 (tar.xz)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-gnulinux-amd64.tar.xz'
|
||||
filepath: '/packages/pamhyr-gnulinux-amd64.tar.xz'
|
||||
- name: 'GNU/Linux CHECKSUM SHA256 (tar.xz)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/linux/pamhyr-gnulinux.tar.xz.sha256'
|
||||
filepath: '/linux/pamhyr-gnulinux.tar.xz.sha256'
|
||||
link_type: 'package'
|
||||
- name: 'Windows amd64 (exe)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/packages/pamhyr-win-amd64.exe'
|
||||
filepath: '/packages/pamhyr-win-amd64.exe'
|
||||
- name: 'GNU/Linux (tar.xz)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/linux/pamhyr-gnulinux.tar.xz'
|
||||
filepath: '/linux/pamhyr-gnulinux.tar.xz'
|
||||
link_type: 'package'
|
||||
- name: 'Windows CHECKSUM SHA256 (exe)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.exe.sha256'
|
||||
filepath: '/windows/pamhyr-windows.exe.sha256'
|
||||
link_type: 'package'
|
||||
- name: 'Windows (exe)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.exe'
|
||||
filepath: '/windows/pamhyr-windows.exe'
|
||||
link_type: 'package'
|
||||
- name: 'Windows CHECKSUM SHA256 (zip)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.zip.sha256'
|
||||
filepath: '/windows/pamhyr-windows.zip.sha256'
|
||||
link_type: 'package'
|
||||
- name: 'Windows (zip)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/windows/pamhyr-windows.zip'
|
||||
filepath: '/windows/pamhyr-windows.zip'
|
||||
link_type: 'package'
|
||||
- name: 'Dev documentations (pdf)'
|
||||
url: '${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/doc/dev/documentation.pdf'
|
||||
filepath: '/doc/dev/documentation.pdf'
|
||||
link_type: 'other'
|
||||
@@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
@@ -0,0 +1,6 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<settings>
|
||||
<option name="USE_PROJECT_PROFILE" value="false" />
|
||||
<version value="1.0" />
|
||||
</settings>
|
||||
</component>
|
||||
@@ -0,0 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Black">
|
||||
<option name="sdkName" value="Python 3.10 (pamhyr)" />
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" project-jdk-name="Python 3.10 (pamhyr)" project-jdk-type="Python SDK" />
|
||||
</project>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/pamhyr.iml" filepath="$PROJECT_DIR$/.idea/pamhyr.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="PYTHON_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/venv" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="Python 3.10 (pamhyr)" jdkType="Python SDK" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
<component name="PyDocumentationSettings">
|
||||
<option name="format" value="PLAIN" />
|
||||
<option name="myDocStringFormat" value="Plain" />
|
||||
</component>
|
||||
</module>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -1,3 +1,4 @@
|
||||
Sylvain COULIBALY, INRAE, 2020 - 2022
|
||||
Théophile TERRAZ, INRAE, 2022 - 2023
|
||||
Pierre-Antoine ROUBY, INRAE, 2023
|
||||
Théophile TERRAZ, INRAE, 2022 - 2024
|
||||
Pierre-Antoine ROUBY, INRAE, 2023 - 2026
|
||||
Dylan JEANNIN, INRAE, 2026
|
||||
@@ -1 +1,41 @@
|
||||
# PamHyr (Programme d’Aide à la Modélisation en Hydraulique des Rivières)
|
||||
# Pamhyr2
|
||||
|
||||
Pamhyr is a free and open source graphical user interface for 1D hydro-sedimentary
|
||||
modelling of rivers.
|
||||
|
||||

|
||||
|
||||
## Features
|
||||
|
||||
+ Define a complex river hydraulics network
|
||||
+ Define the river geometry
|
||||
+ Define boundary conditions
|
||||
+ Define lateral contribution
|
||||
+ Define river friction
|
||||
+ Define reservoirs
|
||||
+ Define hydraulic structures
|
||||
+ Define or generate initial conditions
|
||||
+ Define river sedimentary layers
|
||||
+ Save the study in a unique file
|
||||
+ Run Mage 8 on a study and visualize results
|
||||
+ Create and edit study alternative scenario tree
|
||||
|
||||
Let see the
|
||||
[documentation](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home)
|
||||
([:fr:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home-fr),
|
||||
[:gb:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home-en))
|
||||
for more details.
|
||||
|
||||
## Install
|
||||
|
||||
### GNU/Linux
|
||||
|
||||
See documentation:
|
||||
- [French :fr:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/fr/Install%20on%20GNULinux)
|
||||
- [English :gb:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/en/Install%20on%20GNULinux)
|
||||
|
||||
### Windows
|
||||
|
||||
See documentation:
|
||||
- [French :fr:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/fr/Install%20on%20Windows)
|
||||
- [English :gb:](https://gitlab.com/pamhyr/pamhyr2/-/wikis/home/en/Install%20on%20Windows)
|
||||
@@ -0,0 +1,23 @@
|
||||
#! /bin/sh
|
||||
|
||||
FILES="documentation.org scenario.org"
|
||||
|
||||
for file in $FILES
|
||||
do
|
||||
echo " PDF $file"
|
||||
emacs -nw --batch \
|
||||
--eval "(require 'org)" \
|
||||
--eval "(require 'ox-latex)" \
|
||||
--eval "(load-file \"../tools/setup.el\")" \
|
||||
--file ./$file \
|
||||
-f org-latex-export-to-pdf \
|
||||
|
||||
echo " HTML $file"
|
||||
emacs -nw --batch \
|
||||
--eval "(require 'org)" \
|
||||
--eval "(require 'ox-latex)" \
|
||||
--eval "(require 'ox-html)" \
|
||||
--eval "(load-file \"../tools/setup.el\")" \
|
||||
--file ./$file \
|
||||
-f org-html-export-to-html
|
||||
done
|
||||
@@ -0,0 +1 @@
|
||||
../tools/ref.bib
|
||||
|
After Width: | Height: | Size: 21 KiB |
|
After Width: | Height: | Size: 51 KiB |
|
After Width: | Height: | Size: 224 KiB |
@@ -0,0 +1,661 @@
|
||||
# senario.org -- Pamhyr developers documentation
|
||||
# Copyright (C) 2023-2024 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
#+STARTUP: indent show2levels
|
||||
|
||||
#+INCLUDE: ../tools/macro.org
|
||||
#+INCLUDE: ../tools/latex.org
|
||||
|
||||
#+TITLE: Scenario implementation in Pamhyr2: \textbf{Preparatory work}
|
||||
#+SUBTITLE: Version: {{{version}}}
|
||||
#+AUTHOR: {{{INRAE}}}
|
||||
|
||||
#+OPTIONS: toc:t
|
||||
#+LANGUAGE: UKenglish
|
||||
|
||||
#+latex: \newpage
|
||||
|
||||
* COMMENT tools
|
||||
|
||||
#+begin_src emacs-lisp :export none
|
||||
(add-to-list 'org-structure-template-alist
|
||||
'("p" "#+begin_src python :python python3 :results output\n\n#+end_src"))
|
||||
#+end_src
|
||||
|
||||
#+RESULTS:
|
||||
#+begin_example
|
||||
((p #+begin_src python :python python3 :results output
|
||||
|
||||
,#+end_src) (d . #+name: graph-XXX
|
||||
,#+header: :results drawer
|
||||
,#+header: :exports results
|
||||
,#+header: :post attr_wrap(width="12cm", data=*this*, name="graph-XXX", caption="Graph XXX", float="t")
|
||||
,#+begin_src dot :file "images/graph-XXX.png" :cache no
|
||||
digraph {
|
||||
bgcolor="transparent";
|
||||
node[colorscheme=set19,shape=box,style="filled",fillcolor=9];
|
||||
}
|
||||
,#+end_src) (p . src python :python python3 :results output :noweb yes
|
||||
|
||||
src) (t . EXPORT latex
|
||||
\begin{table}
|
||||
\centering
|
||||
\resizebox{0.6\linewidth}{!}{
|
||||
|
||||
}
|
||||
%\vspace{0.5pt}
|
||||
%\caption{Number of tests by errors types}
|
||||
\end{table}
|
||||
,#+E) (B . src shell :session *shell* :results output :exports both) (a . export ascii) (c . center) (C . comment) (e . example) (E . export) (h . export html) (l . export latex) (q . quote) (s . src) (v . verse))
|
||||
#+end_example
|
||||
|
||||
#+name: dbg-execute
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def execute(db, query):
|
||||
print(query)
|
||||
return db.execute(query)
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: dbg-execute
|
||||
|
||||
#+name: execute
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def execute(db, query):
|
||||
return db.execute(query)
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: execute
|
||||
|
||||
* Principe
|
||||
|
||||
** Scenario
|
||||
|
||||
A scenario is defined by a name, a description and a parent
|
||||
scenario. If a scenario as no parent, parent value is =None=. So, in
|
||||
Pamhyr2 the list of scenario must by a tree with a root defined by a
|
||||
default scenarios with no parent.
|
||||
|
||||
#+begin_src sql
|
||||
CREATE TABLE scenario(
|
||||
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL, -- Name of the scenario
|
||||
description TEXT NOT NULL, -- Rich text description
|
||||
parent_id INTEGER REFERENCES scenario(id) -- Recursive references
|
||||
-- for parent scenario
|
||||
)
|
||||
#+end_src
|
||||
|
||||
** Data
|
||||
|
||||
Each data is associated with one and only one scenario. This senario
|
||||
is defined by the =id=. So, each data structure who can saved in DB
|
||||
must add the following lines in table définition:
|
||||
|
||||
#+begin_src sql
|
||||
scenario_id INTEGER NOT NULL,
|
||||
FOREIGN KEY(scenario_id) REFERENCES scenario(id)
|
||||
#+end_src
|
||||
|
||||
To avoid, at least, memory usage exploitation, by default, a scenario
|
||||
must saved only the modified data from its parent. This contrains
|
||||
require to wrap any data modification to update the data scenario id
|
||||
to current scenario id in source code. In addition, we need to modify
|
||||
the data loading méthode to take in considération this recursive
|
||||
dependencies.
|
||||
|
||||
#+CAPTION: Recursive loading method
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def rec_load(cls, db, current_scenario):
|
||||
# Default case, end of recursion
|
||||
if current_scenario is None:
|
||||
return [] # Default value
|
||||
|
||||
table = db.execute(f"<MY SELECT> WHERE scenario_id = {current_scenario}")
|
||||
|
||||
# If no data for this scenario, recursion
|
||||
if len(table) == 0:
|
||||
parent_id = db.get_parent_id(current_scenario)
|
||||
return cls.rec_load(db, parent_id)
|
||||
|
||||
# Otherelse, parse data and return...
|
||||
#+end_src
|
||||
|
||||
With this method, modify a data in parent scenario, modify this data
|
||||
in child scenario too. Unless is value has been previously modified in
|
||||
the child scenario. Deny tree node modification, except for leaf.
|
||||
|
||||
This method work, but it dont allow to delete data un child scenarios,
|
||||
because if we dont found data for this scenario we search for parent
|
||||
scenario. So, we need a condition to stop recursion in case of data
|
||||
deletion in child scenario. To stop the recurtion, we can use a dummy
|
||||
data flag. By default, this flags is =false=, but if this flags is
|
||||
=true= the data is ignored at loading.
|
||||
|
||||
So, we can use this flags for each data structure who can saved in DB:
|
||||
|
||||
#+begin_src sql
|
||||
is_dummy BOOLEAN, -- True if this data as been deleted
|
||||
#+end_src
|
||||
|
||||
Modify the loading method:
|
||||
|
||||
#+CAPTION: Recursive loading method with possible dummy data
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def rec_load_2(cls, db, current_scenario):
|
||||
# Default case, end of recursion
|
||||
if current_scenario is None:
|
||||
return [] # Default value
|
||||
|
||||
table = db.execute(f"<MY SELECT> WHERE scenario_id = {current_scenario}")
|
||||
|
||||
# If no data for this scenario, recursion
|
||||
if len(table) == 0:
|
||||
parent_id = db.get_parent_id(current_scenario)
|
||||
return cls.rec_load(db, parent_id)
|
||||
|
||||
for data in table:
|
||||
if is_dummy(data):
|
||||
continue
|
||||
|
||||
# Otherelse, parse data ...
|
||||
|
||||
# return ...
|
||||
#+end_src
|
||||
|
||||
#+RESULTS:
|
||||
|
||||
And add a data reduction method:
|
||||
|
||||
#+caption: Data reduction method for data subtree
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def reduce_change(self):
|
||||
# Get the greater scenario
|
||||
scenar = reduce(
|
||||
lambda acc, x: max(acc, x._scenario),
|
||||
self._values,
|
||||
self._scenario
|
||||
)
|
||||
|
||||
# Apply change on this subtree
|
||||
self._scenario = scenar
|
||||
|
||||
if is_dummy(self): # There are no more subtree
|
||||
self.values = []
|
||||
else: # Update data subtree scenario id
|
||||
for value in self._values:
|
||||
value.set_scenario(self._scenario)
|
||||
# Dummy data is no more necessary in this subtree
|
||||
self._values = list(
|
||||
filter(
|
||||
lambda v: not is_dummy(v),
|
||||
self._values
|
||||
)
|
||||
)
|
||||
|
||||
# Keep data id unique for all subtree
|
||||
self.get_new_db_id()
|
||||
#+end_src
|
||||
|
||||
#+RESULTS:
|
||||
|
||||
#+latex: \newpage
|
||||
|
||||
* Prototype
|
||||
|
||||
** Scenario
|
||||
|
||||
#+name: scenario
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
class Scenario():
|
||||
def __init__(self, id, name, parent):
|
||||
self._id = id
|
||||
self._name = name
|
||||
self._parent = parent
|
||||
|
||||
@classmethod
|
||||
def create_db(cls, db):
|
||||
execute(
|
||||
db, """
|
||||
CREATE TABLE scenario(
|
||||
id INTEGER PRIMARY KEY,
|
||||
name TEXT NOT NULL,
|
||||
parent_id INTEGER REFERENCES scenario(id)
|
||||
)
|
||||
"""
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def load_db(cls, db):
|
||||
cur = execute(
|
||||
db, f"SELECT * FROM scenario"
|
||||
)
|
||||
table = cur.fetchall()
|
||||
|
||||
new = []
|
||||
for values in table:
|
||||
new.append(
|
||||
cls(
|
||||
values[0], values[1], values[2],
|
||||
)
|
||||
)
|
||||
|
||||
return new
|
||||
|
||||
def save(self, db):
|
||||
sid = 'NULL' if self._parent is None else self._parent
|
||||
|
||||
execute(
|
||||
db,
|
||||
"INSERT INTO scenario (id, name, parent_id) " +
|
||||
f"VALUES ({self._id}, '{self._name}', {sid})"
|
||||
)
|
||||
|
||||
def __repr__(self):
|
||||
return f"Scenario {{ {self._id}, {self._name}, parent {self._parent} }}"
|
||||
|
||||
def __str__(self):
|
||||
return f"{self._name}({self._id})"
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: scenario
|
||||
|
||||
** Data
|
||||
|
||||
#+name: data-b
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
class B():
|
||||
def __init__(self, value, scenario):
|
||||
self._value = value
|
||||
self._scenario = scenario
|
||||
self._dummy = False
|
||||
|
||||
@classmethod
|
||||
def create_db(cls, db):
|
||||
execute(db, """
|
||||
CREATE TABLE b(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
dummy_data BOOLEAN,
|
||||
x INTEGER,
|
||||
a_id INTEGER NOT NULL,
|
||||
scenario_id INTEGER NOT NULL,
|
||||
FOREIGN KEY(a_id) REFERENCES a(id),
|
||||
FOREIGN KEY(scenario_id) REFERENCES scenario(id)
|
||||
)
|
||||
""")
|
||||
|
||||
def save(self, db, a_id):
|
||||
execute(
|
||||
db,
|
||||
"INSERT INTO b (x, dummy_data, a_id, scenario_id) " +
|
||||
f"VALUES ({self._value}, {self._dummy}, {a_id}, {self._scenario})"
|
||||
)
|
||||
|
||||
@classmethod
|
||||
def load_db(cls, db, a_id, senar):
|
||||
if senar is None:
|
||||
return []
|
||||
|
||||
cur = execute(
|
||||
db,
|
||||
"SELECT x, scenario_id, dummy_data FROM b " +
|
||||
f"WHERE scenario_id = {senar} AND a_id = {a_id}"
|
||||
)
|
||||
table = cur.fetchall()
|
||||
|
||||
if len(table) == 0:
|
||||
parent = execute(
|
||||
db,
|
||||
f"SELECT parent_id FROM scenario WHERE id = {senar}"
|
||||
).fetchone()
|
||||
|
||||
return cls.load_db(db, parent[0])
|
||||
|
||||
new = []
|
||||
for values in table:
|
||||
if values[2]: # Is dummy
|
||||
continue
|
||||
|
||||
new.append(cls(values[0], values[1]))
|
||||
|
||||
return new
|
||||
|
||||
def set_value(self, value, scenario):
|
||||
self._value = value
|
||||
self._scenario = scenario
|
||||
|
||||
def set_dummy(self, scenario):
|
||||
self._scenario = scenario
|
||||
self._dummy = True
|
||||
|
||||
def __repr__(self):
|
||||
if self._dummy:
|
||||
return ""
|
||||
return f"{self._value}"
|
||||
|
||||
def __str__(self):
|
||||
if self._dummy:
|
||||
return ""
|
||||
return f"{self._value}"
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: data-b
|
||||
|
||||
#+name: data-a
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
class A():
|
||||
def __init__(self, id, values, scenario):
|
||||
self._id = id
|
||||
self._values = values
|
||||
self._scenario = scenario
|
||||
self._dummy = False
|
||||
|
||||
@classmethod
|
||||
def create_db(cls, db):
|
||||
execute(db, """
|
||||
CREATE TABLE a(
|
||||
id INTEGER PRIMARY KEY,
|
||||
dummy_data BOOLEAN,
|
||||
scenario_id INTEGER,
|
||||
FOREIGN KEY(scenario_id) REFERENCES scenario(id)
|
||||
)
|
||||
""")
|
||||
|
||||
def save(self, db):
|
||||
self.reduce_change()
|
||||
|
||||
execute(db, f"DELETE FROM a WHERE scenario_id = {self._scenario}")
|
||||
execute(
|
||||
db,
|
||||
"INSERT INTO a (id, dummy_data, scenario_id) " +
|
||||
f"VALUES ({self._id}, {self._dummy}, {self._scenario})"
|
||||
)
|
||||
|
||||
execute(
|
||||
db,
|
||||
"DELETE FROM b " +
|
||||
f"WHERE scenario_id = {self._scenario} " +
|
||||
f"AND a_id = {self._id}"
|
||||
)
|
||||
|
||||
for value in self._values:
|
||||
value.save(db, self._id)
|
||||
|
||||
def reduce_change(self):
|
||||
diff_scenar = reduce(
|
||||
lambda acc, x: max(acc, x._scenario),
|
||||
self._values,
|
||||
self._scenario
|
||||
)
|
||||
print(f" ~> Reduce: {self._scenario} to {diff_scenar}")
|
||||
self._scenario = diff_scenar
|
||||
|
||||
# Reduce new scenario value on each value
|
||||
for value in self._values:
|
||||
value._scenario = self._scenario
|
||||
|
||||
# Delete useless dummy data
|
||||
self._values = list(
|
||||
filter(
|
||||
lambda v: not v._dummy,
|
||||
self._values
|
||||
)
|
||||
)
|
||||
|
||||
# HACK: keep id unique
|
||||
self._id = self._id * 100 + diff_scenar
|
||||
|
||||
@classmethod
|
||||
def load_db(cls, db, senar):
|
||||
if senar is None:
|
||||
return []
|
||||
|
||||
cur = execute(
|
||||
db,
|
||||
f"SELECT id, scenario_id, dummy_data FROM a WHERE scenario_id = {senar}"
|
||||
)
|
||||
table = cur.fetchall()
|
||||
|
||||
if len(table) == 0:
|
||||
parent = execute(
|
||||
db,
|
||||
f"SELECT parent_id FROM scenario WHERE id = {senar}"
|
||||
).fetchone()
|
||||
|
||||
return cls.load_db(db, parent[0])
|
||||
|
||||
new = []
|
||||
for values in table:
|
||||
if values[2]:
|
||||
continue
|
||||
|
||||
bb = B.load_db(db, values[0], senar)
|
||||
new.append(cls(values[0], bb, values[1]))
|
||||
|
||||
return new
|
||||
|
||||
def set_dummy(self, scenario):
|
||||
self._scenario = scenario
|
||||
self._dummy = True
|
||||
|
||||
def add(self, b):
|
||||
self._values.append(b)
|
||||
|
||||
def delete(self, index, scenario):
|
||||
self._values[index].set_dummy(scenario)
|
||||
self._scenario = scenario
|
||||
|
||||
def __repr__(self):
|
||||
if self._dummy:
|
||||
return "{ }"
|
||||
return f"{{ {self._values}, ({self._scenario}) }}"
|
||||
|
||||
def __str__(self):
|
||||
if self._dummy:
|
||||
return "{ }"
|
||||
return f"{{ {list(map(str, self._values))}, ({self._scenario}) }}"
|
||||
#+end_src
|
||||
|
||||
#+RESULTS: data-a
|
||||
|
||||
** Full prototype
|
||||
|
||||
#+begin_src python :python python3 :results output :exports both :noweb yes :cache yes
|
||||
from functools import reduce
|
||||
|
||||
def execute(db, query):
|
||||
# print(query)
|
||||
return db.execute(query)
|
||||
|
||||
def get_tree(db):
|
||||
from treelib import Node, Tree
|
||||
|
||||
tree = Tree()
|
||||
|
||||
for senar in db.execute("SELECT * FROM scenario").fetchall():
|
||||
if senar[1] is None:
|
||||
tree.create_node(
|
||||
str(Scenario(senar[0], senar[1], senar[2])) +
|
||||
" : " + str(A.load_db(db, senar[0])[0]),
|
||||
senar[0]
|
||||
)
|
||||
else:
|
||||
tree.create_node(
|
||||
str(Scenario(senar[0], senar[1], senar[2])) +
|
||||
" : " + str(A.load_db(db, senar[0])[0]),
|
||||
senar[0],
|
||||
parent=senar[2]
|
||||
)
|
||||
|
||||
return tree
|
||||
|
||||
### --- Scenario ---
|
||||
<<scenario>>
|
||||
|
||||
### --- class B ---
|
||||
<<data-b>>
|
||||
|
||||
### --- class A ---
|
||||
<<data-a>>
|
||||
|
||||
### --- Script ---
|
||||
import sqlite3
|
||||
import pprint
|
||||
|
||||
pp = pprint.PrettyPrinter(width=79, compact=True, depth=6)
|
||||
|
||||
with sqlite3.connect(":memory:") as db:
|
||||
cur = db.cursor()
|
||||
|
||||
Scenario.create_db(cur)
|
||||
A.create_db(cur)
|
||||
B.create_db(cur)
|
||||
|
||||
print("--- Default scenario (s0) ---")
|
||||
|
||||
# One scenario
|
||||
|
||||
s0 = Scenario(0, "s0", None)
|
||||
a0 = A(
|
||||
1,
|
||||
[
|
||||
B(0, s0._id),
|
||||
B(1, s0._id),
|
||||
B(2, s0._id),
|
||||
],
|
||||
s0._id
|
||||
)
|
||||
|
||||
s0.save(cur)
|
||||
a0.save(cur)
|
||||
|
||||
print("--- New scenario (s1) -- copy without modification ---")
|
||||
|
||||
# New scenario
|
||||
|
||||
s1 = Scenario(1, "s1", s0._id)
|
||||
s1.save(cur)
|
||||
|
||||
print("--- New scenario (s2) -- data modification ---")
|
||||
|
||||
# New scenario 2 with data
|
||||
|
||||
s2 = Scenario(2, "s2", s0._id)
|
||||
s2.save(cur)
|
||||
|
||||
a2 = a0
|
||||
bb = list(map(
|
||||
lambda b: b.set_value(b._value + 1, s2._id),
|
||||
a2._values
|
||||
))
|
||||
|
||||
a2.save(cur)
|
||||
|
||||
print("--- New scenario (s3) -- delete data ---")
|
||||
|
||||
# New scenario 3 with data
|
||||
|
||||
s3 = Scenario(3, "s3", s0._id)
|
||||
s3.save(cur)
|
||||
|
||||
a3 = A.load_db(cur, s3._id)[0]
|
||||
a3._values[0].set_dummy(s3._id)
|
||||
a3.save(cur)
|
||||
|
||||
print("--- New scenario (s4) -- new data ---")
|
||||
|
||||
s4 = Scenario(4, "s4", s3._id)
|
||||
s4.save(cur)
|
||||
|
||||
a4 = A.load_db(cur, s3._id)[0]
|
||||
a4.add(B(666, s4._id))
|
||||
a4.save(cur)
|
||||
|
||||
print("--- Scenario tree ---")
|
||||
|
||||
tree = get_tree(db)
|
||||
print(tree)
|
||||
|
||||
print("--- Modify s0 data ---")
|
||||
|
||||
aa = A.load_db(db, s0._id)[0]
|
||||
bb = list(map(
|
||||
lambda b: b.set_value(b._value * 100 - 1, s0._id),
|
||||
aa._values
|
||||
))
|
||||
aa.save(db)
|
||||
|
||||
print("--- Scenario tree ---")
|
||||
|
||||
tree = get_tree(db)
|
||||
print(tree)
|
||||
|
||||
print("--- DB ---")
|
||||
|
||||
ss = db.execute("SELECT * FROM scenario").fetchall()
|
||||
print(f"+ scenario ({len(ss)}):")
|
||||
pp.pprint(ss)
|
||||
|
||||
aa = db.execute("SELECT * FROM a").fetchall()
|
||||
print(f"+ a ({len(aa)}):")
|
||||
pp.pprint(aa)
|
||||
|
||||
bb = db.execute("SELECT * FROM b").fetchall()
|
||||
print(f"+ b ({len(bb)}):")
|
||||
pp.pprint(bb)
|
||||
|
||||
#+end_src
|
||||
|
||||
#+RESULTS[96c84f23be557425ae2822ef7f174175ef69f9b9]:
|
||||
#+begin_example
|
||||
--- Default scenario (s0) ---
|
||||
~> Reduce: 0 to 0
|
||||
--- New scenario (s1) -- copy without modification ---
|
||||
--- New scenario (s2) -- data modification ---
|
||||
~> Reduce: 0 to 2
|
||||
--- New scenario (s3) -- delete data ---
|
||||
~> Reduce: 0 to 3
|
||||
--- New scenario (s4) -- new data ---
|
||||
~> Reduce: 3 to 4
|
||||
--- Scenario tree ---
|
||||
s0(0) : { ['0', '1', '2'], (0) }
|
||||
├── s1(1) : { ['0', '1', '2'], (0) }
|
||||
├── s2(2) : { ['1', '2', '3'], (2) }
|
||||
└── s3(3) : { ['1', '2'], (3) }
|
||||
└── s4(4) : { ['1', '2', '666'], (4) }
|
||||
|
||||
--- Modify s0 data ---
|
||||
~> Reduce: 0 to 0
|
||||
--- Scenario tree ---
|
||||
s0(0) : { ['-1', '99', '199'], (0) }
|
||||
├── s1(1) : { ['-1', '99', '199'], (0) }
|
||||
├── s2(2) : { ['1', '2', '3'], (2) }
|
||||
└── s3(3) : { ['1', '2'], (3) }
|
||||
└── s4(4) : { ['1', '2', '666'], (4) }
|
||||
|
||||
--- DB ---
|
||||
+ scenario (5):
|
||||
[(0, 's0', None), (1, 's1', 0), (2, 's2', 0), (3, 's3', 0), (4, 's4', 3)]
|
||||
+ a (4):
|
||||
[(10000, 0, 0), (10002, 0, 2), (10003, 0, 3), (1000304, 0, 4)]
|
||||
+ b (14):
|
||||
[(1, 0, 0, 100, 0), (2, 0, 1, 100, 0), (3, 0, 2, 100, 0), (4, 0, 1, 10002, 2),
|
||||
(5, 0, 2, 10002, 2), (6, 0, 3, 10002, 2), (7, 0, 1, 10003, 3),
|
||||
(8, 0, 2, 10003, 3), (9, 0, 1, 1000304, 4), (10, 0, 2, 1000304, 4),
|
||||
(11, 0, 666, 1000304, 4), (12, 0, -1, 10000, 0), (13, 0, 99, 10000, 0),
|
||||
(14, 0, 199, 10000, 0)]
|
||||
#+end_example
|
||||
@@ -0,0 +1,525 @@
|
||||
# presentation.org -- Pamhyr
|
||||
# Copyright (C) 2023 INRAE
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 3 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
#+STARTUP: indent hideblocks content beamer
|
||||
|
||||
#+TITLE: \textbf{Pamhyr2}
|
||||
#+SUBTITLE: Scenarios managements
|
||||
|
||||
# #+AUTHOR: Pierre-Antoine Rouby
|
||||
#+LATEX_HEADER: \author[Pierre-Antoine Rouby]{\textbf{Pierre-Antoine Rouby}}
|
||||
#+EMAIL: pierre-antoine.rouby@inrae.fr
|
||||
#+INSTITUTE: INRAE Lyon-Villerbanne, teams River Hydraulics
|
||||
#+LATEX_HEADER: \institute{INRAE Lyon-Villerbanne, River Hydraulics team}
|
||||
#+DATE: 9th November
|
||||
|
||||
#+KEYWORDS: g ui, hydraulics, sedimentary, hydro-sedimentary, 1D modelling, freesoftware, foss
|
||||
|
||||
#+OPTIONS: H:2 toc:t num:t author:nil
|
||||
#+LATEX_CLASS: beamer
|
||||
#+LATEX_CLASS_OPTIONS: [slideopt,A4,showboxes,svgnames,aspectratio=169]
|
||||
# #+LATEX_CLASS_OPTIONS: [presentation]
|
||||
#+BEAMER_THEME: default
|
||||
#+COLUMNS: %45ITEM %10BEAMER_ENV(Env) %10BEAMER_ACT(Act) %4BEAMER_COL(Col)
|
||||
|
||||
#+LANGUAGE: fr
|
||||
#+LATEX_HEADER: \usepackage[frenchb]{babel}
|
||||
|
||||
#+BEGIN_SRC emacs-lisp :results silent :exports none
|
||||
(setq org-latex-pdf-process (list
|
||||
"latexmk -pdflatex='lualatex -shell-escape -interaction nonstopmode' -pdf -f %f"))
|
||||
|
||||
(add-to-list 'org-latex-packages-alist '("" "minted"))
|
||||
(setq org-latex-listings 'minted)
|
||||
(setq org-src-fontify-natively t)
|
||||
|
||||
(org-add-link-type
|
||||
"cite" 'ebib
|
||||
(lambda (path desc format)
|
||||
(cond
|
||||
((eq format 'html)
|
||||
(format "(<cite>%s</cite>)" path))
|
||||
((eq format 'text)
|
||||
(format "[%s]" path))
|
||||
((eq format 'latex)
|
||||
(if (or (not desc) (equal 0 (search "cite:" desc)))
|
||||
(format "\\cite{%s}" path)
|
||||
(format "\\cite[%s][%s]{%s}"
|
||||
(cadr (split-string desc ";"))
|
||||
(car (split-string desc ";")) path))))))
|
||||
#+END_SRC
|
||||
|
||||
# Wrapper
|
||||
#+NAME: attr_wrap
|
||||
#+HEADER: :var width="\\textwidth"
|
||||
#+HEADER: :var caption=""
|
||||
#+HEADER: :var smallcaption=""
|
||||
#+HEADER: :var name=""
|
||||
#+HEADER: :var data=""
|
||||
#+HEADER: :var float="nil"
|
||||
#+BEGIN_SRC sh :results output :exports none
|
||||
echo "#+CAPTION[$smallcaption]: $caption"
|
||||
echo "#+NAME: $name"
|
||||
echo "#+ATTR_LATEX: :width $width :float $float"
|
||||
echo "$data"
|
||||
#+END_SRC
|
||||
|
||||
#+LATEX_HEADER: \setbeamertemplate{footline}[frame number]
|
||||
#+LATEX_HEADER: \setbeamertemplate{headline}{}
|
||||
#+LATEX_HEADER: \usepackage{multirow}
|
||||
#+LATEX_HEADER: \usepackage{fontawesome5}
|
||||
#+LATEX_HEADER: \usepackage{tcolorbox}
|
||||
#+LATEX_HEADER: \usepackage{tikz}
|
||||
|
||||
#+LATEX_HEADER: \logo{\includegraphics[width=.1\textwidth]{../../../src/View/ui/ressources/Logo-INRAE.png}}
|
||||
|
||||
#+LATEX_HEADER: \newcommand{\R}[1]{\rotatebox[origin=c]{90}{#1}}
|
||||
|
||||
# Beamer colors
|
||||
#+LATEX_HEADER: \setbeamersize{text margin left=0.5cm,text margin right=0.5cm}
|
||||
#+LATEX_HEADER: \setbeamerfont{alerted text}{series=\bfseries}
|
||||
#+LATEX_HEADER: \setbeamerfont{example text}{series=\bfseries}
|
||||
|
||||
#+LATEX_HEADER: \definecolor{inrae_1}{RGB}{102,193,191}
|
||||
#+LATEX_HEADER: \definecolor{inrae_2}{RGB}{0,150,152}
|
||||
#+LATEX_HEADER: \definecolor{inrae_3}{RGB}{39,86,98}
|
||||
|
||||
#+LATEX_HEADER: \setbeamercolor{alerted text}{fg=inrae_1}
|
||||
#+LATEX_HEADER: \setbeamercolor{structure}{fg=inrae_2}
|
||||
#+LATEX_HEADER: \setbeamercolor{normal text}{fg=inrae_3}
|
||||
#+LATEX_HEADER: \setbeamercolor*{author}{fg=inrae_3}
|
||||
|
||||
#+LATEX_HEADER: \usepackage[absolute,showboxes,overlay]{textpos}
|
||||
|
||||
#+LATEX_HEADER: \TPshowboxesfalse
|
||||
#+LATEX_HEADER: \textblockorigin{5mm}{0mm}
|
||||
|
||||
# Biblio
|
||||
#+LATEX_HEADER: \usepackage{natbib}
|
||||
# #+LATEX_HEADER: \bibliographystyle{apalike}
|
||||
#+LATEX_HEADER: \setbeamertemplate{bibliography item}{}
|
||||
#+LATEX_HEADER: \renewcommand\bibfont{\scriptsize}
|
||||
#+LATEX_HEADER: \setbeamertemplate{frametitle continuation}[from second]
|
||||
#+LATEX_HEADER: \setbeamercolor*{bibliography entry title}{fg=inrae_3}
|
||||
#+LATEX_HEADER: \setbeamercolor*{bibliography entry author}{fg=inrae_3}
|
||||
#+LATEX_HEADER: \setbeamercolor*{bibliography entry location}{fg=inrae_3}
|
||||
|
||||
#+LATEX_HEADER: \usepackage{bbding}
|
||||
#+LATEX_HEADER: \usepackage{pdfpages}
|
||||
|
||||
# Renew title page
|
||||
#+LATEX_HEADER: \defbeamertemplate*{title page}{customized}[1][]
|
||||
#+LATEX_HEADER: {
|
||||
# #+LATEX_HEADER: {
|
||||
# #+LATEX_HEADER: \usebeamerfont{date}\usebeamercolor[fg]{date}
|
||||
# #+LATEX_HEADER: \tikz[overlay,remember picture]
|
||||
# #+LATEX_HEADER: \node[xshift=-1cm,yshift=-1cm,text width=10cm] at (current page.north east) {
|
||||
# #+LATEX_HEADER: 7$^{th}$ International Conference\\
|
||||
# #+LATEX_HEADER: 8TH-10TH November\\
|
||||
# #+LATEX_HEADER: EDF Lab - CHATOU, FRANCE
|
||||
# #+LATEX_HEADER: }
|
||||
# #+LATEX_HEADER: }
|
||||
#+LATEX_HEADER: {
|
||||
#+LATEX_HEADER: \usebeamerfont{title}\inserttitle\par
|
||||
#+LATEX_HEADER: \usebeamerfont{title}\usebeamercolor[fg]{title}
|
||||
#+LATEX_HEADER: }
|
||||
#+LATEX_HEADER: \bigskip
|
||||
#+LATEX_HEADER: \begin{center}
|
||||
#+LATEX_HEADER: \usebeamerfont{subtitle}\usebeamercolor[fg]{subtitle}
|
||||
#+LATEX_HEADER: {
|
||||
#+LATEX_HEADER: \LARGE\insertsubtitle\par
|
||||
#+LATEX_HEADER: }
|
||||
#+LATEX_HEADER: \bigskip
|
||||
#+LATEX_HEADER: \usebeamerfont{author}\usebeamercolor[fg]{author}\insertauthor\par
|
||||
#+LATEX_HEADER: \bigskip
|
||||
#+LATEX_HEADER: \usebeamerfont{institute}\usebeamercolor[fg]{institute}\insertinstitute\par
|
||||
#+LATEX_HEADER: \bigskip
|
||||
#+LATEX_HEADER: \usebeamerfont{date}\usebeamercolor[fg]{date}\insertdate\par
|
||||
#+LATEX_HEADER: \usebeamercolor[fg]{titlegraphic}\inserttitlegraphic
|
||||
#+LATEX_HEADER: \end{center}
|
||||
#+LATEX_HEADER: }
|
||||
|
||||
# #+LATEX_HEADER: \newcommand{\tred}[1]{\textcolor{rouge_inrae}{#1}}
|
||||
|
||||
#+TODO: TODO WIP TOREVIEW | DONE
|
||||
|
||||
#+MACRO: pamhyr \textsc{PAMHyR}
|
||||
#+MACRO: pamhyr2 \textsc{Pamhyr2}
|
||||
|
||||
#+MACRO: pause \pause
|
||||
#+MACRO: framebreak \framebreak
|
||||
#+MACRO: no
|
||||
# #+MACRO: OK \checkmark
|
||||
#+MACRO: OK \faIcon{check}
|
||||
#+MACRO: bf \textbf{$1}
|
||||
|
||||
# #+latex: \frame{\tocpage}
|
||||
|
||||
* Problématique
|
||||
|
||||
** Problématique
|
||||
|
||||
*** Utilisateur
|
||||
|
||||
- Définire une version modifier de l'étude (changement dans les
|
||||
données)
|
||||
- Comparé des résultats entre une variante et l'étude
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
**** COMMENT Développeur
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
- Un unique fichier
|
||||
- Limité la duplication de donnée à sauvegarder
|
||||
- Garder une bonne cohérence entre données et résultats
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
*** Scénarios
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 1
|
||||
:BEAMER_ENV: definition
|
||||
:END:
|
||||
|
||||
Un scénario est une variate d'une étude.
|
||||
|
||||
** Problématique -- Avancer
|
||||
|
||||
*** Utilisateur
|
||||
|
||||
- Définire une version modifier d'un senarios
|
||||
- Comparé des résultats entre plusieurs senarios
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
**** COMMENT Développeur
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
- Un unique fichier
|
||||
- Limité la duplication de donnée à sauvegarder
|
||||
- Garder une bonne cohérence entre données et résultats
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
*** Scénarios
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 1
|
||||
:BEAMER_ENV: definition
|
||||
:END:
|
||||
|
||||
Un scénario peut être l'étude ou une variate d'un autre scénario.
|
||||
|
||||
** Problématique -- Encore plus avancer
|
||||
|
||||
*** Utilisateur
|
||||
|
||||
- Définire un ensemble fini de variante correspondant a un ensemble de
|
||||
valeur pour un(des) paramètre(s) et executer un solveur sur
|
||||
l'ensemble des variantes
|
||||
- Pouvoir comparé des metrics sur un ensemble de résultats trop grand
|
||||
pour une comparaisont à la mains
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
**** COMMENT Développeur
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
- Un unique fichier
|
||||
- Limité la duplication de donnée à sauvegarder
|
||||
- Garder une bonne cohérence entre données et résultats
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
*** Scénarios
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 1
|
||||
:BEAMER_ENV: definition
|
||||
:END:
|
||||
|
||||
Un scénario peut être l'étude, une variate d'un scénarios ou un
|
||||
ensemble fini de variantes d'un scénarios.
|
||||
|
||||
** Problématique -- Encore plus plus avancer
|
||||
|
||||
*** Utilisateur
|
||||
|
||||
- Définire un ensemble fini de variante correspondant a un ensemble de
|
||||
valeur pour un(des) paramètre(s) et faire un nombre fini de tirage
|
||||
aléatoire dans ces paramètre pour executer un solveur ces paramètres
|
||||
- Pouvoir comparé des metrics sur un ensemble de résultats trop grand
|
||||
pour une comparaisont à la mains
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
*** Scénarios
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 1
|
||||
:BEAMER_ENV: definition
|
||||
:END:
|
||||
|
||||
Un scénario peut être l'étude, une variate d'un scénarios ou un
|
||||
ensemble fini ou un tirage aléatoire dans un ensemble de variantes
|
||||
d'un scénarios.
|
||||
|
||||
** Problématique -- Développeur
|
||||
|
||||
*** Développeur
|
||||
|
||||
- Permetre a l'utilisateur de *garder une bonne cohérence entre
|
||||
données et résultats* de façon claire
|
||||
- Permetre a l'utilisateur de *géré les scénarios* de façon claire
|
||||
(représentation graphique)
|
||||
- Garder *un unique fichier* (=.pamhyr=)
|
||||
- *Limité la duplication* de donnée à sauvegarder
|
||||
- Permetre à l'utilisateur de garder les *résultats pertinant* sans
|
||||
exploser la mémoire de l'ordinateur
|
||||
|
||||
* Proposition
|
||||
|
||||
** Proposition -- Concept
|
||||
|
||||
*** {{{no}}}
|
||||
\vspace{-1.2cm}
|
||||
**** Deux type de scénarios
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
- Scénarios simple
|
||||
- Scénarios d'éxecution d'ensemble
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
**** Scénarios simple
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
Est composer:
|
||||
- d'un identifiant unique
|
||||
- d'un nom (définie par l'utilisateur)
|
||||
- d'une description (définie par l'utilisateur)
|
||||
- d'un parent (définie par l'utilisateur)
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
\vspace{-0.5cm}
|
||||
|
||||
*** Scénarios d'ensembles
|
||||
|
||||
**** {{{no}}}
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
\vspace{-1cm}
|
||||
Est composer:
|
||||
- d'un identifiant unique
|
||||
- d'un nom (définie par l'utilisateur)
|
||||
- d'une description (définie par l'utilisateur)
|
||||
- d'un parent (définie par l'utilisateur)
|
||||
- d'un ou plusieurs ensemble de valeur
|
||||
|
||||
**** {{{no}}}
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
\vspace{-0.5cm}
|
||||
Un ensemble de valeurs est definie par:
|
||||
- une valeurs de départ
|
||||
- une valeurs de fin
|
||||
- un pas de valeur
|
||||
- un élément d'origine (élément définie dans l'étude)
|
||||
- une fonctions (modification de l'élément à l'aide d'une valeur de
|
||||
l'ensemble)
|
||||
|
||||
** Proposition -- Limitation
|
||||
|
||||
*** Scénarios simple
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
Si le scénarios est le *parent d'un autre scénarios*, il ne *peut plus
|
||||
être modifier* sans risquer des comportement difficilement
|
||||
comprehensible pour l'utilisateur.
|
||||
|
||||
{{{pause}}}
|
||||
|
||||
*** Scénarios d'ensembles
|
||||
:PROPERTIES:
|
||||
:BEAMER_COL: 0.5
|
||||
:BEAMER_ENV: block
|
||||
:END:
|
||||
|
||||
- Un scénarios d'ensemble *ne peut pas être parent* d'un autre
|
||||
scénarios
|
||||
- Le nombre d'exécution peut très rapidement grossir
|
||||
|
||||
** Proposition -- Affichage
|
||||
|
||||
#+name: graph-scenarios
|
||||
#+header: :results drawer
|
||||
#+header: :exports results
|
||||
#+header: :post attr_wrap(width="7cm", data=*this*, name="graph-scenarios", caption="Exemple of scenarios graph", float="t")
|
||||
#+begin_src dot :file "images/graph-scenarios.png" :cache no
|
||||
digraph {
|
||||
bgcolor="transparent";
|
||||
node[colorscheme=pastel19,shape=ellipse,style="filled",fillcolor=9];
|
||||
|
||||
b[fillcolor=2];
|
||||
|
||||
aa[shape=box,fillcolor=2];
|
||||
aa2[label="aa'", shape=box, fillcolor=2];
|
||||
ad[shape=box, fillcolor=2];
|
||||
re[shape=box, fillcolor=2];
|
||||
rf[shape=box, fillcolor=2];
|
||||
|
||||
default -> a;
|
||||
default -> b;
|
||||
default -> c;
|
||||
|
||||
a -> aa;
|
||||
a -> aa2;
|
||||
a -> f -> rf;
|
||||
c -> d -> ad;
|
||||
c -> e -> re;
|
||||
}
|
||||
#+end_src
|
||||
|
||||
#+RESULTS[80ed2484b9cc71143f800ff23c10846fd04697c3]: graph-scenarios
|
||||
:results:
|
||||
#+CAPTION[]: Exemple of scenarios graph
|
||||
#+NAME: graph-scenarios
|
||||
#+ATTR_LATEX: :width 7cm :float t
|
||||
[[file:images/graph-scenarios.png]]
|
||||
:end:
|
||||
|
||||
* Solution technique
|
||||
|
||||
** Technique -- scénarios
|
||||
|
||||
#+begin_src sql
|
||||
CREATE TABLE scenario(
|
||||
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
|
||||
name TEXT NOT NULL, -- Name of the scenario
|
||||
description TEXT NOT NULL, -- Rich text description
|
||||
parent_id INTEGER REFERENCES scenario(id) -- Recursive references
|
||||
-- for parent scenario
|
||||
)
|
||||
#+end_src
|
||||
|
||||
** Technique -- Données -- Enregistrement
|
||||
|
||||
#+begin_src sql
|
||||
-- Unique ID (Must be unused, to delete)
|
||||
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
|
||||
-- New ID (not unique)
|
||||
pamhyr_id INTEGER NOT NULL,
|
||||
-- (Optional) Flag for set there is no data in this scenario and
|
||||
-- ignore parent scenario
|
||||
dummy BOOLEAN NOT NULL,
|
||||
-- Corresponding scenario
|
||||
scenario_id INTEGER NOT NULL,
|
||||
PRIMARY KEY(pamhyr_id, scenario_id),
|
||||
FOREIGN KEY(scenario_id) REFERENCES scenario(id),
|
||||
#+end_src
|
||||
|
||||
** Technique -- Données -- Chargement
|
||||
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def load(cls, db, current_scenario):
|
||||
# Default case, end of recursion
|
||||
if current_scenario is None:
|
||||
return [] # Default value
|
||||
|
||||
table = db.execute(f"<MY SELECT> WHERE scenario_id = {current_scenario}")
|
||||
|
||||
# If no data for this scenario, recursion
|
||||
if len(table) == 0:
|
||||
parent_id = db.get_parent_id(current_scenario)
|
||||
return cls.load(db, parent_id)
|
||||
|
||||
# Otherelse, parse data and return...
|
||||
#+end_src
|
||||
|
||||
** Technique -- Données -- Modification
|
||||
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def set_modified(self, current_scenario):
|
||||
self.scenario = current_scenario
|
||||
#+end_src
|
||||
|
||||
#+begin_src python :python python3 :results output :noweb yes
|
||||
def delete(self, current_scenario):
|
||||
self.deleted = True
|
||||
self.set_modified(current_scenario)
|
||||
#+end_src
|
||||
|
||||
** Technique -- Exécution d'ensemble
|
||||
|
||||
#+begin_src sql
|
||||
CREATE TABLE range_set(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
start REAL NOT NULL, -- Range start
|
||||
end REAL NOT NULL, -- Range end
|
||||
step REAL NOT NULL, -- Range step
|
||||
generator_name TEXT NOT NULL, -- Generator function name (ex:
|
||||
-- 'minor_strickler')
|
||||
original_data_id INTEGER, -- (optional) Ref to data who apply
|
||||
-- this range (ex: a strickler id)
|
||||
scenario_id INTEGER NOT NULL,
|
||||
FOREIGN KEY(scenario_id) REFERENCES scenario(id)
|
||||
)
|
||||
#+end_src
|
||||
|
||||
* Sauvegarde des résultats
|
||||
|
||||
** Sauvegarde des résultats
|
||||
|
||||
*** Scénarios simple
|
||||
|
||||
Sauvegarde d'un seul résultats complet par scénarios (et par solver).
|
||||
|
||||
*** Scénarios d'ensemble
|
||||
|
||||
Sauvegarde de metrics récupéré sur un ensemble de résultats (pas de
|
||||
sauvegarde de tous les résultats) ou certain résultats particuliers.
|
||||
|
||||
* Question & remarque
|
||||
|
||||
** Question & remarque
|
||||
|
||||
- Solution satisfaisante ?
|
||||
- Cas d'usage intéressent non couvert ?
|
||||
- Contre exemple ?
|
||||
- Meilleur solution ?
|
||||
|
After Width: | Height: | Size: 61 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 52 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 43 KiB |
|
After Width: | Height: | Size: 87 KiB |
|
After Width: | Height: | Size: 21 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 74 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 30 KiB |
|
After Width: | Height: | Size: 127 KiB |
|
After Width: | Height: | Size: 13 KiB |
|
After Width: | Height: | Size: 110 KiB |
|
After Width: | Height: | Size: 18 KiB |
|
After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 114 KiB |
|
After Width: | Height: | Size: 196 KiB |
|
After Width: | Height: | Size: 70 KiB |
|
After Width: | Height: | Size: 72 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 38 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 44 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
After Width: | Height: | Size: 49 KiB |
|
After Width: | Height: | Size: 134 KiB |
|
After Width: | Height: | Size: 131 KiB |
|
After Width: | Height: | Size: 42 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 40 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 107 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 19 KiB |
|
After Width: | Height: | Size: 20 KiB |
@@ -0,0 +1,692 @@
|
||||
diff --git a/packages/linux.sh b/packages/linux.sh
|
||||
index 215047e..a19bfb6 100755
|
||||
--- a/packages/linux.sh
|
||||
+++ b/packages/linux.sh
|
||||
@@ -76,11 +76,11 @@ mv ../pamhyr-src.tar.gz ./
|
||||
|
||||
echo " *** MAKE BIN PACKAGE"
|
||||
|
||||
-OLD_PWD=$PWD
|
||||
-cd dist/
|
||||
-tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100
|
||||
-cd $OLD_PWD
|
||||
+# OLD_PWD=$PWD
|
||||
+# cd dist/
|
||||
+# tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100
|
||||
+# cd $OLD_PWD
|
||||
|
||||
-mv dist/pamhyr-gnulinux-amd64.tar.xz ./
|
||||
+# mv dist/pamhyr-gnulinux-amd64.tar.xz ./
|
||||
|
||||
echo " *** DONE"
|
||||
diff --git a/src/Model/Friction/Friction.py b/src/Model/Friction/Friction.py
|
||||
index 18167a8..5bf2302 100644
|
||||
--- a/src/Model/Friction/Friction.py
|
||||
+++ b/src/Model/Friction/Friction.py
|
||||
@@ -170,6 +170,7 @@ class Friction(SQLSubModel):
|
||||
@begin_strickler.setter
|
||||
def begin_strickler(self, strickler):
|
||||
self._begin_strickler = strickler
|
||||
+ self._end_strickler = strickler # HACK: Only one Strickler
|
||||
self._status.modified()
|
||||
|
||||
@property
|
||||
diff --git a/src/Model/Stricklers/Stricklers.py b/src/Model/Stricklers/Stricklers.py
|
||||
index baa484f..a5670d2 100644
|
||||
--- a/src/Model/Stricklers/Stricklers.py
|
||||
+++ b/src/Model/Stricklers/Stricklers.py
|
||||
@@ -38,7 +38,7 @@ class Stricklers(SQLSubModel):
|
||||
else:
|
||||
self.id = id
|
||||
|
||||
- Stricklers._id_cnt = max(Stricklers._id_cnt + 1, self.id)
|
||||
+ Stricklers._id_cnt = max(Stricklers._id_cnt + 1, id + 1)
|
||||
|
||||
self._name = name
|
||||
self._comment = comment
|
||||
diff --git a/src/View/BoundaryCondition/translate.py b/src/View/BoundaryCondition/translate.py
|
||||
index c4ff8f8..172999a 100644
|
||||
--- a/src/View/BoundaryCondition/translate.py
|
||||
+++ b/src/View/BoundaryCondition/translate.py
|
||||
@@ -29,9 +29,9 @@ _translate = QCoreApplication.translate
|
||||
long_types = {
|
||||
"ND": _translate("BoundaryCondition", "Not defined"),
|
||||
"PC": _translate("BoundaryCondition", "Ponctual contribution"),
|
||||
- "TZ": _translate("BoundaryCondition", "Time over Z"),
|
||||
- "TD": _translate("BoundaryCondition", "Time over Discharge"),
|
||||
- "ZD": _translate("BoundaryCondition", "Z over Discharge"),
|
||||
+ "TZ": _translate("BoundaryCondition", "TimeZ"),
|
||||
+ "TD": _translate("BoundaryCondition", "TimeDischarge"),
|
||||
+ "ZD": _translate("BoundaryCondition", "ZDischarge"),
|
||||
"SL": _translate("BoundaryCondition", "Solid"),
|
||||
}
|
||||
|
||||
diff --git a/src/View/Frictions/PlotStricklers.py b/src/View/Frictions/PlotStricklers.py
|
||||
index 71ff6e6..b9060bc 100644
|
||||
--- a/src/View/Frictions/PlotStricklers.py
|
||||
+++ b/src/View/Frictions/PlotStricklers.py
|
||||
@@ -106,6 +106,8 @@ class PlotStricklers(APlot):
|
||||
)
|
||||
self.draw_frictions(lst, color="b")
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/Frictions/Window.py b/src/View/Frictions/Window.py
|
||||
index 4af3b66..f46fae3 100644
|
||||
--- a/src/View/Frictions/Window.py
|
||||
+++ b/src/View/Frictions/Window.py
|
||||
@@ -112,10 +112,10 @@ class FrictionsWindow(ASubMainWindow, ListedSubWindow):
|
||||
)
|
||||
|
||||
table.setItemDelegateForColumn(
|
||||
- 3, self._delegate_stricklers
|
||||
+ 2, self._delegate_stricklers
|
||||
)
|
||||
table.setItemDelegateForColumn(
|
||||
- 4, self._delegate_stricklers
|
||||
+ 3, self._delegate_stricklers
|
||||
)
|
||||
|
||||
table.setSelectionBehavior(QAbstractItemView.SelectRows)
|
||||
diff --git a/src/View/Frictions/translate.py b/src/View/Frictions/translate.py
|
||||
index 21981ab..82071e9 100644
|
||||
--- a/src/View/Frictions/translate.py
|
||||
+++ b/src/View/Frictions/translate.py
|
||||
@@ -21,10 +21,10 @@ from PyQt5.QtCore import QCoreApplication
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
table_headers = {
|
||||
- "name": _translate("Frictions", "Name"),
|
||||
+ # "name": _translate("Frictions", "Name"),
|
||||
# "edge": _translate("Frictions", "Reach"),
|
||||
"begin_kp": _translate("Frictions", "Begin kp (m)"),
|
||||
"end_kp": _translate("Frictions", "End kp (m)"),
|
||||
- "begin_strickler": _translate("Frictions", "Begin strickler"),
|
||||
- "end_strickler": _translate("Frictions", "End strickler"),
|
||||
+ "begin_strickler": _translate("Frictions", "Strickler"),
|
||||
+ # "end_strickler": _translate("Frictions", "End strickler"),
|
||||
}
|
||||
diff --git a/src/View/Geometry/PlotAC.py b/src/View/Geometry/PlotAC.py
|
||||
index fe6d933..e43f39e 100644
|
||||
--- a/src/View/Geometry/PlotAC.py
|
||||
+++ b/src/View/Geometry/PlotAC.py
|
||||
@@ -67,18 +67,18 @@ class PlotAC(APlot):
|
||||
gl = self.data.profile(selected_profile).names()
|
||||
|
||||
self.canvas.axes.set_xlabel(
|
||||
- _translate("MainWindow_reach", "Abscisse en travers (m)"),
|
||||
+ _translate("MainWindow_reach", "Transverse abscissa (m)"),
|
||||
color='green', fontsize=12
|
||||
)
|
||||
self.canvas.axes.set_ylabel(
|
||||
- _translate("MainWindow_reach", "Cote (m)"),
|
||||
+ _translate("MainWindow_reach", "Height (m)"),
|
||||
color='green', fontsize=12
|
||||
)
|
||||
self.canvas.figure.tight_layout()
|
||||
|
||||
- label_before_plot_selected = _translate("MainWindow_reach", "Profil précédent")
|
||||
- label_plot_selected = _translate("MainWindow_reach", "Profil sélectionné")
|
||||
- label_after_plot_selected = _translate("MainWindow_reach", "Profil suivant")
|
||||
+ label_before_plot_selected = _translate("MainWindow_reach", "Previous cross-section")
|
||||
+ label_plot_selected = _translate("MainWindow_reach", "Cross-section")
|
||||
+ label_after_plot_selected = _translate("MainWindow_reach", "Next cross-section")
|
||||
color_before_plot_selected = "k" # 'grey'
|
||||
color_plot_selected = 'b'
|
||||
color_after_plot_selected = 'm'
|
||||
diff --git a/src/View/Geometry/PlotKPZ.py b/src/View/Geometry/PlotKPZ.py
|
||||
index eb7d5e2..64057aa 100644
|
||||
--- a/src/View/Geometry/PlotKPZ.py
|
||||
+++ b/src/View/Geometry/PlotKPZ.py
|
||||
@@ -158,6 +158,8 @@ class PlotKPZ(APlot):
|
||||
color='lightgrey'
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py
|
||||
index 7776d73..1c8cb5d 100644
|
||||
--- a/src/View/Geometry/Window.py
|
||||
+++ b/src/View/Geometry/Window.py
|
||||
@@ -111,7 +111,7 @@ class GeometryWindow(ASubMainWindow, ListedSubWindow):
|
||||
self.ui.btn_sort_desc.triggered.connect(self.sort_descending)
|
||||
self.ui.btn_move_up.triggered.connect(self.move_row_up)
|
||||
self.ui.btn_move_down.triggered.connect(self.move_row_down)
|
||||
- self.ui.btn_end_editing.triggered.connect(self.handleSave)
|
||||
+ # self.ui.btn_end_editing.triggered.connect(self.handleSave)
|
||||
self.ui.btn_add.triggered.connect(self.insert_row)
|
||||
self.ui.btn_delete.triggered.connect(self.delete_rows)
|
||||
self.ui.btn_edit.triggered.connect(self.edit_profile)
|
||||
diff --git a/src/View/Geometry/mainwindow_ui_reach.py b/src/View/Geometry/mainwindow_ui_reach.py
|
||||
index 897b698..60bcfa6 100644
|
||||
--- a/src/View/Geometry/mainwindow_ui_reach.py
|
||||
+++ b/src/View/Geometry/mainwindow_ui_reach.py
|
||||
@@ -95,29 +95,29 @@ class Ui_MainWindow(object):
|
||||
self.btn_edit.setIcon(icon_btn_edit)
|
||||
self.toolBar.addAction(self.btn_edit)
|
||||
|
||||
- self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
|
||||
- self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
|
||||
- icon_btn_copy_selected_profile = QtGui.QIcon()
|
||||
- icon_btn_copy_selected_profile.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
|
||||
- self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
|
||||
- self.toolBar.addAction(self.btn_copy_selected_profile)
|
||||
-
|
||||
- self.btn_paste_selected_profile = QtWidgets.QAction(self.widget)
|
||||
- self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
|
||||
- icon_btn_paste_selected_profile = QtGui.QIcon()
|
||||
- icon_btn_paste_selected_profile.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
|
||||
- self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
|
||||
- self.toolBar.addAction(self.btn_paste_selected_profile)
|
||||
-
|
||||
- self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget)
|
||||
- self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
|
||||
- icon_btn_duplicate_selected_profile = QtGui.QIcon()
|
||||
- icon_btn_duplicate_selected_profile.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
|
||||
- self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
|
||||
- self.toolBar.addAction(self.btn_duplicate_selected_profile)
|
||||
+ # self.btn_copy_selected_profile = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_copy_selected_profile.setObjectName("btn_copy_selected_profile")
|
||||
+ # icon_btn_copy_selected_profile = QtGui.QIcon()
|
||||
+ # icon_btn_copy_selected_profile.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-copy.png"))
|
||||
+ # self.btn_copy_selected_profile.setIcon(icon_btn_copy_selected_profile)
|
||||
+ # self.toolBar.addAction(self.btn_copy_selected_profile)
|
||||
+
|
||||
+ # self.btn_paste_selected_profile = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_paste_selected_profile.setObjectName("btn_paste_selected_profile")
|
||||
+ # icon_btn_paste_selected_profile = QtGui.QIcon()
|
||||
+ # icon_btn_paste_selected_profile.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-paste.png"))
|
||||
+ # self.btn_paste_selected_profile.setIcon(icon_btn_paste_selected_profile)
|
||||
+ # self.toolBar.addAction(self.btn_paste_selected_profile)
|
||||
+
|
||||
+ # self.btn_duplicate_selected_profile = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_duplicate_selected_profile.setObjectName("btn_duplicate_selected_profile")
|
||||
+ # icon_btn_duplicate_selected_profile = QtGui.QIcon()
|
||||
+ # icon_btn_duplicate_selected_profile.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-dnd-multiple.png"))
|
||||
+ # self.btn_duplicate_selected_profile.setIcon(icon_btn_duplicate_selected_profile)
|
||||
+ # self.toolBar.addAction(self.btn_duplicate_selected_profile)
|
||||
|
||||
self.btn_sort_asc = QtWidgets.QAction(self.widget)
|
||||
self.btn_sort_asc.setObjectName("btn_sort_asc")
|
||||
@@ -151,13 +151,13 @@ class Ui_MainWindow(object):
|
||||
self.btn_move_down.setIcon(icon_btn_move_down)
|
||||
self.toolBar.addAction(self.btn_move_down)
|
||||
|
||||
- self.btn_end_editing = QtWidgets.QAction(self.widget)
|
||||
- self.btn_end_editing.setObjectName("btn_end_editing")
|
||||
- icon_btn_save = QtGui.QIcon()
|
||||
- icon_btn_save.addPixmap(
|
||||
- QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
|
||||
- self.btn_end_editing.setIcon(icon_btn_save)
|
||||
- self.toolBar.addAction(self.btn_end_editing)
|
||||
+ # self.btn_end_editing = QtWidgets.QAction(self.widget)
|
||||
+ # self.btn_end_editing.setObjectName("btn_end_editing")
|
||||
+ # icon_btn_save = QtGui.QIcon()
|
||||
+ # icon_btn_save.addPixmap(
|
||||
+ # QtGui.QPixmap(f"{icon_path}gtk-apply.png"))
|
||||
+ # self.btn_end_editing.setIcon(icon_btn_save)
|
||||
+ # self.toolBar.addAction(self.btn_end_editing)
|
||||
|
||||
self.verticalLayout.addLayout(self.horizontalLayout)
|
||||
self.tableView = QtWidgets.QTableView(self.widget)
|
||||
@@ -314,30 +314,23 @@ class Ui_MainWindow(object):
|
||||
def retranslateUi(self, MainWindow_reach):
|
||||
_translate = QtCore.QCoreApplication.translate
|
||||
self.name_reach = ""
|
||||
- self.mainwindow_title = _translate("MainWindow_reach", "Jeu de sections du Bief")
|
||||
+ self.mainwindow_title = _translate("MainWindow_reach", "Geometry reach edit")
|
||||
MainWindow_reach.setWindowTitle(self.mainwindow_title + f"{self.name_reach}")
|
||||
- self.text_section_order = _translate("MainWindow_reach", "\nOrdre des sections : "
|
||||
- "Amont --> Aval")
|
||||
# self.label_section_order.setText(f"{self.text_section_order}")
|
||||
self.vertical_slider_value = ""
|
||||
- self.vertical_slider_label.setText(_translate("MainWindow_reach", "Pk = ") + f"{self.vertical_slider_value}")
|
||||
- self.btn_open.setToolTip(_translate("MainWindow_reach", " Importer une géométrie"))
|
||||
- self.btn_add.setToolTip(_translate("MainWindow_reach", " Nouveau profil"))
|
||||
- self.btn_delete.setToolTip(_translate("MainWindow_reach", " Supprimer le profil sélectionné"))
|
||||
- self.btn_edit.setToolTip(_translate("MainWindow_reach", " Éditer le profil sélectionné"))
|
||||
- self.btn_copy_selected_profile.setToolTip(_translate("MainWindow_reach", " Copier le profil sélectionné"))
|
||||
- self.btn_paste_selected_profile.setToolTip(_translate("MainWindow_reach", "Coller le profil en fin de liste ("
|
||||
- "penser à modifier le Pk avant de "
|
||||
- "trier)"))
|
||||
- self.btn_duplicate_selected_profile.setToolTip(
|
||||
- _translate("MainWindow_reach", " Dupliquer la section sélectionnée"))
|
||||
+ self.vertical_slider_label.setText(_translate("MainWindow_reach", "Kp = ") + f"{self.vertical_slider_value}")
|
||||
+ self.btn_open.setToolTip(_translate("MainWindow_reach", " Import geometry"))
|
||||
+ self.btn_add.setToolTip(_translate("MainWindow_reach", " New profile"))
|
||||
+ self.btn_delete.setToolTip(_translate("MainWindow_reach", " Delete selected profile"))
|
||||
+ self.btn_edit.setToolTip(_translate("MainWindow_reach", " Editer selected profile"))
|
||||
+
|
||||
self.btn_sort_asc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre croissant des Pk"))
|
||||
self.btn_sort_desc.setToolTip(_translate("MainWindow_reach", " Trier les profils par ordre décroissant des Pk"))
|
||||
self.btn_move_up.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
|
||||
"profil sélectionné vers le haut)"))
|
||||
self.btn_move_down.setToolTip(_translate("MainWindow_reach", " Changer l'ordre des profils (en décalant le "
|
||||
"profil sélectionné vers le bas)"))
|
||||
- self.btn_end_editing.setToolTip(_translate("MainWindow_reach", " Terminer l'édition"))
|
||||
+ # self.btn_end_editing.setToolTip(_translate("MainWindow_reach", " Terminer l'édition"))
|
||||
self.tableView_header = [_translate("MainWindow_reach", "Name"),
|
||||
_translate("MainWindow_reach", "Kp (m)"),
|
||||
_translate("MainWindow_reach", "Type")]
|
||||
diff --git a/src/View/InitialConditions/PlotDKP.py b/src/View/InitialConditions/PlotDKP.py
|
||||
index 58a8321..445cc08 100644
|
||||
--- a/src/View/InitialConditions/PlotDKP.py
|
||||
+++ b/src/View/InitialConditions/PlotDKP.py
|
||||
@@ -71,6 +71,8 @@ class PlotDKP(APlot):
|
||||
color='b', marker='+', lw=1.
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/InitialConditions/PlotDischarge.py b/src/View/InitialConditions/PlotDischarge.py
|
||||
index 1fe05de..0703c59 100644
|
||||
--- a/src/View/InitialConditions/PlotDischarge.py
|
||||
+++ b/src/View/InitialConditions/PlotDischarge.py
|
||||
@@ -65,6 +65,8 @@ class PlotDischarge(APlot):
|
||||
color='r', lw=1.
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/View/InitialConditions/translate.py b/src/View/InitialConditions/translate.py
|
||||
index 370d4a2..3fe45f7 100644
|
||||
--- a/src/View/InitialConditions/translate.py
|
||||
+++ b/src/View/InitialConditions/translate.py
|
||||
@@ -21,11 +21,11 @@ from PyQt5.QtCore import QCoreApplication
|
||||
_translate = QCoreApplication.translate
|
||||
|
||||
table_headers = {
|
||||
- "name": _translate("LateralContribution", "Name"),
|
||||
+ # "name": _translate("LateralContribution", "Name"),
|
||||
"kp": _translate("LateralContribution", "KP (m)"),
|
||||
# "speed": _translate("LateralContribution", "Speed (m/s)"),
|
||||
"discharge": _translate("LateralContribution", "Discharge (m³/s)"),
|
||||
"elevation": _translate("LateralContribution", "Elevation (m)"),
|
||||
"height": _translate("LateralContribution", "Height (m)"),
|
||||
- "comment": _translate("LateralContribution", "Comment"),
|
||||
+ # "comment": _translate("LateralContribution", "Comment"),
|
||||
}
|
||||
diff --git a/src/View/SedimentLayers/Edit/translate.py b/src/View/SedimentLayers/Edit/translate.py
|
||||
index fe9e44a..f9f02cb 100644
|
||||
--- a/src/View/SedimentLayers/Edit/translate.py
|
||||
+++ b/src/View/SedimentLayers/Edit/translate.py
|
||||
@@ -6,7 +6,7 @@ _translate = QCoreApplication.translate
|
||||
|
||||
table_headers = {
|
||||
"name": _translate("SedimentLayers", "Name"),
|
||||
- "type": _translate("SedimentLayers", "Type"),
|
||||
+ # "type": _translate("SedimentLayers", "Type"),
|
||||
"height": _translate("Sedimentlayers", "Height"),
|
||||
"d50": _translate("Sedimentlayers", "D50"),
|
||||
"sigma": _translate("Sedimentlayers", "Sigma"),
|
||||
diff --git a/src/View/SedimentLayers/Reach/Plot.py b/src/View/SedimentLayers/Reach/Plot.py
|
||||
index a312a8c..5764abf 100644
|
||||
--- a/src/View/SedimentLayers/Reach/Plot.py
|
||||
+++ b/src/View/SedimentLayers/Reach/Plot.py
|
||||
@@ -78,6 +78,8 @@ class Plot(APlot):
|
||||
color='grey' if i == len(z_sl) - 1 else None
|
||||
)
|
||||
|
||||
+ self.canvas.axes.invert_xaxis()
|
||||
+
|
||||
self.canvas.figure.tight_layout()
|
||||
self.canvas.figure.canvas.draw_idle()
|
||||
if self.toolbar is not None:
|
||||
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
|
||||
index 8034809..031f349 100644
|
||||
--- a/src/lang/fr.ts
|
||||
+++ b/src/lang/fr.ts
|
||||
@@ -60,21 +60,6 @@
|
||||
<source>Ponctual contribution</source>
|
||||
<translation>Contributions ponctuelles</translation>
|
||||
</message>
|
||||
- <message>
|
||||
- <location filename="../View/BoundaryCondition/translate.py" line="32"/>
|
||||
- <source>Time over Z</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/BoundaryCondition/translate.py" line="33"/>
|
||||
- <source>Time over Discharge</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/BoundaryCondition/translate.py" line="34"/>
|
||||
- <source>Z over Discharge</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
<message>
|
||||
<location filename="../View/BoundaryCondition/translate.py" line="39"/>
|
||||
<source>Name</source>
|
||||
@@ -110,6 +95,21 @@
|
||||
<source>Solid</source>
|
||||
<translation type="unfinished">Solide</translation>
|
||||
</message>
|
||||
+ <message>
|
||||
+ <location filename="../View/BoundaryCondition/translate.py" line="32"/>
|
||||
+ <source>TimeZ</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/BoundaryCondition/translate.py" line="33"/>
|
||||
+ <source>TimeDischarge</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/BoundaryCondition/translate.py" line="34"/>
|
||||
+ <source>ZDischarge</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Checker</name>
|
||||
@@ -533,7 +533,7 @@
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="24"/>
|
||||
<source>Name</source>
|
||||
- <translation>Nom</translation>
|
||||
+ <translation type="obsolete">Nom</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="26"/>
|
||||
@@ -548,12 +548,17 @@
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="28"/>
|
||||
<source>Begin strickler</source>
|
||||
- <translation>strickler de départ</translation>
|
||||
+ <translation type="obsolete">strickler de départ</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../View/Frictions/translate.py" line="29"/>
|
||||
<source>End strickler</source>
|
||||
- <translation>Strickler de fin</translation>
|
||||
+ <translation type="obsolete">Strickler de fin</translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Frictions/translate.py" line="28"/>
|
||||
+ <source>Strickler</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
@@ -587,7 +592,7 @@
|
||||
<context>
|
||||
<name>LateralContribution</name>
|
||||
<message>
|
||||
- <location filename="../View/InitialConditions/translate.py" line="24"/>
|
||||
+ <location filename="../View/LateralContribution/translate.py" line="35"/>
|
||||
<source>Name</source>
|
||||
<translation>Nom</translation>
|
||||
</message>
|
||||
@@ -602,7 +607,7 @@
|
||||
<translation>Lit moyen</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/InitialConditions/translate.py" line="30"/>
|
||||
+ <location filename="../View/Stricklers/translate.py" line="31"/>
|
||||
<source>Comment</source>
|
||||
<translation>Commentaire</translation>
|
||||
</message>
|
||||
@@ -1715,7 +1720,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
-<context>
|
||||
+<context encoding="UTF-8">
|
||||
<name>MainWindow_reach</name>
|
||||
<message>
|
||||
<location filename="../View/Frictions/PlotStricklers.py" line="76"/>
|
||||
@@ -1723,7 +1728,7 @@ sur le plan défini par les deux points nommés extrêmes </source>
|
||||
<translation></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="335"/>
|
||||
<source>Kp (m)</source>
|
||||
<translation>Pk (m)</translation>
|
||||
</message>
|
||||
@@ -1778,68 +1783,47 @@ sur le plan défini par les deux points nommés extrêmes </source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="317"/>
|
||||
- <source>Jeu de sections du Bief</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="319"/>
|
||||
- <source>
|
||||
-Ordre des sections : Amont --> Aval</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="323"/>
|
||||
- <source>Pk = </source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="325"/>
|
||||
- <source> Nouveau profil</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="327"/>
|
||||
<source> Trier les profils par ordre croissant des Pk</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="341"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="334"/>
|
||||
<source>Name</source>
|
||||
<translation>Nom</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="343"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="336"/>
|
||||
<source>Type</source>
|
||||
<translation>Type</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="345"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="338"/>
|
||||
<source>Alt+Z</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="348"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="341"/>
|
||||
<source>Alt+E</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="351"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="344"/>
|
||||
<source>Alt+R</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="355"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="348"/>
|
||||
<source>Vue globale automatique (Alt+S)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="359"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="352"/>
|
||||
<source>Vue globale automatique (Alt+D)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="363"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="356"/>
|
||||
<source>Vue globale automatique (Alt+F)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@@ -1889,68 +1873,33 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<source>Profil sélectionné</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="324"/>
|
||||
- <source> Importer une géométrie</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="326"/>
|
||||
- <source> Supprimer le profil sélectionné</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="327"/>
|
||||
- <source> Éditer le profil sélectionné</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
<message encoding="UTF-8">
|
||||
<location filename="../View/Geometry/mainwindow_ui_reach.py" line="328"/>
|
||||
- <source> Copier le profil sélectionné</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="329"/>
|
||||
- <source>Coller le profil en fin de liste (penser à modifier le Pk avant de trier)</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="332"/>
|
||||
- <source> Dupliquer la section sélectionnée</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="335"/>
|
||||
<source> Trier les profils par ordre décroissant des Pk</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="336"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="329"/>
|
||||
<source> Changer l'ordre des profils (en décalant le profil sélectionné vers le haut)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="338"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="331"/>
|
||||
<source> Changer l'ordre des profils (en décalant le profil sélectionné vers le bas)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="340"/>
|
||||
- <source> Terminer l'édition</source>
|
||||
- <translation type="unfinished"></translation>
|
||||
- </message>
|
||||
- <message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="346"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="339"/>
|
||||
<source>Vue isométrique (Alt+Z)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="349"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="342"/>
|
||||
<source>Vue isométrique (Alt+E)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message encoding="UTF-8">
|
||||
- <location filename="../View/Geometry/mainwindow_ui_reach.py" line="352"/>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="345"/>
|
||||
<source>Vue isométrique (Alt+R)</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
@@ -1960,7 +1909,7 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<translation type="unfinished">Altitude (m)</translation>
|
||||
</message>
|
||||
<message>
|
||||
- <location filename="../View/Geometry/PlotKPZ.py" line="66"/>
|
||||
+ <location filename="../View/Geometry/PlotAC.py" line="73"/>
|
||||
<source>Height (m)</source>
|
||||
<translation type="unfinished">Hauteur (m)</translation>
|
||||
</message>
|
||||
@@ -1969,6 +1918,56 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<source>Select destination file</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="317"/>
|
||||
+ <source>Geometry reach edit</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="321"/>
|
||||
+ <source>Kp = </source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="322"/>
|
||||
+ <source> Import geometry</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="323"/>
|
||||
+ <source> New profile</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="324"/>
|
||||
+ <source> Delete selected profile</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/mainwindow_ui_reach.py" line="325"/>
|
||||
+ <source> Editer selected profile</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/PlotAC.py" line="69"/>
|
||||
+ <source>Transverse abscissa (m)</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/PlotAC.py" line="79"/>
|
||||
+ <source>Previous cross-section</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/PlotAC.py" line="80"/>
|
||||
+ <source>Cross-section</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
+ <message>
|
||||
+ <location filename="../View/Geometry/PlotAC.py" line="81"/>
|
||||
+ <source>Next cross-section</source>
|
||||
+ <translation type="unfinished"></translation>
|
||||
+ </message>
|
||||
</context>
|
||||
<context>
|
||||
<name>Network</name>
|
||||
@@ -2071,7 +2070,7 @@ Seuls les 5 premiers seront édités.</source>
|
||||
<message>
|
||||
<location filename="../View/SedimentLayers/Edit/translate.py" line="9"/>
|
||||
<source>Type</source>
|
||||
- <translation type="unfinished">Type</translation>
|
||||
+ <translation type="obsolete">Type</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../View/SedimentLayers/Reach/Profile/Window.py" line="68"/>
|
||||
|
After Width: | Height: | Size: 88 KiB |
|
After Width: | Height: | Size: 196 KiB |
|
After Width: | Height: | Size: 103 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 65 KiB |
|
After Width: | Height: | Size: 200 KiB |
|
After Width: | Height: | Size: 205 KiB |
|
After Width: | Height: | Size: 90 KiB |
|
After Width: | Height: | Size: 50 KiB |
|
After Width: | Height: | Size: 52 KiB |
|
After Width: | Height: | Size: 22 KiB |
|
After Width: | Height: | Size: 102 KiB |
|
After Width: | Height: | Size: 90 KiB |