diff --git a/doc/grid.png b/doc/grid.png
index d45a1d9..21ca410 100644
Binary files a/doc/grid.png and b/doc/grid.png differ
diff --git a/doc/map.png b/doc/map.png
index a58dbaf..54e37b0 100644
Binary files a/doc/map.png and b/doc/map.png differ
diff --git a/engine/test.py b/engine/test.py
index 841efd6..b872d4f 100644
--- a/engine/test.py
+++ b/engine/test.py
@@ -4,8 +4,9 @@ Author: Sergey Vartanov (me@enzet.ru).
import copy
import extract_icon
-import process
import os
+import process
+import random
import sys
import yaml
@@ -19,16 +20,27 @@ import svg
icons_file_name = '../icons/icons.svg'
icon_grid_file_name = '../icon_grid.svg'
+icon_colors_file_name = '../data/icon_colors'
-def draw_icon(icon):
+def draw_icon(icon, color='444444'):
output_file.write('\n')
# Actions
+icon_colors = [('FFFFFF', '444444')]
+if os.path.isfile(icon_colors_file_name):
+ icon_colors_file = open(icon_colors_file_name)
+ for line in icon_colors_file.read().split('\n'):
+ background_color = hex(int(line[0:3]))[2:] + hex(int(line[3:6]))[2:] + \
+ hex(int(line[6:9]))[2:]
+ foreground_color = hex(int(line[10:13]))[2:] + hex(int(line[13:16]))[2:] + \
+ hex(int(line[16:19]))[2:]
+ icon_colors.append((background_color, foreground_color))
+
step = 24
width = step * 10
@@ -64,12 +76,14 @@ for element in scheme['tags']:
if not (set([icon] + [icon2] + [icon3] + element['over_icon']) in to_draw):
to_draw.append(set([icon] + [icon2] + [icon3] + element['over_icon']))
-icons = []
height = 24
number = 0
+icons = []
+
for icons_to_draw in to_draw:
drawed = False
+ icons.append({'xx': x - 8.0, 'yy': y - 8.0})
for icon in icons_to_draw:
path, xx, yy = extracter.get_path(icon)
if path:
@@ -91,7 +105,12 @@ output_file = svg.SVG(open(icon_grid_file_name, 'w+'))
output_file.begin(width, height)
for icon in icons:
- draw_icon(icon)
+ if 'xx' in icon:
+ xx, yy = icon['xx'], icon['yy']
+ background_color, foreground_color = random.choice(icon_colors)
+ output_file.rect(xx - 2, yy - 2, 20, 20, color=background_color)
+ else:
+ draw_icon(icon, foreground_color)
print 'Icons: ' + str(number) + '.'
diff --git a/icons/icons.svg b/icons/icons.svg
index c30b5a3..f584a6a 100644
--- a/icons/icons.svg
+++ b/icons/icons.svg
@@ -24,9 +24,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="22.627417"
- inkscape:cx="58.168882"
- inkscape:cy="471.75063"
+ inkscape:zoom="8"
+ inkscape:cx="103.5"
+ inkscape:cy="303.76451"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
@@ -2746,11 +2746,6 @@
id="path4412"
d="m 60,276 -8,8"
style="fill:none;stroke:#d4aa00;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-
-
+ transform="translate(0.5,-17.5)" />
-
+ sodipodi:nodetypes="csssc" />
+
+
+
+
+
+
+
+
diff --git a/session.vim b/session.vim
index a2bcd8a..165b657 100644
--- a/session.vim
+++ b/session.vim
@@ -1,4 +1,4 @@
-edit tags.yml
-vs mapper.py
-tabe icons.html
-vs test.py
+edit engine/process.py
+vs engine/mapper.py
+tabe data/tags.yml
+vs engine/test.py