kapstok / NHL-SoftDev (public) (License: Unspecified) (since 2018-11-16) (hash sha1)
No description available
Clone URLs: https://rocketgit.com/user/kapstok/NHL-SoftDev ssh://rocketgit@ssh.rocketgit.com/user/kapstok/NHL-SoftDev git://git.rocketgit.com/user/kapstok/NHL-SoftDev
19.12.2017 Final Herkansing testcase7 master
List of commits:
Subject Hash Author Date (UTC)
Last changes before test case 5. 258ba4735dfd2078f8e4f034fffed2bbbb086f2a Jan Allersma 2017-11-22 14:08:37
It's actually working now! With a gameloop and new icons :D 0b65d450fea6d9f679029f2d6765c7e2d1126cdd Jan Allersma 2017-11-20 22:02:23
Something... Works?? 9a6afe028642b571483fccd6d6bdab10dee68e9c Jan Allersma 2017-11-20 15:14:07
User input for sending msg. cdd1c17cfe8cc73985945aad5878e4891e92eab1 Jan Allersma 2017-11-14 23:05:53
prutsen veel prusten f37cf730ff7a0ad2e08cd769da5f488051ac6dd4 XCBouke 2017-11-09 21:32:15
uglyJsonCode created online with Bitbucket ed6c9c541947ec64827b6e80ed959feb1b0f9b85 XCBouke 2017-11-09 14:29:36
Connectie created online with Bitbucket (send en recieve in 1) b484aff52014ff8d1dbaf8387cf1479cf236f33a XCBouke 2017-11-09 14:28:29
Ready for test case 3. Also BIG cleanup. bda906e19e3b82fb91df53eb2208e8def822c6b5 Jan Allersma 2017-11-05 21:38:16
test case 2 fix(?) dd86d637d166707a31b644dad711c7a9e39dbc8d Jan Allersma 2017-11-04 10:55:03
Test case 2 9ea6eadbd85dde0e9522068718092b1f0e9b49f0 Jan Allersma 2017-10-29 22:37:57
Added threading. 4540fe1669c9e145e613edf2459031e7bec500ea Jan Allersma 2017-10-29 20:47:49
Code for testing 16/10/17. Use simulatie/rabbit/combination.py mainly. c5e87d7fe5abbcd3316b1538a0d647fd23faa59f Jan Allersma 2017-10-15 19:13:23
Added more paths. Some of them are WIP. 03ad1039e22bd1ebd301bda99e78f38239a15077 Jan Allersma 2017-09-21 14:40:44
Added paths... 5561d21918f048a40ca9686112638a48805917e3 Jan Allersma 2017-09-21 13:06:43
Added first paths of crossroad. Also added reference of crossroad. 43a5ddf291e38b47bad02a92af58839d86f9d449 Jan Allersma 2017-09-21 12:21:53
Added first paths of crossroad. Also added reference of crossroad. bb687a8152231d0c89fed827baefcfbf067be90c Jan Allersma 2017-09-21 12:21:11
Fixed typo. db82c84f8d834e62cb37333ff973ddc54af5372f Jan Allersma 2017-09-20 20:51:15
RabbitMQ test.First attempt. 876d29c668f5e027a820f3ff48a6ca080fc530c2 Jan Allersma 2017-09-19 13:47:31
Initial commit 6a565c61a3337232d0e7a136ffb2f49b431c2a40 Jan Allersma 2017-09-11 06:52:38
Commit 258ba4735dfd2078f8e4f034fffed2bbbb086f2a - Last changes before test case 5.
Author: Jan Allersma
Author date (UTC): 2017-11-22 14:08
Committer name: Jan Allersma
Committer date (UTC): 2017-11-22 14:08
Parent(s): 0b65d450fea6d9f679029f2d6765c7e2d1126cdd
Signer:
Signing key:
Signing status: N
Tree: 55d2b15a7d830db53d119465d49dcdc8f8113c56
File Lines added Lines deleted
simulatie/connection.py 3 1
simulatie/model.py 2 2
simulatie/pyg.py 1 1
simulatie/trafficModel.py 54 0
File simulatie/connection.py changed (mode: 100644) (index 8acadb2..f3b2e93)
... ... import pika
2 2 import threading import threading
3 3
4 4 import model import model
5 import trafficModel
5 6 import pyg import pyg
6 7
7 8 creds = pika.PlainCredentials(model.uname, model.passwd) creds = pika.PlainCredentials(model.uname, model.passwd)
 
... ... recieve.queue_declare(
18 19
19 20 def callback(ch, method, prop, body): def callback(ch, method, prop, body):
20 21 print(model.recieveQueue + ': ') print(model.recieveQueue + ': ')
21 print(body.decode('utf-8', 'ignore'))
22 #print(body.decode('utf-8', 'ignore'))
23 trafficModel.update(body)
22 24
23 25 def sendMsg(msg): def sendMsg(msg):
24 26 channel.basic_publish ( channel.basic_publish (
File simulatie/model.py changed (mode: 100644) (index f5ada36..bf0d8b0)
1 1 # Jan Allersma: groep 8. Maakt simulator. # Jan Allersma: groep 8. Maakt simulator.
2 2 uname = 'softdev' uname = 'softdev'
3 3 passwd = 'softdev' passwd = 'softdev'
4 vhost = '/2'
5 host = '127.0.0.1'#'141.252.237.17'
4 vhost = '/9'
5 host = '141.252.237.90'
6 6
7 7 recieveQueue = 'simulator' recieveQueue = 'simulator'
8 8 sendQueue = 'controller' sendQueue = 'controller'
File simulatie/pyg.py changed (mode: 100644) (index 87527c7..97a05b8)
... ... pygame.init()
7 7
8 8 screen = pygame.display.set_mode((800,600)) screen = pygame.display.set_mode((800,600))
9 9 screen.fill((255,255,255)) screen.fill((255,255,255))
10 bg = pygame.transform.scale(pygame.image.load("kruispunt.png"), (800,600))
10 #bg = pygame.transform.scale(pygame.image.load("kruispunt.png"), (800,600))
11 11
12 12 class Vehicle(object): class Vehicle(object):
13 13 def __init__(self, x, y, trafficId): def __init__(self, x, y, trafficId):
File simulatie/trafficModel.py added (mode: 100644) (index 0000000..19110ac)
1 import json
2
3 '''
4 Status voor Auto, fietser en voetgangers:
5 0 = Stoppen.
6 1 = Stop indien mogelijk.
7 2 = Doorrijden/lopen.
8
9 Status voor bussen (2xx):
10 0 = Stoppen.
11 1 = Stop indien mogelijk.
12 2 = Rechtdoor rijden.
13 3 = Linksaf rijden.
14 4 = Rechtsaf rijden.
15 5 = Linksaf & rechtdoor rijden.
16 6 = Rechtsaf & rechtdoor rijden.
17 7 = Linksaf & rechtsaf rijden.
18 8 = Alle richtingen doorrijden.
19
20 Status voor spoorwegovergang (6xx):
21 0 = Stoppen.
22 2 = Doorrijden/lopen.
23 '''
24 # lights = [[id, status]]
25 lights = [
26 [101, 0],
27 [102, 0],
28 [103, 0],
29 [104, 0],
30 [105, 0],
31 [106, 0],
32 [107, 0],
33 [108, 0],
34 [109, 0],
35 [110, 0],
36 [201, 0],
37 [301, 0],
38 [302, 0],
39 [303, 0],
40 [304, 0],
41 [305, 0],
42 [401, 0],
43 [402, 0],
44 [403, 0],
45 [404, 0],
46 [405, 0],
47 [406, 0],
48 [501, 0],
49 [601, 0]
50 ]
51
52 def update(jsonObj):
53 result = json.loads(jsonObj)
54 print(result)
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/kapstok/NHL-SoftDev

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/kapstok/NHL-SoftDev

Clone this repository using git:
git clone git://git.rocketgit.com/user/kapstok/NHL-SoftDev

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main