diff --git a/locations.md b/locations.md index 241a4b9..29cc02b 100644 --- a/locations.md +++ b/locations.md @@ -2,7 +2,6 @@ ## Bedroom - * bed * desk * side table @@ -20,14 +19,17 @@ * tv table * bookcase * couch -* arm chairs +* left arm chair +* right arm chair * coffee table +* sideboard +* high table ## Bar * storage shelf * bar table -* spare table +* sofa # Default locations @@ -35,6 +37,6 @@ * snacks on couch table * drinks on kitchen table * food in bookcase -* care in storage shelf +* care in sidetable * container on tv table -* fruit on side table +* fruit on bar table diff --git a/objects/generate_list.py b/objects/generate_list.py new file mode 100755 index 0000000..dfce90d --- /dev/null +++ b/objects/generate_list.py @@ -0,0 +1,16 @@ +# Usage like: python3 object_list_generator_new.py objects/ > list.markdown +import os +import sys + +rootdir = sys.argv[1] +os.system("find . -name '*.jpg' -execdir mogrify -resize 200x {} \;") +for subdir, dirs, files in os.walk(rootdir): + print("# Class %s" % subdir[subdir.find("/")+1:]) + print(""" +| Objectname | Image | +:-------------------------:|:-------------------------:""") + for file in files: + print("| %s | ![](%s) |" % (file[:file.find(".")], os.path.join(subdir, file))) + print("\n") + +# execute pandoc .markdown -o .pdf diff --git a/objects/objects.html b/objects/objects.html new file mode 100644 index 0000000..7824bde --- /dev/null +++ b/objects/objects.html @@ -0,0 +1,224 @@ +

Class kitchen_stuff

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ObjectnameImage
bowl
cup
fork
knife
plate
spoon
+

Class drinks

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ObjectnameImage
apple_juice
iso_drink
orange_juice
red_spritzer
sparkling_water
+

Class fruit

+ + + + + + + + + + + + + + + + + +
ObjectnameImage
lemon
orange
+

Class care

+ + + + + + + + + + + + + + + + + + + + + +
ObjectnameImage
shower_gel
soap
toothpaste
+

Class food

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ObjectnameImage
bouillon
corn
noodles
pepper
salt
sauerkraut
seasoning_mix
tomatoes
+

Class container

+ + + + + + + + + +
ObjectnameImage
+

Class cleaning_stuff

+ + + + + + + + + + + + + + + + + +
ObjectnameImage
cloth
dishwasher_tab
+

Class snacks

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ObjectnameImage
cereal_bar_chocolate
cereal_bar_chocolate_banana
cracker
fruit_bar_apple
fruit_bar_forest_fruit
get_it
nut_fruit_mix
peanut_bits
diff --git a/objects/objects.md b/objects/objects.md index 9f92776..7893f4b 100644 --- a/objects/objects.md +++ b/objects/objects.md @@ -1,14 +1,14 @@ -# Class cutlery +# Class kitchen_stuff | Objectname | Image | :-------------------------:|:-------------------------: -| bowl | ![](objects/cutlery/bowl.jpg) | -| cup | ![](objects/cutlery/cup.jpg) | -| fork | ![](objects/cutlery/fork.jpg) | -| knife | ![](objects/cutlery/knife.jpg) | -| plate | ![](objects/cutlery/plate.jpg) | -| spoon | ![](objects/cutlery/spoon.jpg) | +| bowl | ![](objects/kitchen_stuff/bowl.jpg) | +| cup | ![](objects/kitchen_stuff/cup.jpg) | +| fork | ![](objects/kitchen_stuff/fork.jpg) | +| knife | ![](objects/kitchen_stuff/knife.jpg) | +| plate | ![](objects/kitchen_stuff/plate.jpg) | +| spoon | ![](objects/kitchen_stuff/spoon.jpg) | # Class drinks diff --git a/objects/objects.pdf b/objects/objects.pdf index 9814186..e057e08 100644 Binary files a/objects/objects.pdf and b/objects/objects.pdf differ diff --git a/objects/objects/care/shower_gel.jpg b/objects/objects/care/shower_gel.jpg index 92e943f..cdc034c 100644 Binary files a/objects/objects/care/shower_gel.jpg and b/objects/objects/care/shower_gel.jpg differ diff --git a/objects/objects/care/soap.jpg b/objects/objects/care/soap.jpg index 5349312..4e3fb01 100644 Binary files a/objects/objects/care/soap.jpg and b/objects/objects/care/soap.jpg differ diff --git a/objects/objects/care/toothpaste.jpg b/objects/objects/care/toothpaste.jpg index a0c8f46..a95a20b 100644 Binary files a/objects/objects/care/toothpaste.jpg and b/objects/objects/care/toothpaste.jpg differ diff --git a/objects/objects/cleaning_stuff/cloth.jpg b/objects/objects/cleaning_stuff/cloth.jpg index 0f52b0d..46a7e7b 100644 Binary files a/objects/objects/cleaning_stuff/cloth.jpg and b/objects/objects/cleaning_stuff/cloth.jpg differ diff --git a/objects/objects/cleaning_stuff/dishwasher_tab.jpg b/objects/objects/cleaning_stuff/dishwasher_tab.jpg index 4c50873..381f286 100644 Binary files a/objects/objects/cleaning_stuff/dishwasher_tab.jpg and b/objects/objects/cleaning_stuff/dishwasher_tab.jpg differ diff --git a/objects/objects/drinks/apple_juice.jpg b/objects/objects/drinks/apple_juice.jpg index c6d5986..db8d4cc 100644 Binary files a/objects/objects/drinks/apple_juice.jpg and b/objects/objects/drinks/apple_juice.jpg differ diff --git a/objects/objects/drinks/iso_drink.jpg b/objects/objects/drinks/iso_drink.jpg index 7584b17..704d2af 100644 Binary files a/objects/objects/drinks/iso_drink.jpg and b/objects/objects/drinks/iso_drink.jpg differ diff --git a/objects/objects/drinks/orange_juice.jpg b/objects/objects/drinks/orange_juice.jpg index fec7c01..b8bab76 100644 Binary files a/objects/objects/drinks/orange_juice.jpg and b/objects/objects/drinks/orange_juice.jpg differ diff --git a/objects/objects/drinks/red_spritzer.jpg b/objects/objects/drinks/red_spritzer.jpg index 0257114..223f5e0 100644 Binary files a/objects/objects/drinks/red_spritzer.jpg and b/objects/objects/drinks/red_spritzer.jpg differ diff --git a/objects/objects/drinks/sparkling_water.jpg b/objects/objects/drinks/sparkling_water.jpg index 10e88e2..6c4add7 100644 Binary files a/objects/objects/drinks/sparkling_water.jpg and b/objects/objects/drinks/sparkling_water.jpg differ diff --git a/objects/objects/food/bouillon.jpg b/objects/objects/food/bouillon.jpg index bc7ccc2..4287c42 100644 Binary files a/objects/objects/food/bouillon.jpg and b/objects/objects/food/bouillon.jpg differ diff --git a/objects/objects/food/corn.jpg b/objects/objects/food/corn.jpg index a279676..bb5da31 100644 Binary files a/objects/objects/food/corn.jpg and b/objects/objects/food/corn.jpg differ diff --git a/objects/objects/food/salt.jpg b/objects/objects/food/salt.jpg index a1a0c64..927136d 100644 Binary files a/objects/objects/food/salt.jpg and b/objects/objects/food/salt.jpg differ diff --git a/objects/objects/food/sauerkraut.jpg b/objects/objects/food/sauerkraut.jpg index a68b80d..cb3e560 100644 Binary files a/objects/objects/food/sauerkraut.jpg and b/objects/objects/food/sauerkraut.jpg differ diff --git a/objects/objects/food/seasoning_mix.jpg b/objects/objects/food/seasoning_mix.jpg index b1912d6..28ecfa8 100644 Binary files a/objects/objects/food/seasoning_mix.jpg and b/objects/objects/food/seasoning_mix.jpg differ diff --git a/objects/objects/cutlery/bowl.jpg b/objects/objects/kitchen_stuff/bowl.jpg similarity index 75% rename from objects/objects/cutlery/bowl.jpg rename to objects/objects/kitchen_stuff/bowl.jpg index b312a7f..e7d0b8c 100644 Binary files a/objects/objects/cutlery/bowl.jpg and b/objects/objects/kitchen_stuff/bowl.jpg differ diff --git a/objects/objects/cutlery/cup.jpg b/objects/objects/kitchen_stuff/cup.jpg similarity index 100% rename from objects/objects/cutlery/cup.jpg rename to objects/objects/kitchen_stuff/cup.jpg diff --git a/objects/objects/cutlery/fork.jpg b/objects/objects/kitchen_stuff/fork.jpg similarity index 80% rename from objects/objects/cutlery/fork.jpg rename to objects/objects/kitchen_stuff/fork.jpg index 25fbe92..52db574 100644 Binary files a/objects/objects/cutlery/fork.jpg and b/objects/objects/kitchen_stuff/fork.jpg differ diff --git a/objects/objects/cutlery/knife.jpg b/objects/objects/kitchen_stuff/knife.jpg similarity index 100% rename from objects/objects/cutlery/knife.jpg rename to objects/objects/kitchen_stuff/knife.jpg diff --git a/objects/objects/cutlery/plate.jpg b/objects/objects/kitchen_stuff/plate.jpg similarity index 100% rename from objects/objects/cutlery/plate.jpg rename to objects/objects/kitchen_stuff/plate.jpg diff --git a/objects/objects/cutlery/spoon.jpg b/objects/objects/kitchen_stuff/spoon.jpg similarity index 98% rename from objects/objects/cutlery/spoon.jpg rename to objects/objects/kitchen_stuff/spoon.jpg index 498833f..600020c 100644 Binary files a/objects/objects/cutlery/spoon.jpg and b/objects/objects/kitchen_stuff/spoon.jpg differ diff --git a/objects/objects/snacks/cereal_bar_chocolate.jpg b/objects/objects/snacks/cereal_bar_chocolate.jpg index da7d60f..74b5293 100644 Binary files a/objects/objects/snacks/cereal_bar_chocolate.jpg and b/objects/objects/snacks/cereal_bar_chocolate.jpg differ diff --git a/objects/objects/snacks/cereal_bar_chocolate_banana.jpg b/objects/objects/snacks/cereal_bar_chocolate_banana.jpg index f37735e..9b3aa95 100644 Binary files a/objects/objects/snacks/cereal_bar_chocolate_banana.jpg and b/objects/objects/snacks/cereal_bar_chocolate_banana.jpg differ diff --git a/objects/objects/snacks/cracker.jpg b/objects/objects/snacks/cracker.jpg index 026b28d..7ab741f 100644 Binary files a/objects/objects/snacks/cracker.jpg and b/objects/objects/snacks/cracker.jpg differ diff --git a/objects/objects/snacks/fruit_bar_apple.jpg b/objects/objects/snacks/fruit_bar_apple.jpg index a8ef0c9..e9c706b 100644 Binary files a/objects/objects/snacks/fruit_bar_apple.jpg and b/objects/objects/snacks/fruit_bar_apple.jpg differ diff --git a/objects/objects/snacks/fruit_bar_forest_fruit.jpg b/objects/objects/snacks/fruit_bar_forest_fruit.jpg index 2e3738c..e810e38 100644 Binary files a/objects/objects/snacks/fruit_bar_forest_fruit.jpg and b/objects/objects/snacks/fruit_bar_forest_fruit.jpg differ diff --git a/objects/objects/snacks/get_it.jpg b/objects/objects/snacks/get_it.jpg index a1113b8..7bd6dc0 100644 Binary files a/objects/objects/snacks/get_it.jpg and b/objects/objects/snacks/get_it.jpg differ diff --git a/objects/objects/snacks/nut_fruit_mix.jpg b/objects/objects/snacks/nut_fruit_mix.jpg index a312bd6..6c4b832 100644 Binary files a/objects/objects/snacks/nut_fruit_mix.jpg and b/objects/objects/snacks/nut_fruit_mix.jpg differ diff --git a/objects/objects/snacks/peanut_bits.jpg b/objects/objects/snacks/peanut_bits.jpg index 7834682..fd25ef2 100644 Binary files a/objects/objects/snacks/peanut_bits.jpg and b/objects/objects/snacks/peanut_bits.jpg differ diff --git a/objects/objects_similar.md b/objects/objects_similar.md new file mode 100644 index 0000000..e272043 --- /dev/null +++ b/objects/objects_similar.md @@ -0,0 +1,55 @@ +# Class + +| Objectname | Image | +:-------------------------:|:-------------------------: + + +# Class other + +| Objectname | Image | +:-------------------------:|:-------------------------: +| bag_pink | ![](objects_similar/other/bag_pink.jpg) | +| bag | ![](objects_similar/other/bag.jpg) | +| bag_purple | ![](objects_similar/other/bag_purple.jpg) | + + +# Class drinks + +| Objectname | Image | +:-------------------------:|:-------------------------: +| multivitamin_juice | ![](objects_similar/drinks/multivitamin_juice.jpg) | +| water_medium | ![](objects_similar/drinks/water_medium.jpg) | + + +# Class care + +| Objectname | Image | +:-------------------------:|:-------------------------: +| toothpaste_active_fresh | ![](objects_similar/care/toothpaste_active_fresh.jpg) | + + +# Class food + +| Objectname | Image | +:-------------------------:|:-------------------------: +| kidney_beans | ![](objects_similar/food/kidney_beans.jpg) | + + +# Class cleaning_stuff + +| Objectname | Image | +:-------------------------:|:-------------------------: +| cloth_yellow | ![](objects_similar/cleaning_stuff/cloth_yellow.jpg) | +| cloth_blue | ![](objects_similar/cleaning_stuff/cloth_blue.jpg) | +| cloth_green | ![](objects_similar/cleaning_stuff/cloth_green.jpg) | + + +# Class snacks + +| Objectname | Image | +:-------------------------:|:-------------------------: +| fruit_bar_cranberry_cherry | ![](objects_similar/snacks/fruit_bar_cranberry_cherry.jpg) | +| race | ![](objects_similar/snacks/race.jpg) | +| cereal_bar_white_chocolate | ![](objects_similar/snacks/cereal_bar_white_chocolate.jpg) | + + diff --git a/objects/objects_similar.pdf b/objects/objects_similar.pdf new file mode 100644 index 0000000..31bf3c9 Binary files /dev/null and b/objects/objects_similar.pdf differ diff --git a/objects/objects_similar/care/toothpaste_active_fresh.jpg b/objects/objects_similar/care/toothpaste_active_fresh.jpg new file mode 100644 index 0000000..98b0e27 Binary files /dev/null and b/objects/objects_similar/care/toothpaste_active_fresh.jpg differ diff --git a/objects/objects_similar/cleaning_stuff/cloth_blue.jpg b/objects/objects_similar/cleaning_stuff/cloth_blue.jpg new file mode 100644 index 0000000..c64cca3 Binary files /dev/null and b/objects/objects_similar/cleaning_stuff/cloth_blue.jpg differ diff --git a/objects/objects_similar/cleaning_stuff/cloth_green.jpg b/objects/objects_similar/cleaning_stuff/cloth_green.jpg new file mode 100644 index 0000000..d5288d1 Binary files /dev/null and b/objects/objects_similar/cleaning_stuff/cloth_green.jpg differ diff --git a/objects/objects_similar/cleaning_stuff/cloth_yellow.jpg b/objects/objects_similar/cleaning_stuff/cloth_yellow.jpg new file mode 100644 index 0000000..46a7e7b Binary files /dev/null and b/objects/objects_similar/cleaning_stuff/cloth_yellow.jpg differ diff --git a/objects/objects_similar/drinks/multivitamin_juice.jpg b/objects/objects_similar/drinks/multivitamin_juice.jpg new file mode 100644 index 0000000..ab1031a Binary files /dev/null and b/objects/objects_similar/drinks/multivitamin_juice.jpg differ diff --git a/objects/objects_similar/drinks/water_medium.jpg b/objects/objects_similar/drinks/water_medium.jpg new file mode 100644 index 0000000..11149dd Binary files /dev/null and b/objects/objects_similar/drinks/water_medium.jpg differ diff --git a/objects/objects_similar/food/kidney_beans.jpg b/objects/objects_similar/food/kidney_beans.jpg new file mode 100644 index 0000000..8e42c62 Binary files /dev/null and b/objects/objects_similar/food/kidney_beans.jpg differ diff --git a/objects/objects_similar/other/bag.jpg b/objects/objects_similar/other/bag.jpg new file mode 100644 index 0000000..1066553 Binary files /dev/null and b/objects/objects_similar/other/bag.jpg differ diff --git a/objects/objects_similar/other/bag_pink.jpg b/objects/objects_similar/other/bag_pink.jpg new file mode 100644 index 0000000..093d85b Binary files /dev/null and b/objects/objects_similar/other/bag_pink.jpg differ diff --git a/objects/objects_similar/other/bag_purple.jpg b/objects/objects_similar/other/bag_purple.jpg new file mode 100644 index 0000000..15bc004 Binary files /dev/null and b/objects/objects_similar/other/bag_purple.jpg differ diff --git a/objects/objects_similar/snacks/cereal_bar_white_chocolate.jpg b/objects/objects_similar/snacks/cereal_bar_white_chocolate.jpg new file mode 100644 index 0000000..1ea2176 Binary files /dev/null and b/objects/objects_similar/snacks/cereal_bar_white_chocolate.jpg differ diff --git a/objects/objects_similar/snacks/fruit_bar_cranberry_cherry.jpg b/objects/objects_similar/snacks/fruit_bar_cranberry_cherry.jpg new file mode 100644 index 0000000..10aa859 Binary files /dev/null and b/objects/objects_similar/snacks/fruit_bar_cranberry_cherry.jpg differ diff --git a/objects/objects_similar/snacks/race.jpg b/objects/objects_similar/snacks/race.jpg new file mode 100644 index 0000000..569c129 Binary files /dev/null and b/objects/objects_similar/snacks/race.jpg differ