Skip to content
Snippets Groups Projects
Commit a0636d2a authored by hagrid67's avatar hagrid67
Browse files

Merge branch 'jupyter_edit'

parents 68aa22aa 090dbd2d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
flatland/utils/editor.py 0 → 100644
+ 114
− 0
View file @ a0636d2a
import numpy as np
from numpy import array
import time
from collections import deque
from matplotlib import pyplot as plt
# import io
# from PIL import Image
# from ipywidgets import IntSlider, link, VBox
# from flatland.envs.rail_env import RailEnv, random_rail_generator
# from flatland.core.transitions import RailEnvTransitions
# from flatland.core.env_observation_builder import TreeObsForRailEnv
import flatland.utils.rendertools as rt
class JupEditor(object):
def __init__(self, env):
self.env = env
self.qEvents = deque()
# TODO: These are currently estimated values
self.yxBase = array([20, 20])
self.nPixCell = 70
self.rcHistory = []
self.iTransLast = -1
self.gRCTrans = array([[-1, 0], [0, 1], [1, 0], [0, -1]]) # NESW in RC
self.oRT = rt.RenderTool(env)
def event_handler(self, wid, event):
"""Mouse motion event handler
"""
x = event['canvasX']
y = event['canvasY']
env = self.env
qEvents = self.qEvents
rcHistory = self.rcHistory
bRedrawn = False
writableData = None
# If the mouse is held down, enqueue an event in our own queue
if event["buttons"] > 0:
qEvents.append((time.time(), x, y))
if len(qEvents) > 0:
tNow = time.time()
if tNow - qEvents[0][0] > 0.1: # wait before trying to draw
height, width = wid.data.shape[:2]
writableData = np.copy(wid.data) # writable copy of image - wid.data is somehow readonly
with wid.hold_sync():
while len(qEvents) > 0:
t, x, y = qEvents.popleft() # get events from our queue
# Draw a black square
if x > 10 and x < width and y > 10 and y < height:
writableData[y-2:y+2, x-2:x+2, :] = 0
# Translate and scale from x,y to integer row,col (note order change)
rcCell = ((array([y, x]) - self.yxBase) / self.nPixCell).astype(int)
if len(rcHistory) > 1:
rcLast = rcHistory[-1]
if not np.array_equal(rcLast, rcCell): # only save at transition
rcHistory.append(rcCell)
else:
rcHistory.append(rcCell)
# If we have already touched 3 cells
# We have a transition into a cell, and out of it.
if len(rcHistory) >= 3:
rc3Cells = array(rcHistory[:3]) # the 3 cells
rcMiddle = rc3Cells[1] # the middle cell which we will update
# get the 2 row, col deltas between the 3 cells, eg [-1,0] = North
rc2Trans = np.diff(rc3Cells, axis=0)
# get the direction index for the 2 transitions
liTrans = []
for rcTrans in rc2Trans:
iTrans = np.argwhere(np.all(self.gRCTrans - rcTrans == 0, axis=1))
if len(iTrans) > 0:
iTrans = iTrans[0][0]
liTrans.append(iTrans)
if len(liTrans) == 2:
# Set the transition
# oEnv.rail.set_transition((*rcLast, iTransLast), iTrans, True) # does nothing
iValCell = env.rail.transitions.set_transition(
env.rail.grid[tuple(rcMiddle)], liTrans[0], liTrans[1], True)
# Also set the reverse transition
iValCell = env.rail.transitions.set_transition(
iValCell,
(liTrans[1] + 2) % 4,
(liTrans[0] + 2) % 4,
True)
# Write the cell transition value back into the grid
env.rail.grid[tuple(rcMiddle)] = iValCell
plt.figure(figsize=(10, 10))
self.oRT.renderEnv(spacing=False, arrows=False, sRailColor="gray", show=False)
img = self.oRT.getImage()
plt.clf()
# This updates the image in the browser with the new rendered image
wid.data = img
bRedrawn = True
rcHistory.pop(0) # remove the last-but-one
if not bRedrawn and writableData is not None:
# This updates the image in the browser to be the new edited version
wid.data = writableData
notebooks/CanvasEditor.ipynb
+ 40
− 848
View file @ a0636d2a
%% Cell type:markdown id: tags:
# Jupyter Canvas Widget - Rail Editor
From - https://github.com/Who8MyLunch/Jupyter_Canvas_Widget/blob/master/notebooks/example%20mouse%20events.ipynb
Follow his instructions to do a local dev install and enable the widget.
%% Cell type:markdown id: tags:
## You need to run all cells before trying to edit the rails!
%% Cell type:code id: tags:
``` python
%load_ext autoreload
%autoreload 2
```
%% Cell type:code id: tags:
``` python
import image_attendant as imat
import ipywidgets
import IPython
import jpy_canvas
import numpy as np
from numpy import array
import time
from collections import deque
from matplotlib import pyplot as plt
import io
from PIL import Image
```
%% Cell type:code id: tags:
``` python
from ipywidgets import IntSlider, link, VBox
```
%% Cell type:code id: tags:
``` python
import flatland.core.env
from flatland.envs.rail_env import RailEnv, random_rail_generator
from flatland.core.transitions import RailEnvTransitions
from flatland.core.env_observation_builder import TreeObsForRailEnv
import flatland.utils.rendertools as rt
from flatland.utils.editor import JupEditor
```
%% Cell type:code id: tags:
``` python
from IPython.core.display import display, HTML
display(HTML("<style>.container { width:90% !important; }</style>"))
```
%% Output
%% Cell type:code id: tags:
``` python
oEnv = RailEnv(width=10,
height=10,
rail_generator=random_rail_generator(cell_type_relative_proportion=[1,1] + [0.5] * 6),
number_of_agents=0,
obs_builder_object=TreeObsForRailEnv(max_depth=2))
obs = oEnv.reset()
oRT = rt.RenderTool(oEnv)
```
%% Cell type:code id: tags:
``` python
sfEnv = "../flatland/env-data/tests/test1.npy"
oEnv.rail.load_transition_map(sfEnv)
```
%% Cell type:code id: tags:
``` python
oFig = plt.figure(figsize=(10,10))
oRT.renderEnv(spacing=False, arrows=False, sRailColor="gray", show=False)
img = oRT.getImage()
#plt.clf()
pass
```
%% Output
%% Cell type:code id: tags:
%% Cell type:markdown id: tags:
``` python
# This API call is misleading - it doesn't update the env's transition map.
oEnv.rail.set_transition((1,1,2), 1, True)
```
### Clear the rails
%% Cell type:code id: tags:
``` python
oEnv.rail.get_transition((1,1,2), 1)
oEnv.rail.grid[:,:] = 0
```
%% Output
%% Cell type:markdown id: tags:
0
### Render the env in the usual way, and take an image snapshot as numpy array
If you have already edited the env in the cell below, these changes should be reflected here.
%% Cell type:code id: tags:
``` python
bin(oEnv.rail.grid[1,1])
```
%% Output
'0b1000000000100000'
%% Cell type:code id: tags:
oFig = plt.figure(figsize=(10,10))
oRT.renderEnv(spacing=False, arrows=False, sRailColor="gray", show=False)
img = oRT.getImage()
print(type(img))
plt.clf() # if you don't want the image to appear here
pass
``` python
cell_id = (1,1,2)
iDir = 1
iValCell = oEnv.rail.transitions.set_transition(oEnv.rail.grid[cell_id[0]][cell_id[1]], cell_id[2], iDir, True)
bin(iValCell)
wid_img = jpy_canvas.Canvas(img)
```
%% Output
'0b1000000001100000'
%% Cell type:code id: tags:
``` python
oEnv.rail.grid[cell_id[0]][cell_id[1]] = iValCell
```
%% Cell type:code id: tags:
<class 'numpy.ndarray'>
``` python
bin(oEnv.rail.grid[1,1])
```
%% Output
%% Cell type:markdown id: tags:
'0b1000000001100000'
### Update the function - in case external code updated
%% Cell type:code id: tags:
``` python
#image = imat.read("../Jupyter_Canvas_Widget/notebooks/images/mini_1.jpg")
image = img
image_b = imat.rebin(image, 0.25)
H,W = image.shape[:2]
L = 20
L2 = L*2 + 1
wid_img.unregister_all()
oEditor = JupEditor(oEnv)
wid_img.register_move(oEditor.event_handler)
oEditor.rcHistory, oEditor.qEvents
```
%% Cell type:code id: tags:
``` python
wid_img = jpy_canvas.Canvas(image)
wid_sub = jpy_canvas.Canvas(image_b)
wid_sub.width=300
wid_sub.layout.border='black'
wid_img.width = W
wid_img.height = H
# wid_sub.width = L2*3
# wid_sub.height = L2*3
%% Output
# guessing these:
xyBase = array([20,20])
nPixCell = 70
#wid_box = ipywidgets.HBox([wid_img, wid_sub])
```
([], deque([]))
%% Cell type:markdown id: tags:
### Edit the map below here by dragging the mouse to create transitions
%% Cell type:code id: tags:
``` python
#wid_box
wid_img
```
%% Output
[2 2] [0 1]
[0 1] [1 1]
iTrans: 2
[1 1] [1 2]
iTrans: 1
iTransLast 2
Set RCD: [1 1] 2 to: 1
[1 2] [1 3]
iTrans: 1
iTransLast 1
Set RCD: [1 2] 1 to: 1
[1 3] [2 3]
iTrans: 2
iTransLast 1
Set RCD: [1 3] 1 to: 2
[2 3] [2 2]
iTrans: 3
iTransLast 2
Set RCD: [2 3] 2 to: 3
[2 2] [2 1]
iTrans: 3
iTransLast 3
Set RCD: [2 2] 3 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 3]
iTrans: 1
iTransLast 1
Set RCD: [2 2] 1 to: 1
[2 3] [2 2]
iTrans: 3
iTransLast 1
Set RCD: [2 3] 1 to: 3
[2 2] [2 1]
iTrans: 3
iTransLast 3
Set RCD: [2 2] 3 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [2 2]
iTrans: 1
iTransLast 3
Set RCD: [2 1] 3 to: 1
[2 2] [2 1]
iTrans: 3
iTransLast 1
Set RCD: [2 2] 1 to: 3
[2 1] [3 1]
iTrans: 2
iTransLast 3
Set RCD: [2 1] 3 to: 2
[3 1] [1 2]
[1 2] [1 1]
iTrans: 3
iTransLast 2
Set RCD: [1 2] 2 to: 3
%% Cell type:code id: tags:
``` python
lEvDraw = deque()
rcLast = array([-1,-1])
iTransLast = -1
gRCTrans = array([[-1,0], [0,1], [1,0], [0,-1]]) # NESW in RC
rcTrans = array([1,1])
iTrans = np.argwhere(np.all(gRCTrans - rcTrans == 0, axis=1))
len(iTrans)
```
%% Output
0
%% Cell type:code id: tags:
``` python
def work_function(wid, event):
"""Mouse motion event handler
"""
global rcLast, iTransLast
i = event['canvasX']
i0 = i-L
i1 = i+L+1
j = event['canvasY']
j0 = j-L
j1 = j+L+1
if i0 < 0:
i0 = 0
if j0 < 0:
j0 = 0
#crop = wid.data[j0:j1, i0:i1]
#print(event)
#print(i0,i1,j0,j1)
#print(wid.data[i,j])
#print(crop.shape)
if False:
with wid_sub.hold_sync():
wid_sub.data = crop
wid_sub.width = crop.shape[1]*5
wid_sub.height = crop.shape[0]*5
if event["buttons"] > 0:
if False:
width, height = wid.data.shape[:2]
with wid.hold_sync():
if i>10 and i<width and j> 10 and j < height:
writableData = np.copy(wid.data)
writableData[j-5:j+5, i-5:i+5, :] = 255
wid.data = writableData
else:
lEvDraw.append((time.time(), i,j))
if len(lEvDraw) > 0:
tNow = time.time()
if tNow - lEvDraw[0][0] > 0.1: # wait before trying to draw
height, width = wid.data.shape[:2]
writableData = np.copy(wid.data)
bRedrawn = False
with wid.hold_sync():
#rcLast = array([-1,-1])
while len(lEvDraw) > 0:
t, i, j = lEvDraw.popleft()
#print("tij:", t,i,j)
if i>10 and i<width and j> 10 and j < height:
writableData[j-2:j+2, i-2:i+2, :] = 0
rcCell = ((array([j,i]) - xyBase) / nPixCell).astype(int)
if (not np.array_equal(rcLast, array([-1,-1]))) and not np.array_equal(rcLast, rcCell):
print (rcLast, rcCell)
rcTrans = rcCell - rcLast
iTrans = np.argwhere(np.all(gRCTrans - rcTrans == 0, axis=1))
if len(iTrans) > 0:
iTrans = iTrans[0][0]
print("iTrans: ", iTrans)
if iTransLast >= 0:
print("iTransLast", iTransLast)
print("Set RCD:", rcLast, iTransLast, "to: ", iTrans )
#oEnv.rail.set_transition((*rcLast, iTransLast), iTrans, True) # does nothing
iValCell = oEnv.rail.transitions.set_transition(oEnv.rail.grid[rcLast[0], rcLast[1]], iTransLast, iTrans, True)
oEnv.rail.grid[rcLast[0], rcLast[1]] = iValCell
oFig = plt.figure(figsize=(10,10))
oRT.renderEnv(spacing=False, arrows=False, sRailColor="gray", show=False)
img = oRT.getImage()
plt.clf()
wid.data = img
bRedrawn = True
iTransLast = iTrans
rcLast = rcCell
if not bRedrawn:
wid.data = writableData
#wid.width = W
#wid.height = H
```
%% Cell type:code id: tags:
``` python
wid_img.register_move(work_function)
```
%% Cell type:markdown id: tags:
### Junk below here
### Save the image (change the filename...)
%% Cell type:code id: tags:
``` python
crop = wid_img.data[0:3, 0:3]
crop
```
%% Output
array([[[255, 255, 255],
[255, 255, 255],
[255, 255, 255]],
[[255, 255, 255],
[255, 255, 255],
[255, 255, 255]],
[[255, 255, 255],
[255, 255, 255],
[255, 255, 255]]], dtype=uint8)
%% Cell type:code id: tags:
``` python
image2 = np.copy(image)
print(type(image2), image2.shape)
```
%% Output
<class 'numpy.ndarray'> (720, 720, 3)
%% Cell type:code id: tags:
``` python
W,H
```
%% Output
(720, 720)
%% Cell type:code id: tags:
``` python
array([2,3]).astype(int)
```
%% Output
array([2, 3])
%% Cell type:code id: tags:
``` python
gA = np.zeros((5,5))
gA[2,2]= 1
rcLast = array([2,2])
gA[rcLast.T]
#gA
```
%% Output
array([[0., 0., 1., 0., 0.],
[0., 0., 1., 0., 0.]])
%% Cell type:code id: tags:
``` python
oEnv.rail.save_transition_map("../flatland/env-data/tests/test-editor.npy")
```
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment