diff --git a/Readme.md b/Readme.md index a064108..3fc06cd 100644 --- a/Readme.md +++ b/Readme.md @@ -144,6 +144,34 @@ git push sf-cristallina ``` +22.6.23 deployment and tests +---------------------------- +``` +ssh zamofing_t@saresc-cons-03 +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX +git remote add psihttp https://git.psi.ch/epics_ioc_modules/ESB_MX.git + +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX +git remote add psihttp https://git.psi.ch/zamofing_t/SwissMX.git + +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX +chmod -R g+w * + + +switch to production deployment: +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX +git checkout prod +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX +git checkout prod + +switch to latest test environment: +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX +git checkout master +cd /sf/cristallina/applications/mx/zamofing_t/ESB_MX/python/SwissMX +git checkout master +``` + + ----------------------------------- SCRATCH ----------------------------------- -0.952 diff --git a/app_config.py b/app_config.py index 7d004d1..780baba 100644 --- a/app_config.py +++ b/app_config.py @@ -133,13 +133,12 @@ class AppCfg(QSettings): "double_pixel_action" : "mask", "remove_raw_files" : False, "save_dap_results" : True, - "make_crystfel_files" : True, "crystfel_lists_laser" : True, })) if AppCfg.DAQ_LOC not in keys: dflt.append((AppCfg.DAQ_LOC, {'end_station':"cristallina", 'p_group':"p20516"})) if AppCfg.DAQ_RUN not in keys: - dflt.append((AppCfg.DAQ_RUN, {'prefix':'jf', 'padding':10})) + dflt.append((AppCfg.DAQ_RUN, {'prefix':'jf', 'padding':10, 'cell_name' : 'na'})) if AppCfg.DAQ_BS_CH not in keys: dflt.append((AppCfg.DAQ_BS_CH, ("SARES30-LSCP1-CRISTA1:CH0:1",))) #list of BS channels if AppCfg.DAQ_PV_CH not in keys: @@ -331,10 +330,10 @@ verbose bits: ]}, ]}, {'name': AppCfg.DFT_POS_PST, 'title':'post sample tube reference positions','type':'group','expanded':False,'children':[ - {'name':'x_in_us', 'title':'in X upstream', 'value':dft_pos_pst.get('x_in_us' ,0),'type':'float','limits':(-45,16),'step':0.1,'decimals':5,'suffix':' mm'}, - {'name':'y_in_us', 'title':'in Y upstream', 'value':dft_pos_pst.get('y_in_us' ,0),'type':'float','limits':(-45,16),'step':0.1,'decimals':5,'suffix':' mm'}, - {'name':'x_in_ds', 'title':'in X downstream', 'value':dft_pos_pst.get('x_in_ds' ,0),'type':'float','limits':(-45,16),'step':0.1,'decimals':5,'suffix':' mm'}, - {'name':'y_in_ds', 'title':'in Y downstream', 'value':dft_pos_pst.get('y_in_ds' ,0),'type':'float','limits':(-45,16),'step':0.1,'decimals':5,'suffix':' mm'}, + {'name':'x_in_us', 'title':'in X upstream', 'value':dft_pos_pst.get('x_in_us' ,0),'type':'float','limits':(-45,17),'step':0.1,'decimals':5,'suffix':' mm'}, + {'name':'y_in_us', 'title':'in Y upstream', 'value':dft_pos_pst.get('y_in_us' ,0),'type':'float','limits':(-45,17),'step':0.1,'decimals':5,'suffix':' mm'}, + {'name':'x_in_ds', 'title':'in X downstream', 'value':dft_pos_pst.get('x_in_ds' ,0),'type':'float','limits':(-45,17),'step':0.1,'decimals':5,'suffix':' mm'}, + {'name':'y_in_ds', 'title':'in Y downstream', 'value':dft_pos_pst.get('y_in_ds' ,0),'type':'float','limits':(-45,17),'step':0.1,'decimals':5,'suffix':' mm'}, {'name':'x_out_delta','title':'out X delta', 'value':dft_pos_pst.get('x_out_delta',0),'type':'float','limits':(-32,32),'step':0.1,'decimals':5,'suffix':' mm'}, {'name':'y_out_delta','title':'out Y delta', 'value':dft_pos_pst.get('y_out_delta',0),'type':'float','limits':(-32,32),'step':0.1,'decimals':5,'suffix':' mm'}, {'name':'z_in', 'title':'in Z', 'value':dft_pos_pst.get('z_in' ,0),'type':'float','limits':(-8 ,5 ),'step':0.1,'decimals':5,'suffix':' mm'}, @@ -391,7 +390,6 @@ verbose bits: {'name':'double_pixel_action', 'value':daq_det['double_pixel_action'], 'type':'str'}, {'name':'remove_raw_files', 'value':daq_det['remove_raw_files'], 'type':'bool'}, {'name':'save_dap_results', 'value':daq_det['save_dap_results'], 'type':'bool'}, - {'name':'make_crystfel_files', 'value':daq_det['make_crystfel_files'], 'type':'bool'}, {'name':'crystfel_lists_laser','value':daq_det['crystfel_lists_laser'],'type':'bool'} ]}, {'name':AppCfg.DAQ_LOC, 'title':'location', 'type':'group', 'children':[ @@ -401,6 +399,7 @@ verbose bits: {'name':AppCfg.DAQ_RUN, 'title':'location', 'type':'group', 'children':[ {'name':'prefix', 'value':daq_run['prefix'], 'type':'str',}, {'name':'padding','value':daq_run['padding'], 'type':'int'}, + {'name':'cell_name', 'value':daq_run['cell_name'], 'type':'str'}, ]}, {'name':AppCfg.DAQ_BS_CH, 'title':'list of beam-sync channels','value':' '.join(cfg.value(AppCfg.DAQ_BS_CH)), 'type':'str'}, {'name':AppCfg.DAQ_PV_CH, 'title':'list of PV channels','value':' '.join(cfg.value(AppCfg.DAQ_PV_CH)), 'type':'str'}, diff --git a/artwork/logo/16x16.png b/artwork/logo/16x16.png new file mode 100644 index 0000000..d7cd71a Binary files /dev/null and b/artwork/logo/16x16.png differ diff --git a/artwork/logo/24x24.png b/artwork/logo/24x24.png new file mode 100644 index 0000000..26b9355 Binary files /dev/null and b/artwork/logo/24x24.png differ diff --git a/artwork/logo/256x256.png b/artwork/logo/256x256.png new file mode 100644 index 0000000..de2b1b9 Binary files /dev/null and b/artwork/logo/256x256.png differ diff --git a/artwork/logo/32x32.png b/artwork/logo/32x32.png new file mode 100644 index 0000000..d5432f8 Binary files /dev/null and b/artwork/logo/32x32.png differ diff --git a/artwork/logo/48x48.png b/artwork/logo/48x48.png new file mode 100644 index 0000000..f9d49a1 Binary files /dev/null and b/artwork/logo/48x48.png differ diff --git a/fonts/Baloo-Regular.ttf b/fonts/Baloo-Regular.ttf new file mode 100644 index 0000000..0c601b3 Binary files /dev/null and b/fonts/Baloo-Regular.ttf differ diff --git a/fonts/Inconsolata-Bold.ttf b/fonts/Inconsolata-Bold.ttf new file mode 100644 index 0000000..035d579 Binary files /dev/null and b/fonts/Inconsolata-Bold.ttf differ diff --git a/fonts/Inconsolata-Regular.ttf b/fonts/Inconsolata-Regular.ttf new file mode 100644 index 0000000..bbc9647 Binary files /dev/null and b/fonts/Inconsolata-Regular.ttf differ diff --git a/fonts/MaterialIcons-Regular.codepoints b/fonts/MaterialIcons-Regular.codepoints new file mode 100644 index 0000000..3c8b075 --- /dev/null +++ b/fonts/MaterialIcons-Regular.codepoints @@ -0,0 +1,932 @@ +3d_rotation e84d +ac_unit eb3b +access_alarm e190 +access_alarms e191 +access_time e192 +accessibility e84e +accessible e914 +account_balance e84f +account_balance_wallet e850 +account_box e851 +account_circle e853 +adb e60e +add e145 +add_a_photo e439 +add_alarm e193 +add_alert e003 +add_box e146 +add_circle e147 +add_circle_outline e148 +add_location e567 +add_shopping_cart e854 +add_to_photos e39d +add_to_queue e05c +adjust e39e +airline_seat_flat e630 +airline_seat_flat_angled e631 +airline_seat_individual_suite e632 +airline_seat_legroom_extra e633 +airline_seat_legroom_normal e634 +airline_seat_legroom_reduced e635 +airline_seat_recline_extra e636 +airline_seat_recline_normal e637 +airplanemode_active e195 +airplanemode_inactive e194 +airplay e055 +airport_shuttle eb3c +alarm e855 +alarm_add e856 +alarm_off e857 +alarm_on e858 +album e019 +all_inclusive eb3d +all_out e90b +android e859 +announcement e85a +apps e5c3 +archive e149 +arrow_back e5c4 +arrow_downward e5db +arrow_drop_down e5c5 +arrow_drop_down_circle e5c6 +arrow_drop_up e5c7 +arrow_forward e5c8 +arrow_upward e5d8 +art_track e060 +aspect_ratio e85b +assessment e85c +assignment e85d +assignment_ind e85e +assignment_late e85f +assignment_return e860 +assignment_returned e861 +assignment_turned_in e862 +assistant e39f +assistant_photo e3a0 +attach_file e226 +attach_money e227 +attachment e2bc +audiotrack e3a1 +autorenew e863 +av_timer e01b +backspace e14a +backup e864 +battery_alert e19c +battery_charging_full e1a3 +battery_full e1a4 +battery_std e1a5 +battery_unknown e1a6 +beach_access eb3e +beenhere e52d +block e14b +bluetooth e1a7 +bluetooth_audio e60f +bluetooth_connected e1a8 +bluetooth_disabled e1a9 +bluetooth_searching e1aa +blur_circular e3a2 +blur_linear e3a3 +blur_off e3a4 +blur_on e3a5 +book e865 +bookmark e866 +bookmark_border e867 +border_all e228 +border_bottom e229 +border_clear e22a +border_color e22b +border_horizontal e22c +border_inner e22d +border_left e22e +border_outer e22f +border_right e230 +border_style e231 +border_top e232 +border_vertical e233 +branding_watermark e06b +brightness_1 e3a6 +brightness_2 e3a7 +brightness_3 e3a8 +brightness_4 e3a9 +brightness_5 e3aa +brightness_6 e3ab +brightness_7 e3ac +brightness_auto e1ab +brightness_high e1ac +brightness_low e1ad +brightness_medium e1ae +broken_image e3ad +brush e3ae +bubble_chart e6dd +bug_report e868 +build e869 +burst_mode e43c +business e0af +business_center eb3f +cached e86a +cake e7e9 +call e0b0 +call_end e0b1 +call_made e0b2 +call_merge e0b3 +call_missed e0b4 +call_missed_outgoing e0e4 +call_received e0b5 +call_split e0b6 +call_to_action e06c +camera e3af +camera_alt e3b0 +camera_enhance e8fc +camera_front e3b1 +camera_rear e3b2 +camera_roll e3b3 +cancel e5c9 +card_giftcard e8f6 +card_membership e8f7 +card_travel e8f8 +casino eb40 +cast e307 +cast_connected e308 +center_focus_strong e3b4 +center_focus_weak e3b5 +change_history e86b +chat e0b7 +chat_bubble e0ca +chat_bubble_outline e0cb +check e5ca +check_box e834 +check_box_outline_blank e835 +check_circle e86c +chevron_left e5cb +chevron_right e5cc +child_care eb41 +child_friendly eb42 +chrome_reader_mode e86d +class e86e +clear e14c +clear_all e0b8 +close e5cd +closed_caption e01c +cloud e2bd +cloud_circle e2be +cloud_done e2bf +cloud_download e2c0 +cloud_off e2c1 +cloud_queue e2c2 +cloud_upload e2c3 +code e86f +collections e3b6 +collections_bookmark e431 +color_lens e3b7 +colorize e3b8 +comment e0b9 +compare e3b9 +compare_arrows e915 +computer e30a +confirmation_number e638 +contact_mail e0d0 +contact_phone e0cf +contacts e0ba +content_copy e14d +content_cut e14e +content_paste e14f +control_point e3ba +control_point_duplicate e3bb +copyright e90c +create e150 +create_new_folder e2cc +credit_card e870 +crop e3be +crop_16_9 e3bc +crop_3_2 e3bd +crop_5_4 e3bf +crop_7_5 e3c0 +crop_din e3c1 +crop_free e3c2 +crop_landscape e3c3 +crop_original e3c4 +crop_portrait e3c5 +crop_rotate e437 +crop_square e3c6 +dashboard e871 +data_usage e1af +date_range e916 +dehaze e3c7 +delete e872 +delete_forever e92b +delete_sweep e16c +description e873 +desktop_mac e30b +desktop_windows e30c +details e3c8 +developer_board e30d +developer_mode e1b0 +device_hub e335 +devices e1b1 +devices_other e337 +dialer_sip e0bb +dialpad e0bc +directions e52e +directions_bike e52f +directions_boat e532 +directions_bus e530 +directions_car e531 +directions_railway e534 +directions_run e566 +directions_subway e533 +directions_transit e535 +directions_walk e536 +disc_full e610 +dns e875 +do_not_disturb e612 +do_not_disturb_alt e611 +do_not_disturb_off e643 +do_not_disturb_on e644 +dock e30e +domain e7ee +done e876 +done_all e877 +donut_large e917 +donut_small e918 +drafts e151 +drag_handle e25d +drive_eta e613 +dvr e1b2 +edit e3c9 +edit_location e568 +eject e8fb +email e0be +enhanced_encryption e63f +equalizer e01d +error e000 +error_outline e001 +euro_symbol e926 +ev_station e56d +event e878 +event_available e614 +event_busy e615 +event_note e616 +event_seat e903 +exit_to_app e879 +expand_less e5ce +expand_more e5cf +explicit e01e +explore e87a +exposure e3ca +exposure_neg_1 e3cb +exposure_neg_2 e3cc +exposure_plus_1 e3cd +exposure_plus_2 e3ce +exposure_zero e3cf +extension e87b +face e87c +fast_forward e01f +fast_rewind e020 +favorite e87d +favorite_border e87e +featured_play_list e06d +featured_video e06e +feedback e87f +fiber_dvr e05d +fiber_manual_record e061 +fiber_new e05e +fiber_pin e06a +fiber_smart_record e062 +file_download e2c4 +file_upload e2c6 +filter e3d3 +filter_1 e3d0 +filter_2 e3d1 +filter_3 e3d2 +filter_4 e3d4 +filter_5 e3d5 +filter_6 e3d6 +filter_7 e3d7 +filter_8 e3d8 +filter_9 e3d9 +filter_9_plus e3da +filter_b_and_w e3db +filter_center_focus e3dc +filter_drama e3dd +filter_frames e3de +filter_hdr e3df +filter_list e152 +filter_none e3e0 +filter_tilt_shift e3e2 +filter_vintage e3e3 +find_in_page e880 +find_replace e881 +fingerprint e90d +first_page e5dc +fitness_center eb43 +flag e153 +flare e3e4 +flash_auto e3e5 +flash_off e3e6 +flash_on e3e7 +flight e539 +flight_land e904 +flight_takeoff e905 +flip e3e8 +flip_to_back e882 +flip_to_front e883 +folder e2c7 +folder_open e2c8 +folder_shared e2c9 +folder_special e617 +font_download e167 +format_align_center e234 +format_align_justify e235 +format_align_left e236 +format_align_right e237 +format_bold e238 +format_clear e239 +format_color_fill e23a +format_color_reset e23b +format_color_text e23c +format_indent_decrease e23d +format_indent_increase e23e +format_italic e23f +format_line_spacing e240 +format_list_bulleted e241 +format_list_numbered e242 +format_paint e243 +format_quote e244 +format_shapes e25e +format_size e245 +format_strikethrough e246 +format_textdirection_l_to_r e247 +format_textdirection_r_to_l e248 +format_underlined e249 +forum e0bf +forward e154 +forward_10 e056 +forward_30 e057 +forward_5 e058 +free_breakfast eb44 +fullscreen e5d0 +fullscreen_exit e5d1 +functions e24a +g_translate e927 +gamepad e30f +games e021 +gavel e90e +gesture e155 +get_app e884 +gif e908 +golf_course eb45 +gps_fixed e1b3 +gps_not_fixed e1b4 +gps_off e1b5 +grade e885 +gradient e3e9 +grain e3ea +graphic_eq e1b8 +grid_off e3eb +grid_on e3ec +group e7ef +group_add e7f0 +group_work e886 +hd e052 +hdr_off e3ed +hdr_on e3ee +hdr_strong e3f1 +hdr_weak e3f2 +headset e310 +headset_mic e311 +healing e3f3 +hearing e023 +help e887 +help_outline e8fd +high_quality e024 +highlight e25f +highlight_off e888 +history e889 +home e88a +hot_tub eb46 +hotel e53a +hourglass_empty e88b +hourglass_full e88c +http e902 +https e88d +image e3f4 +image_aspect_ratio e3f5 +import_contacts e0e0 +import_export e0c3 +important_devices e912 +inbox e156 +indeterminate_check_box e909 +info e88e +info_outline e88f +input e890 +insert_chart e24b +insert_comment e24c +insert_drive_file e24d +insert_emoticon e24e +insert_invitation e24f +insert_link e250 +insert_photo e251 +invert_colors e891 +invert_colors_off e0c4 +iso e3f6 +keyboard e312 +keyboard_arrow_down e313 +keyboard_arrow_left e314 +keyboard_arrow_right e315 +keyboard_arrow_up e316 +keyboard_backspace e317 +keyboard_capslock e318 +keyboard_hide e31a +keyboard_return e31b +keyboard_tab e31c +keyboard_voice e31d +kitchen eb47 +label e892 +label_outline e893 +landscape e3f7 +language e894 +laptop e31e +laptop_chromebook e31f +laptop_mac e320 +laptop_windows e321 +last_page e5dd +launch e895 +layers e53b +layers_clear e53c +leak_add e3f8 +leak_remove e3f9 +lens e3fa +library_add e02e +library_books e02f +library_music e030 +lightbulb_outline e90f +line_style e919 +line_weight e91a +linear_scale e260 +link e157 +linked_camera e438 +list e896 +live_help e0c6 +live_tv e639 +local_activity e53f +local_airport e53d +local_atm e53e +local_bar e540 +local_cafe e541 +local_car_wash e542 +local_convenience_store e543 +local_dining e556 +local_drink e544 +local_florist e545 +local_gas_station e546 +local_grocery_store e547 +local_hospital e548 +local_hotel e549 +local_laundry_service e54a +local_library e54b +local_mall e54c +local_movies e54d +local_offer e54e +local_parking e54f +local_pharmacy e550 +local_phone e551 +local_pizza e552 +local_play e553 +local_post_office e554 +local_printshop e555 +local_see e557 +local_shipping e558 +local_taxi e559 +location_city e7f1 +location_disabled e1b6 +location_off e0c7 +location_on e0c8 +location_searching e1b7 +lock e897 +lock_open e898 +lock_outline e899 +looks e3fc +looks_3 e3fb +looks_4 e3fd +looks_5 e3fe +looks_6 e3ff +looks_one e400 +looks_two e401 +loop e028 +loupe e402 +low_priority e16d +loyalty e89a +mail e158 +mail_outline e0e1 +map e55b +markunread e159 +markunread_mailbox e89b +memory e322 +menu e5d2 +merge_type e252 +message e0c9 +mic e029 +mic_none e02a +mic_off e02b +mms e618 +mode_comment e253 +mode_edit e254 +monetization_on e263 +money_off e25c +monochrome_photos e403 +mood e7f2 +mood_bad e7f3 +more e619 +more_horiz e5d3 +more_vert e5d4 +motorcycle e91b +mouse e323 +move_to_inbox e168 +movie e02c +movie_creation e404 +movie_filter e43a +multiline_chart e6df +music_note e405 +music_video e063 +my_location e55c +nature e406 +nature_people e407 +navigate_before e408 +navigate_next e409 +navigation e55d +near_me e569 +network_cell e1b9 +network_check e640 +network_locked e61a +network_wifi e1ba +new_releases e031 +next_week e16a +nfc e1bb +no_encryption e641 +no_sim e0cc +not_interested e033 +note e06f +note_add e89c +notifications e7f4 +notifications_active e7f7 +notifications_none e7f5 +notifications_off e7f6 +notifications_paused e7f8 +offline_pin e90a +ondemand_video e63a +opacity e91c +open_in_browser e89d +open_in_new e89e +open_with e89f +pages e7f9 +pageview e8a0 +palette e40a +pan_tool e925 +panorama e40b +panorama_fish_eye e40c +panorama_horizontal e40d +panorama_vertical e40e +panorama_wide_angle e40f +party_mode e7fa +pause e034 +pause_circle_filled e035 +pause_circle_outline e036 +payment e8a1 +people e7fb +people_outline e7fc +perm_camera_mic e8a2 +perm_contact_calendar e8a3 +perm_data_setting e8a4 +perm_device_information e8a5 +perm_identity e8a6 +perm_media e8a7 +perm_phone_msg e8a8 +perm_scan_wifi e8a9 +person e7fd +person_add e7fe +person_outline e7ff +person_pin e55a +person_pin_circle e56a +personal_video e63b +pets e91d +phone e0cd +phone_android e324 +phone_bluetooth_speaker e61b +phone_forwarded e61c +phone_in_talk e61d +phone_iphone e325 +phone_locked e61e +phone_missed e61f +phone_paused e620 +phonelink e326 +phonelink_erase e0db +phonelink_lock e0dc +phonelink_off e327 +phonelink_ring e0dd +phonelink_setup e0de +photo e410 +photo_album e411 +photo_camera e412 +photo_filter e43b +photo_library e413 +photo_size_select_actual e432 +photo_size_select_large e433 +photo_size_select_small e434 +picture_as_pdf e415 +picture_in_picture e8aa +picture_in_picture_alt e911 +pie_chart e6c4 +pie_chart_outlined e6c5 +pin_drop e55e +place e55f +play_arrow e037 +play_circle_filled e038 +play_circle_outline e039 +play_for_work e906 +playlist_add e03b +playlist_add_check e065 +playlist_play e05f +plus_one e800 +poll e801 +polymer e8ab +pool eb48 +portable_wifi_off e0ce +portrait e416 +power e63c +power_input e336 +power_settings_new e8ac +pregnant_woman e91e +present_to_all e0df +print e8ad +priority_high e645 +public e80b +publish e255 +query_builder e8ae +question_answer e8af +queue e03c +queue_music e03d +queue_play_next e066 +radio e03e +radio_button_checked e837 +radio_button_unchecked e836 +rate_review e560 +receipt e8b0 +recent_actors e03f +record_voice_over e91f +redeem e8b1 +redo e15a +refresh e5d5 +remove e15b +remove_circle e15c +remove_circle_outline e15d +remove_from_queue e067 +remove_red_eye e417 +remove_shopping_cart e928 +reorder e8fe +repeat e040 +repeat_one e041 +replay e042 +replay_10 e059 +replay_30 e05a +replay_5 e05b +reply e15e +reply_all e15f +report e160 +report_problem e8b2 +restaurant e56c +restaurant_menu e561 +restore e8b3 +restore_page e929 +ring_volume e0d1 +room e8b4 +room_service eb49 +rotate_90_degrees_ccw e418 +rotate_left e419 +rotate_right e41a +rounded_corner e920 +router e328 +rowing e921 +rss_feed e0e5 +rv_hookup e642 +satellite e562 +save e161 +scanner e329 +schedule e8b5 +school e80c +screen_lock_landscape e1be +screen_lock_portrait e1bf +screen_lock_rotation e1c0 +screen_rotation e1c1 +screen_share e0e2 +sd_card e623 +sd_storage e1c2 +search e8b6 +security e32a +select_all e162 +send e163 +sentiment_dissatisfied e811 +sentiment_neutral e812 +sentiment_satisfied e813 +sentiment_very_dissatisfied e814 +sentiment_very_satisfied e815 +settings e8b8 +settings_applications e8b9 +settings_backup_restore e8ba +settings_bluetooth e8bb +settings_brightness e8bd +settings_cell e8bc +settings_ethernet e8be +settings_input_antenna e8bf +settings_input_component e8c0 +settings_input_composite e8c1 +settings_input_hdmi e8c2 +settings_input_svideo e8c3 +settings_overscan e8c4 +settings_phone e8c5 +settings_power e8c6 +settings_remote e8c7 +settings_system_daydream e1c3 +settings_voice e8c8 +share e80d +shop e8c9 +shop_two e8ca +shopping_basket e8cb +shopping_cart e8cc +short_text e261 +show_chart e6e1 +shuffle e043 +signal_cellular_4_bar e1c8 +signal_cellular_connected_no_internet_4_bar e1cd +signal_cellular_no_sim e1ce +signal_cellular_null e1cf +signal_cellular_off e1d0 +signal_wifi_4_bar e1d8 +signal_wifi_4_bar_lock e1d9 +signal_wifi_off e1da +sim_card e32b +sim_card_alert e624 +skip_next e044 +skip_previous e045 +slideshow e41b +slow_motion_video e068 +smartphone e32c +smoke_free eb4a +smoking_rooms eb4b +sms e625 +sms_failed e626 +snooze e046 +sort e164 +sort_by_alpha e053 +spa eb4c +space_bar e256 +speaker e32d +speaker_group e32e +speaker_notes e8cd +speaker_notes_off e92a +speaker_phone e0d2 +spellcheck e8ce +star e838 +star_border e83a +star_half e839 +stars e8d0 +stay_current_landscape e0d3 +stay_current_portrait e0d4 +stay_primary_landscape e0d5 +stay_primary_portrait e0d6 +stop e047 +stop_screen_share e0e3 +storage e1db +store e8d1 +store_mall_directory e563 +straighten e41c +streetview e56e +strikethrough_s e257 +style e41d +subdirectory_arrow_left e5d9 +subdirectory_arrow_right e5da +subject e8d2 +subscriptions e064 +subtitles e048 +subway e56f +supervisor_account e8d3 +surround_sound e049 +swap_calls e0d7 +swap_horiz e8d4 +swap_vert e8d5 +swap_vertical_circle e8d6 +switch_camera e41e +switch_video e41f +sync e627 +sync_disabled e628 +sync_problem e629 +system_update e62a +system_update_alt e8d7 +tab e8d8 +tab_unselected e8d9 +tablet e32f +tablet_android e330 +tablet_mac e331 +tag_faces e420 +tap_and_play e62b +terrain e564 +text_fields e262 +text_format e165 +textsms e0d8 +texture e421 +theaters e8da +thumb_down e8db +thumb_up e8dc +thumbs_up_down e8dd +time_to_leave e62c +timelapse e422 +timeline e922 +timer e425 +timer_10 e423 +timer_3 e424 +timer_off e426 +title e264 +toc e8de +today e8df +toll e8e0 +tonality e427 +touch_app e913 +toys e332 +track_changes e8e1 +traffic e565 +train e570 +tram e571 +transfer_within_a_station e572 +transform e428 +translate e8e2 +trending_down e8e3 +trending_flat e8e4 +trending_up e8e5 +tune e429 +turned_in e8e6 +turned_in_not e8e7 +tv e333 +unarchive e169 +undo e166 +unfold_less e5d6 +unfold_more e5d7 +update e923 +usb e1e0 +verified_user e8e8 +vertical_align_bottom e258 +vertical_align_center e259 +vertical_align_top e25a +vibration e62d +video_call e070 +video_label e071 +video_library e04a +videocam e04b +videocam_off e04c +videogame_asset e338 +view_agenda e8e9 +view_array e8ea +view_carousel e8eb +view_column e8ec +view_comfy e42a +view_compact e42b +view_day e8ed +view_headline e8ee +view_list e8ef +view_module e8f0 +view_quilt e8f1 +view_stream e8f2 +view_week e8f3 +vignette e435 +visibility e8f4 +visibility_off e8f5 +voice_chat e62e +voicemail e0d9 +volume_down e04d +volume_mute e04e +volume_off e04f +volume_up e050 +vpn_key e0da +vpn_lock e62f +wallpaper e1bc +warning e002 +watch e334 +watch_later e924 +wb_auto e42c +wb_cloudy e42d +wb_incandescent e42e +wb_iridescent e436 +wb_sunny e430 +wc e63d +web e051 +web_asset e069 +weekend e16b +whatshot e80e +widgets e1bd +wifi e63e +wifi_lock e1e1 +wifi_tethering e1e2 +work e8f9 +wrap_text e25b +youtube_searched_for e8fa +zoom_in e8ff +zoom_out e900 +zoom_out_map e56b diff --git a/fonts/MaterialIcons-Regular.json b/fonts/MaterialIcons-Regular.json new file mode 100644 index 0000000..6501c9b --- /dev/null +++ b/fonts/MaterialIcons-Regular.json @@ -0,0 +1 @@ +{"3d_rotation": "0xe84d", "ac_unit": "0xeb3b", "access_alarm": "0xe190", "access_alarms": "0xe191", "access_time": "0xe192", "accessibility": "0xe84e", "accessible": "0xe914", "account_balance": "0xe84f", "account_balance_wallet": "0xe850", "account_box": "0xe851", "account_circle": "0xe853", "adb": "0xe60e", "add": "0xe145", "add_a_photo": "0xe439", "add_alarm": "0xe193", "add_alert": "0xe003", "add_box": "0xe146", "add_circle": "0xe147", "add_circle_outline": "0xe148", "add_location": "0xe567", "add_shopping_cart": "0xe854", "add_to_photos": "0xe39d", "add_to_queue": "0xe05c", "adjust": "0xe39e", "airline_seat_flat": "0xe630", "airline_seat_flat_angled": "0xe631", "airline_seat_individual_suite": "0xe632", "airline_seat_legroom_extra": "0xe633", "airline_seat_legroom_normal": "0xe634", "airline_seat_legroom_reduced": "0xe635", "airline_seat_recline_extra": "0xe636", "airline_seat_recline_normal": "0xe637", "airplanemode_active": "0xe195", "airplanemode_inactive": "0xe194", "airplay": "0xe055", "airport_shuttle": "0xeb3c", "alarm": "0xe855", "alarm_add": "0xe856", "alarm_off": "0xe857", "alarm_on": "0xe858", "album": "0xe019", "all_inclusive": "0xeb3d", "all_out": "0xe90b", "android": "0xe859", "announcement": "0xe85a", "apps": "0xe5c3", "archive": "0xe149", "arrow_back": "0xe5c4", "arrow_downward": "0xe5db", "arrow_drop_down": "0xe5c5", "arrow_drop_down_circle": "0xe5c6", "arrow_drop_up": "0xe5c7", "arrow_forward": "0xe5c8", "arrow_upward": "0xe5d8", "art_track": "0xe060", "aspect_ratio": "0xe85b", "assessment": "0xe85c", "assignment": "0xe85d", "assignment_ind": "0xe85e", "assignment_late": "0xe85f", "assignment_return": "0xe860", "assignment_returned": "0xe861", "assignment_turned_in": "0xe862", "assistant": "0xe39f", "assistant_photo": "0xe3a0", "attach_file": "0xe226", "attach_money": "0xe227", "attachment": "0xe2bc", "audiotrack": "0xe3a1", "autorenew": "0xe863", "av_timer": "0xe01b", "backspace": "0xe14a", "backup": "0xe864", "battery_alert": "0xe19c", "battery_charging_full": "0xe1a3", "battery_full": "0xe1a4", "battery_std": "0xe1a5", "battery_unknown": "0xe1a6", "beach_access": "0xeb3e", "beenhere": "0xe52d", "block": "0xe14b", "bluetooth": "0xe1a7", "bluetooth_audio": "0xe60f", "bluetooth_connected": "0xe1a8", "bluetooth_disabled": "0xe1a9", "bluetooth_searching": "0xe1aa", "blur_circular": "0xe3a2", "blur_linear": "0xe3a3", "blur_off": "0xe3a4", "blur_on": "0xe3a5", "book": "0xe865", "bookmark": "0xe866", "bookmark_border": "0xe867", "border_all": "0xe228", "border_bottom": "0xe229", "border_clear": "0xe22a", "border_color": "0xe22b", "border_horizontal": "0xe22c", "border_inner": "0xe22d", "border_left": "0xe22e", "border_outer": "0xe22f", "border_right": "0xe230", "border_style": "0xe231", "border_top": "0xe232", "border_vertical": "0xe233", "branding_watermark": "0xe06b", "brightness_1": "0xe3a6", "brightness_2": "0xe3a7", "brightness_3": "0xe3a8", "brightness_4": "0xe3a9", "brightness_5": "0xe3aa", "brightness_6": "0xe3ab", "brightness_7": "0xe3ac", "brightness_auto": "0xe1ab", "brightness_high": "0xe1ac", "brightness_low": "0xe1ad", "brightness_medium": "0xe1ae", "broken_image": "0xe3ad", "brush": "0xe3ae", "bubble_chart": "0xe6dd", "bug_report": "0xe868", "build": "0xe869", "burst_mode": "0xe43c", "business": "0xe0af", "business_center": "0xeb3f", "cached": "0xe86a", "cake": "0xe7e9", "call": "0xe0b0", "call_end": "0xe0b1", "call_made": "0xe0b2", "call_merge": "0xe0b3", "call_missed": "0xe0b4", "call_missed_outgoing": "0xe0e4", "call_received": "0xe0b5", "call_split": "0xe0b6", "call_to_action": "0xe06c", "camera": "0xe3af", "camera_alt": "0xe3b0", "camera_enhance": "0xe8fc", "camera_front": "0xe3b1", "camera_rear": "0xe3b2", "camera_roll": "0xe3b3", "cancel": "0xe5c9", "card_giftcard": "0xe8f6", "card_membership": "0xe8f7", "card_travel": "0xe8f8", "casino": "0xeb40", "cast": "0xe307", "cast_connected": "0xe308", "center_focus_strong": "0xe3b4", "center_focus_weak": "0xe3b5", "change_history": "0xe86b", "chat": "0xe0b7", "chat_bubble": "0xe0ca", "chat_bubble_outline": "0xe0cb", "check": "0xe5ca", "check_box": "0xe834", "check_box_outline_blank": "0xe835", "check_circle": "0xe86c", "chevron_left": "0xe5cb", "chevron_right": "0xe5cc", "child_care": "0xeb41", "child_friendly": "0xeb42", "chrome_reader_mode": "0xe86d", "class": "0xe86e", "clear": "0xe14c", "clear_all": "0xe0b8", "close": "0xe5cd", "closed_caption": "0xe01c", "cloud": "0xe2bd", "cloud_circle": "0xe2be", "cloud_done": "0xe2bf", "cloud_download": "0xe2c0", "cloud_off": "0xe2c1", "cloud_queue": "0xe2c2", "cloud_upload": "0xe2c3", "code": "0xe86f", "collections": "0xe3b6", "collections_bookmark": "0xe431", "color_lens": "0xe3b7", "colorize": "0xe3b8", "comment": "0xe0b9", "compare": "0xe3b9", "compare_arrows": "0xe915", "computer": "0xe30a", "confirmation_number": "0xe638", "contact_mail": "0xe0d0", "contact_phone": "0xe0cf", "contacts": "0xe0ba", "content_copy": "0xe14d", "content_cut": "0xe14e", "content_paste": "0xe14f", "control_point": "0xe3ba", "control_point_duplicate": "0xe3bb", "copyright": "0xe90c", "create": "0xe150", "create_new_folder": "0xe2cc", "credit_card": "0xe870", "crop": "0xe3be", "crop_16_9": "0xe3bc", "crop_3_2": "0xe3bd", "crop_5_4": "0xe3bf", "crop_7_5": "0xe3c0", "crop_din": "0xe3c1", "crop_free": "0xe3c2", "crop_landscape": "0xe3c3", "crop_original": "0xe3c4", "crop_portrait": "0xe3c5", "crop_rotate": "0xe437", "crop_square": "0xe3c6", "dashboard": "0xe871", "data_usage": "0xe1af", "date_range": "0xe916", "dehaze": "0xe3c7", "delete": "0xe872", "delete_forever": "0xe92b", "delete_sweep": "0xe16c", "description": "0xe873", "desktop_mac": "0xe30b", "desktop_windows": "0xe30c", "details": "0xe3c8", "developer_board": "0xe30d", "developer_mode": "0xe1b0", "device_hub": "0xe335", "devices": "0xe1b1", "devices_other": "0xe337", "dialer_sip": "0xe0bb", "dialpad": "0xe0bc", "directions": "0xe52e", "directions_bike": "0xe52f", "directions_boat": "0xe532", "directions_bus": "0xe530", "directions_car": "0xe531", "directions_railway": "0xe534", "directions_run": "0xe566", "directions_subway": "0xe533", "directions_transit": "0xe535", "directions_walk": "0xe536", "disc_full": "0xe610", "dns": "0xe875", "do_not_disturb": "0xe612", "do_not_disturb_alt": "0xe611", "do_not_disturb_off": "0xe643", "do_not_disturb_on": "0xe644", "dock": "0xe30e", "domain": "0xe7ee", "done": "0xe876", "done_all": "0xe877", "donut_large": "0xe917", "donut_small": "0xe918", "drafts": "0xe151", "drag_handle": "0xe25d", "drive_eta": "0xe613", "dvr": "0xe1b2", "edit": "0xe3c9", "edit_location": "0xe568", "eject": "0xe8fb", "email": "0xe0be", "enhanced_encryption": "0xe63f", "equalizer": "0xe01d", "error": "0xe000", "error_outline": "0xe001", "euro_symbol": "0xe926", "ev_station": "0xe56d", "event": "0xe878", "event_available": "0xe614", "event_busy": "0xe615", "event_note": "0xe616", "event_seat": "0xe903", "exit_to_app": "0xe879", "expand_less": "0xe5ce", "expand_more": "0xe5cf", "explicit": "0xe01e", "explore": "0xe87a", "exposure": "0xe3ca", "exposure_neg_1": "0xe3cb", "exposure_neg_2": "0xe3cc", "exposure_plus_1": "0xe3cd", "exposure_plus_2": "0xe3ce", "exposure_zero": "0xe3cf", "extension": "0xe87b", "face": "0xe87c", "fast_forward": "0xe01f", "fast_rewind": "0xe020", "favorite": "0xe87d", "favorite_border": "0xe87e", "featured_play_list": "0xe06d", "featured_video": "0xe06e", "feedback": "0xe87f", "fiber_dvr": "0xe05d", "fiber_manual_record": "0xe061", "fiber_new": "0xe05e", "fiber_pin": "0xe06a", "fiber_smart_record": "0xe062", "file_download": "0xe2c4", "file_upload": "0xe2c6", "filter": "0xe3d3", "filter_1": "0xe3d0", "filter_2": "0xe3d1", "filter_3": "0xe3d2", "filter_4": "0xe3d4", "filter_5": "0xe3d5", "filter_6": "0xe3d6", "filter_7": "0xe3d7", "filter_8": "0xe3d8", "filter_9": "0xe3d9", "filter_9_plus": "0xe3da", "filter_b_and_w": "0xe3db", "filter_center_focus": "0xe3dc", "filter_drama": "0xe3dd", "filter_frames": "0xe3de", "filter_hdr": "0xe3df", "filter_list": "0xe152", "filter_none": "0xe3e0", "filter_tilt_shift": "0xe3e2", "filter_vintage": "0xe3e3", "find_in_page": "0xe880", "find_replace": "0xe881", "fingerprint": "0xe90d", "first_page": "0xe5dc", "fitness_center": "0xeb43", "flag": "0xe153", "flare": "0xe3e4", "flash_auto": "0xe3e5", "flash_off": "0xe3e6", "flash_on": "0xe3e7", "flight": "0xe539", "flight_land": "0xe904", "flight_takeoff": "0xe905", "flip": "0xe3e8", "flip_to_back": "0xe882", "flip_to_front": "0xe883", "folder": "0xe2c7", "folder_open": "0xe2c8", "folder_shared": "0xe2c9", "folder_special": "0xe617", "font_download": "0xe167", "format_align_center": "0xe234", "format_align_justify": "0xe235", "format_align_left": "0xe236", "format_align_right": "0xe237", "format_bold": "0xe238", "format_clear": "0xe239", "format_color_fill": "0xe23a", "format_color_reset": "0xe23b", "format_color_text": "0xe23c", "format_indent_decrease": "0xe23d", "format_indent_increase": "0xe23e", "format_italic": "0xe23f", "format_line_spacing": "0xe240", "format_list_bulleted": "0xe241", "format_list_numbered": "0xe242", "format_paint": "0xe243", "format_quote": "0xe244", "format_shapes": "0xe25e", "format_size": "0xe245", "format_strikethrough": "0xe246", "format_textdirection_l_to_r": "0xe247", "format_textdirection_r_to_l": "0xe248", "format_underlined": "0xe249", "forum": "0xe0bf", "forward": "0xe154", "forward_10": "0xe056", "forward_30": "0xe057", "forward_5": "0xe058", "free_breakfast": "0xeb44", "fullscreen": "0xe5d0", "fullscreen_exit": "0xe5d1", "functions": "0xe24a", "g_translate": "0xe927", "gamepad": "0xe30f", "games": "0xe021", "gavel": "0xe90e", "gesture": "0xe155", "get_app": "0xe884", "gif": "0xe908", "golf_course": "0xeb45", "gps_fixed": "0xe1b3", "gps_not_fixed": "0xe1b4", "gps_off": "0xe1b5", "grade": "0xe885", "gradient": "0xe3e9", "grain": "0xe3ea", "graphic_eq": "0xe1b8", "grid_off": "0xe3eb", "grid_on": "0xe3ec", "group": "0xe7ef", "group_add": "0xe7f0", "group_work": "0xe886", "hd": "0xe052", "hdr_off": "0xe3ed", "hdr_on": "0xe3ee", "hdr_strong": "0xe3f1", "hdr_weak": "0xe3f2", "headset": "0xe310", "headset_mic": "0xe311", "healing": "0xe3f3", "hearing": "0xe023", "help": "0xe887", "help_outline": "0xe8fd", "high_quality": "0xe024", "highlight": "0xe25f", "highlight_off": "0xe888", "history": "0xe889", "home": "0xe88a", "hot_tub": "0xeb46", "hotel": "0xe53a", "hourglass_empty": "0xe88b", "hourglass_full": "0xe88c", "http": "0xe902", "https": "0xe88d", "image": "0xe3f4", "image_aspect_ratio": "0xe3f5", "import_contacts": "0xe0e0", "import_export": "0xe0c3", "important_devices": "0xe912", "inbox": "0xe156", "indeterminate_check_box": "0xe909", "info": "0xe88e", "info_outline": "0xe88f", "input": "0xe890", "insert_chart": "0xe24b", "insert_comment": "0xe24c", "insert_drive_file": "0xe24d", "insert_emoticon": "0xe24e", "insert_invitation": "0xe24f", "insert_link": "0xe250", "insert_photo": "0xe251", "invert_colors": "0xe891", "invert_colors_off": "0xe0c4", "iso": "0xe3f6", "keyboard": "0xe312", "keyboard_arrow_down": "0xe313", "keyboard_arrow_left": "0xe314", "keyboard_arrow_right": "0xe315", "keyboard_arrow_up": "0xe316", "keyboard_backspace": "0xe317", "keyboard_capslock": "0xe318", "keyboard_hide": "0xe31a", "keyboard_return": "0xe31b", "keyboard_tab": "0xe31c", "keyboard_voice": "0xe31d", "kitchen": "0xeb47", "label": "0xe892", "label_outline": "0xe893", "landscape": "0xe3f7", "language": "0xe894", "laptop": "0xe31e", "laptop_chromebook": "0xe31f", "laptop_mac": "0xe320", "laptop_windows": "0xe321", "last_page": "0xe5dd", "launch": "0xe895", "layers": "0xe53b", "layers_clear": "0xe53c", "leak_add": "0xe3f8", "leak_remove": "0xe3f9", "lens": "0xe3fa", "library_add": "0xe02e", "library_books": "0xe02f", "library_music": "0xe030", "lightbulb_outline": "0xe90f", "line_style": "0xe919", "line_weight": "0xe91a", "linear_scale": "0xe260", "link": "0xe157", "linked_camera": "0xe438", "list": "0xe896", "live_help": "0xe0c6", "live_tv": "0xe639", "local_activity": "0xe53f", "local_airport": "0xe53d", "local_atm": "0xe53e", "local_bar": "0xe540", "local_cafe": "0xe541", "local_car_wash": "0xe542", "local_convenience_store": "0xe543", "local_dining": "0xe556", "local_drink": "0xe544", "local_florist": "0xe545", "local_gas_station": "0xe546", "local_grocery_store": "0xe547", "local_hospital": "0xe548", "local_hotel": "0xe549", "local_laundry_service": "0xe54a", "local_library": "0xe54b", "local_mall": "0xe54c", "local_movies": "0xe54d", "local_offer": "0xe54e", "local_parking": "0xe54f", "local_pharmacy": "0xe550", "local_phone": "0xe551", "local_pizza": "0xe552", "local_play": "0xe553", "local_post_office": "0xe554", "local_printshop": "0xe555", "local_see": "0xe557", "local_shipping": "0xe558", "local_taxi": "0xe559", "location_city": "0xe7f1", "location_disabled": "0xe1b6", "location_off": "0xe0c7", "location_on": "0xe0c8", "location_searching": "0xe1b7", "lock": "0xe897", "lock_open": "0xe898", "lock_outline": "0xe899", "looks": "0xe3fc", "looks_3": "0xe3fb", "looks_4": "0xe3fd", "looks_5": "0xe3fe", "looks_6": "0xe3ff", "looks_one": "0xe400", "looks_two": "0xe401", "loop": "0xe028", "loupe": "0xe402", "low_priority": "0xe16d", "loyalty": "0xe89a", "mail": "0xe158", "mail_outline": "0xe0e1", "map": "0xe55b", "markunread": "0xe159", "markunread_mailbox": "0xe89b", "memory": "0xe322", "menu": "0xe5d2", "merge_type": "0xe252", "message": "0xe0c9", "mic": "0xe029", "mic_none": "0xe02a", "mic_off": "0xe02b", "mms": "0xe618", "mode_comment": "0xe253", "mode_edit": "0xe254", "monetization_on": "0xe263", "money_off": "0xe25c", "monochrome_photos": "0xe403", "mood": "0xe7f2", "mood_bad": "0xe7f3", "more": "0xe619", "more_horiz": "0xe5d3", "more_vert": "0xe5d4", "motorcycle": "0xe91b", "mouse": "0xe323", "move_to_inbox": "0xe168", "movie": "0xe02c", "movie_creation": "0xe404", "movie_filter": "0xe43a", "multiline_chart": "0xe6df", "music_note": "0xe405", "music_video": "0xe063", "my_location": "0xe55c", "nature": "0xe406", "nature_people": "0xe407", "navigate_before": "0xe408", "navigate_next": "0xe409", "navigation": "0xe55d", "near_me": "0xe569", "network_cell": "0xe1b9", "network_check": "0xe640", "network_locked": "0xe61a", "network_wifi": "0xe1ba", "new_releases": "0xe031", "next_week": "0xe16a", "nfc": "0xe1bb", "no_encryption": "0xe641", "no_sim": "0xe0cc", "not_interested": "0xe033", "note": "0xe06f", "note_add": "0xe89c", "notifications": "0xe7f4", "notifications_active": "0xe7f7", "notifications_none": "0xe7f5", "notifications_off": "0xe7f6", "notifications_paused": "0xe7f8", "offline_pin": "0xe90a", "ondemand_video": "0xe63a", "opacity": "0xe91c", "open_in_browser": "0xe89d", "open_in_new": "0xe89e", "open_with": "0xe89f", "pages": "0xe7f9", "pageview": "0xe8a0", "palette": "0xe40a", "pan_tool": "0xe925", "panorama": "0xe40b", "panorama_fish_eye": "0xe40c", "panorama_horizontal": "0xe40d", "panorama_vertical": "0xe40e", "panorama_wide_angle": "0xe40f", "party_mode": "0xe7fa", "pause": "0xe034", "pause_circle_filled": "0xe035", "pause_circle_outline": "0xe036", "payment": "0xe8a1", "people": "0xe7fb", "people_outline": "0xe7fc", "perm_camera_mic": "0xe8a2", "perm_contact_calendar": "0xe8a3", "perm_data_setting": "0xe8a4", "perm_device_information": "0xe8a5", "perm_identity": "0xe8a6", "perm_media": "0xe8a7", "perm_phone_msg": "0xe8a8", "perm_scan_wifi": "0xe8a9", "person": "0xe7fd", "person_add": "0xe7fe", "person_outline": "0xe7ff", "person_pin": "0xe55a", "person_pin_circle": "0xe56a", "personal_video": "0xe63b", "pets": "0xe91d", "phone": "0xe0cd", "phone_android": "0xe324", "phone_bluetooth_speaker": "0xe61b", "phone_forwarded": "0xe61c", "phone_in_talk": "0xe61d", "phone_iphone": "0xe325", "phone_locked": "0xe61e", "phone_missed": "0xe61f", "phone_paused": "0xe620", "phonelink": "0xe326", "phonelink_erase": "0xe0db", "phonelink_lock": "0xe0dc", "phonelink_off": "0xe327", "phonelink_ring": "0xe0dd", "phonelink_setup": "0xe0de", "photo": "0xe410", "photo_album": "0xe411", "photo_camera": "0xe412", "photo_filter": "0xe43b", "photo_library": "0xe413", "photo_size_select_actual": "0xe432", "photo_size_select_large": "0xe433", "photo_size_select_small": "0xe434", "picture_as_pdf": "0xe415", "picture_in_picture": "0xe8aa", "picture_in_picture_alt": "0xe911", "pie_chart": "0xe6c4", "pie_chart_outlined": "0xe6c5", "pin_drop": "0xe55e", "place": "0xe55f", "play_arrow": "0xe037", "play_circle_filled": "0xe038", "play_circle_outline": "0xe039", "play_for_work": "0xe906", "playlist_add": "0xe03b", "playlist_add_check": "0xe065", "playlist_play": "0xe05f", "plus_one": "0xe800", "poll": "0xe801", "polymer": "0xe8ab", "pool": "0xeb48", "portable_wifi_off": "0xe0ce", "portrait": "0xe416", "power": "0xe63c", "power_input": "0xe336", "power_settings_new": "0xe8ac", "pregnant_woman": "0xe91e", "present_to_all": "0xe0df", "print": "0xe8ad", "priority_high": "0xe645", "public": "0xe80b", "publish": "0xe255", "query_builder": "0xe8ae", "question_answer": "0xe8af", "queue": "0xe03c", "queue_music": "0xe03d", "queue_play_next": "0xe066", "radio": "0xe03e", "radio_button_checked": "0xe837", "radio_button_unchecked": "0xe836", "rate_review": "0xe560", "receipt": "0xe8b0", "recent_actors": "0xe03f", "record_voice_over": "0xe91f", "redeem": "0xe8b1", "redo": "0xe15a", "refresh": "0xe5d5", "remove": "0xe15b", "remove_circle": "0xe15c", "remove_circle_outline": "0xe15d", "remove_from_queue": "0xe067", "remove_red_eye": "0xe417", "remove_shopping_cart": "0xe928", "reorder": "0xe8fe", "repeat": "0xe040", "repeat_one": "0xe041", "replay": "0xe042", "replay_10": "0xe059", "replay_30": "0xe05a", "replay_5": "0xe05b", "reply": "0xe15e", "reply_all": "0xe15f", "report": "0xe160", "report_problem": "0xe8b2", "restaurant": "0xe56c", "restaurant_menu": "0xe561", "restore": "0xe8b3", "restore_page": "0xe929", "ring_volume": "0xe0d1", "room": "0xe8b4", "room_service": "0xeb49", "rotate_90_degrees_ccw": "0xe418", "rotate_left": "0xe419", "rotate_right": "0xe41a", "rounded_corner": "0xe920", "router": "0xe328", "rowing": "0xe921", "rss_feed": "0xe0e5", "rv_hookup": "0xe642", "satellite": "0xe562", "save": "0xe161", "scanner": "0xe329", "schedule": "0xe8b5", "school": "0xe80c", "screen_lock_landscape": "0xe1be", "screen_lock_portrait": "0xe1bf", "screen_lock_rotation": "0xe1c0", "screen_rotation": "0xe1c1", "screen_share": "0xe0e2", "sd_card": "0xe623", "sd_storage": "0xe1c2", "search": "0xe8b6", "security": "0xe32a", "select_all": "0xe162", "send": "0xe163", "sentiment_dissatisfied": "0xe811", "sentiment_neutral": "0xe812", "sentiment_satisfied": "0xe813", "sentiment_very_dissatisfied": "0xe814", "sentiment_very_satisfied": "0xe815", "settings": "0xe8b8", "settings_applications": "0xe8b9", "settings_backup_restore": "0xe8ba", "settings_bluetooth": "0xe8bb", "settings_brightness": "0xe8bd", "settings_cell": "0xe8bc", "settings_ethernet": "0xe8be", "settings_input_antenna": "0xe8bf", "settings_input_component": "0xe8c0", "settings_input_composite": "0xe8c1", "settings_input_hdmi": "0xe8c2", "settings_input_svideo": "0xe8c3", "settings_overscan": "0xe8c4", "settings_phone": "0xe8c5", "settings_power": "0xe8c6", "settings_remote": "0xe8c7", "settings_system_daydream": "0xe1c3", "settings_voice": "0xe8c8", "share": "0xe80d", "shop": "0xe8c9", "shop_two": "0xe8ca", "shopping_basket": "0xe8cb", "shopping_cart": "0xe8cc", "short_text": "0xe261", "show_chart": "0xe6e1", "shuffle": "0xe043", "signal_cellular_4_bar": "0xe1c8", "signal_cellular_connected_no_internet_4_bar": "0xe1cd", "signal_cellular_no_sim": "0xe1ce", "signal_cellular_null": "0xe1cf", "signal_cellular_off": "0xe1d0", "signal_wifi_4_bar": "0xe1d8", "signal_wifi_4_bar_lock": "0xe1d9", "signal_wifi_off": "0xe1da", "sim_card": "0xe32b", "sim_card_alert": "0xe624", "skip_next": "0xe044", "skip_previous": "0xe045", "slideshow": "0xe41b", "slow_motion_video": "0xe068", "smartphone": "0xe32c", "smoke_free": "0xeb4a", "smoking_rooms": "0xeb4b", "sms": "0xe625", "sms_failed": "0xe626", "snooze": "0xe046", "sort": "0xe164", "sort_by_alpha": "0xe053", "spa": "0xeb4c", "space_bar": "0xe256", "speaker": "0xe32d", "speaker_group": "0xe32e", "speaker_notes": "0xe8cd", "speaker_notes_off": "0xe92a", "speaker_phone": "0xe0d2", "spellcheck": "0xe8ce", "star": "0xe838", "star_border": "0xe83a", "star_half": "0xe839", "stars": "0xe8d0", "stay_current_landscape": "0xe0d3", "stay_current_portrait": "0xe0d4", "stay_primary_landscape": "0xe0d5", "stay_primary_portrait": "0xe0d6", "stop": "0xe047", "stop_screen_share": "0xe0e3", "storage": "0xe1db", "store": "0xe8d1", "store_mall_directory": "0xe563", "straighten": "0xe41c", "streetview": "0xe56e", "strikethrough_s": "0xe257", "style": "0xe41d", "subdirectory_arrow_left": "0xe5d9", "subdirectory_arrow_right": "0xe5da", "subject": "0xe8d2", "subscriptions": "0xe064", "subtitles": "0xe048", "subway": "0xe56f", "supervisor_account": "0xe8d3", "surround_sound": "0xe049", "swap_calls": "0xe0d7", "swap_horiz": "0xe8d4", "swap_vert": "0xe8d5", "swap_vertical_circle": "0xe8d6", "switch_camera": "0xe41e", "switch_video": "0xe41f", "sync": "0xe627", "sync_disabled": "0xe628", "sync_problem": "0xe629", "system_update": "0xe62a", "system_update_alt": "0xe8d7", "tab": "0xe8d8", "tab_unselected": "0xe8d9", "tablet": "0xe32f", "tablet_android": "0xe330", "tablet_mac": "0xe331", "tag_faces": "0xe420", "tap_and_play": "0xe62b", "terrain": "0xe564", "text_fields": "0xe262", "text_format": "0xe165", "textsms": "0xe0d8", "texture": "0xe421", "theaters": "0xe8da", "thumb_down": "0xe8db", "thumb_up": "0xe8dc", "thumbs_up_down": "0xe8dd", "time_to_leave": "0xe62c", "timelapse": "0xe422", "timeline": "0xe922", "timer": "0xe425", "timer_10": "0xe423", "timer_3": "0xe424", "timer_off": "0xe426", "title": "0xe264", "toc": "0xe8de", "today": "0xe8df", "toll": "0xe8e0", "tonality": "0xe427", "touch_app": "0xe913", "toys": "0xe332", "track_changes": "0xe8e1", "traffic": "0xe565", "train": "0xe570", "tram": "0xe571", "transfer_within_a_station": "0xe572", "transform": "0xe428", "translate": "0xe8e2", "trending_down": "0xe8e3", "trending_flat": "0xe8e4", "trending_up": "0xe8e5", "tune": "0xe429", "turned_in": "0xe8e6", "turned_in_not": "0xe8e7", "tv": "0xe333", "unarchive": "0xe169", "undo": "0xe166", "unfold_less": "0xe5d6", "unfold_more": "0xe5d7", "update": "0xe923", "usb": "0xe1e0", "verified_user": "0xe8e8", "vertical_align_bottom": "0xe258", "vertical_align_center": "0xe259", "vertical_align_top": "0xe25a", "vibration": "0xe62d", "video_call": "0xe070", "video_label": "0xe071", "video_library": "0xe04a", "videocam": "0xe04b", "videocam_off": "0xe04c", "videogame_asset": "0xe338", "view_agenda": "0xe8e9", "view_array": "0xe8ea", "view_carousel": "0xe8eb", "view_column": "0xe8ec", "view_comfy": "0xe42a", "view_compact": "0xe42b", "view_day": "0xe8ed", "view_headline": "0xe8ee", "view_list": "0xe8ef", "view_module": "0xe8f0", "view_quilt": "0xe8f1", "view_stream": "0xe8f2", "view_week": "0xe8f3", "vignette": "0xe435", "visibility": "0xe8f4", "visibility_off": "0xe8f5", "voice_chat": "0xe62e", "voicemail": "0xe0d9", "volume_down": "0xe04d", "volume_mute": "0xe04e", "volume_off": "0xe04f", "volume_up": "0xe050", "vpn_key": "0xe0da", "vpn_lock": "0xe62f", "wallpaper": "0xe1bc", "warning": "0xe002", "watch": "0xe334", "watch_later": "0xe924", "wb_auto": "0xe42c", "wb_cloudy": "0xe42d", "wb_incandescent": "0xe42e", "wb_iridescent": "0xe436", "wb_sunny": "0xe430", "wc": "0xe63d", "web": "0xe051", "web_asset": "0xe069", "weekend": "0xe16b", "whatshot": "0xe80e", "widgets": "0xe1bd", "wifi": "0xe63e", "wifi_lock": "0xe1e1", "wifi_tethering": "0xe1e2", "work": "0xe8f9", "wrap_text": "0xe25b", "youtube_searched_for": "0xe8fa", "zoom_in": "0xe8ff", "zoom_out": "0xe900", "zoom_out_map": "0xe56b"} \ No newline at end of file diff --git a/fonts/MaterialIcons-Regular.ttf b/fonts/MaterialIcons-Regular.ttf new file mode 100644 index 0000000..7015564 Binary files /dev/null and b/fonts/MaterialIcons-Regular.ttf differ diff --git a/geometry.py b/geometry.py index b4e58ef..38ecca7 100755 --- a/geometry.py +++ b/geometry.py @@ -399,9 +399,11 @@ class geometry: _log.warning(e) return aa=aa.A.ravel() - print(f'plane={aa[0]}X+{aa[1]}Y+{aa[2]}') - for p in points: - print(f'{p}->{aa[0]*p[0]+aa[1]*p[1]+aa[2]}') + if _log.level==logging.DEBUG: + s=f'plane={aa[0]}X+{aa[1]}Y+{aa[2]}\n' + for p in points: + s+=f' {p}->{aa[0]*p[0]+aa[1]*p[1]+aa[2]}\n' + _log.debug(s) self._fitPlane=aa diff --git a/psi_device.py b/psi_device.py index 5f86514..257bbb0 100644 --- a/psi_device.py +++ b/psi_device.py @@ -1,4 +1,5 @@ import logging +from math import ceil _log=logging.getLogger(__name__) if __name__ == "__main__": logging.basicConfig(level=logging.DEBUG,format='%(name)s:%(levelname)s:%(module)s:%(lineno)d:%(funcName)s:%(message)s ') @@ -11,7 +12,8 @@ if hostname=='ganymede': sys.path.insert(0, os.path.expanduser('~/Documents/prj/SwissFEL/PBTools/')) else: sys.path.insert(0, os.path.expanduser('/sf/cristallina/applications/mx/zamofing_t/PBTools/')) - sys.path.insert(0, os.path.expanduser("/photonics/home/gac-cristall/Documents/swissmx_cristallina/slic/")) + sys.path.insert(0, os.path.expanduser('/sf/cristallina/applications/mx/slic')) + #("/photonics/home/gac-cristall/Documents/swissmx_cristallina/slic/")) #from slic.core.acquisition import SFAcquisition from PyQt5.QtWidgets import (QApplication,) @@ -87,7 +89,9 @@ class Jungfrau: except TypeError as e: _log.warning(f'failed to get _pulse_id_start: {e}') if self._daq is not None: - self._daq.acquire(run['prefix'], n_pulses=n_pulses+run['padding'], wait=False) + n_pulses_run = n_pulses + run['padding'] + self._daq.acquire(run['prefix'], n_pulses=min(n_pulses_run, 5000), n_repeat=ceil(n_pulses_run/5000), wait=False, cell_name=run['cell_name']) + #self._daq.acquire(run['prefix'], n_pulses=n_pulses, wait=False) pass #run['id']+=1 cfg.setValue(AppCfg.DAQ_RUN,run) diff --git a/swissmx.py b/swissmx.py index f420002..07e713c 100755 --- a/swissmx.py +++ b/swissmx.py @@ -20,7 +20,50 @@ bitmask for simulation: """ import logging -logging.basicConfig(level=logging.DEBUG, format='%(levelname)s:%(module)s:%(lineno)d:%(funcName)s:%(message)s ') +class col: + d='\033[0m' # default + r='\033[31m' # red + g='\033[32m' # green + y='\033[33m' # yellow + rr='\033[91m' # red(bright) + gg='\033[92m' # green(bright) + yy='\033[93m' # yellow(bright) + b='\033[1m' # bold + u='\033[4m' # underline + + +class logHandler(logging.StreamHandler): + def __init__(self): + logging.StreamHandler.__init__(self) + + def emit(self, record): + '''override function of base class''' + try: + msg=self.format(record) + # print(record.__dict__) + if record.levelno<=10: + c=col.g + elif record.levelno<=20: + c=col.y + elif record.levelno<=30: + c=col.yy + elif record.levelno<=40: + c=col.r + else: + c=col.rr+col.b + msg=c+msg+col.d + stream=self.stream + stream.write(msg+self.terminator) + self.flush() + except RecursionError: + raise + except Exception: + self.handleError(record) + + +# logging.basicConfig(level=logging.DEBUG, format='%(levelname)s:%(module)s:%(lineno)d:%(funcName)s:%(message)s ') +logging.basicConfig(level=logging.INFO, format='%(levelname)s:%(module)s:%(lineno)d:%(funcName)s:%(message)s', + handlers=[logHandler()]) logging.getLogger('PyQt5.uic').setLevel(logging.INFO) logging.getLogger('requests').setLevel(logging.INFO) @@ -33,6 +76,18 @@ logging.getLogger('zoom').setLevel(logging.INFO) logging.getLogger('pbtools.misc.pp_comm').setLevel(logging.INFO) _log = logging.getLogger("swissmx") #_log.setLevel(logging.INFO) +class col: + d = '\033[0m' #default + r = '\033[31m' #red + g = '\033[32m' #green + y = '\033[33m' #yellow + rr= '\033[91m' #red(bright) + gg= '\033[92m' #green(bright) + yy= '\033[93m' #yellow(bright) + b = '\033[1m' #bold + u = '\033[4m' #underline + + import time class timestamp(): @@ -2041,7 +2096,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) fidScl=param.pop('fidScl',.02) fiducial=param.pop('fiducial',((.1, .1), (.1, 2.7), (10.3, .1), (10.3, 2.7))) fiducial=np.array(fiducial) - gp=psi_device.shapepath.GenPath(); gp.swissmx_points(ofs=ofs, width=width, flipy=True) + gp=psi_device.shapepath.GenPath(); gp.swissmx(ofs=ofs, width=width, flipy=True) sz=gp.points.max(0)+np.array(ofs)*2 go=UsrGO.Path((fx-sz[0]/2, fy-sz[1]/2), sz, gp.points, fiducial, fidScl,**param) elif idx==6: @@ -2050,7 +2105,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) fidScl=param.pop('fidScl',.02) fiducial=param.pop('fiducial',((.1, .1), (.1, 2.2), (10.3, .1), (10.3, 2.2))) fiducial=np.array(fiducial) - gp=psi_device.shapepath.GenPath(); gp.swissfel_points(ofs=ofs, width=width,flipy=True,**param) + gp=psi_device.shapepath.GenPath(); gp.swissfel(ofs=ofs, width=width,flipy=True,**param) sz=gp.points.max(0)+np.array(ofs)*2 go=UsrGO.Path((fx-sz[0]/2, fy-sz[1]/2), sz, gp.points, fiducial, fidScl) else: @@ -2095,7 +2150,8 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) sz=np.array(go._dscr['size']) fid=fid/sz trf=geometry.geometry.least_square_trf(ptFitTrf,fid) - print(trf) + #_log.debug(f'{trf}') + _log.debug('\n trf='+str(trf).replace('\n','\n ')) tr=go.transform() tr.setMatrix(1, trf[1,0]/trf[0,0], 0, trf[0,1]/trf[1,1], 1, 0, @@ -2112,7 +2168,7 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) sz=go.szOrig fid=fid/sz trf=geometry.geometry.least_square_trf(ptFitTrf, fid) - print(trf) + _log.debug('\n trf='+str(trf).replace('\n','\n ')) tr=go.transform() tr.setMatrix(1, trf[1, 0]/trf[0, 0], 0, trf[0, 1]/trf[1, 1], 1, 0, @@ -2193,12 +2249,24 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) sp.setup_motion(fnPrg=fn+'.prg', mode=4, scale=1., dwell=10, grid=kwargs['grid'],trf=kwargs['trf']) try: p=geo._fitPlane + # TODO: Cleanup if code_gen==0: # X has inverted sign ! # Z is in um -> therefore the offset must be multiplied with 1000 ! Z motor has opposite sign ! - cz=f'{+p[0]:+.18g}X{-p[1]:+.18g}Y{-p[2]*1000:+.18g}' + #cz=f'{+p[0]:+.18g}X{-p[1]:+.18g}Y{-p[2]*1000:+.18g}' + t=p*np.array((1,-1,-1000)) + cz=f'{t[0]:+.18g}X{t[1]:+.18g}Y{t[2]:+.18g}' else: - cz=f'{+p[0]:+.18g}X{-p[1]:+.18g}Y{-p[2]*1000:+.18g}' + trf=kwargs['trf'] # grid-coord -> motor-um + #(0,0,1)*trf + # trf*'gridpos in um' -> motor pos in mm + trf2=np.asmatrix(np.identity(3)) + trf2[:, :2]=trf + #p1=(0,0,1)*trf2 # =matrix([[-2376.8, 1376.8, 1. ]]) um + trf3=np.matrix( ((p[0],0,0),(-p[1],0,0),(-1000*p[2],0,1)) ) + #(0, 0, 1)*trf2*trf3 + t=(trf2*trf3)[:,0].A.ravel() + cz=f'{t[0]:+.18g}X{t[1]:+.18g}Y{t[2]:+.18g}' except AttributeError: cz='0' _log.warning('no plane fitting done. z does not move') @@ -2211,8 +2279,8 @@ Author Thierry Zamofing (thierry.zamofing@psi.ch) fy=f'{trf[0,1]:+.18g}X{trf[1,1]:+.18g}Y{trf[2,1]:+.18g}' _log.debug(f'pts_trf[0,:]={kwargs["pts_trf"][0, :]}') - _log.debug((f'points[0,:]={kwargs["points"][0, :]}') - _log.debug((f'trf=\n{trf}') + _log.debug(f'points[0,:]={kwargs["points"][0, :]}') + _log.debug(f'trf=\n{trf}') sp.setup_coord_trf(fx, fy, cz) # reset to shape path system